From ec54dcb054d5de896b39d3e61a8afba1d8b35915 Mon Sep 17 00:00:00 2001
From: "jimw@mysql.com" <>
Date: Fri, 17 Jun 2005 08:56:04 -0700
Subject: [PATCH 1/2] Fix spurious permissions problem when CONVERT_TZ() is
 used in a multi-table update query. (Bug #9979)

---
 mysql-test/r/timezone_grant.result |  7 +++++++
 mysql-test/t/timezone_grant.test   | 12 ++++++++++++
 sql/sql_parse.cc                   |  5 +++--
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/timezone_grant.result b/mysql-test/r/timezone_grant.result
index 685f8007ac7..471cacde300 100644
--- a/mysql-test/r/timezone_grant.result
+++ b/mysql-test/r/timezone_grant.result
@@ -45,6 +45,13 @@ select * from mysql.time_zone_name;
 ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name'
 select Name, convert_tz('2004-11-30 12:00:00', Name, 'UTC') from mysql.time_zone_name;
 ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'time_zone_name'
+drop table t1, t2;
+create table t1 (a int, b datetime);
+create table t2 (a int, b varchar(40));
+update t1 set b = '2005-01-01 10:00';
+update t1 set b = convert_tz(b, 'UTC', 'UTC');
+update t1 join t2 on (t1.a = t2.a) set t1.b = '2005-01-01 10:00' where t2.b = 'foo';
+update t1 join t2 on (t1.a = t2.a) set t1.b = convert_tz('2005-01-01 10:00','UTC','UTC') where t2.b = 'foo';
 delete from mysql.user where user like 'mysqltest\_%';
 delete from mysql.db where user like 'mysqltest\_%';
 delete from mysql.tables_priv where user like 'mysqltest\_%';
diff --git a/mysql-test/t/timezone_grant.test b/mysql-test/t/timezone_grant.test
index 501315668f5..8627866a0bf 100644
--- a/mysql-test/t/timezone_grant.test
+++ b/mysql-test/t/timezone_grant.test
@@ -61,6 +61,18 @@ select * from mysql.time_zone_name;
 --error 1142
 select Name, convert_tz('2004-11-30 12:00:00', Name, 'UTC') from mysql.time_zone_name;
 
+#
+# Bug #9979: Use of CONVERT_TZ in multiple-table UPDATE causes bogus
+# privilege error
+#
+drop table t1, t2;
+create table t1 (a int, b datetime);
+create table t2 (a int, b varchar(40));
+update t1 set b = '2005-01-01 10:00';
+update t1 set b = convert_tz(b, 'UTC', 'UTC');
+update t1 join t2 on (t1.a = t2.a) set t1.b = '2005-01-01 10:00' where t2.b = 'foo';
+update t1 join t2 on (t1.a = t2.a) set t1.b = convert_tz('2005-01-01 10:00','UTC','UTC') where t2.b = 'foo';
+
 # Clean-up
 connection default;
 delete from mysql.user where user like 'mysqltest\_%';
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index f0ea0a762bd..a515441ee1b 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1938,7 +1938,8 @@ mysql_execute_command(THD *thd)
     that is not a SHOW command or a select that only access local
     variables, but for now this is probably good enough.
   */
-  if (tables || &lex->select_lex != lex->all_selects_list)
+  if (tables || &lex->select_lex != lex->all_selects_list ||
+      lex->time_zone_tables_used)
     mysql_reset_errors(thd);
 
 #ifdef HAVE_REPLICATION
@@ -5354,7 +5355,7 @@ int multi_update_precheck(THD *thd, TABLE_LIST *tables)
   /*
     Is there tables of subqueries?
   */
-  if (&lex->select_lex != lex->all_selects_list)
+  if (&lex->select_lex != lex->all_selects_list || lex->time_zone_tables_used)
   {
     DBUG_PRINT("info",("Checking sub query list"));
     for (table= tables; table; table= table->next)

From eb785d70b8eb7c5792d064461167943f48c5f11f Mon Sep 17 00:00:00 2001
From: "jimw@mysql.com" <>
Date: Fri, 15 Jul 2005 12:31:57 -0700
Subject: [PATCH 2/2] Fix error in formatting metadata in mysqltest.

---
 client/mysqltest.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/mysqltest.c b/client/mysqltest.c
index b7f4ceb9c20..b23b77e9bca 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -3141,10 +3141,10 @@ static void run_query_display_metadata(MYSQL_FIELD *field, uint num_fields,
     int10_to_str((int) field->type, buff, 10);
     dynstr_append(ds, buff);
     dynstr_append_mem(ds, "\t", 1);
-    int10_to_str((int) field->length, buff, 10);
+    longlong10_to_str((unsigned int) field->length, buff, 10);
     dynstr_append(ds, buff);
     dynstr_append_mem(ds, "\t", 1);
-    int10_to_str((int) field->max_length, buff, 10);
+    longlong10_to_str((unsigned int) field->max_length, buff, 10);
     dynstr_append(ds, buff);
     dynstr_append_mem(ds, "\t", 1);
     dynstr_append_mem(ds, (char*) (IS_NOT_NULL(field->flags) ?