Move everything into a subdirectory in order to circumvent a bzr merge bug.

3d4ef17d · Vasil Dimov · 1c6ee3c9 · 3d4ef17d · 3d4ef17d · 3d4ef17d
Commit 3d4ef17d authored Apr 12, 2010 by Vasil Dimov
414 changed files
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
--- a/COPYING
+++ b/COPYING
--- a/COPYING.Google
+++ b/COPYING.Google
--- a/COPYING.Percona
+++ b/COPYING.Percona
--- a/COPYING.Sun_Microsystems
+++ b/COPYING.Sun_Microsystems
--- a/ChangeLog
+++ b/ChangeLog
--- a/Doxyfile
+++ b/Doxyfile
--- a/Makefile.am
+++ b/Makefile.am
--- a/btr/btr0btr.c
+++ b/btr/btr0btr.c
--- a/btr/btr0cur.c
+++ b/btr/btr0cur.c
--- a/btr/btr0pcur.c
+++ b/btr/btr0pcur.c
--- a/btr/btr0sea.c
+++ b/btr/btr0sea.c
--- a/buf/buf0buddy.c
+++ b/buf/buf0buddy.c
--- a/buf/buf0buf.c
+++ b/buf/buf0buf.c
--- a/buf/buf0flu.c
+++ b/buf/buf0flu.c
--- a/buf/buf0lru.c
+++ b/buf/buf0lru.c
--- a/buf/buf0rea.c
+++ b/buf/buf0rea.c
--- a/compile-innodb
+++ b/compile-innodb
--- a/compile-innodb-debug
+++ b/compile-innodb-debug
--- a/data/data0data.c
+++ b/data/data0data.c
--- a/data/data0type.c
+++ b/data/data0type.c
--- a/dict/dict0boot.c
+++ b/dict/dict0boot.c
--- a/dict/dict0crea.c
+++ b/dict/dict0crea.c
--- a/dict/dict0dict.c
+++ b/dict/dict0dict.c
--- a/dict/dict0load.c
+++ b/dict/dict0load.c
--- a/dict/dict0mem.c
+++ b/dict/dict0mem.c
--- a/dyn/dyn0dyn.c
+++ b/dyn/dyn0dyn.c
--- a/eval/eval0eval.c
+++ b/eval/eval0eval.c
--- a/eval/eval0proc.c
+++ b/eval/eval0proc.c
--- a/fil/fil0fil.c
+++ b/fil/fil0fil.c
--- a/fsp/fsp0fsp.c
+++ b/fsp/fsp0fsp.c
--- a/fut/fut0fut.c
+++ b/fut/fut0fut.c
--- a/fut/fut0lst.c
+++ b/fut/fut0lst.c
--- a/ha/ha0ha.c
+++ b/ha/ha0ha.c
--- a/ha/ha0storage.c
+++ b/ha/ha0storage.c
--- a/ha/hash0hash.c
+++ b/ha/hash0hash.c
--- a/ha_innodb.def
+++ b/ha_innodb.def
--- a/handler/ha_innodb.cc
+++ b/handler/ha_innodb.cc
--- a/handler/ha_innodb.h
+++ b/handler/ha_innodb.h
--- a/handler/handler0alter.cc
+++ b/handler/handler0alter.cc
--- a/handler/i_s.cc
+++ b/handler/i_s.cc
--- a/handler/i_s.h
+++ b/handler/i_s.h
--- a/handler/mysql_addons.cc
+++ b/handler/mysql_addons.cc
--- a/ibuf/ibuf0ibuf.c
+++ b/ibuf/ibuf0ibuf.c
--- a/include/btr0btr.h
+++ b/include/btr0btr.h
--- a/include/btr0btr.ic
+++ b/include/btr0btr.ic
--- a/include/btr0cur.h
+++ b/include/btr0cur.h
--- a/include/btr0cur.ic
+++ b/include/btr0cur.ic
--- a/include/btr0pcur.h
+++ b/include/btr0pcur.h
--- a/include/btr0pcur.ic
+++ b/include/btr0pcur.ic
--- a/include/btr0sea.h
+++ b/include/btr0sea.h
--- a/include/btr0sea.ic
+++ b/include/btr0sea.ic
--- a/include/btr0types.h
+++ b/include/btr0types.h
--- a/include/buf0buddy.h
+++ b/include/buf0buddy.h
--- a/include/buf0buddy.ic
+++ b/include/buf0buddy.ic
--- a/include/buf0buf.h
+++ b/include/buf0buf.h
--- a/include/buf0buf.ic
+++ b/include/buf0buf.ic
--- a/include/buf0flu.h
+++ b/include/buf0flu.h
--- a/include/buf0flu.ic
+++ b/include/buf0flu.ic
--- a/include/buf0lru.h
+++ b/include/buf0lru.h
--- a/include/buf0lru.ic
+++ b/include/buf0lru.ic
--- a/include/buf0rea.h
+++ b/include/buf0rea.h
--- a/include/buf0types.h
+++ b/include/buf0types.h
--- a/include/data0data.h
+++ b/include/data0data.h
--- a/include/data0data.ic
+++ b/include/data0data.ic
--- a/include/data0type.h
+++ b/include/data0type.h
--- a/include/data0type.ic
+++ b/include/data0type.ic
--- a/include/data0types.h
+++ b/include/data0types.h
--- a/include/db0err.h
+++ b/include/db0err.h
--- a/include/dict0boot.h
+++ b/include/dict0boot.h
--- a/include/dict0boot.ic
+++ b/include/dict0boot.ic
--- a/include/dict0crea.h
+++ b/include/dict0crea.h
--- a/include/dict0crea.ic
+++ b/include/dict0crea.ic
--- a/include/dict0dict.h
+++ b/include/dict0dict.h
--- a/include/dict0dict.ic
+++ b/include/dict0dict.ic
--- a/include/dict0load.h
+++ b/include/dict0load.h
--- a/include/dict0load.ic
+++ b/include/dict0load.ic
--- a/include/dict0mem.h
+++ b/include/dict0mem.h
--- a/include/dict0mem.ic
+++ b/include/dict0mem.ic
--- a/include/dict0types.h
+++ b/include/dict0types.h
--- a/include/dyn0dyn.h
+++ b/include/dyn0dyn.h
--- a/include/dyn0dyn.ic
+++ b/include/dyn0dyn.ic
--- a/include/eval0eval.h
+++ b/include/eval0eval.h
--- a/include/eval0eval.ic
+++ b/include/eval0eval.ic
--- a/include/eval0proc.h
+++ b/include/eval0proc.h
--- a/include/eval0proc.ic
+++ b/include/eval0proc.ic
--- a/include/fil0fil.h
+++ b/include/fil0fil.h
--- a/include/fsp0fsp.h
+++ b/include/fsp0fsp.h
--- a/include/fsp0fsp.ic
+++ b/include/fsp0fsp.ic
--- a/include/fsp0types.h
+++ b/include/fsp0types.h
--- a/include/fut0fut.h
+++ b/include/fut0fut.h
--- a/include/fut0fut.ic
+++ b/include/fut0fut.ic
--- a/include/fut0lst.h
+++ b/include/fut0lst.h
--- a/include/fut0lst.ic
+++ b/include/fut0lst.ic
--- a/include/ha0ha.h
+++ b/include/ha0ha.h
--- a/include/ha0ha.ic
+++ b/include/ha0ha.ic
--- a/include/ha0storage.h
+++ b/include/ha0storage.h
--- a/include/ha0storage.ic
+++ b/include/ha0storage.ic
--- a/include/ha_prototypes.h
+++ b/include/ha_prototypes.h
--- a/include/handler0alter.h
+++ b/include/handler0alter.h
--- a/include/hash0hash.h
+++ b/include/hash0hash.h
--- a/include/hash0hash.ic
+++ b/include/hash0hash.ic
--- a/include/ibuf0ibuf.h
+++ b/include/ibuf0ibuf.h
--- a/include/ibuf0ibuf.ic
+++ b/include/ibuf0ibuf.ic
--- a/include/ibuf0types.h
+++ b/include/ibuf0types.h
--- a/include/lock0iter.h
+++ b/include/lock0iter.h
--- a/include/lock0lock.h
+++ b/include/lock0lock.h
--- a/include/lock0lock.ic
+++ b/include/lock0lock.ic
--- a/include/lock0priv.h
+++ b/include/lock0priv.h
--- a/include/lock0priv.ic
+++ b/include/lock0priv.ic
--- a/include/lock0types.h
+++ b/include/lock0types.h
--- a/include/log0log.h
+++ b/include/log0log.h
--- a/include/log0log.ic
+++ b/include/log0log.ic
--- a/include/log0recv.h
+++ b/include/log0recv.h
--- a/include/log0recv.ic
+++ b/include/log0recv.ic
--- a/include/mach0data.h
+++ b/include/mach0data.h
--- a/include/mach0data.ic
+++ b/include/mach0data.ic
--- a/include/mem0dbg.h
+++ b/include/mem0dbg.h
--- a/include/mem0dbg.ic
+++ b/include/mem0dbg.ic
--- a/include/mem0mem.h
+++ b/include/mem0mem.h
--- a/include/mem0mem.ic
+++ b/include/mem0mem.ic
--- a/include/mem0pool.h
+++ b/include/mem0pool.h
--- a/include/mem0pool.ic
+++ b/include/mem0pool.ic
--- a/include/mtr0log.h
+++ b/include/mtr0log.h
--- a/include/mtr0log.ic
+++ b/include/mtr0log.ic
--- a/include/mtr0mtr.h
+++ b/include/mtr0mtr.h
--- a/include/mtr0mtr.ic
+++ b/include/mtr0mtr.ic
--- a/include/mtr0types.h
+++ b/include/mtr0types.h
--- a/include/mysql_addons.h
+++ b/include/mysql_addons.h
--- a/include/os0file.h
+++ b/include/os0file.h
--- a/include/os0file.ic
+++ b/include/os0file.ic
--- a/include/os0proc.h
+++ b/include/os0proc.h
--- a/include/os0proc.ic
+++ b/include/os0proc.ic
--- a/include/os0sync.h
+++ b/include/os0sync.h
--- a/include/os0sync.ic
+++ b/include/os0sync.ic
--- a/include/os0thread.h
+++ b/include/os0thread.h
--- a/include/os0thread.ic
+++ b/include/os0thread.ic
--- a/include/page0cur.h
+++ b/include/page0cur.h
--- a/include/page0cur.ic
+++ b/include/page0cur.ic
--- a/include/page0page.h
+++ b/include/page0page.h
--- a/include/page0page.ic
+++ b/include/page0page.ic
--- a/include/page0types.h
+++ b/include/page0types.h
--- a/include/page0zip.h
+++ b/include/page0zip.h
--- a/include/page0zip.ic
+++ b/include/page0zip.ic
--- a/include/pars0grm.h
+++ b/include/pars0grm.h
--- a/include/pars0opt.h
+++ b/include/pars0opt.h
--- a/include/pars0opt.ic
+++ b/include/pars0opt.ic
--- a/include/pars0pars.h
+++ b/include/pars0pars.h
--- a/include/pars0pars.ic
+++ b/include/pars0pars.ic
--- a/include/pars0sym.h
+++ b/include/pars0sym.h
--- a/include/pars0sym.ic
+++ b/include/pars0sym.ic
--- a/include/pars0types.h
+++ b/include/pars0types.h
--- a/include/que0que.h
+++ b/include/que0que.h
--- a/include/que0que.ic
+++ b/include/que0que.ic
--- a/include/que0types.h
+++ b/include/que0types.h
--- a/include/read0read.h
+++ b/include/read0read.h
--- a/include/read0read.ic
+++ b/include/read0read.ic
--- a/include/read0types.h
+++ b/include/read0types.h
--- a/include/rem0cmp.h
+++ b/include/rem0cmp.h
--- a/include/rem0cmp.ic
+++ b/include/rem0cmp.ic
--- a/include/rem0rec.h
+++ b/include/rem0rec.h
--- a/include/rem0rec.ic
+++ b/include/rem0rec.ic
--- a/include/rem0types.h
+++ b/include/rem0types.h
--- a/include/row0ext.h
+++ b/include/row0ext.h
--- a/include/row0ext.ic
+++ b/include/row0ext.ic
--- a/include/row0ins.h
+++ b/include/row0ins.h
--- a/include/row0ins.ic
+++ b/include/row0ins.ic
--- a/include/row0merge.h
+++ b/include/row0merge.h
--- a/include/row0mysql.h
+++ b/include/row0mysql.h
--- a/include/row0mysql.ic
+++ b/include/row0mysql.ic
--- a/include/row0purge.h
+++ b/include/row0purge.h
--- a/include/row0purge.ic
+++ b/include/row0purge.ic
--- a/include/row0row.h
+++ b/include/row0row.h
--- a/include/row0row.ic
+++ b/include/row0row.ic
--- a/include/row0sel.h
+++ b/include/row0sel.h
--- a/include/row0sel.ic
+++ b/include/row0sel.ic
--- a/include/row0types.h
+++ b/include/row0types.h
--- a/include/row0uins.h
+++ b/include/row0uins.h
--- a/include/row0uins.ic
+++ b/include/row0uins.ic
--- a/include/row0umod.h
+++ b/include/row0umod.h
--- a/include/row0umod.ic
+++ b/include/row0umod.ic
--- a/include/row0undo.h
+++ b/include/row0undo.h
--- a/include/row0undo.ic
+++ b/include/row0undo.ic
--- a/include/row0upd.h
+++ b/include/row0upd.h
--- a/include/row0upd.ic
+++ b/include/row0upd.ic
--- a/include/row0vers.h
+++ b/include/row0vers.h
--- a/include/row0vers.ic
+++ b/include/row0vers.ic
--- a/include/srv0que.h
+++ b/include/srv0que.h
--- a/include/srv0srv.h
+++ b/include/srv0srv.h
--- a/include/srv0srv.ic
+++ b/include/srv0srv.ic
--- a/include/srv0start.h
+++ b/include/srv0start.h
--- a/include/sync0arr.h
+++ b/include/sync0arr.h
--- a/include/sync0arr.ic
+++ b/include/sync0arr.ic
--- a/include/sync0rw.h
+++ b/include/sync0rw.h
--- a/include/sync0rw.ic
+++ b/include/sync0rw.ic
--- a/include/sync0sync.h
+++ b/include/sync0sync.h
--- a/include/sync0sync.ic
+++ b/include/sync0sync.ic
--- a/include/sync0types.h
+++ b/include/sync0types.h
--- a/include/thr0loc.h
+++ b/include/thr0loc.h
--- a/include/thr0loc.ic
+++ b/include/thr0loc.ic
--- a/include/trx0i_s.h
+++ b/include/trx0i_s.h
--- a/include/trx0purge.h
+++ b/include/trx0purge.h
--- a/include/trx0purge.ic
+++ b/include/trx0purge.ic
--- a/include/trx0rec.h
+++ b/include/trx0rec.h
--- a/include/trx0rec.ic
+++ b/include/trx0rec.ic
--- a/include/trx0roll.h
+++ b/include/trx0roll.h
--- a/include/trx0roll.ic
+++ b/include/trx0roll.ic
--- a/include/trx0rseg.h
+++ b/include/trx0rseg.h
--- a/include/trx0rseg.ic
+++ b/include/trx0rseg.ic
--- a/include/trx0sys.h
+++ b/include/trx0sys.h
--- a/include/trx0sys.ic
+++ b/include/trx0sys.ic
--- a/include/trx0trx.h
+++ b/include/trx0trx.h
--- a/include/trx0trx.ic
+++ b/include/trx0trx.ic
--- a/include/trx0types.h
+++ b/include/trx0types.h
--- a/include/trx0undo.h
+++ b/include/trx0undo.h
--- a/include/trx0undo.ic
+++ b/include/trx0undo.ic
--- a/include/trx0xa.h
+++ b/include/trx0xa.h
--- a/include/univ.i
+++ b/include/univ.i
--- a/include/usr0sess.h
+++ b/include/usr0sess.h
--- a/include/usr0sess.ic
+++ b/include/usr0sess.ic
--- a/include/usr0types.h
+++ b/include/usr0types.h
--- a/include/ut0auxconf.h
+++ b/include/ut0auxconf.h
--- a/include/ut0byte.h
+++ b/include/ut0byte.h
--- a/include/ut0byte.ic
+++ b/include/ut0byte.ic
--- a/include/ut0dbg.h
+++ b/include/ut0dbg.h
--- a/include/ut0list.h
+++ b/include/ut0list.h
--- a/include/ut0list.ic
+++ b/include/ut0list.ic
--- a/include/ut0lst.h
+++ b/include/ut0lst.h
--- a/include/ut0mem.h
+++ b/include/ut0mem.h
--- a/include/ut0mem.ic
+++ b/include/ut0mem.ic
--- a/include/ut0rbt.h
+++ b/include/ut0rbt.h
--- a/include/ut0rnd.h
+++ b/include/ut0rnd.h
--- a/include/ut0rnd.ic
+++ b/include/ut0rnd.ic
--- a/include/ut0sort.h
+++ b/include/ut0sort.h
--- a/include/ut0ut.h
+++ b/include/ut0ut.h
--- a/include/ut0ut.ic
+++ b/include/ut0ut.ic
--- a/include/ut0vec.h
+++ b/include/ut0vec.h
--- a/include/ut0vec.ic
+++ b/include/ut0vec.ic
--- a/include/ut0wqueue.h
+++ b/include/ut0wqueue.h
--- a/lock/lock0iter.c
+++ b/lock/lock0iter.c
--- a/lock/lock0lock.c
+++ b/lock/lock0lock.c
--- a/log/log0log.c
+++ b/log/log0log.c
--- a/log/log0recv.c
+++ b/log/log0recv.c
--- a/mach/mach0data.c
+++ b/mach/mach0data.c
--- a/mem/mem0dbg.c
+++ b/mem/mem0dbg.c
--- a/mem/mem0mem.c
+++ b/mem/mem0mem.c
--- a/mem/mem0pool.c
+++ b/mem/mem0pool.c
--- a/mtr/mtr0log.c
+++ b/mtr/mtr0log.c
--- a/mtr/mtr0mtr.c
+++ b/mtr/mtr0mtr.c
--- a/mysql-test/ctype_innodb_like.inc
+++ b/mysql-test/ctype_innodb_like.inc
--- a/mysql-test/have_innodb.inc
+++ b/mysql-test/have_innodb.inc
--- a/mysql-test/innodb-analyze.result
+++ b/mysql-test/innodb-analyze.result
--- a/mysql-test/innodb-analyze.test
+++ b/mysql-test/innodb-analyze.test
--- a/mysql-test/innodb-autoinc-44030.result
+++ b/mysql-test/innodb-autoinc-44030.result
--- a/mysql-test/innodb-autoinc-44030.test
+++ b/mysql-test/innodb-autoinc-44030.test
--- a/mysql-test/innodb-autoinc.result
+++ b/mysql-test/innodb-autoinc.result
--- a/mysql-test/innodb-autoinc.test
+++ b/mysql-test/innodb-autoinc.test
--- a/mysql-test/innodb-consistent-master.opt
+++ b/mysql-test/innodb-consistent-master.opt
--- a/mysql-test/innodb-consistent.result
+++ b/mysql-test/innodb-consistent.result
--- a/mysql-test/innodb-consistent.test
+++ b/mysql-test/innodb-consistent.test
--- a/mysql-test/innodb-index.inc
+++ b/mysql-test/innodb-index.inc
--- a/mysql-test/innodb-index.result
+++ b/mysql-test/innodb-index.result
--- a/mysql-test/innodb-index.test
+++ b/mysql-test/innodb-index.test
--- a/mysql-test/innodb-index_ucs2.result
+++ b/mysql-test/innodb-index_ucs2.result
--- a/mysql-test/innodb-index_ucs2.test
+++ b/mysql-test/innodb-index_ucs2.test
--- a/mysql-test/innodb-lock.result
+++ b/mysql-test/innodb-lock.result
--- a/mysql-test/innodb-lock.test
+++ b/mysql-test/innodb-lock.test
--- a/mysql-test/innodb-master.opt
+++ b/mysql-test/innodb-master.opt
--- a/mysql-test/innodb-replace.result
+++ b/mysql-test/innodb-replace.result
--- a/mysql-test/innodb-replace.test
+++ b/mysql-test/innodb-replace.test
--- a/mysql-test/innodb-semi-consistent-master.opt
+++ b/mysql-test/innodb-semi-consistent-master.opt
--- a/mysql-test/innodb-semi-consistent.result
+++ b/mysql-test/innodb-semi-consistent.result
--- a/mysql-test/innodb-semi-consistent.test
+++ b/mysql-test/innodb-semi-consistent.test
--- a/mysql-test/innodb-timeout.result
+++ b/mysql-test/innodb-timeout.result
--- a/mysql-test/innodb-timeout.test
+++ b/mysql-test/innodb-timeout.test
--- a/mysql-test/innodb-use-sys-malloc-master.opt
+++ b/mysql-test/innodb-use-sys-malloc-master.opt
--- a/mysql-test/innodb-use-sys-malloc.result
+++ b/mysql-test/innodb-use-sys-malloc.result
--- a/mysql-test/innodb-use-sys-malloc.test
+++ b/mysql-test/innodb-use-sys-malloc.test
--- a/mysql-test/innodb-zip.result
+++ b/mysql-test/innodb-zip.result
--- a/mysql-test/innodb-zip.test
+++ b/mysql-test/innodb-zip.test
--- a/mysql-test/innodb.result
+++ b/mysql-test/innodb.result
--- a/mysql-test/innodb.test
+++ b/mysql-test/innodb.test
--- a/mysql-test/innodb_bug21704.result
+++ b/mysql-test/innodb_bug21704.result
--- a/mysql-test/innodb_bug21704.test
+++ b/mysql-test/innodb_bug21704.test
--- a/mysql-test/innodb_bug34053.result
+++ b/mysql-test/innodb_bug34053.result
--- a/mysql-test/innodb_bug34053.test
+++ b/mysql-test/innodb_bug34053.test
--- a/mysql-test/innodb_bug34300.result
+++ b/mysql-test/innodb_bug34300.result
--- a/mysql-test/innodb_bug34300.test
+++ b/mysql-test/innodb_bug34300.test
--- a/mysql-test/innodb_bug35220.result
+++ b/mysql-test/innodb_bug35220.result
--- a/mysql-test/innodb_bug35220.test
+++ b/mysql-test/innodb_bug35220.test
--- a/mysql-test/innodb_bug36169.result
+++ b/mysql-test/innodb_bug36169.result
--- a/mysql-test/innodb_bug36169.test
+++ b/mysql-test/innodb_bug36169.test
--- a/mysql-test/innodb_bug36172.result
+++ b/mysql-test/innodb_bug36172.result
--- a/mysql-test/innodb_bug36172.test
+++ b/mysql-test/innodb_bug36172.test
--- a/mysql-test/innodb_bug38231.result
+++ b/mysql-test/innodb_bug38231.result
--- a/mysql-test/innodb_bug38231.test
+++ b/mysql-test/innodb_bug38231.test
--- a/mysql-test/innodb_bug39438-master.opt
+++ b/mysql-test/innodb_bug39438-master.opt
--- a/mysql-test/innodb_bug39438.result
+++ b/mysql-test/innodb_bug39438.result
--- a/mysql-test/innodb_bug39438.test
+++ b/mysql-test/innodb_bug39438.test
--- a/mysql-test/innodb_bug40360.result
+++ b/mysql-test/innodb_bug40360.result
--- a/mysql-test/innodb_bug40360.test
+++ b/mysql-test/innodb_bug40360.test
--- a/mysql-test/innodb_bug40565.result
+++ b/mysql-test/innodb_bug40565.result
--- a/mysql-test/innodb_bug40565.test
+++ b/mysql-test/innodb_bug40565.test
--- a/mysql-test/innodb_bug41904.result
+++ b/mysql-test/innodb_bug41904.result
--- a/mysql-test/innodb_bug41904.test
+++ b/mysql-test/innodb_bug41904.test
--- a/mysql-test/innodb_bug42101-nonzero-master.opt
+++ b/mysql-test/innodb_bug42101-nonzero-master.opt
--- a/mysql-test/innodb_bug42101-nonzero.result
+++ b/mysql-test/innodb_bug42101-nonzero.result
--- a/mysql-test/innodb_bug42101-nonzero.test
+++ b/mysql-test/innodb_bug42101-nonzero.test
--- a/mysql-test/innodb_bug42101.result
+++ b/mysql-test/innodb_bug42101.result
--- a/mysql-test/innodb_bug42101.test
+++ b/mysql-test/innodb_bug42101.test
--- a/mysql-test/innodb_bug44032.result
+++ b/mysql-test/innodb_bug44032.result
--- a/mysql-test/innodb_bug44032.test
+++ b/mysql-test/innodb_bug44032.test
--- a/mysql-test/innodb_bug44369.result
+++ b/mysql-test/innodb_bug44369.result
--- a/mysql-test/innodb_bug44369.test
+++ b/mysql-test/innodb_bug44369.test
--- a/mysql-test/innodb_bug44571.result
+++ b/mysql-test/innodb_bug44571.result
--- a/mysql-test/innodb_bug44571.test
+++ b/mysql-test/innodb_bug44571.test
--- a/mysql-test/innodb_bug45357.result
+++ b/mysql-test/innodb_bug45357.result
--- a/mysql-test/innodb_bug45357.test
+++ b/mysql-test/innodb_bug45357.test
--- a/mysql-test/innodb_bug46000.result
+++ b/mysql-test/innodb_bug46000.result
--- a/mysql-test/innodb_bug46000.test
+++ b/mysql-test/innodb_bug46000.test
--- a/mysql-test/innodb_bug47621.result
+++ b/mysql-test/innodb_bug47621.result
--- a/mysql-test/innodb_bug47621.test
+++ b/mysql-test/innodb_bug47621.test
--- a/mysql-test/innodb_bug47622.result
+++ b/mysql-test/innodb_bug47622.result
--- a/mysql-test/innodb_bug47622.test
+++ b/mysql-test/innodb_bug47622.test
--- a/mysql-test/innodb_bug47777.result
+++ b/mysql-test/innodb_bug47777.result
--- a/mysql-test/innodb_bug47777.test
+++ b/mysql-test/innodb_bug47777.test
--- a/mysql-test/innodb_bug51378.result
+++ b/mysql-test/innodb_bug51378.result
--- a/mysql-test/innodb_bug51378.test
+++ b/mysql-test/innodb_bug51378.test
--- a/mysql-test/innodb_bug51920.result
+++ b/mysql-test/innodb_bug51920.result
--- a/mysql-test/innodb_bug51920.test
+++ b/mysql-test/innodb_bug51920.test
--- a/mysql-test/innodb_file_format.result
+++ b/mysql-test/innodb_file_format.result
--- a/mysql-test/innodb_file_format.test
+++ b/mysql-test/innodb_file_format.test
--- a/mysql-test/innodb_information_schema.result
+++ b/mysql-test/innodb_information_schema.result
--- a/mysql-test/innodb_information_schema.test
+++ b/mysql-test/innodb_information_schema.test
--- a/mysql-test/innodb_trx_weight.inc
+++ b/mysql-test/innodb_trx_weight.inc
--- a/mysql-test/innodb_trx_weight.result
+++ b/mysql-test/innodb_trx_weight.result
--- a/mysql-test/innodb_trx_weight.test
+++ b/mysql-test/innodb_trx_weight.test
--- a/mysql-test/patches/README
+++ b/mysql-test/patches/README
--- a/mysql-test/patches/index_merge_innodb-explain.diff
+++ b/mysql-test/patches/index_merge_innodb-explain.diff
--- a/mysql-test/patches/information_schema.diff
+++ b/mysql-test/patches/information_schema.diff
--- a/mysql-test/patches/innodb_change_buffering_basic.diff
+++ b/mysql-test/patches/innodb_change_buffering_basic.diff
--- a/mysql-test/patches/innodb_file_per_table.diff
+++ b/mysql-test/patches/innodb_file_per_table.diff
--- a/mysql-test/patches/innodb_lock_wait_timeout.diff
+++ b/mysql-test/patches/innodb_lock_wait_timeout.diff
--- a/mysql-test/patches/innodb_thread_concurrency_basic.diff
+++ b/mysql-test/patches/innodb_thread_concurrency_basic.diff
--- a/mysql-test/patches/partition_innodb.diff
+++ b/mysql-test/patches/partition_innodb.diff
--- a/os/os0file.c
+++ b/os/os0file.c
--- a/os/os0proc.c
+++ b/os/os0proc.c
--- a/os/os0sync.c
+++ b/os/os0sync.c
--- a/os/os0thread.c
+++ b/os/os0thread.c
--- a/page/page0cur.c
+++ b/page/page0cur.c
--- a/page/page0page.c
+++ b/page/page0page.c
--- a/page/page0zip.c
+++ b/page/page0zip.c
--- a/pars/lexyy.c
+++ b/pars/lexyy.c
--- a/pars/make_bison.sh
+++ b/pars/make_bison.sh
--- a/pars/make_flex.sh
+++ b/pars/make_flex.sh
--- a/pars/pars0grm.c
+++ b/pars/pars0grm.c
--- a/pars/pars0grm.y
+++ b/pars/pars0grm.y
--- a/pars/pars0lex.l
+++ b/pars/pars0lex.l
--- a/pars/pars0opt.c
+++ b/pars/pars0opt.c
--- a/pars/pars0pars.c
+++ b/pars/pars0pars.c
--- a/pars/pars0sym.c
+++ b/pars/pars0sym.c
--- a/plug.in
+++ b/plug.in
--- a/que/que0que.c
+++ b/que/que0que.c
--- a/read/read0read.c
+++ b/read/read0read.c
--- a/rem/rem0cmp.c
+++ b/rem/rem0cmp.c
--- a/rem/rem0rec.c
+++ b/rem/rem0rec.c
--- a/revert_gen.sh
+++ b/revert_gen.sh
--- a/row/row0ext.c
+++ b/row/row0ext.c
--- a/row/row0ins.c
+++ b/row/row0ins.c
--- a/row/row0merge.c
+++ b/row/row0merge.c
--- a/row/row0mysql.c
+++ b/row/row0mysql.c
--- a/row/row0purge.c
+++ b/row/row0purge.c
--- a/row/row0row.c
+++ b/row/row0row.c
--- a/row/row0sel.c
+++ b/row/row0sel.c
--- a/row/row0uins.c
+++ b/row/row0uins.c
--- a/row/row0umod.c
+++ b/row/row0umod.c
--- a/row/row0undo.c
+++ b/row/row0undo.c
--- a/row/row0upd.c
+++ b/row/row0upd.c
--- a/row/row0vers.c
+++ b/row/row0vers.c
--- a/scripts/export.sh
+++ b/scripts/export.sh
--- a/scripts/install_innodb_plugins.sql
+++ b/scripts/install_innodb_plugins.sql
--- a/scripts/install_innodb_plugins_win.sql
+++ b/scripts/install_innodb_plugins_win.sql
--- a/setup.sh
+++ b/setup.sh
--- a/srv/srv0que.c
+++ b/srv/srv0que.c
--- a/srv/srv0srv.c
+++ b/srv/srv0srv.c
--- a/srv/srv0start.c
+++ b/srv/srv0start.c
--- a/sync/sync0arr.c
+++ b/sync/sync0arr.c
--- a/sync/sync0rw.c
+++ b/sync/sync0rw.c
--- a/sync/sync0sync.c
+++ b/sync/sync0sync.c
--- a/thr/thr0loc.c
+++ b/thr/thr0loc.c
--- a/trx/trx0i_s.c
+++ b/trx/trx0i_s.c
--- a/trx/trx0purge.c
+++ b/trx/trx0purge.c
--- a/trx/trx0rec.c
+++ b/trx/trx0rec.c
--- a/trx/trx0roll.c
+++ b/trx/trx0roll.c
--- a/trx/trx0rseg.c
+++ b/trx/trx0rseg.c
--- a/trx/trx0sys.c
+++ b/trx/trx0sys.c
--- a/trx/trx0trx.c
+++ b/trx/trx0trx.c
--- a/trx/trx0undo.c
+++ b/trx/trx0undo.c
--- a/usr/usr0sess.c
+++ b/usr/usr0sess.c
--- a/ut/ut0auxconf_atomic_pthread_t_gcc.c
+++ b/ut/ut0auxconf_atomic_pthread_t_gcc.c
--- a/ut/ut0auxconf_atomic_pthread_t_solaris.c
+++ b/ut/ut0auxconf_atomic_pthread_t_solaris.c
--- a/ut/ut0auxconf_have_gcc_atomics.c
+++ b/ut/ut0auxconf_have_gcc_atomics.c
--- a/ut/ut0auxconf_have_solaris_atomics.c
+++ b/ut/ut0auxconf_have_solaris_atomics.c
--- a/ut/ut0auxconf_pause.c
+++ b/ut/ut0auxconf_pause.c
--- a/ut/ut0auxconf_sizeof_pthread_t.c
+++ b/ut/ut0auxconf_sizeof_pthread_t.c
--- a/ut/ut0byte.c
+++ b/ut/ut0byte.c
--- a/ut/ut0dbg.c
+++ b/ut/ut0dbg.c
--- a/ut/ut0list.c
+++ b/ut/ut0list.c
--- a/ut/ut0mem.c
+++ b/ut/ut0mem.c
--- a/ut/ut0rbt.c
+++ b/ut/ut0rbt.c
--- a/ut/ut0rnd.c
+++ b/ut/ut0rnd.c
--- a/ut/ut0ut.c
+++ b/ut/ut0ut.c
--- a/ut/ut0vec.c
+++ b/ut/ut0vec.c
--- a/ut/ut0wqueue.c
+++ b/ut/ut0wqueue.c