387 files changed, 18 insertions, 18 deletions

diff --git a/storage/innodb_plugin/CMakeLists.txt b/storage/innobase/CMakeLists.txt
index 7762ece9bcd..fa951657a79 100644
--- a/storage/innodb_plugin/CMakeLists.txt
+++ b/storage/innobase/CMakeLists.txt
@@ -23,9 +23,9 @@ IF (CMAKE_SIZEOF_VOID_P MATCHES 8)
 	SET(WIN64 TRUE)
 ENDIF (CMAKE_SIZEOF_VOID_P MATCHES 8)
 
-# Include directories under innodb_plugin
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/innodb_plugin/include
-		    ${CMAKE_SOURCE_DIR}/storage/innodfb_plugin/handler)
+# Include directories under innobase
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/innobase/include
+		    ${CMAKE_SOURCE_DIR}/storage/innobase/handler)
 
 # Include directories under mysql
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
@@ -41,7 +41,7 @@ IF(MSVC AND $(WIN64))
 				    PROPERTIES COMPILE_FLAGS -Od)
 ENDIF(MSVC AND $(WIN64))
 
-SET(INNODB_PLUGIN_SOURCES	btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c
+SET(INNOBASE_SOURCES	btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c
 			buf/buf0buddy.c buf/buf0buf.c buf/buf0flu.c buf/buf0lru.c buf/buf0rea.c
 			data/data0data.c data/data0type.c
 			dict/dict0boot.c dict/dict0crea.c dict/dict0dict.c dict/dict0load.c dict/dict0mem.c
@@ -75,4 +75,4 @@ SET(INNODB_PLUGIN_SOURCES	btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea
 			ut/ut0byte.c ut/ut0dbg.c ut/ut0mem.c ut/ut0rnd.c ut/ut0ut.c ut/ut0vec.c
 			ut/ut0list.c ut/ut0wqueue.c)
 ADD_DEFINITIONS(-DHAVE_WINDOWS_ATOMICS -DINNODB_RW_LOCKS_USE_ATOMICS -DIB_HAVE_PAUSE_INSTRUCTION)
-MYSQL_STORAGE_ENGINE(INNODB_PLUGIN)
\ No newline at end of file
+MYSQL_STORAGE_ENGINE(INNOBASE)
\ No newline at end of file
diff --git a/storage/innodb_plugin/COPYING b/storage/innobase/COPYING
index 6b106e18fdb..6b106e18fdb 100644
--- a/storage/innodb_plugin/COPYING
+++ b/storage/innobase/COPYING
diff --git a/storage/innodb_plugin/COPYING.Google b/storage/innobase/COPYING.Google
index 5ade2b0e381..5ade2b0e381 100644
--- a/storage/innodb_plugin/COPYING.Google
+++ b/storage/innobase/COPYING.Google
diff --git a/storage/innodb_plugin/COPYING.Percona b/storage/innobase/COPYING.Percona
index 8c786811719..8c786811719 100644
--- a/storage/innodb_plugin/COPYING.Percona
+++ b/storage/innobase/COPYING.Percona
diff --git a/storage/innodb_plugin/COPYING.Sun_Microsystems b/storage/innobase/COPYING.Sun_Microsystems
index 5a77ef3ab73..5a77ef3ab73 100644
--- a/storage/innodb_plugin/COPYING.Sun_Microsystems
+++ b/storage/innobase/COPYING.Sun_Microsystems
diff --git a/storage/innodb_plugin/ChangeLog b/storage/innobase/ChangeLog
index 2b04c06f0e8..2b04c06f0e8 100644
--- a/storage/innodb_plugin/ChangeLog
+++ b/storage/innobase/ChangeLog
diff --git a/storage/innodb_plugin/Doxyfile b/storage/innobase/Doxyfile
index 62aa7dd8abc..62aa7dd8abc 100644
--- a/storage/innodb_plugin/Doxyfile
+++ b/storage/innobase/Doxyfile
diff --git a/storage/innodb_plugin/Makefile.am b/storage/innobase/Makefile.am
index 50a3c1e6cab..26f6b741227 100644
--- a/storage/innodb_plugin/Makefile.am
+++ b/storage/innobase/Makefile.am
@@ -229,7 +229,7 @@ noinst_HEADERS=		\
 			mem/mem0dbg.c
 
 EXTRA_LIBRARIES=	libinnobase.a
-noinst_LIBRARIES=	@plugin_innodb_plugin_static_target@
+noinst_LIBRARIES=	@plugin_innobase_static_target@
 libinnobase_a_SOURCES=	\
 			btr/btr0btr.c			\
 			btr/btr0cur.c			\
@@ -327,13 +327,13 @@ libinnobase_a_SOURCES=	\
 libinnobase_a_CXXFLAGS=	$(AM_CFLAGS)
 libinnobase_a_CFLAGS=	$(AM_CFLAGS)
 
-EXTRA_LTLIBRARIES=	ha_innodb_plugin.la
-pkgplugin_LTLIBRARIES=	@plugin_innodb_plugin_shared_target@
+EXTRA_LTLIBRARIES=	ha_innodb.la
+pkgplugin_LTLIBRARIES=	@plugin_innobase_shared_target@
 
-ha_innodb_plugin_la_LDFLAGS=	-module -rpath $(pkgplugindir)
-ha_innodb_plugin_la_CXXFLAGS=	$(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
-ha_innodb_plugin_la_CFLAGS=	$(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
-ha_innodb_plugin_la_SOURCES=	$(libinnobase_a_SOURCES)
+ha_innodb_la_LDFLAGS=	-module -rpath $(pkgplugindir)
+ha_innodb_la_CXXFLAGS=	$(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+ha_innodb_la_CFLAGS=	$(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+ha_innodb_la_SOURCES=	$(libinnobase_a_SOURCES)
 
 EXTRA_DIST=		CMakeLists.txt plug.in \
 			pars/make_bison.sh pars/make_flex.sh \
diff --git a/storage/innodb_plugin/README b/storage/innobase/README
index 56aa8058224..56aa8058224 100644
--- a/storage/innodb_plugin/README
+++ b/storage/innobase/README
diff --git a/storage/innodb_plugin/btr/btr0btr.c b/storage/innobase/btr/btr0btr.c
index 6ba9b36207b..6ba9b36207b 100644
--- a/storage/innodb_plugin/btr/btr0btr.c
+++ b/storage/innobase/btr/btr0btr.c
diff --git a/storage/innodb_plugin/btr/btr0cur.c b/storage/innobase/btr/btr0cur.c
index 46dfb5d1a46..46dfb5d1a46 100644
--- a/storage/innodb_plugin/btr/btr0cur.c
+++ b/storage/innobase/btr/btr0cur.c
diff --git a/storage/innodb_plugin/btr/btr0pcur.c b/storage/innobase/btr/btr0pcur.c
index ec98692c35b..ec98692c35b 100644
--- a/storage/innodb_plugin/btr/btr0pcur.c
+++ b/storage/innobase/btr/btr0pcur.c
diff --git a/storage/innodb_plugin/btr/btr0sea.c b/storage/innobase/btr/btr0sea.c
index faa1c13897e..faa1c13897e 100644
--- a/storage/innodb_plugin/btr/btr0sea.c
+++ b/storage/innobase/btr/btr0sea.c
diff --git a/storage/innodb_plugin/buf/buf0buddy.c b/storage/innobase/buf/buf0buddy.c
index f0e1395c307..f0e1395c307 100644
--- a/storage/innodb_plugin/buf/buf0buddy.c
+++ b/storage/innobase/buf/buf0buddy.c
diff --git a/storage/innodb_plugin/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
index 0008fcb1271..0008fcb1271 100644
--- a/storage/innodb_plugin/buf/buf0buf.c
+++ b/storage/innobase/buf/buf0buf.c
diff --git a/storage/innodb_plugin/buf/buf0flu.c b/storage/innobase/buf/buf0flu.c
index 74dd0c07ca6..74dd0c07ca6 100644
--- a/storage/innodb_plugin/buf/buf0flu.c
+++ b/storage/innobase/buf/buf0flu.c
diff --git a/storage/innodb_plugin/buf/buf0lru.c b/storage/innobase/buf/buf0lru.c
index be53a5f5d9d..be53a5f5d9d 100644
--- a/storage/innodb_plugin/buf/buf0lru.c
+++ b/storage/innobase/buf/buf0lru.c
diff --git a/storage/innodb_plugin/buf/buf0rea.c b/storage/innobase/buf/buf0rea.c
index 319d6b2a522..319d6b2a522 100644
--- a/storage/innodb_plugin/buf/buf0rea.c
+++ b/storage/innobase/buf/buf0rea.c
diff --git a/storage/innodb_plugin/compile-innodb b/storage/innobase/compile-innodb
index 82601f03ae9..82601f03ae9 100755
--- a/storage/innodb_plugin/compile-innodb
+++ b/storage/innobase/compile-innodb
diff --git a/storage/innodb_plugin/compile-innodb-debug b/storage/innobase/compile-innodb-debug
index efb4abf88d5..efb4abf88d5 100755
--- a/storage/innodb_plugin/compile-innodb-debug
+++ b/storage/innobase/compile-innodb-debug
diff --git a/storage/innodb_plugin/data/data0data.c b/storage/innobase/data/data0data.c
index e3c1f1b4f23..e3c1f1b4f23 100644
--- a/storage/innodb_plugin/data/data0data.c
+++ b/storage/innobase/data/data0data.c
diff --git a/storage/innodb_plugin/data/data0type.c b/storage/innobase/data/data0type.c
index 8429775e7d8..8429775e7d8 100644
--- a/storage/innodb_plugin/data/data0type.c
+++ b/storage/innobase/data/data0type.c
diff --git a/storage/innodb_plugin/dict/dict0boot.c b/storage/innobase/dict/dict0boot.c
index e55de30481b..e55de30481b 100644
--- a/storage/innodb_plugin/dict/dict0boot.c
+++ b/storage/innobase/dict/dict0boot.c
diff --git a/storage/innodb_plugin/dict/dict0crea.c b/storage/innobase/dict/dict0crea.c
index 7bad4d2057e..7bad4d2057e 100644
--- a/storage/innodb_plugin/dict/dict0crea.c
+++ b/storage/innobase/dict/dict0crea.c
diff --git a/storage/innodb_plugin/dict/dict0dict.c b/storage/innobase/dict/dict0dict.c
index d1f0e0ffc19..d1f0e0ffc19 100644
--- a/storage/innodb_plugin/dict/dict0dict.c
+++ b/storage/innobase/dict/dict0dict.c
diff --git a/storage/innodb_plugin/dict/dict0load.c b/storage/innobase/dict/dict0load.c
index 842a129c1a6..842a129c1a6 100644
--- a/storage/innodb_plugin/dict/dict0load.c
+++ b/storage/innobase/dict/dict0load.c
diff --git a/storage/innodb_plugin/dict/dict0mem.c b/storage/innobase/dict/dict0mem.c
index 6458cbab92d..6458cbab92d 100644
--- a/storage/innodb_plugin/dict/dict0mem.c
+++ b/storage/innobase/dict/dict0mem.c
diff --git a/storage/innodb_plugin/dyn/dyn0dyn.c b/storage/innobase/dyn/dyn0dyn.c
index e1275f040f3..e1275f040f3 100644
--- a/storage/innodb_plugin/dyn/dyn0dyn.c
+++ b/storage/innobase/dyn/dyn0dyn.c
diff --git a/storage/innodb_plugin/eval/eval0eval.c b/storage/innobase/eval/eval0eval.c
index 589b0fa1576..589b0fa1576 100644
--- a/storage/innodb_plugin/eval/eval0eval.c
+++ b/storage/innobase/eval/eval0eval.c
diff --git a/storage/innodb_plugin/eval/eval0proc.c b/storage/innobase/eval/eval0proc.c
index 3a4218d92bf..3a4218d92bf 100644
--- a/storage/innodb_plugin/eval/eval0proc.c
+++ b/storage/innobase/eval/eval0proc.c
diff --git a/storage/innodb_plugin/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c
index 96e60b0128f..96e60b0128f 100644
--- a/storage/innodb_plugin/fil/fil0fil.c
+++ b/storage/innobase/fil/fil0fil.c
diff --git a/storage/innodb_plugin/fsp/fsp0fsp.c b/storage/innobase/fsp/fsp0fsp.c
index ce14723ba18..ce14723ba18 100644
--- a/storage/innodb_plugin/fsp/fsp0fsp.c
+++ b/storage/innobase/fsp/fsp0fsp.c
diff --git a/storage/innodb_plugin/fut/fut0fut.c b/storage/innobase/fut/fut0fut.c
index 20b45a575e6..20b45a575e6 100644
--- a/storage/innodb_plugin/fut/fut0fut.c
+++ b/storage/innobase/fut/fut0fut.c
diff --git a/storage/innodb_plugin/fut/fut0lst.c b/storage/innobase/fut/fut0lst.c
index a1e21c22725..a1e21c22725 100644
--- a/storage/innodb_plugin/fut/fut0lst.c
+++ b/storage/innobase/fut/fut0lst.c
diff --git a/storage/innodb_plugin/ha/ha0ha.c b/storage/innobase/ha/ha0ha.c
index cb5e541b55d..cb5e541b55d 100644
--- a/storage/innodb_plugin/ha/ha0ha.c
+++ b/storage/innobase/ha/ha0ha.c
diff --git a/storage/innodb_plugin/ha/ha0storage.c b/storage/innobase/ha/ha0storage.c
index 698e34f1166..698e34f1166 100644
--- a/storage/innodb_plugin/ha/ha0storage.c
+++ b/storage/innobase/ha/ha0storage.c
diff --git a/storage/innodb_plugin/ha/hash0hash.c b/storage/innobase/ha/hash0hash.c
index 2800d7793f8..2800d7793f8 100644
--- a/storage/innodb_plugin/ha/hash0hash.c
+++ b/storage/innobase/ha/hash0hash.c
diff --git a/storage/innodb_plugin/ha_innodb.def b/storage/innobase/ha_innodb.def
index e0faa62deb1..e0faa62deb1 100644
--- a/storage/innodb_plugin/ha_innodb.def
+++ b/storage/innobase/ha_innodb.def
diff --git a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 682004407c7..f9c893ac845 100644
--- a/storage/innodb_plugin/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -10009,7 +10009,7 @@ static struct st_mysql_sys_var* innobase_system_variables[]= {
   NULL
 };
 
-mysql_declare_plugin(innodb_plugin)
+mysql_declare_plugin(innobase)
 {
   MYSQL_STORAGE_ENGINE_PLUGIN,
   &innobase_storage_engine,
diff --git a/storage/innodb_plugin/handler/ha_innodb.h b/storage/innobase/handler/ha_innodb.h
index cc98003f8ff..cc98003f8ff 100644
--- a/storage/innodb_plugin/handler/ha_innodb.h
+++ b/storage/innobase/handler/ha_innodb.h
diff --git a/storage/innodb_plugin/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc
index d1f64a1985c..d1f64a1985c 100644
--- a/storage/innodb_plugin/handler/handler0alter.cc
+++ b/storage/innobase/handler/handler0alter.cc
diff --git a/storage/innodb_plugin/handler/handler0vars.h b/storage/innobase/handler/handler0vars.h
index e0f8f75e34d..e0f8f75e34d 100644
--- a/storage/innodb_plugin/handler/handler0vars.h
+++ b/storage/innobase/handler/handler0vars.h
diff --git a/storage/innodb_plugin/handler/i_s.cc b/storage/innobase/handler/i_s.cc
index c0d488d1c49..c0d488d1c49 100644
--- a/storage/innodb_plugin/handler/i_s.cc
+++ b/storage/innobase/handler/i_s.cc
diff --git a/storage/innodb_plugin/handler/i_s.h b/storage/innobase/handler/i_s.h
index 402c88bbedb..402c88bbedb 100644
--- a/storage/innodb_plugin/handler/i_s.h
+++ b/storage/innobase/handler/i_s.h
diff --git a/storage/innodb_plugin/handler/mysql_addons.cc b/storage/innobase/handler/mysql_addons.cc
index eae1fe9fbc2..eae1fe9fbc2 100644
--- a/storage/innodb_plugin/handler/mysql_addons.cc
+++ b/storage/innobase/handler/mysql_addons.cc
diff --git a/storage/innodb_plugin/handler/win_delay_loader.cc b/storage/innobase/handler/win_delay_loader.cc
index 9b92f6a9cf2..9b92f6a9cf2 100644
--- a/storage/innodb_plugin/handler/win_delay_loader.cc
+++ b/storage/innobase/handler/win_delay_loader.cc
diff --git a/storage/innodb_plugin/ibuf/ibuf0ibuf.c b/storage/innobase/ibuf/ibuf0ibuf.c
index 37c68391477..37c68391477 100644
--- a/storage/innodb_plugin/ibuf/ibuf0ibuf.c
+++ b/storage/innobase/ibuf/ibuf0ibuf.c
diff --git a/storage/innodb_plugin/include/btr0btr.h b/storage/innobase/include/btr0btr.h
index d5c8258513c..d5c8258513c 100644
--- a/storage/innodb_plugin/include/btr0btr.h
+++ b/storage/innobase/include/btr0btr.h
diff --git a/storage/innodb_plugin/include/btr0btr.ic b/storage/innobase/include/btr0btr.ic
index 2259d22c9a6..2259d22c9a6 100644
--- a/storage/innodb_plugin/include/btr0btr.ic
+++ b/storage/innobase/include/btr0btr.ic
diff --git a/storage/innodb_plugin/include/btr0cur.h b/storage/innobase/include/btr0cur.h
index b2d43ae3254..b2d43ae3254 100644
--- a/storage/innodb_plugin/include/btr0cur.h
+++ b/storage/innobase/include/btr0cur.h
diff --git a/storage/innodb_plugin/include/btr0cur.ic b/storage/innobase/include/btr0cur.ic
index 280583f6ccf..280583f6ccf 100644
--- a/storage/innodb_plugin/include/btr0cur.ic
+++ b/storage/innobase/include/btr0cur.ic
diff --git a/storage/innodb_plugin/include/btr0pcur.h b/storage/innobase/include/btr0pcur.h
index 12b1375d8b7..12b1375d8b7 100644
--- a/storage/innodb_plugin/include/btr0pcur.h
+++ b/storage/innobase/include/btr0pcur.h
diff --git a/storage/innodb_plugin/include/btr0pcur.ic b/storage/innobase/include/btr0pcur.ic
index 0ca7223f861..0ca7223f861 100644
--- a/storage/innodb_plugin/include/btr0pcur.ic
+++ b/storage/innobase/include/btr0pcur.ic
diff --git a/storage/innodb_plugin/include/btr0sea.h b/storage/innobase/include/btr0sea.h
index 631b3bd386c..631b3bd386c 100644
--- a/storage/innodb_plugin/include/btr0sea.h
+++ b/storage/innobase/include/btr0sea.h
diff --git a/storage/innodb_plugin/include/btr0sea.ic b/storage/innobase/include/btr0sea.ic
index beadeeb8d02..beadeeb8d02 100644
--- a/storage/innodb_plugin/include/btr0sea.ic
+++ b/storage/innobase/include/btr0sea.ic
diff --git a/storage/innodb_plugin/include/btr0types.h b/storage/innobase/include/btr0types.h
index ef4a6b04b34..ef4a6b04b34 100644
--- a/storage/innodb_plugin/include/btr0types.h
+++ b/storage/innobase/include/btr0types.h
diff --git a/storage/innodb_plugin/include/buf0buddy.h b/storage/innobase/include/buf0buddy.h
index 7648950d5d1..7648950d5d1 100644
--- a/storage/innodb_plugin/include/buf0buddy.h
+++ b/storage/innobase/include/buf0buddy.h
diff --git a/storage/innodb_plugin/include/buf0buddy.ic b/storage/innobase/include/buf0buddy.ic
index c419a2374d9..c419a2374d9 100644
--- a/storage/innodb_plugin/include/buf0buddy.ic
+++ b/storage/innobase/include/buf0buddy.ic
diff --git a/storage/innodb_plugin/include/buf0buf.h b/storage/innobase/include/buf0buf.h
index 65ad42c895a..65ad42c895a 100644
--- a/storage/innodb_plugin/include/buf0buf.h
+++ b/storage/innobase/include/buf0buf.h
diff --git a/storage/innodb_plugin/include/buf0buf.ic b/storage/innobase/include/buf0buf.ic
index 17064342116..17064342116 100644
--- a/storage/innodb_plugin/include/buf0buf.ic
+++ b/storage/innobase/include/buf0buf.ic
diff --git a/storage/innodb_plugin/include/buf0flu.h b/storage/innobase/include/buf0flu.h
index 6c751852f54..6c751852f54 100644
--- a/storage/innodb_plugin/include/buf0flu.h
+++ b/storage/innobase/include/buf0flu.h
diff --git a/storage/innodb_plugin/include/buf0flu.ic b/storage/innobase/include/buf0flu.ic
index c90cd59e4b6..c90cd59e4b6 100644
--- a/storage/innodb_plugin/include/buf0flu.ic
+++ b/storage/innobase/include/buf0flu.ic
diff --git a/storage/innodb_plugin/include/buf0lru.h b/storage/innobase/include/buf0lru.h
index 463aca0982c..463aca0982c 100644
--- a/storage/innodb_plugin/include/buf0lru.h
+++ b/storage/innobase/include/buf0lru.h
diff --git a/storage/innodb_plugin/include/buf0lru.ic b/storage/innobase/include/buf0lru.ic
index 556f45d987f..556f45d987f 100644
--- a/storage/innodb_plugin/include/buf0lru.ic
+++ b/storage/innobase/include/buf0lru.ic
diff --git a/storage/innodb_plugin/include/buf0rea.h b/storage/innobase/include/buf0rea.h
index b4d25e6fde0..b4d25e6fde0 100644
--- a/storage/innodb_plugin/include/buf0rea.h
+++ b/storage/innobase/include/buf0rea.h
diff --git a/storage/innodb_plugin/include/buf0types.h b/storage/innobase/include/buf0types.h
index e7167d716a0..e7167d716a0 100644
--- a/storage/innodb_plugin/include/buf0types.h
+++ b/storage/innobase/include/buf0types.h
diff --git a/storage/innodb_plugin/include/data0data.h b/storage/innobase/include/data0data.h
index f9fce3f3657..f9fce3f3657 100644
--- a/storage/innodb_plugin/include/data0data.h
+++ b/storage/innobase/include/data0data.h
diff --git a/storage/innodb_plugin/include/data0data.ic b/storage/innobase/include/data0data.ic
index da79aa33702..da79aa33702 100644
--- a/storage/innodb_plugin/include/data0data.ic
+++ b/storage/innobase/include/data0data.ic
diff --git a/storage/innodb_plugin/include/data0type.h b/storage/innobase/include/data0type.h
index a73bed3a9f5..a73bed3a9f5 100644
--- a/storage/innodb_plugin/include/data0type.h
+++ b/storage/innobase/include/data0type.h
diff --git a/storage/innodb_plugin/include/data0type.ic b/storage/innobase/include/data0type.ic
index 240b4288f39..240b4288f39 100644
--- a/storage/innodb_plugin/include/data0type.ic
+++ b/storage/innobase/include/data0type.ic
diff --git a/storage/innodb_plugin/include/data0types.h b/storage/innobase/include/data0types.h
index 04e835bc401..04e835bc401 100644
--- a/storage/innodb_plugin/include/data0types.h
+++ b/storage/innobase/include/data0types.h
diff --git a/storage/innodb_plugin/include/db0err.h b/storage/innobase/include/db0err.h
index 23898583b72..23898583b72 100644
--- a/storage/innodb_plugin/include/db0err.h
+++ b/storage/innobase/include/db0err.h
diff --git a/storage/innodb_plugin/include/dict0boot.h b/storage/innobase/include/dict0boot.h
index 51d37ee98d1..51d37ee98d1 100644
--- a/storage/innodb_plugin/include/dict0boot.h
+++ b/storage/innobase/include/dict0boot.h
diff --git a/storage/innodb_plugin/include/dict0boot.ic b/storage/innobase/include/dict0boot.ic
index d5f372e38c4..d5f372e38c4 100644
--- a/storage/innodb_plugin/include/dict0boot.ic
+++ b/storage/innobase/include/dict0boot.ic
diff --git a/storage/innodb_plugin/include/dict0crea.h b/storage/innobase/include/dict0crea.h
index 3107d771d88..3107d771d88 100644
--- a/storage/innodb_plugin/include/dict0crea.h
+++ b/storage/innobase/include/dict0crea.h
diff --git a/storage/innodb_plugin/include/dict0crea.ic b/storage/innobase/include/dict0crea.ic
index c5365ce7489..c5365ce7489 100644
--- a/storage/innodb_plugin/include/dict0crea.ic
+++ b/storage/innobase/include/dict0crea.ic
diff --git a/storage/innodb_plugin/include/dict0dict.h b/storage/innobase/include/dict0dict.h
index b2029699e51..b2029699e51 100644
--- a/storage/innodb_plugin/include/dict0dict.h
+++ b/storage/innobase/include/dict0dict.h
diff --git a/storage/innodb_plugin/include/dict0dict.ic b/storage/innobase/include/dict0dict.ic
index 46e78df8272..46e78df8272 100644
--- a/storage/innodb_plugin/include/dict0dict.ic
+++ b/storage/innobase/include/dict0dict.ic
diff --git a/storage/innodb_plugin/include/dict0load.h b/storage/innobase/include/dict0load.h
index 60b8c1fb632..60b8c1fb632 100644
--- a/storage/innodb_plugin/include/dict0load.h
+++ b/storage/innobase/include/dict0load.h
diff --git a/storage/innodb_plugin/include/dict0load.ic b/storage/innobase/include/dict0load.ic
index ccc16db165b..ccc16db165b 100644
--- a/storage/innodb_plugin/include/dict0load.ic
+++ b/storage/innobase/include/dict0load.ic
diff --git a/storage/innodb_plugin/include/dict0mem.h b/storage/innobase/include/dict0mem.h
index 1ee906fbf57..1ee906fbf57 100644
--- a/storage/innodb_plugin/include/dict0mem.h
+++ b/storage/innobase/include/dict0mem.h
diff --git a/storage/innodb_plugin/include/dict0mem.ic b/storage/innobase/include/dict0mem.ic
index c36adb07a18..c36adb07a18 100644
--- a/storage/innodb_plugin/include/dict0mem.ic
+++ b/storage/innobase/include/dict0mem.ic
diff --git a/storage/innodb_plugin/include/dict0types.h b/storage/innobase/include/dict0types.h
index 7ad69193cc9..7ad69193cc9 100644
--- a/storage/innodb_plugin/include/dict0types.h
+++ b/storage/innobase/include/dict0types.h
diff --git a/storage/innodb_plugin/include/dyn0dyn.h b/storage/innobase/include/dyn0dyn.h
index 121a5946ac7..121a5946ac7 100644
--- a/storage/innodb_plugin/include/dyn0dyn.h
+++ b/storage/innobase/include/dyn0dyn.h
diff --git a/storage/innodb_plugin/include/dyn0dyn.ic b/storage/innobase/include/dyn0dyn.ic
index 110e674abff..110e674abff 100644
--- a/storage/innodb_plugin/include/dyn0dyn.ic
+++ b/storage/innobase/include/dyn0dyn.ic
diff --git a/storage/innodb_plugin/include/eval0eval.h b/storage/innobase/include/eval0eval.h
index 60aefd8d453..60aefd8d453 100644
--- a/storage/innodb_plugin/include/eval0eval.h
+++ b/storage/innobase/include/eval0eval.h
diff --git a/storage/innodb_plugin/include/eval0eval.ic b/storage/innobase/include/eval0eval.ic
index fe767f39b00..fe767f39b00 100644
--- a/storage/innodb_plugin/include/eval0eval.ic
+++ b/storage/innobase/include/eval0eval.ic
diff --git a/storage/innodb_plugin/include/eval0proc.h b/storage/innobase/include/eval0proc.h
index 13e2e365320..13e2e365320 100644
--- a/storage/innodb_plugin/include/eval0proc.h
+++ b/storage/innobase/include/eval0proc.h
diff --git a/storage/innodb_plugin/include/eval0proc.ic b/storage/innobase/include/eval0proc.ic
index c602af0a694..c602af0a694 100644
--- a/storage/innodb_plugin/include/eval0proc.ic
+++ b/storage/innobase/include/eval0proc.ic
diff --git a/storage/innodb_plugin/include/fil0fil.h b/storage/innobase/include/fil0fil.h
index a36deaf16ce..a36deaf16ce 100644
--- a/storage/innodb_plugin/include/fil0fil.h
+++ b/storage/innobase/include/fil0fil.h
diff --git a/storage/innodb_plugin/include/fsp0fsp.h b/storage/innobase/include/fsp0fsp.h
index 5f7dc58eedc..5f7dc58eedc 100644
--- a/storage/innodb_plugin/include/fsp0fsp.h
+++ b/storage/innobase/include/fsp0fsp.h
diff --git a/storage/innodb_plugin/include/fsp0fsp.ic b/storage/innobase/include/fsp0fsp.ic
index 434c370b527..434c370b527 100644
--- a/storage/innodb_plugin/include/fsp0fsp.ic
+++ b/storage/innobase/include/fsp0fsp.ic
diff --git a/storage/innodb_plugin/include/fsp0types.h b/storage/innobase/include/fsp0types.h
index 496081c2346..496081c2346 100644
--- a/storage/innodb_plugin/include/fsp0types.h
+++ b/storage/innobase/include/fsp0types.h
diff --git a/storage/innodb_plugin/include/fut0fut.h b/storage/innobase/include/fut0fut.h
index dce20b3bad6..dce20b3bad6 100644
--- a/storage/innodb_plugin/include/fut0fut.h
+++ b/storage/innobase/include/fut0fut.h
diff --git a/storage/innodb_plugin/include/fut0fut.ic b/storage/innobase/include/fut0fut.ic
index 0b52719a055..0b52719a055 100644
--- a/storage/innodb_plugin/include/fut0fut.ic
+++ b/storage/innobase/include/fut0fut.ic
diff --git a/storage/innodb_plugin/include/fut0lst.h b/storage/innobase/include/fut0lst.h
index fe024c2498f..fe024c2498f 100644
--- a/storage/innodb_plugin/include/fut0lst.h
+++ b/storage/innobase/include/fut0lst.h
diff --git a/storage/innodb_plugin/include/fut0lst.ic b/storage/innobase/include/fut0lst.ic
index dcd13c61871..dcd13c61871 100644
--- a/storage/innodb_plugin/include/fut0lst.ic
+++ b/storage/innobase/include/fut0lst.ic
diff --git a/storage/innodb_plugin/include/ha0ha.h b/storage/innobase/include/ha0ha.h
index 1ffbd3440aa..1ffbd3440aa 100644
--- a/storage/innodb_plugin/include/ha0ha.h
+++ b/storage/innobase/include/ha0ha.h
diff --git a/storage/innodb_plugin/include/ha0ha.ic b/storage/innobase/include/ha0ha.ic
index 734403c4cd9..734403c4cd9 100644
--- a/storage/innodb_plugin/include/ha0ha.ic
+++ b/storage/innobase/include/ha0ha.ic
diff --git a/storage/innodb_plugin/include/ha0storage.h b/storage/innobase/include/ha0storage.h
index c30bd840579..c30bd840579 100644
--- a/storage/innodb_plugin/include/ha0storage.h
+++ b/storage/innobase/include/ha0storage.h
diff --git a/storage/innodb_plugin/include/ha0storage.ic b/storage/innobase/include/ha0storage.ic
index 5acbf82f005..5acbf82f005 100644
--- a/storage/innodb_plugin/include/ha0storage.ic
+++ b/storage/innobase/include/ha0storage.ic
diff --git a/storage/innodb_plugin/include/ha_prototypes.h b/storage/innobase/include/ha_prototypes.h
index e8789d1638b..e8789d1638b 100644
--- a/storage/innodb_plugin/include/ha_prototypes.h
+++ b/storage/innobase/include/ha_prototypes.h
diff --git a/storage/innodb_plugin/include/handler0alter.h b/storage/innobase/include/handler0alter.h
index 985b76f4f50..985b76f4f50 100644
--- a/storage/innodb_plugin/include/handler0alter.h
+++ b/storage/innobase/include/handler0alter.h
diff --git a/storage/innodb_plugin/include/hash0hash.h b/storage/innobase/include/hash0hash.h
index 977cb829f35..977cb829f35 100644
--- a/storage/innodb_plugin/include/hash0hash.h
+++ b/storage/innobase/include/hash0hash.h
diff --git a/storage/innodb_plugin/include/hash0hash.ic b/storage/innobase/include/hash0hash.ic
index 19da2d50701..19da2d50701 100644
--- a/storage/innodb_plugin/include/hash0hash.ic
+++ b/storage/innobase/include/hash0hash.ic
diff --git a/storage/innodb_plugin/include/ibuf0ibuf.h b/storage/innobase/include/ibuf0ibuf.h
index 21330997df3..21330997df3 100644
--- a/storage/innodb_plugin/include/ibuf0ibuf.h
+++ b/storage/innobase/include/ibuf0ibuf.h
diff --git a/storage/innodb_plugin/include/ibuf0ibuf.ic b/storage/innobase/include/ibuf0ibuf.ic
index 15bbe61ab30..15bbe61ab30 100644
--- a/storage/innodb_plugin/include/ibuf0ibuf.ic
+++ b/storage/innobase/include/ibuf0ibuf.ic
diff --git a/storage/innodb_plugin/include/ibuf0types.h b/storage/innobase/include/ibuf0types.h
index 55944f879b2..55944f879b2 100644
--- a/storage/innodb_plugin/include/ibuf0types.h
+++ b/storage/innobase/include/ibuf0types.h
diff --git a/storage/innodb_plugin/include/lock0iter.h b/storage/innobase/include/lock0iter.h
index 25a57c9740c..25a57c9740c 100644
--- a/storage/innodb_plugin/include/lock0iter.h
+++ b/storage/innobase/include/lock0iter.h
diff --git a/storage/innodb_plugin/include/lock0lock.h b/storage/innobase/include/lock0lock.h
index fa5db831d4f..fa5db831d4f 100644
--- a/storage/innodb_plugin/include/lock0lock.h
+++ b/storage/innobase/include/lock0lock.h
diff --git a/storage/innodb_plugin/include/lock0lock.ic b/storage/innobase/include/lock0lock.ic
index 014722f51c4..014722f51c4 100644
--- a/storage/innodb_plugin/include/lock0lock.ic
+++ b/storage/innobase/include/lock0lock.ic
diff --git a/storage/innodb_plugin/include/lock0priv.h b/storage/innobase/include/lock0priv.h
index 287c151b19f..287c151b19f 100644
--- a/storage/innodb_plugin/include/lock0priv.h
+++ b/storage/innobase/include/lock0priv.h
diff --git a/storage/innodb_plugin/include/lock0priv.ic b/storage/innobase/include/lock0priv.ic
index 30447c99848..30447c99848 100644
--- a/storage/innodb_plugin/include/lock0priv.ic
+++ b/storage/innobase/include/lock0priv.ic
diff --git a/storage/innodb_plugin/include/lock0types.h b/storage/innobase/include/lock0types.h
index 45f29e90fe9..45f29e90fe9 100644
--- a/storage/innodb_plugin/include/lock0types.h
+++ b/storage/innobase/include/lock0types.h
diff --git a/storage/innodb_plugin/include/log0log.h b/storage/innobase/include/log0log.h
index 059f548a085..059f548a085 100644
--- a/storage/innodb_plugin/include/log0log.h
+++ b/storage/innobase/include/log0log.h
diff --git a/storage/innodb_plugin/include/log0log.ic b/storage/innobase/include/log0log.ic
index d071985982a..d071985982a 100644
--- a/storage/innodb_plugin/include/log0log.ic
+++ b/storage/innobase/include/log0log.ic
diff --git a/storage/innodb_plugin/include/log0recv.h b/storage/innobase/include/log0recv.h
index 8468c213bdb..8468c213bdb 100644
--- a/storage/innodb_plugin/include/log0recv.h
+++ b/storage/innobase/include/log0recv.h
diff --git a/storage/innodb_plugin/include/log0recv.ic b/storage/innobase/include/log0recv.ic
index 0a8e55b96fa..0a8e55b96fa 100644
--- a/storage/innodb_plugin/include/log0recv.ic
+++ b/storage/innobase/include/log0recv.ic
diff --git a/storage/innodb_plugin/include/mach0data.h b/storage/innobase/include/mach0data.h
index 44ee3df22ce..44ee3df22ce 100644
--- a/storage/innodb_plugin/include/mach0data.h
+++ b/storage/innobase/include/mach0data.h
diff --git a/storage/innodb_plugin/include/mach0data.ic b/storage/innobase/include/mach0data.ic
index ef20356bd31..ef20356bd31 100644
--- a/storage/innodb_plugin/include/mach0data.ic
+++ b/storage/innobase/include/mach0data.ic
diff --git a/storage/innodb_plugin/include/mem0dbg.h b/storage/innobase/include/mem0dbg.h
index a064af5c678..a064af5c678 100644
--- a/storage/innodb_plugin/include/mem0dbg.h
+++ b/storage/innobase/include/mem0dbg.h
diff --git a/storage/innodb_plugin/include/mem0dbg.ic b/storage/innobase/include/mem0dbg.ic
index cb9245411dc..cb9245411dc 100644
--- a/storage/innodb_plugin/include/mem0dbg.ic
+++ b/storage/innobase/include/mem0dbg.ic
diff --git a/storage/innodb_plugin/include/mem0mem.h b/storage/innobase/include/mem0mem.h
index a092b024219..a092b024219 100644
--- a/storage/innodb_plugin/include/mem0mem.h
+++ b/storage/innobase/include/mem0mem.h
diff --git a/storage/innodb_plugin/include/mem0mem.ic b/storage/innobase/include/mem0mem.ic
index e7080d8c508..e7080d8c508 100644
--- a/storage/innodb_plugin/include/mem0mem.ic
+++ b/storage/innobase/include/mem0mem.ic
diff --git a/storage/innodb_plugin/include/mem0pool.h b/storage/innobase/include/mem0pool.h
index 18f988241d6..18f988241d6 100644
--- a/storage/innodb_plugin/include/mem0pool.h
+++ b/storage/innobase/include/mem0pool.h
diff --git a/storage/innodb_plugin/include/mem0pool.ic b/storage/innobase/include/mem0pool.ic
index b891dd6dea0..b891dd6dea0 100644
--- a/storage/innodb_plugin/include/mem0pool.ic
+++ b/storage/innobase/include/mem0pool.ic
diff --git a/storage/innodb_plugin/include/mtr0log.h b/storage/innobase/include/mtr0log.h
index 6322af2a569..6322af2a569 100644
--- a/storage/innodb_plugin/include/mtr0log.h
+++ b/storage/innobase/include/mtr0log.h
diff --git a/storage/innodb_plugin/include/mtr0log.ic b/storage/innobase/include/mtr0log.ic
index 5c24c38b337..5c24c38b337 100644
--- a/storage/innodb_plugin/include/mtr0log.ic
+++ b/storage/innobase/include/mtr0log.ic
diff --git a/storage/innodb_plugin/include/mtr0mtr.h b/storage/innobase/include/mtr0mtr.h
index 69a2c03f4cb..69a2c03f4cb 100644
--- a/storage/innodb_plugin/include/mtr0mtr.h
+++ b/storage/innobase/include/mtr0mtr.h
diff --git a/storage/innodb_plugin/include/mtr0mtr.ic b/storage/innobase/include/mtr0mtr.ic
index 310c7c4117f..310c7c4117f 100644
--- a/storage/innodb_plugin/include/mtr0mtr.ic
+++ b/storage/innobase/include/mtr0mtr.ic
diff --git a/storage/innodb_plugin/include/mtr0types.h b/storage/innobase/include/mtr0types.h
index 83a7aaf3839..83a7aaf3839 100644
--- a/storage/innodb_plugin/include/mtr0types.h
+++ b/storage/innobase/include/mtr0types.h
diff --git a/storage/innodb_plugin/include/mysql_addons.h b/storage/innobase/include/mysql_addons.h
index 17660c18710..17660c18710 100644
--- a/storage/innodb_plugin/include/mysql_addons.h
+++ b/storage/innobase/include/mysql_addons.h
diff --git a/storage/innodb_plugin/include/os0file.h b/storage/innobase/include/os0file.h
index d8d2f0e5d9e..d8d2f0e5d9e 100644
--- a/storage/innodb_plugin/include/os0file.h
+++ b/storage/innobase/include/os0file.h
diff --git a/storage/innodb_plugin/include/os0proc.h b/storage/innobase/include/os0proc.h
index fd46bd7db87..fd46bd7db87 100644
--- a/storage/innodb_plugin/include/os0proc.h
+++ b/storage/innobase/include/os0proc.h
diff --git a/storage/innodb_plugin/include/os0proc.ic b/storage/innobase/include/os0proc.ic
index c9641644525..c9641644525 100644
--- a/storage/innodb_plugin/include/os0proc.ic
+++ b/storage/innobase/include/os0proc.ic
diff --git a/storage/innodb_plugin/include/os0sync.h b/storage/innobase/include/os0sync.h
index 0e0b32e7036..0e0b32e7036 100644
--- a/storage/innodb_plugin/include/os0sync.h
+++ b/storage/innobase/include/os0sync.h
diff --git a/storage/innodb_plugin/include/os0sync.ic b/storage/innobase/include/os0sync.ic
index 1f3ce38fa65..1f3ce38fa65 100644
--- a/storage/innodb_plugin/include/os0sync.ic
+++ b/storage/innobase/include/os0sync.ic
diff --git a/storage/innodb_plugin/include/os0thread.h b/storage/innobase/include/os0thread.h
index 6583de0005f..6583de0005f 100644
--- a/storage/innodb_plugin/include/os0thread.h
+++ b/storage/innobase/include/os0thread.h
diff --git a/storage/innodb_plugin/include/os0thread.ic b/storage/innobase/include/os0thread.ic
index f89bc40b4fa..f89bc40b4fa 100644
--- a/storage/innodb_plugin/include/os0thread.ic
+++ b/storage/innobase/include/os0thread.ic
diff --git a/storage/innodb_plugin/include/page0cur.h b/storage/innobase/include/page0cur.h
index 1544b0abe1c..1544b0abe1c 100644
--- a/storage/innodb_plugin/include/page0cur.h
+++ b/storage/innobase/include/page0cur.h
diff --git a/storage/innodb_plugin/include/page0cur.ic b/storage/innobase/include/page0cur.ic
index 3520677dfb3..3520677dfb3 100644
--- a/storage/innodb_plugin/include/page0cur.ic
+++ b/storage/innobase/include/page0cur.ic
diff --git a/storage/innodb_plugin/include/page0page.h b/storage/innobase/include/page0page.h
index a4fe069d022..a4fe069d022 100644
--- a/storage/innodb_plugin/include/page0page.h
+++ b/storage/innobase/include/page0page.h
diff --git a/storage/innodb_plugin/include/page0page.ic b/storage/innobase/include/page0page.ic
index 318ec1cc1f2..318ec1cc1f2 100644
--- a/storage/innodb_plugin/include/page0page.ic
+++ b/storage/innobase/include/page0page.ic
diff --git a/storage/innodb_plugin/include/page0types.h b/storage/innobase/include/page0types.h
index d9a277bf208..d9a277bf208 100644
--- a/storage/innodb_plugin/include/page0types.h
+++ b/storage/innobase/include/page0types.h
diff --git a/storage/innodb_plugin/include/page0zip.h b/storage/innobase/include/page0zip.h
index 9aaa066306b..9aaa066306b 100644
--- a/storage/innodb_plugin/include/page0zip.h
+++ b/storage/innobase/include/page0zip.h
diff --git a/storage/innodb_plugin/include/page0zip.ic b/storage/innobase/include/page0zip.ic
index 75cc7a9fcc4..75cc7a9fcc4 100644
--- a/storage/innodb_plugin/include/page0zip.ic
+++ b/storage/innobase/include/page0zip.ic
diff --git a/storage/innodb_plugin/include/pars0grm.h b/storage/innobase/include/pars0grm.h
index 3de233eed3a..3de233eed3a 100644
--- a/storage/innodb_plugin/include/pars0grm.h
+++ b/storage/innobase/include/pars0grm.h
diff --git a/storage/innodb_plugin/include/pars0opt.h b/storage/innobase/include/pars0opt.h
index 42d956068f8..42d956068f8 100644
--- a/storage/innodb_plugin/include/pars0opt.h
+++ b/storage/innobase/include/pars0opt.h
diff --git a/storage/innodb_plugin/include/pars0opt.ic b/storage/innobase/include/pars0opt.ic
index e0bb6bf1af2..e0bb6bf1af2 100644
--- a/storage/innodb_plugin/include/pars0opt.ic
+++ b/storage/innobase/include/pars0opt.ic
diff --git a/storage/innodb_plugin/include/pars0pars.h b/storage/innobase/include/pars0pars.h
index a7de7f2292e..a7de7f2292e 100644
--- a/storage/innodb_plugin/include/pars0pars.h
+++ b/storage/innobase/include/pars0pars.h
diff --git a/storage/innodb_plugin/include/pars0pars.ic b/storage/innobase/include/pars0pars.ic
index ae6c13cd671..ae6c13cd671 100644
--- a/storage/innodb_plugin/include/pars0pars.ic
+++ b/storage/innobase/include/pars0pars.ic
diff --git a/storage/innodb_plugin/include/pars0sym.h b/storage/innobase/include/pars0sym.h
index 6d1a4b82414..6d1a4b82414 100644
--- a/storage/innodb_plugin/include/pars0sym.h
+++ b/storage/innobase/include/pars0sym.h
diff --git a/storage/innodb_plugin/include/pars0sym.ic b/storage/innobase/include/pars0sym.ic
index 9eb09db3a47..9eb09db3a47 100644
--- a/storage/innodb_plugin/include/pars0sym.ic
+++ b/storage/innobase/include/pars0sym.ic
diff --git a/storage/innodb_plugin/include/pars0types.h b/storage/innobase/include/pars0types.h
index e0a8a86bf07..e0a8a86bf07 100644
--- a/storage/innodb_plugin/include/pars0types.h
+++ b/storage/innobase/include/pars0types.h
diff --git a/storage/innodb_plugin/include/que0que.h b/storage/innobase/include/que0que.h
index 420f34550e2..420f34550e2 100644
--- a/storage/innodb_plugin/include/que0que.h
+++ b/storage/innobase/include/que0que.h
diff --git a/storage/innodb_plugin/include/que0que.ic b/storage/innobase/include/que0que.ic
index a1c0dc1e77a..a1c0dc1e77a 100644
--- a/storage/innodb_plugin/include/que0que.ic
+++ b/storage/innobase/include/que0que.ic
diff --git a/storage/innodb_plugin/include/que0types.h b/storage/innobase/include/que0types.h
index ea976074768..ea976074768 100644
--- a/storage/innodb_plugin/include/que0types.h
+++ b/storage/innobase/include/que0types.h
diff --git a/storage/innodb_plugin/include/read0read.h b/storage/innobase/include/read0read.h
index 4d9a9fade36..4d9a9fade36 100644
--- a/storage/innodb_plugin/include/read0read.h
+++ b/storage/innobase/include/read0read.h
diff --git a/storage/innodb_plugin/include/read0read.ic b/storage/innobase/include/read0read.ic
index 9924967cc2d..9924967cc2d 100644
--- a/storage/innodb_plugin/include/read0read.ic
+++ b/storage/innobase/include/read0read.ic
diff --git a/storage/innodb_plugin/include/read0types.h b/storage/innobase/include/read0types.h
index caf69e3fb51..caf69e3fb51 100644
--- a/storage/innodb_plugin/include/read0types.h
+++ b/storage/innobase/include/read0types.h
diff --git a/storage/innodb_plugin/include/rem0cmp.h b/storage/innobase/include/rem0cmp.h
index d30d9f86abe..d30d9f86abe 100644
--- a/storage/innodb_plugin/include/rem0cmp.h
+++ b/storage/innobase/include/rem0cmp.h
diff --git a/storage/innodb_plugin/include/rem0cmp.ic b/storage/innobase/include/rem0cmp.ic
index 39ef5f4fba3..39ef5f4fba3 100644
--- a/storage/innodb_plugin/include/rem0cmp.ic
+++ b/storage/innobase/include/rem0cmp.ic
diff --git a/storage/innodb_plugin/include/rem0rec.h b/storage/innobase/include/rem0rec.h
index 17d08afabb9..17d08afabb9 100644
--- a/storage/innodb_plugin/include/rem0rec.h
+++ b/storage/innobase/include/rem0rec.h
diff --git a/storage/innodb_plugin/include/rem0rec.ic b/storage/innobase/include/rem0rec.ic
index 9fe736f9b0b..9fe736f9b0b 100644
--- a/storage/innodb_plugin/include/rem0rec.ic
+++ b/storage/innobase/include/rem0rec.ic
diff --git a/storage/innodb_plugin/include/rem0types.h b/storage/innobase/include/rem0types.h
index 8b84d4af233..8b84d4af233 100644
--- a/storage/innodb_plugin/include/rem0types.h
+++ b/storage/innobase/include/rem0types.h
diff --git a/storage/innodb_plugin/include/row0ext.h b/storage/innobase/include/row0ext.h
index 43d82d644e6..43d82d644e6 100644
--- a/storage/innodb_plugin/include/row0ext.h
+++ b/storage/innobase/include/row0ext.h
diff --git a/storage/innodb_plugin/include/row0ext.ic b/storage/innobase/include/row0ext.ic
index 82771a9312a..82771a9312a 100644
--- a/storage/innodb_plugin/include/row0ext.ic
+++ b/storage/innobase/include/row0ext.ic
diff --git a/storage/innodb_plugin/include/row0ins.h b/storage/innobase/include/row0ins.h
index 530622e6225..530622e6225 100644
--- a/storage/innodb_plugin/include/row0ins.h
+++ b/storage/innobase/include/row0ins.h
diff --git a/storage/innodb_plugin/include/row0ins.ic b/storage/innobase/include/row0ins.ic
index 84f6da255bf..84f6da255bf 100644
--- a/storage/innodb_plugin/include/row0ins.ic
+++ b/storage/innobase/include/row0ins.ic
diff --git a/storage/innodb_plugin/include/row0merge.h b/storage/innobase/include/row0merge.h
index 62a5efd11f7..62a5efd11f7 100644
--- a/storage/innodb_plugin/include/row0merge.h
+++ b/storage/innobase/include/row0merge.h
diff --git a/storage/innodb_plugin/include/row0mysql.h b/storage/innobase/include/row0mysql.h
index 97028622505..97028622505 100644
--- a/storage/innodb_plugin/include/row0mysql.h
+++ b/storage/innobase/include/row0mysql.h
diff --git a/storage/innodb_plugin/include/row0mysql.ic b/storage/innobase/include/row0mysql.ic
index 35033aa2ad1..35033aa2ad1 100644
--- a/storage/innodb_plugin/include/row0mysql.ic
+++ b/storage/innobase/include/row0mysql.ic
diff --git a/storage/innodb_plugin/include/row0purge.h b/storage/innobase/include/row0purge.h
index 89ec54fb54a..89ec54fb54a 100644
--- a/storage/innodb_plugin/include/row0purge.h
+++ b/storage/innobase/include/row0purge.h
diff --git a/storage/innodb_plugin/include/row0purge.ic b/storage/innobase/include/row0purge.ic
index 23d7d3845a4..23d7d3845a4 100644
--- a/storage/innodb_plugin/include/row0purge.ic
+++ b/storage/innobase/include/row0purge.ic
diff --git a/storage/innodb_plugin/include/row0row.h b/storage/innobase/include/row0row.h
index 723b7b53395..723b7b53395 100644
--- a/storage/innodb_plugin/include/row0row.h
+++ b/storage/innobase/include/row0row.h
diff --git a/storage/innodb_plugin/include/row0row.ic b/storage/innobase/include/row0row.ic
index 05c007641af..05c007641af 100644
--- a/storage/innodb_plugin/include/row0row.ic
+++ b/storage/innobase/include/row0row.ic
diff --git a/storage/innodb_plugin/include/row0sel.h b/storage/innobase/include/row0sel.h
index 01a5afaa23e..01a5afaa23e 100644
--- a/storage/innodb_plugin/include/row0sel.h
+++ b/storage/innobase/include/row0sel.h
diff --git a/storage/innodb_plugin/include/row0sel.ic b/storage/innobase/include/row0sel.ic
index 5907f9913da..5907f9913da 100644
--- a/storage/innodb_plugin/include/row0sel.ic
+++ b/storage/innobase/include/row0sel.ic
diff --git a/storage/innodb_plugin/include/row0types.h b/storage/innobase/include/row0types.h
index 7920fd75061..7920fd75061 100644
--- a/storage/innodb_plugin/include/row0types.h
+++ b/storage/innobase/include/row0types.h
diff --git a/storage/innodb_plugin/include/row0uins.h b/storage/innobase/include/row0uins.h
index 77b071c3a6b..77b071c3a6b 100644
--- a/storage/innodb_plugin/include/row0uins.h
+++ b/storage/innobase/include/row0uins.h
diff --git a/storage/innodb_plugin/include/row0uins.ic b/storage/innobase/include/row0uins.ic
index 27606150d8e..27606150d8e 100644
--- a/storage/innodb_plugin/include/row0uins.ic
+++ b/storage/innobase/include/row0uins.ic
diff --git a/storage/innodb_plugin/include/row0umod.h b/storage/innobase/include/row0umod.h
index ed44cc8d601..ed44cc8d601 100644
--- a/storage/innodb_plugin/include/row0umod.h
+++ b/storage/innobase/include/row0umod.h
diff --git a/storage/innodb_plugin/include/row0umod.ic b/storage/innobase/include/row0umod.ic
index ea3fd3b43c7..ea3fd3b43c7 100644
--- a/storage/innodb_plugin/include/row0umod.ic
+++ b/storage/innobase/include/row0umod.ic
diff --git a/storage/innodb_plugin/include/row0undo.h b/storage/innobase/include/row0undo.h
index 6eb4ca448b3..6eb4ca448b3 100644
--- a/storage/innodb_plugin/include/row0undo.h
+++ b/storage/innobase/include/row0undo.h
diff --git a/storage/innodb_plugin/include/row0undo.ic b/storage/innobase/include/row0undo.ic
index dc788debc14..dc788debc14 100644
--- a/storage/innodb_plugin/include/row0undo.ic
+++ b/storage/innobase/include/row0undo.ic
diff --git a/storage/innodb_plugin/include/row0upd.h b/storage/innobase/include/row0upd.h
index 635d746d5a1..635d746d5a1 100644
--- a/storage/innodb_plugin/include/row0upd.h
+++ b/storage/innobase/include/row0upd.h
diff --git a/storage/innodb_plugin/include/row0upd.ic b/storage/innobase/include/row0upd.ic
index 18e22f1eca9..18e22f1eca9 100644
--- a/storage/innodb_plugin/include/row0upd.ic
+++ b/storage/innobase/include/row0upd.ic
diff --git a/storage/innodb_plugin/include/row0vers.h b/storage/innobase/include/row0vers.h
index 5a2e38230d5..5a2e38230d5 100644
--- a/storage/innodb_plugin/include/row0vers.h
+++ b/storage/innobase/include/row0vers.h
diff --git a/storage/innodb_plugin/include/row0vers.ic b/storage/innobase/include/row0vers.ic
index 8bb3a5c0cb3..8bb3a5c0cb3 100644
--- a/storage/innodb_plugin/include/row0vers.ic
+++ b/storage/innobase/include/row0vers.ic
diff --git a/storage/innodb_plugin/include/srv0que.h b/storage/innobase/include/srv0que.h
index 82ee7739ef7..82ee7739ef7 100644
--- a/storage/innodb_plugin/include/srv0que.h
+++ b/storage/innobase/include/srv0que.h
diff --git a/storage/innodb_plugin/include/srv0srv.h b/storage/innobase/include/srv0srv.h
index 499bccfe2b8..499bccfe2b8 100644
--- a/storage/innodb_plugin/include/srv0srv.h
+++ b/storage/innobase/include/srv0srv.h
diff --git a/storage/innodb_plugin/include/srv0srv.ic b/storage/innobase/include/srv0srv.ic
index 8a1a678a016..8a1a678a016 100644
--- a/storage/innodb_plugin/include/srv0srv.ic
+++ b/storage/innobase/include/srv0srv.ic
diff --git a/storage/innodb_plugin/include/srv0start.h b/storage/innobase/include/srv0start.h
index 8abf15da9c1..8abf15da9c1 100644
--- a/storage/innodb_plugin/include/srv0start.h
+++ b/storage/innobase/include/srv0start.h
diff --git a/storage/innodb_plugin/include/sync0arr.h b/storage/innobase/include/sync0arr.h
index 5f1280f5e28..5f1280f5e28 100644
--- a/storage/innodb_plugin/include/sync0arr.h
+++ b/storage/innobase/include/sync0arr.h
diff --git a/storage/innodb_plugin/include/sync0arr.ic b/storage/innobase/include/sync0arr.ic
index bf57f5b2dc2..bf57f5b2dc2 100644
--- a/storage/innodb_plugin/include/sync0arr.ic
+++ b/storage/innobase/include/sync0arr.ic
diff --git a/storage/innodb_plugin/include/sync0rw.h b/storage/innobase/include/sync0rw.h
index aedfd5f3f86..aedfd5f3f86 100644
--- a/storage/innodb_plugin/include/sync0rw.h
+++ b/storage/innobase/include/sync0rw.h
diff --git a/storage/innodb_plugin/include/sync0rw.ic b/storage/innobase/include/sync0rw.ic
index 7116f1b7c9b..7116f1b7c9b 100644
--- a/storage/innodb_plugin/include/sync0rw.ic
+++ b/storage/innobase/include/sync0rw.ic
diff --git a/storage/innodb_plugin/include/sync0sync.h b/storage/innobase/include/sync0sync.h
index df990823cc4..df990823cc4 100644
--- a/storage/innodb_plugin/include/sync0sync.h
+++ b/storage/innobase/include/sync0sync.h
diff --git a/storage/innodb_plugin/include/sync0sync.ic b/storage/innobase/include/sync0sync.ic
index b05020b5660..b05020b5660 100644
--- a/storage/innodb_plugin/include/sync0sync.ic
+++ b/storage/innobase/include/sync0sync.ic
diff --git a/storage/innodb_plugin/include/sync0types.h b/storage/innobase/include/sync0types.h
index 1911bbac7fd..1911bbac7fd 100644
--- a/storage/innodb_plugin/include/sync0types.h
+++ b/storage/innobase/include/sync0types.h
diff --git a/storage/innodb_plugin/include/thr0loc.h b/storage/innobase/include/thr0loc.h
index b4bdc33e615..b4bdc33e615 100644
--- a/storage/innodb_plugin/include/thr0loc.h
+++ b/storage/innobase/include/thr0loc.h
diff --git a/storage/innodb_plugin/include/thr0loc.ic b/storage/innobase/include/thr0loc.ic
index ce44e512320..ce44e512320 100644
--- a/storage/innodb_plugin/include/thr0loc.ic
+++ b/storage/innobase/include/thr0loc.ic
diff --git a/storage/innodb_plugin/include/trx0i_s.h b/storage/innobase/include/trx0i_s.h
index 9bf032de9f9..9bf032de9f9 100644
--- a/storage/innodb_plugin/include/trx0i_s.h
+++ b/storage/innobase/include/trx0i_s.h
diff --git a/storage/innodb_plugin/include/trx0purge.h b/storage/innobase/include/trx0purge.h
index 7812ad7eb92..7812ad7eb92 100644
--- a/storage/innodb_plugin/include/trx0purge.h
+++ b/storage/innobase/include/trx0purge.h
diff --git a/storage/innodb_plugin/include/trx0purge.ic b/storage/innobase/include/trx0purge.ic
index de09e393654..de09e393654 100644
--- a/storage/innodb_plugin/include/trx0purge.ic
+++ b/storage/innobase/include/trx0purge.ic
diff --git a/storage/innodb_plugin/include/trx0rec.h b/storage/innobase/include/trx0rec.h
index 0ae82c33afe..0ae82c33afe 100644
--- a/storage/innodb_plugin/include/trx0rec.h
+++ b/storage/innobase/include/trx0rec.h
diff --git a/storage/innodb_plugin/include/trx0rec.ic b/storage/innobase/include/trx0rec.ic
index 037b5d4f6cf..037b5d4f6cf 100644
--- a/storage/innodb_plugin/include/trx0rec.ic
+++ b/storage/innobase/include/trx0rec.ic
diff --git a/storage/innodb_plugin/include/trx0roll.h b/storage/innobase/include/trx0roll.h
index ddca9e9e4ef..ddca9e9e4ef 100644
--- a/storage/innodb_plugin/include/trx0roll.h
+++ b/storage/innobase/include/trx0roll.h
diff --git a/storage/innodb_plugin/include/trx0roll.ic b/storage/innobase/include/trx0roll.ic
index 3460832b18c..3460832b18c 100644
--- a/storage/innodb_plugin/include/trx0roll.ic
+++ b/storage/innobase/include/trx0roll.ic
diff --git a/storage/innodb_plugin/include/trx0rseg.h b/storage/innobase/include/trx0rseg.h
index dbc732651ca..dbc732651ca 100644
--- a/storage/innodb_plugin/include/trx0rseg.h
+++ b/storage/innobase/include/trx0rseg.h
diff --git a/storage/innodb_plugin/include/trx0rseg.ic b/storage/innobase/include/trx0rseg.ic
index daffa92fc7d..daffa92fc7d 100644
--- a/storage/innodb_plugin/include/trx0rseg.ic
+++ b/storage/innobase/include/trx0rseg.ic
diff --git a/storage/innodb_plugin/include/trx0sys.h b/storage/innobase/include/trx0sys.h
index 812e8cfa0ba..812e8cfa0ba 100644
--- a/storage/innodb_plugin/include/trx0sys.h
+++ b/storage/innobase/include/trx0sys.h
diff --git a/storage/innodb_plugin/include/trx0sys.ic b/storage/innobase/include/trx0sys.ic
index 1c7c732751b..1c7c732751b 100644
--- a/storage/innodb_plugin/include/trx0sys.ic
+++ b/storage/innobase/include/trx0sys.ic
diff --git a/storage/innodb_plugin/include/trx0trx.h b/storage/innobase/include/trx0trx.h
index 681feeaec94..681feeaec94 100644
--- a/storage/innodb_plugin/include/trx0trx.h
+++ b/storage/innobase/include/trx0trx.h
diff --git a/storage/innodb_plugin/include/trx0trx.ic b/storage/innobase/include/trx0trx.ic
index 7332eeece85..7332eeece85 100644
--- a/storage/innodb_plugin/include/trx0trx.ic
+++ b/storage/innobase/include/trx0trx.ic
diff --git a/storage/innodb_plugin/include/trx0types.h b/storage/innobase/include/trx0types.h
index 08cc9622d02..08cc9622d02 100644
--- a/storage/innodb_plugin/include/trx0types.h
+++ b/storage/innobase/include/trx0types.h
diff --git a/storage/innodb_plugin/include/trx0undo.h b/storage/innobase/include/trx0undo.h
index 4db10eaa92e..4db10eaa92e 100644
--- a/storage/innodb_plugin/include/trx0undo.h
+++ b/storage/innobase/include/trx0undo.h
diff --git a/storage/innodb_plugin/include/trx0undo.ic b/storage/innobase/include/trx0undo.ic
index 2d289b34ef1..2d289b34ef1 100644
--- a/storage/innodb_plugin/include/trx0undo.ic
+++ b/storage/innobase/include/trx0undo.ic
diff --git a/storage/innodb_plugin/include/trx0xa.h b/storage/innobase/include/trx0xa.h
index e0dd8a1af5b..e0dd8a1af5b 100644
--- a/storage/innodb_plugin/include/trx0xa.h
+++ b/storage/innobase/include/trx0xa.h
diff --git a/storage/innodb_plugin/include/univ.i b/storage/innobase/include/univ.i
index 6bce6dd765e..6bce6dd765e 100644
--- a/storage/innodb_plugin/include/univ.i
+++ b/storage/innobase/include/univ.i
diff --git a/storage/innodb_plugin/include/usr0sess.h b/storage/innobase/include/usr0sess.h
index 7638a0c69e2..7638a0c69e2 100644
--- a/storage/innodb_plugin/include/usr0sess.h
+++ b/storage/innobase/include/usr0sess.h
diff --git a/storage/innodb_plugin/include/usr0sess.ic b/storage/innobase/include/usr0sess.ic
index 35a75d75acc..35a75d75acc 100644
--- a/storage/innodb_plugin/include/usr0sess.ic
+++ b/storage/innobase/include/usr0sess.ic
diff --git a/storage/innodb_plugin/include/usr0types.h b/storage/innobase/include/usr0types.h
index 6cc6f015613..6cc6f015613 100644
--- a/storage/innodb_plugin/include/usr0types.h
+++ b/storage/innobase/include/usr0types.h
diff --git a/storage/innodb_plugin/include/ut0auxconf.h b/storage/innobase/include/ut0auxconf.h
index 88fb26f1863..88fb26f1863 100644
--- a/storage/innodb_plugin/include/ut0auxconf.h
+++ b/storage/innobase/include/ut0auxconf.h
diff --git a/storage/innodb_plugin/include/ut0byte.h b/storage/innobase/include/ut0byte.h
index a2687e62f08..a2687e62f08 100644
--- a/storage/innodb_plugin/include/ut0byte.h
+++ b/storage/innobase/include/ut0byte.h
diff --git a/storage/innodb_plugin/include/ut0byte.ic b/storage/innobase/include/ut0byte.ic
index e3beed65138..e3beed65138 100644
--- a/storage/innodb_plugin/include/ut0byte.ic
+++ b/storage/innobase/include/ut0byte.ic
diff --git a/storage/innodb_plugin/include/ut0dbg.h b/storage/innobase/include/ut0dbg.h
index 78b525c38ab..78b525c38ab 100644
--- a/storage/innodb_plugin/include/ut0dbg.h
+++ b/storage/innobase/include/ut0dbg.h
diff --git a/storage/innodb_plugin/include/ut0list.h b/storage/innobase/include/ut0list.h
index ec67f4e2a0f..ec67f4e2a0f 100644
--- a/storage/innodb_plugin/include/ut0list.h
+++ b/storage/innobase/include/ut0list.h
diff --git a/storage/innodb_plugin/include/ut0list.ic b/storage/innobase/include/ut0list.ic
index eb5c62796e8..eb5c62796e8 100644
--- a/storage/innodb_plugin/include/ut0list.ic
+++ b/storage/innobase/include/ut0list.ic
diff --git a/storage/innodb_plugin/include/ut0lst.h b/storage/innobase/include/ut0lst.h
index 261d33963dc..261d33963dc 100644
--- a/storage/innodb_plugin/include/ut0lst.h
+++ b/storage/innobase/include/ut0lst.h
diff --git a/storage/innodb_plugin/include/ut0mem.h b/storage/innobase/include/ut0mem.h
index cf41cba4643..cf41cba4643 100644
--- a/storage/innodb_plugin/include/ut0mem.h
+++ b/storage/innobase/include/ut0mem.h
diff --git a/storage/innodb_plugin/include/ut0mem.ic b/storage/innobase/include/ut0mem.ic
index f36c28f1989..f36c28f1989 100644
--- a/storage/innodb_plugin/include/ut0mem.ic
+++ b/storage/innobase/include/ut0mem.ic
diff --git a/storage/innodb_plugin/include/ut0rnd.h b/storage/innobase/include/ut0rnd.h
index ce5152e942f..ce5152e942f 100644
--- a/storage/innodb_plugin/include/ut0rnd.h
+++ b/storage/innobase/include/ut0rnd.h
diff --git a/storage/innodb_plugin/include/ut0rnd.ic b/storage/innobase/include/ut0rnd.ic
index 763469142ec..763469142ec 100644
--- a/storage/innodb_plugin/include/ut0rnd.ic
+++ b/storage/innobase/include/ut0rnd.ic
diff --git a/storage/innodb_plugin/include/ut0sort.h b/storage/innobase/include/ut0sort.h
index 5c6647dda9e..5c6647dda9e 100644
--- a/storage/innodb_plugin/include/ut0sort.h
+++ b/storage/innobase/include/ut0sort.h
diff --git a/storage/innodb_plugin/include/ut0ut.h b/storage/innobase/include/ut0ut.h
index 80094321041..80094321041 100644
--- a/storage/innodb_plugin/include/ut0ut.h
+++ b/storage/innobase/include/ut0ut.h
diff --git a/storage/innodb_plugin/include/ut0ut.ic b/storage/innobase/include/ut0ut.ic
index 6f55c7e410e..6f55c7e410e 100644
--- a/storage/innodb_plugin/include/ut0ut.ic
+++ b/storage/innobase/include/ut0ut.ic
diff --git a/storage/innodb_plugin/include/ut0vec.h b/storage/innobase/include/ut0vec.h
index a770f671cfc..a770f671cfc 100644
--- a/storage/innodb_plugin/include/ut0vec.h
+++ b/storage/innobase/include/ut0vec.h
diff --git a/storage/innodb_plugin/include/ut0vec.ic b/storage/innobase/include/ut0vec.ic
index 02e881f9bca..02e881f9bca 100644
--- a/storage/innodb_plugin/include/ut0vec.ic
+++ b/storage/innobase/include/ut0vec.ic
diff --git a/storage/innodb_plugin/include/ut0wqueue.h b/storage/innobase/include/ut0wqueue.h
index 2ec0f16ab05..2ec0f16ab05 100644
--- a/storage/innodb_plugin/include/ut0wqueue.h
+++ b/storage/innobase/include/ut0wqueue.h
diff --git a/storage/innodb_plugin/lock/lock0iter.c b/storage/innobase/lock/lock0iter.c
index 51d1802ccde..51d1802ccde 100644
--- a/storage/innodb_plugin/lock/lock0iter.c
+++ b/storage/innobase/lock/lock0iter.c
diff --git a/storage/innodb_plugin/lock/lock0lock.c b/storage/innobase/lock/lock0lock.c
index fcd8d268331..fcd8d268331 100644
--- a/storage/innodb_plugin/lock/lock0lock.c
+++ b/storage/innobase/lock/lock0lock.c
diff --git a/storage/innodb_plugin/log/log0log.c b/storage/innobase/log/log0log.c
index 24c828cdf5f..24c828cdf5f 100644
--- a/storage/innodb_plugin/log/log0log.c
+++ b/storage/innobase/log/log0log.c
diff --git a/storage/innodb_plugin/log/log0recv.c b/storage/innobase/log/log0recv.c
index aea29c78517..aea29c78517 100644
--- a/storage/innodb_plugin/log/log0recv.c
+++ b/storage/innobase/log/log0recv.c
diff --git a/storage/innodb_plugin/mach/mach0data.c b/storage/innobase/mach/mach0data.c
index e030ce9aadf..e030ce9aadf 100644
--- a/storage/innodb_plugin/mach/mach0data.c
+++ b/storage/innobase/mach/mach0data.c
diff --git a/storage/innodb_plugin/mem/mem0dbg.c b/storage/innobase/mem/mem0dbg.c
index a20eb2ad7d2..a20eb2ad7d2 100644
--- a/storage/innodb_plugin/mem/mem0dbg.c
+++ b/storage/innobase/mem/mem0dbg.c
diff --git a/storage/innodb_plugin/mem/mem0mem.c b/storage/innobase/mem/mem0mem.c
index e0dc8716f13..e0dc8716f13 100644
--- a/storage/innodb_plugin/mem/mem0mem.c
+++ b/storage/innobase/mem/mem0mem.c
diff --git a/storage/innodb_plugin/mem/mem0pool.c b/storage/innobase/mem/mem0pool.c
index c8fea97a6a3..c8fea97a6a3 100644
--- a/storage/innodb_plugin/mem/mem0pool.c
+++ b/storage/innobase/mem/mem0pool.c
diff --git a/storage/innodb_plugin/mtr/mtr0log.c b/storage/innobase/mtr/mtr0log.c
index 3f3dab36b76..3f3dab36b76 100644
--- a/storage/innodb_plugin/mtr/mtr0log.c
+++ b/storage/innobase/mtr/mtr0log.c
diff --git a/storage/innodb_plugin/mtr/mtr0mtr.c b/storage/innobase/mtr/mtr0mtr.c
index be31c5df801..be31c5df801 100644
--- a/storage/innodb_plugin/mtr/mtr0mtr.c
+++ b/storage/innobase/mtr/mtr0mtr.c
diff --git a/storage/innodb_plugin/mysql-test/ctype_innodb_like.inc b/storage/innobase/mysql-test/ctype_innodb_like.inc
index ae43342885a..ae43342885a 100644
--- a/storage/innodb_plugin/mysql-test/ctype_innodb_like.inc
+++ b/storage/innobase/mysql-test/ctype_innodb_like.inc
diff --git a/storage/innodb_plugin/mysql-test/have_innodb.inc b/storage/innobase/mysql-test/have_innodb.inc
index 8944cc46f3e..8944cc46f3e 100644
--- a/storage/innodb_plugin/mysql-test/have_innodb.inc
+++ b/storage/innobase/mysql-test/have_innodb.inc
diff --git a/storage/innodb_plugin/mysql-test/innodb-analyze.result b/storage/innobase/mysql-test/innodb-analyze.result
index 2aee004a2d6..2aee004a2d6 100644
--- a/storage/innodb_plugin/mysql-test/innodb-analyze.result
+++ b/storage/innobase/mysql-test/innodb-analyze.result
diff --git a/storage/innodb_plugin/mysql-test/innodb-analyze.test b/storage/innobase/mysql-test/innodb-analyze.test
index d5d6d698170..d5d6d698170 100644
--- a/storage/innodb_plugin/mysql-test/innodb-analyze.test
+++ b/storage/innobase/mysql-test/innodb-analyze.test
diff --git a/storage/innodb_plugin/mysql-test/innodb-autoinc.result b/storage/innobase/mysql-test/innodb-autoinc.result
index d2e8eb19e0c..d2e8eb19e0c 100644
--- a/storage/innodb_plugin/mysql-test/innodb-autoinc.result
+++ b/storage/innobase/mysql-test/innodb-autoinc.result
diff --git a/storage/innodb_plugin/mysql-test/innodb-autoinc.test b/storage/innobase/mysql-test/innodb-autoinc.test
index 61c42f45733..61c42f45733 100644
--- a/storage/innodb_plugin/mysql-test/innodb-autoinc.test
+++ b/storage/innobase/mysql-test/innodb-autoinc.test
diff --git a/storage/innodb_plugin/mysql-test/innodb-index.inc b/storage/innobase/mysql-test/innodb-index.inc
index 37de3162abe..37de3162abe 100644
--- a/storage/innodb_plugin/mysql-test/innodb-index.inc
+++ b/storage/innobase/mysql-test/innodb-index.inc
diff --git a/storage/innodb_plugin/mysql-test/innodb-index.result b/storage/innobase/mysql-test/innodb-index.result
index a7d66b15300..a7d66b15300 100644
--- a/storage/innodb_plugin/mysql-test/innodb-index.result
+++ b/storage/innobase/mysql-test/innodb-index.result
diff --git a/storage/innodb_plugin/mysql-test/innodb-index.test b/storage/innobase/mysql-test/innodb-index.test
index 42888ff3686..42888ff3686 100644
--- a/storage/innodb_plugin/mysql-test/innodb-index.test
+++ b/storage/innobase/mysql-test/innodb-index.test
diff --git a/storage/innodb_plugin/mysql-test/innodb-index_ucs2.result b/storage/innobase/mysql-test/innodb-index_ucs2.result
index c8a1e8c7da1..c8a1e8c7da1 100644
--- a/storage/innodb_plugin/mysql-test/innodb-index_ucs2.result
+++ b/storage/innobase/mysql-test/innodb-index_ucs2.result
diff --git a/storage/innodb_plugin/mysql-test/innodb-index_ucs2.test b/storage/innobase/mysql-test/innodb-index_ucs2.test
index fff9a4da1a8..fff9a4da1a8 100644
--- a/storage/innodb_plugin/mysql-test/innodb-index_ucs2.test
+++ b/storage/innobase/mysql-test/innodb-index_ucs2.test
diff --git a/storage/innodb_plugin/mysql-test/innodb-lock.result b/storage/innobase/mysql-test/innodb-lock.result
index 4ace4065c34..4ace4065c34 100644
--- a/storage/innodb_plugin/mysql-test/innodb-lock.result
+++ b/storage/innobase/mysql-test/innodb-lock.result
diff --git a/storage/innodb_plugin/mysql-test/innodb-lock.test b/storage/innobase/mysql-test/innodb-lock.test
index eacf7e562be..eacf7e562be 100644
--- a/storage/innodb_plugin/mysql-test/innodb-lock.test
+++ b/storage/innobase/mysql-test/innodb-lock.test
diff --git a/storage/innodb_plugin/mysql-test/innodb-master.opt b/storage/innobase/mysql-test/innodb-master.opt
index 4901efb416c..4901efb416c 100644
--- a/storage/innodb_plugin/mysql-test/innodb-master.opt
+++ b/storage/innobase/mysql-test/innodb-master.opt
diff --git a/storage/innodb_plugin/mysql-test/innodb-replace.result b/storage/innobase/mysql-test/innodb-replace.result
index c926bb89a2e..c926bb89a2e 100644
--- a/storage/innodb_plugin/mysql-test/innodb-replace.result
+++ b/storage/innobase/mysql-test/innodb-replace.result
diff --git a/storage/innodb_plugin/mysql-test/innodb-replace.test b/storage/innobase/mysql-test/innodb-replace.test
index 8c3aacde5e8..8c3aacde5e8 100644
--- a/storage/innodb_plugin/mysql-test/innodb-replace.test
+++ b/storage/innobase/mysql-test/innodb-replace.test
diff --git a/storage/innodb_plugin/mysql-test/innodb-semi-consistent-master.opt b/storage/innobase/mysql-test/innodb-semi-consistent-master.opt
index e76299453d3..e76299453d3 100644
--- a/storage/innodb_plugin/mysql-test/innodb-semi-consistent-master.opt
+++ b/storage/innobase/mysql-test/innodb-semi-consistent-master.opt
diff --git a/storage/innodb_plugin/mysql-test/innodb-semi-consistent.result b/storage/innobase/mysql-test/innodb-semi-consistent.result
index ca0e362ef80..ca0e362ef80 100644
--- a/storage/innodb_plugin/mysql-test/innodb-semi-consistent.result
+++ b/storage/innobase/mysql-test/innodb-semi-consistent.result
diff --git a/storage/innodb_plugin/mysql-test/innodb-semi-consistent.test b/storage/innobase/mysql-test/innodb-semi-consistent.test
index 61ad7815ca9..61ad7815ca9 100644
--- a/storage/innodb_plugin/mysql-test/innodb-semi-consistent.test
+++ b/storage/innobase/mysql-test/innodb-semi-consistent.test
diff --git a/storage/innodb_plugin/mysql-test/innodb-timeout.result b/storage/innobase/mysql-test/innodb-timeout.result
index be9a688cd72..be9a688cd72 100644
--- a/storage/innodb_plugin/mysql-test/innodb-timeout.result
+++ b/storage/innobase/mysql-test/innodb-timeout.result
diff --git a/storage/innodb_plugin/mysql-test/innodb-timeout.test b/storage/innobase/mysql-test/innodb-timeout.test
index f23fe3cff2d..f23fe3cff2d 100644
--- a/storage/innodb_plugin/mysql-test/innodb-timeout.test
+++ b/storage/innobase/mysql-test/innodb-timeout.test
diff --git a/storage/innodb_plugin/mysql-test/innodb-use-sys-malloc-master.opt b/storage/innobase/mysql-test/innodb-use-sys-malloc-master.opt
index 889834add01..889834add01 100644
--- a/storage/innodb_plugin/mysql-test/innodb-use-sys-malloc-master.opt
+++ b/storage/innobase/mysql-test/innodb-use-sys-malloc-master.opt
diff --git a/storage/innodb_plugin/mysql-test/innodb-use-sys-malloc.result b/storage/innobase/mysql-test/innodb-use-sys-malloc.result
index 2ec4c7c8130..2ec4c7c8130 100644
--- a/storage/innodb_plugin/mysql-test/innodb-use-sys-malloc.result
+++ b/storage/innobase/mysql-test/innodb-use-sys-malloc.result
diff --git a/storage/innodb_plugin/mysql-test/innodb-use-sys-malloc.test b/storage/innobase/mysql-test/innodb-use-sys-malloc.test
index 325dd19d086..325dd19d086 100644
--- a/storage/innodb_plugin/mysql-test/innodb-use-sys-malloc.test
+++ b/storage/innobase/mysql-test/innodb-use-sys-malloc.test
diff --git a/storage/innodb_plugin/mysql-test/innodb-zip.result b/storage/innobase/mysql-test/innodb-zip.result
index c81401743a5..c81401743a5 100644
--- a/storage/innodb_plugin/mysql-test/innodb-zip.result
+++ b/storage/innobase/mysql-test/innodb-zip.result
diff --git a/storage/innodb_plugin/mysql-test/innodb-zip.test b/storage/innobase/mysql-test/innodb-zip.test
index ddc39d44487..ddc39d44487 100644
--- a/storage/innodb_plugin/mysql-test/innodb-zip.test
+++ b/storage/innobase/mysql-test/innodb-zip.test
diff --git a/storage/innodb_plugin/mysql-test/innodb.result b/storage/innobase/mysql-test/innodb.result
index bdae7633fd1..bdae7633fd1 100644
--- a/storage/innodb_plugin/mysql-test/innodb.result
+++ b/storage/innobase/mysql-test/innodb.result
diff --git a/storage/innodb_plugin/mysql-test/innodb.test b/storage/innobase/mysql-test/innodb.test
index f46a3a70b56..f46a3a70b56 100644
--- a/storage/innodb_plugin/mysql-test/innodb.test
+++ b/storage/innobase/mysql-test/innodb.test
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug21704.result b/storage/innobase/mysql-test/innodb_bug21704.result
index b8e0b15d50d..b8e0b15d50d 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug21704.result
+++ b/storage/innobase/mysql-test/innodb_bug21704.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug21704.test b/storage/innobase/mysql-test/innodb_bug21704.test
index c649b61034c..c649b61034c 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug21704.test
+++ b/storage/innobase/mysql-test/innodb_bug21704.test
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug34053.result b/storage/innobase/mysql-test/innodb_bug34053.result
index 195775f74c8..195775f74c8 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug34053.result
+++ b/storage/innobase/mysql-test/innodb_bug34053.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug34053.test b/storage/innobase/mysql-test/innodb_bug34053.test
index b935e45c06d..b935e45c06d 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug34053.test
+++ b/storage/innobase/mysql-test/innodb_bug34053.test
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug34300.result b/storage/innobase/mysql-test/innodb_bug34300.result
index ae9fee81ad7..ae9fee81ad7 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug34300.result
+++ b/storage/innobase/mysql-test/innodb_bug34300.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug34300.test b/storage/innobase/mysql-test/innodb_bug34300.test
index 114bcf98c25..114bcf98c25 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug34300.test
+++ b/storage/innobase/mysql-test/innodb_bug34300.test
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug35220.result b/storage/innobase/mysql-test/innodb_bug35220.result
index 195775f74c8..195775f74c8 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug35220.result
+++ b/storage/innobase/mysql-test/innodb_bug35220.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug35220.test b/storage/innobase/mysql-test/innodb_bug35220.test
index 26f7d6b1ddd..26f7d6b1ddd 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug35220.test
+++ b/storage/innobase/mysql-test/innodb_bug35220.test
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug36169.result b/storage/innobase/mysql-test/innodb_bug36169.result
index aa80e4d7aa4..aa80e4d7aa4 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug36169.result
+++ b/storage/innobase/mysql-test/innodb_bug36169.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug36169.test b/storage/innobase/mysql-test/innodb_bug36169.test
index d3566d3eb39..d3566d3eb39 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug36169.test
+++ b/storage/innobase/mysql-test/innodb_bug36169.test
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug36172.result b/storage/innobase/mysql-test/innodb_bug36172.result
index 195775f74c8..195775f74c8 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug36172.result
+++ b/storage/innobase/mysql-test/innodb_bug36172.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug36172.test b/storage/innobase/mysql-test/innodb_bug36172.test
index 666d4a2f4b7..666d4a2f4b7 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug36172.test
+++ b/storage/innobase/mysql-test/innodb_bug36172.test
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug40360.result b/storage/innobase/mysql-test/innodb_bug40360.result
index ef4cf463903..ef4cf463903 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug40360.result
+++ b/storage/innobase/mysql-test/innodb_bug40360.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug40360.test b/storage/innobase/mysql-test/innodb_bug40360.test
index e88837aab4f..e88837aab4f 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug40360.test
+++ b/storage/innobase/mysql-test/innodb_bug40360.test
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug40565.result b/storage/innobase/mysql-test/innodb_bug40565.result
index 21e923d9336..21e923d9336 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug40565.result
+++ b/storage/innobase/mysql-test/innodb_bug40565.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug40565.test b/storage/innobase/mysql-test/innodb_bug40565.test
index d7aa0fd514a..d7aa0fd514a 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug40565.test
+++ b/storage/innobase/mysql-test/innodb_bug40565.test
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug41904.result b/storage/innobase/mysql-test/innodb_bug41904.result
index 6070d32d181..6070d32d181 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug41904.result
+++ b/storage/innobase/mysql-test/innodb_bug41904.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug41904.test b/storage/innobase/mysql-test/innodb_bug41904.test
index 365c5229adc..365c5229adc 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug41904.test
+++ b/storage/innobase/mysql-test/innodb_bug41904.test
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug42101-nonzero-master.opt b/storage/innobase/mysql-test/innodb_bug42101-nonzero-master.opt
index d71dbe17d5b..d71dbe17d5b 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug42101-nonzero-master.opt
+++ b/storage/innobase/mysql-test/innodb_bug42101-nonzero-master.opt
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug42101-nonzero.result b/storage/innobase/mysql-test/innodb_bug42101-nonzero.result
index 277dfffdd35..277dfffdd35 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug42101-nonzero.result
+++ b/storage/innobase/mysql-test/innodb_bug42101-nonzero.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug42101-nonzero.test b/storage/innobase/mysql-test/innodb_bug42101-nonzero.test
index 685fdf20489..685fdf20489 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug42101-nonzero.test
+++ b/storage/innobase/mysql-test/innodb_bug42101-nonzero.test
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug42101.result b/storage/innobase/mysql-test/innodb_bug42101.result
index 805097ffe9d..805097ffe9d 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug42101.result
+++ b/storage/innobase/mysql-test/innodb_bug42101.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug42101.test b/storage/innobase/mysql-test/innodb_bug42101.test
index b6536490d48..b6536490d48 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug42101.test
+++ b/storage/innobase/mysql-test/innodb_bug42101.test
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug44032.result b/storage/innobase/mysql-test/innodb_bug44032.result
index da2a000b06e..da2a000b06e 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug44032.result
+++ b/storage/innobase/mysql-test/innodb_bug44032.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug44032.test b/storage/innobase/mysql-test/innodb_bug44032.test
index a963cb8b68f..a963cb8b68f 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug44032.test
+++ b/storage/innobase/mysql-test/innodb_bug44032.test
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug45357.result b/storage/innobase/mysql-test/innodb_bug45357.result
index 7adeff2062f..7adeff2062f 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug45357.result
+++ b/storage/innobase/mysql-test/innodb_bug45357.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_bug45357.test b/storage/innobase/mysql-test/innodb_bug45357.test
index 81727f352dd..81727f352dd 100644
--- a/storage/innodb_plugin/mysql-test/innodb_bug45357.test
+++ b/storage/innobase/mysql-test/innodb_bug45357.test
diff --git a/storage/innodb_plugin/mysql-test/innodb_file_format.result b/storage/innobase/mysql-test/innodb_file_format.result
index 9cfac5f001c..9cfac5f001c 100644
--- a/storage/innodb_plugin/mysql-test/innodb_file_format.result
+++ b/storage/innobase/mysql-test/innodb_file_format.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_file_format.test b/storage/innobase/mysql-test/innodb_file_format.test
index 62ce4157183..62ce4157183 100644
--- a/storage/innodb_plugin/mysql-test/innodb_file_format.test
+++ b/storage/innobase/mysql-test/innodb_file_format.test
diff --git a/storage/innodb_plugin/mysql-test/innodb_information_schema.result b/storage/innobase/mysql-test/innodb_information_schema.result
index 396cae579ce..396cae579ce 100644
--- a/storage/innodb_plugin/mysql-test/innodb_information_schema.result
+++ b/storage/innobase/mysql-test/innodb_information_schema.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_information_schema.test b/storage/innobase/mysql-test/innodb_information_schema.test
index eaed653854a..eaed653854a 100644
--- a/storage/innodb_plugin/mysql-test/innodb_information_schema.test
+++ b/storage/innobase/mysql-test/innodb_information_schema.test
diff --git a/storage/innodb_plugin/mysql-test/innodb_trx_weight.inc b/storage/innobase/mysql-test/innodb_trx_weight.inc
index 56d3d47da36..56d3d47da36 100644
--- a/storage/innodb_plugin/mysql-test/innodb_trx_weight.inc
+++ b/storage/innobase/mysql-test/innodb_trx_weight.inc
diff --git a/storage/innodb_plugin/mysql-test/innodb_trx_weight.result b/storage/innobase/mysql-test/innodb_trx_weight.result
index 195775f74c8..195775f74c8 100644
--- a/storage/innodb_plugin/mysql-test/innodb_trx_weight.result
+++ b/storage/innobase/mysql-test/innodb_trx_weight.result
diff --git a/storage/innodb_plugin/mysql-test/innodb_trx_weight.test b/storage/innobase/mysql-test/innodb_trx_weight.test
index b72eaad345f..b72eaad345f 100644
--- a/storage/innodb_plugin/mysql-test/innodb_trx_weight.test
+++ b/storage/innobase/mysql-test/innodb_trx_weight.test
diff --git a/storage/innodb_plugin/mysql-test/patches/README b/storage/innobase/mysql-test/patches/README
index 122d756e9e3..122d756e9e3 100644
--- a/storage/innodb_plugin/mysql-test/patches/README
+++ b/storage/innobase/mysql-test/patches/README
diff --git a/storage/innodb_plugin/mysql-test/patches/index_merge_innodb-explain.diff b/storage/innobase/mysql-test/patches/index_merge_innodb-explain.diff
index d1ed8afc778..d1ed8afc778 100644
--- a/storage/innodb_plugin/mysql-test/patches/index_merge_innodb-explain.diff
+++ b/storage/innobase/mysql-test/patches/index_merge_innodb-explain.diff
diff --git a/storage/innodb_plugin/mysql-test/patches/information_schema.diff b/storage/innobase/mysql-test/patches/information_schema.diff
index a3a21f7a08d..a3a21f7a08d 100644
--- a/storage/innodb_plugin/mysql-test/patches/information_schema.diff
+++ b/storage/innobase/mysql-test/patches/information_schema.diff
diff --git a/storage/innodb_plugin/mysql-test/patches/innodb-index.diff b/storage/innobase/mysql-test/patches/innodb-index.diff
index 0b008c96f25..0b008c96f25 100644
--- a/storage/innodb_plugin/mysql-test/patches/innodb-index.diff
+++ b/storage/innobase/mysql-test/patches/innodb-index.diff
diff --git a/storage/innodb_plugin/mysql-test/patches/innodb_file_per_table.diff b/storage/innobase/mysql-test/patches/innodb_file_per_table.diff
index 8b7ae2036c9..8b7ae2036c9 100644
--- a/storage/innodb_plugin/mysql-test/patches/innodb_file_per_table.diff
+++ b/storage/innobase/mysql-test/patches/innodb_file_per_table.diff
diff --git a/storage/innodb_plugin/mysql-test/patches/innodb_lock_wait_timeout.diff b/storage/innobase/mysql-test/patches/innodb_lock_wait_timeout.diff
index bc61a0f5841..bc61a0f5841 100644
--- a/storage/innodb_plugin/mysql-test/patches/innodb_lock_wait_timeout.diff
+++ b/storage/innobase/mysql-test/patches/innodb_lock_wait_timeout.diff
diff --git a/storage/innodb_plugin/mysql-test/patches/innodb_thread_concurrency_basic.diff b/storage/innobase/mysql-test/patches/innodb_thread_concurrency_basic.diff
index 72e5457905f..72e5457905f 100644
--- a/storage/innodb_plugin/mysql-test/patches/innodb_thread_concurrency_basic.diff
+++ b/storage/innobase/mysql-test/patches/innodb_thread_concurrency_basic.diff
diff --git a/storage/innodb_plugin/mysql-test/patches/partition_innodb.diff b/storage/innobase/mysql-test/patches/partition_innodb.diff
index 01bc073008e..01bc073008e 100644
--- a/storage/innodb_plugin/mysql-test/patches/partition_innodb.diff
+++ b/storage/innobase/mysql-test/patches/partition_innodb.diff
diff --git a/storage/innodb_plugin/os/os0file.c b/storage/innobase/os/os0file.c
index d3bd6465f5f..d3bd6465f5f 100644
--- a/storage/innodb_plugin/os/os0file.c
+++ b/storage/innobase/os/os0file.c
diff --git a/storage/innodb_plugin/os/os0proc.c b/storage/innobase/os/os0proc.c
index a0ea9a1b258..a0ea9a1b258 100644
--- a/storage/innodb_plugin/os/os0proc.c
+++ b/storage/innobase/os/os0proc.c
diff --git a/storage/innodb_plugin/os/os0sync.c b/storage/innobase/os/os0sync.c
index 4ec340b72b5..4ec340b72b5 100644
--- a/storage/innodb_plugin/os/os0sync.c
+++ b/storage/innobase/os/os0sync.c
diff --git a/storage/innodb_plugin/os/os0thread.c b/storage/innobase/os/os0thread.c
index 9a2d95cb166..9a2d95cb166 100644
--- a/storage/innodb_plugin/os/os0thread.c
+++ b/storage/innobase/os/os0thread.c
diff --git a/storage/innodb_plugin/page/page0cur.c b/storage/innobase/page/page0cur.c
index 65f3ba67439..65f3ba67439 100644
--- a/storage/innodb_plugin/page/page0cur.c
+++ b/storage/innobase/page/page0cur.c
diff --git a/storage/innodb_plugin/page/page0page.c b/storage/innobase/page/page0page.c
index f056ef77bdc..f056ef77bdc 100644
--- a/storage/innodb_plugin/page/page0page.c
+++ b/storage/innobase/page/page0page.c
diff --git a/storage/innodb_plugin/page/page0zip.c b/storage/innobase/page/page0zip.c
index 92ba0ec768a..92ba0ec768a 100644
--- a/storage/innodb_plugin/page/page0zip.c
+++ b/storage/innobase/page/page0zip.c
diff --git a/storage/innodb_plugin/pars/lexyy.c b/storage/innobase/pars/lexyy.c
index 37d892e51e3..37d892e51e3 100644
--- a/storage/innodb_plugin/pars/lexyy.c
+++ b/storage/innobase/pars/lexyy.c
diff --git a/storage/innodb_plugin/pars/make_bison.sh b/storage/innobase/pars/make_bison.sh
index 09bb86e3106..09bb86e3106 100755
--- a/storage/innodb_plugin/pars/make_bison.sh
+++ b/storage/innobase/pars/make_bison.sh
diff --git a/storage/innodb_plugin/pars/make_flex.sh b/storage/innobase/pars/make_flex.sh
index 89308a6636f..89308a6636f 100755
--- a/storage/innodb_plugin/pars/make_flex.sh
+++ b/storage/innobase/pars/make_flex.sh
diff --git a/storage/innodb_plugin/pars/pars0grm.c b/storage/innobase/pars/pars0grm.c
index d667970735e..d667970735e 100644
--- a/storage/innodb_plugin/pars/pars0grm.c
+++ b/storage/innobase/pars/pars0grm.c
diff --git a/storage/innodb_plugin/pars/pars0grm.y b/storage/innobase/pars/pars0grm.y
index 14d64f1826f..14d64f1826f 100644
--- a/storage/innodb_plugin/pars/pars0grm.y
+++ b/storage/innobase/pars/pars0grm.y
diff --git a/storage/innodb_plugin/pars/pars0lex.l b/storage/innobase/pars/pars0lex.l
index 4abff65e98b..4abff65e98b 100644
--- a/storage/innodb_plugin/pars/pars0lex.l
+++ b/storage/innobase/pars/pars0lex.l
diff --git a/storage/innodb_plugin/pars/pars0opt.c b/storage/innobase/pars/pars0opt.c
index 2e392ba4836..2e392ba4836 100644
--- a/storage/innodb_plugin/pars/pars0opt.c
+++ b/storage/innobase/pars/pars0opt.c
diff --git a/storage/innodb_plugin/pars/pars0pars.c b/storage/innobase/pars/pars0pars.c
index 9faf36d00a8..9faf36d00a8 100644
--- a/storage/innodb_plugin/pars/pars0pars.c
+++ b/storage/innobase/pars/pars0pars.c
diff --git a/storage/innodb_plugin/pars/pars0sym.c b/storage/innobase/pars/pars0sym.c
index b56350116bb..b56350116bb 100644
--- a/storage/innodb_plugin/pars/pars0sym.c
+++ b/storage/innobase/pars/pars0sym.c
diff --git a/storage/innodb_plugin/plug.in b/storage/innobase/plug.in
index 52ad86179a4..af5ee336efe 100644
--- a/storage/innodb_plugin/plug.in
+++ b/storage/innobase/plug.in
@@ -14,12 +14,12 @@
 # Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-MYSQL_STORAGE_ENGINE(innodb_plugin,, [InnoDB Storage Engine],
+MYSQL_STORAGE_ENGINE(innobase, innodb, [InnoDB Storage Engine],
         [Transactional Tables using InnoDB], [max,max-no-ndb])
-MYSQL_PLUGIN_DIRECTORY(innodb_plugin, [storage/innodb_plugin])
-MYSQL_PLUGIN_STATIC(innodb_plugin,   [libinnobase.a])
-MYSQL_PLUGIN_DYNAMIC(innodb_plugin,  [ha_innodb_plugin.la])
-MYSQL_PLUGIN_ACTIONS(innodb_plugin,  [
+MYSQL_PLUGIN_DIRECTORY(innobase, [storage/innobase])
+MYSQL_PLUGIN_STATIC(innobase,   [libinnobase.a])
+MYSQL_PLUGIN_DYNAMIC(innobase,  [ha_innodb.la])
+MYSQL_PLUGIN_ACTIONS(innobase,  [
   AC_CHECK_HEADERS(sched.h)
   AC_CHECK_SIZEOF(int, 4)
   AC_CHECK_SIZEOF(long, 4)
diff --git a/storage/innodb_plugin/que/que0que.c b/storage/innobase/que/que0que.c
index 54b1e7535fa..54b1e7535fa 100644
--- a/storage/innodb_plugin/que/que0que.c
+++ b/storage/innobase/que/que0que.c
diff --git a/storage/innodb_plugin/read/read0read.c b/storage/innobase/read/read0read.c
index 85adae4ddff..85adae4ddff 100644
--- a/storage/innodb_plugin/read/read0read.c
+++ b/storage/innobase/read/read0read.c
diff --git a/storage/innodb_plugin/rem/rem0cmp.c b/storage/innobase/rem/rem0cmp.c
index b707f2116d6..b707f2116d6 100644
--- a/storage/innodb_plugin/rem/rem0cmp.c
+++ b/storage/innobase/rem/rem0cmp.c
diff --git a/storage/innodb_plugin/rem/rem0rec.c b/storage/innobase/rem/rem0rec.c
index 1c8b3fd8c1e..1c8b3fd8c1e 100644
--- a/storage/innodb_plugin/rem/rem0rec.c
+++ b/storage/innobase/rem/rem0rec.c
diff --git a/storage/innodb_plugin/row/row0ext.c b/storage/innobase/row/row0ext.c
index 7320f5b1dca..7320f5b1dca 100644
--- a/storage/innodb_plugin/row/row0ext.c
+++ b/storage/innobase/row/row0ext.c
diff --git a/storage/innodb_plugin/row/row0ins.c b/storage/innobase/row/row0ins.c
index 930c9ec1fc7..930c9ec1fc7 100644
--- a/storage/innodb_plugin/row/row0ins.c
+++ b/storage/innobase/row/row0ins.c
diff --git a/storage/innodb_plugin/row/row0merge.c b/storage/innobase/row/row0merge.c
index 05a45dc647c..05a45dc647c 100644
--- a/storage/innodb_plugin/row/row0merge.c
+++ b/storage/innobase/row/row0merge.c
diff --git a/storage/innodb_plugin/row/row0mysql.c b/storage/innobase/row/row0mysql.c
index b345bb59624..b345bb59624 100644
--- a/storage/innodb_plugin/row/row0mysql.c
+++ b/storage/innobase/row/row0mysql.c
diff --git a/storage/innodb_plugin/row/row0purge.c b/storage/innobase/row/row0purge.c
index 500ebe571ab..500ebe571ab 100644
--- a/storage/innodb_plugin/row/row0purge.c
+++ b/storage/innobase/row/row0purge.c
diff --git a/storage/innodb_plugin/row/row0row.c b/storage/innobase/row/row0row.c
index 128ac3ba3e8..128ac3ba3e8 100644
--- a/storage/innodb_plugin/row/row0row.c
+++ b/storage/innobase/row/row0row.c
diff --git a/storage/innodb_plugin/row/row0sel.c b/storage/innobase/row/row0sel.c
index 3ef9726588e..3ef9726588e 100644
--- a/storage/innodb_plugin/row/row0sel.c
+++ b/storage/innobase/row/row0sel.c
diff --git a/storage/innodb_plugin/row/row0uins.c b/storage/innobase/row/row0uins.c
index 9f9c814f1a5..9f9c814f1a5 100644
--- a/storage/innodb_plugin/row/row0uins.c
+++ b/storage/innobase/row/row0uins.c
diff --git a/storage/innodb_plugin/row/row0umod.c b/storage/innobase/row/row0umod.c
index 6be475d8c78..6be475d8c78 100644
--- a/storage/innodb_plugin/row/row0umod.c
+++ b/storage/innobase/row/row0umod.c
diff --git a/storage/innodb_plugin/row/row0undo.c b/storage/innobase/row/row0undo.c
index 3d739c9689a..3d739c9689a 100644
--- a/storage/innodb_plugin/row/row0undo.c
+++ b/storage/innobase/row/row0undo.c
diff --git a/storage/innodb_plugin/row/row0upd.c b/storage/innobase/row/row0upd.c
index 58dfd43ead9..58dfd43ead9 100644
--- a/storage/innodb_plugin/row/row0upd.c
+++ b/storage/innobase/row/row0upd.c
diff --git a/storage/innodb_plugin/row/row0vers.c b/storage/innobase/row/row0vers.c
index a4fbb5289aa..a4fbb5289aa 100644
--- a/storage/innodb_plugin/row/row0vers.c
+++ b/storage/innobase/row/row0vers.c
diff --git a/storage/innodb_plugin/scripts/install_innodb_plugins.sql b/storage/innobase/scripts/install_innodb_plugins.sql
index 3fdb8f11e22..3fdb8f11e22 100644
--- a/storage/innodb_plugin/scripts/install_innodb_plugins.sql
+++ b/storage/innobase/scripts/install_innodb_plugins.sql
diff --git a/storage/innodb_plugin/scripts/install_innodb_plugins_win.sql b/storage/innobase/scripts/install_innodb_plugins_win.sql
index 8c94b4e240d..8c94b4e240d 100644
--- a/storage/innodb_plugin/scripts/install_innodb_plugins_win.sql
+++ b/storage/innobase/scripts/install_innodb_plugins_win.sql
diff --git a/storage/innodb_plugin/setup.sh b/storage/innobase/setup.sh
index 23fe729a406..23fe729a406 100755
--- a/storage/innodb_plugin/setup.sh
+++ b/storage/innobase/setup.sh
diff --git a/storage/innodb_plugin/srv/srv0que.c b/storage/innobase/srv/srv0que.c
index fc50a86a55c..fc50a86a55c 100644
--- a/storage/innodb_plugin/srv/srv0que.c
+++ b/storage/innobase/srv/srv0que.c
diff --git a/storage/innodb_plugin/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
index 79fa08e7cdf..79fa08e7cdf 100644
--- a/storage/innodb_plugin/srv/srv0srv.c
+++ b/storage/innobase/srv/srv0srv.c
diff --git a/storage/innodb_plugin/srv/srv0start.c b/storage/innobase/srv/srv0start.c
index a942fd439a3..a942fd439a3 100644
--- a/storage/innodb_plugin/srv/srv0start.c
+++ b/storage/innobase/srv/srv0start.c
diff --git a/storage/innodb_plugin/sync/sync0arr.c b/storage/innobase/sync/sync0arr.c
index d78ee8f3191..d78ee8f3191 100644
--- a/storage/innodb_plugin/sync/sync0arr.c
+++ b/storage/innobase/sync/sync0arr.c
diff --git a/storage/innodb_plugin/sync/sync0rw.c b/storage/innobase/sync/sync0rw.c
index 0ed114e330c..0ed114e330c 100644
--- a/storage/innodb_plugin/sync/sync0rw.c
+++ b/storage/innobase/sync/sync0rw.c
diff --git a/storage/innodb_plugin/sync/sync0sync.c b/storage/innobase/sync/sync0sync.c
index 84ed08e14e7..84ed08e14e7 100644
--- a/storage/innodb_plugin/sync/sync0sync.c
+++ b/storage/innobase/sync/sync0sync.c
diff --git a/storage/innodb_plugin/thr/thr0loc.c b/storage/innobase/thr/thr0loc.c
index 18f7b0707bd..18f7b0707bd 100644
--- a/storage/innodb_plugin/thr/thr0loc.c
+++ b/storage/innobase/thr/thr0loc.c
diff --git a/storage/innodb_plugin/trx/trx0i_s.c b/storage/innobase/trx/trx0i_s.c
index 0d809806edc..0d809806edc 100644
--- a/storage/innodb_plugin/trx/trx0i_s.c
+++ b/storage/innobase/trx/trx0i_s.c
diff --git a/storage/innodb_plugin/trx/trx0purge.c b/storage/innobase/trx/trx0purge.c
index cd79fd1c315..cd79fd1c315 100644
--- a/storage/innodb_plugin/trx/trx0purge.c
+++ b/storage/innobase/trx/trx0purge.c
diff --git a/storage/innodb_plugin/trx/trx0rec.c b/storage/innobase/trx/trx0rec.c
index 36911c9df85..36911c9df85 100644
--- a/storage/innodb_plugin/trx/trx0rec.c
+++ b/storage/innobase/trx/trx0rec.c
diff --git a/storage/innodb_plugin/trx/trx0roll.c b/storage/innobase/trx/trx0roll.c
index 51d17192d5b..51d17192d5b 100644
--- a/storage/innodb_plugin/trx/trx0roll.c
+++ b/storage/innobase/trx/trx0roll.c
diff --git a/storage/innodb_plugin/trx/trx0rseg.c b/storage/innobase/trx/trx0rseg.c
index 580762e8716..580762e8716 100644
--- a/storage/innodb_plugin/trx/trx0rseg.c
+++ b/storage/innobase/trx/trx0rseg.c
diff --git a/storage/innodb_plugin/trx/trx0sys.c b/storage/innobase/trx/trx0sys.c
index ef10119587d..ef10119587d 100644
--- a/storage/innodb_plugin/trx/trx0sys.c
+++ b/storage/innobase/trx/trx0sys.c
diff --git a/storage/innodb_plugin/trx/trx0trx.c b/storage/innobase/trx/trx0trx.c
index 4d4885062a6..4d4885062a6 100644
--- a/storage/innodb_plugin/trx/trx0trx.c
+++ b/storage/innobase/trx/trx0trx.c
diff --git a/storage/innodb_plugin/trx/trx0undo.c b/storage/innobase/trx/trx0undo.c
index 9af96f14526..9af96f14526 100644
--- a/storage/innodb_plugin/trx/trx0undo.c
+++ b/storage/innobase/trx/trx0undo.c
diff --git a/storage/innodb_plugin/usr/usr0sess.c b/storage/innobase/usr/usr0sess.c
index 990991a2c06..990991a2c06 100644
--- a/storage/innodb_plugin/usr/usr0sess.c
+++ b/storage/innobase/usr/usr0sess.c
diff --git a/storage/innodb_plugin/ut/ut0auxconf_atomic_pthread_t_gcc.c b/storage/innobase/ut/ut0auxconf_atomic_pthread_t_gcc.c
index 30de5aa6f17..30de5aa6f17 100644
--- a/storage/innodb_plugin/ut/ut0auxconf_atomic_pthread_t_gcc.c
+++ b/storage/innobase/ut/ut0auxconf_atomic_pthread_t_gcc.c
diff --git a/storage/innodb_plugin/ut/ut0auxconf_atomic_pthread_t_solaris.c b/storage/innobase/ut/ut0auxconf_atomic_pthread_t_solaris.c
index a18a537d1d4..a18a537d1d4 100644
--- a/storage/innodb_plugin/ut/ut0auxconf_atomic_pthread_t_solaris.c
+++ b/storage/innobase/ut/ut0auxconf_atomic_pthread_t_solaris.c
diff --git a/storage/innodb_plugin/ut/ut0auxconf_have_solaris_atomics.c b/storage/innobase/ut/ut0auxconf_have_solaris_atomics.c
index 7eb704edd4b..7eb704edd4b 100644
--- a/storage/innodb_plugin/ut/ut0auxconf_have_solaris_atomics.c
+++ b/storage/innobase/ut/ut0auxconf_have_solaris_atomics.c
diff --git a/storage/innodb_plugin/ut/ut0auxconf_pause.c b/storage/innobase/ut/ut0auxconf_pause.c
index 54d63bdd9bc..54d63bdd9bc 100644
--- a/storage/innodb_plugin/ut/ut0auxconf_pause.c
+++ b/storage/innobase/ut/ut0auxconf_pause.c
diff --git a/storage/innodb_plugin/ut/ut0auxconf_sizeof_pthread_t.c b/storage/innobase/ut/ut0auxconf_sizeof_pthread_t.c
index 96add4526ef..96add4526ef 100644
--- a/storage/innodb_plugin/ut/ut0auxconf_sizeof_pthread_t.c
+++ b/storage/innobase/ut/ut0auxconf_sizeof_pthread_t.c
diff --git a/storage/innodb_plugin/ut/ut0byte.c b/storage/innobase/ut/ut0byte.c
index 4e093f72ce2..4e093f72ce2 100644
--- a/storage/innodb_plugin/ut/ut0byte.c
+++ b/storage/innobase/ut/ut0byte.c
diff --git a/storage/innodb_plugin/ut/ut0dbg.c b/storage/innobase/ut/ut0dbg.c
index 4484e6c36de..4484e6c36de 100644
--- a/storage/innodb_plugin/ut/ut0dbg.c
+++ b/storage/innobase/ut/ut0dbg.c
diff --git a/storage/innodb_plugin/ut/ut0list.c b/storage/innobase/ut/ut0list.c
index 895a575c535..895a575c535 100644
--- a/storage/innodb_plugin/ut/ut0list.c
+++ b/storage/innobase/ut/ut0list.c
diff --git a/storage/innodb_plugin/ut/ut0mem.c b/storage/innobase/ut/ut0mem.c
index edb63c95700..edb63c95700 100644
--- a/storage/innodb_plugin/ut/ut0mem.c
+++ b/storage/innobase/ut/ut0mem.c
diff --git a/storage/innodb_plugin/ut/ut0rnd.c b/storage/innobase/ut/ut0rnd.c
index cefd0990ecc..cefd0990ecc 100644
--- a/storage/innodb_plugin/ut/ut0rnd.c
+++ b/storage/innobase/ut/ut0rnd.c
diff --git a/storage/innodb_plugin/ut/ut0ut.c b/storage/innobase/ut/ut0ut.c
index e4cc226fbad..e4cc226fbad 100644
--- a/storage/innodb_plugin/ut/ut0ut.c
+++ b/storage/innobase/ut/ut0ut.c
diff --git a/storage/innodb_plugin/ut/ut0vec.c b/storage/innobase/ut/ut0vec.c
index 45f2bc9771f..45f2bc9771f 100644
--- a/storage/innodb_plugin/ut/ut0vec.c
+++ b/storage/innobase/ut/ut0vec.c
diff --git a/storage/innodb_plugin/ut/ut0wqueue.c b/storage/innobase/ut/ut0wqueue.c
index 5220d1e17f4..5220d1e17f4 100644
--- a/storage/innodb_plugin/ut/ut0wqueue.c
+++ b/storage/innobase/ut/ut0wqueue.c
diff --git a/storage/innodb_plugin/win-plugin/README b/storage/innobase/win-plugin/README
index 00f4e996a3f..00f4e996a3f 100644
--- a/storage/innodb_plugin/win-plugin/README
+++ b/storage/innobase/win-plugin/README
diff --git a/storage/innodb_plugin/win-plugin/win-plugin.diff b/storage/innobase/win-plugin/win-plugin.diff
index 4b3354ac4de..4b3354ac4de 100644
--- a/storage/innodb_plugin/win-plugin/win-plugin.diff
+++ b/storage/innobase/win-plugin/win-plugin.diff