[MDEV-10919] Merge 5.7 xtradb Created: 2016-09-29  Updated: 2017-05-27  Resolved: 2017-05-27

Status: Closed
Project: MariaDB Server
Component/s: Storage Engine - XtraDB
Fix Version/s: N/A

Type: Task Priority: Minor
Reporter: Jan Lindström (Inactive) Assignee: Jan Lindström (Inactive)
Resolution: Won't Fix Votes: 1
Labels: None

Sprint: 10.2.3-1, 10.2.3-2

 Description   

Percona-Server-5.7.14-8.



 Comments   
Comment by Jan Lindström (Inactive) [ 2016-09-29 ]

jan@jan-lindstrom-asus-laptop:~/mysql/10.2-xtradb$ git merge merge/merge-xtradb-5.7
Auto-merging storage/xtradb/ut/ut0wqueue.cc
Auto-merging storage/xtradb/ut/ut0ut.cc
CONFLICT (content): Merge conflict in storage/xtradb/ut/ut0ut.cc
Auto-merging storage/xtradb/ut/ut0crc32.cc
CONFLICT (content): Merge conflict in storage/xtradb/ut/ut0crc32.cc
Removing storage/xtradb/ut/ut0bh.cc
Auto-merging storage/xtradb/trx/trx0undo.cc
CONFLICT (content): Merge conflict in storage/xtradb/trx/trx0undo.cc
Auto-merging storage/xtradb/trx/trx0trx.cc
CONFLICT (content): Merge conflict in storage/xtradb/trx/trx0trx.cc
Auto-merging storage/xtradb/trx/trx0sys.cc
CONFLICT (content): Merge conflict in storage/xtradb/trx/trx0sys.cc
Auto-merging storage/xtradb/trx/trx0roll.cc
CONFLICT (content): Merge conflict in storage/xtradb/trx/trx0roll.cc
Auto-merging storage/xtradb/trx/trx0rec.cc
CONFLICT (content): Merge conflict in storage/xtradb/trx/trx0rec.cc
Auto-merging storage/xtradb/trx/trx0i_s.cc
Auto-merging storage/xtradb/sync/sync0sync.cc
CONFLICT (content): Merge conflict in storage/xtradb/sync/sync0sync.cc
Auto-merging storage/xtradb/sync/sync0rw.cc
CONFLICT (content): Merge conflict in storage/xtradb/sync/sync0rw.cc
Auto-merging storage/xtradb/sync/sync0arr.cc
CONFLICT (content): Merge conflict in storage/xtradb/sync/sync0arr.cc
Auto-merging storage/xtradb/srv/srv0start.cc
CONFLICT (content): Merge conflict in storage/xtradb/srv/srv0start.cc
Auto-merging storage/xtradb/srv/srv0srv.cc
CONFLICT (content): Merge conflict in storage/xtradb/srv/srv0srv.cc
Auto-merging storage/xtradb/srv/srv0mon.cc
CONFLICT (content): Merge conflict in storage/xtradb/srv/srv0mon.cc
Auto-merging storage/xtradb/srv/srv0conc.cc
CONFLICT (content): Merge conflict in storage/xtradb/srv/srv0conc.cc
Auto-merging storage/xtradb/row/row0upd.cc
CONFLICT (content): Merge conflict in storage/xtradb/row/row0upd.cc
Auto-merging storage/xtradb/row/row0umod.cc
CONFLICT (content): Merge conflict in storage/xtradb/row/row0umod.cc
Auto-merging storage/xtradb/row/row0sel.cc
CONFLICT (content): Merge conflict in storage/xtradb/row/row0sel.cc
Auto-merging storage/xtradb/row/row0mysql.cc
CONFLICT (content): Merge conflict in storage/xtradb/row/row0mysql.cc
Auto-merging storage/xtradb/row/row0merge.cc
CONFLICT (content): Merge conflict in storage/xtradb/row/row0merge.cc
Auto-merging storage/xtradb/row/row0log.cc
CONFLICT (content): Merge conflict in storage/xtradb/row/row0log.cc
Auto-merging storage/xtradb/row/row0ins.cc
CONFLICT (content): Merge conflict in storage/xtradb/row/row0ins.cc
Auto-merging storage/xtradb/row/row0import.cc
CONFLICT (content): Merge conflict in storage/xtradb/row/row0import.cc
Auto-merging storage/xtradb/row/row0ftsort.cc
CONFLICT (content): Merge conflict in storage/xtradb/row/row0ftsort.cc
Auto-merging storage/xtradb/row/row0ext.cc
CONFLICT (content): Merge conflict in storage/xtradb/row/row0ext.cc
Auto-merging storage/xtradb/rem/rem0rec.cc
CONFLICT (content): Merge conflict in storage/xtradb/rem/rem0rec.cc
Auto-merging storage/xtradb/read/read0read.cc
CONFLICT (content): Merge conflict in storage/xtradb/read/read0read.cc
Auto-merging storage/xtradb/pars/pars0pars.cc
CONFLICT (content): Merge conflict in storage/xtradb/pars/pars0pars.cc
Auto-merging storage/xtradb/pars/pars0opt.cc
Auto-merging storage/xtradb/pars/pars0lex.l
Auto-merging storage/xtradb/pars/lexyy.cc
Auto-merging storage/xtradb/page/page0zip.cc
CONFLICT (content): Merge conflict in storage/xtradb/page/page0zip.cc
Auto-merging storage/xtradb/page/page0page.cc
Auto-merging storage/xtradb/page/page0cur.cc
Auto-merging storage/xtradb/os/os0thread.cc
CONFLICT (content): Merge conflict in storage/xtradb/os/os0thread.cc
CONFLICT (modify/delete): storage/xtradb/os/os0sync.cc deleted in merge/merge-xtradb-5.7 and modified in HEAD. Version HEAD of storage/xtradb/os/os0sync.cc left in tree.
Auto-merging storage/xtradb/os/os0file.cc
CONFLICT (content): Merge conflict in storage/xtradb/os/os0file.cc
Auto-merging storage/xtradb/mtr/mtr0mtr.cc
CONFLICT (content): Merge conflict in storage/xtradb/mtr/mtr0mtr.cc
Auto-merging storage/xtradb/mtr/mtr0log.cc
CONFLICT (content): Merge conflict in storage/xtradb/mtr/mtr0log.cc
Removing storage/xtradb/mem/mem0pool.cc
Removing storage/xtradb/mem/mem0dbg.cc
Auto-merging storage/xtradb/log/log0recv.cc
CONFLICT (content): Merge conflict in storage/xtradb/log/log0recv.cc
Auto-merging storage/xtradb/log/log0online.cc
CONFLICT (content): Merge conflict in storage/xtradb/log/log0online.cc
Auto-merging storage/xtradb/log/log0log.cc
CONFLICT (content): Merge conflict in storage/xtradb/log/log0log.cc
Auto-merging storage/xtradb/lock/lock0wait.cc
CONFLICT (content): Merge conflict in storage/xtradb/lock/lock0wait.cc
Auto-merging storage/xtradb/lock/lock0lock.cc
CONFLICT (content): Merge conflict in storage/xtradb/lock/lock0lock.cc
Auto-merging storage/xtradb/include/ut0wqueue.h
CONFLICT (content): Merge conflict in storage/xtradb/include/ut0wqueue.h
Auto-merging storage/xtradb/include/ut0ut.h
CONFLICT (content): Merge conflict in storage/xtradb/include/ut0ut.h
Auto-merging storage/xtradb/include/ut0list.ic
Auto-merging storage/xtradb/include/ut0list.h
Auto-merging storage/xtradb/include/ut0crc32.h
CONFLICT (content): Merge conflict in storage/xtradb/include/ut0crc32.h
Auto-merging storage/xtradb/include/ut0counter.h
CONFLICT (content): Merge conflict in storage/xtradb/include/ut0counter.h
Auto-merging storage/xtradb/include/ut0byte.ic
Removing storage/xtradb/include/ut0bh.ic
Removing storage/xtradb/include/ut0bh.h
Auto-merging storage/xtradb/include/univ.i
CONFLICT (content): Merge conflict in storage/xtradb/include/univ.i
Auto-merging storage/xtradb/include/trx0undo.h
Auto-merging storage/xtradb/include/trx0trx.h
CONFLICT (content): Merge conflict in storage/xtradb/include/trx0trx.h
Auto-merging storage/xtradb/include/trx0sys.ic
CONFLICT (content): Merge conflict in storage/xtradb/include/trx0sys.ic
Auto-merging storage/xtradb/include/trx0sys.h
CONFLICT (content): Merge conflict in storage/xtradb/include/trx0sys.h
Auto-merging storage/xtradb/include/sync0types.h
CONFLICT (content): Merge conflict in storage/xtradb/include/sync0types.h
CONFLICT (modify/delete): storage/xtradb/include/sync0sync.ic deleted in merge/merge-xtradb-5.7 and modified in HEAD. Version HEAD of storage/xtradb/include/sync0sync.ic left in tree.
Auto-merging storage/xtradb/include/sync0sync.h
CONFLICT (content): Merge conflict in storage/xtradb/include/sync0sync.h
Auto-merging storage/xtradb/include/sync0rw.ic
CONFLICT (content): Merge conflict in storage/xtradb/include/sync0rw.ic
Auto-merging storage/xtradb/include/sync0rw.h
CONFLICT (content): Merge conflict in storage/xtradb/include/sync0rw.h
Auto-merging storage/xtradb/include/sync0arr.h
Auto-merging storage/xtradb/include/srv0srv.h
CONFLICT (content): Merge conflict in storage/xtradb/include/srv0srv.h
Auto-merging storage/xtradb/include/srv0mon.h
CONFLICT (content): Merge conflict in storage/xtradb/include/srv0mon.h
Auto-merging storage/xtradb/include/row0mysql.h
CONFLICT (content): Merge conflict in storage/xtradb/include/row0mysql.h
Auto-merging storage/xtradb/include/row0merge.h
CONFLICT (content): Merge conflict in storage/xtradb/include/row0merge.h
Auto-merging storage/xtradb/include/row0log.h
CONFLICT (content): Merge conflict in storage/xtradb/include/row0log.h
Auto-merging storage/xtradb/include/row0ftsort.h
Auto-merging storage/xtradb/include/rem0rec.h
CONFLICT (content): Merge conflict in storage/xtradb/include/rem0rec.h
Removing storage/xtradb/include/read0read.ic
Auto-merging storage/xtradb/include/page0page.ic
Auto-merging storage/xtradb/include/page0page.h
Auto-merging storage/xtradb/include/page0cur.ic
CONFLICT (content): Merge conflict in storage/xtradb/include/page0cur.ic
Auto-merging storage/xtradb/include/os0thread.h
CONFLICT (content): Merge conflict in storage/xtradb/include/os0thread.h
CONFLICT (modify/delete): storage/xtradb/include/os0sync.ic deleted in merge/merge-xtradb-5.7 and modified in HEAD. Version HEAD of storage/xtradb/include/os0sync.ic left in tree.
CONFLICT (modify/delete): storage/xtradb/include/os0sync.h deleted in merge/merge-xtradb-5.7 and modified in HEAD. Version HEAD of storage/xtradb/include/os0sync.h left in tree.
Auto-merging storage/xtradb/include/os0file.ic
CONFLICT (content): Merge conflict in storage/xtradb/include/os0file.ic
Auto-merging storage/xtradb/include/os0file.h
CONFLICT (content): Merge conflict in storage/xtradb/include/os0file.h
Auto-merging storage/xtradb/include/mtr0mtr.ic
CONFLICT (content): Merge conflict in storage/xtradb/include/mtr0mtr.ic
Auto-merging storage/xtradb/include/mtr0mtr.h
CONFLICT (content): Merge conflict in storage/xtradb/include/mtr0mtr.h
Auto-merging storage/xtradb/include/mtr0log.ic
CONFLICT (content): Merge conflict in storage/xtradb/include/mtr0log.ic
Removing storage/xtradb/include/mem0pool.h
Removing storage/xtradb/include/mem0dbg.ic
Removing storage/xtradb/include/mem0dbg.h
Auto-merging storage/xtradb/include/log0recv.h
CONFLICT (content): Merge conflict in storage/xtradb/include/log0recv.h
Auto-merging storage/xtradb/include/log0log.ic
Auto-merging storage/xtradb/include/log0log.h
CONFLICT (content): Merge conflict in storage/xtradb/include/log0log.h
Auto-merging storage/xtradb/include/lock0priv.h
CONFLICT (content): Merge conflict in storage/xtradb/include/lock0priv.h
Auto-merging storage/xtradb/include/lock0lock.h
CONFLICT (content): Merge conflict in storage/xtradb/include/lock0lock.h
Auto-merging storage/xtradb/include/ibuf0ibuf.h
CONFLICT (content): Merge conflict in storage/xtradb/include/ibuf0ibuf.h
Auto-merging storage/xtradb/include/hash0hash.h
Auto-merging storage/xtradb/include/ha_prototypes.h
CONFLICT (content): Merge conflict in storage/xtradb/include/ha_prototypes.h
Auto-merging storage/xtradb/include/fsp0types.h
CONFLICT (content): Merge conflict in storage/xtradb/include/fsp0types.h
Auto-merging storage/xtradb/include/fsp0fsp.ic
CONFLICT (content): Merge conflict in storage/xtradb/include/fsp0fsp.ic
Auto-merging storage/xtradb/include/fsp0fsp.h
CONFLICT (content): Merge conflict in storage/xtradb/include/fsp0fsp.h
Auto-merging storage/xtradb/include/fil0fil.h
CONFLICT (content): Merge conflict in storage/xtradb/include/fil0fil.h
Auto-merging storage/xtradb/include/dyn0types.h
Removing storage/xtradb/include/dyn0dyn.ic
Removing storage/xtradb/include/dyn0dyn.h
Auto-merging storage/xtradb/include/dict0types.h
CONFLICT (content): Merge conflict in storage/xtradb/include/dict0types.h
Auto-merging storage/xtradb/include/dict0stats_bg.h
Auto-merging storage/xtradb/include/dict0stats.h
CONFLICT (content): Merge conflict in storage/xtradb/include/dict0stats.h
Auto-merging storage/xtradb/include/dict0priv.ic
Auto-merging storage/xtradb/include/dict0priv.h
Auto-merging storage/xtradb/include/dict0mem.h
CONFLICT (content): Merge conflict in storage/xtradb/include/dict0mem.h
Auto-merging storage/xtradb/include/dict0dict.ic
CONFLICT (content): Merge conflict in storage/xtradb/include/dict0dict.ic
Auto-merging storage/xtradb/include/dict0dict.h
CONFLICT (content): Merge conflict in storage/xtradb/include/dict0dict.h
Auto-merging storage/xtradb/include/dict0crea.h
CONFLICT (content): Merge conflict in storage/xtradb/include/dict0crea.h
Auto-merging storage/xtradb/include/db0err.h
CONFLICT (content): Merge conflict in storage/xtradb/include/db0err.h
Auto-merging storage/xtradb/include/buf0rea.h
CONFLICT (content): Merge conflict in storage/xtradb/include/buf0rea.h
Auto-merging storage/xtradb/include/buf0flu.h
Auto-merging storage/xtradb/include/buf0buf.ic
CONFLICT (content): Merge conflict in storage/xtradb/include/buf0buf.ic
Auto-merging storage/xtradb/include/buf0buf.h
CONFLICT (content): Merge conflict in storage/xtradb/include/buf0buf.h
Auto-merging storage/xtradb/include/btr0pcur.ic
CONFLICT (content): Merge conflict in storage/xtradb/include/btr0pcur.ic
Auto-merging storage/xtradb/include/btr0pcur.h
Auto-merging storage/xtradb/include/btr0cur.h
CONFLICT (content): Merge conflict in storage/xtradb/include/btr0cur.h
Auto-merging storage/xtradb/include/btr0btr.ic
CONFLICT (content): Merge conflict in storage/xtradb/include/btr0btr.ic
Auto-merging storage/xtradb/include/btr0btr.h
CONFLICT (content): Merge conflict in storage/xtradb/include/btr0btr.h
Auto-merging storage/xtradb/ibuf/ibuf0ibuf.cc
CONFLICT (content): Merge conflict in storage/xtradb/ibuf/ibuf0ibuf.cc
Auto-merging storage/xtradb/handler/xtradb_i_s.cc
CONFLICT (content): Merge conflict in storage/xtradb/handler/xtradb_i_s.cc
Auto-merging storage/xtradb/handler/i_s.h
CONFLICT (content): Merge conflict in storage/xtradb/handler/i_s.h
Auto-merging storage/xtradb/handler/i_s.cc
CONFLICT (content): Merge conflict in storage/xtradb/handler/i_s.cc
Auto-merging storage/xtradb/handler/handler0alter.cc
CONFLICT (content): Merge conflict in storage/xtradb/handler/handler0alter.cc
Auto-merging storage/xtradb/handler/ha_innodb.h
CONFLICT (content): Merge conflict in storage/xtradb/handler/ha_innodb.h
Auto-merging storage/xtradb/handler/ha_innodb.cc
CONFLICT (content): Merge conflict in storage/xtradb/handler/ha_innodb.cc
Removing storage/xtradb/ha_innodb.def
Auto-merging storage/xtradb/fts/fts0que.cc
CONFLICT (content): Merge conflict in storage/xtradb/fts/fts0que.cc
Auto-merging storage/xtradb/fts/fts0opt.cc
Auto-merging storage/xtradb/fts/fts0fts.cc
CONFLICT (content): Merge conflict in storage/xtradb/fts/fts0fts.cc
Auto-merging storage/xtradb/fsp/fsp0fsp.cc
CONFLICT (content): Merge conflict in storage/xtradb/fsp/fsp0fsp.cc
Auto-merging storage/xtradb/fil/fil0fil.cc
CONFLICT (content): Merge conflict in storage/xtradb/fil/fil0fil.cc
Removing storage/xtradb/dyn/dyn0dyn.cc
Auto-merging storage/xtradb/dict/dict0stats_bg.cc
CONFLICT (content): Merge conflict in storage/xtradb/dict/dict0stats_bg.cc
Auto-merging storage/xtradb/dict/dict0stats.cc
CONFLICT (content): Merge conflict in storage/xtradb/dict/dict0stats.cc
Auto-merging storage/xtradb/dict/dict0mem.cc
CONFLICT (content): Merge conflict in storage/xtradb/dict/dict0mem.cc
Auto-merging storage/xtradb/dict/dict0load.cc
CONFLICT (content): Merge conflict in storage/xtradb/dict/dict0load.cc
Auto-merging storage/xtradb/dict/dict0dict.cc
CONFLICT (content): Merge conflict in storage/xtradb/dict/dict0dict.cc
Auto-merging storage/xtradb/dict/dict0crea.cc
CONFLICT (content): Merge conflict in storage/xtradb/dict/dict0crea.cc
Auto-merging storage/xtradb/dict/dict0boot.cc
CONFLICT (content): Merge conflict in storage/xtradb/dict/dict0boot.cc
Auto-merging storage/xtradb/buf/buf0rea.cc
CONFLICT (content): Merge conflict in storage/xtradb/buf/buf0rea.cc
Auto-merging storage/xtradb/buf/buf0lru.cc
CONFLICT (content): Merge conflict in storage/xtradb/buf/buf0lru.cc
Auto-merging storage/xtradb/buf/buf0flu.cc
CONFLICT (content): Merge conflict in storage/xtradb/buf/buf0flu.cc
Auto-merging storage/xtradb/buf/buf0dump.cc
CONFLICT (content): Merge conflict in storage/xtradb/buf/buf0dump.cc
Auto-merging storage/xtradb/buf/buf0dblwr.cc
CONFLICT (content): Merge conflict in storage/xtradb/buf/buf0dblwr.cc
Auto-merging storage/xtradb/buf/buf0checksum.cc
CONFLICT (content): Merge conflict in storage/xtradb/buf/buf0checksum.cc
Auto-merging storage/xtradb/buf/buf0buf.cc
CONFLICT (content): Merge conflict in storage/xtradb/buf/buf0buf.cc
Auto-merging storage/xtradb/btr/btr0pcur.cc
Auto-merging storage/xtradb/btr/btr0cur.cc
CONFLICT (content): Merge conflict in storage/xtradb/btr/btr0cur.cc
Auto-merging storage/xtradb/btr/btr0btr.cc
CONFLICT (content): Merge conflict in storage/xtradb/btr/btr0btr.cc
Auto-merging storage/xtradb/api/api0misc.cc
CONFLICT (content): Merge conflict in storage/xtradb/api/api0misc.cc
Auto-merging storage/xtradb/api/api0api.cc
CONFLICT (content): Merge conflict in storage/xtradb/api/api0api.cc
Auto-merging storage/xtradb/CMakeLists.txt
CONFLICT (content): Merge conflict in storage/xtradb/CMakeLists.txt
Automatic merge failed; fix conflicts and then commit the result.

