1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Georgi Kodinov 2010-06-07 13:01:54 +03:00
commit 3617e5a159
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_parse.cc
View File

@ -1510,8 +1510,11 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
SHUTDOWN_DEFAULT is 0. If client is >= 4.1.3, the shutdown level is in SHUTDOWN_DEFAULT is 0. If client is >= 4.1.3, the shutdown level is in
packet[0]. packet[0].
*/ */
enum mysql_enum_shutdown_level level= enum mysql_enum_shutdown_level level;
(enum mysql_enum_shutdown_level) (uchar) packet[0]; if (!thd->is_valid_time())
level= SHUTDOWN_DEFAULT;
else
level= (enum mysql_enum_shutdown_level) (uchar) packet[0];
if (level == SHUTDOWN_DEFAULT) if (level == SHUTDOWN_DEFAULT)
level= SHUTDOWN_WAIT_ALL_BUFFERS; // soon default will be configurable level= SHUTDOWN_WAIT_ALL_BUFFERS; // soon default will be configurable
else if (level != SHUTDOWN_WAIT_ALL_BUFFERS) else if (level != SHUTDOWN_WAIT_ALL_BUFFERS)