database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.1

Browse Source 
into  mysql.com:/home/my/mysql-5.1


Makefile.am:
  Auto merged
configure.in:
  Auto merged
sql/field.h:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.h:
  Auto merged
This commit is contained in:
unknown
2006-11-29 22:54:11 +02:00
parent 8f71610f9c ee1c5226b9
commit 6bcbd7df1e
109 changed files with 66386 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql-common/client.c
View File

@@ -682,7 +682,13 @@ cli_advanced_command(MYSQL *mysql, enum enum_server_command command,
mysql->net.report_error=0;
mysql->info=0;
mysql->affected_rows= ~(my_ulonglong) 0;
net_clear(&mysql->net); /* Clear receive buffer */
/*
We don't want to clear the protocol buffer on COM_QUIT, beacsue if
the previous command was a shutdown command, we may have the
response for the COM_QUIT already in the communication buffer
*/
if (command != COM_QUIT)
net_clear(&mysql->net); /* Clear receive buffer */
if (net_write_command(net,(uchar) command, header, header_length,
arg, arg_length))