From 14ccf96eb042aaf10f1c813798dd4dcaea912d68 Mon Sep 17 00:00:00 2001
From: snail <okniuys@gmail.com>
Date: Mon, 22 Feb 2016 11:23:35 +0800
Subject: [PATCH 1/4] error deal for query containing multi statement

A query may execute multi sql statements.If an error occurs for any sql, the result should return the error info.
---
 lualib/mysql.lua | 4 ++++
 1 file changed, 4 insertions(+)

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

From 8f7fa6a5629a976b65af25b975a0423d2523d968 Mon Sep 17 00:00:00 2001
From: Cloud Wu <cloudwu@gmail.com>
Date: Thu, 25 Feb 2016 14:40:24 +0800
Subject: [PATCH 2/4] merge sproto

---
 lualib/sproto.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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)

From cbf22ac9f32608d9d97d04b0369d03689297d160 Mon Sep 17 00:00:00 2001
From: Cloud Wu <cloudwu@gmail.com>
Date: Mon, 7 Mar 2016 11:46:30 +0800
Subject: [PATCH 3/4] release rc2

---
 HISTORY.md | 9 +++++++++
 1 file changed, 9 insertions(+)

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

From 7771e180ec7628d2df4afeb0e97ff006a8dc9b05 Mon Sep 17 00:00:00 2001
From: great90 <897346026@qq.com>
Date: Tue, 8 Mar 2016 11:25:59 +0800
Subject: [PATCH 4/4] delete unused local variable

delete unused local variable table "udp_socket"
---
 lualib/socket.lua | 2 --
 1 file changed, 2 deletions(-)

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] = {