Merge lp:~stewart/percona-server/bug1011047 into lp:percona-server/5.5

[Stewart Smith]

Fix "can't start server with plugins loaded" bug. Basically, we were initing the userstats features too late.

http://jenkins.percona.com/view/PS%205.5/job/percona-server-5.5-param/477/

[Laurynas Biveinis (laurynas-biveinis)]

Stewart -

1) Can you reconcile your have_example_plugin.inc fix with Bjorn's reply to you on mysql-internals?
2) Why a simple --source include/restart_mysqld.inc is not enough to replace lines 119--135?
3) Line 98 has "Edit" at the end, a copy paste from somewhere?

review: Needs Fixing

Unmerged revisions

294. By Stewart Smith on 2012-08-24

Add a test for server not starting with userstats enabled/plugin installed (bug lp:1011047)

293. By Stewart Smith on 2012-08-24

fix bug: 'mysqld can't startup when a plugin was installed'. table and index statistics were inited too late, they instead need to be inited *before* plugins.

292. By Stewart Smith on 2012-08-24

fix mysql-test/include/have_example_plugin.inc so that it's compatible with MTRv2 and detects EXAMPLE_PLUGIN_OPT instead of EXAMPLE_PLUGIN.

=== modified file 'Percona-Server/mysql-test/include/have_example_plugin.inc'
--- Percona-Server/mysql-test/include/have_example_plugin.inc	2012-01-20 11:35:48 +0000
+++ Percona-Server/mysql-test/include/have_example_plugin.inc	2012-08-24 04:41:23 +0000
@@ -8,8 +8,8 @@
 #
 # Check if the variable EXAMPLE_PLUGIN is set
 #