Comment by Jan Lindström (Inactive) [ 2016-11-03 ]

Changes to be committed:
 
	modified:   storage/xtradb/CMakeLists.txt
	modified:   storage/xtradb/Doxyfile
	modified:   storage/xtradb/api/api0api.cc
	modified:   storage/xtradb/api/api0misc.cc
	modified:   storage/xtradb/btr/btr0btr.cc
	new file:   storage/xtradb/btr/btr0bulk.cc
	modified:   storage/xtradb/btr/btr0cur.cc
	modified:   storage/xtradb/btr/btr0pcur.cc
	modified:   storage/xtradb/btr/btr0sea.cc
	modified:   storage/xtradb/buf/buf0buddy.cc
	modified:   storage/xtradb/buf/buf0buf.cc
	modified:   storage/xtradb/buf/buf0checksum.cc
	modified:   storage/xtradb/buf/buf0dblwr.cc
	modified:   storage/xtradb/buf/buf0dump.cc
	modified:   storage/xtradb/buf/buf0flu.cc
	modified:   storage/xtradb/buf/buf0lru.cc
	modified:   storage/xtradb/buf/buf0rea.cc
	modified:   storage/xtradb/data/data0data.cc
	modified:   storage/xtradb/data/data0type.cc
	modified:   storage/xtradb/dict/dict0boot.cc
	modified:   storage/xtradb/dict/dict0crea.cc
	modified:   storage/xtradb/dict/dict0dict.cc
	modified:   storage/xtradb/dict/dict0load.cc
	modified:   storage/xtradb/dict/dict0mem.cc
	modified:   storage/xtradb/dict/dict0stats.cc
	modified:   storage/xtradb/dict/dict0stats_bg.cc
	deleted:    storage/xtradb/dyn/dyn0dyn.cc
	modified:   storage/xtradb/eval/eval0eval.cc
	modified:   storage/xtradb/eval/eval0proc.cc
	modified:   storage/xtradb/fil/fil0fil.cc
	new file:   storage/xtradb/fsp/fsp0file.cc
	modified:   storage/xtradb/fsp/fsp0fsp.cc
	new file:   storage/xtradb/fsp/fsp0space.cc
	new file:   storage/xtradb/fsp/fsp0sysspace.cc
	modified:   storage/xtradb/fts/fts0ast.cc
	modified:   storage/xtradb/fts/fts0blex.cc
	modified:   storage/xtradb/fts/fts0blex.l
	modified:   storage/xtradb/fts/fts0config.cc
	modified:   storage/xtradb/fts/fts0fts.cc
	modified:   storage/xtradb/fts/fts0opt.cc
	modified:   storage/xtradb/fts/fts0pars.cc
	modified:   storage/xtradb/fts/fts0pars.y
	new file:   storage/xtradb/fts/fts0plugin.cc
	modified:   storage/xtradb/fts/fts0que.cc
	modified:   storage/xtradb/fts/fts0sql.cc
	modified:   storage/xtradb/fts/fts0tlex.cc
	modified:   storage/xtradb/fts/fts0tlex.l
	modified:   storage/xtradb/fut/fut0lst.cc
	new file:   storage/xtradb/gis/gis0geo.cc
	new file:   storage/xtradb/gis/gis0rtree.cc
	new file:   storage/xtradb/gis/gis0sea.cc
	modified:   storage/xtradb/ha/ha0ha.cc
	modified:   storage/xtradb/ha/ha0storage.cc
	modified:   storage/xtradb/ha/hash0hash.cc
	deleted:    storage/xtradb/ha_innodb.def
	modified:   storage/xtradb/handler/ha_innodb.cc
	modified:   storage/xtradb/handler/ha_innodb.h
	new file:   storage/xtradb/handler/ha_innopart.cc
	new file:   storage/xtradb/handler/ha_innopart.h
	modified:   storage/xtradb/handler/handler0alter.cc
	modified:   storage/xtradb/handler/i_s.cc
	modified:   storage/xtradb/handler/i_s.h
	modified:   storage/xtradb/handler/xtradb_i_s.cc
	modified:   storage/xtradb/ibuf/ibuf0ibuf.cc
	modified:   storage/xtradb/include/api0api.h
	modified:   storage/xtradb/include/api0misc.h
	modified:   storage/xtradb/include/btr0btr.h
	modified:   storage/xtradb/include/btr0btr.ic
	new file:   storage/xtradb/include/btr0bulk.h
	modified:   storage/xtradb/include/btr0cur.h
	modified:   storage/xtradb/include/btr0cur.ic
	modified:   storage/xtradb/include/btr0pcur.h
	modified:   storage/xtradb/include/btr0pcur.ic
	modified:   storage/xtradb/include/btr0sea.h
	modified:   storage/xtradb/include/btr0sea.ic
	modified:   storage/xtradb/include/btr0types.h
	modified:   storage/xtradb/include/buf0buddy.h
	modified:   storage/xtradb/include/buf0buddy.ic
	modified:   storage/xtradb/include/buf0buf.h
	modified:   storage/xtradb/include/buf0buf.ic
	modified:   storage/xtradb/include/buf0checksum.h
	modified:   storage/xtradb/include/buf0dblwr.h
	new file:   storage/xtradb/include/buf0dblwr.ic
	modified:   storage/xtradb/include/buf0dump.h
	modified:   storage/xtradb/include/buf0flu.h
	modified:   storage/xtradb/include/buf0flu.ic
	modified:   storage/xtradb/include/buf0lru.h
	modified:   storage/xtradb/include/buf0rea.h
	modified:   storage/xtradb/include/buf0types.h
	modified:   storage/xtradb/include/data0data.h
	modified:   storage/xtradb/include/data0data.ic
	modified:   storage/xtradb/include/data0type.h
	modified:   storage/xtradb/include/data0type.ic
	modified:   storage/xtradb/include/db0err.h
	modified:   storage/xtradb/include/dict0boot.h
	modified:   storage/xtradb/include/dict0boot.ic
	modified:   storage/xtradb/include/dict0crea.h
	modified:   storage/xtradb/include/dict0crea.ic
	modified:   storage/xtradb/include/dict0dict.h
	modified:   storage/xtradb/include/dict0dict.ic
	modified:   storage/xtradb/include/dict0load.h
	modified:   storage/xtradb/include/dict0mem.h
	modified:   storage/xtradb/include/dict0mem.ic
	modified:   storage/xtradb/include/dict0priv.h
	modified:   storage/xtradb/include/dict0priv.ic
	modified:   storage/xtradb/include/dict0stats.h
	modified:   storage/xtradb/include/dict0stats.ic
	modified:   storage/xtradb/include/dict0stats_bg.h
	modified:   storage/xtradb/include/dict0types.h
	new file:   storage/xtradb/include/dyn0buf.h
	deleted:    storage/xtradb/include/dyn0dyn.h
	deleted:    storage/xtradb/include/dyn0dyn.ic
	new file:   storage/xtradb/include/dyn0types.h
	modified:   storage/xtradb/include/eval0eval.h
	modified:   storage/xtradb/include/eval0eval.ic
	modified:   storage/xtradb/include/eval0proc.h
	modified:   storage/xtradb/include/eval0proc.ic
	modified:   storage/xtradb/include/fil0fil.h
	new file:   storage/xtradb/include/fsp0file.h
	modified:   storage/xtradb/include/fsp0fsp.h
	modified:   storage/xtradb/include/fsp0fsp.ic
	new file:   storage/xtradb/include/fsp0space.h
	new file:   storage/xtradb/include/fsp0sysspace.h
	modified:   storage/xtradb/include/fsp0types.h
	modified:   storage/xtradb/include/fts0ast.h
	modified:   storage/xtradb/include/fts0blex.h
	modified:   storage/xtradb/include/fts0fts.h
	modified:   storage/xtradb/include/fts0opt.h
	new file:   storage/xtradb/include/fts0plugin.h
	modified:   storage/xtradb/include/fts0priv.h
	modified:   storage/xtradb/include/fts0priv.ic
	modified:   storage/xtradb/include/fts0tlex.h
	new file:   storage/xtradb/include/fts0tokenize.h
	modified:   storage/xtradb/include/fts0types.h
	modified:   storage/xtradb/include/fts0types.ic
	renamed:    storage/xtradb/include/mem0pool.ic -> storage/xtradb/include/fut0fut.h
	modified:   storage/xtradb/include/fut0fut.ic
	modified:   storage/xtradb/include/fut0lst.h
	modified:   storage/xtradb/include/fut0lst.ic
	new file:   storage/xtradb/include/gis0geo.h
	new file:   storage/xtradb/include/gis0rtree.h
	new file:   storage/xtradb/include/gis0rtree.ic
	new file:   storage/xtradb/include/gis0type.h
	modified:   storage/xtradb/include/ha0ha.h
	modified:   storage/xtradb/include/ha0ha.ic
	modified:   storage/xtradb/include/ha0storage.h
	modified:   storage/xtradb/include/ha0storage.ic
	modified:   storage/xtradb/include/ha_prototypes.h
	modified:   storage/xtradb/include/handler0alter.h
	modified:   storage/xtradb/include/hash0hash.h
	modified:   storage/xtradb/include/hash0hash.ic
	new file:   storage/xtradb/include/ib0mutex.h
	modified:   storage/xtradb/include/ibuf0ibuf.h
	modified:   storage/xtradb/include/ibuf0ibuf.ic
	modified:   storage/xtradb/include/lock0iter.h
	modified:   storage/xtradb/include/lock0lock.h
	modified:   storage/xtradb/include/lock0lock.ic
	new file:   storage/xtradb/include/lock0prdt.h
	modified:   storage/xtradb/include/lock0priv.h
	modified:   storage/xtradb/include/lock0priv.ic
	modified:   storage/xtradb/include/lock0types.h
	modified:   storage/xtradb/include/log0log.h
	modified:   storage/xtradb/include/log0log.ic
	modified:   storage/xtradb/include/log0online.h
	modified:   storage/xtradb/include/log0recv.h
	modified:   storage/xtradb/include/log0recv.ic
	new file:   storage/xtradb/include/log0types.h
	modified:   storage/xtradb/include/mach0data.h
	modified:   storage/xtradb/include/mach0data.ic
	deleted:    storage/xtradb/include/mem0dbg.h
	deleted:    storage/xtradb/include/mem0dbg.ic
	modified:   storage/xtradb/include/mem0mem.h
	modified:   storage/xtradb/include/mem0mem.ic
	deleted:    storage/xtradb/include/mem0pool.h
	modified:   storage/xtradb/include/mtr0log.h
	modified:   storage/xtradb/include/mtr0log.ic
	modified:   storage/xtradb/include/mtr0mtr.h
	modified:   storage/xtradb/include/mtr0mtr.ic
	modified:   storage/xtradb/include/mtr0types.h
	new file:   storage/xtradb/include/os0atomic.h
	new file:   storage/xtradb/include/os0atomic.ic
	new file:   storage/xtradb/include/os0event.h
	modified:   storage/xtradb/include/os0file.h
	modified:   storage/xtradb/include/os0file.ic
	modified:   storage/xtradb/include/os0once.h
	modified:   storage/xtradb/include/os0proc.h
	deleted:    storage/xtradb/include/os0sync.h
	deleted:    storage/xtradb/include/os0sync.ic
	modified:   storage/xtradb/include/os0thread.h
	modified:   storage/xtradb/include/page0cur.h
	modified:   storage/xtradb/include/page0cur.ic
	modified:   storage/xtradb/include/page0page.h
	modified:   storage/xtradb/include/page0page.ic
	new file:   storage/xtradb/include/page0size.h
	modified:   storage/xtradb/include/page0types.h
	modified:   storage/xtradb/include/page0zip.h
	modified:   storage/xtradb/include/page0zip.ic
	modified:   storage/xtradb/include/pars0opt.h
	modified:   storage/xtradb/include/pars0pars.h
	modified:   storage/xtradb/include/pars0sym.h
	modified:   storage/xtradb/include/que0que.h
	modified:   storage/xtradb/include/que0que.ic
	modified:   storage/xtradb/include/read0i_s.h
	modified:   storage/xtradb/include/read0read.h
	deleted:    storage/xtradb/include/read0read.ic
	modified:   storage/xtradb/include/read0types.h
	modified:   storage/xtradb/include/rem0cmp.h
	modified:   storage/xtradb/include/rem0cmp.ic
	modified:   storage/xtradb/include/rem0rec.h
	modified:   storage/xtradb/include/rem0rec.ic
	modified:   storage/xtradb/include/row0ext.h
	modified:   storage/xtradb/include/row0ftsort.h
	modified:   storage/xtradb/include/row0import.h
	modified:   storage/xtradb/include/row0ins.h
	modified:   storage/xtradb/include/row0log.h
	modified:   storage/xtradb/include/row0log.ic
	modified:   storage/xtradb/include/row0merge.h
	modified:   storage/xtradb/include/row0mysql.h
	modified:   storage/xtradb/include/row0purge.h
	modified:   storage/xtradb/include/row0quiesce.h
	modified:   storage/xtradb/include/row0row.h
	modified:   storage/xtradb/include/row0row.ic
	modified:   storage/xtradb/include/row0sel.h
	modified:   storage/xtradb/include/row0sel.ic
	new file:   storage/xtradb/include/row0trunc.h
	modified:   storage/xtradb/include/row0uins.h
	modified:   storage/xtradb/include/row0umod.h
	modified:   storage/xtradb/include/row0undo.h
	modified:   storage/xtradb/include/row0upd.h
	modified:   storage/xtradb/include/row0upd.ic
	modified:   storage/xtradb/include/row0vers.h
	new file:   storage/xtradb/include/sess0sess.h
	modified:   storage/xtradb/include/srv0conc.h
	modified:   storage/xtradb/include/srv0mon.h
	modified:   storage/xtradb/include/srv0mon.ic
	modified:   storage/xtradb/include/srv0srv.h
	modified:   storage/xtradb/include/srv0start.h
	modified:   storage/xtradb/include/sync0arr.h
	modified:   storage/xtradb/include/sync0arr.ic
	new file:   storage/xtradb/include/sync0debug.h
	new file:   storage/xtradb/include/sync0policy.h
	new file:   storage/xtradb/include/sync0policy.ic
	modified:   storage/xtradb/include/sync0rw.h
	modified:   storage/xtradb/include/sync0rw.ic
	modified:   storage/xtradb/include/sync0sync.h
	deleted:    storage/xtradb/include/sync0sync.ic
	modified:   storage/xtradb/include/sync0types.h
	modified:   storage/xtradb/include/trx0i_s.h
	modified:   storage/xtradb/include/trx0purge.h
	modified:   storage/xtradb/include/trx0purge.ic
	modified:   storage/xtradb/include/trx0rec.h
	modified:   storage/xtradb/include/trx0rec.ic
	modified:   storage/xtradb/include/trx0roll.h
	modified:   storage/xtradb/include/trx0roll.ic
	modified:   storage/xtradb/include/trx0rseg.h
	modified:   storage/xtradb/include/trx0rseg.ic
	modified:   storage/xtradb/include/trx0sys.h
	modified:   storage/xtradb/include/trx0sys.ic
	modified:   storage/xtradb/include/trx0trx.h
	modified:   storage/xtradb/include/trx0trx.ic
	modified:   storage/xtradb/include/trx0types.h
	modified:   storage/xtradb/include/trx0undo.h
	modified:   storage/xtradb/include/trx0undo.ic
	modified:   storage/xtradb/include/trx0xa.h
	modified:   storage/xtradb/include/univ.i
	modified:   storage/xtradb/include/usr0sess.h
	deleted:    storage/xtradb/include/ut0bh.h
	deleted:    storage/xtradb/include/ut0bh.ic
	modified:   storage/xtradb/include/ut0byte.h
	modified:   storage/xtradb/include/ut0byte.ic
	modified:   storage/xtradb/include/ut0counter.h
	modified:   storage/xtradb/include/ut0crc32.h
	modified:   storage/xtradb/include/ut0dbg.h
	modified:   storage/xtradb/include/ut0list.h
	modified:   storage/xtradb/include/ut0list.ic
	modified:   storage/xtradb/include/ut0lst.h
	modified:   storage/xtradb/include/ut0mem.h
	modified:   storage/xtradb/include/ut0mem.ic
	new file:   storage/xtradb/include/ut0mutex.h
	new file:   storage/xtradb/include/ut0mutex.ic
	new file:   storage/xtradb/include/ut0new.h
	new file:   storage/xtradb/include/ut0pool.h
	modified:   storage/xtradb/include/ut0rbt.h
	modified:   storage/xtradb/include/ut0rnd.h
	modified:   storage/xtradb/include/ut0rnd.ic
	new file:   storage/xtradb/include/ut0stage.h
	modified:   storage/xtradb/include/ut0ut.h
	modified:   storage/xtradb/include/ut0ut.ic
	modified:   storage/xtradb/include/ut0vec.h
	modified:   storage/xtradb/include/ut0vec.ic
	modified:   storage/xtradb/include/ut0wqueue.h
	new file:   storage/xtradb/innodb.cmake
	modified:   storage/xtradb/lock/lock0iter.cc
	modified:   storage/xtradb/lock/lock0lock.cc
	new file:   storage/xtradb/lock/lock0prdt.cc
	modified:   storage/xtradb/lock/lock0wait.cc
	modified:   storage/xtradb/log/log0log.cc
	modified:   storage/xtradb/log/log0online.cc
	modified:   storage/xtradb/log/log0recv.cc
	modified:   storage/xtradb/mach/mach0data.cc
	deleted:    storage/xtradb/mem/mem0dbg.cc
	modified:   storage/xtradb/mem/mem0mem.cc
	deleted:    storage/xtradb/mem/mem0pool.cc
	modified:   storage/xtradb/mtr/mtr0log.cc
	modified:   storage/xtradb/mtr/mtr0mtr.cc
	new file:   storage/xtradb/os/os0event.cc
	modified:   storage/xtradb/os/os0file.cc
	modified:   storage/xtradb/os/os0proc.cc
	deleted:    storage/xtradb/os/os0sync.cc
	modified:   storage/xtradb/os/os0thread.cc
	modified:   storage/xtradb/page/page0cur.cc
	modified:   storage/xtradb/page/page0page.cc
	modified:   storage/xtradb/page/page0zip.cc
	modified:   storage/xtradb/pars/lexyy.cc
	modified:   storage/xtradb/pars/make_bison.sh
	modified:   storage/xtradb/pars/make_flex.sh
	modified:   storage/xtradb/pars/pars0grm.cc
	modified:   storage/xtradb/pars/pars0grm.y
	modified:   storage/xtradb/pars/pars0lex.l
	modified:   storage/xtradb/pars/pars0opt.cc
	modified:   storage/xtradb/pars/pars0pars.cc
	modified:   storage/xtradb/pars/pars0sym.cc
	modified:   storage/xtradb/que/que0que.cc
	modified:   storage/xtradb/read/read0read.cc
	modified:   storage/xtradb/rem/rem0cmp.cc
	modified:   storage/xtradb/rem/rem0rec.cc
	modified:   storage/xtradb/row/row0ext.cc
	modified:   storage/xtradb/row/row0ftsort.cc
	modified:   storage/xtradb/row/row0import.cc
	modified:   storage/xtradb/row/row0ins.cc
	modified:   storage/xtradb/row/row0log.cc
	modified:   storage/xtradb/row/row0merge.cc
	modified:   storage/xtradb/row/row0mysql.cc
	modified:   storage/xtradb/row/row0purge.cc
	modified:   storage/xtradb/row/row0quiesce.cc
	modified:   storage/xtradb/row/row0row.cc
	modified:   storage/xtradb/row/row0sel.cc
	new file:   storage/xtradb/row/row0trunc.cc
	modified:   storage/xtradb/row/row0uins.cc
	modified:   storage/xtradb/row/row0umod.cc
	modified:   storage/xtradb/row/row0undo.cc
	modified:   storage/xtradb/row/row0upd.cc
	modified:   storage/xtradb/row/row0vers.cc
	modified:   storage/xtradb/srv/srv0conc.cc
	modified:   storage/xtradb/srv/srv0mon.cc
	modified:   storage/xtradb/srv/srv0srv.cc
	modified:   storage/xtradb/srv/srv0start.cc
	modified:   storage/xtradb/sync/sync0arr.cc
	new file:   storage/xtradb/sync/sync0debug.cc
	modified:   storage/xtradb/sync/sync0rw.cc
	modified:   storage/xtradb/sync/sync0sync.cc
	modified:   storage/xtradb/trx/trx0i_s.cc
	modified:   storage/xtradb/trx/trx0purge.cc
	modified:   storage/xtradb/trx/trx0rec.cc
	modified:   storage/xtradb/trx/trx0roll.cc
	modified:   storage/xtradb/trx/trx0rseg.cc
	modified:   storage/xtradb/trx/trx0sys.cc
	modified:   storage/xtradb/trx/trx0trx.cc
	modified:   storage/xtradb/trx/trx0undo.cc
	modified:   storage/xtradb/usr/usr0sess.cc
	deleted:    storage/xtradb/ut/ut0bh.cc
	modified:   storage/xtradb/ut/ut0crc32.cc
	modified:   storage/xtradb/ut/ut0dbg.cc
	modified:   storage/xtradb/ut/ut0list.cc
	modified:   storage/xtradb/ut/ut0mem.cc
	new file:   storage/xtradb/ut/ut0new.cc
	modified:   storage/xtradb/ut/ut0rbt.cc
	modified:   storage/xtradb/ut/ut0rnd.cc
	modified:   storage/xtradb/ut/ut0ut.cc
	modified:   storage/xtradb/ut/ut0vec.cc
	modified:   storage/xtradb/ut/ut0wqueue.cc

Comment by Jan Lindström (Inactive) [ 2016-11-03 ]

Fixing merge errors, directories:

  • api : done
  • btr : done
  • buf
  • data
  • dict
  • dyn
  • eval
  • fil
  • fsp
  • fts
  • fut
  • ha
  • handler
  • ibuf
  • include
  • lock
  • log
  • mach
  • mem
  • mtr
  • os
  • page
  • pars
  • que
  • read
  • rem
  • row
  • srv
  • sync
  • trx
  • usr
  • ut
Generated at Thu Feb 08 07:45:55 UTC 2024 using Jira 8.20.16#820016-sha1:9d11dbea5f4be3d4cc21f03a88dd11d8c8687422.