From 29a46b4cf93afb06d7de8d97de5c376226f61377 Mon Sep 17 00:00:00 2001 From: Guilhem Bichot Date: Fri, 7 Aug 2009 12:16:00 +0200 Subject: [PATCH] Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same layout as we always had in trees containing only the builtin 2) win\configure.js WITH_INNOBASE_STORAGE_ENGINE still works. --- storage/{innodb_plugin => innobase}/CMakeLists.txt | 10 +++++----- storage/{innodb_plugin => innobase}/COPYING | 0 storage/{innodb_plugin => innobase}/COPYING.Google | 0 .../{innodb_plugin => innobase}/COPYING.Percona | 0 .../COPYING.Sun_Microsystems | 0 storage/{innodb_plugin => innobase}/ChangeLog | 0 storage/{innodb_plugin => innobase}/Doxyfile | 0 storage/{innodb_plugin => innobase}/Makefile.am | 14 +++++++------- storage/{innodb_plugin => innobase}/README | 0 storage/{innodb_plugin => innobase}/btr/btr0btr.c | 0 storage/{innodb_plugin => innobase}/btr/btr0cur.c | 0 storage/{innodb_plugin => innobase}/btr/btr0pcur.c | 0 storage/{innodb_plugin => innobase}/btr/btr0sea.c | 0 .../{innodb_plugin => innobase}/buf/buf0buddy.c | 0 storage/{innodb_plugin => innobase}/buf/buf0buf.c | 0 storage/{innodb_plugin => innobase}/buf/buf0flu.c | 0 storage/{innodb_plugin => innobase}/buf/buf0lru.c | 0 storage/{innodb_plugin => innobase}/buf/buf0rea.c | 0 storage/{innodb_plugin => innobase}/compile-innodb | 0 .../compile-innodb-debug | 0 .../{innodb_plugin => innobase}/data/data0data.c | 0 .../{innodb_plugin => innobase}/data/data0type.c | 0 .../{innodb_plugin => innobase}/dict/dict0boot.c | 0 .../{innodb_plugin => innobase}/dict/dict0crea.c | 0 .../{innodb_plugin => innobase}/dict/dict0dict.c | 0 .../{innodb_plugin => innobase}/dict/dict0load.c | 0 .../{innodb_plugin => innobase}/dict/dict0mem.c | 0 storage/{innodb_plugin => innobase}/dyn/dyn0dyn.c | 0 .../{innodb_plugin => innobase}/eval/eval0eval.c | 0 .../{innodb_plugin => innobase}/eval/eval0proc.c | 0 storage/{innodb_plugin => innobase}/fil/fil0fil.c | 0 storage/{innodb_plugin => innobase}/fsp/fsp0fsp.c | 0 storage/{innodb_plugin => innobase}/fut/fut0fut.c | 0 storage/{innodb_plugin => innobase}/fut/fut0lst.c | 0 storage/{innodb_plugin => innobase}/ha/ha0ha.c | 0 .../{innodb_plugin => innobase}/ha/ha0storage.c | 0 storage/{innodb_plugin => innobase}/ha/hash0hash.c | 0 storage/{innodb_plugin => innobase}/ha_innodb.def | 0 .../handler/ha_innodb.cc | 2 +- .../handler/ha_innodb.h | 0 .../handler/handler0alter.cc | 0 .../handler/handler0vars.h | 0 storage/{innodb_plugin => innobase}/handler/i_s.cc | 0 storage/{innodb_plugin => innobase}/handler/i_s.h | 0 .../handler/mysql_addons.cc | 0 .../handler/win_delay_loader.cc | 0 .../{innodb_plugin => innobase}/ibuf/ibuf0ibuf.c | 0 .../{innodb_plugin => innobase}/include/btr0btr.h | 0 .../{innodb_plugin => innobase}/include/btr0btr.ic | 0 .../{innodb_plugin => innobase}/include/btr0cur.h | 0 .../{innodb_plugin => innobase}/include/btr0cur.ic | 0 .../{innodb_plugin => innobase}/include/btr0pcur.h | 0 .../include/btr0pcur.ic | 0 .../{innodb_plugin => innobase}/include/btr0sea.h | 0 .../{innodb_plugin => innobase}/include/btr0sea.ic | 0 .../include/btr0types.h | 0 .../include/buf0buddy.h | 0 .../include/buf0buddy.ic | 0 .../{innodb_plugin => innobase}/include/buf0buf.h | 0 .../{innodb_plugin => innobase}/include/buf0buf.ic | 0 .../{innodb_plugin => innobase}/include/buf0flu.h | 0 .../{innodb_plugin => innobase}/include/buf0flu.ic | 0 .../{innodb_plugin => innobase}/include/buf0lru.h | 0 .../{innodb_plugin => innobase}/include/buf0lru.ic | 0 .../{innodb_plugin => innobase}/include/buf0rea.h | 0 .../include/buf0types.h | 0 .../include/data0data.h | 0 .../include/data0data.ic | 0 .../include/data0type.h | 0 .../include/data0type.ic | 0 .../include/data0types.h | 0 .../{innodb_plugin => innobase}/include/db0err.h | 0 .../include/dict0boot.h | 0 .../include/dict0boot.ic | 0 .../include/dict0crea.h | 0 .../include/dict0crea.ic | 0 .../include/dict0dict.h | 0 .../include/dict0dict.ic | 0 .../include/dict0load.h | 0 .../include/dict0load.ic | 0 .../{innodb_plugin => innobase}/include/dict0mem.h | 0 .../include/dict0mem.ic | 0 .../include/dict0types.h | 0 .../{innodb_plugin => innobase}/include/dyn0dyn.h | 0 .../{innodb_plugin => innobase}/include/dyn0dyn.ic | 0 .../include/eval0eval.h | 0 .../include/eval0eval.ic | 0 .../include/eval0proc.h | 0 .../include/eval0proc.ic | 0 .../{innodb_plugin => innobase}/include/fil0fil.h | 0 .../{innodb_plugin => innobase}/include/fsp0fsp.h | 0 .../{innodb_plugin => innobase}/include/fsp0fsp.ic | 0 .../include/fsp0types.h | 0 .../{innodb_plugin => innobase}/include/fut0fut.h | 0 .../{innodb_plugin => innobase}/include/fut0fut.ic | 0 .../{innodb_plugin => innobase}/include/fut0lst.h | 0 .../{innodb_plugin => innobase}/include/fut0lst.ic | 0 .../{innodb_plugin => innobase}/include/ha0ha.h | 0 .../{innodb_plugin => innobase}/include/ha0ha.ic | 0 .../include/ha0storage.h | 0 .../include/ha0storage.ic | 0 .../include/ha_prototypes.h | 0 .../include/handler0alter.h | 0 .../include/hash0hash.h | 0 .../include/hash0hash.ic | 0 .../include/ibuf0ibuf.h | 0 .../include/ibuf0ibuf.ic | 0 .../include/ibuf0types.h | 0 .../include/lock0iter.h | 0 .../include/lock0lock.h | 0 .../include/lock0lock.ic | 0 .../include/lock0priv.h | 0 .../include/lock0priv.ic | 0 .../include/lock0types.h | 0 .../{innodb_plugin => innobase}/include/log0log.h | 0 .../{innodb_plugin => innobase}/include/log0log.ic | 0 .../{innodb_plugin => innobase}/include/log0recv.h | 0 .../include/log0recv.ic | 0 .../include/mach0data.h | 0 .../include/mach0data.ic | 0 .../{innodb_plugin => innobase}/include/mem0dbg.h | 0 .../{innodb_plugin => innobase}/include/mem0dbg.ic | 0 .../{innodb_plugin => innobase}/include/mem0mem.h | 0 .../{innodb_plugin => innobase}/include/mem0mem.ic | 0 .../{innodb_plugin => innobase}/include/mem0pool.h | 0 .../include/mem0pool.ic | 0 .../{innodb_plugin => innobase}/include/mtr0log.h | 0 .../{innodb_plugin => innobase}/include/mtr0log.ic | 0 .../{innodb_plugin => innobase}/include/mtr0mtr.h | 0 .../{innodb_plugin => innobase}/include/mtr0mtr.ic | 0 .../include/mtr0types.h | 0 .../include/mysql_addons.h | 0 .../{innodb_plugin => innobase}/include/os0file.h | 0 .../{innodb_plugin => innobase}/include/os0proc.h | 0 .../{innodb_plugin => innobase}/include/os0proc.ic | 0 .../{innodb_plugin => innobase}/include/os0sync.h | 0 .../{innodb_plugin => innobase}/include/os0sync.ic | 0 .../include/os0thread.h | 0 .../include/os0thread.ic | 0 .../{innodb_plugin => innobase}/include/page0cur.h | 0 .../include/page0cur.ic | 0 .../include/page0page.h | 0 .../include/page0page.ic | 0 .../include/page0types.h | 0 .../{innodb_plugin => innobase}/include/page0zip.h | 0 .../include/page0zip.ic | 0 .../{innodb_plugin => innobase}/include/pars0grm.h | 0 .../{innodb_plugin => innobase}/include/pars0opt.h | 0 .../include/pars0opt.ic | 0 .../include/pars0pars.h | 0 .../include/pars0pars.ic | 0 .../{innodb_plugin => innobase}/include/pars0sym.h | 0 .../include/pars0sym.ic | 0 .../include/pars0types.h | 0 .../{innodb_plugin => innobase}/include/que0que.h | 0 .../{innodb_plugin => innobase}/include/que0que.ic | 0 .../include/que0types.h | 0 .../include/read0read.h | 0 .../include/read0read.ic | 0 .../include/read0types.h | 0 .../{innodb_plugin => innobase}/include/rem0cmp.h | 0 .../{innodb_plugin => innobase}/include/rem0cmp.ic | 0 .../{innodb_plugin => innobase}/include/rem0rec.h | 0 .../{innodb_plugin => innobase}/include/rem0rec.ic | 0 .../include/rem0types.h | 0 .../{innodb_plugin => innobase}/include/row0ext.h | 0 .../{innodb_plugin => innobase}/include/row0ext.ic | 0 .../{innodb_plugin => innobase}/include/row0ins.h | 0 .../{innodb_plugin => innobase}/include/row0ins.ic | 0 .../include/row0merge.h | 0 .../include/row0mysql.h | 0 .../include/row0mysql.ic | 0 .../include/row0purge.h | 0 .../include/row0purge.ic | 0 .../{innodb_plugin => innobase}/include/row0row.h | 0 .../{innodb_plugin => innobase}/include/row0row.ic | 0 .../{innodb_plugin => innobase}/include/row0sel.h | 0 .../{innodb_plugin => innobase}/include/row0sel.ic | 0 .../include/row0types.h | 0 .../{innodb_plugin => innobase}/include/row0uins.h | 0 .../include/row0uins.ic | 0 .../{innodb_plugin => innobase}/include/row0umod.h | 0 .../include/row0umod.ic | 0 .../{innodb_plugin => innobase}/include/row0undo.h | 0 .../include/row0undo.ic | 0 .../{innodb_plugin => innobase}/include/row0upd.h | 0 .../{innodb_plugin => innobase}/include/row0upd.ic | 0 .../{innodb_plugin => innobase}/include/row0vers.h | 0 .../include/row0vers.ic | 0 .../{innodb_plugin => innobase}/include/srv0que.h | 0 .../{innodb_plugin => innobase}/include/srv0srv.h | 0 .../{innodb_plugin => innobase}/include/srv0srv.ic | 0 .../include/srv0start.h | 0 .../{innodb_plugin => innobase}/include/sync0arr.h | 0 .../include/sync0arr.ic | 0 .../{innodb_plugin => innobase}/include/sync0rw.h | 0 .../{innodb_plugin => innobase}/include/sync0rw.ic | 0 .../include/sync0sync.h | 0 .../include/sync0sync.ic | 0 .../include/sync0types.h | 0 .../{innodb_plugin => innobase}/include/thr0loc.h | 0 .../{innodb_plugin => innobase}/include/thr0loc.ic | 0 .../{innodb_plugin => innobase}/include/trx0i_s.h | 0 .../include/trx0purge.h | 0 .../include/trx0purge.ic | 0 .../{innodb_plugin => innobase}/include/trx0rec.h | 0 .../{innodb_plugin => innobase}/include/trx0rec.ic | 0 .../{innodb_plugin => innobase}/include/trx0roll.h | 0 .../include/trx0roll.ic | 0 .../{innodb_plugin => innobase}/include/trx0rseg.h | 0 .../include/trx0rseg.ic | 0 .../{innodb_plugin => innobase}/include/trx0sys.h | 0 .../{innodb_plugin => innobase}/include/trx0sys.ic | 0 .../{innodb_plugin => innobase}/include/trx0trx.h | 0 .../{innodb_plugin => innobase}/include/trx0trx.ic | 0 .../include/trx0types.h | 0 .../{innodb_plugin => innobase}/include/trx0undo.h | 0 .../include/trx0undo.ic | 0 .../{innodb_plugin => innobase}/include/trx0xa.h | 0 storage/{innodb_plugin => innobase}/include/univ.i | 0 .../{innodb_plugin => innobase}/include/usr0sess.h | 0 .../include/usr0sess.ic | 0 .../include/usr0types.h | 0 .../include/ut0auxconf.h | 0 .../{innodb_plugin => innobase}/include/ut0byte.h | 0 .../{innodb_plugin => innobase}/include/ut0byte.ic | 0 .../{innodb_plugin => innobase}/include/ut0dbg.h | 0 .../{innodb_plugin => innobase}/include/ut0list.h | 0 .../{innodb_plugin => innobase}/include/ut0list.ic | 0 .../{innodb_plugin => innobase}/include/ut0lst.h | 0 .../{innodb_plugin => innobase}/include/ut0mem.h | 0 .../{innodb_plugin => innobase}/include/ut0mem.ic | 0 .../{innodb_plugin => innobase}/include/ut0rnd.h | 0 .../{innodb_plugin => innobase}/include/ut0rnd.ic | 0 .../{innodb_plugin => innobase}/include/ut0sort.h | 0 .../{innodb_plugin => innobase}/include/ut0ut.h | 0 .../{innodb_plugin => innobase}/include/ut0ut.ic | 0 .../{innodb_plugin => innobase}/include/ut0vec.h | 0 .../{innodb_plugin => innobase}/include/ut0vec.ic | 0 .../include/ut0wqueue.h | 0 .../{innodb_plugin => innobase}/lock/lock0iter.c | 0 .../{innodb_plugin => innobase}/lock/lock0lock.c | 0 storage/{innodb_plugin => innobase}/log/log0log.c | 0 storage/{innodb_plugin => innobase}/log/log0recv.c | 0 .../{innodb_plugin => innobase}/mach/mach0data.c | 0 storage/{innodb_plugin => innobase}/mem/mem0dbg.c | 0 storage/{innodb_plugin => innobase}/mem/mem0mem.c | 0 storage/{innodb_plugin => innobase}/mem/mem0pool.c | 0 storage/{innodb_plugin => innobase}/mtr/mtr0log.c | 0 storage/{innodb_plugin => innobase}/mtr/mtr0mtr.c | 0 .../mysql-test/ctype_innodb_like.inc | 0 .../mysql-test/have_innodb.inc | 0 .../mysql-test/innodb-analyze.result | 0 .../mysql-test/innodb-analyze.test | 0 .../mysql-test/innodb-autoinc.result | 0 .../mysql-test/innodb-autoinc.test | 0 .../mysql-test/innodb-index.inc | 0 .../mysql-test/innodb-index.result | 0 .../mysql-test/innodb-index.test | 0 .../mysql-test/innodb-index_ucs2.result | 0 .../mysql-test/innodb-index_ucs2.test | 0 .../mysql-test/innodb-lock.result | 0 .../mysql-test/innodb-lock.test | 0 .../mysql-test/innodb-master.opt | 0 .../mysql-test/innodb-replace.result | 0 .../mysql-test/innodb-replace.test | 0 .../mysql-test/innodb-semi-consistent-master.opt | 0 .../mysql-test/innodb-semi-consistent.result | 0 .../mysql-test/innodb-semi-consistent.test | 0 .../mysql-test/innodb-timeout.result | 0 .../mysql-test/innodb-timeout.test | 0 .../mysql-test/innodb-use-sys-malloc-master.opt | 0 .../mysql-test/innodb-use-sys-malloc.result | 0 .../mysql-test/innodb-use-sys-malloc.test | 0 .../mysql-test/innodb-zip.result | 0 .../mysql-test/innodb-zip.test | 0 .../mysql-test/innodb.result | 0 .../mysql-test/innodb.test | 0 .../mysql-test/innodb_bug21704.result | 0 .../mysql-test/innodb_bug21704.test | 0 .../mysql-test/innodb_bug34053.result | 0 .../mysql-test/innodb_bug34053.test | 0 .../mysql-test/innodb_bug34300.result | 0 .../mysql-test/innodb_bug34300.test | 0 .../mysql-test/innodb_bug35220.result | 0 .../mysql-test/innodb_bug35220.test | 0 .../mysql-test/innodb_bug36169.result | 0 .../mysql-test/innodb_bug36169.test | 0 .../mysql-test/innodb_bug36172.result | 0 .../mysql-test/innodb_bug36172.test | 0 .../mysql-test/innodb_bug40360.result | 0 .../mysql-test/innodb_bug40360.test | 0 .../mysql-test/innodb_bug40565.result | 0 .../mysql-test/innodb_bug40565.test | 0 .../mysql-test/innodb_bug41904.result | 0 .../mysql-test/innodb_bug41904.test | 0 .../mysql-test/innodb_bug42101-nonzero-master.opt | 0 .../mysql-test/innodb_bug42101-nonzero.result | 0 .../mysql-test/innodb_bug42101-nonzero.test | 0 .../mysql-test/innodb_bug42101.result | 0 .../mysql-test/innodb_bug42101.test | 0 .../mysql-test/innodb_bug44032.result | 0 .../mysql-test/innodb_bug44032.test | 0 .../mysql-test/innodb_bug45357.result | 0 .../mysql-test/innodb_bug45357.test | 0 .../mysql-test/innodb_file_format.result | 0 .../mysql-test/innodb_file_format.test | 0 .../mysql-test/innodb_information_schema.result | 0 .../mysql-test/innodb_information_schema.test | 0 .../mysql-test/innodb_trx_weight.inc | 0 .../mysql-test/innodb_trx_weight.result | 0 .../mysql-test/innodb_trx_weight.test | 0 .../mysql-test/patches/README | 0 .../patches/index_merge_innodb-explain.diff | 0 .../mysql-test/patches/information_schema.diff | 0 .../mysql-test/patches/innodb-index.diff | 0 .../mysql-test/patches/innodb_file_per_table.diff | 0 .../patches/innodb_lock_wait_timeout.diff | 0 .../patches/innodb_thread_concurrency_basic.diff | 0 .../mysql-test/patches/partition_innodb.diff | 0 storage/{innodb_plugin => innobase}/os/os0file.c | 0 storage/{innodb_plugin => innobase}/os/os0proc.c | 0 storage/{innodb_plugin => innobase}/os/os0sync.c | 0 storage/{innodb_plugin => innobase}/os/os0thread.c | 0 .../{innodb_plugin => innobase}/page/page0cur.c | 0 .../{innodb_plugin => innobase}/page/page0page.c | 0 .../{innodb_plugin => innobase}/page/page0zip.c | 0 storage/{innodb_plugin => innobase}/pars/lexyy.c | 0 .../{innodb_plugin => innobase}/pars/make_bison.sh | 0 .../{innodb_plugin => innobase}/pars/make_flex.sh | 0 .../{innodb_plugin => innobase}/pars/pars0grm.c | 0 .../{innodb_plugin => innobase}/pars/pars0grm.y | 0 .../{innodb_plugin => innobase}/pars/pars0lex.l | 0 .../{innodb_plugin => innobase}/pars/pars0opt.c | 0 .../{innodb_plugin => innobase}/pars/pars0pars.c | 0 .../{innodb_plugin => innobase}/pars/pars0sym.c | 0 storage/{innodb_plugin => innobase}/plug.in | 10 +++++----- storage/{innodb_plugin => innobase}/que/que0que.c | 0 .../{innodb_plugin => innobase}/read/read0read.c | 0 storage/{innodb_plugin => innobase}/rem/rem0cmp.c | 0 storage/{innodb_plugin => innobase}/rem/rem0rec.c | 0 storage/{innodb_plugin => innobase}/row/row0ext.c | 0 storage/{innodb_plugin => innobase}/row/row0ins.c | 0 .../{innodb_plugin => innobase}/row/row0merge.c | 0 .../{innodb_plugin => innobase}/row/row0mysql.c | 0 .../{innodb_plugin => innobase}/row/row0purge.c | 0 storage/{innodb_plugin => innobase}/row/row0row.c | 0 storage/{innodb_plugin => innobase}/row/row0sel.c | 0 storage/{innodb_plugin => innobase}/row/row0uins.c | 0 storage/{innodb_plugin => innobase}/row/row0umod.c | 0 storage/{innodb_plugin => innobase}/row/row0undo.c | 0 storage/{innodb_plugin => innobase}/row/row0upd.c | 0 storage/{innodb_plugin => innobase}/row/row0vers.c | 0 .../scripts/install_innodb_plugins.sql | 0 .../scripts/install_innodb_plugins_win.sql | 0 storage/{innodb_plugin => innobase}/setup.sh | 0 storage/{innodb_plugin => innobase}/srv/srv0que.c | 0 storage/{innodb_plugin => innobase}/srv/srv0srv.c | 0 .../{innodb_plugin => innobase}/srv/srv0start.c | 0 .../{innodb_plugin => innobase}/sync/sync0arr.c | 0 storage/{innodb_plugin => innobase}/sync/sync0rw.c | 0 .../{innodb_plugin => innobase}/sync/sync0sync.c | 0 storage/{innodb_plugin => innobase}/thr/thr0loc.c | 0 storage/{innodb_plugin => innobase}/trx/trx0i_s.c | 0 .../{innodb_plugin => innobase}/trx/trx0purge.c | 0 storage/{innodb_plugin => innobase}/trx/trx0rec.c | 0 storage/{innodb_plugin => innobase}/trx/trx0roll.c | 0 storage/{innodb_plugin => innobase}/trx/trx0rseg.c | 0 storage/{innodb_plugin => innobase}/trx/trx0sys.c | 0 storage/{innodb_plugin => innobase}/trx/trx0trx.c | 0 storage/{innodb_plugin => innobase}/trx/trx0undo.c | 0 storage/{innodb_plugin => innobase}/usr/usr0sess.c | 0 .../ut/ut0auxconf_atomic_pthread_t_gcc.c | 0 .../ut/ut0auxconf_atomic_pthread_t_solaris.c | 0 .../ut/ut0auxconf_have_solaris_atomics.c | 0 .../ut/ut0auxconf_pause.c | 0 .../ut/ut0auxconf_sizeof_pthread_t.c | 0 storage/{innodb_plugin => innobase}/ut/ut0byte.c | 0 storage/{innodb_plugin => innobase}/ut/ut0dbg.c | 0 storage/{innodb_plugin => innobase}/ut/ut0list.c | 0 storage/{innodb_plugin => innobase}/ut/ut0mem.c | 0 storage/{innodb_plugin => innobase}/ut/ut0rnd.c | 0 storage/{innodb_plugin => innobase}/ut/ut0ut.c | 0 storage/{innodb_plugin => innobase}/ut/ut0vec.c | 0 storage/{innodb_plugin => innobase}/ut/ut0wqueue.c | 0 .../{innodb_plugin => innobase}/win-plugin/README | 0 .../win-plugin/win-plugin.diff | 0 387 files changed, 18 insertions(+), 18 deletions(-) rename storage/{innodb_plugin => innobase}/CMakeLists.txt (91%) rename storage/{innodb_plugin => innobase}/COPYING (100%) rename storage/{innodb_plugin => innobase}/COPYING.Google (100%) rename storage/{innodb_plugin => innobase}/COPYING.Percona (100%) rename storage/{innodb_plugin => innobase}/COPYING.Sun_Microsystems (100%) rename storage/{innodb_plugin => innobase}/ChangeLog (100%) rename storage/{innodb_plugin => innobase}/Doxyfile (100%) rename storage/{innodb_plugin => innobase}/Makefile.am (95%) rename storage/{innodb_plugin => innobase}/README (100%) rename storage/{innodb_plugin => innobase}/btr/btr0btr.c (100%) rename storage/{innodb_plugin => innobase}/btr/btr0cur.c (100%) rename storage/{innodb_plugin => innobase}/btr/btr0pcur.c (100%) rename storage/{innodb_plugin => innobase}/btr/btr0sea.c (100%) rename storage/{innodb_plugin => innobase}/buf/buf0buddy.c (100%) rename storage/{innodb_plugin => innobase}/buf/buf0buf.c (100%) rename storage/{innodb_plugin => innobase}/buf/buf0flu.c (100%) rename storage/{innodb_plugin => innobase}/buf/buf0lru.c (100%) rename storage/{innodb_plugin => innobase}/buf/buf0rea.c (100%) rename storage/{innodb_plugin => innobase}/compile-innodb (100%) rename storage/{innodb_plugin => innobase}/compile-innodb-debug (100%) rename storage/{innodb_plugin => innobase}/data/data0data.c (100%) rename storage/{innodb_plugin => innobase}/data/data0type.c (100%) rename storage/{innodb_plugin => innobase}/dict/dict0boot.c (100%) rename storage/{innodb_plugin => innobase}/dict/dict0crea.c (100%) rename storage/{innodb_plugin => innobase}/dict/dict0dict.c (100%) rename storage/{innodb_plugin => innobase}/dict/dict0load.c (100%) rename storage/{innodb_plugin => innobase}/dict/dict0mem.c (100%) rename storage/{innodb_plugin => innobase}/dyn/dyn0dyn.c (100%) rename storage/{innodb_plugin => innobase}/eval/eval0eval.c (100%) rename storage/{innodb_plugin => innobase}/eval/eval0proc.c (100%) rename storage/{innodb_plugin => innobase}/fil/fil0fil.c (100%) rename storage/{innodb_plugin => innobase}/fsp/fsp0fsp.c (100%) rename storage/{innodb_plugin => innobase}/fut/fut0fut.c (100%) rename storage/{innodb_plugin => innobase}/fut/fut0lst.c (100%) rename storage/{innodb_plugin => innobase}/ha/ha0ha.c (100%) rename storage/{innodb_plugin => innobase}/ha/ha0storage.c (100%) rename storage/{innodb_plugin => innobase}/ha/hash0hash.c (100%) rename storage/{innodb_plugin => innobase}/ha_innodb.def (100%) rename storage/{innodb_plugin => innobase}/handler/ha_innodb.cc (99%) rename storage/{innodb_plugin => innobase}/handler/ha_innodb.h (100%) rename storage/{innodb_plugin => innobase}/handler/handler0alter.cc (100%) rename storage/{innodb_plugin => innobase}/handler/handler0vars.h (100%) rename storage/{innodb_plugin => innobase}/handler/i_s.cc (100%) rename storage/{innodb_plugin => innobase}/handler/i_s.h (100%) rename storage/{innodb_plugin => innobase}/handler/mysql_addons.cc (100%) rename storage/{innodb_plugin => innobase}/handler/win_delay_loader.cc (100%) rename storage/{innodb_plugin => innobase}/ibuf/ibuf0ibuf.c (100%) rename storage/{innodb_plugin => innobase}/include/btr0btr.h (100%) rename storage/{innodb_plugin => innobase}/include/btr0btr.ic (100%) rename storage/{innodb_plugin => innobase}/include/btr0cur.h (100%) rename storage/{innodb_plugin => innobase}/include/btr0cur.ic (100%) rename storage/{innodb_plugin => innobase}/include/btr0pcur.h (100%) rename storage/{innodb_plugin => innobase}/include/btr0pcur.ic (100%) rename storage/{innodb_plugin => innobase}/include/btr0sea.h (100%) rename storage/{innodb_plugin => innobase}/include/btr0sea.ic (100%) rename storage/{innodb_plugin => innobase}/include/btr0types.h (100%) rename storage/{innodb_plugin => innobase}/include/buf0buddy.h (100%) rename storage/{innodb_plugin => innobase}/include/buf0buddy.ic (100%) rename storage/{innodb_plugin => innobase}/include/buf0buf.h (100%) rename storage/{innodb_plugin => innobase}/include/buf0buf.ic (100%) rename storage/{innodb_plugin => innobase}/include/buf0flu.h (100%) rename storage/{innodb_plugin => innobase}/include/buf0flu.ic (100%) rename storage/{innodb_plugin => innobase}/include/buf0lru.h (100%) rename storage/{innodb_plugin => innobase}/include/buf0lru.ic (100%) rename storage/{innodb_plugin => innobase}/include/buf0rea.h (100%) rename storage/{innodb_plugin => innobase}/include/buf0types.h (100%) rename storage/{innodb_plugin => innobase}/include/data0data.h (100%) rename storage/{innodb_plugin => innobase}/include/data0data.ic (100%) rename storage/{innodb_plugin => innobase}/include/data0type.h (100%) rename storage/{innodb_plugin => innobase}/include/data0type.ic (100%) rename storage/{innodb_plugin => innobase}/include/data0types.h (100%) rename storage/{innodb_plugin => innobase}/include/db0err.h (100%) rename storage/{innodb_plugin => innobase}/include/dict0boot.h (100%) rename storage/{innodb_plugin => innobase}/include/dict0boot.ic (100%) rename storage/{innodb_plugin => innobase}/include/dict0crea.h (100%) rename storage/{innodb_plugin => innobase}/include/dict0crea.ic (100%) rename storage/{innodb_plugin => innobase}/include/dict0dict.h (100%) rename storage/{innodb_plugin => innobase}/include/dict0dict.ic (100%) rename storage/{innodb_plugin => innobase}/include/dict0load.h (100%) rename storage/{innodb_plugin => innobase}/include/dict0load.ic (100%) rename storage/{innodb_plugin => innobase}/include/dict0mem.h (100%) rename storage/{innodb_plugin => innobase}/include/dict0mem.ic (100%) rename storage/{innodb_plugin => innobase}/include/dict0types.h (100%) rename storage/{innodb_plugin => innobase}/include/dyn0dyn.h (100%) rename storage/{innodb_plugin => innobase}/include/dyn0dyn.ic (100%) rename storage/{innodb_plugin => innobase}/include/eval0eval.h (100%) rename storage/{innodb_plugin => innobase}/include/eval0eval.ic (100%) rename storage/{innodb_plugin => innobase}/include/eval0proc.h (100%) rename storage/{innodb_plugin => innobase}/include/eval0proc.ic (100%) rename storage/{innodb_plugin => innobase}/include/fil0fil.h (100%) rename storage/{innodb_plugin => innobase}/include/fsp0fsp.h (100%) rename storage/{innodb_plugin => innobase}/include/fsp0fsp.ic (100%) rename storage/{innodb_plugin => innobase}/include/fsp0types.h (100%) rename storage/{innodb_plugin => innobase}/include/fut0fut.h (100%) rename storage/{innodb_plugin => innobase}/include/fut0fut.ic (100%) rename storage/{innodb_plugin => innobase}/include/fut0lst.h (100%) rename storage/{innodb_plugin => innobase}/include/fut0lst.ic (100%) rename storage/{innodb_plugin => innobase}/include/ha0ha.h (100%) rename storage/{innodb_plugin => innobase}/include/ha0ha.ic (100%) rename storage/{innodb_plugin => innobase}/include/ha0storage.h (100%) rename storage/{innodb_plugin => innobase}/include/ha0storage.ic (100%) rename storage/{innodb_plugin => innobase}/include/ha_prototypes.h (100%) rename storage/{innodb_plugin => innobase}/include/handler0alter.h (100%) rename storage/{innodb_plugin => innobase}/include/hash0hash.h (100%) rename storage/{innodb_plugin => innobase}/include/hash0hash.ic (100%) rename storage/{innodb_plugin => innobase}/include/ibuf0ibuf.h (100%) rename storage/{innodb_plugin => innobase}/include/ibuf0ibuf.ic (100%) rename storage/{innodb_plugin => innobase}/include/ibuf0types.h (100%) rename storage/{innodb_plugin => innobase}/include/lock0iter.h (100%) rename storage/{innodb_plugin => innobase}/include/lock0lock.h (100%) rename storage/{innodb_plugin => innobase}/include/lock0lock.ic (100%) rename storage/{innodb_plugin => innobase}/include/lock0priv.h (100%) rename storage/{innodb_plugin => innobase}/include/lock0priv.ic (100%) rename storage/{innodb_plugin => innobase}/include/lock0types.h (100%) rename storage/{innodb_plugin => innobase}/include/log0log.h (100%) rename storage/{innodb_plugin => innobase}/include/log0log.ic (100%) rename storage/{innodb_plugin => innobase}/include/log0recv.h (100%) rename storage/{innodb_plugin => innobase}/include/log0recv.ic (100%) rename storage/{innodb_plugin => innobase}/include/mach0data.h (100%) rename storage/{innodb_plugin => innobase}/include/mach0data.ic (100%) rename storage/{innodb_plugin => innobase}/include/mem0dbg.h (100%) rename storage/{innodb_plugin => innobase}/include/mem0dbg.ic (100%) rename storage/{innodb_plugin => innobase}/include/mem0mem.h (100%) rename storage/{innodb_plugin => innobase}/include/mem0mem.ic (100%) rename storage/{innodb_plugin => innobase}/include/mem0pool.h (100%) rename storage/{innodb_plugin => innobase}/include/mem0pool.ic (100%) rename storage/{innodb_plugin => innobase}/include/mtr0log.h (100%) rename storage/{innodb_plugin => innobase}/include/mtr0log.ic (100%) rename storage/{innodb_plugin => innobase}/include/mtr0mtr.h (100%) rename storage/{innodb_plugin => innobase}/include/mtr0mtr.ic (100%) rename storage/{innodb_plugin => innobase}/include/mtr0types.h (100%) rename storage/{innodb_plugin => innobase}/include/mysql_addons.h (100%) rename storage/{innodb_plugin => innobase}/include/os0file.h (100%) rename storage/{innodb_plugin => innobase}/include/os0proc.h (100%) rename storage/{innodb_plugin => innobase}/include/os0proc.ic (100%) rename storage/{innodb_plugin => innobase}/include/os0sync.h (100%) rename storage/{innodb_plugin => innobase}/include/os0sync.ic (100%) rename storage/{innodb_plugin => innobase}/include/os0thread.h (100%) rename storage/{innodb_plugin => innobase}/include/os0thread.ic (100%) rename storage/{innodb_plugin => innobase}/include/page0cur.h (100%) rename storage/{innodb_plugin => innobase}/include/page0cur.ic (100%) rename storage/{innodb_plugin => innobase}/include/page0page.h (100%) rename storage/{innodb_plugin => innobase}/include/page0page.ic (100%) rename storage/{innodb_plugin => innobase}/include/page0types.h (100%) rename storage/{innodb_plugin => innobase}/include/page0zip.h (100%) rename storage/{innodb_plugin => innobase}/include/page0zip.ic (100%) rename storage/{innodb_plugin => innobase}/include/pars0grm.h (100%) rename storage/{innodb_plugin => innobase}/include/pars0opt.h (100%) rename storage/{innodb_plugin => innobase}/include/pars0opt.ic (100%) rename storage/{innodb_plugin => innobase}/include/pars0pars.h (100%) rename storage/{innodb_plugin => innobase}/include/pars0pars.ic (100%) rename storage/{innodb_plugin => innobase}/include/pars0sym.h (100%) rename storage/{innodb_plugin => innobase}/include/pars0sym.ic (100%) rename storage/{innodb_plugin => innobase}/include/pars0types.h (100%) rename storage/{innodb_plugin => innobase}/include/que0que.h (100%) rename storage/{innodb_plugin => innobase}/include/que0que.ic (100%) rename storage/{innodb_plugin => innobase}/include/que0types.h (100%) rename storage/{innodb_plugin => innobase}/include/read0read.h (100%) rename storage/{innodb_plugin => innobase}/include/read0read.ic (100%) rename storage/{innodb_plugin => innobase}/include/read0types.h (100%) rename storage/{innodb_plugin => innobase}/include/rem0cmp.h (100%) rename storage/{innodb_plugin => innobase}/include/rem0cmp.ic (100%) rename storage/{innodb_plugin => innobase}/include/rem0rec.h (100%) rename storage/{innodb_plugin => innobase}/include/rem0rec.ic (100%) rename storage/{innodb_plugin => innobase}/include/rem0types.h (100%) rename storage/{innodb_plugin => innobase}/include/row0ext.h (100%) rename storage/{innodb_plugin => innobase}/include/row0ext.ic (100%) rename storage/{innodb_plugin => innobase}/include/row0ins.h (100%) rename storage/{innodb_plugin => innobase}/include/row0ins.ic (100%) rename storage/{innodb_plugin => innobase}/include/row0merge.h (100%) rename storage/{innodb_plugin => innobase}/include/row0mysql.h (100%) rename storage/{innodb_plugin => innobase}/include/row0mysql.ic (100%) rename storage/{innodb_plugin => innobase}/include/row0purge.h (100%) rename storage/{innodb_plugin => innobase}/include/row0purge.ic (100%) rename storage/{innodb_plugin => innobase}/include/row0row.h (100%) rename storage/{innodb_plugin => innobase}/include/row0row.ic (100%) rename storage/{innodb_plugin => innobase}/include/row0sel.h (100%) rename storage/{innodb_plugin => innobase}/include/row0sel.ic (100%) rename storage/{innodb_plugin => innobase}/include/row0types.h (100%) rename storage/{innodb_plugin => innobase}/include/row0uins.h (100%) rename storage/{innodb_plugin => innobase}/include/row0uins.ic (100%) rename storage/{innodb_plugin => innobase}/include/row0umod.h (100%) rename storage/{innodb_plugin => innobase}/include/row0umod.ic (100%) rename storage/{innodb_plugin => innobase}/include/row0undo.h (100%) rename storage/{innodb_plugin => innobase}/include/row0undo.ic (100%) rename storage/{innodb_plugin => innobase}/include/row0upd.h (100%) rename storage/{innodb_plugin => innobase}/include/row0upd.ic (100%) rename storage/{innodb_plugin => innobase}/include/row0vers.h (100%) rename storage/{innodb_plugin => innobase}/include/row0vers.ic (100%) rename storage/{innodb_plugin => innobase}/include/srv0que.h (100%) rename storage/{innodb_plugin => innobase}/include/srv0srv.h (100%) rename storage/{innodb_plugin => innobase}/include/srv0srv.ic (100%) rename storage/{innodb_plugin => innobase}/include/srv0start.h (100%) rename storage/{innodb_plugin => innobase}/include/sync0arr.h (100%) rename storage/{innodb_plugin => innobase}/include/sync0arr.ic (100%) rename storage/{innodb_plugin => innobase}/include/sync0rw.h (100%) rename storage/{innodb_plugin => innobase}/include/sync0rw.ic (100%) rename storage/{innodb_plugin => innobase}/include/sync0sync.h (100%) rename storage/{innodb_plugin => innobase}/include/sync0sync.ic (100%) rename storage/{innodb_plugin => innobase}/include/sync0types.h (100%) rename storage/{innodb_plugin => innobase}/include/thr0loc.h (100%) rename storage/{innodb_plugin => innobase}/include/thr0loc.ic (100%) rename storage/{innodb_plugin => innobase}/include/trx0i_s.h (100%) rename storage/{innodb_plugin => innobase}/include/trx0purge.h (100%) rename storage/{innodb_plugin => innobase}/include/trx0purge.ic (100%) rename storage/{innodb_plugin => innobase}/include/trx0rec.h (100%) rename storage/{innodb_plugin => innobase}/include/trx0rec.ic (100%) rename storage/{innodb_plugin => innobase}/include/trx0roll.h (100%) rename storage/{innodb_plugin => innobase}/include/trx0roll.ic (100%) rename storage/{innodb_plugin => innobase}/include/trx0rseg.h (100%) rename storage/{innodb_plugin => innobase}/include/trx0rseg.ic (100%) rename storage/{innodb_plugin => innobase}/include/trx0sys.h (100%) rename storage/{innodb_plugin => innobase}/include/trx0sys.ic (100%) rename storage/{innodb_plugin => innobase}/include/trx0trx.h (100%) rename storage/{innodb_plugin => innobase}/include/trx0trx.ic (100%) rename storage/{innodb_plugin => innobase}/include/trx0types.h (100%) rename storage/{innodb_plugin => innobase}/include/trx0undo.h (100%) rename storage/{innodb_plugin => innobase}/include/trx0undo.ic (100%) rename storage/{innodb_plugin => innobase}/include/trx0xa.h (100%) rename storage/{innodb_plugin => innobase}/include/univ.i (100%) rename storage/{innodb_plugin => innobase}/include/usr0sess.h (100%) rename storage/{innodb_plugin => innobase}/include/usr0sess.ic (100%) rename storage/{innodb_plugin => innobase}/include/usr0types.h (100%) rename storage/{innodb_plugin => innobase}/include/ut0auxconf.h (100%) rename storage/{innodb_plugin => innobase}/include/ut0byte.h (100%) rename storage/{innodb_plugin => innobase}/include/ut0byte.ic (100%) rename storage/{innodb_plugin => innobase}/include/ut0dbg.h (100%) rename storage/{innodb_plugin => innobase}/include/ut0list.h (100%) rename storage/{innodb_plugin => innobase}/include/ut0list.ic (100%) rename storage/{innodb_plugin => innobase}/include/ut0lst.h (100%) rename storage/{innodb_plugin => innobase}/include/ut0mem.h (100%) rename storage/{innodb_plugin => innobase}/include/ut0mem.ic (100%) rename storage/{innodb_plugin => innobase}/include/ut0rnd.h (100%) rename storage/{innodb_plugin => innobase}/include/ut0rnd.ic (100%) rename storage/{innodb_plugin => innobase}/include/ut0sort.h (100%) rename storage/{innodb_plugin => innobase}/include/ut0ut.h (100%) rename storage/{innodb_plugin => innobase}/include/ut0ut.ic (100%) rename storage/{innodb_plugin => innobase}/include/ut0vec.h (100%) rename storage/{innodb_plugin => innobase}/include/ut0vec.ic (100%) rename storage/{innodb_plugin => innobase}/include/ut0wqueue.h (100%) rename storage/{innodb_plugin => innobase}/lock/lock0iter.c (100%) rename storage/{innodb_plugin => innobase}/lock/lock0lock.c (100%) rename storage/{innodb_plugin => innobase}/log/log0log.c (100%) rename storage/{innodb_plugin => innobase}/log/log0recv.c (100%) rename storage/{innodb_plugin => innobase}/mach/mach0data.c (100%) rename storage/{innodb_plugin => innobase}/mem/mem0dbg.c (100%) rename storage/{innodb_plugin => innobase}/mem/mem0mem.c (100%) rename storage/{innodb_plugin => innobase}/mem/mem0pool.c (100%) rename storage/{innodb_plugin => innobase}/mtr/mtr0log.c (100%) rename storage/{innodb_plugin => innobase}/mtr/mtr0mtr.c (100%) rename storage/{innodb_plugin => innobase}/mysql-test/ctype_innodb_like.inc (100%) rename storage/{innodb_plugin => innobase}/mysql-test/have_innodb.inc (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb-analyze.result (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb-analyze.test (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb-autoinc.result (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb-autoinc.test (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb-index.inc (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb-index.result (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb-index.test (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb-index_ucs2.result (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb-index_ucs2.test (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb-lock.result (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb-lock.test (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb-master.opt (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb-replace.result (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb-replace.test (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb-semi-consistent-master.opt (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb-semi-consistent.result (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb-semi-consistent.test (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb-timeout.result (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb-timeout.test (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb-use-sys-malloc-master.opt (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb-use-sys-malloc.result (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb-use-sys-malloc.test (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb-zip.result (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb-zip.test (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb.result (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb.test (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_bug21704.result (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_bug21704.test (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_bug34053.result (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_bug34053.test (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_bug34300.result (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_bug34300.test (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_bug35220.result (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_bug35220.test (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_bug36169.result (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_bug36169.test (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_bug36172.result (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_bug36172.test (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_bug40360.result (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_bug40360.test (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_bug40565.result (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_bug40565.test (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_bug41904.result (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_bug41904.test (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_bug42101-nonzero-master.opt (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_bug42101-nonzero.result (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_bug42101-nonzero.test (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_bug42101.result (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_bug42101.test (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_bug44032.result (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_bug44032.test (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_bug45357.result (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_bug45357.test (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_file_format.result (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_file_format.test (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_information_schema.result (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_information_schema.test (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_trx_weight.inc (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_trx_weight.result (100%) rename storage/{innodb_plugin => innobase}/mysql-test/innodb_trx_weight.test (100%) rename storage/{innodb_plugin => innobase}/mysql-test/patches/README (100%) rename storage/{innodb_plugin => innobase}/mysql-test/patches/index_merge_innodb-explain.diff (100%) rename storage/{innodb_plugin => innobase}/mysql-test/patches/information_schema.diff (100%) rename storage/{innodb_plugin => innobase}/mysql-test/patches/innodb-index.diff (100%) rename storage/{innodb_plugin => innobase}/mysql-test/patches/innodb_file_per_table.diff (100%) rename storage/{innodb_plugin => innobase}/mysql-test/patches/innodb_lock_wait_timeout.diff (100%) rename storage/{innodb_plugin => innobase}/mysql-test/patches/innodb_thread_concurrency_basic.diff (100%) rename storage/{innodb_plugin => innobase}/mysql-test/patches/partition_innodb.diff (100%) rename storage/{innodb_plugin => innobase}/os/os0file.c (100%) rename storage/{innodb_plugin => innobase}/os/os0proc.c (100%) rename storage/{innodb_plugin => innobase}/os/os0sync.c (100%) rename storage/{innodb_plugin => innobase}/os/os0thread.c (100%) rename storage/{innodb_plugin => innobase}/page/page0cur.c (100%) rename storage/{innodb_plugin => innobase}/page/page0page.c (100%) rename storage/{innodb_plugin => innobase}/page/page0zip.c (100%) rename storage/{innodb_plugin => innobase}/pars/lexyy.c (100%) rename storage/{innodb_plugin => innobase}/pars/make_bison.sh (100%) rename storage/{innodb_plugin => innobase}/pars/make_flex.sh (100%) rename storage/{innodb_plugin => innobase}/pars/pars0grm.c (100%) rename storage/{innodb_plugin => innobase}/pars/pars0grm.y (100%) rename storage/{innodb_plugin => innobase}/pars/pars0lex.l (100%) rename storage/{innodb_plugin => innobase}/pars/pars0opt.c (100%) rename storage/{innodb_plugin => innobase}/pars/pars0pars.c (100%) rename storage/{innodb_plugin => innobase}/pars/pars0sym.c (100%) rename storage/{innodb_plugin => innobase}/plug.in (94%) rename storage/{innodb_plugin => innobase}/que/que0que.c (100%) rename storage/{innodb_plugin => innobase}/read/read0read.c (100%) rename storage/{innodb_plugin => innobase}/rem/rem0cmp.c (100%) rename storage/{innodb_plugin => innobase}/rem/rem0rec.c (100%) rename storage/{innodb_plugin => innobase}/row/row0ext.c (100%) rename storage/{innodb_plugin => innobase}/row/row0ins.c (100%) rename storage/{innodb_plugin => innobase}/row/row0merge.c (100%) rename storage/{innodb_plugin => innobase}/row/row0mysql.c (100%) rename storage/{innodb_plugin => innobase}/row/row0purge.c (100%) rename storage/{innodb_plugin => innobase}/row/row0row.c (100%) rename storage/{innodb_plugin => innobase}/row/row0sel.c (100%) rename storage/{innodb_plugin => innobase}/row/row0uins.c (100%) rename storage/{innodb_plugin => innobase}/row/row0umod.c (100%) rename storage/{innodb_plugin => innobase}/row/row0undo.c (100%) rename storage/{innodb_plugin => innobase}/row/row0upd.c (100%) rename storage/{innodb_plugin => innobase}/row/row0vers.c (100%) rename storage/{innodb_plugin => innobase}/scripts/install_innodb_plugins.sql (100%) rename storage/{innodb_plugin => innobase}/scripts/install_innodb_plugins_win.sql (100%) rename storage/{innodb_plugin => innobase}/setup.sh (100%) rename storage/{innodb_plugin => innobase}/srv/srv0que.c (100%) rename storage/{innodb_plugin => innobase}/srv/srv0srv.c (100%) rename storage/{innodb_plugin => innobase}/srv/srv0start.c (100%) rename storage/{innodb_plugin => innobase}/sync/sync0arr.c (100%) rename storage/{innodb_plugin => innobase}/sync/sync0rw.c (100%) rename storage/{innodb_plugin => innobase}/sync/sync0sync.c (100%) rename storage/{innodb_plugin => innobase}/thr/thr0loc.c (100%) rename storage/{innodb_plugin => innobase}/trx/trx0i_s.c (100%) rename storage/{innodb_plugin => innobase}/trx/trx0purge.c (100%) rename storage/{innodb_plugin => innobase}/trx/trx0rec.c (100%) rename storage/{innodb_plugin => innobase}/trx/trx0roll.c (100%) rename storage/{innodb_plugin => innobase}/trx/trx0rseg.c (100%) rename storage/{innodb_plugin => innobase}/trx/trx0sys.c (100%) rename storage/{innodb_plugin => innobase}/trx/trx0trx.c (100%) rename storage/{innodb_plugin => innobase}/trx/trx0undo.c (100%) rename storage/{innodb_plugin => innobase}/usr/usr0sess.c (100%) rename storage/{innodb_plugin => innobase}/ut/ut0auxconf_atomic_pthread_t_gcc.c (100%) rename storage/{innodb_plugin => innobase}/ut/ut0auxconf_atomic_pthread_t_solaris.c (100%) rename storage/{innodb_plugin => innobase}/ut/ut0auxconf_have_solaris_atomics.c (100%) rename storage/{innodb_plugin => innobase}/ut/ut0auxconf_pause.c (100%) rename storage/{innodb_plugin => innobase}/ut/ut0auxconf_sizeof_pthread_t.c (100%) rename storage/{innodb_plugin => innobase}/ut/ut0byte.c (100%) rename storage/{innodb_plugin => innobase}/ut/ut0dbg.c (100%) rename storage/{innodb_plugin => innobase}/ut/ut0list.c (100%) rename storage/{innodb_plugin => innobase}/ut/ut0mem.c (100%) rename storage/{innodb_plugin => innobase}/ut/ut0rnd.c (100%) rename storage/{innodb_plugin => innobase}/ut/ut0ut.c (100%) rename storage/{innodb_plugin => innobase}/ut/ut0vec.c (100%) rename storage/{innodb_plugin => innobase}/ut/ut0wqueue.c (100%) rename storage/{innodb_plugin => innobase}/win-plugin/README (100%) rename storage/{innodb_plugin => innobase}/win-plugin/win-plugin.diff (100%) diff --git a/storage/innodb_plugin/CMakeLists.txt b/storage/innobase/CMakeLists.txt similarity index 91% rename from storage/innodb_plugin/CMakeLists.txt rename to 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 similarity index 100% rename from storage/innodb_plugin/COPYING rename to storage/innobase/COPYING diff --git a/storage/innodb_plugin/COPYING.Google b/storage/innobase/COPYING.Google similarity index 100% rename from storage/innodb_plugin/COPYING.Google rename to storage/innobase/COPYING.Google diff --git a/storage/innodb_plugin/COPYING.Percona b/storage/innobase/COPYING.Percona similarity index 100% rename from storage/innodb_plugin/COPYING.Percona rename to storage/innobase/COPYING.Percona diff --git a/storage/innodb_plugin/COPYING.Sun_Microsystems b/storage/innobase/COPYING.Sun_Microsystems similarity index 100% rename from storage/innodb_plugin/COPYING.Sun_Microsystems rename to storage/innobase/COPYING.Sun_Microsystems diff --git a/storage/innodb_plugin/ChangeLog b/storage/innobase/ChangeLog similarity index 100% rename from storage/innodb_plugin/ChangeLog rename to storage/innobase/ChangeLog diff --git a/storage/innodb_plugin/Doxyfile b/storage/innobase/Doxyfile similarity index 100% rename from storage/innodb_plugin/Doxyfile rename to storage/innobase/Doxyfile diff --git a/storage/innodb_plugin/Makefile.am b/storage/innobase/Makefile.am similarity index 95% rename from storage/innodb_plugin/Makefile.am rename to 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 similarity index 100% rename from storage/innodb_plugin/README rename to storage/innobase/README diff --git a/storage/innodb_plugin/btr/btr0btr.c b/storage/innobase/btr/btr0btr.c similarity index 100% rename from storage/innodb_plugin/btr/btr0btr.c rename to storage/innobase/btr/btr0btr.c diff --git a/storage/innodb_plugin/btr/btr0cur.c b/storage/innobase/btr/btr0cur.c similarity index 100% rename from storage/innodb_plugin/btr/btr0cur.c rename to storage/innobase/btr/btr0cur.c diff --git a/storage/innodb_plugin/btr/btr0pcur.c b/storage/innobase/btr/btr0pcur.c similarity index 100% rename from storage/innodb_plugin/btr/btr0pcur.c rename to storage/innobase/btr/btr0pcur.c diff --git a/storage/innodb_plugin/btr/btr0sea.c b/storage/innobase/btr/btr0sea.c similarity index 100% rename from storage/innodb_plugin/btr/btr0sea.c rename to storage/innobase/btr/btr0sea.c diff --git a/storage/innodb_plugin/buf/buf0buddy.c b/storage/innobase/buf/buf0buddy.c similarity index 100% rename from storage/innodb_plugin/buf/buf0buddy.c rename to storage/innobase/buf/buf0buddy.c diff --git a/storage/innodb_plugin/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c similarity index 100% rename from storage/innodb_plugin/buf/buf0buf.c rename to storage/innobase/buf/buf0buf.c diff --git a/storage/innodb_plugin/buf/buf0flu.c b/storage/innobase/buf/buf0flu.c similarity index 100% rename from storage/innodb_plugin/buf/buf0flu.c rename to storage/innobase/buf/buf0flu.c diff --git a/storage/innodb_plugin/buf/buf0lru.c b/storage/innobase/buf/buf0lru.c similarity index 100% rename from storage/innodb_plugin/buf/buf0lru.c rename to storage/innobase/buf/buf0lru.c diff --git a/storage/innodb_plugin/buf/buf0rea.c b/storage/innobase/buf/buf0rea.c similarity index 100% rename from storage/innodb_plugin/buf/buf0rea.c rename to storage/innobase/buf/buf0rea.c diff --git a/storage/innodb_plugin/compile-innodb b/storage/innobase/compile-innodb similarity index 100% rename from storage/innodb_plugin/compile-innodb rename to storage/innobase/compile-innodb diff --git a/storage/innodb_plugin/compile-innodb-debug b/storage/innobase/compile-innodb-debug similarity index 100% rename from storage/innodb_plugin/compile-innodb-debug rename to storage/innobase/compile-innodb-debug diff --git a/storage/innodb_plugin/data/data0data.c b/storage/innobase/data/data0data.c similarity index 100% rename from storage/innodb_plugin/data/data0data.c rename to storage/innobase/data/data0data.c diff --git a/storage/innodb_plugin/data/data0type.c b/storage/innobase/data/data0type.c similarity index 100% rename from storage/innodb_plugin/data/data0type.c rename to storage/innobase/data/data0type.c diff --git a/storage/innodb_plugin/dict/dict0boot.c b/storage/innobase/dict/dict0boot.c similarity index 100% rename from storage/innodb_plugin/dict/dict0boot.c rename to storage/innobase/dict/dict0boot.c diff --git a/storage/innodb_plugin/dict/dict0crea.c b/storage/innobase/dict/dict0crea.c similarity index 100% rename from storage/innodb_plugin/dict/dict0crea.c rename to storage/innobase/dict/dict0crea.c diff --git a/storage/innodb_plugin/dict/dict0dict.c b/storage/innobase/dict/dict0dict.c similarity index 100% rename from storage/innodb_plugin/dict/dict0dict.c rename to storage/innobase/dict/dict0dict.c diff --git a/storage/innodb_plugin/dict/dict0load.c b/storage/innobase/dict/dict0load.c similarity index 100% rename from storage/innodb_plugin/dict/dict0load.c rename to storage/innobase/dict/dict0load.c diff --git a/storage/innodb_plugin/dict/dict0mem.c b/storage/innobase/dict/dict0mem.c similarity index 100% rename from storage/innodb_plugin/dict/dict0mem.c rename to storage/innobase/dict/dict0mem.c diff --git a/storage/innodb_plugin/dyn/dyn0dyn.c b/storage/innobase/dyn/dyn0dyn.c similarity index 100% rename from storage/innodb_plugin/dyn/dyn0dyn.c rename to storage/innobase/dyn/dyn0dyn.c diff --git a/storage/innodb_plugin/eval/eval0eval.c b/storage/innobase/eval/eval0eval.c similarity index 100% rename from storage/innodb_plugin/eval/eval0eval.c rename to storage/innobase/eval/eval0eval.c diff --git a/storage/innodb_plugin/eval/eval0proc.c b/storage/innobase/eval/eval0proc.c similarity index 100% rename from storage/innodb_plugin/eval/eval0proc.c rename to storage/innobase/eval/eval0proc.c diff --git a/storage/innodb_plugin/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c similarity index 100% rename from storage/innodb_plugin/fil/fil0fil.c rename to storage/innobase/fil/fil0fil.c diff --git a/storage/innodb_plugin/fsp/fsp0fsp.c b/storage/innobase/fsp/fsp0fsp.c similarity index 100% rename from storage/innodb_plugin/fsp/fsp0fsp.c rename to storage/innobase/fsp/fsp0fsp.c diff --git a/storage/innodb_plugin/fut/fut0fut.c b/storage/innobase/fut/fut0fut.c similarity index 100% rename from storage/innodb_plugin/fut/fut0fut.c rename to storage/innobase/fut/fut0fut.c diff --git a/storage/innodb_plugin/fut/fut0lst.c b/storage/innobase/fut/fut0lst.c similarity index 100% rename from storage/innodb_plugin/fut/fut0lst.c rename to storage/innobase/fut/fut0lst.c diff --git a/storage/innodb_plugin/ha/ha0ha.c b/storage/innobase/ha/ha0ha.c similarity index 100% rename from storage/innodb_plugin/ha/ha0ha.c rename to storage/innobase/ha/ha0ha.c diff --git a/storage/innodb_plugin/ha/ha0storage.c b/storage/innobase/ha/ha0storage.c similarity index 100% rename from storage/innodb_plugin/ha/ha0storage.c rename to storage/innobase/ha/ha0storage.c diff --git a/storage/innodb_plugin/ha/hash0hash.c b/storage/innobase/ha/hash0hash.c similarity index 100% rename from storage/innodb_plugin/ha/hash0hash.c rename to storage/innobase/ha/hash0hash.c diff --git a/storage/innodb_plugin/ha_innodb.def b/storage/innobase/ha_innodb.def similarity index 100% rename from storage/innodb_plugin/ha_innodb.def rename to storage/innobase/ha_innodb.def diff --git a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc similarity index 99% rename from storage/innodb_plugin/handler/ha_innodb.cc rename to 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 similarity index 100% rename from storage/innodb_plugin/handler/ha_innodb.h rename to storage/innobase/handler/ha_innodb.h diff --git a/storage/innodb_plugin/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc similarity index 100% rename from storage/innodb_plugin/handler/handler0alter.cc rename to storage/innobase/handler/handler0alter.cc diff --git a/storage/innodb_plugin/handler/handler0vars.h b/storage/innobase/handler/handler0vars.h similarity index 100% rename from storage/innodb_plugin/handler/handler0vars.h rename to storage/innobase/handler/handler0vars.h diff --git a/storage/innodb_plugin/handler/i_s.cc b/storage/innobase/handler/i_s.cc similarity index 100% rename from storage/innodb_plugin/handler/i_s.cc rename to storage/innobase/handler/i_s.cc diff --git a/storage/innodb_plugin/handler/i_s.h b/storage/innobase/handler/i_s.h similarity index 100% rename from storage/innodb_plugin/handler/i_s.h rename to storage/innobase/handler/i_s.h diff --git a/storage/innodb_plugin/handler/mysql_addons.cc b/storage/innobase/handler/mysql_addons.cc similarity index 100% rename from storage/innodb_plugin/handler/mysql_addons.cc rename to 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 similarity index 100% rename from storage/innodb_plugin/handler/win_delay_loader.cc rename to storage/innobase/handler/win_delay_loader.cc diff --git a/storage/innodb_plugin/ibuf/ibuf0ibuf.c b/storage/innobase/ibuf/ibuf0ibuf.c similarity index 100% rename from storage/innodb_plugin/ibuf/ibuf0ibuf.c rename to storage/innobase/ibuf/ibuf0ibuf.c diff --git a/storage/innodb_plugin/include/btr0btr.h b/storage/innobase/include/btr0btr.h similarity index 100% rename from storage/innodb_plugin/include/btr0btr.h rename to storage/innobase/include/btr0btr.h diff --git a/storage/innodb_plugin/include/btr0btr.ic b/storage/innobase/include/btr0btr.ic similarity index 100% rename from storage/innodb_plugin/include/btr0btr.ic rename to storage/innobase/include/btr0btr.ic diff --git a/storage/innodb_plugin/include/btr0cur.h b/storage/innobase/include/btr0cur.h similarity index 100% rename from storage/innodb_plugin/include/btr0cur.h rename to storage/innobase/include/btr0cur.h diff --git a/storage/innodb_plugin/include/btr0cur.ic b/storage/innobase/include/btr0cur.ic similarity index 100% rename from storage/innodb_plugin/include/btr0cur.ic rename to storage/innobase/include/btr0cur.ic diff --git a/storage/innodb_plugin/include/btr0pcur.h b/storage/innobase/include/btr0pcur.h similarity index 100% rename from storage/innodb_plugin/include/btr0pcur.h rename to storage/innobase/include/btr0pcur.h diff --git a/storage/innodb_plugin/include/btr0pcur.ic b/storage/innobase/include/btr0pcur.ic similarity index 100% rename from storage/innodb_plugin/include/btr0pcur.ic rename to storage/innobase/include/btr0pcur.ic diff --git a/storage/innodb_plugin/include/btr0sea.h b/storage/innobase/include/btr0sea.h similarity index 100% rename from storage/innodb_plugin/include/btr0sea.h rename to storage/innobase/include/btr0sea.h diff --git a/storage/innodb_plugin/include/btr0sea.ic b/storage/innobase/include/btr0sea.ic similarity index 100% rename from storage/innodb_plugin/include/btr0sea.ic rename to storage/innobase/include/btr0sea.ic diff --git a/storage/innodb_plugin/include/btr0types.h b/storage/innobase/include/btr0types.h similarity index 100% rename from storage/innodb_plugin/include/btr0types.h rename to storage/innobase/include/btr0types.h diff --git a/storage/innodb_plugin/include/buf0buddy.h b/storage/innobase/include/buf0buddy.h similarity index 100% rename from storage/innodb_plugin/include/buf0buddy.h rename to storage/innobase/include/buf0buddy.h diff --git a/storage/innodb_plugin/include/buf0buddy.ic b/storage/innobase/include/buf0buddy.ic similarity index 100% rename from storage/innodb_plugin/include/buf0buddy.ic rename to storage/innobase/include/buf0buddy.ic diff --git a/storage/innodb_plugin/include/buf0buf.h b/storage/innobase/include/buf0buf.h similarity index 100% rename from storage/innodb_plugin/include/buf0buf.h rename to storage/innobase/include/buf0buf.h diff --git a/storage/innodb_plugin/include/buf0buf.ic b/storage/innobase/include/buf0buf.ic similarity index 100% rename from storage/innodb_plugin/include/buf0buf.ic rename to storage/innobase/include/buf0buf.ic diff --git a/storage/innodb_plugin/include/buf0flu.h b/storage/innobase/include/buf0flu.h similarity index 100% rename from storage/innodb_plugin/include/buf0flu.h rename to storage/innobase/include/buf0flu.h diff --git a/storage/innodb_plugin/include/buf0flu.ic b/storage/innobase/include/buf0flu.ic similarity index 100% rename from storage/innodb_plugin/include/buf0flu.ic rename to storage/innobase/include/buf0flu.ic diff --git a/storage/innodb_plugin/include/buf0lru.h b/storage/innobase/include/buf0lru.h similarity index 100% rename from storage/innodb_plugin/include/buf0lru.h rename to storage/innobase/include/buf0lru.h diff --git a/storage/innodb_plugin/include/buf0lru.ic b/storage/innobase/include/buf0lru.ic similarity index 100% rename from storage/innodb_plugin/include/buf0lru.ic rename to storage/innobase/include/buf0lru.ic diff --git a/storage/innodb_plugin/include/buf0rea.h b/storage/innobase/include/buf0rea.h similarity index 100% rename from storage/innodb_plugin/include/buf0rea.h rename to storage/innobase/include/buf0rea.h diff --git a/storage/innodb_plugin/include/buf0types.h b/storage/innobase/include/buf0types.h similarity index 100% rename from storage/innodb_plugin/include/buf0types.h rename to storage/innobase/include/buf0types.h diff --git a/storage/innodb_plugin/include/data0data.h b/storage/innobase/include/data0data.h similarity index 100% rename from storage/innodb_plugin/include/data0data.h rename to storage/innobase/include/data0data.h diff --git a/storage/innodb_plugin/include/data0data.ic b/storage/innobase/include/data0data.ic similarity index 100% rename from storage/innodb_plugin/include/data0data.ic rename to storage/innobase/include/data0data.ic diff --git a/storage/innodb_plugin/include/data0type.h b/storage/innobase/include/data0type.h similarity index 100% rename from storage/innodb_plugin/include/data0type.h rename to storage/innobase/include/data0type.h diff --git a/storage/innodb_plugin/include/data0type.ic b/storage/innobase/include/data0type.ic similarity index 100% rename from storage/innodb_plugin/include/data0type.ic rename to storage/innobase/include/data0type.ic diff --git a/storage/innodb_plugin/include/data0types.h b/storage/innobase/include/data0types.h similarity index 100% rename from storage/innodb_plugin/include/data0types.h rename to storage/innobase/include/data0types.h diff --git a/storage/innodb_plugin/include/db0err.h b/storage/innobase/include/db0err.h similarity index 100% rename from storage/innodb_plugin/include/db0err.h rename to storage/innobase/include/db0err.h diff --git a/storage/innodb_plugin/include/dict0boot.h b/storage/innobase/include/dict0boot.h similarity index 100% rename from storage/innodb_plugin/include/dict0boot.h rename to storage/innobase/include/dict0boot.h diff --git a/storage/innodb_plugin/include/dict0boot.ic b/storage/innobase/include/dict0boot.ic similarity index 100% rename from storage/innodb_plugin/include/dict0boot.ic rename to storage/innobase/include/dict0boot.ic diff --git a/storage/innodb_plugin/include/dict0crea.h b/storage/innobase/include/dict0crea.h similarity index 100% rename from storage/innodb_plugin/include/dict0crea.h rename to storage/innobase/include/dict0crea.h diff --git a/storage/innodb_plugin/include/dict0crea.ic b/storage/innobase/include/dict0crea.ic similarity index 100% rename from storage/innodb_plugin/include/dict0crea.ic rename to storage/innobase/include/dict0crea.ic diff --git a/storage/innodb_plugin/include/dict0dict.h b/storage/innobase/include/dict0dict.h similarity index 100% rename from storage/innodb_plugin/include/dict0dict.h rename to storage/innobase/include/dict0dict.h diff --git a/storage/innodb_plugin/include/dict0dict.ic b/storage/innobase/include/dict0dict.ic similarity index 100% rename from storage/innodb_plugin/include/dict0dict.ic rename to storage/innobase/include/dict0dict.ic diff --git a/storage/innodb_plugin/include/dict0load.h b/storage/innobase/include/dict0load.h similarity index 100% rename from storage/innodb_plugin/include/dict0load.h rename to storage/innobase/include/dict0load.h diff --git a/storage/innodb_plugin/include/dict0load.ic b/storage/innobase/include/dict0load.ic similarity index 100% rename from storage/innodb_plugin/include/dict0load.ic rename to storage/innobase/include/dict0load.ic diff --git a/storage/innodb_plugin/include/dict0mem.h b/storage/innobase/include/dict0mem.h similarity index 100% rename from storage/innodb_plugin/include/dict0mem.h rename to storage/innobase/include/dict0mem.h diff --git a/storage/innodb_plugin/include/dict0mem.ic b/storage/innobase/include/dict0mem.ic similarity index 100% rename from storage/innodb_plugin/include/dict0mem.ic rename to storage/innobase/include/dict0mem.ic diff --git a/storage/innodb_plugin/include/dict0types.h b/storage/innobase/include/dict0types.h similarity index 100% rename from storage/innodb_plugin/include/dict0types.h rename to storage/innobase/include/dict0types.h diff --git a/storage/innodb_plugin/include/dyn0dyn.h b/storage/innobase/include/dyn0dyn.h similarity index 100% rename from storage/innodb_plugin/include/dyn0dyn.h rename to storage/innobase/include/dyn0dyn.h diff --git a/storage/innodb_plugin/include/dyn0dyn.ic b/storage/innobase/include/dyn0dyn.ic similarity index 100% rename from storage/innodb_plugin/include/dyn0dyn.ic rename to storage/innobase/include/dyn0dyn.ic diff --git a/storage/innodb_plugin/include/eval0eval.h b/storage/innobase/include/eval0eval.h similarity index 100% rename from storage/innodb_plugin/include/eval0eval.h rename to storage/innobase/include/eval0eval.h diff --git a/storage/innodb_plugin/include/eval0eval.ic b/storage/innobase/include/eval0eval.ic similarity index 100% rename from storage/innodb_plugin/include/eval0eval.ic rename to storage/innobase/include/eval0eval.ic diff --git a/storage/innodb_plugin/include/eval0proc.h b/storage/innobase/include/eval0proc.h similarity index 100% rename from storage/innodb_plugin/include/eval0proc.h rename to storage/innobase/include/eval0proc.h diff --git a/storage/innodb_plugin/include/eval0proc.ic b/storage/innobase/include/eval0proc.ic similarity index 100% rename from storage/innodb_plugin/include/eval0proc.ic rename to storage/innobase/include/eval0proc.ic diff --git a/storage/innodb_plugin/include/fil0fil.h b/storage/innobase/include/fil0fil.h similarity index 100% rename from storage/innodb_plugin/include/fil0fil.h rename to storage/innobase/include/fil0fil.h diff --git a/storage/innodb_plugin/include/fsp0fsp.h b/storage/innobase/include/fsp0fsp.h similarity index 100% rename from storage/innodb_plugin/include/fsp0fsp.h rename to storage/innobase/include/fsp0fsp.h diff --git a/storage/innodb_plugin/include/fsp0fsp.ic b/storage/innobase/include/fsp0fsp.ic similarity index 100% rename from storage/innodb_plugin/include/fsp0fsp.ic rename to storage/innobase/include/fsp0fsp.ic diff --git a/storage/innodb_plugin/include/fsp0types.h b/storage/innobase/include/fsp0types.h similarity index 100% rename from storage/innodb_plugin/include/fsp0types.h rename to storage/innobase/include/fsp0types.h diff --git a/storage/innodb_plugin/include/fut0fut.h b/storage/innobase/include/fut0fut.h similarity index 100% rename from storage/innodb_plugin/include/fut0fut.h rename to storage/innobase/include/fut0fut.h diff --git a/storage/innodb_plugin/include/fut0fut.ic b/storage/innobase/include/fut0fut.ic similarity index 100% rename from storage/innodb_plugin/include/fut0fut.ic rename to storage/innobase/include/fut0fut.ic diff --git a/storage/innodb_plugin/include/fut0lst.h b/storage/innobase/include/fut0lst.h similarity index 100% rename from storage/innodb_plugin/include/fut0lst.h rename to storage/innobase/include/fut0lst.h diff --git a/storage/innodb_plugin/include/fut0lst.ic b/storage/innobase/include/fut0lst.ic similarity index 100% rename from storage/innodb_plugin/include/fut0lst.ic rename to storage/innobase/include/fut0lst.ic diff --git a/storage/innodb_plugin/include/ha0ha.h b/storage/innobase/include/ha0ha.h similarity index 100% rename from storage/innodb_plugin/include/ha0ha.h rename to storage/innobase/include/ha0ha.h diff --git a/storage/innodb_plugin/include/ha0ha.ic b/storage/innobase/include/ha0ha.ic similarity index 100% rename from storage/innodb_plugin/include/ha0ha.ic rename to storage/innobase/include/ha0ha.ic diff --git a/storage/innodb_plugin/include/ha0storage.h b/storage/innobase/include/ha0storage.h similarity index 100% rename from storage/innodb_plugin/include/ha0storage.h rename to storage/innobase/include/ha0storage.h diff --git a/storage/innodb_plugin/include/ha0storage.ic b/storage/innobase/include/ha0storage.ic similarity index 100% rename from storage/innodb_plugin/include/ha0storage.ic rename to storage/innobase/include/ha0storage.ic diff --git a/storage/innodb_plugin/include/ha_prototypes.h b/storage/innobase/include/ha_prototypes.h similarity index 100% rename from storage/innodb_plugin/include/ha_prototypes.h rename to storage/innobase/include/ha_prototypes.h diff --git a/storage/innodb_plugin/include/handler0alter.h b/storage/innobase/include/handler0alter.h similarity index 100% rename from storage/innodb_plugin/include/handler0alter.h rename to storage/innobase/include/handler0alter.h diff --git a/storage/innodb_plugin/include/hash0hash.h b/storage/innobase/include/hash0hash.h similarity index 100% rename from storage/innodb_plugin/include/hash0hash.h rename to storage/innobase/include/hash0hash.h diff --git a/storage/innodb_plugin/include/hash0hash.ic b/storage/innobase/include/hash0hash.ic similarity index 100% rename from storage/innodb_plugin/include/hash0hash.ic rename to storage/innobase/include/hash0hash.ic diff --git a/storage/innodb_plugin/include/ibuf0ibuf.h b/storage/innobase/include/ibuf0ibuf.h similarity index 100% rename from storage/innodb_plugin/include/ibuf0ibuf.h rename to storage/innobase/include/ibuf0ibuf.h diff --git a/storage/innodb_plugin/include/ibuf0ibuf.ic b/storage/innobase/include/ibuf0ibuf.ic similarity index 100% rename from storage/innodb_plugin/include/ibuf0ibuf.ic rename to storage/innobase/include/ibuf0ibuf.ic diff --git a/storage/innodb_plugin/include/ibuf0types.h b/storage/innobase/include/ibuf0types.h similarity index 100% rename from storage/innodb_plugin/include/ibuf0types.h rename to storage/innobase/include/ibuf0types.h diff --git a/storage/innodb_plugin/include/lock0iter.h b/storage/innobase/include/lock0iter.h similarity index 100% rename from storage/innodb_plugin/include/lock0iter.h rename to storage/innobase/include/lock0iter.h diff --git a/storage/innodb_plugin/include/lock0lock.h b/storage/innobase/include/lock0lock.h similarity index 100% rename from storage/innodb_plugin/include/lock0lock.h rename to storage/innobase/include/lock0lock.h diff --git a/storage/innodb_plugin/include/lock0lock.ic b/storage/innobase/include/lock0lock.ic similarity index 100% rename from storage/innodb_plugin/include/lock0lock.ic rename to storage/innobase/include/lock0lock.ic diff --git a/storage/innodb_plugin/include/lock0priv.h b/storage/innobase/include/lock0priv.h similarity index 100% rename from storage/innodb_plugin/include/lock0priv.h rename to storage/innobase/include/lock0priv.h diff --git a/storage/innodb_plugin/include/lock0priv.ic b/storage/innobase/include/lock0priv.ic similarity index 100% rename from storage/innodb_plugin/include/lock0priv.ic rename to storage/innobase/include/lock0priv.ic diff --git a/storage/innodb_plugin/include/lock0types.h b/storage/innobase/include/lock0types.h similarity index 100% rename from storage/innodb_plugin/include/lock0types.h rename to storage/innobase/include/lock0types.h diff --git a/storage/innodb_plugin/include/log0log.h b/storage/innobase/include/log0log.h similarity index 100% rename from storage/innodb_plugin/include/log0log.h rename to storage/innobase/include/log0log.h diff --git a/storage/innodb_plugin/include/log0log.ic b/storage/innobase/include/log0log.ic similarity index 100% rename from storage/innodb_plugin/include/log0log.ic rename to storage/innobase/include/log0log.ic diff --git a/storage/innodb_plugin/include/log0recv.h b/storage/innobase/include/log0recv.h similarity index 100% rename from storage/innodb_plugin/include/log0recv.h rename to storage/innobase/include/log0recv.h diff --git a/storage/innodb_plugin/include/log0recv.ic b/storage/innobase/include/log0recv.ic similarity index 100% rename from storage/innodb_plugin/include/log0recv.ic rename to storage/innobase/include/log0recv.ic diff --git a/storage/innodb_plugin/include/mach0data.h b/storage/innobase/include/mach0data.h similarity index 100% rename from storage/innodb_plugin/include/mach0data.h rename to storage/innobase/include/mach0data.h diff --git a/storage/innodb_plugin/include/mach0data.ic b/storage/innobase/include/mach0data.ic similarity index 100% rename from storage/innodb_plugin/include/mach0data.ic rename to storage/innobase/include/mach0data.ic diff --git a/storage/innodb_plugin/include/mem0dbg.h b/storage/innobase/include/mem0dbg.h similarity index 100% rename from storage/innodb_plugin/include/mem0dbg.h rename to storage/innobase/include/mem0dbg.h diff --git a/storage/innodb_plugin/include/mem0dbg.ic b/storage/innobase/include/mem0dbg.ic similarity index 100% rename from storage/innodb_plugin/include/mem0dbg.ic rename to storage/innobase/include/mem0dbg.ic diff --git a/storage/innodb_plugin/include/mem0mem.h b/storage/innobase/include/mem0mem.h similarity index 100% rename from storage/innodb_plugin/include/mem0mem.h rename to storage/innobase/include/mem0mem.h diff --git a/storage/innodb_plugin/include/mem0mem.ic b/storage/innobase/include/mem0mem.ic similarity index 100% rename from storage/innodb_plugin/include/mem0mem.ic rename to storage/innobase/include/mem0mem.ic diff --git a/storage/innodb_plugin/include/mem0pool.h b/storage/innobase/include/mem0pool.h similarity index 100% rename from storage/innodb_plugin/include/mem0pool.h rename to storage/innobase/include/mem0pool.h diff --git a/storage/innodb_plugin/include/mem0pool.ic b/storage/innobase/include/mem0pool.ic similarity index 100% rename from storage/innodb_plugin/include/mem0pool.ic rename to storage/innobase/include/mem0pool.ic diff --git a/storage/innodb_plugin/include/mtr0log.h b/storage/innobase/include/mtr0log.h similarity index 100% rename from storage/innodb_plugin/include/mtr0log.h rename to storage/innobase/include/mtr0log.h diff --git a/storage/innodb_plugin/include/mtr0log.ic b/storage/innobase/include/mtr0log.ic similarity index 100% rename from storage/innodb_plugin/include/mtr0log.ic rename to storage/innobase/include/mtr0log.ic diff --git a/storage/innodb_plugin/include/mtr0mtr.h b/storage/innobase/include/mtr0mtr.h similarity index 100% rename from storage/innodb_plugin/include/mtr0mtr.h rename to storage/innobase/include/mtr0mtr.h diff --git a/storage/innodb_plugin/include/mtr0mtr.ic b/storage/innobase/include/mtr0mtr.ic similarity index 100% rename from storage/innodb_plugin/include/mtr0mtr.ic rename to storage/innobase/include/mtr0mtr.ic diff --git a/storage/innodb_plugin/include/mtr0types.h b/storage/innobase/include/mtr0types.h similarity index 100% rename from storage/innodb_plugin/include/mtr0types.h rename to storage/innobase/include/mtr0types.h diff --git a/storage/innodb_plugin/include/mysql_addons.h b/storage/innobase/include/mysql_addons.h similarity index 100% rename from storage/innodb_plugin/include/mysql_addons.h rename to storage/innobase/include/mysql_addons.h diff --git a/storage/innodb_plugin/include/os0file.h b/storage/innobase/include/os0file.h similarity index 100% rename from storage/innodb_plugin/include/os0file.h rename to storage/innobase/include/os0file.h diff --git a/storage/innodb_plugin/include/os0proc.h b/storage/innobase/include/os0proc.h similarity index 100% rename from storage/innodb_plugin/include/os0proc.h rename to storage/innobase/include/os0proc.h diff --git a/storage/innodb_plugin/include/os0proc.ic b/storage/innobase/include/os0proc.ic similarity index 100% rename from storage/innodb_plugin/include/os0proc.ic rename to storage/innobase/include/os0proc.ic diff --git a/storage/innodb_plugin/include/os0sync.h b/storage/innobase/include/os0sync.h similarity index 100% rename from storage/innodb_plugin/include/os0sync.h rename to storage/innobase/include/os0sync.h diff --git a/storage/innodb_plugin/include/os0sync.ic b/storage/innobase/include/os0sync.ic similarity index 100% rename from storage/innodb_plugin/include/os0sync.ic rename to storage/innobase/include/os0sync.ic diff --git a/storage/innodb_plugin/include/os0thread.h b/storage/innobase/include/os0thread.h similarity index 100% rename from storage/innodb_plugin/include/os0thread.h rename to storage/innobase/include/os0thread.h diff --git a/storage/innodb_plugin/include/os0thread.ic b/storage/innobase/include/os0thread.ic similarity index 100% rename from storage/innodb_plugin/include/os0thread.ic rename to storage/innobase/include/os0thread.ic diff --git a/storage/innodb_plugin/include/page0cur.h b/storage/innobase/include/page0cur.h similarity index 100% rename from storage/innodb_plugin/include/page0cur.h rename to storage/innobase/include/page0cur.h diff --git a/storage/innodb_plugin/include/page0cur.ic b/storage/innobase/include/page0cur.ic similarity index 100% rename from storage/innodb_plugin/include/page0cur.ic rename to storage/innobase/include/page0cur.ic diff --git a/storage/innodb_plugin/include/page0page.h b/storage/innobase/include/page0page.h similarity index 100% rename from storage/innodb_plugin/include/page0page.h rename to storage/innobase/include/page0page.h diff --git a/storage/innodb_plugin/include/page0page.ic b/storage/innobase/include/page0page.ic similarity index 100% rename from storage/innodb_plugin/include/page0page.ic rename to storage/innobase/include/page0page.ic diff --git a/storage/innodb_plugin/include/page0types.h b/storage/innobase/include/page0types.h similarity index 100% rename from storage/innodb_plugin/include/page0types.h rename to storage/innobase/include/page0types.h diff --git a/storage/innodb_plugin/include/page0zip.h b/storage/innobase/include/page0zip.h similarity index 100% rename from storage/innodb_plugin/include/page0zip.h rename to storage/innobase/include/page0zip.h diff --git a/storage/innodb_plugin/include/page0zip.ic b/storage/innobase/include/page0zip.ic similarity index 100% rename from storage/innodb_plugin/include/page0zip.ic rename to storage/innobase/include/page0zip.ic diff --git a/storage/innodb_plugin/include/pars0grm.h b/storage/innobase/include/pars0grm.h similarity index 100% rename from storage/innodb_plugin/include/pars0grm.h rename to storage/innobase/include/pars0grm.h diff --git a/storage/innodb_plugin/include/pars0opt.h b/storage/innobase/include/pars0opt.h similarity index 100% rename from storage/innodb_plugin/include/pars0opt.h rename to storage/innobase/include/pars0opt.h diff --git a/storage/innodb_plugin/include/pars0opt.ic b/storage/innobase/include/pars0opt.ic similarity index 100% rename from storage/innodb_plugin/include/pars0opt.ic rename to storage/innobase/include/pars0opt.ic diff --git a/storage/innodb_plugin/include/pars0pars.h b/storage/innobase/include/pars0pars.h similarity index 100% rename from storage/innodb_plugin/include/pars0pars.h rename to storage/innobase/include/pars0pars.h diff --git a/storage/innodb_plugin/include/pars0pars.ic b/storage/innobase/include/pars0pars.ic similarity index 100% rename from storage/innodb_plugin/include/pars0pars.ic rename to storage/innobase/include/pars0pars.ic diff --git a/storage/innodb_plugin/include/pars0sym.h b/storage/innobase/include/pars0sym.h similarity index 100% rename from storage/innodb_plugin/include/pars0sym.h rename to storage/innobase/include/pars0sym.h diff --git a/storage/innodb_plugin/include/pars0sym.ic b/storage/innobase/include/pars0sym.ic similarity index 100% rename from storage/innodb_plugin/include/pars0sym.ic rename to storage/innobase/include/pars0sym.ic diff --git a/storage/innodb_plugin/include/pars0types.h b/storage/innobase/include/pars0types.h similarity index 100% rename from storage/innodb_plugin/include/pars0types.h rename to storage/innobase/include/pars0types.h diff --git a/storage/innodb_plugin/include/que0que.h b/storage/innobase/include/que0que.h similarity index 100% rename from storage/innodb_plugin/include/que0que.h rename to storage/innobase/include/que0que.h diff --git a/storage/innodb_plugin/include/que0que.ic b/storage/innobase/include/que0que.ic similarity index 100% rename from storage/innodb_plugin/include/que0que.ic rename to storage/innobase/include/que0que.ic diff --git a/storage/innodb_plugin/include/que0types.h b/storage/innobase/include/que0types.h similarity index 100% rename from storage/innodb_plugin/include/que0types.h rename to storage/innobase/include/que0types.h diff --git a/storage/innodb_plugin/include/read0read.h b/storage/innobase/include/read0read.h similarity index 100% rename from storage/innodb_plugin/include/read0read.h rename to storage/innobase/include/read0read.h diff --git a/storage/innodb_plugin/include/read0read.ic b/storage/innobase/include/read0read.ic similarity index 100% rename from storage/innodb_plugin/include/read0read.ic rename to storage/innobase/include/read0read.ic diff --git a/storage/innodb_plugin/include/read0types.h b/storage/innobase/include/read0types.h similarity index 100% rename from storage/innodb_plugin/include/read0types.h rename to storage/innobase/include/read0types.h diff --git a/storage/innodb_plugin/include/rem0cmp.h b/storage/innobase/include/rem0cmp.h similarity index 100% rename from storage/innodb_plugin/include/rem0cmp.h rename to storage/innobase/include/rem0cmp.h diff --git a/storage/innodb_plugin/include/rem0cmp.ic b/storage/innobase/include/rem0cmp.ic similarity index 100% rename from storage/innodb_plugin/include/rem0cmp.ic rename to storage/innobase/include/rem0cmp.ic diff --git a/storage/innodb_plugin/include/rem0rec.h b/storage/innobase/include/rem0rec.h similarity index 100% rename from storage/innodb_plugin/include/rem0rec.h rename to storage/innobase/include/rem0rec.h diff --git a/storage/innodb_plugin/include/rem0rec.ic b/storage/innobase/include/rem0rec.ic similarity index 100% rename from storage/innodb_plugin/include/rem0rec.ic rename to storage/innobase/include/rem0rec.ic diff --git a/storage/innodb_plugin/include/rem0types.h b/storage/innobase/include/rem0types.h similarity index 100% rename from storage/innodb_plugin/include/rem0types.h rename to storage/innobase/include/rem0types.h diff --git a/storage/innodb_plugin/include/row0ext.h b/storage/innobase/include/row0ext.h similarity index 100% rename from storage/innodb_plugin/include/row0ext.h rename to storage/innobase/include/row0ext.h diff --git a/storage/innodb_plugin/include/row0ext.ic b/storage/innobase/include/row0ext.ic similarity index 100% rename from storage/innodb_plugin/include/row0ext.ic rename to storage/innobase/include/row0ext.ic diff --git a/storage/innodb_plugin/include/row0ins.h b/storage/innobase/include/row0ins.h similarity index 100% rename from storage/innodb_plugin/include/row0ins.h rename to storage/innobase/include/row0ins.h diff --git a/storage/innodb_plugin/include/row0ins.ic b/storage/innobase/include/row0ins.ic similarity index 100% rename from storage/innodb_plugin/include/row0ins.ic rename to storage/innobase/include/row0ins.ic diff --git a/storage/innodb_plugin/include/row0merge.h b/storage/innobase/include/row0merge.h similarity index 100% rename from storage/innodb_plugin/include/row0merge.h rename to storage/innobase/include/row0merge.h diff --git a/storage/innodb_plugin/include/row0mysql.h b/storage/innobase/include/row0mysql.h similarity index 100% rename from storage/innodb_plugin/include/row0mysql.h rename to storage/innobase/include/row0mysql.h diff --git a/storage/innodb_plugin/include/row0mysql.ic b/storage/innobase/include/row0mysql.ic similarity index 100% rename from storage/innodb_plugin/include/row0mysql.ic rename to storage/innobase/include/row0mysql.ic diff --git a/storage/innodb_plugin/include/row0purge.h b/storage/innobase/include/row0purge.h similarity index 100% rename from storage/innodb_plugin/include/row0purge.h rename to storage/innobase/include/row0purge.h diff --git a/storage/innodb_plugin/include/row0purge.ic b/storage/innobase/include/row0purge.ic similarity index 100% rename from storage/innodb_plugin/include/row0purge.ic rename to storage/innobase/include/row0purge.ic diff --git a/storage/innodb_plugin/include/row0row.h b/storage/innobase/include/row0row.h similarity index 100% rename from storage/innodb_plugin/include/row0row.h rename to storage/innobase/include/row0row.h diff --git a/storage/innodb_plugin/include/row0row.ic b/storage/innobase/include/row0row.ic similarity index 100% rename from storage/innodb_plugin/include/row0row.ic rename to storage/innobase/include/row0row.ic diff --git a/storage/innodb_plugin/include/row0sel.h b/storage/innobase/include/row0sel.h similarity index 100% rename from storage/innodb_plugin/include/row0sel.h rename to storage/innobase/include/row0sel.h diff --git a/storage/innodb_plugin/include/row0sel.ic b/storage/innobase/include/row0sel.ic similarity index 100% rename from storage/innodb_plugin/include/row0sel.ic rename to storage/innobase/include/row0sel.ic diff --git a/storage/innodb_plugin/include/row0types.h b/storage/innobase/include/row0types.h similarity index 100% rename from storage/innodb_plugin/include/row0types.h rename to storage/innobase/include/row0types.h diff --git a/storage/innodb_plugin/include/row0uins.h b/storage/innobase/include/row0uins.h similarity index 100% rename from storage/innodb_plugin/include/row0uins.h rename to storage/innobase/include/row0uins.h diff --git a/storage/innodb_plugin/include/row0uins.ic b/storage/innobase/include/row0uins.ic similarity index 100% rename from storage/innodb_plugin/include/row0uins.ic rename to storage/innobase/include/row0uins.ic diff --git a/storage/innodb_plugin/include/row0umod.h b/storage/innobase/include/row0umod.h similarity index 100% rename from storage/innodb_plugin/include/row0umod.h rename to storage/innobase/include/row0umod.h diff --git a/storage/innodb_plugin/include/row0umod.ic b/storage/innobase/include/row0umod.ic similarity index 100% rename from storage/innodb_plugin/include/row0umod.ic rename to storage/innobase/include/row0umod.ic diff --git a/storage/innodb_plugin/include/row0undo.h b/storage/innobase/include/row0undo.h similarity index 100% rename from storage/innodb_plugin/include/row0undo.h rename to storage/innobase/include/row0undo.h diff --git a/storage/innodb_plugin/include/row0undo.ic b/storage/innobase/include/row0undo.ic similarity index 100% rename from storage/innodb_plugin/include/row0undo.ic rename to storage/innobase/include/row0undo.ic diff --git a/storage/innodb_plugin/include/row0upd.h b/storage/innobase/include/row0upd.h similarity index 100% rename from storage/innodb_plugin/include/row0upd.h rename to storage/innobase/include/row0upd.h diff --git a/storage/innodb_plugin/include/row0upd.ic b/storage/innobase/include/row0upd.ic similarity index 100% rename from storage/innodb_plugin/include/row0upd.ic rename to storage/innobase/include/row0upd.ic diff --git a/storage/innodb_plugin/include/row0vers.h b/storage/innobase/include/row0vers.h similarity index 100% rename from storage/innodb_plugin/include/row0vers.h rename to storage/innobase/include/row0vers.h diff --git a/storage/innodb_plugin/include/row0vers.ic b/storage/innobase/include/row0vers.ic similarity index 100% rename from storage/innodb_plugin/include/row0vers.ic rename to storage/innobase/include/row0vers.ic diff --git a/storage/innodb_plugin/include/srv0que.h b/storage/innobase/include/srv0que.h similarity index 100% rename from storage/innodb_plugin/include/srv0que.h rename to storage/innobase/include/srv0que.h diff --git a/storage/innodb_plugin/include/srv0srv.h b/storage/innobase/include/srv0srv.h similarity index 100% rename from storage/innodb_plugin/include/srv0srv.h rename to storage/innobase/include/srv0srv.h diff --git a/storage/innodb_plugin/include/srv0srv.ic b/storage/innobase/include/srv0srv.ic similarity index 100% rename from storage/innodb_plugin/include/srv0srv.ic rename to storage/innobase/include/srv0srv.ic diff --git a/storage/innodb_plugin/include/srv0start.h b/storage/innobase/include/srv0start.h similarity index 100% rename from storage/innodb_plugin/include/srv0start.h rename to storage/innobase/include/srv0start.h diff --git a/storage/innodb_plugin/include/sync0arr.h b/storage/innobase/include/sync0arr.h similarity index 100% rename from storage/innodb_plugin/include/sync0arr.h rename to storage/innobase/include/sync0arr.h diff --git a/storage/innodb_plugin/include/sync0arr.ic b/storage/innobase/include/sync0arr.ic similarity index 100% rename from storage/innodb_plugin/include/sync0arr.ic rename to storage/innobase/include/sync0arr.ic diff --git a/storage/innodb_plugin/include/sync0rw.h b/storage/innobase/include/sync0rw.h similarity index 100% rename from storage/innodb_plugin/include/sync0rw.h rename to storage/innobase/include/sync0rw.h diff --git a/storage/innodb_plugin/include/sync0rw.ic b/storage/innobase/include/sync0rw.ic similarity index 100% rename from storage/innodb_plugin/include/sync0rw.ic rename to storage/innobase/include/sync0rw.ic diff --git a/storage/innodb_plugin/include/sync0sync.h b/storage/innobase/include/sync0sync.h similarity index 100% rename from storage/innodb_plugin/include/sync0sync.h rename to storage/innobase/include/sync0sync.h diff --git a/storage/innodb_plugin/include/sync0sync.ic b/storage/innobase/include/sync0sync.ic similarity index 100% rename from storage/innodb_plugin/include/sync0sync.ic rename to storage/innobase/include/sync0sync.ic diff --git a/storage/innodb_plugin/include/sync0types.h b/storage/innobase/include/sync0types.h similarity index 100% rename from storage/innodb_plugin/include/sync0types.h rename to storage/innobase/include/sync0types.h diff --git a/storage/innodb_plugin/include/thr0loc.h b/storage/innobase/include/thr0loc.h similarity index 100% rename from storage/innodb_plugin/include/thr0loc.h rename to storage/innobase/include/thr0loc.h diff --git a/storage/innodb_plugin/include/thr0loc.ic b/storage/innobase/include/thr0loc.ic similarity index 100% rename from storage/innodb_plugin/include/thr0loc.ic rename to storage/innobase/include/thr0loc.ic diff --git a/storage/innodb_plugin/include/trx0i_s.h b/storage/innobase/include/trx0i_s.h similarity index 100% rename from storage/innodb_plugin/include/trx0i_s.h rename to storage/innobase/include/trx0i_s.h diff --git a/storage/innodb_plugin/include/trx0purge.h b/storage/innobase/include/trx0purge.h similarity index 100% rename from storage/innodb_plugin/include/trx0purge.h rename to storage/innobase/include/trx0purge.h diff --git a/storage/innodb_plugin/include/trx0purge.ic b/storage/innobase/include/trx0purge.ic similarity index 100% rename from storage/innodb_plugin/include/trx0purge.ic rename to storage/innobase/include/trx0purge.ic diff --git a/storage/innodb_plugin/include/trx0rec.h b/storage/innobase/include/trx0rec.h similarity index 100% rename from storage/innodb_plugin/include/trx0rec.h rename to storage/innobase/include/trx0rec.h diff --git a/storage/innodb_plugin/include/trx0rec.ic b/storage/innobase/include/trx0rec.ic similarity index 100% rename from storage/innodb_plugin/include/trx0rec.ic rename to storage/innobase/include/trx0rec.ic diff --git a/storage/innodb_plugin/include/trx0roll.h b/storage/innobase/include/trx0roll.h similarity index 100% rename from storage/innodb_plugin/include/trx0roll.h rename to storage/innobase/include/trx0roll.h diff --git a/storage/innodb_plugin/include/trx0roll.ic b/storage/innobase/include/trx0roll.ic similarity index 100% rename from storage/innodb_plugin/include/trx0roll.ic rename to storage/innobase/include/trx0roll.ic diff --git a/storage/innodb_plugin/include/trx0rseg.h b/storage/innobase/include/trx0rseg.h similarity index 100% rename from storage/innodb_plugin/include/trx0rseg.h rename to storage/innobase/include/trx0rseg.h diff --git a/storage/innodb_plugin/include/trx0rseg.ic b/storage/innobase/include/trx0rseg.ic similarity index 100% rename from storage/innodb_plugin/include/trx0rseg.ic rename to storage/innobase/include/trx0rseg.ic diff --git a/storage/innodb_plugin/include/trx0sys.h b/storage/innobase/include/trx0sys.h similarity index 100% rename from storage/innodb_plugin/include/trx0sys.h rename to storage/innobase/include/trx0sys.h diff --git a/storage/innodb_plugin/include/trx0sys.ic b/storage/innobase/include/trx0sys.ic similarity index 100% rename from storage/innodb_plugin/include/trx0sys.ic rename to storage/innobase/include/trx0sys.ic diff --git a/storage/innodb_plugin/include/trx0trx.h b/storage/innobase/include/trx0trx.h similarity index 100% rename from storage/innodb_plugin/include/trx0trx.h rename to storage/innobase/include/trx0trx.h diff --git a/storage/innodb_plugin/include/trx0trx.ic b/storage/innobase/include/trx0trx.ic similarity index 100% rename from storage/innodb_plugin/include/trx0trx.ic rename to storage/innobase/include/trx0trx.ic diff --git a/storage/innodb_plugin/include/trx0types.h b/storage/innobase/include/trx0types.h similarity index 100% rename from storage/innodb_plugin/include/trx0types.h rename to storage/innobase/include/trx0types.h diff --git a/storage/innodb_plugin/include/trx0undo.h b/storage/innobase/include/trx0undo.h similarity index 100% rename from storage/innodb_plugin/include/trx0undo.h rename to storage/innobase/include/trx0undo.h diff --git a/storage/innodb_plugin/include/trx0undo.ic b/storage/innobase/include/trx0undo.ic similarity index 100% rename from storage/innodb_plugin/include/trx0undo.ic rename to storage/innobase/include/trx0undo.ic diff --git a/storage/innodb_plugin/include/trx0xa.h b/storage/innobase/include/trx0xa.h similarity index 100% rename from storage/innodb_plugin/include/trx0xa.h rename to storage/innobase/include/trx0xa.h diff --git a/storage/innodb_plugin/include/univ.i b/storage/innobase/include/univ.i similarity index 100% rename from storage/innodb_plugin/include/univ.i rename to storage/innobase/include/univ.i diff --git a/storage/innodb_plugin/include/usr0sess.h b/storage/innobase/include/usr0sess.h similarity index 100% rename from storage/innodb_plugin/include/usr0sess.h rename to storage/innobase/include/usr0sess.h diff --git a/storage/innodb_plugin/include/usr0sess.ic b/storage/innobase/include/usr0sess.ic similarity index 100% rename from storage/innodb_plugin/include/usr0sess.ic rename to storage/innobase/include/usr0sess.ic diff --git a/storage/innodb_plugin/include/usr0types.h b/storage/innobase/include/usr0types.h similarity index 100% rename from storage/innodb_plugin/include/usr0types.h rename to storage/innobase/include/usr0types.h diff --git a/storage/innodb_plugin/include/ut0auxconf.h b/storage/innobase/include/ut0auxconf.h similarity index 100% rename from storage/innodb_plugin/include/ut0auxconf.h rename to storage/innobase/include/ut0auxconf.h diff --git a/storage/innodb_plugin/include/ut0byte.h b/storage/innobase/include/ut0byte.h similarity index 100% rename from storage/innodb_plugin/include/ut0byte.h rename to storage/innobase/include/ut0byte.h diff --git a/storage/innodb_plugin/include/ut0byte.ic b/storage/innobase/include/ut0byte.ic similarity index 100% rename from storage/innodb_plugin/include/ut0byte.ic rename to storage/innobase/include/ut0byte.ic diff --git a/storage/innodb_plugin/include/ut0dbg.h b/storage/innobase/include/ut0dbg.h similarity index 100% rename from storage/innodb_plugin/include/ut0dbg.h rename to storage/innobase/include/ut0dbg.h diff --git a/storage/innodb_plugin/include/ut0list.h b/storage/innobase/include/ut0list.h similarity index 100% rename from storage/innodb_plugin/include/ut0list.h rename to storage/innobase/include/ut0list.h diff --git a/storage/innodb_plugin/include/ut0list.ic b/storage/innobase/include/ut0list.ic similarity index 100% rename from storage/innodb_plugin/include/ut0list.ic rename to storage/innobase/include/ut0list.ic diff --git a/storage/innodb_plugin/include/ut0lst.h b/storage/innobase/include/ut0lst.h similarity index 100% rename from storage/innodb_plugin/include/ut0lst.h rename to storage/innobase/include/ut0lst.h diff --git a/storage/innodb_plugin/include/ut0mem.h b/storage/innobase/include/ut0mem.h similarity index 100% rename from storage/innodb_plugin/include/ut0mem.h rename to storage/innobase/include/ut0mem.h diff --git a/storage/innodb_plugin/include/ut0mem.ic b/storage/innobase/include/ut0mem.ic similarity index 100% rename from storage/innodb_plugin/include/ut0mem.ic rename to storage/innobase/include/ut0mem.ic diff --git a/storage/innodb_plugin/include/ut0rnd.h b/storage/innobase/include/ut0rnd.h similarity index 100% rename from storage/innodb_plugin/include/ut0rnd.h rename to storage/innobase/include/ut0rnd.h diff --git a/storage/innodb_plugin/include/ut0rnd.ic b/storage/innobase/include/ut0rnd.ic similarity index 100% rename from storage/innodb_plugin/include/ut0rnd.ic rename to storage/innobase/include/ut0rnd.ic diff --git a/storage/innodb_plugin/include/ut0sort.h b/storage/innobase/include/ut0sort.h similarity index 100% rename from storage/innodb_plugin/include/ut0sort.h rename to storage/innobase/include/ut0sort.h diff --git a/storage/innodb_plugin/include/ut0ut.h b/storage/innobase/include/ut0ut.h similarity index 100% rename from storage/innodb_plugin/include/ut0ut.h rename to storage/innobase/include/ut0ut.h diff --git a/storage/innodb_plugin/include/ut0ut.ic b/storage/innobase/include/ut0ut.ic similarity index 100% rename from storage/innodb_plugin/include/ut0ut.ic rename to storage/innobase/include/ut0ut.ic diff --git a/storage/innodb_plugin/include/ut0vec.h b/storage/innobase/include/ut0vec.h similarity index 100% rename from storage/innodb_plugin/include/ut0vec.h rename to storage/innobase/include/ut0vec.h diff --git a/storage/innodb_plugin/include/ut0vec.ic b/storage/innobase/include/ut0vec.ic similarity index 100% rename from storage/innodb_plugin/include/ut0vec.ic rename to storage/innobase/include/ut0vec.ic diff --git a/storage/innodb_plugin/include/ut0wqueue.h b/storage/innobase/include/ut0wqueue.h similarity index 100% rename from storage/innodb_plugin/include/ut0wqueue.h rename to storage/innobase/include/ut0wqueue.h diff --git a/storage/innodb_plugin/lock/lock0iter.c b/storage/innobase/lock/lock0iter.c similarity index 100% rename from storage/innodb_plugin/lock/lock0iter.c rename to storage/innobase/lock/lock0iter.c diff --git a/storage/innodb_plugin/lock/lock0lock.c b/storage/innobase/lock/lock0lock.c similarity index 100% rename from storage/innodb_plugin/lock/lock0lock.c rename to storage/innobase/lock/lock0lock.c diff --git a/storage/innodb_plugin/log/log0log.c b/storage/innobase/log/log0log.c similarity index 100% rename from storage/innodb_plugin/log/log0log.c rename to storage/innobase/log/log0log.c diff --git a/storage/innodb_plugin/log/log0recv.c b/storage/innobase/log/log0recv.c similarity index 100% rename from storage/innodb_plugin/log/log0recv.c rename to storage/innobase/log/log0recv.c diff --git a/storage/innodb_plugin/mach/mach0data.c b/storage/innobase/mach/mach0data.c similarity index 100% rename from storage/innodb_plugin/mach/mach0data.c rename to storage/innobase/mach/mach0data.c diff --git a/storage/innodb_plugin/mem/mem0dbg.c b/storage/innobase/mem/mem0dbg.c similarity index 100% rename from storage/innodb_plugin/mem/mem0dbg.c rename to storage/innobase/mem/mem0dbg.c diff --git a/storage/innodb_plugin/mem/mem0mem.c b/storage/innobase/mem/mem0mem.c similarity index 100% rename from storage/innodb_plugin/mem/mem0mem.c rename to storage/innobase/mem/mem0mem.c diff --git a/storage/innodb_plugin/mem/mem0pool.c b/storage/innobase/mem/mem0pool.c similarity index 100% rename from storage/innodb_plugin/mem/mem0pool.c rename to storage/innobase/mem/mem0pool.c diff --git a/storage/innodb_plugin/mtr/mtr0log.c b/storage/innobase/mtr/mtr0log.c similarity index 100% rename from storage/innodb_plugin/mtr/mtr0log.c rename to storage/innobase/mtr/mtr0log.c diff --git a/storage/innodb_plugin/mtr/mtr0mtr.c b/storage/innobase/mtr/mtr0mtr.c similarity index 100% rename from storage/innodb_plugin/mtr/mtr0mtr.c rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/ctype_innodb_like.inc rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/have_innodb.inc rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb-analyze.result rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb-analyze.test rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb-autoinc.result rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb-autoinc.test rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb-index.inc rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb-index.result rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb-index.test rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb-index_ucs2.result rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb-index_ucs2.test rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb-lock.result rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb-lock.test rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb-master.opt rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb-replace.result rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb-replace.test rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb-semi-consistent-master.opt rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb-semi-consistent.result rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb-semi-consistent.test rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb-timeout.result rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb-timeout.test rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb-use-sys-malloc-master.opt rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb-use-sys-malloc.result rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb-use-sys-malloc.test rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb-zip.result rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb-zip.test rename to storage/innobase/mysql-test/innodb-zip.test diff --git a/storage/innodb_plugin/mysql-test/innodb.result b/storage/innobase/mysql-test/innodb.result similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb.result rename to storage/innobase/mysql-test/innodb.result diff --git a/storage/innodb_plugin/mysql-test/innodb.test b/storage/innobase/mysql-test/innodb.test similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb.test rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_bug21704.result rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_bug21704.test rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_bug34053.result rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_bug34053.test rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_bug34300.result rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_bug34300.test rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_bug35220.result rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_bug35220.test rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_bug36169.result rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_bug36169.test rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_bug36172.result rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_bug36172.test rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_bug40360.result rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_bug40360.test rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_bug40565.result rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_bug40565.test rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_bug41904.result rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_bug41904.test rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_bug42101-nonzero-master.opt rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_bug42101-nonzero.result rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_bug42101-nonzero.test rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_bug42101.result rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_bug42101.test rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_bug44032.result rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_bug44032.test rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_bug45357.result rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_bug45357.test rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_file_format.result rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_file_format.test rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_information_schema.result rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_information_schema.test rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_trx_weight.inc rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_trx_weight.result rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/innodb_trx_weight.test rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/patches/README rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/patches/index_merge_innodb-explain.diff rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/patches/information_schema.diff rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/patches/innodb-index.diff rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/patches/innodb_file_per_table.diff rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/patches/innodb_lock_wait_timeout.diff rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/patches/innodb_thread_concurrency_basic.diff rename to 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 similarity index 100% rename from storage/innodb_plugin/mysql-test/patches/partition_innodb.diff rename to storage/innobase/mysql-test/patches/partition_innodb.diff diff --git a/storage/innodb_plugin/os/os0file.c b/storage/innobase/os/os0file.c similarity index 100% rename from storage/innodb_plugin/os/os0file.c rename to storage/innobase/os/os0file.c diff --git a/storage/innodb_plugin/os/os0proc.c b/storage/innobase/os/os0proc.c similarity index 100% rename from storage/innodb_plugin/os/os0proc.c rename to storage/innobase/os/os0proc.c diff --git a/storage/innodb_plugin/os/os0sync.c b/storage/innobase/os/os0sync.c similarity index 100% rename from storage/innodb_plugin/os/os0sync.c rename to storage/innobase/os/os0sync.c diff --git a/storage/innodb_plugin/os/os0thread.c b/storage/innobase/os/os0thread.c similarity index 100% rename from storage/innodb_plugin/os/os0thread.c rename to storage/innobase/os/os0thread.c diff --git a/storage/innodb_plugin/page/page0cur.c b/storage/innobase/page/page0cur.c similarity index 100% rename from storage/innodb_plugin/page/page0cur.c rename to storage/innobase/page/page0cur.c diff --git a/storage/innodb_plugin/page/page0page.c b/storage/innobase/page/page0page.c similarity index 100% rename from storage/innodb_plugin/page/page0page.c rename to storage/innobase/page/page0page.c diff --git a/storage/innodb_plugin/page/page0zip.c b/storage/innobase/page/page0zip.c similarity index 100% rename from storage/innodb_plugin/page/page0zip.c rename to storage/innobase/page/page0zip.c diff --git a/storage/innodb_plugin/pars/lexyy.c b/storage/innobase/pars/lexyy.c similarity index 100% rename from storage/innodb_plugin/pars/lexyy.c rename to storage/innobase/pars/lexyy.c diff --git a/storage/innodb_plugin/pars/make_bison.sh b/storage/innobase/pars/make_bison.sh similarity index 100% rename from storage/innodb_plugin/pars/make_bison.sh rename to storage/innobase/pars/make_bison.sh diff --git a/storage/innodb_plugin/pars/make_flex.sh b/storage/innobase/pars/make_flex.sh similarity index 100% rename from storage/innodb_plugin/pars/make_flex.sh rename to storage/innobase/pars/make_flex.sh diff --git a/storage/innodb_plugin/pars/pars0grm.c b/storage/innobase/pars/pars0grm.c similarity index 100% rename from storage/innodb_plugin/pars/pars0grm.c rename to storage/innobase/pars/pars0grm.c diff --git a/storage/innodb_plugin/pars/pars0grm.y b/storage/innobase/pars/pars0grm.y similarity index 100% rename from storage/innodb_plugin/pars/pars0grm.y rename to storage/innobase/pars/pars0grm.y diff --git a/storage/innodb_plugin/pars/pars0lex.l b/storage/innobase/pars/pars0lex.l similarity index 100% rename from storage/innodb_plugin/pars/pars0lex.l rename to storage/innobase/pars/pars0lex.l diff --git a/storage/innodb_plugin/pars/pars0opt.c b/storage/innobase/pars/pars0opt.c similarity index 100% rename from storage/innodb_plugin/pars/pars0opt.c rename to storage/innobase/pars/pars0opt.c diff --git a/storage/innodb_plugin/pars/pars0pars.c b/storage/innobase/pars/pars0pars.c similarity index 100% rename from storage/innodb_plugin/pars/pars0pars.c rename to storage/innobase/pars/pars0pars.c diff --git a/storage/innodb_plugin/pars/pars0sym.c b/storage/innobase/pars/pars0sym.c similarity index 100% rename from storage/innodb_plugin/pars/pars0sym.c rename to storage/innobase/pars/pars0sym.c diff --git a/storage/innodb_plugin/plug.in b/storage/innobase/plug.in similarity index 94% rename from storage/innodb_plugin/plug.in rename to 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 similarity index 100% rename from storage/innodb_plugin/que/que0que.c rename to storage/innobase/que/que0que.c diff --git a/storage/innodb_plugin/read/read0read.c b/storage/innobase/read/read0read.c similarity index 100% rename from storage/innodb_plugin/read/read0read.c rename to storage/innobase/read/read0read.c diff --git a/storage/innodb_plugin/rem/rem0cmp.c b/storage/innobase/rem/rem0cmp.c similarity index 100% rename from storage/innodb_plugin/rem/rem0cmp.c rename to storage/innobase/rem/rem0cmp.c diff --git a/storage/innodb_plugin/rem/rem0rec.c b/storage/innobase/rem/rem0rec.c similarity index 100% rename from storage/innodb_plugin/rem/rem0rec.c rename to storage/innobase/rem/rem0rec.c diff --git a/storage/innodb_plugin/row/row0ext.c b/storage/innobase/row/row0ext.c similarity index 100% rename from storage/innodb_plugin/row/row0ext.c rename to storage/innobase/row/row0ext.c diff --git a/storage/innodb_plugin/row/row0ins.c b/storage/innobase/row/row0ins.c similarity index 100% rename from storage/innodb_plugin/row/row0ins.c rename to storage/innobase/row/row0ins.c diff --git a/storage/innodb_plugin/row/row0merge.c b/storage/innobase/row/row0merge.c similarity index 100% rename from storage/innodb_plugin/row/row0merge.c rename to storage/innobase/row/row0merge.c diff --git a/storage/innodb_plugin/row/row0mysql.c b/storage/innobase/row/row0mysql.c similarity index 100% rename from storage/innodb_plugin/row/row0mysql.c rename to storage/innobase/row/row0mysql.c diff --git a/storage/innodb_plugin/row/row0purge.c b/storage/innobase/row/row0purge.c similarity index 100% rename from storage/innodb_plugin/row/row0purge.c rename to storage/innobase/row/row0purge.c diff --git a/storage/innodb_plugin/row/row0row.c b/storage/innobase/row/row0row.c similarity index 100% rename from storage/innodb_plugin/row/row0row.c rename to storage/innobase/row/row0row.c diff --git a/storage/innodb_plugin/row/row0sel.c b/storage/innobase/row/row0sel.c similarity index 100% rename from storage/innodb_plugin/row/row0sel.c rename to storage/innobase/row/row0sel.c diff --git a/storage/innodb_plugin/row/row0uins.c b/storage/innobase/row/row0uins.c similarity index 100% rename from storage/innodb_plugin/row/row0uins.c rename to storage/innobase/row/row0uins.c diff --git a/storage/innodb_plugin/row/row0umod.c b/storage/innobase/row/row0umod.c similarity index 100% rename from storage/innodb_plugin/row/row0umod.c rename to storage/innobase/row/row0umod.c diff --git a/storage/innodb_plugin/row/row0undo.c b/storage/innobase/row/row0undo.c similarity index 100% rename from storage/innodb_plugin/row/row0undo.c rename to storage/innobase/row/row0undo.c diff --git a/storage/innodb_plugin/row/row0upd.c b/storage/innobase/row/row0upd.c similarity index 100% rename from storage/innodb_plugin/row/row0upd.c rename to storage/innobase/row/row0upd.c diff --git a/storage/innodb_plugin/row/row0vers.c b/storage/innobase/row/row0vers.c similarity index 100% rename from storage/innodb_plugin/row/row0vers.c rename to storage/innobase/row/row0vers.c diff --git a/storage/innodb_plugin/scripts/install_innodb_plugins.sql b/storage/innobase/scripts/install_innodb_plugins.sql similarity index 100% rename from storage/innodb_plugin/scripts/install_innodb_plugins.sql rename to 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 similarity index 100% rename from storage/innodb_plugin/scripts/install_innodb_plugins_win.sql rename to storage/innobase/scripts/install_innodb_plugins_win.sql diff --git a/storage/innodb_plugin/setup.sh b/storage/innobase/setup.sh similarity index 100% rename from storage/innodb_plugin/setup.sh rename to storage/innobase/setup.sh diff --git a/storage/innodb_plugin/srv/srv0que.c b/storage/innobase/srv/srv0que.c similarity index 100% rename from storage/innodb_plugin/srv/srv0que.c rename to storage/innobase/srv/srv0que.c diff --git a/storage/innodb_plugin/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c similarity index 100% rename from storage/innodb_plugin/srv/srv0srv.c rename to storage/innobase/srv/srv0srv.c diff --git a/storage/innodb_plugin/srv/srv0start.c b/storage/innobase/srv/srv0start.c similarity index 100% rename from storage/innodb_plugin/srv/srv0start.c rename to storage/innobase/srv/srv0start.c diff --git a/storage/innodb_plugin/sync/sync0arr.c b/storage/innobase/sync/sync0arr.c similarity index 100% rename from storage/innodb_plugin/sync/sync0arr.c rename to storage/innobase/sync/sync0arr.c diff --git a/storage/innodb_plugin/sync/sync0rw.c b/storage/innobase/sync/sync0rw.c similarity index 100% rename from storage/innodb_plugin/sync/sync0rw.c rename to storage/innobase/sync/sync0rw.c diff --git a/storage/innodb_plugin/sync/sync0sync.c b/storage/innobase/sync/sync0sync.c similarity index 100% rename from storage/innodb_plugin/sync/sync0sync.c rename to storage/innobase/sync/sync0sync.c diff --git a/storage/innodb_plugin/thr/thr0loc.c b/storage/innobase/thr/thr0loc.c similarity index 100% rename from storage/innodb_plugin/thr/thr0loc.c rename to storage/innobase/thr/thr0loc.c diff --git a/storage/innodb_plugin/trx/trx0i_s.c b/storage/innobase/trx/trx0i_s.c similarity index 100% rename from storage/innodb_plugin/trx/trx0i_s.c rename to storage/innobase/trx/trx0i_s.c diff --git a/storage/innodb_plugin/trx/trx0purge.c b/storage/innobase/trx/trx0purge.c similarity index 100% rename from storage/innodb_plugin/trx/trx0purge.c rename to storage/innobase/trx/trx0purge.c diff --git a/storage/innodb_plugin/trx/trx0rec.c b/storage/innobase/trx/trx0rec.c similarity index 100% rename from storage/innodb_plugin/trx/trx0rec.c rename to storage/innobase/trx/trx0rec.c diff --git a/storage/innodb_plugin/trx/trx0roll.c b/storage/innobase/trx/trx0roll.c similarity index 100% rename from storage/innodb_plugin/trx/trx0roll.c rename to storage/innobase/trx/trx0roll.c diff --git a/storage/innodb_plugin/trx/trx0rseg.c b/storage/innobase/trx/trx0rseg.c similarity index 100% rename from storage/innodb_plugin/trx/trx0rseg.c rename to storage/innobase/trx/trx0rseg.c diff --git a/storage/innodb_plugin/trx/trx0sys.c b/storage/innobase/trx/trx0sys.c similarity index 100% rename from storage/innodb_plugin/trx/trx0sys.c rename to storage/innobase/trx/trx0sys.c diff --git a/storage/innodb_plugin/trx/trx0trx.c b/storage/innobase/trx/trx0trx.c similarity index 100% rename from storage/innodb_plugin/trx/trx0trx.c rename to storage/innobase/trx/trx0trx.c diff --git a/storage/innodb_plugin/trx/trx0undo.c b/storage/innobase/trx/trx0undo.c similarity index 100% rename from storage/innodb_plugin/trx/trx0undo.c rename to storage/innobase/trx/trx0undo.c diff --git a/storage/innodb_plugin/usr/usr0sess.c b/storage/innobase/usr/usr0sess.c similarity index 100% rename from storage/innodb_plugin/usr/usr0sess.c rename to 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 similarity index 100% rename from storage/innodb_plugin/ut/ut0auxconf_atomic_pthread_t_gcc.c rename to 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 similarity index 100% rename from storage/innodb_plugin/ut/ut0auxconf_atomic_pthread_t_solaris.c rename to 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 similarity index 100% rename from storage/innodb_plugin/ut/ut0auxconf_have_solaris_atomics.c rename to 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 similarity index 100% rename from storage/innodb_plugin/ut/ut0auxconf_pause.c rename to 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 similarity index 100% rename from storage/innodb_plugin/ut/ut0auxconf_sizeof_pthread_t.c rename to storage/innobase/ut/ut0auxconf_sizeof_pthread_t.c diff --git a/storage/innodb_plugin/ut/ut0byte.c b/storage/innobase/ut/ut0byte.c similarity index 100% rename from storage/innodb_plugin/ut/ut0byte.c rename to storage/innobase/ut/ut0byte.c diff --git a/storage/innodb_plugin/ut/ut0dbg.c b/storage/innobase/ut/ut0dbg.c similarity index 100% rename from storage/innodb_plugin/ut/ut0dbg.c rename to storage/innobase/ut/ut0dbg.c diff --git a/storage/innodb_plugin/ut/ut0list.c b/storage/innobase/ut/ut0list.c similarity index 100% rename from storage/innodb_plugin/ut/ut0list.c rename to storage/innobase/ut/ut0list.c diff --git a/storage/innodb_plugin/ut/ut0mem.c b/storage/innobase/ut/ut0mem.c similarity index 100% rename from storage/innodb_plugin/ut/ut0mem.c rename to storage/innobase/ut/ut0mem.c diff --git a/storage/innodb_plugin/ut/ut0rnd.c b/storage/innobase/ut/ut0rnd.c similarity index 100% rename from storage/innodb_plugin/ut/ut0rnd.c rename to storage/innobase/ut/ut0rnd.c diff --git a/storage/innodb_plugin/ut/ut0ut.c b/storage/innobase/ut/ut0ut.c similarity index 100% rename from storage/innodb_plugin/ut/ut0ut.c rename to storage/innobase/ut/ut0ut.c diff --git a/storage/innodb_plugin/ut/ut0vec.c b/storage/innobase/ut/ut0vec.c similarity index 100% rename from storage/innodb_plugin/ut/ut0vec.c rename to storage/innobase/ut/ut0vec.c diff --git a/storage/innodb_plugin/ut/ut0wqueue.c b/storage/innobase/ut/ut0wqueue.c similarity index 100% rename from storage/innodb_plugin/ut/ut0wqueue.c rename to storage/innobase/ut/ut0wqueue.c diff --git a/storage/innodb_plugin/win-plugin/README b/storage/innobase/win-plugin/README similarity index 100% rename from storage/innodb_plugin/win-plugin/README rename to storage/innobase/win-plugin/README diff --git a/storage/innodb_plugin/win-plugin/win-plugin.diff b/storage/innobase/win-plugin/win-plugin.diff similarity index 100% rename from storage/innodb_plugin/win-plugin/win-plugin.diff rename to storage/innobase/win-plugin/win-plugin.diff