Replay c2996 on top of the new storage/innobase

storage/innobase/handler/ha_innodb.cc

@@ -43,11 +43,14 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 #pragma implementation				// gcc: Class implementation
 #endif
 
-#include <mysql_priv.h>
+#include <sql_table.h>	// explain_filename, nz2, EXPLAIN_PARTITIONS_AS_COMMENT,
+			// EXPLAIN_FILENAME_MAX_EXTRA_LENGTH
 
+#include <sql_acl.h>	// PROCESS_ACL
 #include <m_ctype.h>
 #include <mysys_err.h>
 #include <mysql/plugin.h>
+#include <mysql/innodb_priv.h>
 #include <mysql/psi/psi.h>
 
 /** @file ha_innodb.cc */
@@ -89,7 +92,6 @@ extern "C" {
 #include "ha_innodb.h"
 #include "i_s.h"
 
-#ifndef MYSQL_SERVER
 # ifndef MYSQL_PLUGIN_IMPORT
 #  define MYSQL_PLUGIN_IMPORT /* nothing */
 # endif /* MYSQL_PLUGIN_IMPORT */
@@ -99,7 +101,6 @@ extern "C" {
 but we need it here */
 bool check_global_access(THD *thd, ulong want_access);
 #endif /* MYSQL_VERSION_ID < 50124 */
-#endif /* MYSQL_SERVER */
 
 /** to protect innobase_open_files */
 static mysql_mutex_t innobase_share_mutex;

storage/innobase/handler/handler0alter.cc

@@ -21,8 +21,10 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 Smart ALTER TABLE
 *******************************************************/
 
-#include <mysql_priv.h>
+#include <unireg.h>
 #include <mysqld_error.h>
+#include <sql_lex.h>                            // SQLCOM_CREATE_INDEX
+#include <mysql/innodb_priv.h>
 
 extern "C" {
 #include "log0log.h"

storage/innobase/handler/i_s.cc

@@ -23,8 +23,8 @@ InnoDB INFORMATION SCHEMA tables interface to MySQL.
 Created July 18, 2007 Vasil Dimov
 *******************************************************/
 
-#include <mysql_priv.h>
 #include <mysqld_error.h>
+#include <sql_acl.h>                            // PROCESS_ACL
 
 #include <m_ctype.h>
 #include <hash.h>
@@ -32,7 +32,8 @@ Created July 18, 2007 Vasil Dimov
 #include <mysys_err.h>
 #include <my_sys.h>
 #include "i_s.h"
-#include <mysql/plugin.h>
+#include <sql_plugin.h>
+#include <mysql/innodb_priv.h>
 
 extern "C" {
 #include "trx0i_s.h"

storage/innobase/handler/mysql_addons.cc

@@ -36,7 +36,7 @@ Created November 07, 2007 Vasil Dimov
 #define MYSQL_SERVER
 #endif /* MYSQL_SERVER */
 
-#include <mysql_priv.h>
+#include <sql_priv.h>
 
 #include "mysql_addons.h"
 #include "univ.i"