From c28e55528480fc67417fb44017db5efd92a9a018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Canna=C3=B2?= Date: Tue, 9 Jan 2018 00:36:55 +0100 Subject: [PATCH] Crash on mirroring #1305 --- lib/mysql_connection.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/mysql_connection.cpp b/lib/mysql_connection.cpp index edadbe044..8810e0152 100644 --- a/lib/mysql_connection.cpp +++ b/lib/mysql_connection.cpp @@ -914,12 +914,14 @@ handler_again: break; case ASYNC_USE_RESULT_CONT: { - unsigned int buffered_data=0; - buffered_data = myds->sess->client_myds->PSarrayOUT->len * RESULTSET_BUFLEN; - buffered_data += myds->sess->client_myds->resultset->len * RESULTSET_BUFLEN; - if (buffered_data > (unsigned int)mysql_thread___threshold_resultset_size*8) { - next_event(ASYNC_USE_RESULT_CONT); // we temporarily pause . See #1232 - break; + if (myds->sess && myds->sess->client_myds && myds->sess->mirror==false) { + unsigned int buffered_data=0; + buffered_data = myds->sess->client_myds->PSarrayOUT->len * RESULTSET_BUFLEN; + buffered_data += myds->sess->client_myds->resultset->len * RESULTSET_BUFLEN; + if (buffered_data > (unsigned int)mysql_thread___threshold_resultset_size*8) { + next_event(ASYNC_USE_RESULT_CONT); // we temporarily pause . See #1232 + break; + } } } if (async_fetch_row_start==false) {