bzr commit into mysql-trunk-bugfixing branch (Georgi.Kodinov:3048)

[Georgi Kodinov]

#At file:///Users/kgeorge/mysql/work/fix-unix-trunk-merge/ based on revid:alik@stripped

 3048 Georgi Kodinov	2010-06-07 [merge]
      merge and typo fix

    modified:
      sql/sql_parse.cc
      sql/sys_vars.cc
=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2010-06-07 08:47:04 +0000
+++ b/sql/sql_parse.cc	2010-06-07 10:37:11 +0000
@@ -1353,8 +1353,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)

=== modified file 'sql/sys_vars.cc'
--- a/sql/sys_vars.cc	2010-06-07 08:47:04 +0000
+++ b/sql/sys_vars.cc	2010-06-07 10:37:11 +0000
@@ -2405,8 +2405,8 @@ static Sys_var_session_special Sys_times
        "timestamp", "Set the time for this client",
        sys_var::ONLY_SESSION, NO_CMD_LINE,
        VALID_RANGE(0, ~(time_t)0), BLOCK_SIZE(1),
-       NO_MUTEX_GUARD, IN_BINLOG, ON_CHECK(0), ON_UPDATE(update_timestamp),
-       ON_READ(read_timestamp));
+       NO_MUTEX_GUARD, IN_BINLOG, ON_CHECK(check_timestamp), 
+       ON_UPDATE(update_timestamp), ON_READ(read_timestamp));
 
 static bool update_last_insert_id(THD *thd, set_var *var)
 {


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