List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:August 18 2011 9:40am
Subject:bzr push into mysql-trunk branch (Georgi.Kodinov:3384 to 3385) Bug#11766001
View as plain text  
 3385 Georgi Kodinov	2011-08-18
      Addendum to the suite for bug #11766001 : 59026: ALLOW MULTIPLE --PLUGIN-LOAD OPTIONS
      
      1. Use the correct case for the mysql.plugin table reference in tests.
      2. Add a note into the mysql-test.run.pl docs comments for PLUGVAR_LOAD_ADD.

    modified:
      mysql-test/include/plugin.defs
      mysql-test/r/multi_plugin_load_add.result
      mysql-test/r/multi_plugin_load_add2.result
      mysql-test/t/multi_plugin_load_add.test
      mysql-test/t/multi_plugin_load_add2.test
 3384 Vasil Dimov	2011-08-18
      Revert vasil.dimov@stripped it is
      suspected for causing crashes and I do not have time right now to look
      at it. Will come back to this after the tree has stabilized.

    modified:
      sql/sql_class.cc
=== modified file 'mysql-test/include/plugin.defs'
--- a/mysql-test/include/plugin.defs	2011-07-19 14:17:58 +0000
+++ b/mysql-test/include/plugin.defs	2011-08-18 09:39:24 +0000
@@ -9,6 +9,7 @@
 # PLUGVAR_DIR: name of directory where plugin was found
 # PLUGVAR_OPT: mysqld option --plugin_dir=....
 # PLUGVAR_LOAD: option --plugin_load=.... if the 4th element is present
+# PLUGVAR_LOAD_ADD: option --plugin_load_add=.... if the 4th element is present
 #
 # If a listed plugin is not found, the corresponding variables will be
 # set to empty, they will not be unset.

=== modified file 'mysql-test/r/multi_plugin_load_add.result'
--- a/mysql-test/r/multi_plugin_load_add.result	2011-08-18 08:31:08 +0000
+++ b/mysql-test/r/multi_plugin_load_add.result	2011-08-18 09:39:24 +0000
@@ -10,5 +10,5 @@ ORDER BY 1;
 PLUGIN_NAME	PLUGIN_STATUS
 qa_auth_server	ACTIVE
 test_plugin_server	ACTIVE
-SELECT * FROM MYSQL.PLUGIN ORDER BY name;
+SELECT * FROM mysql.plugin ORDER BY name;
 name	dl

=== modified file 'mysql-test/r/multi_plugin_load_add2.result'
--- a/mysql-test/r/multi_plugin_load_add2.result	2011-08-18 08:31:08 +0000
+++ b/mysql-test/r/multi_plugin_load_add2.result	2011-08-18 09:39:24 +0000
@@ -10,5 +10,5 @@ ORDER BY 1;
 PLUGIN_NAME	PLUGIN_STATUS
 qa_auth_server	ACTIVE
 test_plugin_server	ACTIVE
-SELECT * FROM MYSQL.PLUGIN ORDER BY name;
+SELECT * FROM mysql.plugin ORDER BY name;
 name	dl

=== modified file 'mysql-test/t/multi_plugin_load_add.test'
--- a/mysql-test/t/multi_plugin_load_add.test	2011-08-18 08:31:08 +0000
+++ b/mysql-test/t/multi_plugin_load_add.test	2011-08-18 09:39:24 +0000
@@ -10,4 +10,4 @@
 SELECT PLUGIN_NAME, PLUGIN_STATUS FROM INFORMATION_SCHEMA.PLUGINS
   WHERE PLUGIN_NAME IN ('test_plugin_server', 'qa_auth_server')
   ORDER BY 1;
-SELECT * FROM MYSQL.PLUGIN ORDER BY name;  
+SELECT * FROM mysql.plugin ORDER BY name;  

=== modified file 'mysql-test/t/multi_plugin_load_add2.test'
--- a/mysql-test/t/multi_plugin_load_add2.test	2011-08-18 08:31:08 +0000
+++ b/mysql-test/t/multi_plugin_load_add2.test	2011-08-18 09:39:24 +0000
@@ -10,4 +10,4 @@
 SELECT PLUGIN_NAME, PLUGIN_STATUS FROM INFORMATION_SCHEMA.PLUGINS
   WHERE PLUGIN_NAME IN ('test_plugin_server', 'qa_auth_server')
   ORDER BY 1;
-SELECT * FROM MYSQL.PLUGIN ORDER BY name;  
+SELECT * FROM mysql.plugin ORDER BY name;  

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (Georgi.Kodinov:3384 to 3385) Bug#11766001Georgi Kodinov22 Aug