Reset server_to_be_closed false when reading query

session-replay-tools · Apr 19, 2019 · c041797 · c041797
1 parent 7e68030
commit c041797
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -65,8 +65,8 @@ EXECUTE_PROCESS(COMMAND git describe --tags
                 )
 MESSAGE(STATUS "building from ${GIT_REVISION}")
 SET(CPACK_PACKAGE_VERSION_MAJOR "1")
-SET(CPACK_PACKAGE_VERSION_MINOR "1")
-SET(CPACK_PACKAGE_VERSION_PATCH "1")
+SET(CPACK_PACKAGE_VERSION_MINOR "3")
+SET(CPACK_PACKAGE_VERSION_PATCH "0")
 SET(CPACK_PACKAGE_VENDOR "MySQL")
 SET(PACKAGE_NAME cetus)
 

diff --git a/plugins/proxy/proxy-plugin.c b/plugins/proxy/proxy-plugin.c
@@ -1472,6 +1472,7 @@ NETWORK_MYSQLD_PLUGIN_PROTO(proxy_read_query)
 
     int server_attr_changed = 0;
     con->is_client_to_be_closed = 0;
+    con->server_to_be_closed = 0;
     con->server_in_tran_and_auto_commit_received = 0;
 
     if (con->server != NULL) {

diff --git a/src/network-mysqld.c b/src/network-mysqld.c
@@ -3626,7 +3626,7 @@ normal_read_query_result(network_mysqld_con *con, network_mysqld_con_state_t ost
             while ((packet = g_queue_pop_head(con->server->recv_queue->chunks)) != NULL) {
                 network_mysqld_queue_append_raw(con->client, con->client->send_queue, packet);
             }
-            if (con->client->send_queue->len > 0) {
+            if (!g_queue_is_empty(con->client->send_queue->chunks)) {
                 g_debug("%s: send_part_content_to_client", G_STRLOC);
                 send_part_content_to_client(con);
             }