List:Commits« Previous MessageNext Message »
From:Konstantin Osipov Date:June 8 2010 12:20pm
Subject:bzr commit into mysql-trunk-runtime branch (kostja:3046)
View as plain text  
#At file:///opt/local/work/trunk-runtime-4441/ based on revid:kostja@stripped

 3046 Konstantin Osipov	2010-06-08 [merge]
      Merge with trunk-runtime.

    modified:
      mysql-test/r/drop.result
      mysql-test/t/drop.test
      sql/sql_yacc.yy
=== modified file 'mysql-test/r/drop.result'
--- a/mysql-test/r/drop.result	2010-02-04 17:34:15 +0000
+++ b/mysql-test/r/drop.result	2010-06-07 15:27:40 +0000
@@ -157,3 +157,13 @@ Error	1051	Unknown table 't1'
 # --
 # -- End of Bug#37431.
 # --
+#
+# Bug#54282 Crash in MDL_context::upgrade_shared_lock_to_exclusive
+#
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (a INT);
+LOCK TABLE t1 WRITE;
+DROP TABLE t1, t1;
+ERROR 42000: Not unique table/alias: 't1'
+UNLOCK TABLES;
+DROP TABLE t1;

=== modified file 'mysql-test/t/drop.test'
--- a/mysql-test/t/drop.test	2010-01-12 15:15:21 +0000
+++ b/mysql-test/t/drop.test	2010-06-07 15:27:40 +0000
@@ -256,3 +256,20 @@ SHOW WARNINGS;
 --echo # --
 --echo # -- End of Bug#37431.
 --echo # --
+
+
+--echo #
+--echo # Bug#54282 Crash in MDL_context::upgrade_shared_lock_to_exclusive
+--echo #
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+CREATE TABLE t1 (a INT);
+LOCK TABLE t1 WRITE;
+--error ER_NONUNIQ_TABLE
+DROP TABLE t1, t1;
+
+UNLOCK TABLES;
+DROP TABLE t1;

=== modified file 'sql/sql_yacc.yy'
--- a/sql/sql_yacc.yy	2010-06-06 11:19:29 +0000
+++ b/sql/sql_yacc.yy	2010-06-07 15:27:40 +0000
@@ -10151,7 +10151,7 @@ drop:
             lex->sql_command = SQLCOM_DROP_TABLE;
             lex->drop_temporary= $2;
             lex->drop_if_exists= $4;
-            YYPS->m_lock_type= TL_IGNORE;
+            YYPS->m_lock_type= TL_UNLOCK;
             YYPS->m_mdl_type= MDL_EXCLUSIVE;
           }
           table_list opt_restrict
@@ -10244,7 +10244,7 @@ drop:
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_DROP_VIEW;
             lex->drop_if_exists= $3;
-            YYPS->m_lock_type= TL_IGNORE;
+            YYPS->m_lock_type= TL_UNLOCK;
             YYPS->m_mdl_type= MDL_EXCLUSIVE;
           }
           table_list opt_restrict


Attachment: [text/bzr-bundle] bzr/kostja@sun.com-20100608122015-l6xpo080ov8bq3u3.bundle
Thread
bzr commit into mysql-trunk-runtime branch (kostja:3046)Konstantin Osipov8 Jun