bzr push into mysql-5.1-bugteam branch (Georgi.Kodinov:3417 to 3418)

[Georgi Kodinov]

 3418 Georgi Kodinov	2010-06-07 [merge]
      merge

    modified:
      sql/sql_parse.cc
 3417 Ramil Kalimullin	2010-06-04 [merge]
      Automerge.

    modified:
      mysql-test/r/variables.result
      mysql-test/t/variables.test
      sql/mysqld.cc
      sql/set_var.cc
      sql/set_var.h
      sql/sql_class.h
      sql/sql_parse.cc
=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2010-06-04 14:10:22 +0000
+++ b/sql/sql_parse.cc	2010-06-07 10:01:54 +0000
@@ -1510,8 +1510,11 @@ 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];
     if (level == SHUTDOWN_DEFAULT)
       level= SHUTDOWN_WAIT_ALL_BUFFERS; // soon default will be configurable
     else if (level != SHUTDOWN_WAIT_ALL_BUFFERS)


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