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

Addendum to the fix for bug #52315: need to set a proper shutdown type

Browse Source 
when an out-of-supported-range date is detected.
This commit is contained in:
Georgi Kodinov 2010-06-07 12:49:52 +03:00
parent 121e04732e
commit df088b8de2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_parse.cc
View File

@ -2243,8 +2243,12 @@ 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];
DBUG_PRINT("quit",("Got shutdown command for level %u", level)); DBUG_PRINT("quit",("Got shutdown command for level %u", level));
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