-if (!$EXAMPLE_PLUGIN) {
-  --skip Example plugin requires the environment variable \$EXAMPLE_PLUGIN to be set (normally done by mtr)
+if (!$EXAMPLE_PLUGIN_OPT) {
+  --skip Requires Example plugin to be built
 }
 
 #

=== added file 'Percona-Server/mysql-test/r/percona_plugin_with_userstats.result'
--- Percona-Server/mysql-test/r/percona_plugin_with_userstats.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_plugin_with_userstats.result	2012-08-24 04:41:23 +0000
@@ -0,0 +1,65 @@
+CREATE TABLE t1(a int) ENGINE=EXAMPLE;
+Warnings:
+Warning	1286	Unknown storage engine 'EXAMPLE'
+Warning	1266	Using storage engine MyISAM for table 't1'
+DROP TABLE t1;
+INSTALL PLUGIN example SONAME 'ha_example.so';
+INSTALL PLUGIN EXAMPLE SONAME 'ha_example.so';
+ERROR HY000: Function 'EXAMPLE' already exists
+UNINSTALL PLUGIN example;
+INSTALL PLUGIN example SONAME 'ha_example.so';
+CREATE TABLE t1(a int) ENGINE=EXAMPLE;
+SELECT * FROM t1;
+a
+DROP TABLE t1;
+set global example_ulong_var=500;
+set global example_enum_var= e1;
+show status like 'example%';
+Variable_name	Value
+example_func_example	enum_var is 0, ulong_var is 500, really
+show variables like 'example%';
+Variable_name	Value
+example_enum_var	e1
+example_ulong_var	500
+UNINSTALL PLUGIN example;
+UNINSTALL PLUGIN EXAMPLE;
+ERROR 42000: PLUGIN EXAMPLE does not exist
+UNINSTALL PLUGIN non_exist;
+ERROR 42000: PLUGIN non_exist does not exist
+#
+# Bug#32034: check_func_enum() does not check correct values but set it
+#            to impossible int val
+#
+INSTALL PLUGIN example SONAME 'ha_example.so';
+SET GLOBAL example_enum_var= e1;
+SET GLOBAL example_enum_var= e2;
+SET GLOBAL example_enum_var= impossible;
+ERROR 42000: Variable 'example_enum_var' can't be set to the value of 'impossible'
+UNINSTALL PLUGIN example;
+INSTALL PLUGIN example SONAME 'ha_example.so';
+select @@session.sql_mode into @old_sql_mode;
+set session sql_mode='';
+set global example_ulong_var=500;
+select @@global.example_ulong_var;
+@@global.example_ulong_var
+500
+set global example_ulong_var=1111;
+Warnings:
+Warning	1292	Truncated incorrect example_ulong_var value: '1111'
+select @@global.example_ulong_var;
+@@global.example_ulong_var
+1000
+set session sql_mode='STRICT_ALL_TABLES';
+set global example_ulong_var=500;
+select @@global.example_ulong_var;
+@@global.example_ulong_var
+500
+set global example_ulong_var=1111;
+ERROR 42000: Variable 'example_ulong_var' can't be set to the value of '1111'
+select @@global.example_ulong_var;
+@@global.example_ulong_var
+500
+set session sql_mode=@old_sql_mode;
+set session old=bla;
+ERROR HY000: Variable 'old' is a read only variable
+UNINSTALL PLUGIN example;

=== added file 'Percona-Server/mysql-test/t/percona_plugin_with_userstats-master.opt'
--- Percona-Server/mysql-test/t/percona_plugin_with_userstats-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_plugin_with_userstats-master.opt	2012-08-24 04:41:23 +0000
@@ -0,0 +1,2 @@
+$EXAMPLE_PLUGIN_OPT
+--userstat

=== added file 'Percona-Server/mysql-test/t/percona_plugin_with_userstats.test'
--- Percona-Server/mysql-test/t/percona_plugin_with_userstats.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_plugin_with_userstats.test	2012-08-24 04:41:23 +0000
@@ -0,0 +1,115 @@
+# This is a test for Bug lp:1011047
+# mysqld can't startup when a plugin was installed Edit
+#
+# It is copied from plugin.test, except that we restart the
+# server in the middle, which on a server without the fix for this bug,
+# will cause the test to fail (server crash).
+#
+# The critical difference is *enabling* --userstat as a server option
+# as otherwise things work just fine
+
+--source include/not_windows_embedded.inc
+--source include/have_example_plugin.inc
+
+CREATE TABLE t1(a int) ENGINE=EXAMPLE;
+DROP TABLE t1;
+
+--replace_regex /\.dll/.so/
+eval INSTALL PLUGIN example SONAME '$EXAMPLE_PLUGIN';
+--replace_regex /\.dll/.so/
+--error 1125
+eval INSTALL PLUGIN EXAMPLE SONAME '$EXAMPLE_PLUGIN';
+
+let $expect_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
+# MTR will remove this file later, but this might be too late.
+--error 0,1
+--remove_file $expect_file
+--write_file $expect_file
+wait
+EOF
+--shutdown_server 10
+--source include/wait_until_disconnected.inc
+#
+# Restart the server
+#
+--append_file $expect_file
+restart
+EOF
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+UNINSTALL PLUGIN example;
+
+--replace_regex /\.dll/.so/
+eval INSTALL PLUGIN example SONAME '$EXAMPLE_PLUGIN';
+
+CREATE TABLE t1(a int) ENGINE=EXAMPLE;
+
+# Let's do some advanced ops with the example engine :)
+SELECT * FROM t1;
+
+DROP TABLE t1;
+
+# a couple of tests for variables
+set global example_ulong_var=500;
+set global example_enum_var= e1;
+show status like 'example%';
+show variables like 'example%';
+
+UNINSTALL PLUGIN example;
+--error 1305
+UNINSTALL PLUGIN EXAMPLE;
+
+--error 1305
+UNINSTALL PLUGIN non_exist;
+
+
+--echo #
+--echo # Bug#32034: check_func_enum() does not check correct values but set it
+--echo #            to impossible int val
+--echo #
+--replace_regex /\.dll/.so/
+eval INSTALL PLUGIN example SONAME '$EXAMPLE_PLUGIN';
+
+SET GLOBAL example_enum_var= e1;
+SET GLOBAL example_enum_var= e2;
+--error 1231
+SET GLOBAL example_enum_var= impossible;
+
+UNINSTALL PLUGIN example;
+
+
+
+#
+# Bug #32757 hang with sql_mode set when setting some global variables
+#
+--replace_regex /\.dll/.so/
+eval INSTALL PLUGIN example SONAME '$EXAMPLE_PLUGIN';
+
+select @@session.sql_mode into @old_sql_mode;
+
+# first, try normal sql_mode (no error, send OK)
+set session sql_mode='';
+set global example_ulong_var=500;
+select @@global.example_ulong_var;
+# overflow -- correct value, but throw warning
+set global example_ulong_var=1111;
+select @@global.example_ulong_var;
+
+# now, try STRICT (error occurrs, no message is sent, so send default)
+set session sql_mode='STRICT_ALL_TABLES';
+set global example_ulong_var=500;
+select @@global.example_ulong_var;
+# overflow -- throw warning, do NOT change value
+--error ER_WRONG_VALUE_FOR_VAR
+set global example_ulong_var=1111;
+select @@global.example_ulong_var;
+
+set session sql_mode=@old_sql_mode;
+
+# finally, show that conditions that already raised an error are not
+# adversely affected (error was already sent, do nothing)
+--error ER_INCORRECT_GLOBAL_LOCAL_VAR
+set session old=bla;
+
+UNINSTALL PLUGIN example;

=== modified file 'Percona-Server/sql/mysqld.cc'
--- Percona-Server/sql/mysqld.cc	2012-08-07 06:10:00 +0000
+++ Percona-Server/sql/mysqld.cc	2012-08-24 04:41:23 +0000
@@ -3790,6 +3790,9 @@
   init_slave_list();
 #endif
 
+  init_global_table_stats();
+  init_global_index_stats();
+
   /* Setup logs */
 
   /*
@@ -4007,9 +4010,6 @@
   /* We have to initialize the storage engines before CSV logging */
   TC_init();
 
-  init_global_table_stats();
-  init_global_index_stats();
-
   if (ha_init())
   {
     sql_print_error("Can't init databases");