Merge lp:~gl-az/percona-server/BT-23310-bug1218664-5.6 into lp:percona-server/5.6

[George Ormond Lorch III]

Merge from 5.5:

Fix for https://bugs.launchpad.net/percona-server/+bug/1233354 - enforce-storage-engine causes mysqld to error on shutdown
  Fixed by calling plugin_unlock in plugin name and default checking in mysqld.cc where enforce_storage_engine name is being validated.

Fix for https://bugs.launchpad.net/percona-server/+bug/1236938 - enforce-storage-engine should not apply when server started in bootstrap or skip-gtant-tables
  Fixed by ignoring enforcement if opt_bootstrap || opt_noacl.

Same code as previous MP but bzr commit message has been fixed and branch linked to the issues directly addressed by the code changes.

[George Ormond Lorch III (gl-az)]

Fixed as discussed on IRC, fixed newly discovered bug, jenkins:
http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/331/

[George Ormond Lorch III (gl-az)]

Ohh yeah, forgot to mention. Complete cycle from mysql_install_db through mysql_upgrade (with --skip-grant-tables) tested locally under valgrind with enforce-storage-engine=innodb in all my.cnf works perfectly now.

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'Percona-Server/sql/mysqld.cc'
--- Percona-Server/sql/mysqld.cc	2013-10-01 13:00:50 +0000
+++ Percona-Server/sql/mysqld.cc	2013-10-08 16:22:02 +0000
@@ -4945,7 +4945,7 @@
   /*
     Validate any enforced storage engine
   */
-  if (enforce_storage_engine)
+  if (enforce_storage_engine && !opt_bootstrap && !opt_noacl)
   {
     LEX_STRING name= { enforce_storage_engine,
       strlen(enforce_storage_engine) };
@@ -4968,6 +4968,8 @@
             enforce_storage_engine);
         }
       }
+      plugin_unlock(0, defplugin);
+      plugin_unlock(0, plugin);
     }
     else
     {

=== modified file 'Percona-Server/sql/sql_table.cc'
--- Percona-Server/sql/sql_table.cc	2013-08-14 03:57:21 +0000
+++ Percona-Server/sql/sql_table.cc	2013-10-08 16:22:02 +0000
@@ -56,6 +56,7 @@
 #include "sql_resolver.h"              // setup_order, fix_inner_refs
 #include "table_cache.h"
 #include <mysql/psi/mysql_table.h>
+#include "mysql.h"			// in_bootstrap & opt_noacl
 
 #ifdef __WIN__
 #include <io.h>
@@ -9313,11 +9314,14 @@
   DBUG_ENTER("check_engine");
   handlerton **new_engine= &create_info->db_type;
   handlerton *req_engine= *new_engine;
-  handlerton *enf_engine= ha_enforce_handlerton(thd);
+  handlerton *enf_engine= NULL;
 
   bool no_substitution=
         test(thd->variables.sql_mode & MODE_NO_ENGINE_SUBSTITUTION);
 
+  if (!in_bootstrap && !opt_noacl)
+    enf_engine= ha_enforce_handlerton(thd);
+
   if (!(*new_engine= ha_checktype(thd, ha_legacy_type(req_engine),
                                   no_substitution, 1)))
     DBUG_RETURN(true);