bzr commit into mysql-5.0-bugteam branch (Georgi.Kodinov:2868) Bug#52315

[Georgi Kodinov]

#At file:///Users/kgeorge/mysql/work/fix-5.0-bugteam/ based on revid:georgi.kodinov@stripped

 2868 Georgi Kodinov	2010-06-07
      Addendum to the fix for bug #52315: need to set a proper shutdown type
      when an out-of-supported-range date is detected.

    modified:
      sql/sql_parse.cc
=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2010-06-04 13:21:19 +0000
+++ b/sql/sql_parse.cc	2010-06-07 09:49:52 +0000
@@ -2243,8 +2243,12 @@ bool dispatch_command(enum enum_server_c
       SHUTDOWN_DEFAULT is 0. If client is >= 4.1.3, the shutdown level is in
       packet[0].
     */
-    enum mysql_enum_shutdown_level level=
-      (enum mysql_enum_shutdown_level) (uchar) packet[0];
+    enum mysql_enum_shutdown_level level;
+    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));
     if (level == SHUTDOWN_DEFAULT)
       level= SHUTDOWN_WAIT_ALL_BUFFERS; // soon default will be configurable


Attachment: [text/bzr-bundle] bzr/[e-mail]