diff --git a/HISTORY.md b/HISTORY.md index 9067a9ac..2f2af7b2 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,3 +1,12 @@ +v1.0.0-rc2 (2015-3-7) +----------- +* Fix a bug in lua 5.3.2 +* Update sproto (fix bugs and add ud for package) +* Fix a bug in http +* Fix a bug in harbor +* Fix a bug in socket channel +* Enhance remote debugger + v1.0.0-rc (2015-12-28) ----------- * Update to lua 5.3.2 diff --git a/lualib/mysql.lua b/lualib/mysql.lua index 933e0643..afa76425 100644 --- a/lualib/mysql.lua +++ b/lualib/mysql.lua @@ -607,6 +607,10 @@ local function _query_resp(self) while err =="again" do res, err, errno, sqlstate = read_result(self,sock) if not res then + mulitresultset.badresult = true + mulitresultset.err = err + mulitresultset.errno = errno + mulitresultset.sqlstate = sqlstate return true, mulitresultset end mulitresultset[i]=res diff --git a/lualib/socket.lua b/lualib/socket.lua index 5ea222e0..d7741b54 100644 --- a/lualib/socket.lua +++ b/lualib/socket.lua @@ -407,8 +407,6 @@ end ---------------------- UDP -local udp_socket = {} - local function create_udp_object(id, cb) assert(not socket_pool[id], "socket is not closed") socket_pool[id] = { diff --git a/lualib/sproto.lua b/lualib/sproto.lua index 3ae114bd..00f5337b 100644 --- a/lualib/sproto.lua +++ b/lualib/sproto.lua @@ -180,9 +180,10 @@ end local header_tmp = {} local function gen_response(self, response, session) - return function(args) + return function(args, ud) header_tmp.type = nil header_tmp.session = session + header_tmp.ud = ud local header = core.encode(self.__package, header_tmp) if response then local content = core.encode(response, args)