Skip to content

Commit c041797

Browse files
committed
Reset server_to_be_closed false when reading query
1 parent 7e68030 commit c041797

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ EXECUTE_PROCESS(COMMAND git describe --tags
6565
)
6666
MESSAGE(STATUS "building from ${GIT_REVISION}")
6767
SET(CPACK_PACKAGE_VERSION_MAJOR "1")
68-
SET(CPACK_PACKAGE_VERSION_MINOR "1")
69-
SET(CPACK_PACKAGE_VERSION_PATCH "1")
68+
SET(CPACK_PACKAGE_VERSION_MINOR "3")
69+
SET(CPACK_PACKAGE_VERSION_PATCH "0")
7070
SET(CPACK_PACKAGE_VENDOR "MySQL")
7171
SET(PACKAGE_NAME cetus)
7272

plugins/proxy/proxy-plugin.c

+1
Original file line numberDiff line numberDiff line change
@@ -1472,6 +1472,7 @@ NETWORK_MYSQLD_PLUGIN_PROTO(proxy_read_query)
14721472

14731473
int server_attr_changed = 0;
14741474
con->is_client_to_be_closed = 0;
1475+
con->server_to_be_closed = 0;
14751476
con->server_in_tran_and_auto_commit_received = 0;
14761477

14771478
if (con->server != NULL) {

src/network-mysqld.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -3626,7 +3626,7 @@ normal_read_query_result(network_mysqld_con *con, network_mysqld_con_state_t ost
36263626
while ((packet = g_queue_pop_head(con->server->recv_queue->chunks)) != NULL) {
36273627
network_mysqld_queue_append_raw(con->client, con->client->send_queue, packet);
36283628
}
3629-
if (con->client->send_queue->len > 0) {
3629+
if (!g_queue_is_empty(con->client->send_queue->chunks)) {
36303630
g_debug("%s: send_part_content_to_client", G_STRLOC);
36313631
send_part_content_to_client(con);
36323632
}

0 commit comments

Comments
 (0)