database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

MDEV-9058: protocol: COM_MULTI command (post-post-review changes)

Browse Source 
Now we do not swap buffers back but just free old one.
This commit is contained in:
Oleksandr Byelkin
2016-03-21 11:00:35 +01:00
parent 0c9d39edc3
commit ec0fb660d7
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_parse.cc
View File

@@ -2230,7 +2230,6 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
/* We have to store next length because it will be destroyed by '\0' */ /* We have to store next length because it will be destroyed by '\0' */
uint next_subpacket_length= uint3korr(packet); uint next_subpacket_length= uint3korr(packet);
unsigned char *readbuff= net->buff; unsigned char *readbuff= net->buff;
unsigned long readbuff_max_packet= net->max_packet;
if (net_allocate_new_packet(net, thd, MYF(0))) if (net_allocate_new_packet(net, thd, MYF(0)))
break; break;
@@ -2266,13 +2265,9 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
} }
com_multi_end: com_multi_end:
/* restore buffer to the original one */ /* 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(net->buff); my_free(readbuff);
net->buff= readbuff;
net->max_packet= readbuff_max_packet;
net->buff_end=net->buff + net->max_packet;
net->write_pos=net->read_pos = net->buff;
} }
break; break;
} }