1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

Automatic merge

This commit is contained in:
Michael Widenius
2014-07-30 22:05:47 +03:00
64 changed files with 860 additions and 278 deletions

View File

@ -934,9 +934,7 @@ bool do_command(THD *thd)
*/
DEBUG_SYNC(thd, "before_do_command_net_read");
thd->m_server_idle= TRUE;
packet_length= my_net_read(net);
thd->m_server_idle= FALSE;
packet_length= my_net_read_packet(net, 1);
if (packet_length == packet_error)
{