--- lib/rw-splitting.lua.orig	2009-06-30 22:47:39.000000000 +0600

+++ lib/rw-splitting.lua	2009-10-20 12:06:21.000000000 +0600

@@ -65,7 +65,7 @@

 	if is_debug then

 		print()

-		print("[connect_server] " .. proxy.connection.client.address)

+		print("[connect_server] " .. proxy.connection.client.src.name)

 	end

 	local rw_ndx = 0

@@ -143,7 +143,7 @@

 -- auth.packet is the packet

 function read_auth_result( auth )

 	if is_debug then

-		print("[read_auth_result] " .. proxy.connection.client.address)

+		print("[read_auth_result] " .. proxy.connection.client.src.name)

 	end

 	if auth.packet:byte() == proxy.MYSQLD_PACKET_OK then

 		-- auth was fine, disconnect from the server

@@ -175,7 +175,7 @@

 	-- looks like we have to forward this statement to a backend

 	if is_debug then

-		print("[read_query] " .. proxy.connection.client.address)

+		print("[read_query] " .. proxy.connection.client.src.name)

 		print("  current backend   = " .. proxy.connection.backend_ndx)

 		print("  client default db = " .. c.default_db)

 		print("  client username   = " .. c.username)

@@ -198,7 +198,7 @@

 		return proxy.PROXY_SEND_RESULT

 	end

-	proxy.queries:append(1, packet)

+	proxy.queries:append(1, packet, { resultset_is_needed = true })

 	-- read/write splitting 

 	--

@@ -278,14 +278,14 @@

 		print("    server default db: " .. s.default_db)

 		print("    client default db: " .. c.default_db)

 		print("    syncronizing")

-		proxy.queries:prepend(2, string.char(proxy.COM_INIT_DB) .. c.default_db)

+		proxy.queries:prepend(2, string.char(proxy.COM_INIT_DB) .. c.default_db, { resultset_is_needed = true })

 	end

 	-- send to master

 	if is_debug then

 		if proxy.connection.backend_ndx > 0 then

 			local b = proxy.global.backends[proxy.connection.backend_ndx]

-			print("  sending to backend : " .. b.address);

+			print("  sending to backend : " .. b.dst.name);

 			print("    is_slave         : " .. tostring(b.type == proxy.BACKEND_TYPE_RO));

 			print("    server default db: " .. s.default_db)

 			print("    server username  : " .. s.username)

@@ -319,7 +319,7 @@

 				proxy.response = {

 					type = proxy.MYSQLD_PACKET_ERR,

 					errmsg = "can't change DB ".. proxy.connection.client.default_db ..

-						" to on slave " .. proxy.global.backends[proxy.connection.backend_ndx].address

+						" to on slave " .. proxy.global.backends[proxy.connection.backend_ndx].dst.name

 				}

 				return proxy.PROXY_SEND_RESULT

@@ -352,7 +352,7 @@

 function disconnect_client()

 	local is_debug = proxy.global.config.rwsplit.is_debug

 	if is_debug then

-		print("[disconnect_client] " .. proxy.connection.client.address)

+		print("[disconnect_client] " .. proxy.connection.client.src.name)

 	end

 	-- make sure we are disconnection from the connection

--- src/network-injection-lua.c.orig	2009-06-30 22:47:39.000000000 +0600

+++ src/network-injection-lua.c	2009-11-17 09:39:32.000000000 +0500

@@ -33,17 +33,18 @@

 #define TIME_DIFF_US(t2, t1) \

 ((t2.tv_sec - t1.tv_sec) * 1000000.0 + (t2.tv_usec - t1.tv_usec))

+typedef enum {

+	PROXY_QUEUE_ADD_PREPEND,

+	PROXY_QUEUE_ADD_APPEND

+} proxy_queue_add_t;

 /**

- * proxy.queries:append(id, packet[, { options }])

+ * handle _append() and _prepend() 

  *

- *   id:      opaque numeric id (numeric)

- *   packet:  mysql packet to append (string)  FIXME: support table for multiple packets

- *   options: table of options (table)

- *     backend_ndx:  backend_ndx to send it to (numeric)

- *     resultset_is_needed: expose the result-set into lua (bool)

+ * _append() and _prepend() have the same behaviour, parameters, ... 

+ * just different in position

  */

-static int proxy_queue_append(lua_State *L) {

+static int proxy_queue_add(lua_State *L, proxy_queue_add_t type) {

 	GQueue *q = *(GQueue **)luaL_checkself(L);

 	int resp_type = luaL_checkinteger(L, 2);

 	size_t str_len;

@@ -68,7 +69,12 @@

 		} else if (lua_isboolean(L, -1)) {

 			inj->resultset_is_needed = lua_toboolean(L, -1);

 		} else {

-			luaL_argerror(L, 4, ":append(..., { resultset_is_needed = boolean } ), is %s");

+			switch (type) {

+			case PROXY_QUEUE_ADD_APPEND:

+				return luaL_argerror(L, 4, ":append(..., { resultset_is_needed = boolean } ), is %s");

+			case PROXY_QUEUE_ADD_PREPEND:

+				return luaL_argerror(L, 4, ":prepend(..., { resultset_is_needed = boolean } ), is %s");

+			}

 		}

 		lua_pop(L, 1);

@@ -78,25 +84,34 @@

 		luaL_typerror(L, 4, "table");

 		break;

 	}

-    

-	network_injection_queue_append(q, inj);

-    

-	return 0;

+

+	switch (type) {

+	case PROXY_QUEUE_ADD_APPEND:

+		network_injection_queue_append(q, inj);

+		return 0;

+	case PROXY_QUEUE_ADD_PREPEND:

+		network_injection_queue_prepend(q, inj);

+		return 0;

+	}

+

+	g_assert_not_reached();

+}

+

+/**

+ * proxy.queries:append(id, packet[, { options }])

+ *

+ *   id:      opaque numeric id (numeric)

+ *   packet:  mysql packet to append (string)  FIXME: support table for multiple packets

+ *   options: table of options (table)

+ *     backend_ndx:  backend_ndx to send it to (numeric)

+ *     resultset_is_needed: expose the result-set into lua (bool)

+ */

+static int proxy_queue_append(lua_State *L) {

+	return proxy_queue_add(L, PROXY_QUEUE_ADD_APPEND);

 }

 static int proxy_queue_prepend(lua_State *L) {

-	/* we expect 2 parameters */

-	GQueue *q = *(GQueue **)luaL_checkself(L);

-	int resp_type = luaL_checkinteger(L, 2);

-	size_t str_len;

-	const char *str = luaL_checklstring(L, 3, &str_len);

-    

-	GString *query = g_string_sized_new(str_len);

-	g_string_append_len(query, str, str_len);

-    

-	network_injection_queue_prepend(q, injection_new(resp_type, query));

-    

-	return 0;

+	return proxy_queue_add(L, PROXY_QUEUE_ADD_PREPEND);

 }

 static int proxy_queue_reset(lua_State *L) {