lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-25 12:43:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #238 from yibiaochen/lua53

Browse Source 
Update mysql.lua
This commit is contained in:
云风
2015-02-21 06:42:53 +08:00
parent 8645061a66 e5e2771e27
commit 9067b9c50f
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lualib/mysql.lua
View File

@@ -461,9 +461,7 @@ local function _mysql_login(self,user,password,database)
local more_capabilities local more_capabilities
more_capabilities, pos = _get_byte2(packet, pos) more_capabilities, pos = _get_byte2(packet, pos)
self._server_capabilities = bor(self._server_capabilities, self._server_capabilities = self._server_capabilities|more_capabilities<<16
lshift(more_capabilities, 16))
local len = 21 - 8 - 1 local len = 21 - 8 - 1
@@ -524,7 +522,7 @@ local function read_result(self, sock)
if typ == 'OK' then if typ == 'OK' then
local res = _parse_ok_packet(packet) local res = _parse_ok_packet(packet)
if res and band(res.server_status, SERVER_MORE_RESULTS_EXISTS) ~= 0 then if res and res.server_status&SERVER_MORE_RESULTS_EXISTS ~= 0 then
return res, "again" return res, "again"
end end
return res return res
@@ -577,7 +575,7 @@ local function read_result(self, sock)
if typ == 'EOF' then if typ == 'EOF' then
local warning_count, status_flags = _parse_eof_packet(packet) local warning_count, status_flags = _parse_eof_packet(packet)
if band(status_flags, SERVER_MORE_RESULTS_EXISTS) ~= 0 then if status_flags&SERVER_MORE_RESULTS_EXISTS ~= 0 then
return rows, "again" return rows, "again"
end end