From: Dmitry Shulga
Date: November 7 2010 6:41pm
Subject: bzr push into mysql-5.5-bugteam branch (Dmitry.Shulga:3260 to 3261) Bug#47924
List-Archive: http://lists.mysql.com/commits/123039
X-Bug: 47924
Message-Id: <201011071843.oA7IMcM1014890@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1366940289=="

--===============1366940289==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 3261 Dmitry Shulga	2010-11-08 [merge]
      Auto-merge from mysql-5.1-bugteam for bug#47924.

    modified:
      mysql-test/r/log_tables.result
      mysql-test/t/log_tables.test
      sql/sql_rename.cc
 3260 He Zhenxing	2010-11-07
      Remove rpl_killed_ddl.test from experimental after fixed BUG#47638

    modified:
      mysql-test/collections/default.experimental
=== modified file 'mysql-test/r/log_tables.result'
--- a/mysql-test/r/log_tables.result	2009-12-22 11:02:52 +0000
+++ b/mysql-test/r/log_tables.result	2010-11-07 18:06:22 +0000
@@ -896,6 +896,16 @@ TIMESTAMP	1	1	SELECT SQL_NO_CACHE 'Bug#3
 TIMESTAMP	1	1	SELECT SQL_NO_CACHE 'Bug#31700 - PK',  f1,f2,f3,SLEEP(1.1) FROM t1 WHERE f1=2
 DROP TABLE t1;
 TRUNCATE TABLE mysql.slow_log;
+use mysql;
+drop table if exists renamed_general_log;
+drop table if exists renamed_slow_log;
+RENAME TABLE general_log TO renamed_general_log;
+ERROR HY000: Cannot rename 'general_log'. When logging enabled, rename to/from log table must rename two tables: the log table to an archive table and another table back to 'general_log'
+RENAME TABLE slow_log TO renamed_slow_log;
+ERROR HY000: Cannot rename 'slow_log'. When logging enabled, rename to/from log table must rename two tables: the log table to an archive table and another table back to 'slow_log'
+use test;
+flush tables with read lock;
+unlock tables;
 SET @@session.long_query_time= @old_long_query_time;
 SET @@global.log_output=       @old_log_output;
 SET @@global.slow_query_log=   @old_slow_query_log;

=== modified file 'mysql-test/t/log_tables.test'
--- a/mysql-test/t/log_tables.test	2009-11-24 11:08:04 +0000
+++ b/mysql-test/t/log_tables.test	2010-11-07 18:06:22 +0000
@@ -1034,6 +1034,25 @@ DROP TABLE t1;
 
 TRUNCATE TABLE mysql.slow_log;
 
+#
+# Bug #47924 main.log_tables times out sporadically
+#
+
+use mysql;
+# Should result in error
+--disable_warnings
+drop table if exists renamed_general_log;
+drop table if exists renamed_slow_log;
+--enable_warnings
+--error ER_CANT_RENAME_LOG_TABLE
+RENAME TABLE general_log TO renamed_general_log;
+--error ER_CANT_RENAME_LOG_TABLE
+RENAME TABLE slow_log TO renamed_slow_log;
+
+use test;
+flush tables with read lock;
+unlock tables;
+
 SET @@session.long_query_time= @old_long_query_time;
 
 SET @@global.log_output=       @old_log_output;

=== modified file 'sql/sql_rename.cc'
--- a/sql/sql_rename.cc	2010-09-16 09:11:13 +0000
+++ b/sql/sql_rename.cc	2010-11-07 18:06:22 +0000
@@ -108,7 +108,7 @@ bool mysql_rename_tables(THD *thd, TABLE
             */
             my_error(ER_CANT_RENAME_LOG_TABLE, MYF(0), ren_table->table_name,
                      ren_table->table_name);
-            DBUG_RETURN(1);
+            goto err;
           }
         }
         else
@@ -121,7 +121,7 @@ bool mysql_rename_tables(THD *thd, TABLE
             */
             my_error(ER_CANT_RENAME_LOG_TABLE, MYF(0), ren_table->table_name,
                      ren_table->table_name);
-            DBUG_RETURN(1);
+            goto err;
           }
           else
           {
@@ -139,7 +139,7 @@ bool mysql_rename_tables(THD *thd, TABLE
       else
         my_error(ER_CANT_RENAME_LOG_TABLE, MYF(0), rename_log_table[1],
                  rename_log_table[1]);
-      DBUG_RETURN(1);
+      goto err;
     }
   }
 


--===============1366940289==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/dmitry.shulga@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dmitry.shulga@stripped\
#   19snaulo1lrnw2pn
# target_branch: file:///Users/shulga/projects/mysql/mysql-5.5-\
#   bugteam/
# testament_sha1: 12f7a9ec7367f205aa6e84c0f3ed7aa9a571cc93
# timestamp: 2010-11-08 00:41:43 +0600
# source_branch: file:///Users/shulga/projects/mysql/5.1-bugteam-\
#   bug36742/
# base_revision_id: zhenxing.he@stripped\
#   dp8t74c36aim64br
# 
# Begin bundle
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
i7kinChIUJFFC4A=


--===============1366940289==--