List:Commits« Previous MessageNext Message »
From:Sergei Golubchik Date:April 14 2009 12:17pm
Subject:bzr commit into mysql-6.0 branch (serg:2736) Bug#44137
View as plain text  
#At file:///usr/home/serg/Abk/mysql/6.0-maria/ based on revid:serg@stripped

 2736 Sergei Golubchik	2009-04-14
      Bug #44137 Transactional DDL locking broke dynamic plugins
      remove all mdl lock requests from the memory root before
      it's reset in the read_record loop

    modified:
      mysql-test/r/plugin.result
      mysql-test/t/plugin.test
      sql/sql_plugin.cc
=== modified file 'mysql-test/r/plugin.result'
--- a/mysql-test/r/plugin.result	2008-10-17 14:13:24 +0000
+++ b/mysql-test/r/plugin.result	2009-04-14 12:17:34 +0000
@@ -53,4 +53,7 @@ select @@global.example_ulong_var;
 set session sql_mode=@old_sql_mode;
 set session old=bla;
 ERROR HY000: Variable 'old' is a read only variable
+SELECT @@global.example_enum_var = 'e2';
+@@global.example_enum_var = 'e2'
+0
 UNINSTALL PLUGIN example;

=== modified file 'mysql-test/t/plugin.test'
--- a/mysql-test/t/plugin.test	2008-02-24 13:12:17 +0000
+++ b/mysql-test/t/plugin.test	2009-04-14 12:17:34 +0000
@@ -73,4 +73,11 @@ set session sql_mode=@old_sql_mode;
 --error ER_INCORRECT_GLOBAL_LOCAL_VAR
 set session old=bla;
 
+#
+# try to restart the server - plugin should be loaded after restart
+#
+--source include/restart_mysqld.inc
+SELECT @@global.example_enum_var = 'e2';
+
 UNINSTALL PLUGIN example;
+

=== modified file 'sql/sql_plugin.cc'
--- a/sql/sql_plugin.cc	2009-04-07 20:19:26 +0000
+++ b/sql/sql_plugin.cc	2009-04-14 12:17:34 +0000
@@ -1374,6 +1374,7 @@ static void plugin_load(MEM_ROOT *tmp_ro
                     "run mysql_upgrade to create it.");
     goto end;
   }
+  new_thd->mdl_context.remove_all_requests();
   table= tables.table;
   init_read_record(&read_record_info, new_thd, table, NULL, 1, 0, FALSE);
   table->use_all_columns();


Attachment: [text/bzr-bundle] bzr/serg@mysql.com-20090414121734-szqdvyblbzz6exh1.bundle
Thread
bzr commit into mysql-6.0 branch (serg:2736) Bug#44137Sergei Golubchik14 Apr