Commit 80acd957 authored by Georgi Kodinov's avatar Georgi Kodinov

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

when an out-of-supported-range date is detected.
parent 5321e49d
...@@ -2243,8 +2243,12 @@ bool dispatch_command(enum enum_server_command command, THD *thd, ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment