Move everything into a subdir in order to workaround a bzr merge bug:

https://bugs.launchpad.net/bzr/+bug/375898
16 years ago · c75d70fdc4
327 changed files with 0 additions and 0 deletions
--- a/subdir/CMakeLists.txt
+++ b/subdir/CMakeLists.txt
--- a/subdir/Makefile.am
+++ b/subdir/Makefile.am
--- a/subdir/btr/btr0btr.c
+++ b/subdir/btr/btr0btr.c
--- a/subdir/btr/btr0cur.c
+++ b/subdir/btr/btr0cur.c
--- a/subdir/btr/btr0pcur.c
+++ b/subdir/btr/btr0pcur.c
--- a/subdir/btr/btr0sea.c
+++ b/subdir/btr/btr0sea.c
--- a/subdir/buf/buf0buf.c
+++ b/subdir/buf/buf0buf.c
--- a/subdir/buf/buf0flu.c
+++ b/subdir/buf/buf0flu.c
--- a/subdir/buf/buf0lru.c
+++ b/subdir/buf/buf0lru.c
--- a/subdir/buf/buf0rea.c
+++ b/subdir/buf/buf0rea.c
--- a/subdir/compile-innodb
+++ b/subdir/compile-innodb
--- a/subdir/compile-innodb-debug
+++ b/subdir/compile-innodb-debug
--- a/subdir/data/data0data.c
+++ b/subdir/data/data0data.c
--- a/subdir/data/data0type.c
+++ b/subdir/data/data0type.c
--- a/subdir/dict/dict0boot.c
+++ b/subdir/dict/dict0boot.c
--- a/subdir/dict/dict0crea.c
+++ b/subdir/dict/dict0crea.c
--- a/subdir/dict/dict0dict.c
+++ b/subdir/dict/dict0dict.c
--- a/subdir/dict/dict0load.c
+++ b/subdir/dict/dict0load.c
--- a/subdir/dict/dict0mem.c
+++ b/subdir/dict/dict0mem.c
--- a/subdir/dyn/dyn0dyn.c
+++ b/subdir/dyn/dyn0dyn.c
--- a/subdir/eval/eval0eval.c
+++ b/subdir/eval/eval0eval.c
--- a/subdir/eval/eval0proc.c
+++ b/subdir/eval/eval0proc.c
--- a/subdir/export.sh
+++ b/subdir/export.sh
--- a/subdir/fil/fil0fil.c
+++ b/subdir/fil/fil0fil.c
--- a/subdir/fsp/fsp0fsp.c
+++ b/subdir/fsp/fsp0fsp.c
--- a/subdir/fut/fut0fut.c
+++ b/subdir/fut/fut0fut.c
--- a/subdir/fut/fut0lst.c
+++ b/subdir/fut/fut0lst.c
--- a/subdir/ha/ha0ha.c
+++ b/subdir/ha/ha0ha.c
--- a/subdir/ha/hash0hash.c
+++ b/subdir/ha/hash0hash.c
--- a/subdir/handler/ha_innodb.cc
+++ b/subdir/handler/ha_innodb.cc
--- a/subdir/handler/ha_innodb.h
+++ b/subdir/handler/ha_innodb.h
--- a/subdir/ibuf/ibuf0ibuf.c
+++ b/subdir/ibuf/ibuf0ibuf.c
--- a/subdir/include/btr0btr.h
+++ b/subdir/include/btr0btr.h
--- a/subdir/include/btr0btr.ic
+++ b/subdir/include/btr0btr.ic
--- a/subdir/include/btr0cur.h
+++ b/subdir/include/btr0cur.h
--- a/subdir/include/btr0cur.ic
+++ b/subdir/include/btr0cur.ic
--- a/subdir/include/btr0pcur.h
+++ b/subdir/include/btr0pcur.h
--- a/subdir/include/btr0pcur.ic
+++ b/subdir/include/btr0pcur.ic
--- a/subdir/include/btr0sea.h
+++ b/subdir/include/btr0sea.h
--- a/subdir/include/btr0sea.ic
+++ b/subdir/include/btr0sea.ic
--- a/subdir/include/btr0types.h
+++ b/subdir/include/btr0types.h
--- a/subdir/include/buf0buf.h
+++ b/subdir/include/buf0buf.h
--- a/subdir/include/buf0buf.ic
+++ b/subdir/include/buf0buf.ic
--- a/subdir/include/buf0flu.h
+++ b/subdir/include/buf0flu.h
--- a/subdir/include/buf0flu.ic
+++ b/subdir/include/buf0flu.ic
--- a/subdir/include/buf0lru.h
+++ b/subdir/include/buf0lru.h
--- a/subdir/include/buf0lru.ic
+++ b/subdir/include/buf0lru.ic
--- a/subdir/include/buf0rea.h
+++ b/subdir/include/buf0rea.h
--- a/subdir/include/buf0types.h
+++ b/subdir/include/buf0types.h
--- a/subdir/include/data0data.h
+++ b/subdir/include/data0data.h
--- a/subdir/include/data0data.ic
+++ b/subdir/include/data0data.ic
--- a/subdir/include/data0type.h
+++ b/subdir/include/data0type.h
--- a/subdir/include/data0type.ic
+++ b/subdir/include/data0type.ic
--- a/subdir/include/data0types.h
+++ b/subdir/include/data0types.h
--- a/subdir/include/db0err.h
+++ b/subdir/include/db0err.h
--- a/subdir/include/dict0boot.h
+++ b/subdir/include/dict0boot.h
--- a/subdir/include/dict0boot.ic
+++ b/subdir/include/dict0boot.ic
--- a/subdir/include/dict0crea.h
+++ b/subdir/include/dict0crea.h
--- a/subdir/include/dict0crea.ic
+++ b/subdir/include/dict0crea.ic
--- a/subdir/include/dict0dict.h
+++ b/subdir/include/dict0dict.h
--- a/subdir/include/dict0dict.ic
+++ b/subdir/include/dict0dict.ic
--- a/subdir/include/dict0load.h
+++ b/subdir/include/dict0load.h
--- a/subdir/include/dict0load.ic
+++ b/subdir/include/dict0load.ic
--- a/subdir/include/dict0mem.h
+++ b/subdir/include/dict0mem.h
--- a/subdir/include/dict0mem.ic
+++ b/subdir/include/dict0mem.ic
--- a/subdir/include/dict0types.h
+++ b/subdir/include/dict0types.h
--- a/subdir/include/dyn0dyn.h
+++ b/subdir/include/dyn0dyn.h
--- a/subdir/include/dyn0dyn.ic
+++ b/subdir/include/dyn0dyn.ic
--- a/subdir/include/eval0eval.h
+++ b/subdir/include/eval0eval.h
--- a/subdir/include/eval0eval.ic
+++ b/subdir/include/eval0eval.ic
--- a/subdir/include/eval0proc.h
+++ b/subdir/include/eval0proc.h
--- a/subdir/include/eval0proc.ic
+++ b/subdir/include/eval0proc.ic
--- a/subdir/include/fil0fil.h
+++ b/subdir/include/fil0fil.h
--- a/subdir/include/fsp0fsp.h
+++ b/subdir/include/fsp0fsp.h
--- a/subdir/include/fsp0fsp.ic
+++ b/subdir/include/fsp0fsp.ic
--- a/subdir/include/fsp0types.h
+++ b/subdir/include/fsp0types.h
--- a/subdir/include/fut0fut.h
+++ b/subdir/include/fut0fut.h
--- a/subdir/include/fut0fut.ic
+++ b/subdir/include/fut0fut.ic
--- a/subdir/include/fut0lst.h
+++ b/subdir/include/fut0lst.h
--- a/subdir/include/fut0lst.ic
+++ b/subdir/include/fut0lst.ic
--- a/subdir/include/ha0ha.h
+++ b/subdir/include/ha0ha.h
--- a/subdir/include/ha0ha.ic
+++ b/subdir/include/ha0ha.ic
--- a/subdir/include/ha_prototypes.h
+++ b/subdir/include/ha_prototypes.h
--- a/subdir/include/hash0hash.h
+++ b/subdir/include/hash0hash.h
--- a/subdir/include/hash0hash.ic
+++ b/subdir/include/hash0hash.ic
--- a/subdir/include/ibuf0ibuf.h
+++ b/subdir/include/ibuf0ibuf.h
--- a/subdir/include/ibuf0ibuf.ic
+++ b/subdir/include/ibuf0ibuf.ic
--- a/subdir/include/ibuf0types.h
+++ b/subdir/include/ibuf0types.h
--- a/subdir/include/lock0iter.h
+++ b/subdir/include/lock0iter.h
--- a/subdir/include/lock0lock.h
+++ b/subdir/include/lock0lock.h
--- a/subdir/include/lock0lock.ic
+++ b/subdir/include/lock0lock.ic
--- a/subdir/include/lock0priv.h
+++ b/subdir/include/lock0priv.h
--- a/subdir/include/lock0priv.ic
+++ b/subdir/include/lock0priv.ic
--- a/subdir/include/lock0types.h
+++ b/subdir/include/lock0types.h
--- a/subdir/include/log0log.h
+++ b/subdir/include/log0log.h
--- a/subdir/include/log0log.ic
+++ b/subdir/include/log0log.ic
--- a/subdir/include/log0recv.h
+++ b/subdir/include/log0recv.h
--- a/subdir/include/log0recv.ic
+++ b/subdir/include/log0recv.ic
--- a/subdir/include/mach0data.h
+++ b/subdir/include/mach0data.h
--- a/subdir/include/mach0data.ic
+++ b/subdir/include/mach0data.ic