Commit ba500853 authored by Oleksandr Byelkin's avatar Oleksandr Byelkin

Fix of PSI & COM_MULTI

parent 53775a97
...@@ -2232,6 +2232,11 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -2232,6 +2232,11 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
if (net_allocate_new_packet(net, thd, MYF(0))) if (net_allocate_new_packet(net, thd, MYF(0)))
break; break;
PSI_statement_locker *save_locker= thd->m_statement_psi;
sql_digest_state *save_digest= thd->m_digest;
thd->m_statement_psi= NULL;
thd->m_digest= NULL;
while (packet_length) while (packet_length)
{ {
current_com++; current_com++;
...@@ -2263,6 +2268,9 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -2263,6 +2268,9 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
} }
com_multi_end: com_multi_end:
thd->m_statement_psi= save_locker;
thd->m_digest= save_digest;
/* release old buffer */ /* release old buffer */
DBUG_ASSERT(net->buff == net->write_pos); // nothing to send DBUG_ASSERT(net->buff == net->write_pos); // nothing to send
my_free(readbuff); my_free(readbuff);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment