Merge lp:~sergei.glushchenko/percona-server/5.6-ST36241-ps-bug1011047 into lp:percona-server/5.6

[Sergei Glushchenko]

Initialize userstats a bit earlier
http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/396/

[Sergei Glushchenko (sergei.glushchenko)]

I'd also like to note that I turned on example plugin in cake options for 5.6 builds in our Jenkins. It is turned off by default in 5.6.

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== added file 'Percona-Server/mysql-test/r/bug1011047.result'
--- Percona-Server/mysql-test/r/bug1011047.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/bug1011047.result	2013-10-30 10:01:33 +0000
@@ -0,0 +1,10 @@
+show variables like 'userstat%';
+Variable_name	Value
+userstat	ON
+INSTALL PLUGIN example SONAME 'ha_example.so';
+show variables like 'userstat%';
+Variable_name	Value
+userstat	ON
+CREATE TABLE t1(a int) ENGINE=EXAMPLE;
+DROP TABLE t1;
+UNINSTALL PLUGIN example;

=== added file 'Percona-Server/mysql-test/t/bug1011047-master.opt'
--- Percona-Server/mysql-test/t/bug1011047-master.opt	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/bug1011047-master.opt	2013-10-30 10:01:33 +0000
@@ -0,0 +1,1 @@
+$EXAMPLE_PLUGIN_OPT --userstat
\ No newline at end of file

=== added file 'Percona-Server/mysql-test/t/bug1011047.test'
--- Percona-Server/mysql-test/t/bug1011047.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/bug1011047.test	2013-10-30 10:01:33 +0000
@@ -0,0 +1,18 @@
+#
+# Bug 1011047: mysqld can't startup when a plugin was installed
+#
+
+--source include/have_example_plugin.inc
+
+show variables like 'userstat%';
+
+--replace_regex /\.dll/.so/
+eval INSTALL PLUGIN example SONAME '$EXAMPLE_PLUGIN';
+
+--source include/restart_mysqld.inc
+show variables like 'userstat%';
+
+CREATE TABLE t1(a int) ENGINE=EXAMPLE;
+DROP TABLE t1;
+
+UNINSTALL PLUGIN example;

=== modified file 'Percona-Server/sql/mysqld.cc'
--- Percona-Server/sql/mysqld.cc	2013-10-23 08:52:03 +0000
+++ Percona-Server/sql/mysqld.cc	2013-10-30 10:01:33 +0000
@@ -4707,6 +4707,11 @@
   init_slave_list();
 #endif
 
+#ifndef EMBEDDED_LIBRARY
+  init_global_table_stats();
+  init_global_index_stats();
+#endif
+
   /* Setup logs */
 
   /*
@@ -4974,11 +4979,6 @@
   if (!DEFAULT_ERRMSGS[0][0])
     unireg_abort(1);
 
-#ifndef EMBEDDED_LIBRARY
-  init_global_table_stats();
-  init_global_index_stats();
-#endif
-
   /* We have to initialize the storage engines before CSV logging */
 
   if (ha_init())