3390 files changed, 5730 insertions, 4456 deletions

diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh
index 8cd78bf4165..6ee8b27e472 100644
--- a/BUILD/FINISH.sh
+++ b/BUILD/FINISH.sh
@@ -5,8 +5,7 @@ configure="./configure $base_configs $extra_configs"
 
 commands="\
 $make -k distclean || true 
-/bin/rm -rf */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache bdb/dist/autom4te.cache autom4te.cache innobase/autom4te.cache;
-
+/bin/rm -rf */.deps/*.P config.cache storage/innobase/config.cache storage/bdb/build_unix/config.cache bdb/dist/autom4te.cache autom4te.cache innobase/autom4te.cache;
 
 path=`dirname $0`
 . \"$path/autorun.sh\""
diff --git a/BUILD/autorun.sh b/BUILD/autorun.sh
index 3adfafb0ce6..8e4ef85657e 100755
--- a/BUILD/autorun.sh
+++ b/BUILD/autorun.sh
@@ -17,5 +17,5 @@ fi
 automake --add-missing --force \
            || (echo "Can't execute automake" && exit 1)
 autoconf   || (echo "Can't execute autoconf" && exit 1)
-(cd bdb/dist && sh s_all)
-(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
+(cd storage/bdb/dist && sh s_all)
+(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf)
diff --git a/BUILD/compile-alpha-cxx b/BUILD/compile-alpha-cxx
index c49846fd964..610d358ef82 100755
--- a/BUILD/compile-alpha-cxx
+++ b/BUILD/compile-alpha-cxx
@@ -1,7 +1,7 @@
 /bin/rm -f */.deps/*.P */*.o
 make -k clean
 /bin/rm -f */.deps/*.P */*.o
-/bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache mysql-*.tar.gz
+/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache storage/bdb/build_unix/config.cache mysql-*.tar.gz
 
 path=`dirname $0`
 . "$path/autorun.sh"
diff --git a/BUILD/compile-alpha-debug b/BUILD/compile-alpha-debug
index 113c2151461..8beffa65cb5 100755
--- a/BUILD/compile-alpha-debug
+++ b/BUILD/compile-alpha-debug
@@ -1,7 +1,7 @@
 /bin/rm -f */.deps/*.P */*.o
 make -k clean
 /bin/rm -f */.deps/*.P */*.o
-/bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache mysql-*.tar.gz
+/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache storage/bdb/build_unix/config.cache mysql-*.tar.gz
 
 path=`dirname $0`
 . "$path/autorun.sh"
diff --git a/BUILD/compile-dist b/BUILD/compile-dist
index 39095f59ffa..a8d180eace1 100755
--- a/BUILD/compile-dist
+++ b/BUILD/compile-dist
@@ -12,8 +12,8 @@ autoheader
 libtoolize --automake --force --copy
 automake --force --add-missing --copy
 autoconf
-(cd bdb/dist && sh s_all)
-(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
+(cd storage/bdb/dist && sh s_all)
+(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf)
 
 # Default to gcc for CC and CXX
 if test -z "$CXX" ; then
diff --git a/BUILD/compile-ia64-debug-max b/BUILD/compile-ia64-debug-max
index 5082844f088..d5f931c8d51 100755
--- a/BUILD/compile-ia64-debug-max
+++ b/BUILD/compile-ia64-debug-max
@@ -1,5 +1,5 @@
 gmake -k clean || true 
-/bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache
+/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache storage/bdb/build_unix/config.cache
 
 path=`dirname $0`
 . "$path/autorun.sh"
diff --git a/BUILD/compile-pentium-pgcc b/BUILD/compile-pentium-pgcc
index 639f108bb2b..411241451cf 100755
--- a/BUILD/compile-pentium-pgcc
+++ b/BUILD/compile-pentium-pgcc
@@ -2,7 +2,6 @@ AM_MAKEFLAGS="-j 2"
 gmake -k clean || true
 /bin/rm -f */.deps/*.P config.cache
  
-
 path=`dirname $0`
 . "$path/autorun.sh"
  
diff --git a/BitKeeper/etc/gone b/BitKeeper/etc/gone
index 7c9741f7e79..5964232680e 100644
--- a/BitKeeper/etc/gone
+++ b/BitKeeper/etc/gone
@@ -1184,9 +1184,11 @@ mwagner@evoq.home.mwagner.org|mysql-test/xml/xsl/README|20001013051514|26509|cd4
 mwagner@evoq.home.mwagner.org|mysql-test/xml/xsl/mysqltest.xsl|20001013051514|27425|1b8f6ec4f1b5f634
 mwagner@work.mysql.com|mysql-test/r/3.23/sel000001.result|20001010091454|28284|383913ae4505ec86
 mwagner@work.mysql.com|mysql-test/r/3.23/sel000002.result|20001010091454|29230|d1787e6fd5dbc1cc
+mysql-test/t/reserved_win_names-master.opt
 ndb/src/client/Makefile
 nick@nick.leippe.com|mysql-test/r/rpl_empty_master_crash.result|20020531235552|47718|615f521be2132141
 nick@nick.leippe.com|mysql-test/t/rpl_empty_master_crash.test|20020531235552|52328|99464e737639ccc6
+reggie@mdk10.(none)|BitKeeper/deleted/.del-reserved_win_names-master.opt~e56da049a7ce9a5b|20050523193219|41081
 reggie@mdk10.(none)|mysql-test/t/reserved_win_names-master.opt|20050520210356|14878|e56da049a7ce9a5b
 sasha@mysql.sashanet.com|BitKeeper/etc/logging_ok|20000801000905|12967|5b7d847a2158554
 sasha@mysql.sashanet.com|build-tags|20011125054855|05181|7afb7e785b80f97
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index e9cc35b4c7e..416ab8dbbde 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -18,6 +18,7 @@ antony@ltantony.dsl-verizon.net
 antony@ltantony.mysql.com
 antony@ltantony.rdg.cyberkinetica.com
 antony@ltantony.rdg.cyberkinetica.homeunix.net
+antony@ltantony.xiphis.org
 arjen@bitbike.com
 arjen@co3064164-a.bitbike.com
 arjen@fred.bitbike.com
@@ -139,6 +140,7 @@ magnus@msdesk.mysql.com
 magnus@neptunus.(none)
 magnus@shellback.(none)
 marko@hundin.mysql.fi
+marty@flipper.bredbandsbolaget.se
 marty@linux.site
 marty@shark.
 mats@mysql.com
@@ -208,6 +210,7 @@ papa@gbichot.local
 patg@krsna.
 patg@krsna.patg.net
 patg@patrick-galbraiths-computer.local
+patg@patrick.local
 patg@pc248.lfp.kcls.org
 patg@radha.local
 paul@central.snake.net
diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit
index fe263b79325..e3f86fa995a 100755
--- a/BitKeeper/triggers/post-commit
+++ b/BitKeeper/triggers/post-commit
@@ -5,7 +5,7 @@ FROM=$USER@mysql.com
 INTERNALS=internals@lists.mysql.com
 DOCS=docs-commit@mysql.com
 LIMIT=10000
-VERSION="5.0"
+VERSION="5.1"
 
 if [ "$REAL_EMAIL" = "" ]
 then
diff --git a/Makefile.am b/Makefile.am
index 6eb7421880e..830c68df3f5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,9 +30,11 @@ SUBDIRS =		. include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
 DIST_SUBDIRS =		. include @docs_dirs@ zlib \
 			@readline_topdir@ sql-common \
 			@thread_dirs@ pstack \
-			@sql_union_dirs@ scripts @man_dirs@ tests SSL\
-			BUILD netware os2 @libmysqld_dirs@ \
-			@bench_dirs@ support-files @tools_dirs@
+                        strings mysys dbug extra regex storage \
+                        vio sql libmysql_r libmysql client scripts \
+			@man_dirs@ tests SSL\
+			BUILD netware os2 @libmysqld_dirs@\
+			@bench_dirs@ support-files server-tools tools
 
 # Relink after clean
 linked_sources = linked_client_sources linked_server_sources \
diff --git a/config/ac-macros/ha_berkeley.m4 b/config/ac-macros/ha_berkeley.m4
index 732c7730816..5463f10ca98 100644
--- a/config/ac-macros/ha_berkeley.m4
+++ b/config/ac-macros/ha_berkeley.m4
@@ -187,7 +187,7 @@ AC_DEFUN([MYSQL_SEARCH_FOR_BDB], [
 dnl echo ["MYSQL_SEARCH_FOR_BDB"]
   bdb_dir_ok="no BerkeleyDB found"
 
-  for test_dir in $srcdir/bdb $srcdir/db-*.*.* /usr/local/BerkeleyDB*; do
+  for test_dir in $srcdir/storage/bdb $srcdir/db-*.*.* /usr/local/BerkeleyDB*; do
 dnl    echo "-----------> Looking at ($test_dir; `cd $test_dir && pwd`)"
     MYSQL_CHECK_BDB_DIR([$test_dir])
     if test X"$bdb_dir_ok" = Xsource || test X"$bdb_dir_ok" = Xinstalled; then
diff --git a/config/ac-macros/ha_innodb.m4 b/config/ac-macros/ha_innodb.m4
index 17f0fab3e90..287b77c8851 100644
--- a/config/ac-macros/ha_innodb.m4
+++ b/config/ac-macros/ha_innodb.m4
@@ -20,45 +20,45 @@ AC_DEFUN([MYSQL_CHECK_INNODB], [
       AC_MSG_RESULT([Using Innodb])
       AC_DEFINE([HAVE_INNOBASE_DB], [1], [Using Innobase DB])
       have_innodb="yes"
-      innodb_includes="-I../innobase/include"
+      innodb_includes="-I\$(top_builddir)/innobase/include"
       innodb_system_libs=""
 dnl Some libs are listed several times, in order for gcc to sort out
 dnl circular references.
       innodb_libs="\
- \$(top_builddir)/innobase/usr/libusr.a\
- \$(top_builddir)/innobase/srv/libsrv.a\
- \$(top_builddir)/innobase/dict/libdict.a\
- \$(top_builddir)/innobase/que/libque.a\
- \$(top_builddir)/innobase/srv/libsrv.a\
- \$(top_builddir)/innobase/ibuf/libibuf.a\
- \$(top_builddir)/innobase/row/librow.a\
- \$(top_builddir)/innobase/pars/libpars.a\
- \$(top_builddir)/innobase/btr/libbtr.a\
- \$(top_builddir)/innobase/trx/libtrx.a\
- \$(top_builddir)/innobase/read/libread.a\
- \$(top_builddir)/innobase/usr/libusr.a\
- \$(top_builddir)/innobase/buf/libbuf.a\
- \$(top_builddir)/innobase/ibuf/libibuf.a\
- \$(top_builddir)/innobase/eval/libeval.a\
- \$(top_builddir)/innobase/log/liblog.a\
- \$(top_builddir)/innobase/fsp/libfsp.a\
- \$(top_builddir)/innobase/fut/libfut.a\
- \$(top_builddir)/innobase/fil/libfil.a\
- \$(top_builddir)/innobase/lock/liblock.a\
- \$(top_builddir)/innobase/mtr/libmtr.a\
- \$(top_builddir)/innobase/page/libpage.a\
- \$(top_builddir)/innobase/rem/librem.a\
- \$(top_builddir)/innobase/thr/libthr.a\
- \$(top_builddir)/innobase/sync/libsync.a\
- \$(top_builddir)/innobase/data/libdata.a\
- \$(top_builddir)/innobase/mach/libmach.a\
- \$(top_builddir)/innobase/ha/libha.a\
- \$(top_builddir)/innobase/dyn/libdyn.a\
- \$(top_builddir)/innobase/mem/libmem.a\
- \$(top_builddir)/innobase/sync/libsync.a\
- \$(top_builddir)/innobase/ut/libut.a\
- \$(top_builddir)/innobase/os/libos.a\
- \$(top_builddir)/innobase/ut/libut.a"
+ \$(top_builddir)/storage/innobase/usr/libusr.a\
+ \$(top_builddir)/storage/innobase/srv/libsrv.a\
+ \$(top_builddir)/storage/innobase/dict/libdict.a\
+ \$(top_builddir)/storage/innobase/que/libque.a\
+ \$(top_builddir)/storage/innobase/srv/libsrv.a\
+ \$(top_builddir)/storage/innobase/ibuf/libibuf.a\
+ \$(top_builddir)/storage/innobase/row/librow.a\
+ \$(top_builddir)/storage/innobase/pars/libpars.a\
+ \$(top_builddir)/storage/innobase/btr/libbtr.a\
+ \$(top_builddir)/storage/innobase/trx/libtrx.a\
+ \$(top_builddir)/storage/innobase/read/libread.a\
+ \$(top_builddir)/storage/innobase/usr/libusr.a\
+ \$(top_builddir)/storage/innobase/buf/libbuf.a\
+ \$(top_builddir)/storage/innobase/ibuf/libibuf.a\
+ \$(top_builddir)/storage/innobase/eval/libeval.a\
+ \$(top_builddir)/storage/innobase/log/liblog.a\
+ \$(top_builddir)/storage/innobase/fsp/libfsp.a\
+ \$(top_builddir)/storage/innobase/fut/libfut.a\
+ \$(top_builddir)/storage/innobase/fil/libfil.a\
+ \$(top_builddir)/storage/innobase/lock/liblock.a\
+ \$(top_builddir)/storage/innobase/mtr/libmtr.a\
+ \$(top_builddir)/storage/innobase/page/libpage.a\
+ \$(top_builddir)/storage/innobase/rem/librem.a\
+ \$(top_builddir)/storage/innobase/thr/libthr.a\
+ \$(top_builddir)/storage/innobase/sync/libsync.a\
+ \$(top_builddir)/storage/innobase/data/libdata.a\
+ \$(top_builddir)/storage/innobase/mach/libmach.a\
+ \$(top_builddir)/storage/innobase/ha/libha.a\
+ \$(top_builddir)/storage/innobase/dyn/libdyn.a\
+ \$(top_builddir)/storage/innobase/mem/libmem.a\
+ \$(top_builddir)/storage/innobase/sync/libsync.a\
+ \$(top_builddir)/storage/innobase/ut/libut.a\
+ \$(top_builddir)/storage/innobase/os/libos.a\
+ \$(top_builddir)/storage/innobase/ut/libut.a"
 
       AC_CHECK_LIB(rt, aio_read, [innodb_system_libs="-lrt"])
       ;;
diff --git a/config/ac-macros/ha_ndbcluster.m4 b/config/ac-macros/ha_ndbcluster.m4
index dc5e0e73558..f26c62ee214 100644
--- a/config/ac-macros/ha_ndbcluster.m4
+++ b/config/ac-macros/ha_ndbcluster.m4
@@ -131,10 +131,10 @@ AC_DEFUN([MYSQL_CHECK_NDBCLUSTER], [
       AC_MSG_RESULT([Using NDB Cluster])
       AC_DEFINE([HAVE_NDBCLUSTER_DB], [1], [Using Ndb Cluster DB])
       have_ndbcluster="yes"
-      ndbcluster_includes="-I../ndb/include -I../ndb/include/ndbapi"
-      ndbcluster_libs="\$(top_builddir)/ndb/src/.libs/libndbclient.a"
+      ndbcluster_includes="-I\$(top_builddir)/storage/ndb/include -I\$(top_builddir)/storage/ndb/include/ndbapi"
+      ndbcluster_libs="\$(top_builddir)/storage/ndb/src/.libs/libndbclient.a"
       ndbcluster_system_libs=""
-      ndb_mgmclient_libs="\$(top_builddir)/ndb/src/mgmclient/libndbmgmclient.la"
+      ndb_mgmclient_libs="\$(top_builddir)/storage/ndb/src/mgmclient/libndbmgmclient.la"
       MYSQL_CHECK_NDB_OPTIONS
       ;;
     * )
diff --git a/configure.in b/configure.in
index 21494999ca4..cffed5f0417 100644
--- a/configure.in
+++ b/configure.in
@@ -5,8 +5,9 @@ AC_PREREQ(2.58)dnl		Minimum Autoconf version required.
 
 AC_INIT(sql/mysqld.cc)
 AC_CANONICAL_SYSTEM
+# The Docs Makefile.am parses this line!
 # Don't forget to also update the NDB lines below.
-AM_INIT_AUTOMAKE(mysql, 5.0.10-beta)
+AM_INIT_AUTOMAKE(mysql, 5.1.0-alpha)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10
@@ -16,9 +17,9 @@ SHARED_LIB_VERSION=14:0:0
 
 # ndb version
 NDB_VERSION_MAJOR=5
-NDB_VERSION_MINOR=0
-NDB_VERSION_BUILD=10
-NDB_VERSION_STATUS="beta"
+NDB_VERSION_MINOR=1
+NDB_VERSION_BUILD=0
+NDB_VERSION_STATUS="alpha"
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?
 # Remember that regexps needs to quote [ and ] since this is run through m4
@@ -2496,7 +2497,7 @@ then
     if test X"$have_berkeley_db" != Xyes; then
       # we must build berkeley db from source
       sql_server_dirs="$sql_server_dirs $have_berkeley_db"
-      AC_CONFIG_FILES(bdb/Makefile)
+      AC_CONFIG_FILES(storage/bdb/Makefile)
 
       echo "CONFIGURING FOR BERKELEY DB" 
       bdb_conf_flags="--disable-shared"
@@ -2522,8 +2523,10 @@ then
       rel_srcdir=
       case "$srcdir" in
 	/* ) rel_srcdir="$srcdir" ;;
-	* )  rel_srcdir="../../$srcdir" ;;
+	* )  rel_srcdir="../../../$srcdir" ;;
       esac
+      echo $bdb/build_unix
+      echo $rel_srcdir/$bdb/dist/configure
       (cd $bdb/build_unix && \
        sh $rel_srcdir/$bdb/dist/configure $bdb_conf_flags) || \
         AC_MSG_ERROR([could not configure Berkeley DB])
@@ -2536,12 +2539,12 @@ dnl       echo "bdb = '$bdb'; inc = '$bdb_includes', lib = '$bdb_libs'"
   else
     if test -d bdb; then :
     else
-      mkdir bdb && mkdir bdb/build_unix
+      mkdir storage/bdb && mkdir storage/bdb/build_unix
     fi
 
-    if test -r bdb/build_unix/db.h; then :
+    if test -r storage/bdb/build_unix/db.h; then :
     else
-      cat <<EOF > bdb/build_unix/db.h
+      cat <<EOF > storage/bdb/build_unix/db.h
 
 This file is a placeholder to fool make.  The way that automake
 and GNU make work together causes some files to depend on this
@@ -2564,8 +2567,8 @@ EOF
   if test X"$have_innodb" = Xyes
   then
     innodb_conf_flags=""
-    sql_server_dirs="$sql_server_dirs innobase"
-    AC_CONFIG_SUBDIRS(innobase)
+    sql_server_dirs="$sql_server_dirs storage/innobase"
+    AC_CONFIG_SUBDIRS(storage/innobase)
   fi
 
 case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_prog_gcc-$have_ndbcluster in
@@ -2587,12 +2590,12 @@ esac
       echo
       exit 1
     fi
-    sql_server_dirs="$sql_server_dirs ndb"
+    sql_server_dirs="$sql_server_dirs storage/ndb"
   fi
   #
   # END of configuration for optional table handlers
   #
-  sql_server_dirs="$sql_server_dirs myisam myisammrg heap vio sql"
+  sql_server_dirs="$sql_server_dirs storage/myisam storage/myisammrg storage/heap vio sql"
 
 fi
 
@@ -2725,51 +2728,53 @@ AC_SUBST([NDB_SIZEOF_INT])
 AC_SUBST([NDB_SIZEOF_LONG])
 AC_SUBST([NDB_SIZEOF_LONG_LONG])
 
-AC_CONFIG_FILES(ndb/Makefile ndb/include/Makefile dnl
-   ndb/src/Makefile ndb/src/common/Makefile dnl
-   ndb/docs/Makefile dnl
-   ndb/tools/Makefile dnl
-   ndb/src/common/debugger/Makefile dnl
-   ndb/src/common/debugger/signaldata/Makefile dnl
-   ndb/src/common/portlib/Makefile dnl
-   ndb/src/common/util/Makefile dnl
-   ndb/src/common/logger/Makefile dnl
-   ndb/src/common/transporter/Makefile dnl
-   ndb/src/common/mgmcommon/Makefile dnl
-   ndb/src/kernel/Makefile dnl
-   ndb/src/kernel/error/Makefile dnl
-   ndb/src/kernel/blocks/Makefile dnl
-   ndb/src/kernel/blocks/cmvmi/Makefile dnl
-   ndb/src/kernel/blocks/dbacc/Makefile dnl
-   ndb/src/kernel/blocks/dbdict/Makefile dnl
-   ndb/src/kernel/blocks/dbdih/Makefile dnl
-   ndb/src/kernel/blocks/dblqh/Makefile dnl
-   ndb/src/kernel/blocks/dbtc/Makefile dnl
-   ndb/src/kernel/blocks/dbtup/Makefile dnl
-   ndb/src/kernel/blocks/ndbfs/Makefile dnl
-   ndb/src/kernel/blocks/ndbcntr/Makefile dnl
-   ndb/src/kernel/blocks/qmgr/Makefile dnl
-   ndb/src/kernel/blocks/trix/Makefile dnl
-   ndb/src/kernel/blocks/backup/Makefile dnl
-   ndb/src/kernel/blocks/dbutil/Makefile dnl
-   ndb/src/kernel/blocks/suma/Makefile dnl
-   ndb/src/kernel/blocks/grep/Makefile dnl
-   ndb/src/kernel/blocks/dbtux/Makefile dnl
-   ndb/src/kernel/vm/Makefile dnl
-   ndb/src/mgmapi/Makefile dnl
-   ndb/src/ndbapi/Makefile dnl
-   ndb/src/mgmsrv/Makefile dnl
-   ndb/src/mgmclient/Makefile dnl
-   ndb/src/cw/Makefile dnl
-   ndb/src/cw/cpcd/Makefile dnl
-   ndb/test/Makefile dnl
-   ndb/test/src/Makefile dnl
-   ndb/test/ndbapi/Makefile dnl
-   ndb/test/ndbapi/bank/Makefile dnl
-   ndb/test/tools/Makefile dnl
-   ndb/test/run-test/Makefile mysql-test/ndb/Makefile dnl
-   ndb/include/ndb_version.h ndb/include/ndb_global.h dnl
-   ndb/include/ndb_types.h dnl
+AC_CONFIG_FILES(storage/ndb/Makefile storage/ndb/include/Makefile dnl
+   storage/ndb/src/Makefile storage/ndb/src/common/Makefile dnl
+   storage/ndb/docs/Makefile dnl
+   storage/ndb/tools/Makefile dnl
+   storage/ndb/src/common/debugger/Makefile dnl
+   storage/ndb/src/common/debugger/signaldata/Makefile dnl
+   storage/ndb/src/common/portlib/Makefile dnl
+   storage/ndb/src/common/util/Makefile dnl
+   storage/ndb/src/common/logger/Makefile dnl
+   storage/ndb/src/common/transporter/Makefile dnl
+   storage/ndb/src/common/mgmcommon/Makefile dnl
+   storage/ndb/src/kernel/Makefile dnl
+   storage/ndb/src/kernel/error/Makefile dnl
+   storage/ndb/src/kernel/blocks/Makefile dnl
+   storage/ndb/src/kernel/blocks/cmvmi/Makefile dnl
+   storage/ndb/src/kernel/blocks/dbacc/Makefile dnl
+   storage/ndb/src/kernel/blocks/dbdict/Makefile dnl
+   storage/ndb/src/kernel/blocks/dbdih/Makefile dnl
+   storage/ndb/src/kernel/blocks/dblqh/Makefile dnl
+   storage/ndb/src/kernel/blocks/dbtc/Makefile dnl
+   storage/ndb/src/kernel/blocks/dbtup/Makefile dnl
+   storage/ndb/src/kernel/blocks/ndbfs/Makefile dnl
+   storage/ndb/src/kernel/blocks/ndbcntr/Makefile dnl
+   storage/ndb/src/kernel/blocks/qmgr/Makefile dnl
+   storage/ndb/src/kernel/blocks/trix/Makefile dnl
+   storage/ndb/src/kernel/blocks/backup/Makefile dnl
+   storage/ndb/src/kernel/blocks/dbutil/Makefile dnl
+   storage/ndb/src/kernel/blocks/suma/Makefile dnl
+   storage/ndb/src/kernel/blocks/grep/Makefile dnl
+   storage/ndb/src/kernel/blocks/dbtux/Makefile dnl
+   storage/ndb/src/kernel/vm/Makefile dnl
+   storage/ndb/src/mgmapi/Makefile dnl
+   storage/ndb/src/ndbapi/Makefile dnl
+   storage/ndb/src/mgmsrv/Makefile dnl
+   storage/ndb/src/mgmclient/Makefile dnl
+   storage/ndb/src/cw/Makefile dnl
+   storage/ndb/src/cw/cpcd/Makefile dnl
+   storage/ndb/test/Makefile dnl
+   storage/ndb/test/src/Makefile dnl
+   storage/ndb/test/ndbapi/Makefile dnl
+   storage/ndb/test/ndbapi/bank/Makefile dnl
+   storage/ndb/test/tools/Makefile dnl
+   storage/ndb/test/run-test/Makefile dnl
+   storage/ndb/include/ndb_version.h dnl
+   storage/ndb/include/ndb_global.h dnl
+   storage/ndb/include/ndb_types.h dnl
+   mysql-test/ndb/Makefile dnl
    )
 fi
 
@@ -2777,8 +2782,8 @@ AC_SUBST(MAKE_BINARY_DISTRIBUTION_OPTIONS)
 
 # Output results
 AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
- strings/Makefile regex/Makefile heap/Makefile dnl
- myisam/Makefile myisammrg/Makefile dnl
+ strings/Makefile regex/Makefile storage/Makefile storage/heap/Makefile dnl
+ storage/myisam/Makefile storage/myisammrg/Makefile dnl
  os2/Makefile os2/include/Makefile os2/include/sys/Makefile dnl
  man/Makefile BUILD/Makefile vio/Makefile dnl
  libmysql_r/Makefile libmysqld/Makefile libmysqld/examples/Makefile dnl
diff --git a/extra/perror.c b/extra/perror.c
index d68f5230e4a..283c3b0c107 100644
--- a/extra/perror.c
+++ b/extra/perror.c
@@ -24,7 +24,7 @@
 #include <errno.h>
 #include <my_getopt.h>
 #ifdef HAVE_NDBCLUSTER_DB
-#include "../ndb/src/ndbapi/ndberror.c"
+#include "../storage/ndb/src/ndbapi/ndberror.c"
 #endif
 
 static my_bool verbose, print_all_codes;
diff --git a/heap/Makefile.am b/heap/Makefile.am
deleted file mode 100644
index 567c7774751..00000000000
--- a/heap/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include 
-LDADD =			libheap.a ../mysys/libmysys.a ../dbug/libdbug.a \
-			../strings/libmystrings.a
-pkglib_LIBRARIES =	libheap.a
-noinst_PROGRAMS	=	hp_test1 hp_test2
-hp_test1_LDFLAGS = @NOINST_LDFLAGS@
-hp_test2_LDFLAGS = @NOINST_LDFLAGS@
-noinst_HEADERS =	heapdef.h
-libheap_a_SOURCES =	hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \
-			hp_rrnd.c hp_scan.c hp_update.c hp_write.c hp_delete.c \
-			hp_rsame.c hp_create.c hp_rename.c hp_rfirst.c \
-			hp_rnext.c hp_rlast.c hp_rprev.c hp_clear.c \
-			hp_rkey.c hp_block.c \
-			hp_hash.c _check.c _rectest.c hp_static.c
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/include/Makefile.am b/include/Makefile.am
index 5f426843950..53b83bd7d88 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -28,7 +28,7 @@ noinst_HEADERS =	config-win.h config-os2.h config-netware.h \
 			myisam.h myisampack.h myisammrg.h ft_global.h\
 			mysys_err.h my_base.h help_start.h help_end.h \
 			my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \
-			my_aes.h my_tree.h hash.h thr_alarm.h \
+			my_aes.h my_tree.h my_trie.h hash.h thr_alarm.h \
 			thr_lock.h t_ctype.h violite.h md5.h \
 			mysql_version.h.in my_handler.h my_time.h decimal.h
 
diff --git a/include/my_bitmap.h b/include/my_bitmap.h
index 84a5d8bd18a..e0cc929bce6 100644
--- a/include/my_bitmap.h
+++ b/include/my_bitmap.h
@@ -21,10 +21,13 @@
 
 #define MY_BIT_NONE (~(uint) 0)
 
+
 typedef struct st_bitmap
 {
-  uchar *bitmap;
-  uint bitmap_size; /* number of bytes occupied by the above */
+  uint32 *bitmap;
+  uint n_bits; /* number of bits occupied by the above */
+  uint32 last_word_mask;
+  uint32 *last_word_ptr;
   /*
      mutex will be acquired for the duration of each bitmap operation if
      thread_safe flag in bitmap_init was set.  Otherwise, we optimize by not
@@ -38,32 +41,97 @@ typedef struct st_bitmap
 #ifdef	__cplusplus
 extern "C" {
 #endif
-extern my_bool bitmap_cmp(const MY_BITMAP *map1, const MY_BITMAP *map2);
-extern my_bool bitmap_init(MY_BITMAP *map, uchar *buf, uint bitmap_size, my_bool thread_safe);
+extern my_bool bitmap_init(MY_BITMAP *map, uint32 *buf, uint n_bits, my_bool thread_safe);
 extern my_bool bitmap_is_clear_all(const MY_BITMAP *map);
 extern my_bool bitmap_is_prefix(const MY_BITMAP *map, uint prefix_size);
-extern my_bool bitmap_is_set(const MY_BITMAP *map, uint bitmap_bit);
 extern my_bool bitmap_is_set_all(const MY_BITMAP *map);
 extern my_bool bitmap_is_subset(const MY_BITMAP *map1, const MY_BITMAP *map2);
 extern my_bool bitmap_test_and_set(MY_BITMAP *map, uint bitmap_bit);
 extern my_bool bitmap_fast_test_and_set(MY_BITMAP *map, uint bitmap_bit);
 extern uint bitmap_set_next(MY_BITMAP *map);
 extern uint bitmap_get_first(const MY_BITMAP *map);
+extern uint bitmap_get_first_set(const MY_BITMAP *map);
 extern uint bitmap_bits_set(const MY_BITMAP *map);
-extern void bitmap_clear_all(MY_BITMAP *map);
-extern void bitmap_clear_bit(MY_BITMAP *map, uint bitmap_bit);
 extern void bitmap_free(MY_BITMAP *map);
-extern void bitmap_intersect(MY_BITMAP *map, const MY_BITMAP *map2);
-extern void bitmap_set_all(MY_BITMAP *map);
-extern void bitmap_set_bit(MY_BITMAP *map, uint bitmap_bit);
 extern void bitmap_set_prefix(MY_BITMAP *map, uint prefix_size);
+extern void bitmap_intersect(MY_BITMAP *map, const MY_BITMAP *map2);
 extern void bitmap_subtract(MY_BITMAP *map, const MY_BITMAP *map2);
 extern void bitmap_union(MY_BITMAP *map, const MY_BITMAP *map2);
 
+extern uint bitmap_lock_set_next(MY_BITMAP *map);
+extern void bitmap_lock_clear_bit(MY_BITMAP *map, uint bitmap_bit);
+#ifdef NOT_USED
+extern uint bitmap_lock_bits_set(const MY_BITMAP *map);
+extern my_bool bitmap_lock_is_set_all(const MY_BITMAP *map);
+extern uint bitmap_lock_get_first(const MY_BITMAP *map);
+extern uint bitmap_lock_get_first_set(const MY_BITMAP *map);
+extern my_bool bitmap_lock_is_subset(const MY_BITMAP *map1,
+                                     const MY_BITMAP *map2);
+extern my_bool bitmap_lock_is_prefix(const MY_BITMAP *map, uint prefix_size);
+extern my_bool bitmap_lock_is_set(const MY_BITMAP *map, uint bitmap_bit);
+extern my_bool bitmap_lock_is_clear_all(const MY_BITMAP *map);
+extern my_bool bitmap_lock_cmp(const MY_BITMAP *map1, const MY_BITMAP *map2);
+extern void bitmap_lock_set_all(MY_BITMAP *map);
+extern void bitmap_lock_clear_all(MY_BITMAP *map);
+extern void bitmap_lock_set_bit(MY_BITMAP *map, uint bitmap_bit);
+extern void bitmap_lock_flip_bit(MY_BITMAP *map, uint bitmap_bit);
+extern void bitmap_lock_set_prefix(MY_BITMAP *map, uint prefix_size);
+extern void bitmap_lock_intersect(MY_BITMAP *map, const MY_BITMAP *map2);
+extern void bitmap_lock_subtract(MY_BITMAP *map, const MY_BITMAP *map2);
+extern void bitmap_lock_union(MY_BITMAP *map, const MY_BITMAP *map2);
+extern void bitmap_lock_xor(MY_BITMAP *map, const MY_BITMAP *map2);
+extern void bitmap_lock_invert(MY_BITMAP *map);
+#endif
 /* Fast, not thread safe, bitmap functions */
-#define bitmap_fast_set_bit(MAP, BIT) (MAP)->bitmap[(BIT) / 8] |= (1 << ((BIT) & 7))
-#define bitmap_fast_clear_bit(MAP, BIT) (MAP)->bitmap[(BIT) / 8] &= ~ (1 << ((BIT) & 7))
-#define bitmap_fast_is_set(MAP, BIT) (MAP)->bitmap[(BIT) / 8] & (1 << ((BIT) & 7))
+#define no_bytes_in_map(map) (((map)->n_bits + 7)/8)
+#define no_words_in_map(map) (((map)->n_bits + 31)/32)
+#define bytes_word_aligned(bytes) (4*((bytes + 3)/4))
+#define _bitmap_set_bit(MAP, BIT) (((uchar*)(MAP)->bitmap)[(BIT) / 8] \
+                                  |= (1 << ((BIT) & 7)))
+#define _bitmap_flip_bit(MAP, BIT) (((uchar*)(MAP)->bitmap)[(BIT) / 8] \
+                                  ^= (1 << ((BIT) & 7)))
+#define _bitmap_clear_bit(MAP, BIT) (((uchar*)(MAP)->bitmap)[(BIT) / 8] \
+                                  &= ~ (1 << ((BIT) & 7)))
+#define _bitmap_is_set(MAP, BIT) (((uchar*)(MAP)->bitmap)[(BIT) / 8] \
+                                  & (1 << ((BIT) & 7)))
+#ifndef DBUG_OFF
+inline uint32
+bitmap_set_bit(MY_BITMAP *map,uint bit)
+{
+  DBUG_ASSERT(bit < (map)->n_bits);
+  return _bitmap_set_bit(map,bit);
+}
+inline uint32
+bitmap_flip_bit(MY_BITMAP *map,uint bit)
+{
+  DBUG_ASSERT(bit < (map)->n_bits);
+  return _bitmap_flip_bit(map,bit);
+}
+inline uint32
+bitmap_clear_bit(MY_BITMAP *map,uint bit)
+{
+  DBUG_ASSERT(bit < (map)->n_bits);
+  return _bitmap_clear_bit(map,bit);
+}
+inline uint32
+bitmap_is_set(const MY_BITMAP *map,uint bit)
+{
+  DBUG_ASSERT(bit < (map)->n_bits);
+  return _bitmap_is_set(map,bit);
+}
+#else
+#define bitmap_set_bit(MAP, BIT) _bitmap_set_bit(MAP, BIT)
+#define bitmap_flip_bit(MAP, BIT) _bitmap_flip_bit(MAP, BIT)
+#define bitmap_clear_bit(MAP, BIT) _bitmap_clear_bit(MAP, BIT)
+#define bitmap_is_set(MAP, BIT) _bitmap_is_set(MAP, BIT)
+#endif
+#define bitmap_cmp(MAP1, MAP2) \
+  (memcmp((MAP1)->bitmap, (MAP2)->bitmap, 4*no_words_in_map((MAP1)))==0)
+#define bitmap_clear_all(MAP) \
+  { memset((MAP)->bitmap, 0, 4*no_words_in_map((MAP))); \
+  *(MAP)->last_word_ptr|= (MAP)->last_word_mask; }
+#define bitmap_set_all(MAP) \
+  (memset((MAP)->bitmap, 0xFF, 4*no_words_in_map((MAP))))
 
 #ifdef	__cplusplus
 }
diff --git a/include/my_trie.h b/include/my_trie.h
new file mode 100644
index 00000000000..a8534cb11c1
--- /dev/null
+++ b/include/my_trie.h
@@ -0,0 +1,142 @@
+/* Copyright (C) 2005 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+#ifndef _trie_h
+#define _trie_h
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+typedef struct st_trie_node
+{
+  uint16 leaf;                /* Depth from root node if match, 0 else */
+  byte c;                     /* Label on this edge */
+  struct st_trie_node *next;  /* Next label */
+  struct st_trie_node *links; /* Array of edges leaving this node */
+  struct st_trie_node *fail;  /* AC failure function */
+} TRIE_NODE;
+
+typedef struct st_trie
+{
+  TRIE_NODE root;
+  MEM_ROOT mem_root;
+  CHARSET_INFO *charset;
+  uint32 nnodes;
+  uint32 nwords;
+} TRIE;
+
+typedef struct st_ac_trie_state
+{
+  TRIE *trie;
+  TRIE_NODE *node;
+} AC_TRIE_STATE;
+
+extern TRIE *trie_init (TRIE *trie, CHARSET_INFO *charset);
+extern void trie_free (TRIE *trie);
+extern my_bool trie_insert (TRIE *trie, const byte *key, uint keylen);
+extern my_bool ac_trie_prepare (TRIE *trie);
+extern void ac_trie_init (TRIE *trie, AC_TRIE_STATE *state);
+
+
+/* `trie_goto' is internal function and shouldn't be used. */
+
+static inline TRIE_NODE *trie_goto (TRIE_NODE *root, TRIE_NODE *node, byte c)
+{
+  TRIE_NODE *next;
+  DBUG_ENTER("trie_goto");
+  for (next= node->links; next; next= next->next)
+    if (next->c == c)
+      DBUG_RETURN(next);
+  if (root == node)
+    DBUG_RETURN(root);
+  DBUG_RETURN(NULL);
+}
+
+
+/*
+  SYNOPSIS
+    int ac_trie_next (AC_TRIE_STATE *state, byte *c);
+    state - valid pointer to `AC_TRIE_STATE'
+    c - character to lookup
+
+  DESCRIPTION
+    Implementation of search using Aho-Corasick automaton.
+    Performs char-by-char search.
+
+  RETURN VALUE
+    `ac_trie_next' returns length of matched word or 0.
+*/
+
+static inline int ac_trie_next (AC_TRIE_STATE *state, byte *c)
+{
+  TRIE_NODE *root, *node;
+  DBUG_ENTER("ac_trie_next");
+  DBUG_ASSERT(state && c);
+  root= &state->trie->root;
+  node= state->node;
+  while (! (state->node= trie_goto(root, node, *c)))
+    node= node->fail;
+  DBUG_RETURN(state->node->leaf);
+}
+
+
+/*
+  SYNOPSIS
+    my_bool trie_search (TRIE *trie, const byte *key, uint keylen);
+    trie - valid pointer to `TRIE'
+    key - valid pointer to key to insert
+    keylen - non-0 key length
+
+  DESCRIPTION
+    Performs key lookup in trie.
+
+  RETURN VALUE
+    `trie_search' returns `true' if key is in `trie'. Otherwise,
+    `false' is returned.
+
+  NOTES
+    Consecutive search here is "best by test". arrays are very short, so
+    binary search or hashing would add too much complexity that would
+    overweight speed gain. Especially because compiler can optimize simple
+    consecutive loop better (tested)
+*/
+
+static inline my_bool trie_search (TRIE *trie, const byte *key, uint keylen)
+{
+  TRIE_NODE *node;
+  uint k;
+  DBUG_ENTER("trie_search");
+  DBUG_ASSERT(trie && key && keylen);
+  node= &trie->root;
+
+  for (k= 0; k < keylen; k++)
+  {
+    byte p;
+    if (! (node= node->links))
+      DBUG_RETURN(FALSE);
+    p= key[k];
+    while (p != node->c)
+      if (! (node= node->next))
+        DBUG_RETURN(FALSE);
+  }
+
+  DBUG_RETURN(node->leaf > 0);
+}
+
+#ifdef	__cplusplus
+}
+#endif
+#endif
diff --git a/innobase/include/Makefile.i b/innobase/include/Makefile.i
deleted file mode 100644
index f3e3fbe989e..00000000000
--- a/innobase/include/Makefile.i
+++ /dev/null
@@ -1,6 +0,0 @@
-# Makefile included in Makefile.am in every subdirectory
-
-INCLUDES =		-I$(srcdir)/../include -I$(srcdir)/../../include -I../../include
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index 9aef03f20d2..9c322478ad9 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -62,7 +62,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
 	unireg.cc uniques.cc stacktrace.c sql_union.cc hash_filo.cc \
 	spatial.cc gstream.cc sql_help.cc tztime.cc protocol_cursor.cc \
 	sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \
-	parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \
+	parse_file.cc rpl_filter.cc sql_view.cc sql_trigger.cc my_decimal.cc \
 	ha_blackhole.cc
 
 libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) $(sqlexamplessources)
@@ -73,9 +73,9 @@ sql_yacc.cc sql_yacc.h: $(top_srcdir)/sql/sql_yacc.yy
 
 # The following libraries should be included in libmysqld.a
 INC_LIB=	$(top_builddir)/regex/libregex.a \
-		$(top_builddir)/myisam/libmyisam.a \
-		$(top_builddir)/myisammrg/libmyisammrg.a \
-		$(top_builddir)/heap/libheap.a \
+		$(top_builddir)/storage/myisam/libmyisam.a \
+		$(top_builddir)/storage/myisammrg/libmyisammrg.a \
+		$(top_builddir)/storage/heap/libheap.a \
 		@innodb_libs@ @bdb_libs_with_path@ \
 		$(top_builddir)/mysys/libmysys.a \
 		$(top_builddir)/strings/libmystrings.a \
diff --git a/myisam/ft_boolean_search.c b/myisam/ft_boolean_search.c
deleted file mode 100644
index 35c41b7d2d6..00000000000
--- a/myisam/ft_boolean_search.c
+++ /dev/null
@@ -1,735 +0,0 @@
-/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-/* Written by Sergei A. Golubchik, who has a shared copyright to this code */
-
-/*  TODO: add caching - pre-read several index entries at once */
-
-#define FT_CORE
-#include "ftdefs.h"
-
-/* search with boolean queries */
-
-static double _wghts[11]=
-{
-  0.131687242798354,
-  0.197530864197531,
-  0.296296296296296,
-  0.444444444444444,
-  0.666666666666667,
-  1.000000000000000,
-  1.500000000000000,
-  2.250000000000000,
-  3.375000000000000,
-  5.062500000000000,
-  7.593750000000000};
-static double *wghts=_wghts+5; /* wghts[i] = 1.5**i */
-
-static double _nwghts[11]=
-{
- -0.065843621399177,
- -0.098765432098766,
- -0.148148148148148,
- -0.222222222222222,
- -0.333333333333334,
- -0.500000000000000,
- -0.750000000000000,
- -1.125000000000000,
- -1.687500000000000,
- -2.531250000000000,
- -3.796875000000000};
-static double *nwghts=_nwghts+5; /* nwghts[i] = -0.5*1.5**i */
-
-#define FTB_FLAG_TRUNC 1
-/* At most one of the following flags can be set */
-#define FTB_FLAG_YES   2
-#define FTB_FLAG_NO    4
-#define FTB_FLAG_WONLY 8
-
-typedef struct st_ftb_expr FTB_EXPR;
-struct st_ftb_expr
-{
-  FTB_EXPR *up;
-  uint      flags;
-/* ^^^^^^^^^^^^^^^^^^ FTB_{EXPR,WORD} common section */
-  my_off_t  docid[2];
-  float     weight;
-  float     cur_weight;
-  LIST     *phrase;               /* phrase words */
-  uint      yesses;               /* number of "yes" words matched */
-  uint      nos;                  /* number of "no"  words matched */
-  uint      ythresh;              /* number of "yes" words in expr */
-  uint      yweaks;               /* number of "yes" words for scan only */
-};
-
-typedef struct st_ftb_word
-{
-  FTB_EXPR  *up;
-  uint       flags;
-/* ^^^^^^^^^^^^^^^^^^ FTB_{EXPR,WORD} common section */
-  my_off_t   docid[2];             /* for index search and for scan */
-  my_off_t   key_root;
-  MI_KEYDEF *keyinfo;
-  float      weight;
-  uint       ndepth;
-  uint       len;
-  uchar      off;
-  byte       word[1];
-} FTB_WORD;
-
-typedef struct st_ft_info
-{
-  struct _ft_vft *please;
-  MI_INFO   *info;
-  CHARSET_INFO *charset;
-  FTB_EXPR  *root;
-  FTB_WORD **list;
-  MEM_ROOT   mem_root;
-  QUEUE      queue;
-  TREE       no_dupes;
-  my_off_t   lastpos;
-  uint       keynr;
-  uchar      with_scan;
-  enum { UNINITIALIZED, READY, INDEX_SEARCH, INDEX_DONE } state;
-} FTB;
-
-static int FTB_WORD_cmp(my_off_t *v, FTB_WORD *a, FTB_WORD *b)
-{
-  int i;
-
-  /* if a==curdoc, take it as  a < b */
-  if (v && a->docid[0] == *v)
-    return -1;
-
-  /* ORDER BY docid, ndepth DESC */
-  i=CMP_NUM(a->docid[0], b->docid[0]);
-  if (!i)
-    i=CMP_NUM(b->ndepth,a->ndepth);
-  return i;
-}
-
-static int FTB_WORD_cmp_list(CHARSET_INFO *cs, FTB_WORD **a, FTB_WORD **b)
-{
-  /* ORDER BY word DESC, ndepth DESC */
-  int i= mi_compare_text(cs, (uchar*) (*b)->word+1,(*b)->len-1,
-                             (uchar*) (*a)->word+1,(*a)->len-1,0,0);
-  if (!i)
-    i=CMP_NUM((*b)->ndepth,(*a)->ndepth);
-  return i;
-}
-
-static void _ftb_parse_query(FTB *ftb, byte **start, byte *end,
-                      FTB_EXPR *up, uint depth, byte *up_quot)
-{
-  byte        res;
-  FTB_PARAM   param;
-  FT_WORD     w;
-  FTB_WORD   *ftbw;
-  FTB_EXPR   *ftbe;
-  FT_WORD    *phrase_word;
-  LIST       *phrase_list;
-  uint  extra=HA_FT_WLEN+ftb->info->s->rec_reflength; /* just a shortcut */
-
-  if (ftb->state != UNINITIALIZED)
-    return;
-
-  param.prev=' ';
-  param.quot= up_quot;
-  while ((res=ft_get_word(ftb->charset,start,end,&w,&param)))
-  {
-    int   r=param.plusminus;
-    float weight= (float) (param.pmsign ? nwghts : wghts)[(r>5)?5:((r<-5)?-5:r)];
-    switch (res) {
-      case 1: /* word found */
-        ftbw=(FTB_WORD *)alloc_root(&ftb->mem_root,
-                                    sizeof(FTB_WORD) +
-                                    (param.trunc ? MI_MAX_KEY_BUFF :
-                                     w.len*ftb->charset->mbmaxlen+extra));
-        ftbw->len=w.len+1;
-        ftbw->flags=0;
-        ftbw->off=0;
-        if (param.yesno>0) ftbw->flags|=FTB_FLAG_YES;
-        if (param.yesno<0) ftbw->flags|=FTB_FLAG_NO;
-        if (param.trunc)   ftbw->flags|=FTB_FLAG_TRUNC;
-        ftbw->weight=weight;
-        ftbw->up=up;
-        ftbw->docid[0]=ftbw->docid[1]=HA_OFFSET_ERROR;
-        ftbw->ndepth= (param.yesno<0) + depth;
-        ftbw->key_root=HA_OFFSET_ERROR;
-        memcpy(ftbw->word+1, w.pos, w.len);
-        ftbw->word[0]=w.len;
-        if (param.yesno > 0) up->ythresh++;
-        queue_insert(& ftb->queue, (byte *)ftbw);
-        ftb->with_scan|=(param.trunc & FTB_FLAG_TRUNC);
-      case 4: /* not indexed word (stopword or too short/long) */
-        if (! up_quot) break;
-        phrase_word= (FT_WORD *)alloc_root(&ftb->mem_root, sizeof(FT_WORD));
-        phrase_list= (LIST *)alloc_root(&ftb->mem_root, sizeof(LIST));
-        phrase_word->pos= w.pos;
-        phrase_word->len= w.len;
-        phrase_list->data= (void *)phrase_word;
-        up->phrase= list_add(up->phrase, phrase_list);
-        break;
-      case 2: /* left bracket */
-        ftbe=(FTB_EXPR *)alloc_root(&ftb->mem_root, sizeof(FTB_EXPR));
-        ftbe->flags=0;
-        if (param.yesno>0) ftbe->flags|=FTB_FLAG_YES;
-        if (param.yesno<0) ftbe->flags|=FTB_FLAG_NO;
-        ftbe->weight=weight;
-        ftbe->up=up;
-        ftbe->ythresh=ftbe->yweaks=0;
-        ftbe->docid[0]=ftbe->docid[1]=HA_OFFSET_ERROR;
-        ftbe->phrase= NULL;
-        if (param.quot) ftb->with_scan|=2;
-        if (param.yesno > 0) up->ythresh++;
-        _ftb_parse_query(ftb, start, end, ftbe, depth+1, param.quot);
-        param.quot=0;
-        break;
-      case 3: /* right bracket */
-        if (up_quot) up->phrase= list_reverse(up->phrase);
-        return;
-    }
-  }
-  return;
-}
-
-static int _ftb_no_dupes_cmp(void* not_used __attribute__((unused)),
-                             const void *a,const void *b)
-{
-  return CMP_NUM((*((my_off_t*)a)), (*((my_off_t*)b)));
-}
-
-/* returns 1 if the search was finished (must-word wasn't found) */
-static int _ft2_search(FTB *ftb, FTB_WORD *ftbw, my_bool init_search)
-{
-  int r;
-  int subkeys=1;
-  my_bool can_go_down;
-  MI_INFO *info=ftb->info;
-  uint off, extra=HA_FT_WLEN+info->s->base.rec_reflength;
-  byte *lastkey_buf=ftbw->word+ftbw->off;
-
-  LINT_INIT(off);
-  if (ftbw->flags & FTB_FLAG_TRUNC)
-    lastkey_buf+=ftbw->len;
-
-  if (init_search)
-  {
-    ftbw->key_root=info->s->state.key_root[ftb->keynr];
-    ftbw->keyinfo=info->s->keyinfo+ftb->keynr;
-
-    r=_mi_search(info, ftbw->keyinfo, (uchar*) ftbw->word, ftbw->len,
-                 SEARCH_FIND | SEARCH_BIGGER, ftbw->key_root);
-  }
-  else
-  {
-    r=_mi_search(info, ftbw->keyinfo, (uchar*) lastkey_buf,
-                   USE_WHOLE_KEY, SEARCH_BIGGER, ftbw->key_root);
-  }
-
-  can_go_down=(!ftbw->off && (init_search || (ftbw->flags & FTB_FLAG_TRUNC)));
-  /* Skip rows inserted by concurrent insert */
-  while (!r)
-  {
-    if (can_go_down)
-    {
-      /* going down ? */
-      off=info->lastkey_length-extra;
-      subkeys=ft_sintXkorr(info->lastkey+off);
-    }
-    if (subkeys<0 || info->lastpos < info->state->data_file_length)
-      break;
-    r= _mi_search_next(info, ftbw->keyinfo, info->lastkey,
-                       info->lastkey_length,
-		       SEARCH_BIGGER, ftbw->key_root);
-  }
-
-  if (!r && !ftbw->off)
-  {
-    r= mi_compare_text(ftb->charset,
-                       info->lastkey+1,
-                       info->lastkey_length-extra-1,
-              (uchar*) ftbw->word+1,
-                       ftbw->len-1,
-             (my_bool) (ftbw->flags & FTB_FLAG_TRUNC),0);
-  }
-
-  if (r) /* not found */
-  {
-    if (!ftbw->off || !(ftbw->flags & FTB_FLAG_TRUNC))
-    {
-      ftbw->docid[0]=HA_OFFSET_ERROR;
-      if ((ftbw->flags & FTB_FLAG_YES) && ftbw->up->up==0)
-      {
-        /*
-          This word MUST BE present in every document returned,
-          so we can stop the search right now
-        */
-        ftb->state=INDEX_DONE;
-        return 1; /* search is done */
-      }
-      else
-        return 0;
-    }
-
-    /* going up to the first-level tree to continue search there */
-    _mi_dpointer(info, (uchar*) (lastkey_buf+HA_FT_WLEN), ftbw->key_root);
-    ftbw->key_root=info->s->state.key_root[ftb->keynr];
-    ftbw->keyinfo=info->s->keyinfo+ftb->keynr;
-    ftbw->off=0;
-    return _ft2_search(ftb, ftbw, 0);
-  }
-
-  /* matching key found */
-  memcpy(lastkey_buf, info->lastkey, info->lastkey_length);
-  if (lastkey_buf == ftbw->word)
-    ftbw->len=info->lastkey_length-extra;
-
-  /* going down ? */
-  if (subkeys<0)
-  {
-    /*
-      yep, going down, to the second-level tree
-      TODO here: subkey-based optimization
-    */
-    ftbw->off=off;
-    ftbw->key_root=info->lastpos;
-    ftbw->keyinfo=& info->s->ft2_keyinfo;
-    r=_mi_search_first(info, ftbw->keyinfo, ftbw->key_root);
-    DBUG_ASSERT(r==0);  /* found something */
-    memcpy(lastkey_buf+off, info->lastkey, info->lastkey_length);
-  }
-  ftbw->docid[0]=info->lastpos;
-  return 0;
-}
-
-static void _ftb_init_index_search(FT_INFO *ftb)
-{
-  int i;
-  FTB_WORD   *ftbw;
-
-  if ((ftb->state != READY && ftb->state !=INDEX_DONE) ||
-      ftb->keynr == NO_SUCH_KEY)
-    return;
-  ftb->state=INDEX_SEARCH;
-
-  for (i=ftb->queue.elements; i; i--)
-  {
-    ftbw=(FTB_WORD *)(ftb->queue.root[i]);
-
-    if (ftbw->flags & FTB_FLAG_TRUNC)
-    {
-      /*
-        special treatment for truncation operator
-        1. there are some (besides this) +words
-           | no need to search in the index, it can never ADD new rows
-           | to the result, and to remove half-matched rows we do scan anyway
-        2. -trunc*
-           | same as 1.
-        3. in 1 and 2, +/- need not be on the same expr. level,
-           but can be on any upper level, as in +word +(trunc1* trunc2*)
-        4. otherwise
-           | We have to index-search for this prefix.
-           | It may cause duplicates, as in the index (sorted by <word,docid>)
-           |   <aaaa,row1>
-           |   <aabb,row2>
-           |   <aacc,row1>
-           | Searching for "aa*" will find row1 twice...
-      */
-      FTB_EXPR *ftbe;
-      for (ftbe=(FTB_EXPR*)ftbw;
-           ftbe->up && !(ftbe->up->flags & FTB_FLAG_TRUNC);
-           ftbe->up->flags|= FTB_FLAG_TRUNC, ftbe=ftbe->up)
-      {
-        if (ftbe->flags & FTB_FLAG_NO ||                     /* 2 */
-             ftbe->up->ythresh - ftbe->up->yweaks >1)        /* 1 */
-        {
-          FTB_EXPR *top_ftbe=ftbe->up;
-          ftbw->docid[0]=HA_OFFSET_ERROR;
-          for (ftbe=(FTB_EXPR *)ftbw;
-               ftbe != top_ftbe && !(ftbe->flags & FTB_FLAG_NO);
-               ftbe=ftbe->up)
-              ftbe->up->yweaks++;
-          ftbe=0;
-          break;
-        }
-      }
-      if (!ftbe)
-        continue;
-      /* 4 */
-      if (!is_tree_inited(& ftb->no_dupes))
-        init_tree(& ftb->no_dupes,0,0,sizeof(my_off_t),
-            _ftb_no_dupes_cmp,0,0,0);
-      else
-        reset_tree(& ftb->no_dupes);
-    }
-
-    ftbw->off=0; /* in case of reinit */
-    if (_ft2_search(ftb, ftbw, 1))
-      return;
-  }
-  queue_fix(& ftb->queue);
-}
-
-
-FT_INFO * ft_init_boolean_search(MI_INFO *info, uint keynr, byte *query,
-                                 uint query_len, CHARSET_INFO *cs)
-{
-  FTB       *ftb;
-  FTB_EXPR  *ftbe;
-  uint       res;
-
-  if (!(ftb=(FTB *)my_malloc(sizeof(FTB), MYF(MY_WME))))
-    return 0;
-  ftb->please= (struct _ft_vft *) & _ft_vft_boolean;
-  ftb->state=UNINITIALIZED;
-  ftb->info=info;
-  ftb->keynr=keynr;
-  ftb->charset=cs;
-  DBUG_ASSERT(keynr==NO_SUCH_KEY || cs == info->s->keyinfo[keynr].seg->charset);
-  ftb->with_scan=0;
-  ftb->lastpos=HA_OFFSET_ERROR;
-  bzero(& ftb->no_dupes, sizeof(TREE));
-
-  init_alloc_root(&ftb->mem_root, 1024, 1024);
-
-  /*
-    Hack: instead of init_queue, we'll use reinit queue to be able
-    to alloc queue with alloc_root()
-  */
-  res=ftb->queue.max_elements=1+query_len/2;
-  if (!(ftb->queue.root=
-        (byte **)alloc_root(&ftb->mem_root, (res+1)*sizeof(void*))))
-    goto err;
-  reinit_queue(& ftb->queue, res, 0, 0,
-                         (int (*)(void*,byte*,byte*))FTB_WORD_cmp, 0);
-  if (!(ftbe=(FTB_EXPR *)alloc_root(&ftb->mem_root, sizeof(FTB_EXPR))))
-    goto err;
-  ftbe->weight=1;
-  ftbe->flags=FTB_FLAG_YES;
-  ftbe->nos=1;
-  ftbe->up=0;
-  ftbe->ythresh=ftbe->yweaks=0;
-  ftbe->docid[0]=ftbe->docid[1]=HA_OFFSET_ERROR;
-  ftbe->phrase= NULL;
-  ftb->root=ftbe;
-  _ftb_parse_query(ftb, &query, query+query_len, ftbe, 0, NULL);
-  ftb->list=(FTB_WORD **)alloc_root(&ftb->mem_root,
-                                     sizeof(FTB_WORD *)*ftb->queue.elements);
-  memcpy(ftb->list, ftb->queue.root+1, sizeof(FTB_WORD *)*ftb->queue.elements);
-  qsort2(ftb->list, ftb->queue.elements, sizeof(FTB_WORD *),
-                              (qsort2_cmp)FTB_WORD_cmp_list, ftb->charset);
-  if (ftb->queue.elements<2) ftb->with_scan &= ~FTB_FLAG_TRUNC;
-  ftb->state=READY;
-  return ftb;
-err:
-  free_root(& ftb->mem_root, MYF(0));
-  my_free((gptr)ftb,MYF(0));
-  return 0;
-}
-
-
-/*
-  Checks if given buffer matches phrase list.
-
-  SYNOPSIS
-    _ftb_check_phrase()
-    s0     start of buffer
-    e0     end of buffer
-    phrase broken into list phrase
-    cs     charset info
-
-  RETURN VALUE
-    1 is returned if phrase found, 0 else.
-*/
-
-static int _ftb_check_phrase(const byte *s0, const byte *e0,
-                LIST *phrase, CHARSET_INFO *cs)
-{
-  FT_WORD h_word;
-  const byte *h_start= s0;
-  DBUG_ENTER("_ftb_strstr");
-  DBUG_ASSERT(phrase);
-
-  while (ft_simple_get_word(cs, (byte **)&h_start, e0, &h_word, FALSE))
-  {
-    FT_WORD *n_word;
-    LIST *phrase_element= phrase;
-    const byte *h_start1= h_start;
-    for (;;)
-    {
-      n_word= (FT_WORD *)phrase_element->data;
-      if (my_strnncoll(cs, h_word.pos, h_word.len, n_word->pos, n_word->len))
-        break;
-      if (! (phrase_element= phrase_element->next))
-        DBUG_RETURN(1);
-      if (! ft_simple_get_word(cs, (byte **)&h_start1, e0, &h_word, FALSE))
-        DBUG_RETURN(0);
-    }
-  }
-  DBUG_RETURN(0);
-}
-
-
-static void _ftb_climb_the_tree(FTB *ftb, FTB_WORD *ftbw, FT_SEG_ITERATOR *ftsi_orig)
-{
-  FT_SEG_ITERATOR ftsi;
-  FTB_EXPR *ftbe;
-  float weight=ftbw->weight;
-  int  yn=ftbw->flags, ythresh, mode=(ftsi_orig != 0);
-  my_off_t curdoc=ftbw->docid[mode];
-
-  for (ftbe=ftbw->up; ftbe; ftbe=ftbe->up)
-  {
-    ythresh = ftbe->ythresh - (mode ? 0 : ftbe->yweaks);
-    if (ftbe->docid[mode] != curdoc)
-    {
-      ftbe->cur_weight=0;
-      ftbe->yesses=ftbe->nos=0;
-      ftbe->docid[mode]=curdoc;
-    }
-    if (ftbe->nos)
-      break;
-    if (yn & FTB_FLAG_YES)
-    {
-      weight /= ftbe->ythresh;
-      ftbe->cur_weight += weight;
-      if ((int) ++ftbe->yesses == ythresh)
-      {
-        yn=ftbe->flags;
-        weight=ftbe->cur_weight*ftbe->weight;
-        if (mode && ftbe->phrase)
-        {
-          int not_found=1;
-
-          memcpy(&ftsi, ftsi_orig, sizeof(ftsi));
-          while (_mi_ft_segiterator(&ftsi) && not_found)
-          {
-            if (!ftsi.pos)
-              continue;
-            not_found = ! _ftb_check_phrase(ftsi.pos, ftsi.pos+ftsi.len,
-                                      ftbe->phrase, ftb->charset);
-          }
-          if (not_found) break;
-        } /* ftbe->quot */
-      }
-      else
-        break;
-    }
-    else
-    if (yn & FTB_FLAG_NO)
-    {
-      /*
-        NOTE: special sort function of queue assures that all
-        (yn & FTB_FLAG_NO) != 0
-        events for every particular subexpression will
-        "auto-magically" happen BEFORE all the
-        (yn & FTB_FLAG_YES) != 0 events. So no
-        already matched expression can become not-matched again.
-      */
-      ++ftbe->nos;
-      break;
-    }
-    else
-    {
-      if (ftbe->ythresh)
-        weight/=3;
-      ftbe->cur_weight +=  weight;
-      if ((int) ftbe->yesses < ythresh)
-        break;
-      if (!(yn & FTB_FLAG_WONLY))
-        yn= ((int) ftbe->yesses++ == ythresh) ? ftbe->flags : FTB_FLAG_WONLY ;
-      weight*= ftbe->weight;
-    }
-  }
-}
-
-
-int ft_boolean_read_next(FT_INFO *ftb, char *record)
-{
-  FTB_EXPR  *ftbe;
-  FTB_WORD  *ftbw;
-  MI_INFO   *info=ftb->info;
-  my_off_t   curdoc;
-
-  if (ftb->state != INDEX_SEARCH && ftb->state != INDEX_DONE)
-    return -1;
-
-  /* black magic ON */
-  if ((int) _mi_check_index(info, ftb->keynr) < 0)
-    return my_errno;
-  if (_mi_readinfo(info, F_RDLCK, 1))
-    return my_errno;
-  /* black magic OFF */
-
-  if (!ftb->queue.elements)
-    return my_errno=HA_ERR_END_OF_FILE;
-
-  /* Attention!!! Address of a local variable is used here! See err: label */
-  ftb->queue.first_cmp_arg=(void *)&curdoc;
-
-  while (ftb->state == INDEX_SEARCH &&
-         (curdoc=((FTB_WORD *)queue_top(& ftb->queue))->docid[0]) !=
-         HA_OFFSET_ERROR)
-  {
-    while (curdoc == (ftbw=(FTB_WORD *)queue_top(& ftb->queue))->docid[0])
-    {
-      _ftb_climb_the_tree(ftb, ftbw, 0);
-
-      /* update queue */
-      _ft2_search(ftb, ftbw, 0);
-      queue_replaced(& ftb->queue);
-    }
-
-    ftbe=ftb->root;
-    if (ftbe->docid[0]==curdoc && ftbe->cur_weight>0 &&
-        ftbe->yesses>=(ftbe->ythresh-ftbe->yweaks) && !ftbe->nos)
-    {
-      /* curdoc matched ! */
-      if (is_tree_inited(&ftb->no_dupes) &&
-          tree_insert(&ftb->no_dupes, &curdoc, 0,
-                      ftb->no_dupes.custom_arg)->count >1)
-        /* but it managed already to get past this line once */
-        continue;
-
-      info->lastpos=curdoc;
-      /* Clear all states, except that the table was updated */
-      info->update&= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED);
-
-      if (!(*info->read_record)(info,curdoc,record))
-      {
-        info->update|= HA_STATE_AKTIV;          /* Record is read */
-        if (ftb->with_scan && ft_boolean_find_relevance(ftb,record,0)==0)
-            continue; /* no match */
-        my_errno=0;
-        goto err;
-      }
-      goto err;
-    }
-  }
-  ftb->state=INDEX_DONE;
-  my_errno=HA_ERR_END_OF_FILE;
-err:
-  ftb->queue.first_cmp_arg=(void *)0;
-  return my_errno;
-}
-
-
-float ft_boolean_find_relevance(FT_INFO *ftb, byte *record, uint length)
-{
-  FT_WORD word;
-  FTB_WORD *ftbw;
-  FTB_EXPR *ftbe;
-  FT_SEG_ITERATOR ftsi, ftsi2;
-  const byte *end;
-  my_off_t  docid=ftb->info->lastpos;
-
-  if (docid == HA_OFFSET_ERROR)
-    return -2.0;
-  if (!ftb->queue.elements)
-    return 0;
-
-  if (ftb->state != INDEX_SEARCH && docid <= ftb->lastpos)
-  {
-    FTB_EXPR *x;
-    uint i;
-
-    for (i=0; i < ftb->queue.elements; i++)
-    {
-      ftb->list[i]->docid[1]=HA_OFFSET_ERROR;
-      for (x=ftb->list[i]->up; x; x=x->up)
-        x->docid[1]=HA_OFFSET_ERROR;
-    }
-  }
-
-  ftb->lastpos=docid;
-
-  if (ftb->keynr==NO_SUCH_KEY)
-    _mi_ft_segiterator_dummy_init(record, length, &ftsi);
-  else
-    _mi_ft_segiterator_init(ftb->info, ftb->keynr, record, &ftsi);
-  memcpy(&ftsi2, &ftsi, sizeof(ftsi));
-
-  while (_mi_ft_segiterator(&ftsi))
-  {
-    if (!ftsi.pos)
-      continue;
-
-    end=ftsi.pos+ftsi.len;
-    while (ft_simple_get_word(ftb->charset, (byte **) &ftsi.pos,
-                              (byte *) end, &word, TRUE))
-    {
-      int a, b, c;
-      for (a=0, b=ftb->queue.elements, c=(a+b)/2; b-a>1; c=(a+b)/2)
-      {
-        ftbw=ftb->list[c];
-        if (mi_compare_text(ftb->charset, (uchar*) word.pos, word.len,
-                            (uchar*) ftbw->word+1, ftbw->len-1,
-                            (my_bool) (ftbw->flags&FTB_FLAG_TRUNC),0) >0)
-          b=c;
-        else
-          a=c;
-      }
-      for (; c>=0; c--)
-      {
-        ftbw=ftb->list[c];
-        if (mi_compare_text(ftb->charset, (uchar*) word.pos, word.len,
-                            (uchar*) ftbw->word+1,ftbw->len-1,
-                            (my_bool) (ftbw->flags&FTB_FLAG_TRUNC),0))
-          break;
-        if (ftbw->docid[1] == docid)
-          continue;
-        ftbw->docid[1]=docid;
-        _ftb_climb_the_tree(ftb, ftbw, &ftsi2);
-      }
-    }
-  }
-
-  ftbe=ftb->root;
-  if (ftbe->docid[1]==docid && ftbe->cur_weight>0 &&
-      ftbe->yesses>=ftbe->ythresh && !ftbe->nos)
-  { /* row matched ! */
-    return ftbe->cur_weight;
-  }
-  else
-  { /* match failed ! */
-    return 0.0;
-  }
-}
-
-
-void ft_boolean_close_search(FT_INFO *ftb)
-{
-  if (is_tree_inited(& ftb->no_dupes))
-  {
-    delete_tree(& ftb->no_dupes);
-  }
-  free_root(& ftb->mem_root, MYF(0));
-  my_free((gptr)ftb,MYF(0));
-}
-
-
-float ft_boolean_get_relevance(FT_INFO *ftb)
-{
-  return ftb->root->cur_weight;
-}
-
-
-void ft_boolean_reinit_search(FT_INFO *ftb)
-{
-  _ftb_init_index_search(ftb);
-}
-
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index f16f9d00f5f..269cdb1340d 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -809,8 +809,8 @@ sub executable_setup () {
     $exe_mysql=          mtr_exe_exists("$path_client_bindir/mysql");
     $exe_mysql_fix_system_tables=
       mtr_script_exists("$glob_basedir/scripts/mysql_fix_privilege_tables");
-    $path_ndb_tools_dir= mtr_path_exists("$glob_basedir/ndb/tools");
-    $exe_ndb_mgm=        "$glob_basedir/ndb/src/mgmclient/ndb_mgm";
+    $path_ndb_tools_dir= mtr_path_exists("$glob_basedir/storage/ndb/tools");
+    $exe_ndb_mgm=        "$glob_basedir/storage/ndb/src/mgmclient/ndb_mgm";
   }
   else
   {
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 081fec21563..4ca591452d2 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -583,8 +583,8 @@ if [ x$SOURCE_DIST = x1 ] ; then
  CHARSETSDIR="$BASEDIR/sql/share/charsets"
  INSTALL_DB="./install_test_db"
  MYSQL_FIX_SYSTEM_TABLES="$BASEDIR/scripts/mysql_fix_privilege_tables"
- NDB_TOOLS_DIR="$BASEDIR/ndb/tools"
- NDB_MGM="$BASEDIR/ndb/src/mgmclient/ndb_mgm"
+ NDB_TOOLS_DIR="$BASEDIR/storage/ndb/tools"
+ NDB_MGM="$BASEDIR/storage/ndb/src/mgmclient/ndb_mgm"
 
  if [ -n "$USE_PURIFY" ] ; then
    PSUP="$MYSQL_TEST_DIR/suppress.purify"
diff --git a/mysql-test/ndb/ndbcluster.sh b/mysql-test/ndb/ndbcluster.sh
index c09c013552e..e80c3594ee8 100644
--- a/mysql-test/ndb/ndbcluster.sh
+++ b/mysql-test/ndb/ndbcluster.sh
@@ -18,7 +18,7 @@ cd $CWD
 # Are we using a source or a binary distribution?
 if [ -d ../sql ] ; then
    SOURCE_DIST=1
-   ndbtop=$BASEDIR/ndb
+   ndbtop=$BASEDIR/storage/ndb
    exec_ndb=$ndbtop/src/kernel/ndbd
    exec_mgmtsrvr=$ndbtop/src/mgmsrv/ndb_mgmd
    exec_waiter=$ndbtop/tools/ndb_waiter
diff --git a/mysys/Makefile.am b/mysys/Makefile.am
index 4a35b9f9c39..41a8a3e647a 100644
--- a/mysys/Makefile.am
+++ b/mysys/Makefile.am
@@ -43,7 +43,7 @@ libmysys_a_SOURCES =    my_init.c my_getwd.c mf_getdate.c my_mmap.c \
 			mf_wcomp.c mf_wfile.c my_gethwaddr.c \
 			mf_qsort.c mf_qsort2.c mf_sort.c \
 			ptr_cmp.c mf_radix.c queues.c \
-			tree.c list.c hash.c array.c string.c typelib.c \
+			tree.c trie.c list.c hash.c array.c string.c typelib.c \
 			my_copy.c my_append.c my_lib.c \
 			my_delete.c my_rename.c my_redel.c my_tempnam.c \
 			my_chsize.c my_lread.c my_lwrite.c my_clock.c \
@@ -81,6 +81,9 @@ FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@
 # which automaticly removes the object files you use to compile a final program
 #
 
+test_bitmap$(EXEEXT): my_bitmap.c $(LIBRARIES)
+	$(LINK) $(FLAGS) -DMAIN  ./my_bitmap.c $(LDADD) $(LIBS)
+
 test_thr_alarm$(EXEEXT): thr_alarm.c $(LIBRARIES)
 	$(CP) $(srcdir)/thr_alarm.c ./test_thr_alarm.c
 	$(LINK) $(FLAGS) -DMAIN  ./test_thr_alarm.c $(LDADD) $(LIBS)
diff --git a/mysys/my_bitmap.c b/mysys/my_bitmap.c
index ba958b234d2..6cfabad1d3b 100644
--- a/mysys/my_bitmap.c
+++ b/mysys/my_bitmap.c
@@ -40,6 +40,50 @@
 #include <my_bitmap.h>
 #include <m_string.h>
 
+void create_last_word_mask(MY_BITMAP *map)
+{
+  /* Get the number of used bits (1..8) in the last byte */
+  unsigned int const used= 1U + ((map->n_bits-1U) & 0x7U);
+
+  /*
+   * Create a mask with the upper 'unused' bits set and the lower 'used'
+   * bits clear. The bits within each byte is stored in big-endian order.
+   */
+  unsigned char const mask= (~((1 << used) - 1)) & 255;
+
+  /*
+    The first bytes are to be set to zero since they represent real  bits
+    in the bitvector. The last bytes are set to 0xFF since they  represent
+    bytes not used by the bitvector. Finally the last byte contains  bits
+    as set by the mask above.
+  */
+  unsigned char *ptr= (unsigned char*)&map->last_word_mask;
+
+  map->last_word_ptr= map->bitmap + no_words_in_map(map)-1;
+  switch (no_bytes_in_map(map)&3)
+  {
+  case 1:
+    map->last_word_mask= ~0U;
+    ptr[0]= mask;
+    return;
+
+  case 2:
+    map->last_word_mask= ~0U;
+    ptr[0]= 0;
+    ptr[1]= mask;
+    return;
+  case 3:
+    map->last_word_mask= 0U;
+    ptr[2]= mask;
+    ptr[3]= 0xFFU;
+    return;
+  case 0:
+    map->last_word_mask= 0U;
+    ptr[3]= mask;
+    return;
+  }
+}
+
 static inline void bitmap_lock(MY_BITMAP *map)
 {
 #ifdef THREAD
@@ -57,29 +101,39 @@ static inline void bitmap_unlock(MY_BITMAP *map)
 }
 
 
-my_bool bitmap_init(MY_BITMAP *map, uchar *buf, uint bitmap_size,
+my_bool bitmap_init(MY_BITMAP *map, uint32 *buf, uint n_bits,
 		    my_bool thread_safe)
 {
   DBUG_ENTER("bitmap_init");
-
-  DBUG_ASSERT((bitmap_size & 7) == 0);
-  bitmap_size/=8;
-  if (!(map->bitmap=buf) &&
-      !(map->bitmap= (uchar*) my_malloc(bitmap_size +
-					(thread_safe ?
-					 sizeof(pthread_mutex_t) : 0),
-					MYF(MY_WME | MY_ZEROFILL))))
-    return 1;
-  map->bitmap_size=bitmap_size;
+  DBUG_ASSERT(n_bits > 0);
+  if (!buf)
+  {
+    uint size_in_bytes= ((n_bits+31)/32)*4
+#ifdef THREAD
+      +(thread_safe ? sizeof(pthread_mutex_t) : 0)
+#endif
+    ;
+    if (!(buf= (uint32*) my_malloc(size_in_bytes, MYF(MY_WME))))
+      return 1;
+  }
+#ifdef THREAD
+  else
+    DBUG_ASSERT(thread_safe == 0);
+#endif
 #ifdef THREAD
   if (thread_safe)
   {
-    map->mutex=(pthread_mutex_t *)(map->bitmap+bitmap_size);
+    map->mutex=(pthread_mutex_t *)buf;
     pthread_mutex_init(map->mutex, MY_MUTEX_INIT_FAST);
+    buf+= sizeof(pthread_mutex_t)/4;
   }
   else
     map->mutex=0;
 #endif
+  map->bitmap= buf;
+  map->n_bits=n_bits;
+  create_last_word_mask(map);
+  bitmap_clear_all(map);
   DBUG_RETURN(0);
 }
 
@@ -90,25 +144,21 @@ void bitmap_free(MY_BITMAP *map)
   if (map->bitmap)
   {
 #ifdef THREAD
-    if (map->mutex)
+    char *buf= (char *)map->mutex;
+    if (buf)
       pthread_mutex_destroy(map->mutex);
-#endif
+    else
+      buf=(char*) map->bitmap;
+    my_free(buf, MYF(0));
+#else
     my_free((char*) map->bitmap, MYF(0));
+#endif
     map->bitmap=0;
   }
   DBUG_VOID_RETURN;
 }
 
 
-void bitmap_set_bit(MY_BITMAP *map, uint bitmap_bit)
-{
-  DBUG_ASSERT(map->bitmap && bitmap_bit < map->bitmap_size*8);
-  bitmap_lock(map);
-  bitmap_fast_set_bit(map, bitmap_bit);
-  bitmap_unlock(map);
-}
-
-
 /*
   test if bit already set and set it if it was not (thread unsafe method)
 
@@ -156,173 +206,113 @@ my_bool bitmap_test_and_set(MY_BITMAP *map, uint bitmap_bit)
 
 uint bitmap_set_next(MY_BITMAP *map)
 {
-  uchar *bitmap=map->bitmap;
-  uint bit_found = MY_BIT_NONE;
-  uint bitmap_size=map->bitmap_size*8;
-  uint i;
-
+  uint bit_found;
   DBUG_ASSERT(map->bitmap);
-  bitmap_lock(map);
-  for (i=0; i < bitmap_size ; i++, bitmap++)
-  {
-    if (*bitmap != 0xff)
-    {						/* Found slot with free bit */
-      uint b;
-      for (b=0; ; b++)
-      {
-	if (!(*bitmap & (1 << b)))
-	{
-	  *bitmap |= 1<<b;
-	  bit_found = (i*8)+b;
-	  break;
-	}
-      }
-      break;					/* Found bit */
-    }
-  }
-  bitmap_unlock(map);
+  if ((bit_found= bitmap_get_first(map)) != MY_BIT_NONE)
+    bitmap_set_bit(map, bit_found);
   return bit_found;
 }
 
 
-void bitmap_clear_bit(MY_BITMAP *map, uint bitmap_bit)
-{
-  DBUG_ASSERT(map->bitmap && bitmap_bit < map->bitmap_size*8);
-  bitmap_lock(map);
-  bitmap_fast_clear_bit(map, bitmap_bit);
-  bitmap_unlock(map);
-}
-
-
 void bitmap_set_prefix(MY_BITMAP *map, uint prefix_size)
 {
-  uint prefix_bytes, prefix_bits;
+  uint prefix_bytes, prefix_bits, d;
+  uchar *m= (uchar *)map->bitmap;
 
   DBUG_ASSERT(map->bitmap &&
-	      (prefix_size <= map->bitmap_size*8 || prefix_size == (uint) ~0));
-  bitmap_lock(map);
-  set_if_smaller(prefix_size, map->bitmap_size*8);
+	      (prefix_size <= map->n_bits || prefix_size == (uint) ~0));
+  set_if_smaller(prefix_size, map->n_bits);
   if ((prefix_bytes= prefix_size / 8))
-    memset(map->bitmap, 0xff, prefix_bytes);
+    memset(m, 0xff, prefix_bytes);
+  m+= prefix_bytes;
   if ((prefix_bits= prefix_size & 7))
-    map->bitmap[prefix_bytes++]= (1 << prefix_bits)-1;
-  if (prefix_bytes < map->bitmap_size)
-    bzero(map->bitmap+prefix_bytes, map->bitmap_size-prefix_bytes);
-  bitmap_unlock(map);
-}
-
-
-void bitmap_clear_all(MY_BITMAP *map)
-{
-  bitmap_set_prefix(map, 0);
-}
-
-
-void bitmap_set_all(MY_BITMAP *map)
-{
-  bitmap_set_prefix(map, ~0);
+    *m++= (1 << prefix_bits)-1;
+  if ((d= no_bytes_in_map(map)-prefix_bytes))
+    bzero(m, d);
+  *map->last_word_ptr|= map->last_word_mask; /*Set last bits*/
 }
 
 
 my_bool bitmap_is_prefix(const MY_BITMAP *map, uint prefix_size)
 {
-  uint prefix_bits= prefix_size & 7, res= 0;
-  uchar *m= map->bitmap, *end_prefix= map->bitmap+prefix_size/8,
-        *end= map->bitmap+map->bitmap_size;
-
-  DBUG_ASSERT(map->bitmap && prefix_size <= map->bitmap_size*8);
+  uint prefix_bits= prefix_size & 0x7, res;
+  uchar *m= (uchar*)map->bitmap;
+  uchar *end_prefix= m+prefix_size/8;
+  uchar *end;
+  DBUG_ASSERT(m && prefix_size <= map->n_bits);
+  end= m+no_bytes_in_map(map);
 
-  bitmap_lock((MY_BITMAP *)map);
   while (m < end_prefix)
     if (*m++ != 0xff)
-      goto ret;
+      return 0;
 
+  *map->last_word_ptr^= map->last_word_mask; /*Clear bits*/
+  res= 0;
   if (prefix_bits && *m++ != (1 << prefix_bits)-1)
     goto ret;
 
   while (m < end)
     if (*m++ != 0)
       goto ret;
-
-  res=1;
+  res= 1;
 ret:
-  bitmap_unlock((MY_BITMAP *)map);
-  return res;
+  *map->last_word_ptr|= map->last_word_mask; /*Set bits again*/
+  return res; 
 }
 
 
-my_bool bitmap_is_clear_all(const MY_BITMAP *map)
-{
-  return bitmap_is_prefix(map, 0);
-}
-
 my_bool bitmap_is_set_all(const MY_BITMAP *map)
 {
-  return bitmap_is_prefix(map, map->bitmap_size*8);
+  uint32 *data_ptr= map->bitmap;
+  uint32 *end= map->last_word_ptr;
+  for (; data_ptr <= end; data_ptr++)
+    if (*data_ptr != 0xFFFFFFFF)
+      return FALSE;
+  return TRUE;
 }
 
 
-my_bool bitmap_is_set(const MY_BITMAP *map, uint bitmap_bit)
+my_bool bitmap_is_clear_all(const MY_BITMAP *map)
 {
-  DBUG_ASSERT(map->bitmap && bitmap_bit < map->bitmap_size*8);
-  return bitmap_fast_is_set(map, bitmap_bit);
+  uint32 *data_ptr= map->bitmap;
+  uint32 *end;
+  if (*map->last_word_ptr != map->last_word_mask)
+    return FALSE;
+  end= map->last_word_ptr;
+  for (; data_ptr < end; data_ptr++)
+    if (*data_ptr)
+      return FALSE;
+  return TRUE;
 }
 
 
 my_bool bitmap_is_subset(const MY_BITMAP *map1, const MY_BITMAP *map2)
 {
-  uint res=0;
-  uchar *m1=map1->bitmap, *m2=map2->bitmap, *end;
+  uint32 *m1= map1->bitmap, *m2= map2->bitmap, *end;
 
   DBUG_ASSERT(map1->bitmap && map2->bitmap &&
-              map1->bitmap_size==map2->bitmap_size);
-  bitmap_lock((MY_BITMAP *)map1);
-  bitmap_lock((MY_BITMAP *)map2);
+              map1->n_bits==map2->n_bits);
 
-  end= m1+map1->bitmap_size;
+  end= map1->last_word_ptr;
 
-  while (m1 < end)
+  while (m1 <= end)
   {
     if ((*m1++) & ~(*m2++))
-      goto ret;
+      return 0;
   }
-
-  res=1;
-ret:
-  bitmap_unlock((MY_BITMAP *)map2);
-  bitmap_unlock((MY_BITMAP *)map1);
-  return res;
-}
-
-
-my_bool bitmap_cmp(const MY_BITMAP *map1, const MY_BITMAP *map2)
-{
-  uint res;
-
-  DBUG_ASSERT(map1->bitmap && map2->bitmap &&
-              map1->bitmap_size==map2->bitmap_size);
-  bitmap_lock((MY_BITMAP *)map1);
-  bitmap_lock((MY_BITMAP *)map2);
-
-  res= memcmp(map1->bitmap, map2->bitmap, map1->bitmap_size)==0;
-
-  bitmap_unlock((MY_BITMAP *)map2);
-  bitmap_unlock((MY_BITMAP *)map1);
-  return res;
+  return 1;
 }
 
 
 void bitmap_intersect(MY_BITMAP *map, const MY_BITMAP *map2)
 {
-  uchar *to=map->bitmap, *from=map2->bitmap, *end;
-  uint len=map->bitmap_size, len2=map2->bitmap_size;
+  uint32 *to= map->bitmap, *from= map2->bitmap, *end;
+  uint len= no_words_in_map(map), len2 = no_words_in_map(map2);
 
   DBUG_ASSERT(map->bitmap && map2->bitmap);
-  bitmap_lock(map);
-  bitmap_lock((MY_BITMAP *)map2);
 
   end= to+min(len,len2);
-
+  *map2->last_word_ptr^= map2->last_word_mask; /*Clear last bits in map2*/
   while (to < end)
     *to++ &= *from++;
 
@@ -332,45 +322,288 @@ void bitmap_intersect(MY_BITMAP *map, const MY_BITMAP *map2)
     while (to < end)
       *to++=0;
   }
-
-  bitmap_unlock((MY_BITMAP *)map2);
-  bitmap_unlock(map);
+  *map2->last_word_ptr|= map2->last_word_mask; /*Set last bits in map*/
+  *map->last_word_ptr|= map->last_word_mask;   /*Set last bits in map2*/
 }
 
 
 void bitmap_subtract(MY_BITMAP *map, const MY_BITMAP *map2)
 {
-  uchar *to=map->bitmap, *from=map2->bitmap, *end;
+  uint32 *to= map->bitmap, *from= map2->bitmap, *end;
 
   DBUG_ASSERT(map->bitmap && map2->bitmap &&
-              map->bitmap_size==map2->bitmap_size);
-  bitmap_lock(map);
-  bitmap_lock((MY_BITMAP *)map2);
+              map->n_bits==map2->n_bits);
 
-  end= to+map->bitmap_size;
+  end= map->last_word_ptr;
 
-  while (to < end)
+  while (to <= end)
     *to++ &= ~(*from++);
-
-  bitmap_unlock((MY_BITMAP *)map2);
-  bitmap_unlock(map);
+  *map->last_word_ptr|= map->last_word_mask; /*Set last bits again*/
 }
 
 
 void bitmap_union(MY_BITMAP *map, const MY_BITMAP *map2)
 {
-  uchar *to=map->bitmap, *from=map2->bitmap, *end;
+  uint32 *to= map->bitmap, *from= map2->bitmap, *end;
+
+  DBUG_ASSERT(map->bitmap && map2->bitmap &&
+              map->n_bits==map2->n_bits);
+  end= map->last_word_ptr;
+
+  while (to <= end)
+    *to++ |= *from++;
+}
+
 
+void bitmap_xor(MY_BITMAP *map, const MY_BITMAP *map2)
+{
+  uint32 *to= map->bitmap, *from= map2->bitmap, *end= map->last_word_ptr;
   DBUG_ASSERT(map->bitmap && map2->bitmap &&
-              map->bitmap_size==map2->bitmap_size);
+              map->n_bits==map2->n_bits);
+  while (to <= end)
+    *to++ ^= *from++;
+  *map->last_word_ptr|= map->last_word_mask; /*Set last bits again*/
+}
+
+
+void bitmap_invert(MY_BITMAP *map)
+{
+  uint32 *to= map->bitmap, *end;
+
+  DBUG_ASSERT(map->bitmap);
+  end= map->last_word_ptr;
+
+  while (to <= end)
+    *to++ ^= 0xFFFFFFFF;
+  *map->last_word_ptr|= map->last_word_mask; /*Set last bits again*/
+}
+
+
+uint bitmap_bits_set(const MY_BITMAP *map)
+{  
+  uchar *m= (uchar*)map->bitmap;
+  uchar *end= m + no_bytes_in_map(map);
+  uint res= 0;
+
+  DBUG_ASSERT(map->bitmap);
+  *map->last_word_ptr^=map->last_word_mask; /*Reset last bits to zero*/
+  while (m < end)
+    res+= my_count_bits_ushort(*m++);
+  *map->last_word_ptr^=map->last_word_mask; /*Set last bits to one again*/
+  return res;
+}
+
+uint bitmap_get_first_set(const MY_BITMAP *map)
+{
+  uchar *byte_ptr;
+  uint bit_found,i,j,k;
+  uint32 *data_ptr, *end= map->last_word_ptr;
+
+  DBUG_ASSERT(map->bitmap);
+  data_ptr= map->bitmap;
+  for (i=0; data_ptr <= end; data_ptr++, i++)
+  {
+    if (*data_ptr)
+    {
+      byte_ptr= (uchar*)data_ptr;
+      for (j=0; ; j++, byte_ptr++)
+      {
+        if (*byte_ptr)
+        {
+          for (k=0; ; k++)
+          {
+            if (*byte_ptr & (1 << k))
+            {
+              bit_found= (i*32) + (j*8) + k;
+              if (bit_found == map->n_bits)
+                return MY_BIT_NONE;
+              return bit_found;
+            }
+          }
+          DBUG_ASSERT(1);
+        }
+      }
+      DBUG_ASSERT(1);
+    }
+  }
+  return MY_BIT_NONE;
+}
+
+
+uint bitmap_get_first(const MY_BITMAP *map)
+{
+  uchar *byte_ptr;
+  uint bit_found= MY_BIT_NONE, i,j,k;
+  uint32 *data_ptr, *end= map->last_word_ptr;
+
+  DBUG_ASSERT(map->bitmap);
+  data_ptr= map->bitmap;
+  for (i=0; data_ptr <= end; data_ptr++, i++)
+  {
+    if (*data_ptr != 0xFFFFFFFF)
+    {
+      byte_ptr= (uchar*)data_ptr;
+      for (j=0; ; j++, byte_ptr++)
+      { 
+        if (*byte_ptr != 0xFF)
+        {
+          for (k=0; ; k++)
+          {
+            if (!(*byte_ptr & (1 << k)))
+            {
+              bit_found= (i*32) + (j*8) + k;
+              if (bit_found == map->n_bits)
+                return MY_BIT_NONE;
+              return bit_found;
+            }
+          }
+          DBUG_ASSERT(1);
+        }
+      }
+      DBUG_ASSERT(1);
+    }
+  }
+  return MY_BIT_NONE;
+}
+
+
+uint bitmap_lock_set_next(MY_BITMAP *map)
+{
+  uint bit_found;
+  bitmap_lock(map);
+  bit_found= bitmap_set_next(map);
+  bitmap_unlock(map);
+  return bit_found;
+}
+
+
+void bitmap_lock_clear_bit(MY_BITMAP *map, uint bitmap_bit)
+{
+  bitmap_lock(map);
+  DBUG_ASSERT(map->bitmap && bitmap_bit < map->n_bits);
+  bitmap_clear_bit(map, bitmap_bit);
+  bitmap_unlock(map);
+}
+
+
+#ifdef NOT_USED
+my_bool bitmap_lock_is_prefix(const MY_BITMAP *map, uint prefix_size)
+{
+  my_bool res;
+  bitmap_lock((MY_BITMAP *)map);
+  res= bitmap_is_prefix(map, prefix_size);
+  bitmap_unlock((MY_BITMAP *)map);
+  return res;
+}
+
+
+void bitmap_lock_set_all(MY_BITMAP *map)
+{
+  bitmap_lock(map);
+  bitmap_set_all(map);
+  bitmap_unlock(map);
+}
+
+
+void bitmap_lock_clear_all(MY_BITMAP *map)
+{
+  bitmap_lock(map);
+  bitmap_clear_all(map);
+  bitmap_unlock(map);
+}
+
+
+void bitmap_lock_set_prefix(MY_BITMAP *map, uint prefix_size)
+{
   bitmap_lock(map);
+  bitmap_set_prefix(map, prefix_size);
+  bitmap_unlock(map);
+}
+
+
+my_bool bitmap_lock_is_clear_all(const MY_BITMAP *map)
+{
+  uint res;
+  bitmap_lock((MY_BITMAP *)map);
+  res= bitmap_is_clear_all(map);
+  bitmap_unlock((MY_BITMAP *)map);
+  return res;
+}
+
+
+my_bool bitmap_lock_is_set_all(const MY_BITMAP *map)
+{
+  uint res;
+  bitmap_lock((MY_BITMAP *)map);
+  res= bitmap_is_set_all(map);
+  bitmap_unlock((MY_BITMAP *)map);
+  return res;
+}
+
+
+my_bool bitmap_lock_is_set(const MY_BITMAP *map, uint bitmap_bit)
+{
+  my_bool res;
+  DBUG_ASSERT(map->bitmap && bitmap_bit < map->n_bits);
+  bitmap_lock((MY_BITMAP *)map);
+  res= bitmap_is_set(map, bitmap_bit);
+  bitmap_unlock((MY_BITMAP *)map);
+  return res;
+}
+
+
+my_bool bitmap_lock_is_subset(const MY_BITMAP *map1, const MY_BITMAP *map2)
+{
+  uint res;
+  bitmap_lock((MY_BITMAP *)map1);
   bitmap_lock((MY_BITMAP *)map2);
+  res= bitmap_is_subset(map1, map2);
+  bitmap_unlock((MY_BITMAP *)map2);
+  bitmap_unlock((MY_BITMAP *)map1);
+  return res;
+}
 
-  end= to+map->bitmap_size;
 
-  while (to < end)
-    *to++ |= *from++;
+my_bool bitmap_lock_cmp(const MY_BITMAP *map1, const MY_BITMAP *map2)
+{
+  uint res;
 
+  DBUG_ASSERT(map1->bitmap && map2->bitmap &&
+              map1->n_bits==map2->n_bits);
+  bitmap_lock((MY_BITMAP *)map1);
+  bitmap_lock((MY_BITMAP *)map2);
+  res= bitmap_cmp(map1, map2);
+  bitmap_unlock((MY_BITMAP *)map2);
+  bitmap_unlock((MY_BITMAP *)map1);
+  return res;
+}
+
+
+void bitmap_lock_intersect(MY_BITMAP *map, const MY_BITMAP *map2)
+{
+  bitmap_lock(map);
+  bitmap_lock((MY_BITMAP *)map2);
+  bitmap_intersect(map, map2);
+  bitmap_unlock((MY_BITMAP *)map2);
+  bitmap_unlock(map);
+}
+
+
+void bitmap_lock_subtract(MY_BITMAP *map, const MY_BITMAP *map2)
+{
+  bitmap_lock(map);
+  bitmap_lock((MY_BITMAP *)map2);
+  bitmap_subtract(map, map2);
+  bitmap_unlock((MY_BITMAP *)map2);
+  bitmap_unlock(map);
+}
+
+
+void bitmap_lock_union(MY_BITMAP *map, const MY_BITMAP *map2)
+{
+  bitmap_lock(map);
+  bitmap_lock((MY_BITMAP *)map2);
+  bitmap_union(map, map2);
   bitmap_unlock((MY_BITMAP *)map2);
   bitmap_unlock(map);
 }
@@ -383,19 +616,12 @@ void bitmap_union(MY_BITMAP *map, const MY_BITMAP *map2)
   RETURN
     Number of set bits in the bitmap.
 */
-
-uint bitmap_bits_set(const MY_BITMAP *map)
-{  
-  uchar *m= map->bitmap;
-  uchar *end= m + map->bitmap_size;
-  uint res= 0;
-
-  DBUG_ASSERT(map->bitmap);
+uint bitmap_lock_bits_set(const MY_BITMAP *map)
+{
+  uint res;
   bitmap_lock((MY_BITMAP *)map);
-  while (m < end)
-  {
-    res+= my_count_bits_ushort(*m++);
-  }
+  DBUG_ASSERT(map->bitmap);
+  res= bitmap_bits_set(map);
   bitmap_unlock((MY_BITMAP *)map);
   return res;
 }
@@ -408,33 +634,429 @@ uint bitmap_bits_set(const MY_BITMAP *map)
   RETURN 
     Number of first unset bit in the bitmap or MY_BIT_NONE if all bits are set.
 */
+uint bitmap_lock_get_first(const MY_BITMAP *map)
+{
+  uint res;
+  bitmap_lock((MY_BITMAP*)map);
+  res= bitmap_get_first(map);
+  bitmap_unlock((MY_BITMAP*)map);
+  return res;
+}
 
-uint bitmap_get_first(const MY_BITMAP *map)
+
+uint bitmap_lock_get_first_set(const MY_BITMAP *map)
+{
+  uint res;
+  bitmap_lock((MY_BITMAP*)map);
+  res= bitmap_get_first_set(map);
+  bitmap_unlock((MY_BITMAP*)map);
+  return res;
+}
+
+
+void bitmap_lock_set_bit(MY_BITMAP *map, uint bitmap_bit)
+{
+  DBUG_ASSERT(map->bitmap && bitmap_bit < map->n_bits);
+  bitmap_lock(map);
+  bitmap_set_bit(map, bitmap_bit);
+  bitmap_unlock(map);
+}
+
+
+void bitmap_lock_flip_bit(MY_BITMAP *map, uint bitmap_bit)
+{
+  DBUG_ASSERT(map->bitmap && bitmap_bit < map->n_bits);
+  bitmap_lock(map);
+  bitmap_flip_bit(map, bitmap_bit);
+  bitmap_unlock(map);
+}
+#endif
+#ifdef MAIN
+
+static void bitmap_print(MY_BITMAP *map)
+{
+  uint32 *to= map->bitmap, *end= map->last_word_ptr;
+  while (to <= end)
+  {
+    fprintf(stderr,"0x%x ", *to++);
+  }
+  fprintf(stderr,"\n");    
+}
+
+uint get_rand_bit(uint bitsize)
+{
+  return (rand() % bitsize);
+}
+
+bool test_set_get_clear_bit(MY_BITMAP *map, uint bitsize)
+{
+  uint i, test_bit;
+  uint no_loops= bitsize > 128 ? 128 : bitsize;
+  for (i=0; i < no_loops; i++)
+  {
+    test_bit= get_rand_bit(bitsize);
+    bitmap_set_bit(map, test_bit);
+    if (!bitmap_is_set(map, test_bit))
+      goto error1;
+    bitmap_clear_bit(map, test_bit);
+    if (bitmap_is_set(map, test_bit))
+      goto error2;
+  }
+  return FALSE;
+error1:
+  printf("Error in set bit, bit %u, bitsize = %u", test_bit, bitsize);
+  return TRUE;
+error2:
+  printf("Error in clear bit, bit %u, bitsize = %u", test_bit, bitsize);
+  return TRUE;
+}
+
+bool test_flip_bit(MY_BITMAP *map, uint bitsize)
+{
+  uint i, test_bit;
+  uint no_loops= bitsize > 128 ? 128 : bitsize;
+  for (i=0; i < no_loops; i++)
+  {
+    test_bit= get_rand_bit(bitsize);
+    bitmap_flip_bit(map, test_bit);
+    if (!bitmap_is_set(map, test_bit))
+      goto error1;
+    bitmap_flip_bit(map, test_bit);
+    if (bitmap_is_set(map, test_bit))
+      goto error2;
+  }
+  return FALSE;
+error1:
+  printf("Error in flip bit 1, bit %u, bitsize = %u", test_bit, bitsize);
+  return TRUE;
+error2:
+  printf("Error in flip bit 2, bit %u, bitsize = %u", test_bit, bitsize);
+  return TRUE;
+}
+
+bool test_operators(MY_BITMAP *map, uint bitsize)
+{
+  return FALSE;
+}
+
+bool test_get_all_bits(MY_BITMAP *map, uint bitsize)
 {
-  uchar *bitmap=map->bitmap;
-  uint bit_found = MY_BIT_NONE;
-  uint bitmap_size=map->bitmap_size*8;
   uint i;
+  bitmap_set_all(map);
+  if (!bitmap_is_set_all(map))
+    goto error1;
+  if (!bitmap_is_prefix(map, bitsize))
+    goto error5;
+  bitmap_clear_all(map);
+  if (!bitmap_is_clear_all(map))
+    goto error2;
+  if (!bitmap_is_prefix(map, 0))
+    goto error6;
+  for (i=0; i<bitsize;i++)
+    bitmap_set_bit(map, i);
+  if (!bitmap_is_set_all(map))
+    goto error3;
+  for (i=0; i<bitsize;i++)
+    bitmap_clear_bit(map, i);
+  if (!bitmap_is_clear_all(map))
+    goto error4;
+  return FALSE;
+error1:
+  printf("Error in set_all, bitsize = %u", bitsize);
+  return TRUE;
+error2:
+  printf("Error in clear_all, bitsize = %u", bitsize);
+  return TRUE;
+error3:
+  printf("Error in bitmap_is_set_all, bitsize = %u", bitsize);
+  return TRUE;
+error4:
+  printf("Error in bitmap_is_clear_all, bitsize = %u", bitsize);
+  return TRUE;
+error5:
+  printf("Error in set_all through set_prefix, bitsize = %u", bitsize);
+  return TRUE;
+error6:
+  printf("Error in clear_all through set_prefix, bitsize = %u", bitsize);
+  return TRUE;
+}
 
-  DBUG_ASSERT(map->bitmap);
-  bitmap_lock((MY_BITMAP *)map);
-  for (i=0; i < bitmap_size ; i++, bitmap++)
+bool test_compare_operators(MY_BITMAP *map, uint bitsize)
+{
+  uint i, j, test_bit1, test_bit2, test_bit3,test_bit4;
+  uint no_loops= bitsize > 128 ? 128 : bitsize;
+  MY_BITMAP map2_obj, map3_obj;
+  MY_BITMAP *map2= &map2_obj, *map3= &map3_obj;
+  uint32 map2buf[1024];
+  uint32 map3buf[1024];
+  bitmap_init(&map2_obj, map2buf, bitsize, FALSE);
+  bitmap_init(&map3_obj, map3buf, bitsize, FALSE);
+  bitmap_clear_all(map2);
+  bitmap_clear_all(map3);
+  for (i=0; i < no_loops; i++)
   {
-    if (*bitmap != 0xff)
-    {						/* Found slot with free bit */
-      uint b;
-      for (b=0; ; b++)
-      {
-	if (!(*bitmap & (1 << b)))
-	{
-	  bit_found = (i*8)+b;
-	  break;
-	}
-      }
-      break;					/* Found bit */
+    test_bit1=get_rand_bit(bitsize);
+    bitmap_set_prefix(map, test_bit1);
+    test_bit2=get_rand_bit(bitsize);
+    bitmap_set_prefix(map2, test_bit2);
+    bitmap_intersect(map, map2);
+    test_bit3= test_bit2 < test_bit1 ? test_bit2 : test_bit1;
+    bitmap_set_prefix(map3, test_bit3);
+    if (!bitmap_cmp(map, map3))
+      goto error1;
+    bitmap_clear_all(map);
+    bitmap_clear_all(map2);
+    bitmap_clear_all(map3);
+    test_bit1=get_rand_bit(bitsize);
+    test_bit2=get_rand_bit(bitsize);
+    test_bit3=get_rand_bit(bitsize);
+    bitmap_set_prefix(map, test_bit1);
+    bitmap_set_prefix(map2, test_bit2);
+    test_bit3= test_bit2 > test_bit1 ? test_bit2 : test_bit1;
+    bitmap_set_prefix(map3, test_bit3);
+    bitmap_union(map, map2);
+    if (!bitmap_cmp(map, map3))
+      goto error2;
+    bitmap_clear_all(map);
+    bitmap_clear_all(map2);
+    bitmap_clear_all(map3);
+    test_bit1=get_rand_bit(bitsize);
+    test_bit2=get_rand_bit(bitsize);
+    test_bit3=get_rand_bit(bitsize);
+    bitmap_set_prefix(map, test_bit1);
+    bitmap_set_prefix(map2, test_bit2);
+    bitmap_xor(map, map2);
+    test_bit3= test_bit2 > test_bit1 ? test_bit2 : test_bit1;
+    test_bit4= test_bit2 < test_bit1 ? test_bit2 : test_bit1;
+    bitmap_set_prefix(map3, test_bit3);
+    for (j=0; j < test_bit4; j++)
+      bitmap_clear_bit(map3, j);
+    if (!bitmap_cmp(map, map3))
+      goto error3;
+    bitmap_clear_all(map);
+    bitmap_clear_all(map2);
+    bitmap_clear_all(map3);
+    test_bit1=get_rand_bit(bitsize);
+    test_bit2=get_rand_bit(bitsize);
+    test_bit3=get_rand_bit(bitsize);
+    bitmap_set_prefix(map, test_bit1);
+    bitmap_set_prefix(map2, test_bit2);
+    bitmap_subtract(map, map2);
+    if (test_bit2 < test_bit1)
+    {
+      bitmap_set_prefix(map3, test_bit1);
+      for (j=0; j < test_bit2; j++)
+        bitmap_clear_bit(map3, j);
     }
+    if (!bitmap_cmp(map, map3))
+      goto error4;
+    bitmap_clear_all(map);
+    bitmap_clear_all(map2);
+    bitmap_clear_all(map3);
+    test_bit1=get_rand_bit(bitsize);
+    bitmap_set_prefix(map, test_bit1);
+    bitmap_invert(map);
+    bitmap_set_all(map3);
+    for (j=0; j < test_bit1; j++)
+      bitmap_clear_bit(map3, j);
+    if (!bitmap_cmp(map, map3))
+      goto error5;
+    bitmap_clear_all(map);
+    bitmap_clear_all(map3);
   }
-  bitmap_unlock((MY_BITMAP *)map);
-  return bit_found;
+  return FALSE;
+error1:
+  printf("intersect error  bitsize=%u,size1=%u,size2=%u", bitsize,
+  test_bit1,test_bit2);
+  return TRUE;
+error2:
+  printf("union error  bitsize=%u,size1=%u,size2=%u", bitsize,
+  test_bit1,test_bit2);
+  return TRUE;
+error3:
+  printf("xor error  bitsize=%u,size1=%u,size2=%u", bitsize,
+  test_bit1,test_bit2);
+  return TRUE;
+error4:
+  printf("subtract error  bitsize=%u,size1=%u,size2=%u", bitsize,
+  test_bit1,test_bit2);
+  return TRUE;
+error5:
+  printf("invert error  bitsize=%u,size=%u", bitsize,
+  test_bit1);
+  return TRUE;
+}
+
+bool test_count_bits_set(MY_BITMAP *map, uint bitsize)
+{
+  uint i, bit_count=0, test_bit;
+  uint no_loops= bitsize > 128 ? 128 : bitsize;
+  for (i=0; i < no_loops; i++)
+  {
+    test_bit=get_rand_bit(bitsize);
+    if (!bitmap_is_set(map, test_bit))
+    {
+      bitmap_set_bit(map, test_bit);
+      bit_count++;
+    }
+  }
+  if (bit_count==0 && bitsize > 0)
+    goto error1;
+  if (bitmap_bits_set(map) != bit_count)
+    goto error2;
+  return FALSE;
+error1:
+  printf("No bits set  bitsize = %u", bitsize);
+  return TRUE;
+error2:
+  printf("Wrong count of bits set, bitsize = %u", bitsize);
+  return TRUE;
 }
 
+bool test_get_first_bit(MY_BITMAP *map, uint bitsize)
+{
+  uint i, j, test_bit;
+  uint no_loops= bitsize > 128 ? 128 : bitsize;
+  for (i=0; i < no_loops; i++)
+  {
+    test_bit=get_rand_bit(bitsize);
+    bitmap_set_bit(map, test_bit);
+    if (bitmap_get_first_set(map) != test_bit)
+      goto error1;
+    bitmap_set_all(map);
+    bitmap_clear_bit(map, test_bit);
+    if (bitmap_get_first(map) != test_bit)
+      goto error2;
+    bitmap_clear_all(map);
+  }
+  return FALSE;
+error1:
+  printf("get_first_set error bitsize=%u,prefix_size=%u",bitsize,test_bit);
+  return TRUE;
+error2:
+  printf("get_first error bitsize= %u, prefix_size= %u",bitsize,test_bit);
+  return TRUE;
+}
+
+bool test_get_next_bit(MY_BITMAP *map, uint bitsize)
+{
+  uint i, j, test_bit;
+  uint no_loops= bitsize > 128 ? 128 : bitsize;
+  for (i=0; i < no_loops; i++)
+  {
+    test_bit=get_rand_bit(bitsize);
+    for (j=0; j < test_bit; j++)
+      bitmap_set_next(map);
+    if (!bitmap_is_prefix(map, test_bit))
+      goto error1;
+    bitmap_clear_all(map);
+  }
+  return FALSE;
+error1:
+  printf("get_next error  bitsize= %u, prefix_size= %u", bitsize,test_bit);
+  return TRUE;
+}
+
+bool test_prefix(MY_BITMAP *map, uint bitsize)
+{
+  uint i, j, test_bit;
+  uint no_loops= bitsize > 128 ? 128 : bitsize;
+  for (i=0; i < no_loops; i++)
+  {
+    test_bit=get_rand_bit(bitsize);
+    bitmap_set_prefix(map, test_bit);
+    if (!bitmap_is_prefix(map, test_bit))
+      goto error1;
+    bitmap_clear_all(map);
+    for (j=0; j < test_bit; j++)
+      bitmap_set_bit(map, j);
+    if (!bitmap_is_prefix(map, test_bit))
+      goto error2;
+    bitmap_set_all(map);
+    for (j=bitsize - 1; ~(j-test_bit); j--)
+      bitmap_clear_bit(map, j);
+    if (!bitmap_is_prefix(map, test_bit))
+      goto error3;
+    bitmap_clear_all(map);
+  }
+  return FALSE;
+error1:
+  printf("prefix1 error  bitsize = %u, prefix_size = %u", bitsize,test_bit);
+  return TRUE;
+error2:
+  printf("prefix2 error  bitsize = %u, prefix_size = %u", bitsize,test_bit);
+  return TRUE;
+error3:
+  printf("prefix3 error  bitsize = %u, prefix_size = %u", bitsize,test_bit);
+  return TRUE;
+}
+
+
+bool do_test(uint bitsize)
+{
+  MY_BITMAP map;
+  uint32 buf[1024];
+  if (bitmap_init(&map, buf, bitsize, FALSE))
+  {
+    printf("init error for bitsize %d", bitsize);
+    goto error;
+  }
+  if (test_set_get_clear_bit(&map,bitsize))
+    goto error;
+  bitmap_clear_all(&map);
+  if (test_flip_bit(&map,bitsize))
+    goto error;
+  bitmap_clear_all(&map);
+  if (test_operators(&map,bitsize))
+    goto error;
+  bitmap_clear_all(&map);
+  if (test_get_all_bits(&map, bitsize))
+    goto error;
+  bitmap_clear_all(&map);
+  if (test_compare_operators(&map,bitsize))
+    goto error;
+  bitmap_clear_all(&map);
+  if (test_count_bits_set(&map,bitsize))
+    goto error;
+  bitmap_clear_all(&map);
+  if (test_get_first_bit(&map,bitsize))
+    goto error;
+  bitmap_clear_all(&map);
+  if (test_get_next_bit(&map,bitsize))
+    goto error;
+  if (test_prefix(&map,bitsize))
+    goto error;
+  return FALSE;
+error:
+  printf("\n");
+  return TRUE;
+}
+
+int main()
+{
+  int i;
+  for (i= 1; i < 4096; i++)
+  {
+    printf("Start test for bitsize=%u\n",i);
+    if (do_test(i))
+      return -1;
+  }
+  printf("OK\n");
+  return 0;
+}
+
+/*
+This is the way the test part was compiled after a complete tree build with
+debug.
+
+gcc -DHAVE_CONFIG_H -I. -I. -I.. -I../include -I.    -g -O -DDBUG_ON
+-DSAFE_MUTEX -fno-omit-frame-pointer   -DHAVE_DARWIN_THREADS
+-D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DTEST_BITMAP
+-DSIGNALS_DONT_BREAK_READ -DIGNORE_SIGHUP_SIGQUIT -MT
+my_bitmap.o -MD -MP -MF ".deps/my_bitmap.Tpo" -c -o my_bitmap.o my_bitmap.c
+
+gcc -o my_bitmap my_bitmap.o -L../mysys -lmysys -L../strings -lmystrings
+-L../dbug -ldbug
+*/
+
+#endif
diff --git a/mysys/trie.c b/mysys/trie.c
new file mode 100644
index 00000000000..1f638f8f732
--- /dev/null
+++ b/mysys/trie.c
@@ -0,0 +1,237 @@
+/* Copyright (C) 2005 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+/*
+  Implementation of trie and Aho-Corasick automaton.
+  Supports only charsets that can be compared byte-wise.
+  
+  TODO:
+    Add character frequencies. Can increase lookup speed
+    up to 30%.
+    Implement character-wise comparision.
+*/
+
+
+#include "mysys_priv.h"
+#include <m_string.h>
+#include <my_trie.h>
+#include <my_base.h>
+
+
+/*
+  SYNOPSIS
+    TRIE *trie_init (TRIE *trie, CHARSET_INFO *charset);
+
+  DESCRIPTION
+    Allocates or initializes a `TRIE' object. If `trie' is a `NULL'
+    pointer, the function allocates, initializes, and returns a new
+    object. Otherwise, the object is initialized and the address of
+    the object is returned.  If `trie_init()' allocates a new object,
+    it will be freed when `trie_free()' is called.
+
+  RETURN VALUE
+    An initialized `TRIE*' object.  `NULL' if there was insufficient
+    memory to allocate a new object.
+*/
+
+TRIE *trie_init (TRIE *trie, CHARSET_INFO *charset)
+{
+  MEM_ROOT mem_root;
+  DBUG_ENTER("trie_init");
+  DBUG_ASSERT(charset);
+  init_alloc_root(&mem_root,
+                  (sizeof(TRIE_NODE) * 128) + ALLOC_ROOT_MIN_BLOCK_SIZE,
+                  sizeof(TRIE_NODE) * 128);
+  if (! trie)
+  {
+    if (! (trie= (TRIE *)alloc_root(&mem_root, sizeof(TRIE))))
+    {
+      free_root(&mem_root, MYF(0));
+      DBUG_RETURN(NULL);
+    }
+  }
+
+  memcpy(&trie->mem_root, &mem_root, sizeof(MEM_ROOT));
+  trie->root.leaf= 0;
+  trie->root.c= 0;
+  trie->root.next= NULL;
+  trie->root.links= NULL;
+  trie->root.fail= NULL;
+  trie->charset= charset;
+  trie->nnodes= 0;
+  trie->nwords= 0;
+  DBUG_RETURN(trie);
+}
+
+
+/*
+  SYNOPSIS
+    void trie_free (TRIE *trie);
+    trie - valid pointer to `TRIE'
+
+  DESCRIPTION
+    Frees the memory allocated for a `trie'.
+
+  RETURN VALUE
+    None.
+*/
+
+void trie_free (TRIE *trie)
+{
+  MEM_ROOT mem_root;
+  DBUG_ENTER("trie_free");
+  DBUG_ASSERT(trie);
+  memcpy(&mem_root, &trie->mem_root, sizeof(MEM_ROOT));
+  free_root(&mem_root, MYF(0));
+  DBUG_VOID_RETURN;
+}
+
+
+/*
+  SYNOPSIS
+    my_bool trie_insert (TRIE *trie, const byte *key, uint keylen);
+    trie - valid pointer to `TRIE'
+    key - valid pointer to key to insert
+    keylen - non-0 key length
+
+  DESCRIPTION
+    Inserts new key into trie.
+
+  RETURN VALUE
+    Upon successful completion, `trie_insert' returns `FALSE'. Otherwise
+    `TRUE' is returned.
+
+  NOTES
+    If this function fails you must assume `trie' is broken.
+    However it can be freed with trie_free().
+*/
+
+my_bool trie_insert (TRIE *trie, const byte *key, uint keylen)
+{
+  TRIE_NODE *node;
+  TRIE_NODE *next;
+  byte p;
+  uint k;
+  DBUG_ENTER("trie_insert");
+  DBUG_ASSERT(trie && key && keylen);
+  node= &trie->root;
+  trie->root.fail= NULL;
+  for (k= 0; k < keylen; k++)
+  {
+    p= key[k];
+    for (next= node->links; next; next= next->next)
+      if (next->c == p)
+        break;
+
+    if (! next)
+    {
+      TRIE_NODE *tmp= (TRIE_NODE *)alloc_root(&trie->mem_root,
+                                              sizeof(TRIE_NODE));
+      if (! tmp)
+        DBUG_RETURN(TRUE);
+      tmp->leaf= 0;
+      tmp->c= p;
+      tmp->links= tmp->fail= tmp->next= NULL;
+      trie->nnodes++;
+      if (! node->links)
+      {
+        node->links= tmp;
+      }
+      else
+      {
+        for (next= node->links; next->next; next= next->next) /* no-op */;
+        next->next= tmp;
+      }
+      node= tmp;
+    }
+    else
+    {
+      node= next;
+    }
+  }
+  node->leaf= keylen;
+  trie->nwords++;
+  DBUG_RETURN(FALSE);
+}
+
+
+/*
+  SYNOPSIS
+    my_bool trie_prepare (TRIE *trie);
+    trie - valid pointer to `TRIE'
+
+  DESCRIPTION
+    Constructs Aho-Corasick automaton.
+
+  RETURN VALUE
+    Upon successful completion, `trie_prepare' returns `FALSE'. Otherwise
+    `TRUE' is returned.
+*/
+
+my_bool ac_trie_prepare (TRIE *trie)
+{
+  TRIE_NODE **tmp_nodes;
+  TRIE_NODE *node;
+  uint32 fnode= 0;
+  uint32 lnode= 0;
+  DBUG_ENTER("trie_prepare");
+  DBUG_ASSERT(trie);
+
+  tmp_nodes= (TRIE_NODE **)my_malloc(trie->nnodes * sizeof(TRIE_NODE *), MYF(0));
+  if (! tmp_nodes)
+    DBUG_RETURN(TRUE);
+
+  trie->root.fail= &trie->root;
+  for (node= trie->root.links; node; node= node->next)
+  {
+    node->fail= &trie->root;
+    tmp_nodes[lnode++]= node;
+  }
+
+  while (fnode < lnode)
+  {
+    TRIE_NODE *current= (TRIE_NODE *)tmp_nodes[fnode++];
+    for (node= current->links; node; node= node->next)
+    {
+      TRIE_NODE *fail= current->fail;
+      tmp_nodes[lnode++]= node;
+      while (! (node->fail= trie_goto(&trie->root, fail, node->c)))
+        fail= fail->fail;
+    }
+  }
+  my_free((gptr)tmp_nodes, MYF(0));
+  DBUG_RETURN(FALSE);
+}
+
+
+/*
+  SYNOPSIS
+    void ac_trie_init (TRIE *trie, AC_TRIE_STATE *state);
+    trie - valid pointer to `TRIE'
+    state - value pointer to `AC_TRIE_STATE'
+
+  DESCRIPTION
+    Initializes `AC_TRIE_STATE' object.
+*/
+
+void ac_trie_init (TRIE *trie, AC_TRIE_STATE *state)
+{
+  DBUG_ENTER("ac_trie_init");
+  DBUG_ASSERT(trie && state);
+  state->trie= trie;
+  state->node= &trie->root;
+  DBUG_VOID_RETURN;
+}
diff --git a/ndb/Makefile.am b/ndb/Makefile.am
deleted file mode 100644
index 3aac54b38ee..00000000000
--- a/ndb/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-SUBDIRS = src tools . include @ndb_opt_subdirs@
-DIST_SUBDIRS = src tools include test docs
-EXTRA_DIST = config ndbapi-examples
-
-include $(top_srcdir)/ndb/config/common.mk.am
-
-dist-hook:
-	-rm -rf `find $(distdir) -type d -name SCCS`
-	-rm -rf `find $(distdir) -type d -name old_files`
-	-rm -rf `find $(distdir)/ndbapi-examples -name '*.o'`
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" != "." -a "$$subdir" != "include"; then \
-	    files="`find $$subdir -name '*\.h'` `find $$subdir -name '*\.hpp'`"; \
-	    for f in $$files; do \
-	      if test -d "$(distdir)/`dirname $$f`" -a ! -e "$(distdir)/$$f"; then \
-	        cp $$f $(distdir)/$$f; \
-	      fi; \
-	    done; \
-	  fi; \
-	done
-
-windoze:
-	for i in `find . -name 'Makefile.am'`; do make -C `dirname $$i` windoze-dsp; done
-
-windoze-dsp:
-
-all-windoze-dsp: windoze
-	find . -name '*.dsp' | grep -v SCCS | xargs unix2dos
-	$(top_srcdir)/ndb/config/make-win-dsw.sh | unix2dos > ndb.dsw
-	tar cvfz ndb-win-dsp.tar.gz ndb.dsw `find . -name '*.dsp' | grep -v SCCS`
diff --git a/ndb/config/common.mk.am b/ndb/config/common.mk.am
deleted file mode 100644
index 869e2fae91d..00000000000
--- a/ndb/config/common.mk.am
+++ /dev/null
@@ -1,12 +0,0 @@
-ndbbindir        = "$(libexecdir)"
-ndbtoolsdir      = "$(bindir)"
-ndbtestdir       = "$(bindir)"
-ndblibdir        = "$(pkglibdir)"
-ndbincludedir    = "$(pkgincludedir)/ndb"
-ndbapiincludedir = "$(pkgincludedir)/ndb/ndbapi"
-mgmapiincludedir = "$(pkgincludedir)/ndb/mgmapi"
-
-INCLUDES = $(INCLUDES_LOC)
-LDADD = $(top_srcdir)/ndb/src/common/portlib/gcc.cpp $(LDADD_LOC)
-DEFS = @DEFS@ @NDB_DEFS@ $(DEFS_LOC) $(NDB_EXTRA_FLAGS)
-NDB_CXXFLAGS=@ndb_cxxflags_fix@ $(NDB_CXXFLAGS_LOC) 
diff --git a/ndb/config/type_kernel.mk.am b/ndb/config/type_kernel.mk.am
deleted file mode 100644
index 703876ee2e9..00000000000
--- a/ndb/config/type_kernel.mk.am
+++ /dev/null
@@ -1,18 +0,0 @@
-
-INCLUDES += \
-        -I$(srcdir) -I$(top_srcdir)/include \
-	-I$(top_srcdir)/ndb/include \
-        -I$(top_srcdir)/ndb/src/kernel/vm \
-        -I$(top_srcdir)/ndb/src/kernel/error \
-	-I$(top_srcdir)/ndb/src/kernel \
-	-I$(top_srcdir)/ndb/include/kernel \
-	-I$(top_srcdir)/ndb/include/transporter \
-	-I$(top_srcdir)/ndb/include/debugger \
-	-I$(top_srcdir)/ndb/include/mgmapi \
-	-I$(top_srcdir)/ndb/include/mgmcommon \
-        -I$(top_srcdir)/ndb/include/ndbapi \
-        -I$(top_srcdir)/ndb/include/util \
-	-I$(top_srcdir)/ndb/include/portlib \
-	-I$(top_srcdir)/ndb/include/logger
-
-#AM_LDFLAGS = @ndb_ldflags@
diff --git a/ndb/config/type_mgmapiclient.mk.am b/ndb/config/type_mgmapiclient.mk.am
deleted file mode 100644
index 1ef4a81d67e..00000000000
--- a/ndb/config/type_mgmapiclient.mk.am
+++ /dev/null
@@ -1,2 +0,0 @@
-
-INCLUDES += -I$(top_srcdir)/ndb/include/mgmapi
diff --git a/ndb/config/type_ndbapi.mk.am b/ndb/config/type_ndbapi.mk.am
deleted file mode 100644
index ed648273aea..00000000000
--- a/ndb/config/type_ndbapi.mk.am
+++ /dev/null
@@ -1,12 +0,0 @@
-
-INCLUDES += \
-        -I$(srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/ndb/include \
-	-I$(top_srcdir)/ndb/include/kernel \
-	-I$(top_srcdir)/ndb/include/transporter \
-	-I$(top_srcdir)/ndb/include/debugger \
-	-I$(top_srcdir)/ndb/include/mgmapi \
-	-I$(top_srcdir)/ndb/include/mgmcommon \
-        -I$(top_srcdir)/ndb/include/ndbapi \
-        -I$(top_srcdir)/ndb/include/util \
-	-I$(top_srcdir)/ndb/include/portlib \
-	-I$(top_srcdir)/ndb/include/logger
diff --git a/ndb/config/type_ndbapiclient.mk.am b/ndb/config/type_ndbapiclient.mk.am
deleted file mode 100644
index 88b57e49e19..00000000000
--- a/ndb/config/type_ndbapiclient.mk.am
+++ /dev/null
@@ -1,2 +0,0 @@
-
-INCLUDES += -I$(top_srcdir)/ndb/include/ndbapi
diff --git a/ndb/config/type_ndbapitest.mk.am b/ndb/config/type_ndbapitest.mk.am
deleted file mode 100644
index 392c4e9fc70..00000000000
--- a/ndb/config/type_ndbapitest.mk.am
+++ /dev/null
@@ -1,14 +0,0 @@
-
-LDADD += $(top_builddir)/ndb/test/src/libNDBT.a \
-         $(top_builddir)/ndb/src/libndbclient.la \
-         $(top_builddir)/dbug/libdbug.a \
-         $(top_builddir)/mysys/libmysys.a \
-         $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
-
-INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/include \
-	-I$(top_srcdir)/ndb/include \
-        -I$(top_srcdir)/ndb/include/ndbapi \
-        -I$(top_srcdir)/ndb/include/util \
-        -I$(top_srcdir)/ndb/include/portlib \
-        -I$(top_srcdir)/ndb/test/include \
-        -I$(top_srcdir)/ndb/include/mgmapi
diff --git a/ndb/config/type_ndbapitools.mk.am b/ndb/config/type_ndbapitools.mk.am
deleted file mode 100644
index d4eb090112d..00000000000
--- a/ndb/config/type_ndbapitools.mk.am
+++ /dev/null
@@ -1,15 +0,0 @@
-
-LDADD += \
-         $(top_builddir)/ndb/src/libndbclient.la \
-         $(top_builddir)/dbug/libdbug.a \
-         $(top_builddir)/mysys/libmysys.a \
-         $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
-
-INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \
-	-I$(top_srcdir)/ndb/include \
-        -I$(top_srcdir)/ndb/include/ndbapi \
-        -I$(top_srcdir)/ndb/include/util \
-        -I$(top_srcdir)/ndb/include/portlib \
-        -I$(top_srcdir)/ndb/test/include \
-        -I$(top_srcdir)/ndb/include/mgmapi \
-        -I$(top_srcdir)/ndb/include/kernel
diff --git a/ndb/config/type_util.mk.am b/ndb/config/type_util.mk.am
deleted file mode 100644
index 0dfa77b7a7c..00000000000
--- a/ndb/config/type_util.mk.am
+++ /dev/null
@@ -1,6 +0,0 @@
-
-INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \
-	-I$(top_srcdir)/ndb/include \
-        -I$(top_srcdir)/ndb/include/util \
-        -I$(top_srcdir)/ndb/include/portlib \
-        -I$(top_srcdir)/ndb/include/logger
diff --git a/ndb/docs/Makefile.am b/ndb/docs/Makefile.am
deleted file mode 100644
index afa91857771..00000000000
--- a/ndb/docs/Makefile.am
+++ /dev/null
@@ -1,114 +0,0 @@
-DOXYDIR = doxygen
-noinst_HEADERS = $(DOXYDIR)/predoxy.pl $(DOXYDIR)/postdoxy.pl $(DOXYDIR)/Doxyfile.ndbapi $(DOXYDIR)/Doxyfile.mgmapi $(DOXYDIR)/header.ndbapi.tex $(DOXYDIR)/header.mgmapi.tex
-
-all: 	do-check-html ndbapidoc-html mgmapidoc-html
-all-pdf: 	do-check-pdf ndbapidoc-pdf mgmapidoc-pdf
-
-DOXYTMP =	.doxytmp
-DOXYOUT =	.doxyout
-
-NDB_RELEASE = @NDB_VERSION_MAJOR@.@NDB_VERSION_MINOR@.@NDB_VERSION_BUILD@-@NDB_VERSION_STATUS@
-
-clean-local:
-	rm -rf ndbapi.pdf ndbapi.html mgmapi.pdf mgmapi.html
-	rm -rf $(DOXYTMP) $(DOXYOUT)
-
-do-check-html:
-	@set -x; \
-	if test @PERL@ = no ; then \
-	  echo "Perl needed to make docs"; \
-	  exit 1; \
-	fi; \
-	if test @DOXYGEN@ = no ; then \
-	  echo "Doxygen needed to make docs"; \
-	  exit 1; \
-	fi;
-
-do-check-pdf: do-check-html
-	if test @PDFLATEX@ = no ; then \
-	  echo "Pdflatex needed to make docs"; \
-	  exit 1; \
-	fi; \
-	if test @MAKEINDEX@ = no ; then \
-	  echo "Makeindex needed to make docs"; \
-	  exit 1; \
-	fi;
-
-###
-#
-#  NDB API Programmer's Guide
-#
-ndbapidoc-html: ndbapi.html
-ndbapidoc-pdf: ndbapi.pdf
-
-ndbapi.html: $(noinst_HEADERS)
-	@set -x; \
-	export NDB_RELEASE=$(NDB_RELEASE); \
-	@RM@ -f ndbapi.pdf ndbapi.html; \
-	@RM@ -rf $(DOXYTMP) $(DOXYOUT); \
-	mkdir -p $(DOXYTMP) $(DOXYOUT); \
-	@CP@ $(top_srcdir)/ndb/include/ndbapi/*  $(DOXYTMP); \
-	@CP@ $(top_srcdir)/ndb/ndbapi-examples/*/*.[ch]pp $(DOXYTMP); \
-	@PERL@ $(DOXYDIR)/predoxy.pl; \
-	mv footer.html $(DOXYTMP); \
-	(cd $(DOXYTMP) ; @DOXYGEN@ ../$(DOXYDIR)/Doxyfile.ndbapi); \
-	@PERL@ $(DOXYDIR)/postdoxy.pl $(DOXYOUT)/ndbapi.latex "MySQL Cluster NDB API Programmer Guide"; \
-	(cd $(DOXYOUT) && \
-		find ndbapi.html -print | cpio -pdm ..);
-
-ndbapi.pdf: ndbapi.html
-	(cd $(DOXYOUT)/ndbapi.latex && \
-		@PDFLATEX@ refman.tex && @MAKEINDEX@ refman && @PDFLATEX@ refman.tex && \
-		cp -p refman.pdf ../../ndbapi.pdf);
-
-###
-#
-#  MGM API Guide
-#
-mgmapidoc-html: mgmapi.html
-mgmapidoc-pdf: mgmapi.pdf
-
-mgmapi.html: $(noinst_HEADERS)
-	@set -x; \
-	export NDB_RELEASE=$(NDB_RELEASE); \
-	@RM@ -f mgmapi.pdf mgmapi.html; \
-	@RM@ -rf $(DOXYTMP) $(DOXYOUT); \
-	mkdir -p $(DOXYTMP) $(DOXYOUT); \
-	@CP@ $(top_srcdir)/ndb/include/mgmapi/*  $(DOXYTMP); \
-	@PERL@ $(DOXYDIR)/predoxy.pl; \
-	mv footer.html $(DOXYTMP); \
-	(cd $(DOXYTMP) ; @DOXYGEN@ ../$(DOXYDIR)/Doxyfile.mgmapi); \
-	@PERL@ $(DOXYDIR)/postdoxy.pl $(DOXYOUT)/mgmapi.latex "MySQL Cluster MGM API Guide"; \
-	(cd $(DOXYOUT) && \
-		find mgmapi.html -print | cpio -pdm ..);
-
-mgmapi.pdf: mgmapi.html
-	(cd $(DOXYOUT)/mgmapi.latex && \
-		@PDFLATEX@ refman.tex && @MAKEINDEX@ refman && @PDFLATEX@ refman.tex && \
-		cp -p refman.pdf ../../mgmapi.pdf);
-
-###
-#  
-#  Complete Source Browser except for 
-#        ndbapi odbc test tools win32 lib examples docs CVS config bin 
-#        include/ndbapi 
-#        include/newtonapi src/newtonapi
-#        include/mgmapi src/mgmapi
-#        src/client
-ndbdoc: DUMMY
-	mkdir -p $(OUTDIR)
-	cd $(top_srcdir)/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.ndb
-
-###
-#
-#  odbcdoc - Complete Source Browser for NDB ODBC (src/client/odbc)
-
-odbcdoc: DUMMY
-	mkdir -p $(OUTDIR)
-	cd $(top_srcdir)/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.odbc
-
-testdoc: DUMMY
-	mkdir -p $(OUTDIR)
-	cd $(top_srcdir)/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.test
-
-windoze-dsp:
diff --git a/ndb/include/Makefile.am b/ndb/include/Makefile.am
deleted file mode 100644
index 10f297492e9..00000000000
--- a/ndb/include/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-
-include $(top_srcdir)/ndb/config/common.mk.am
-
-ndbinclude_HEADERS = \
-ndb_constants.h \
-ndb_init.h \
-ndb_types.h \
-ndb_version.h
-
-ndbapiinclude_HEADERS = \
-ndbapi/ndbapi_limits.h \
-ndbapi/ndb_opt_defaults.h \
-ndbapi/Ndb.hpp \
-ndbapi/NdbApi.hpp \
-ndbapi/NdbTransaction.hpp \
-ndbapi/NdbDictionary.hpp \
-ndbapi/NdbError.hpp \
-ndbapi/NdbEventOperation.hpp \
-ndbapi/NdbIndexOperation.hpp \
-ndbapi/NdbOperation.hpp \
-ndbapi/ndb_cluster_connection.hpp \
-ndbapi/NdbBlob.hpp \
-ndbapi/NdbPool.hpp \
-ndbapi/NdbRecAttr.hpp \
-ndbapi/NdbReceiver.hpp \
-ndbapi/NdbScanFilter.hpp \
-ndbapi/NdbScanOperation.hpp \
-ndbapi/NdbIndexScanOperation.hpp \
-ndbapi/ndberror.h
-
-mgmapiinclude_HEADERS = \
-mgmapi/mgmapi.h \
-mgmapi/mgmapi_debug.h \
-mgmapi/mgmapi_config_parameters.h \
-mgmapi/mgmapi_config_parameters_debug.h \
-mgmapi/ndb_logevent.h
-
-noinst_HEADERS = \
-ndb_global.h \
-ndb_net.h
-
-EXTRA_DIST = debugger editline kernel logger mgmcommon \
-portlib transporter util
-
-dist-hook:
-	-rm -rf `find $(distdir) -type d -name SCCS`
-
-windoze-dsp:
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
diff --git a/ndb/src/Makefile.am b/ndb/src/Makefile.am
deleted file mode 100644
index d35790a2e43..00000000000
--- a/ndb/src/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-SUBDIRS = common mgmapi ndbapi . kernel mgmclient mgmsrv cw
-
-include $(top_srcdir)/ndb/config/common.mk.am
-
-ndblib_LTLIBRARIES = libndbclient.la
-
-libndbclient_la_SOURCES =
-
-libndbclient_la_LIBADD =  \
-              ndbapi/libndbapi.la \
-              common/transporter/libtransporter.la   \
-              common/debugger/libtrace.la     \
-              common/debugger/signaldata/libsignaldataprint.la \
-              mgmapi/libmgmapi.la \
-              common/mgmcommon/libmgmsrvcommon.la \
-              common/logger/liblogger.la       \
-              common/portlib/libportlib.la      \
-              common/util/libgeneral.la 
-
-windoze-dsp: libndbclient.dsp
-
-libndbclient.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(ndblib_LTLIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ dummy.cpp
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(libndbclient_la_LIBADD)
-	@touch dummy.cpp
diff --git a/ndb/src/common/debugger/Makefile.am b/ndb/src/common/debugger/Makefile.am
deleted file mode 100644
index e25a11c9bee..00000000000
--- a/ndb/src/common/debugger/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-SUBDIRS = signaldata
-
-noinst_LTLIBRARIES = libtrace.la
-
-libtrace_la_SOURCES = SignalLoggerManager.cpp DebuggerNames.cpp BlockNames.cpp EventLogger.cpp GrepError.cpp
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libtrace.dsp
-
-libtrace.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(libtrace_la_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/common/debugger/signaldata/Makefile.am b/ndb/src/common/debugger/signaldata/Makefile.am
deleted file mode 100644
index 9146d552568..00000000000
--- a/ndb/src/common/debugger/signaldata/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-
-noinst_LTLIBRARIES = libsignaldataprint.la
-
-libsignaldataprint_la_SOURCES = \
-          TcKeyReq.cpp TcKeyConf.cpp TcKeyRef.cpp \
-	  TcRollbackRep.cpp \
-          TupKey.cpp TupCommit.cpp LqhKey.cpp \
-          FsOpenReq.cpp FsCloseReq.cpp FsRef.cpp FsConf.cpp FsReadWriteReq.cpp\
-          SignalDataPrint.cpp SignalNames.cpp \
-          ContinueB.cpp DihContinueB.cpp NdbfsContinueB.cpp \
-          CloseComReqConf.cpp PackedSignal.cpp PrepFailReqRef.cpp \
-	  GCPSave.cpp DictTabInfo.cpp \
-	  AlterTable.cpp AlterTab.cpp \
-	  CreateTrig.cpp AlterTrig.cpp DropTrig.cpp \
-	  FireTrigOrd.cpp TrigAttrInfo.cpp \
-	  CreateIndx.cpp AlterIndx.cpp DropIndx.cpp TcIndx.cpp \
-	  IndxKeyInfo.cpp IndxAttrInfo.cpp \
-          FsAppendReq.cpp ScanTab.cpp \
-          BackupImpl.cpp BackupSignalData.cpp \
-          UtilSequence.cpp UtilPrepare.cpp UtilDelete.cpp UtilExecute.cpp \
-          LqhFrag.cpp DropTab.cpp PrepDropTab.cpp LCP.cpp MasterLCP.cpp \
-          CopyGCI.cpp SystemError.cpp StartRec.cpp NFCompleteRep.cpp \
-          FailRep.cpp DisconnectRep.cpp SignalDroppedRep.cpp \
-          SumaImpl.cpp NdbSttor.cpp CreateFragmentation.cpp \
-	  UtilLock.cpp TuxMaint.cpp AccLock.cpp \
-          LqhTrans.cpp ReadNodesConf.cpp CntrStart.cpp \
-          ScanFrag.cpp
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libsignaldataprint.dsp
-
-libsignaldataprint.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(libsignaldataprint_la_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/common/logger/Makefile.am b/ndb/src/common/logger/Makefile.am
deleted file mode 100644
index 0af21f9fbde..00000000000
--- a/ndb/src/common/logger/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-
-noinst_LTLIBRARIES = liblogger.la
-
-SOURCE_WIN = Logger.cpp LogHandlerList.cpp LogHandler.cpp \
-           ConsoleLogHandler.cpp FileLogHandler.cpp
-liblogger_la_SOURCES = $(SOURCE_WIN) SysLogHandler.cpp
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-windoze-dsp: liblogger.dsp
-
-liblogger.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(SOURCE_WIN)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/common/mgmcommon/Makefile.am b/ndb/src/common/mgmcommon/Makefile.am
deleted file mode 100644
index 104bf0b29f2..00000000000
--- a/ndb/src/common/mgmcommon/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-noinst_LTLIBRARIES = libmgmsrvcommon.la
-
-libmgmsrvcommon_la_SOURCES = \
-	ConfigRetriever.cpp \
-	IPCConfig.cpp
-
-INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmapi -I$(top_srcdir)/ndb/src/mgmsrv
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
-include $(top_srcdir)/ndb/config/type_mgmapiclient.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libmgmsrvcommon.dsp
-
-libmgmsrvcommon.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(libmgmsrvcommon_la_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/common/portlib/Makefile.am b/ndb/src/common/portlib/Makefile.am
deleted file mode 100644
index 99138a7414e..00000000000
--- a/ndb/src/common/portlib/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-noinst_HEADERS = gcc.cpp
-
-noinst_LTLIBRARIES = libportlib.la
-
-libportlib_la_SOURCES = \
-	NdbCondition.c NdbMutex.c NdbSleep.c NdbTick.c \
-	NdbEnv.c NdbThread.c NdbHost.c NdbTCP.cpp	    \
-	NdbDaemon.c NdbMem.c \
-	NdbConfig.c
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_util.mk.am
-
-EXTRA_PROGRAMS = memtest PortLibTest munmaptest
-
-PortLibTest_SOURCES = NdbPortLibTest.cpp
-munmaptest_SOURCES = munmaptest.cpp
-
-# Don't update the files from bitkeeper
-WIN_src = win32/NdbCondition.c \
-              win32/NdbDaemon.c \
-              win32/NdbEnv.c \
-              win32/NdbHost.c \
-              win32/NdbMem.c \
-              win32/NdbMutex.c \
-              win32/NdbSleep.c \
-              win32/NdbTCP.c \
-              win32/NdbThread.c \
-              win32/NdbTick.c
-
-windoze-dsp: libportlib.dsp
-
-libportlib.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(WIN_src)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/common/transporter/Makefile.am b/ndb/src/common/transporter/Makefile.am
deleted file mode 100644
index 4c277097a91..00000000000
--- a/ndb/src/common/transporter/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-
-noinst_LTLIBRARIES = libtransporter.la
-
-libtransporter_la_SOURCES = \
-	Transporter.cpp \
-	SendBuffer.cpp   \
-	TCP_Transporter.cpp \
-	TransporterRegistry.cpp \
-        Packer.cpp
-
-EXTRA_libtransporter_la_SOURCES = SHM_Transporter.cpp SHM_Transporter.unix.cpp SCI_Transporter.cpp
-
-libtransporter_la_LIBADD = @ndb_transporter_opt_objs@
-libtransporter_la_DEPENDENCIES = @ndb_transporter_opt_objs@
-
-INCLUDES_LOC = -I$(top_srcdir)/ndb/include/mgmapi -I$(top_srcdir)/ndb/src/mgmapi -I$(top_srcdir)/ndb/include/debugger -I$(top_srcdir)/ndb/include/kernel -I$(top_srcdir)/ndb/include/transporter @NDB_SCI_INCLUDES@
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_util.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libtransporter.dsp
-
-libtransporter.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(libtransporter_la_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/common/util/Makefile.am b/ndb/src/common/util/Makefile.am
deleted file mode 100644
index 2719d14ee92..00000000000
--- a/ndb/src/common/util/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-
-noinst_LTLIBRARIES = libgeneral.la
-
-libgeneral_la_SOURCES = \
-	    File.cpp md5_hash.cpp Properties.cpp socket_io.cpp \
-            SimpleProperties.cpp Parser.cpp InputStream.cpp \
-            SocketServer.cpp SocketClient.cpp SocketAuthenticator.cpp\
-	    OutputStream.cpp NdbOut.cpp BaseString.cpp Base64.cpp \
-	    NdbSqlUtil.cpp new.cpp \
-            uucode.c random.c version.c \
-            strdup.c \
-            ConfigValues.cpp ndb_init.c basestring_vsnprintf.c \
-            Bitmask.cpp
-
-EXTRA_PROGRAMS = testBitmask
-testBitmask_SOURCES =  testBitmask.cpp
-testBitmask_LDFLAGS = @ndb_bin_am_ldflags@ \
-  $(top_builddir)/ndb/src/libndbclient.la \
-         $(top_builddir)/dbug/libdbug.a \
-         $(top_builddir)/mysys/libmysys.a \
-         $(top_builddir)/strings/libmystrings.a
-
-testBitmask.cpp : Bitmask.cpp
-	rm -f testBitmask.cpp
-	@LN_CP_F@ Bitmask.cpp testBitmask.cpp
-
-testBitmask.o:	$(testBitmask_SOURCES)
-		$(CXXCOMPILE) -c $(INCLUDES) -D__TEST_BITMASK__ $<
-
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_util.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libgeneral.dsp
-
-libgeneral.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(libgeneral_la_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/common/util/version.c b/ndb/src/common/util/version.c
deleted file mode 100644
index 5883a709e96..00000000000
--- a/ndb/src/common/util/version.c
+++ /dev/null
@@ -1,241 +0,0 @@
-/* Copyright (C) 2003 MySQL AB
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
-
-#include <ndb_global.h>
-#include <ndb_version.h>
-#include <version.h>
-#include <basestring_vsnprintf.h>
-#include <NdbEnv.h>
-#include <NdbOut.hpp>
-
-Uint32 getMajor(Uint32 version) {
-  return (version >> 16) & 0xFF;
-}
-
-Uint32 getMinor(Uint32 version) {
-  return (version >> 8) & 0xFF;
-}
-
-Uint32 getBuild(Uint32 version) {
-  return (version >> 0) & 0xFF;
-}
-
-Uint32 makeVersion(Uint32 major, Uint32 minor, Uint32 build) {
-  return MAKE_VERSION(major, minor, build);
-  
-}
-
-const char * getVersionString(Uint32 version, const char * status) {
-  char buff[100];
-  if (status && status[0] != 0)
-	  basestring_snprintf(buff, sizeof(buff),
-	     "Version %d.%d.%d (%s)",
-	     getMajor(version),
-	     getMinor(version),
-	     getBuild(version),
-	     status);
-  else
-    basestring_snprintf(buff, sizeof(buff),
-	     "Version %d.%d.%d",
-	     getMajor(version),
-	     getMinor(version),
-	     getBuild(version));
-  return strdup(buff);
-}
-
-typedef enum {
-  UG_Null,
-  UG_Range,
-  UG_Exact
-} UG_MatchType;
-
-struct NdbUpGradeCompatible {
-  Uint32 ownVersion;
-  Uint32 otherVersion;
-  UG_MatchType matchType;
-};
-
-/*#define TEST_VERSION*/
-
-#define HAVE_NDB_SETVERSION
-#ifdef HAVE_NDB_SETVERSION
-Uint32 ndbOwnVersionTesting = 0;
-void
-ndbSetOwnVersion() {
-  char buf[256];
-  if (NdbEnv_GetEnv("NDB_SETVERSION", buf, sizeof(buf))) {
-    Uint32 _v1,_v2,_v3;
-    if (sscanf(buf, "%u.%u.%u", &_v1, &_v2, &_v3) == 3) {
-      ndbOwnVersionTesting = MAKE_VERSION(_v1,_v2,_v3);
-      ndbout_c("Testing: Version set to 0x%x",  ndbOwnVersionTesting);
-    }
-  }
-}
-#else
-void ndbSetOwnVersion() {}
-#endif
-
-#ifndef TEST_VERSION
-struct NdbUpGradeCompatible ndbCompatibleTable_full[] = {
-  { MAKE_VERSION(5,0,NDB_VERSION_BUILD), MAKE_VERSION(5,0,3), UG_Range},
-  { MAKE_VERSION(5,0,3), MAKE_VERSION(5,0,2), UG_Exact },
-  { MAKE_VERSION(4,1,12), MAKE_VERSION(4,1,10), UG_Range },
-  { MAKE_VERSION(4,1,10), MAKE_VERSION(4,1,9), UG_Exact },
-  { MAKE_VERSION(4,1,9), MAKE_VERSION(4,1,8), UG_Exact },
-  { MAKE_VERSION(3,5,2), MAKE_VERSION(3,5,1), UG_Exact },
-  { 0, 0, UG_Null }
-};
-
-struct NdbUpGradeCompatible ndbCompatibleTable_upgrade[] = {
-  { MAKE_VERSION(5,0,2), MAKE_VERSION(4,1,8), UG_Exact },
-  { MAKE_VERSION(3,5,4), MAKE_VERSION(3,5,3), UG_Exact },
-  { 0, 0, UG_Null }
-};
-
-#else /* testing purposes */
-
-struct NdbUpGradeCompatible ndbCompatibleTable_full[] = {
-  { MAKE_VERSION(4,1,5), MAKE_VERSION(4,1,0), UG_Range },
-  { MAKE_VERSION(3,6,9), MAKE_VERSION(3,6,1), UG_Range },
-  { MAKE_VERSION(3,6,2), MAKE_VERSION(3,6,1), UG_Range },
-  { MAKE_VERSION(3,5,7), MAKE_VERSION(3,5,0), UG_Range },
-  { MAKE_VERSION(3,5,1), MAKE_VERSION(3,5,0), UG_Range },
-  { NDB_VERSION_D      , MAKE_VERSION(NDB_VERSION_MAJOR,NDB_VERSION_MINOR,2), UG_Range },
-  { 0, 0, UG_Null }
-};
-
-struct NdbUpGradeCompatible ndbCompatibleTable_upgrade[] = {
-  { MAKE_VERSION(4,1,5), MAKE_VERSION(3,6,9), UG_Exact },
-  { MAKE_VERSION(3,6,2), MAKE_VERSION(3,5,7), UG_Exact },
-  { MAKE_VERSION(3,5,1), NDB_VERSION_D      , UG_Exact },
-  { 0, 0, UG_Null }
-};
-
-
-#endif
-
-void ndbPrintVersion()
-{
-  printf("Version: %u.%u.%u\n",
-	 getMajor(ndbGetOwnVersion()),
-	 getMinor(ndbGetOwnVersion()),
-	 getBuild(ndbGetOwnVersion()));
-}
-
-Uint32
-ndbGetOwnVersion()
-{
-#ifdef HAVE_NDB_SETVERSION
-  if (ndbOwnVersionTesting == 0)
-    return NDB_VERSION_D;
-  else
-    return ndbOwnVersionTesting;
-#else
-  return NDB_VERSION_D;
-#endif
-}
-
-int
-ndbSearchUpgradeCompatibleTable(Uint32 ownVersion, Uint32 otherVersion,
-				struct NdbUpGradeCompatible table[])
-{
-  int i;
-  for (i = 0; table[i].ownVersion != 0 && table[i].otherVersion != 0; i++) {
-    if (table[i].ownVersion == ownVersion ||
-	table[i].ownVersion == (Uint32) ~0) {
-      switch (table[i].matchType) {
-      case UG_Range:
-	if (otherVersion >= table[i].otherVersion){
-	  return 1;
-	}
-	break;
-      case UG_Exact:
-	if (otherVersion == table[i].otherVersion){
-	  return 1;
-	}
-	break;
-      default:
-	break;
-      }
-    }
-  }
-  return 0;
-}
-
-int
-ndbCompatible(Uint32 ownVersion, Uint32 otherVersion, struct NdbUpGradeCompatible table[])
-{
-  if (otherVersion >= ownVersion) {
-    return 1;
-  }
-  return ndbSearchUpgradeCompatibleTable(ownVersion, otherVersion, table);
-}
-
-int
-ndbCompatible_full(Uint32 ownVersion, Uint32 otherVersion)
-{
-  return ndbCompatible(ownVersion, otherVersion, ndbCompatibleTable_full);
-}
-
-int
-ndbCompatible_upgrade(Uint32 ownVersion, Uint32 otherVersion)
-{
-  if (ndbCompatible_full(ownVersion, otherVersion))
-    return 1;
-  return ndbCompatible(ownVersion, otherVersion, ndbCompatibleTable_upgrade);
-}
-
-int
-ndbCompatible_mgmt_ndb(Uint32 ownVersion, Uint32 otherVersion)
-{
-  return ndbCompatible_upgrade(ownVersion, otherVersion);
-}
-
-int
-ndbCompatible_mgmt_api(Uint32 ownVersion, Uint32 otherVersion)
-{
-  return ndbCompatible_upgrade(ownVersion, otherVersion);
-}
-
-int
-ndbCompatible_ndb_mgmt(Uint32 ownVersion, Uint32 otherVersion)
-{
-  return ndbCompatible_full(ownVersion, otherVersion);
-}
-
-int
-ndbCompatible_api_mgmt(Uint32 ownVersion, Uint32 otherVersion)
-{
-  return ndbCompatible_full(ownVersion, otherVersion);
-}
-
-int
-ndbCompatible_api_ndb(Uint32 ownVersion, Uint32 otherVersion)
-{
-  return ndbCompatible_full(ownVersion, otherVersion);
-}
-
-int
-ndbCompatible_ndb_api(Uint32 ownVersion, Uint32 otherVersion)
-{
-  return ndbCompatible_upgrade(ownVersion, otherVersion);
-}
-
-int
-ndbCompatible_ndb_ndb(Uint32 ownVersion, Uint32 otherVersion)
-{
-  return ndbCompatible_upgrade(ownVersion, otherVersion);
-}
diff --git a/ndb/src/cw/cpcd/Makefile.am b/ndb/src/cw/cpcd/Makefile.am
deleted file mode 100644
index 75f557b2af7..00000000000
--- a/ndb/src/cw/cpcd/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-
-ndbbin_PROGRAMS = ndb_cpcd
-
-ndb_cpcd_SOURCES = main.cpp CPCD.cpp Process.cpp APIService.cpp Monitor.cpp common.cpp
-
-LDADD_LOC = \
-            $(top_builddir)/ndb/src/libndbclient.la      \
-            $(top_builddir)/dbug/libdbug.a \
-            $(top_builddir)/mysys/libmysys.a \
-            $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_util.mk.am
-
-ndb_cpcd_LDFLAGS = @ndb_bin_am_ldflags@
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp:
diff --git a/ndb/src/kernel/Makefile.am b/ndb/src/kernel/Makefile.am
deleted file mode 100644
index 55d3c5a578f..00000000000
--- a/ndb/src/kernel/Makefile.am
+++ /dev/null
@@ -1,75 +0,0 @@
-SUBDIRS = error blocks vm
-
-include $(top_srcdir)/ndb/config/common.mk.am
-
-ndbbin_PROGRAMS = ndbd
-
-ndbd_SOURCES = main.cpp SimBlockList.cpp
-
-include $(top_srcdir)/ndb/config/type_kernel.mk.am
-
-INCLUDES += \
-              -Iblocks/cmvmi \
-              -Iblocks/dbacc \
-              -Iblocks/dbdict \
-              -Iblocks/dbdih \
-              -Iblocks/dblqh \
-              -Iblocks/dbtc \
-              -Iblocks/dbtup \
-              -Iblocks/ndbfs \
-              -Iblocks/ndbcntr \
-              -Iblocks/qmgr \
-              -Iblocks/trix \
-              -Iblocks/backup \
-              -Iblocks/dbutil \
-              -Iblocks/suma \
-              -Iblocks/grep \
-              -Iblocks/dbtux
-
-LDADD +=  \
-              blocks/cmvmi/libcmvmi.a \
-              blocks/dbacc/libdbacc.a \
-              blocks/dbdict/libdbdict.a \
-              blocks/dbdih/libdbdih.a \
-              blocks/dblqh/libdblqh.a \
-              blocks/dbtc/libdbtc.a \
-              blocks/dbtup/libdbtup.a \
-              blocks/ndbfs/libndbfs.a \
-              blocks/ndbcntr/libndbcntr.a \
-              blocks/qmgr/libqmgr.a \
-              blocks/trix/libtrix.a \
-              blocks/backup/libbackup.a \
-              blocks/dbutil/libdbutil.a \
-              blocks/suma/libsuma.a \
-              blocks/grep/libgrep.a \
-              blocks/dbtux/libdbtux.a \
-              vm/libkernel.a	\
-              error/liberror.a \
-              $(top_builddir)/ndb/src/common/transporter/libtransporter.la   \
-              $(top_builddir)/ndb/src/common/debugger/libtrace.la     \
-              $(top_builddir)/ndb/src/common/debugger/signaldata/libsignaldataprint.la \
-              $(top_builddir)/ndb/src/common/logger/liblogger.la       \
-              $(top_builddir)/ndb/src/common/mgmcommon/libmgmsrvcommon.la \
-              $(top_builddir)/ndb/src/mgmapi/libmgmapi.la \
-              $(top_builddir)/ndb/src/common/portlib/libportlib.la      \
-              $(top_builddir)/ndb/src/common/util/libgeneral.la  \
-         $(top_builddir)/dbug/libdbug.a \
-         $(top_builddir)/mysys/libmysys.a \
-         $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: ndbd.dsp
-
-ndbd.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-prg.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-prg.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(ndbbin_PROGRAMS)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(ndbd_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
diff --git a/ndb/src/kernel/blocks/backup/Makefile.am b/ndb/src/kernel/blocks/backup/Makefile.am
deleted file mode 100644
index c8f44f31292..00000000000
--- a/ndb/src/kernel/blocks/backup/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-
-noinst_LIBRARIES = libbackup.a
-
-libbackup_a_SOURCES = Backup.cpp BackupInit.cpp
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libbackup.dsp
-
-libbackup.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(libbackup_a_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/cmvmi/Makefile.am b/ndb/src/kernel/blocks/cmvmi/Makefile.am
deleted file mode 100644
index dc2e12746fd..00000000000
--- a/ndb/src/kernel/blocks/cmvmi/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-
-noinst_LIBRARIES = libcmvmi.a
-
-libcmvmi_a_SOURCES = Cmvmi.cpp
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libcmvmi.dsp
-
-libcmvmi.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(libcmvmi_a_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/dbacc/Makefile.am b/ndb/src/kernel/blocks/dbacc/Makefile.am
deleted file mode 100644
index ca1b1efac37..00000000000
--- a/ndb/src/kernel/blocks/dbacc/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-
-noinst_LIBRARIES = libdbacc.a
-
-libdbacc_a_SOURCES = DbaccInit.cpp DbaccMain.cpp
-
-INCLUDES_LOC = -I$(top_srcdir)/ndb/src/kernel/blocks/dbtup
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libdbacc.dsp
-
-libdbacc.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(libdbacc_a_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/dbdict/Makefile.am b/ndb/src/kernel/blocks/dbdict/Makefile.am
deleted file mode 100644
index 9a0d68f8148..00000000000
--- a/ndb/src/kernel/blocks/dbdict/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-#SUBDIRS = printSchemafile
-
-noinst_LIBRARIES = libdbdict.a
-
-libdbdict_a_SOURCES = Dbdict.cpp
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libdbdict.dsp
-
-libdbdict.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(libdbdict_a_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/dbdih/Makefile.am b/ndb/src/kernel/blocks/dbdih/Makefile.am
deleted file mode 100644
index d6ad380b806..00000000000
--- a/ndb/src/kernel/blocks/dbdih/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-noinst_LIBRARIES = libdbdih.a
-
-libdbdih_a_SOURCES = DbdihInit.cpp DbdihMain.cpp
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libdbdih.dsp
-
-libdbdih.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(libdbdih_a_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/dblqh/Makefile.am b/ndb/src/kernel/blocks/dblqh/Makefile.am
deleted file mode 100644
index 854860b269c..00000000000
--- a/ndb/src/kernel/blocks/dblqh/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-#SUBDIRS = redoLogReader
-
-noinst_LIBRARIES = libdblqh.a
-
-libdblqh_a_SOURCES = DblqhInit.cpp DblqhMain.cpp
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libdblqh.dsp
-
-libdblqh.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(libdblqh_a_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/dbtc/Makefile.am b/ndb/src/kernel/blocks/dbtc/Makefile.am
deleted file mode 100644
index 98ee2639bac..00000000000
--- a/ndb/src/kernel/blocks/dbtc/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-noinst_LIBRARIES = libdbtc.a
-
-libdbtc_a_SOURCES = DbtcInit.cpp DbtcMain.cpp
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libdbtc.dsp
-
-libdbtc.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(libdbtc_a_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/dbtup/Makefile.am b/ndb/src/kernel/blocks/dbtup/Makefile.am
deleted file mode 100644
index 2d14ad41025..00000000000
--- a/ndb/src/kernel/blocks/dbtup/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-noinst_LIBRARIES = libdbtup.a
-
-libdbtup_a_SOURCES = \
-        DbtupExecQuery.cpp \
-        DbtupBuffer.cpp \
-        DbtupRoutines.cpp \
-        DbtupCommit.cpp \
-        DbtupFixAlloc.cpp \
-        DbtupTrigger.cpp \
-        DbtupAbort.cpp \
-        DbtupLCP.cpp \
-        DbtupUndoLog.cpp \
-        DbtupPageMap.cpp \
-        DbtupPagMan.cpp  \
-        DbtupStoredProcDef.cpp \
-        DbtupMeta.cpp \
-        DbtupTabDesMan.cpp \
-	DbtupGen.cpp \
-        DbtupSystemRestart.cpp \
-	DbtupIndex.cpp \
-	DbtupScan.cpp \
-        DbtupDebug.cpp
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libdbtup.dsp
-
-libdbtup.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(libdbtup_a_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/dbtux/Makefile.am b/ndb/src/kernel/blocks/dbtux/Makefile.am
deleted file mode 100644
index b5951e8ed37..00000000000
--- a/ndb/src/kernel/blocks/dbtux/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-noinst_LIBRARIES = libdbtux.a
-
-libdbtux_a_SOURCES = \
-                        DbtuxGen.cpp \
-			DbtuxMeta.cpp \
-			DbtuxMaint.cpp \
-			DbtuxNode.cpp \
-			DbtuxTree.cpp \
-			DbtuxScan.cpp \
-			DbtuxSearch.cpp \
-			DbtuxCmp.cpp \
-			DbtuxDebug.cpp
-
-INCLUDES_LOC = -I$(top_srcdir)/ndb/src/kernel/blocks/dbtup
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libdbtux.dsp
-
-libdbtux.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(libdbtux_a_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/dbutil/Makefile.am b/ndb/src/kernel/blocks/dbutil/Makefile.am
deleted file mode 100644
index 925356c2f76..00000000000
--- a/ndb/src/kernel/blocks/dbutil/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-noinst_LIBRARIES = libdbutil.a
-
-libdbutil_a_SOURCES = DbUtil.cpp
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libdbutil.dsp
-
-libdbutil.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(libdbutil_a_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/grep/Makefile.am b/ndb/src/kernel/blocks/grep/Makefile.am
deleted file mode 100644
index 6d2b422784b..00000000000
--- a/ndb/src/kernel/blocks/grep/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-noinst_LIBRARIES = libgrep.a
-
-libgrep_a_SOURCES = Grep.cpp GrepInit.cpp 
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libgrep.dsp
-
-libgrep.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(libgrep_a_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/ndbcntr/Makefile.am b/ndb/src/kernel/blocks/ndbcntr/Makefile.am
deleted file mode 100644
index 3f24675b2b3..00000000000
--- a/ndb/src/kernel/blocks/ndbcntr/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-noinst_LIBRARIES = libndbcntr.a
-
-libndbcntr_a_SOURCES = \
-	NdbcntrInit.cpp	\
-	NdbcntrSysTable.cpp \
-	NdbcntrMain.cpp
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libndbcntr.dsp
-
-libndbcntr.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(libndbcntr_a_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/ndbfs/Makefile.am b/ndb/src/kernel/blocks/ndbfs/Makefile.am
deleted file mode 100644
index a22386f8612..00000000000
--- a/ndb/src/kernel/blocks/ndbfs/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-noinst_LIBRARIES = libndbfs.a
-
-libndbfs_a_SOURCES = \
-	AsyncFile.cpp			\
-	Ndbfs.cpp VoidFs.cpp	\
-	Filename.cpp			\
-	CircularIndex.cpp
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libndbfs.dsp
-
-libndbfs.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(libndbfs_a_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/qmgr/Makefile.am b/ndb/src/kernel/blocks/qmgr/Makefile.am
deleted file mode 100644
index 278af2a7865..00000000000
--- a/ndb/src/kernel/blocks/qmgr/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-noinst_LIBRARIES = libqmgr.a
-
-libqmgr_a_SOURCES = \
-	QmgrInit.cpp	\
-	QmgrMain.cpp
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libqmgr.dsp
-
-libqmgr.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(libqmgr_a_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/suma/Makefile.am b/ndb/src/kernel/blocks/suma/Makefile.am
deleted file mode 100644
index 5a74dbb74eb..00000000000
--- a/ndb/src/kernel/blocks/suma/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-noinst_LIBRARIES = libsuma.a
-
-libsuma_a_SOURCES = Suma.cpp SumaInit.cpp
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libsuma.dsp
-
-libsuma.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(libsuma_a_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/trix/Makefile.am b/ndb/src/kernel/blocks/trix/Makefile.am
deleted file mode 100644
index 343063a6283..00000000000
--- a/ndb/src/kernel/blocks/trix/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-noinst_LIBRARIES = libtrix.a
-
-libtrix_a_SOURCES = Trix.cpp
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libtrix.dsp
-
-libtrix.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(libtrix_a_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/error/Makefile.am b/ndb/src/kernel/error/Makefile.am
deleted file mode 100644
index 54f3de2d76d..00000000000
--- a/ndb/src/kernel/error/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-noinst_LIBRARIES = liberror.a
-
-liberror_a_SOURCES = TimeModule.cpp \
-	ErrorReporter.cpp \
-	ErrorMessages.cpp
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: liberror.dsp
-
-liberror.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(liberror_a_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/vm/Makefile.am b/ndb/src/kernel/vm/Makefile.am
deleted file mode 100644
index d9e57ce9dd6..00000000000
--- a/ndb/src/kernel/vm/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-#SUBDIRS = testCopy testDataBuffer testSimplePropertiesSection
-#ifneq ($(USE_EDITLINE), N)
-#DIRS += testLongSig
-#endif
-
-noinst_LIBRARIES = libkernel.a
-
-libkernel_a_SOURCES = \
-	SimulatedBlock.cpp	\
-	FastScheduler.cpp		\
-	TimeQueue.cpp		\
-	VMSignal.cpp		\
-	ThreadConfig.cpp          \
-	TransporterCallback.cpp \
-	Emulator.cpp		\
-	Configuration.cpp		\
-	WatchDog.cpp \
-        SimplePropertiesSection.cpp \
-        SectionReader.cpp \
-	MetaData.cpp \
-        Mutex.cpp SafeCounter.cpp \
-	SuperPool.cpp
-
-INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmapi
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_kernel.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libkernel.dsp
-
-libkernel.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(libkernel_a_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/mgmapi/Makefile.am b/ndb/src/mgmapi/Makefile.am
deleted file mode 100644
index db730bf8c89..00000000000
--- a/ndb/src/mgmapi/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-
-noinst_LTLIBRARIES = libmgmapi.la
-
-libmgmapi_la_SOURCES = mgmapi.cpp ndb_logevent.cpp mgmapi_configuration.cpp LocalConfig.cpp
-
-INCLUDES_LOC = -I$(top_srcdir)/ndb/include/mgmapi
-
-DEFS_LOC = -DNO_DEBUG_MESSAGES -DNDB_PORT="\"@ndb_port@\""
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_util.mk.am
-
-#ndbtest_PROGRAMS = ndb_test_mgmapi
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libmgmapi.dsp
-
-libmgmapi.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(libmgmapi_la_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/mgmclient/Makefile.am b/ndb/src/mgmclient/Makefile.am
deleted file mode 100644
index c63e8d1bff8..00000000000
--- a/ndb/src/mgmclient/Makefile.am
+++ /dev/null
@@ -1,58 +0,0 @@
-
-noinst_LTLIBRARIES = libndbmgmclient.la
-ndbtools_PROGRAMS = ndb_mgm
-
-libndbmgmclient_la_SOURCES = CommandInterpreter.cpp
-libndbmgmclient_la_LIBADD = ../mgmapi/libmgmapi.la \
-			    ../common/logger/liblogger.la \
-			    ../common/portlib/libportlib.la \
-			    ../common/util/libgeneral.la \
-			    ../common/portlib/libportlib.la
-
-
-ndb_mgm_SOURCES = main.cpp
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
-
-INCLUDES += -I$(top_srcdir)/ndb/include/mgmapi \
-            -I$(top_srcdir)/ndb/src/common/mgmcommon
-
-LDADD_LOC = $(noinst_LTLIBRARIES) \
-	    ../common/portlib/libportlib.la \
-            @readline_link@ \
-            $(top_builddir)/dbug/libdbug.a \
-            $(top_builddir)/mysys/libmysys.a \
-            $(top_builddir)/strings/libmystrings.a \
-            @TERMCAP_LIB@ @NDB_SCI_LIBS@
-
-ndb_mgm_LDFLAGS = @ndb_bin_am_ldflags@
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: ndb_mgm.dsp libndbmgmclient.dsp
-
-ndb_mgm.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-prg.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-prg.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(ndbtools_PROGRAMS)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_mgm_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
-
-libndbmgmclient.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(libndbmgmclient_la_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB
diff --git a/ndb/src/mgmsrv/Makefile.am b/ndb/src/mgmsrv/Makefile.am
deleted file mode 100644
index 7fd3fa66b43..00000000000
--- a/ndb/src/mgmsrv/Makefile.am
+++ /dev/null
@@ -1,60 +0,0 @@
-MYSQLDATAdir =		$(localstatedir)
-MYSQLSHAREdir =		$(pkgdatadir)
-MYSQLBASEdir=		$(prefix)
-#MYSQLCLUSTERdir=        $(prefix)/mysql-cluster
-MYSQLCLUSTERdir=        .
-
-ndbbin_PROGRAMS = ndb_mgmd
-
-ndb_mgmd_SOURCES = \
-	MgmtSrvr.cpp \
-	MgmtSrvrGeneralSignalHandling.cpp \
-	main.cpp \
-	Services.cpp \
-	convertStrToInt.cpp \
-	SignalQueue.cpp \
-	MgmtSrvrConfig.cpp \
-	ConfigInfo.cpp \
-	InitConfigFileParser.cpp \
-	Config.cpp
-
-INCLUDES_LOC = -I$(top_srcdir)/ndb/src/ndbapi \
-               -I$(top_srcdir)/ndb/src/mgmapi \
-               -I$(top_srcdir)/ndb/src/common/mgmcommon \
-               -I$(top_srcdir)/ndb/src/mgmclient
-
-LDADD_LOC = $(top_srcdir)/ndb/src/mgmclient/CommandInterpreter.o \
-            $(top_builddir)/ndb/src/libndbclient.la \
-            $(top_builddir)/dbug/libdbug.a \
-            $(top_builddir)/mysys/libmysys.a \
-            $(top_builddir)/strings/libmystrings.a \
-            @readline_link@ \
-            @NDB_SCI_LIBS@ \
-	    @TERMCAP_LIB@
-
-DEFS_LOC =		-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
-			-DDATADIR="\"$(MYSQLDATAdir)\"" \
-			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
-			-DMYSQLCLUSTERDIR="\"$(MYSQLCLUSTERdir)\""
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
-
-ndb_mgmd_LDFLAGS = @ndb_bin_am_ldflags@
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: ndb_mgmd.dsp
-
-ndb_mgmd.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-prg.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-prg.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(ndbbin_PROGRAMS)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_mgmd_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
diff --git a/ndb/src/ndbapi/Makefile.am b/ndb/src/ndbapi/Makefile.am
deleted file mode 100644
index b734e058b87..00000000000
--- a/ndb/src/ndbapi/Makefile.am
+++ /dev/null
@@ -1,62 +0,0 @@
-#SUBDIRS = signal-sender
-
-noinst_LTLIBRARIES = libndbapi.la
-
-libndbapi_la_SOURCES = \
-        TransporterFacade.cpp   \
-        ClusterMgr.cpp  \
-        Ndb.cpp \
-        NdbPoolImpl.cpp \
-        NdbPool.cpp \
-        Ndblist.cpp     \
-        Ndbif.cpp       \
-        Ndbinit.cpp     \
-        Ndberr.cpp    \
-        ndberror.c    \
-        NdbErrorOut.cpp    \
-        NdbTransaction.cpp       \
-        NdbTransactionScan.cpp \
-        NdbOperation.cpp        \
-        NdbOperationSearch.cpp  \
-        NdbOperationScan.cpp    \
-        NdbOperationInt.cpp     \
-        NdbOperationDefine.cpp  \
-        NdbOperationExec.cpp    \
-        NdbScanOperation.cpp    NdbScanFilter.cpp \
-        NdbIndexOperation.cpp   \
-        NdbEventOperation.cpp   \
-        NdbEventOperationImpl.cpp   \
-        NdbApiSignal.cpp        \
-        NdbRecAttr.cpp  \
-        NdbUtil.cpp \
-        NdbReceiver.cpp \
-        NdbDictionary.cpp \
-        NdbDictionaryImpl.cpp \
-        DictCache.cpp \
-        ndb_cluster_connection.cpp \
-	NdbBlob.cpp
-
-INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmapi
-
-# Ndbapi cannot handle -O3
-NDB_CXXFLAGS_RELEASE_LOC = -O2
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_ndbapi.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libndbapi.dsp
-
-libndbapi.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(libndbapi_la_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/test/ndbapi/Makefile.am b/ndb/test/ndbapi/Makefile.am
deleted file mode 100644
index 1d2dfb3f948..00000000000
--- a/ndb/test/ndbapi/Makefile.am
+++ /dev/null
@@ -1,159 +0,0 @@
-
-SUBDIRS = bank
-
-ndbtest_PROGRAMS = \
-flexBench \
-drop_all_tabs \
-create_all_tabs \
-create_tab \
-flexAsynch \
-flexBench \
-flexHammer \
-flexTT \
-testBackup \
-testBasic \
-testBasicAsynch \
-testBlobs \
-testDataBuffers \
-testDict \
-testIndex \
-testMgm \
-testNdbApi \
-testNodeRestart \
-testOIBasic \
-testOperations \
-testRestartGci \
-testScan \
-testScanInterpreter \
-testScanPerf \
-testSystemRestart \
-testTimeout \
-testTransactions \
-testDeadlock \
-test_event ndbapi_slow_select testReadPerf testLcp \
-testPartitioning \
-testBitfield \
-DbCreate DbAsyncGenerator \
-test_event_multi_table
-
-#flexTimedAsynch
-#testBlobs
-#flex_bench_mysql
-
-create_all_tabs_SOURCES = create_all_tabs.cpp
-create_tab_SOURCES = create_tab.cpp
-drop_all_tabs_SOURCES = drop_all_tabs.cpp
-flexAsynch_SOURCES = flexAsynch.cpp
-flexBench_SOURCES = flexBench.cpp
-flexHammer_SOURCES = flexHammer.cpp
-flexTT_SOURCES = flexTT.cpp
-#flexTimedAsynch_SOURCES = flexTimedAsynch.cpp
-#flex_bench_mysql_SOURCES = flex_bench_mysql.cpp
-testBackup_SOURCES = testBackup.cpp
-testBasic_SOURCES = testBasic.cpp
-testBasicAsynch_SOURCES = testBasicAsynch.cpp
-testBlobs_SOURCES = testBlobs.cpp
-testDataBuffers_SOURCES = testDataBuffers.cpp
-testDict_SOURCES = testDict.cpp
-testIndex_SOURCES = testIndex.cpp
-testMgm_SOURCES = testMgm.cpp
-testNdbApi_SOURCES = testNdbApi.cpp
-testNodeRestart_SOURCES = testNodeRestart.cpp
-testOIBasic_SOURCES = testOIBasic.cpp
-testOperations_SOURCES = testOperations.cpp
-testRestartGci_SOURCES = testRestartGci.cpp
-testScan_SOURCES = testScan.cpp ScanFunctions.hpp
-testScanInterpreter_SOURCES = testScanInterpreter.cpp ScanFilter.hpp ScanInterpretTest.hpp 
-testScanPerf_SOURCES = testScanPerf.cpp
-testSystemRestart_SOURCES = testSystemRestart.cpp
-testTimeout_SOURCES = testTimeout.cpp
-testTransactions_SOURCES = testTransactions.cpp
-testDeadlock_SOURCES = testDeadlock.cpp
-test_event_SOURCES = test_event.cpp
-ndbapi_slow_select_SOURCES = slow_select.cpp
-testReadPerf_SOURCES = testReadPerf.cpp
-testLcp_SOURCES = testLcp.cpp
-testPartitioning_SOURCES = testPartitioning.cpp
-testBitfield_SOURCES = testBitfield.cpp
-DbCreate_SOURCES = bench/mainPopulate.cpp bench/dbPopulate.cpp bench/userInterface.cpp bench/dbPopulate.h bench/userInterface.h bench/testData.h bench/testDefinitions.h bench/ndb_schema.hpp bench/ndb_error.hpp
-DbAsyncGenerator_SOURCES = bench/mainAsyncGenerator.cpp bench/asyncGenerator.cpp bench/ndb_async2.cpp bench/dbGenerator.h bench/macros.h bench/userInterface.h bench/testData.h bench/testDefinitions.h bench/ndb_schema.hpp bench/ndb_error.hpp
-test_event_multi_table_SOURCES = test_event_multi_table.cpp
-
-INCLUDES_LOC = -I$(top_srcdir)/ndb/include/kernel
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am
-
-##testDict_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
-##testIndex_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
-##testSystemRestart_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
-##testTransactions_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
-testBackup_LDADD = $(LDADD) bank/libbank.a
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-
-
-windoze-dsp: flexBench.dsp testBasic.dsp testBlobs.dsp \
-             testScan.dsp
-
-flexBench.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-prg.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-prg.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ flexBench
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(flexBench_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
-
-testBasic.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-prg.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-prg.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ testBasic
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(testBasic_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
-
-testOIBasic.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-prg.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-prg.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ testOIBasic
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(testOIBasic_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
-
-testBlobs.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-prg.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-prg.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ testBlobs
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(testBlobs_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
-
-testScan.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-prg.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-prg.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ testScan
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(testScan_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
diff --git a/ndb/test/ndbapi/bank/Makefile.am b/ndb/test/ndbapi/bank/Makefile.am
deleted file mode 100644
index d4f82a7f9c4..00000000000
--- a/ndb/test/ndbapi/bank/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-
-ndbtest_PROGRAMS = testBank bankSumAccounts bankValidateAllGLs bankMakeGL bankTransactionMaker bankCreator bankTimer
-
-noinst_LIBRARIES = libbank.a
-
-libbank_a_SOURCES = Bank.cpp BankLoad.cpp Bank.hpp
-
-testBank_SOURCES = testBank.cpp
-bankSumAccounts_SOURCES = bankSumAccounts.cpp
-bankValidateAllGLs_SOURCES = bankValidateAllGLs.cpp 
-bankMakeGL_SOURCES = bankMakeGL.cpp 
-bankTransactionMaker_SOURCES = bankTransactionMaker.cpp 
-bankCreator_SOURCES = bankCreator.cpp  
-bankTimer_SOURCES = bankTimer.cpp
-
-LDADD_LOC = $(noinst_LIBRARIES)
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp:
diff --git a/ndb/test/run-test/Makefile.am b/ndb/test/run-test/Makefile.am
deleted file mode 100644
index 60d64a7697f..00000000000
--- a/ndb/test/run-test/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-
-testdir=$(prefix)/mysql-test/ndb
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_util.mk.am
-include $(top_srcdir)/ndb/config/type_mgmapiclient.mk.am
-
-test_PROGRAMS = atrt
-test_DATA=daily-basic-tests.txt daily-devel-tests.txt 16node-tests.txt \
-          conf-daily-basic-ndbmaster.txt \
-          conf-daily-basic-shark.txt \
-          conf-daily-devel-ndbmaster.txt \
-          conf-daily-sql-ndbmaster.txt \
-          conf-daily-basic-dl145a.txt
-test_SCRIPTS=atrt-analyze-result.sh atrt-gather-result.sh atrt-setup.sh \
-          atrt-clear-result.sh make-config.sh make-index.sh make-html-reports.sh
-
-atrt_SOURCES = main.cpp run-test.hpp
-INCLUDES_LOC = -I$(top_srcdir)/ndb/test/include
-LDADD_LOC = $(top_builddir)/ndb/test/src/libNDBT.a \
-	    $(top_builddir)/ndb/src/libndbclient.la \
-            $(top_builddir)/dbug/libdbug.a \
-            $(top_builddir)/mysys/libmysys.a \
-            $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
-
-wrappersdir=$(prefix)/bin
-wrappers_SCRIPTS=atrt-testBackup atrt-mysql-test-run
-
-EXTRA_DIST = $(test_DATA) $(test_SCRIPTS) $(wrappers_SCRIPTS) README.ATRT
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp:
diff --git a/ndb/test/src/Makefile.am b/ndb/test/src/Makefile.am
deleted file mode 100644
index 289633b060a..00000000000
--- a/ndb/test/src/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-
-noinst_LIBRARIES = libNDBT.a
-
-libNDBT_a_SOURCES = \
-	NDBT_ReturnCodes.cpp \
-	NDBT_Error.cpp NDBT_Tables.cpp NDBT_ResultRow.cpp \
-	NDBT_Test.cpp HugoCalculator.cpp \
-	HugoOperations.cpp HugoTransactions.cpp \
-	HugoAsynchTransactions.cpp UtilTransactions.cpp \
-	NdbRestarter.cpp NdbRestarts.cpp NDBT_Output.cpp \
-	NdbBackup.cpp  NdbConfig.cpp NdbGrep.cpp NDBT_Table.cpp \
-	NdbSchemaCon.cpp NdbSchemaOp.cpp getarg.c \
-	CpcClient.cpp
-
-INCLUDES_LOC = -I$(top_srcdir)/ndb/src/common/mgmcommon -I$(top_srcdir)/ndb/include/mgmcommon -I$(top_srcdir)/ndb/include/kernel -I$(top_srcdir)/ndb/src/mgmapi
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: libNDBT.dsp
-
-libNDBT.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-lib.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-lib.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(libNDBT_a_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LIB
diff --git a/ndb/test/tools/Makefile.am b/ndb/test/tools/Makefile.am
deleted file mode 100644
index 873136e254d..00000000000
--- a/ndb/test/tools/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-
-ndbtest_PROGRAMS = hugoLoad hugoFill hugoLockRecords hugoPkDelete hugoPkRead hugoPkReadRecord  hugoPkUpdate hugoScanRead hugoScanUpdate restart verify_index copy_tab create_index  ndb_cpcc
-
-# transproxy 
-
-hugoFill_SOURCES = hugoFill.cpp
-hugoLoad_SOURCES = hugoLoad.cpp
-hugoLockRecords_SOURCES = hugoLockRecords.cpp
-hugoPkDelete_SOURCES = hugoPkDelete.cpp
-hugoPkRead_SOURCES = hugoPkRead.cpp
-hugoPkReadRecord_SOURCES = hugoPkReadRecord.cpp
-hugoPkUpdate_SOURCES = hugoPkUpdate.cpp
-hugoScanRead_SOURCES = hugoScanRead.cpp
-hugoScanUpdate_SOURCES = hugoScanUpdate.cpp
-restart_SOURCES = restart.cpp
-# transproxy_SOURCES = transproxy.cpp
-verify_index_SOURCES = verify_index.cpp
-copy_tab_SOURCES = copy_tab.cpp
-create_index_SOURCES = create_index.cpp
-ndb_cpcc_SOURCES = cpcc.cpp
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am
-
-ndb_cpcc_LDADD = $(LDADD)
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp:
diff --git a/ndb/tools/Makefile.am b/ndb/tools/Makefile.am
deleted file mode 100644
index 1008b166dfc..00000000000
--- a/ndb/tools/Makefile.am
+++ /dev/null
@@ -1,157 +0,0 @@
-
-ndbtools_PROGRAMS = \
-  ndb_test_platform \
-  ndb_waiter \
-  ndb_drop_table \
-  ndb_delete_all \
-  ndb_desc \
-  ndb_drop_index \
-  ndb_show_tables \
-  ndb_select_all \
-  ndb_select_count \
-  ndb_restore
-
-tools_common_sources = ../test/src/NDBT_ReturnCodes.cpp \
-                       ../test/src/NDBT_Table.cpp \
-                       ../test/src/NDBT_Output.cpp
-
-ndb_test_platform_SOURCES = ndb_test_platform.cpp
-ndb_waiter_SOURCES = waiter.cpp $(tools_common_sources)
-ndb_delete_all_SOURCES = delete_all.cpp $(tools_common_sources)
-ndb_desc_SOURCES = desc.cpp $(tools_common_sources)
-ndb_drop_index_SOURCES = drop_index.cpp $(tools_common_sources)
-ndb_drop_table_SOURCES = drop_tab.cpp $(tools_common_sources)
-ndb_show_tables_SOURCES = listTables.cpp $(tools_common_sources)
-ndb_select_all_SOURCES = select_all.cpp \
-                         ../test/src/NDBT_ResultRow.cpp \
-                         $(tools_common_sources)
-ndb_select_count_SOURCES = select_count.cpp $(tools_common_sources)
-ndb_restore_SOURCES = restore/restore_main.cpp \
-                      restore/consumer.cpp \
-                      restore/consumer_restore.cpp \
-                      restore/consumer_printer.cpp \
-                      restore/Restore.cpp \
-                      ../test/src/NDBT_ResultRow.cpp $(tools_common_sources)
-
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_ndbapitools.mk.am
-
-ndb_test_platform_LDFLAGS = @ndb_bin_am_ldflags@
-ndb_waiter_LDFLAGS = @ndb_bin_am_ldflags@
-ndb_drop_table_LDFLAGS = @ndb_bin_am_ldflags@
-ndb_delete_all_LDFLAGS = @ndb_bin_am_ldflags@
-ndb_desc_LDFLAGS = @ndb_bin_am_ldflags@
-ndb_drop_index_LDFLAGS = @ndb_bin_am_ldflags@
-ndb_show_tables_LDFLAGS = @ndb_bin_am_ldflags@
-ndb_select_all_LDFLAGS = @ndb_bin_am_ldflags@
-ndb_select_count_LDFLAGS = @ndb_bin_am_ldflags@
-ndb_restore_LDFLAGS = @ndb_bin_am_ldflags@
-
-# Don't update the files from bitkeeper
-%::SCCS/s.%
-
-windoze-dsp: \
-  ndb_waiter.dsp \
-  ndb_drop_table.dsp \
-  ndb_delete_all.dsp \
-  ndb_desc.dsp \
-  ndb_drop_index.dsp \
-  ndb_show_tables.dsp \
-  ndb_select_all.dsp \
-  ndb_select_count.dsp
-
-ndb_waiter.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-prg.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-prg.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ ndb_waiter
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_waiter_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
-
-ndb_drop_table.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-prg.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-prg.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ ndb_drop_table
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_drop_table_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
-
-ndb_delete_all.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-prg.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-prg.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ ndb_delete_all
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_delete_all_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
-
-ndb_desc.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-prg.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-prg.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ ndb_desc
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_desc_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
-
-ndb_drop_index.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-prg.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-prg.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ ndb_drop_index
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_drop_index_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
-
-ndb_show_tables.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-prg.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-prg.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ ndb_show_tables
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_show_tables_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
-
-ndb_select_all.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-prg.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-prg.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ ndb_select_all
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_select_all_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
-
-ndb_select_count.dsp: Makefile \
-               $(top_srcdir)/ndb/config/win-prg.am \
-               $(top_srcdir)/ndb/config/win-name \
-               $(top_srcdir)/ndb/config/win-includes \
-               $(top_srcdir)/ndb/config/win-sources \
-               $(top_srcdir)/ndb/config/win-libraries
-	cat $(top_srcdir)/ndb/config/win-prg.am > $@
-	@$(top_srcdir)/ndb/config/win-name $@ ndb_select_count
-	@$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
-	@$(top_srcdir)/ndb/config/win-sources $@ $(ndb_select_count_SOURCES)
-	@$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 225e8bdccbb..79764ab63cc 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -31,7 +31,6 @@ bin_SCRIPTS =		@server_scripts@ \
 			mysqlhotcopy \
 			mysqldumpslow \
 			mysql_explain_log \
-			mysql_tableinfo \
 			mysqld_multi \
 			mysql_create_system_tables
 
@@ -55,7 +54,6 @@ EXTRA_SCRIPTS =		make_binary_distribution.sh \
 			mysqldumpslow.sh \
 			mysql_explain_log.sh \
 			mysqld_multi.sh \
-			mysql_tableinfo.sh \
 			mysqld_safe.sh \
 			mysql_create_system_tables.sh
 
diff --git a/scripts/mysql_fix_privilege_tables.sql b/scripts/mysql_fix_privilege_tables.sql
index b93e0a47b1b..bc9da056758 100644
--- a/scripts/mysql_fix_privilege_tables.sql
+++ b/scripts/mysql_fix_privilege_tables.sql
@@ -1,5 +1,5 @@
 -- This script converts any old privilege tables to privilege tables suitable
--- for MySQL 4.0.
+-- for this version of MySQL
 
 -- You can safely ignore all 'Duplicate column' and 'Unknown column' errors"
 -- because these just mean that your tables are already up to date.
@@ -123,7 +123,6 @@ UPDATE user SET Show_db_priv= Select_priv, Super_priv=Process_priv, Execute_priv
 
 --  Add fields that can be used to limit number of questions and connections
 --  for some users.
-
 ALTER TABLE user
 ADD max_questions int(11) NOT NULL DEFAULT 0 AFTER x509_subject,
 ADD max_updates   int(11) unsigned NOT NULL DEFAULT 0 AFTER max_questions,
@@ -138,8 +137,8 @@ ALTER TABLE db
 ADD Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
 ADD Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL;
 ALTER TABLE host
-ADD Create_tmp_table_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
-ADD Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL;
+ADD Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL,
+ADD Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL;
 
 alter table user change max_questions max_questions int(11) unsigned DEFAULT 0  NOT NULL;
 alter table tables_priv add KEY Grantor (Grantor);
diff --git a/scripts/mysql_tableinfo.sh b/scripts/mysql_tableinfo.sh
deleted file mode 100644
index 2ed7e381fa3..00000000000
--- a/scripts/mysql_tableinfo.sh
+++ /dev/null
@@ -1,494 +0,0 @@
-#!@PERL@ -w
-
-use strict;
-use Getopt::Long;
-use DBI;
-
-=head1 NAME
-
-WARNING: MySQL versions 5.0 and above feature the INFORMATION_SCHEMA
-pseudo-database which contains always up-to-date metadata information
-about all tables. So instead of using this script one can now
-simply query the INFORMATION_SCHEMA.SCHEMATA, INFORMATION_SCHEMA.TABLES,
-INFORMATION_SCHEMA.COLUMNS, INFORMATION_SCHEMA.STATISTICS pseudo-tables.
-Please see the MySQL manual for more information about INFORMATION_SCHEMA.
-This script will be removed from the MySQL distribution in version 5.1.
-
-mysql_tableinfo - creates and populates information tables with 
-the output of SHOW DATABASES, SHOW TABLES (or SHOW TABLE STATUS), 
-SHOW COLUMNS and SHOW INDEX.
-
-This is version 1.1.
-
-=head1 SYNOPSIS
- 
-  mysql_tableinfo [OPTIONS] database_to_write [database_like_wild] [table_like_wild]
-
-  Do not backquote (``) database_to_write, 
-  and do not quote ('') database_like_wild or table_like_wild
-
-  Examples:
-
-  mysql_tableinfo info
-
-  mysql_tableinfo info this_db
-
-  mysql_tableinfo info %a% b%
-
-  mysql_tableinfo info --clear-only
-
-  mysql_tableinfo info --col --idx --table-status
-
-=cut
-
-# Documentation continued at end of file
-
-
-sub usage {
-    die @_,"\nExecute 'perldoc $0' for documentation\n";
-}
-
-my %opt = (
-    'user'	=> scalar getpwuid($>),
-    'host'      => "localhost",
-    'prefix'    => "", #to avoid 'use of uninitialized value...'
-);
-Getopt::Long::Configure(qw(no_ignore_case)); # disambuguate -p and -P
-GetOptions( \%opt,
-    "help",
-    "user|u=s",
-    "password|p=s",
-    "host|h=s",
-    "port|P=s",
-    "socket|S=s",
-    "tbl-status",
-    "col",
-    "idx",
-    "clear",
-    "clear-only",
-    "prefix=s",
-    "quiet|q",
-) or usage("Invalid option");
-
-if (!$opt{'quiet'})
-    {
-    print <<EOF
-WARNING: MySQL versions 5.0 and above feature the INFORMATION_SCHEMA
-pseudo-database which contains always up-to-date metadata information
-about all tables. So instead of using this script one can now
-simply query the INFORMATION_SCHEMA.SCHEMATA, INFORMATION_SCHEMA.TABLES,
-INFORMATION_SCHEMA.COLUMNS, INFORMATION_SCHEMA.STATISTICS pseudo-tables.
-Please see the MySQL manual for more information about INFORMATION_SCHEMA.
-This script will be removed from the MySQL distribution in version 5.1.
-EOF
-    }
-
-if ($opt{'help'}) {usage();}
-
-my ($db_to_write,$db_like_wild,$tbl_like_wild);
-if (@ARGV==0)
-{
-    usage("Not enough arguments");
-}
-$db_to_write="`$ARGV[0]`"; shift @ARGV;
-$db_like_wild=($ARGV[0])?$ARGV[0]:"%"; shift @ARGV;
-$tbl_like_wild=($ARGV[0])?$ARGV[0]:"%"; shift @ARGV;
-if (@ARGV>0) { usage("Too many arguments"); }
-
-$0 = $1 if $0 =~ m:/([^/]+)$:;
-
-my $info_db="`".$opt{'prefix'}."db`";
-my $info_tbl="`".$opt{'prefix'}."tbl".
-    (($opt{'tbl-status'})?"_status":"")."`";
-my $info_col="`".$opt{'prefix'}."col`";
-my $info_idx="`".$opt{'prefix'}."idx`";
-
-
-# --- connect to the database ---
-
-my $dsn = ";host=$opt{'host'}";
-$dsn .= ";port=$opt{'port'}" if $opt{'port'};
-$dsn .= ";mysql_socket=$opt{'socket'}" if $opt{'socket'};
-
-my $dbh = DBI->connect("dbi:mysql:$dsn;mysql_read_default_group=perl",
-                        $opt{'user'}, $opt{'password'},
-{
-    RaiseError => 1,
-    PrintError => 0,
-    AutoCommit => 1,
-});
-
-$db_like_wild=$dbh->quote($db_like_wild);
-$tbl_like_wild=$dbh->quote($tbl_like_wild);
-
-#Ask
-
-if (!$opt{'quiet'})
-{
-    print "\n!! This program is going to do:\n\n";
-    print "**DROP** TABLE ...\n" if ($opt{'clear'} or $opt{'clear-only'});
-    print "**DELETE** FROM ... WHERE `Database` LIKE $db_like_wild AND `Table` LIKE $tbl_like_wild
-**INSERT** INTO ...
-
-on the following tables :\n";
-
-    foreach  (($info_db, $info_tbl),
-	      (($opt{'col'})?$info_col:()), 
-	      (($opt{'idx'})?$info_idx:()))
-    {
-	print("  $db_to_write.$_\n");
-    }
-    print "\nContinue (you can skip this confirmation step with --quiet) ? (y|n) [n]";
-    if (<STDIN> !~ /^\s*y\s*$/i) 
-    {
-	print "Nothing done!\n";exit;
-    }
-}
-
-if ($opt{'clear'} or $opt{'clear-only'}) 
-{
-#do not drop the $db_to_write database !
-    foreach  (($info_db, $info_tbl),
-	      (($opt{'col'})?$info_col:()), 
-	      (($opt{'idx'})?$info_idx:()))
-    {
-	$dbh->do("DROP TABLE IF EXISTS $db_to_write.$_");
-    }
-    if ($opt{'clear-only'}) 
-    {
-	print "Wrote to database $db_to_write .\n" unless ($opt{'quiet'});
-	exit; 
-    }
-}
-
-
-my %sth;
-my %extra_col_desc;
-my %row;
-my %done_create_table;
-
-#create the $db_to_write database
-$dbh->do("CREATE DATABASE IF NOT EXISTS $db_to_write");
-$dbh->do("USE $db_to_write");
-
-#get databases
-$sth{'db'}=$dbh->prepare("SHOW DATABASES LIKE $db_like_wild");
-$sth{'db'}->execute;
-
-#create $info_db which will receive info about databases.
-#Ensure that the first column to be called "Database" (as SHOW DATABASES LIKE
-#returns a varying
-#column name (of the form "Database (%...)") which is not suitable)
-$extra_col_desc{'db'}=do_create_table("db",$info_db,undef,"`Database`");
-#we'll remember the type of the `Database` column (as returned by
-#SHOW DATABASES), which we will need when creating the next tables. 
-
-#clear out-of-date info from this table 
-$dbh->do("DELETE FROM $info_db WHERE `Database` LIKE $db_like_wild"); 
-
-
-while ($row{'db'}=$sth{'db'}->fetchrow_arrayref) #go through all databases
-{
-
-#insert the database name
-    $dbh->do("INSERT INTO $info_db VALUES("
-	     .join(',' ,  ( map $dbh->quote($_), @{$row{'db'}} ) ).")" );
-
-#for each database, get tables
-
-    $sth{'tbl'}=$dbh->prepare("SHOW TABLE"
-			    .( ($opt{'tbl-status'}) ? 
-			       " STATUS"
-			       : "S" )
-			    ." from `$row{'db'}->[0]` LIKE $tbl_like_wild");
-    $sth{'tbl'}->execute;
-    unless ($done_create_table{$info_tbl})
-
-#tables must be created only once, and out-of-date info must be
-#cleared once
-    {
-	$done_create_table{$info_tbl}=1;
-	$extra_col_desc{'tbl'}=
-	    do_create_table("tbl",$info_tbl,
-#add an extra column (database name) at the left
-#and ensure that the table name will be called "Table"
-#(this is unncessesary with
-#SHOW TABLE STATUS, but necessary with SHOW TABLES (which returns a column
-#named "Tables_in_..."))
-			    "`Database` ".$extra_col_desc{'db'},"`Table`"); 
-	$dbh->do("DELETE FROM $info_tbl WHERE `Database` LIKE $db_like_wild		                         AND `Table` LIKE $tbl_like_wild");
-    }
-
-    while ($row{'tbl'}=$sth{'tbl'}->fetchrow_arrayref)
-    {
-	$dbh->do("INSERT INTO $info_tbl VALUES("
-		 .$dbh->quote($row{'db'}->[0]).","
-		 .join(',' ,  ( map $dbh->quote($_), @{$row{'tbl'}} ) ).")");
-
-#for each table, get columns...
-
-	if ($opt{'col'})
-	{
-	    $sth{'col'}=$dbh->prepare("SHOW COLUMNS FROM `$row{'tbl'}->[0]` FROM `$row{'db'}->[0]`"); 
-	    $sth{'col'}->execute;
-	    unless ($done_create_table{$info_col})
-	    {
-		$done_create_table{$info_col}=1;
-		do_create_table("col",$info_col,
-				"`Database` ".$extra_col_desc{'db'}.","
-				."`Table` ".$extra_col_desc{'tbl'}.","
-				."`Seq_in_table` BIGINT(3)"); 
-#We need to add a sequence number (1 for the first column of the table,
-#2 for the second etc) so that users are able to retrieve columns in order
-#if they want. This is not needed for INDEX 
-#(where there is already Seq_in_index)
-		$dbh->do("DELETE FROM $info_col WHERE `Database` 
-                            LIKE $db_like_wild
-			    AND `Table` LIKE $tbl_like_wild");
-	    }
-	    my $col_number=0;
-	    while ($row{'col'}=$sth{'col'}->fetchrow_arrayref)
-	    {
-		$dbh->do("INSERT INTO $info_col VALUES("
-			 .$dbh->quote($row{'db'}->[0]).","
-			 .$dbh->quote($row{'tbl'}->[0]).","
-			 .++$col_number.","
-			 .join(',' ,  ( map $dbh->quote($_), @{$row{'col'}} ) ).")");
-	    }
-	}
-
-#and get index.
-
-	if ($opt{'idx'})
-	{
-	    $sth{'idx'}=$dbh->prepare("SHOW INDEX FROM `$row{'tbl'}->[0]` FROM `$row{'db'}->[0]`"); 
-	    $sth{'idx'}->execute;
-	    unless ($done_create_table{$info_idx})
-	    {
-		$done_create_table{$info_idx}=1;
-		do_create_table("idx",$info_idx,
-				"`Database` ".$extra_col_desc{'db'});
-		$dbh->do("DELETE FROM $info_idx WHERE `Database`
-			 LIKE $db_like_wild
-			 AND `Table` LIKE $tbl_like_wild");
-	    }
-	    while ($row{'idx'}=$sth{'idx'}->fetchrow_arrayref)
-	    {
-		$dbh->do("INSERT INTO $info_idx VALUES("
-			 .$dbh->quote($row{'db'}->[0]).","
-			 .join(',' ,  ( map $dbh->quote($_), @{$row{'idx'}} ) ).")");
-	    }
-	}
-    }
-}
-
-print "Wrote to database $db_to_write .\n" unless ($opt{'quiet'});
-exit;
-
-
-sub do_create_table
-{
-    my ($sth_key,$target_tbl,$extra_col_desc,$first_col_name)=@_; 
-    my $create_table_query=$extra_col_desc;
-    my ($i,$first_col_desc,$col_desc);
-
-    for ($i=0;$i<$sth{$sth_key}->{NUM_OF_FIELDS};$i++)
-    {
-	if ($create_table_query) { $create_table_query.=", "; }	
-	$col_desc=$sth{$sth_key}->{mysql_type_name}->[$i];
-	if ($col_desc =~ /char|int/i)
-	{
-	    $col_desc.="($sth{$sth_key}->{PRECISION}->[$i])";
-	}
-	elsif ($col_desc =~ /decimal|numeric/i) #(never seen that)
-	{
-	    $col_desc.=
-		"($sth{$sth_key}->{PRECISION}->[$i],$sth{$sth_key}->{SCALE}->[$i])";
-	}
-	elsif ($col_desc !~ /date/i) #date and datetime are OK,
-	                         #no precision or scale for them
-	{
-	    warn "unexpected column type '$col_desc' 
-(neither 'char','int','decimal|numeric')
-when creating $target_tbl, hope table creation will go OK\n";
-	}
-	if ($i==0) {$first_col_desc=$col_desc};
-	$create_table_query.=
-	    ( ($i==0 and $first_col_name) ? 
-	      "$first_col_name " :"`$sth{$sth_key}->{NAME}->[$i]` " )
-	    .$col_desc;
-    }
-if ($create_table_query)
-{
-    $dbh->do("CREATE TABLE IF NOT EXISTS $target_tbl ($create_table_query)");
-}
-return $first_col_desc;
-}
-
-__END__
-
-
-=head1 DESCRIPTION
-
-mysql_tableinfo asks a MySQL server information about its
-databases, tables, table columns and index, and stores this
-in tables called `db`, `tbl` (or `tbl_status`), `col`, `idx` 
-(with an optional prefix specified with --prefix).
-After that, you can query these information tables, for example
-to build your admin scripts with SQL queries, like
-
-SELECT CONCAT("CHECK TABLE ",`database`,".",`table`," EXTENDED;") 
-FROM info.tbl WHERE ... ;
-
-as people usually do with some other RDBMS
-(note: to increase the speed of your queries on the info tables,
-you may add some index on them).
-
-The database_like_wild and table_like_wild instructs the program
-to gather information only about databases and tables
-whose names match these patterns. If the info
-tables already exist, their rows matching the patterns are simply
-deleted and replaced by the new ones. That is,
-old rows not matching the patterns are not touched.
-If the database_like_wild and table_like_wild arguments
-are not specified on the command-line they default to "%".
-
-The program :
-
-- does CREATE DATABASE IF NOT EXISTS database_to_write
-where database_to_write is the database name specified on the command-line.
-
-- does CREATE TABLE IF NOT EXISTS database_to_write.`db`
-
-- fills database_to_write.`db` with the output of
-SHOW DATABASES LIKE database_like_wild
-
-- does CREATE TABLE IF NOT EXISTS database_to_write.`tbl`
-(respectively database_to_write.`tbl_status`
-if the --tbl-status option is on)
-
-- for every found database,
-fills database_to_write.`tbl` (respectively database_to_write.`tbl_status`)
-with the output of 
-SHOW TABLES FROM found_db LIKE table_like_wild
-(respectively SHOW TABLE STATUS FROM found_db LIKE table_like_wild)
-
-- if the --col option is on,
-    * does CREATE TABLE IF NOT EXISTS database_to_write.`col`
-    * for every found table,
-      fills database_to_write.`col` with the output of 
-      SHOW COLUMNS FROM found_tbl FROM found_db
-
-- if the --idx option is on,
-    * does CREATE TABLE IF NOT EXISTS database_to_write.`idx`
-    * for every found table,
-      fills database_to_write.`idx` with the output of 
-      SHOW INDEX FROM found_tbl FROM found_db
-
-Some options may modify this general scheme (see below).
-
-As mentioned, the contents of the info tables are the output of
-SHOW commands. In fact the contents are slightly more complete :
-
-- the `tbl` (or `tbl_status`) info table 
-  has an extra column which contains the database name,
-
-- the `col` info table
-  has an extra column which contains the table name,
-  and an extra column which contains, for each described column,
-  the number of this column in the table owning it (this extra column
-  is called `Seq_in_table`). `Seq_in_table` makes it possible for you
-  to retrieve your columns in sorted order, when you are querying
-  the `col` table. 
-
-- the `index` info table
-  has an extra column which contains the database name.
-
-Caution: info tables contain certain columns (e.g.
-Database, Table, Null...) whose names, as they are MySQL reserved words,
-need to be backquoted (`...`) when used in SQL statements.
-
-Caution: as information fetching and info tables filling happen at the
-same time, info tables may contain inaccurate information about
-themselves.
-
-=head1 OPTIONS
-
-=over 4
-
-=item --clear
-
-Does DROP TABLE on the info tables (only those that the program is
-going to fill, for example if you do not use --col it won't drop
-the `col` table) and processes normally. Does not drop database_to_write.
-
-=item --clear-only
-
-Same as --clear but exits after the DROPs.
-
-=item --col
-
-Adds columns information (into table `col`).
-
-=item --idx
-
-Adds index information (into table `idx`).
-
-=item --prefix prefix
-
-The info tables are named from the concatenation of prefix and,
-respectively, db, tbl (or tbl_status), col, idx. Do not quote ('')
-or backquote (``) prefix.
-
-=item -q, --quiet
-
-Does not warn you about what the script is going to do (DROP TABLE etc)
-and does not ask for a confirmation before starting.
-
-=item --tbl-status
-
-Instead of using SHOW TABLES, uses SHOW TABLE STATUS
-(much more complete information, but slower). 
-
-=item --help
-
-Display helpscreen and exit
-
-=item -u, --user=#         
-
-user for database login if not current user. Give a user
-who has sufficient privileges (CREATE, ...).
-
-=item -p, --password=#     
-
-password to use when connecting to server
-
-=item -h, --host=#     
-
-host to connect to
-
-=item -P, --port=#         
-
-port to use when connecting to server
-
-=item -S, --socket=#         
-
-UNIX domain socket to use when connecting to server
-
-=head1 WARRANTY
-
-This software is free and comes without warranty of any kind.
-
-Patches adding bug fixes, documentation and new features are welcome.
-
-=head1 TO DO
-
-Nothing: starting from MySQL 5.0, this program is replaced by the
-INFORMATION_SCHEMA pseudo-database.
-
-=head1 AUTHOR
-
-2002-06-18 Guilhem Bichot (guilhem.bichot@mines-paris.org)
-
-And all the authors of mysqlhotcopy, which served as a model for 
-the structure of the program.
diff --git a/server-tools/Makefile.am b/server-tools/Makefile.am
index ed316b9ac38..a249a6f6792 100644
--- a/server-tools/Makefile.am
+++ b/server-tools/Makefile.am
@@ -1 +1,2 @@
-SUBDIRS= instance-manager
+SUBDIRS = . instance-manager
+DIST_SUBDIRS = . instance-manager
diff --git a/sql/Makefile.am b/sql/Makefile.am
index cabb4fee905..b1b14db4cb7 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -29,9 +29,9 @@ libexec_PROGRAMS =	mysqld
 noinst_PROGRAMS =	gen_lex_hash
 bin_PROGRAMS =		mysql_tzinfo_to_sql
 gen_lex_hash_LDFLAGS =  @NOINST_LDFLAGS@
-LDADD =			$(top_builddir)/myisam/libmyisam.a \
-			$(top_builddir)/myisammrg/libmyisammrg.a \
-			$(top_builddir)/heap/libheap.a \
+LDADD =			$(top_builddir)/storage/myisam/libmyisam.a \
+			$(top_builddir)/storage/myisammrg/libmyisammrg.a \
+			$(top_builddir)/storage/heap/libheap.a \
 			$(top_builddir)/vio/libvio.a \
 			$(top_builddir)/mysys/libmysys.a \
 			$(top_builddir)/dbug/libdbug.a \
@@ -55,7 +55,7 @@ noinst_HEADERS =	item.h item_func.h item_sum.h item_cmpfunc.h \
 			ha_ndbcluster.h opt_range.h protocol.h \
 			sql_select.h structs.h table.h sql_udf.h hash_filo.h\
 			lex.h lex_symbol.h sql_acl.h sql_crypt.h  \
-			log_event.h sql_repl.h slave.h \
+			log_event.h sql_repl.h slave.h rpl_filter.h \
 			stacktrace.h sql_sort.h sql_cache.h set_var.h \
 			spatial.h gstream.h client_settings.h tzfile.h \
                         tztime.h my_decimal.h\
@@ -89,7 +89,8 @@ mysqld_SOURCES =	sql_lex.cc sql_handler.cc \
 			sql_db.cc sql_table.cc sql_rename.cc sql_crypt.cc \
 			sql_load.cc mf_iocache.cc field_conv.cc sql_show.cc \
 			sql_udf.cc sql_analyse.cc sql_analyse.h sql_cache.cc \
-			slave.cc sql_repl.cc sql_union.cc sql_derived.cc \
+			slave.cc sql_repl.cc rpl_filter.cc \
+                        sql_union.cc sql_derived.cc \
 			client.c sql_client.cc mini_client_errors.c pack.c\
 			stacktrace.c repl_failsafe.h repl_failsafe.cc \
 			sql_olap.cc sql_view.cc \
diff --git a/sql/examples/ha_tina.cc b/sql/examples/ha_tina.cc
index a030960d08a..8680d683a2f 100644
--- a/sql/examples/ha_tina.cc
+++ b/sql/examples/ha_tina.cc
@@ -79,7 +79,8 @@ static byte* tina_get_key(TINA_SHARE *share,uint *length,
 int get_mmap(TINA_SHARE *share, int write)
 {
   DBUG_ENTER("ha_tina::get_mmap");
-  if (share->mapped_file && munmap(share->mapped_file, share->file_stat.st_size))
+  if (share->mapped_file && my_munmap(share->mapped_file,
+                                      share->file_stat.st_size))
     DBUG_RETURN(1);
 
   if (my_fstat(share->data_file, &share->file_stat, MYF(MY_WME)) == -1)
@@ -88,13 +89,13 @@ int get_mmap(TINA_SHARE *share, int write)
   if (share->file_stat.st_size) 
   {
     if (write)
-      share->mapped_file= (byte *)mmap(NULL, share->file_stat.st_size, 
-                                       PROT_READ|PROT_WRITE, MAP_SHARED,
-                                       share->data_file, 0);
+      share->mapped_file= (byte *)my_mmap(NULL, share->file_stat.st_size,
+                                          PROT_READ|PROT_WRITE, MAP_SHARED,
+                                          share->data_file, 0);
     else
-      share->mapped_file= (byte *)mmap(NULL, share->file_stat.st_size, 
-                                       PROT_READ, MAP_PRIVATE,
-                                       share->data_file, 0);
+      share->mapped_file= (byte *)my_mmap(NULL, share->file_stat.st_size,
+                                          PROT_READ, MAP_PRIVATE,
+                                          share->data_file, 0);
     if ((share->mapped_file ==(caddr_t)-1)) 
     {
       /*
@@ -202,7 +203,7 @@ static int free_share(TINA_SHARE *share)
   if (!--share->use_count){
     /* Drop the mapped file */
     if (share->mapped_file) 
-      munmap(share->mapped_file, share->file_stat.st_size);
+      my_munmap(share->mapped_file, share->file_stat.st_size);
     result_code= my_close(share->data_file,MYF(0));
     hash_delete(&tina_open_tables, (byte*) share);
     thr_lock_delete(&share->lock);
@@ -760,7 +761,7 @@ int ha_tina::rnd_end()
     if (my_chsize(share->data_file, length, 0, MYF(MY_WME)))
       DBUG_RETURN(-1);
 
-    if (munmap(share->mapped_file, length))
+    if (my_munmap(share->mapped_file, length))
       DBUG_RETURN(-1);
 
     /* We set it to null so that get_mmap() won't try to unmap it */
diff --git a/sql/field.cc b/sql/field.cc
index 925fca8ac43..fef4195c46d 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -1231,6 +1231,7 @@ Field::Field(char *ptr_arg,uint32 length_arg,uchar *null_ptr_arg,
   flags=null_ptr ? 0: NOT_NULL_FLAG;
   comment.str= (char*) "";
   comment.length=0;
+  fieldnr= 0;
 }
 
 uint Field::offset()
diff --git a/sql/field.h b/sql/field.h
index 523cf444c30..3f6b88198db 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -88,6 +88,10 @@ public:
   uint32	field_length;		// Length of field
   uint          field_index;            // field number in fields array
   uint16	flags;
+  /* fieldnr is the id of the field (first field = 1) as is also
+     used in key_part.
+  */
+  uint16        fieldnr;
   uchar		null_bit;		// Bit used to test null bit
 
   Field(char *ptr_arg,uint32 length_arg,uchar *null_ptr_arg,uchar null_bit_arg,
diff --git a/sql/ha_federated.cc b/sql/ha_federated.cc
index 383652e4a3a..bbcae0613e7 100644
--- a/sql/ha_federated.cc
+++ b/sql/ha_federated.cc
@@ -1085,11 +1085,8 @@ inline uint field_in_record_is_null(TABLE *table,
 
 int ha_federated::write_row(byte *buf)
 {
-  uint x= 0, num_fields= 0;
+  uint x, num_fields;
   Field **field;
-  query_id_t current_query_id= 1;
-  ulong tmp_query_id= 1;
-  uint all_fields_have_same_query_id= 1;
 
   char insert_buffer[IO_SIZE];
   char values_buffer[IO_SIZE], insert_field_value_buffer[IO_SIZE];
@@ -1114,14 +1111,6 @@ int ha_federated::write_row(byte *buf)
   if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_INSERT)
     table->timestamp_field->set_time();
 
-  /*
-    get the current query id - the fields that we add to the insert
-    statement to send to the foreign will not be appended unless they match
-    this query id
-  */
-  current_query_id= table->in_use->query_id;
-  DBUG_PRINT("info", ("current query id %d", current_query_id));
-
   /* start off our string */
   insert_string.append("INSERT INTO `");
   insert_string.append(share->table_base_name);
@@ -1129,47 +1118,29 @@ int ha_federated::write_row(byte *buf)
   /* start both our field and field values strings */
   insert_string.append(" (");
   values_string.append(" VALUES (");
-
-  /*
-    Even if one field is different, all_fields_same_query_id can't remain
-    0 if it remains 0, then that means no fields were specified in the query
-    such as in the case of INSERT INTO table VALUES (val1, val2, valN)
-  */
-  for (field= table->field; *field; field++, x++)
-  {
-    if (x > 0 && tmp_query_id != (*field)->query_id)
-      all_fields_have_same_query_id= 0;
-
-    tmp_query_id= (*field)->query_id;
-  }
   /*
     loop through the field pointer array, add any fields to both the values
-    list and the fields list that match the current query id
+    list and the fields list that is part of the write set
   */
-  x=0;
-  for (field= table->field; *field; field++, x++)
+  for (num_fields= 0, field= table->field; *field; field++)
   {
     /* if there is a query id and if it's equal to the current query id */
-    if (((*field)->query_id && (*field)->query_id == current_query_id)
-        || all_fields_have_same_query_id)
+    if (ha_get_bit_in_write_set((*field)->fieldnr))
     {
       num_fields++;
 
       if ((*field)->is_null())
       {
-        DBUG_PRINT("info",
-                   ("column %d current query id %d field is_null query id %d",
-                    x, current_query_id, (*field)->query_id));
+        DBUG_PRINT("info", ("column %d field is_null", num_fields-1));
         insert_field_value_string.append("NULL");
       }
       else
       {
-        DBUG_PRINT("info",
-                   ("column %d current query id %d field is not null query ID %d",
-                    x, current_query_id, (*field)->query_id));
+        DBUG_PRINT("info", ("column %d field is not null", num_fields-1));
         (*field)->val_str(&insert_field_value_string);
         /* quote these fields if they require it */
-        (*field)->quote_data(&insert_field_value_string); }
+        (*field)->quote_data(&insert_field_value_string); 
+      }
       /* append the field name */
       insert_string.append((*field)->field_name);
 
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index e33a0939e27..4167b7c2dde 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -107,28 +107,28 @@ typedef byte	mysql_byte;
 
 /* Include necessary InnoDB headers */
 extern "C" {
-#include "../innobase/include/univ.i"
-#include "../innobase/include/os0file.h"
-#include "../innobase/include/os0thread.h"
-#include "../innobase/include/srv0start.h"
-#include "../innobase/include/srv0srv.h"
-#include "../innobase/include/trx0roll.h"
-#include "../innobase/include/trx0trx.h"
-#include "../innobase/include/trx0sys.h"
-#include "../innobase/include/mtr0mtr.h"
-#include "../innobase/include/row0ins.h"
-#include "../innobase/include/row0mysql.h"
-#include "../innobase/include/row0sel.h"
-#include "../innobase/include/row0upd.h"
-#include "../innobase/include/log0log.h"
-#include "../innobase/include/lock0lock.h"
-#include "../innobase/include/dict0crea.h"
-#include "../innobase/include/btr0cur.h"
-#include "../innobase/include/btr0btr.h"
-#include "../innobase/include/fsp0fsp.h"
-#include "../innobase/include/sync0sync.h"
-#include "../innobase/include/fil0fil.h"
-#include "../innobase/include/trx0xa.h"
+#include "../storage/innobase/include/univ.i"
+#include "../storage/innobase/include/os0file.h"
+#include "../storage/innobase/include/os0thread.h"
+#include "../storage/innobase/include/srv0start.h"
+#include "../storage/innobase/include/srv0srv.h"
+#include "../storage/innobase/include/trx0roll.h"
+#include "../storage/innobase/include/trx0trx.h"
+#include "../storage/innobase/include/trx0sys.h"
+#include "../storage/innobase/include/mtr0mtr.h"
+#include "../storage/innobase/include/row0ins.h"
+#include "../storage/innobase/include/row0mysql.h"
+#include "../storage/innobase/include/row0sel.h"
+#include "../storage/innobase/include/row0upd.h"
+#include "../storage/innobase/include/log0log.h"
+#include "../storage/innobase/include/lock0lock.h"
+#include "../storage/innobase/include/dict0crea.h"
+#include "../storage/innobase/include/btr0cur.h"
+#include "../storage/innobase/include/btr0btr.h"
+#include "../storage/innobase/include/fsp0fsp.h"
+#include "../storage/innobase/include/sync0sync.h"
+#include "../storage/innobase/include/fil0fil.h"
+#include "../storage/innobase/include/trx0xa.h"
 }
 
 #define HA_INNOBASE_ROWS_IN_TABLE 10000 /* to get optimization right */
@@ -2974,7 +2974,8 @@ build_template(
 				goto include_field;
 			}
 
-			if (thd->query_id == field->query_id) {
+			if (table->file->ha_get_bit_in_read_set(i+1) ||
+			    table->file->ha_get_bit_in_write_set(i+1)) {
 				/* This field is needed in the query */
 
 				goto include_field;
diff --git a/sql/ha_innodb.h b/sql/ha_innodb.h
index 90cae3998ed..98496e748b4 100644
--- a/sql/ha_innodb.h
+++ b/sql/ha_innodb.h
@@ -164,6 +164,16 @@ class ha_innobase: public handler
 	int transactional_table_lock(THD *thd, int lock_type);
 	int start_stmt(THD *thd);
 
+        int ha_retrieve_all_cols()
+        {
+          ha_set_all_bits_in_read_set();
+          return extra(HA_EXTRA_RETRIEVE_ALL_COLS);
+        }
+        int ha_retrieve_all_pk()
+        {
+          ha_set_primary_key_in_read_set();
+          return extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY);
+        }
   	void position(byte *record);
   	ha_rows records_in_range(uint inx, key_range *min_key, key_range
 								*max_key);
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc
index 0d9c32adbfa..27023ba4c64 100644
--- a/sql/ha_myisam.cc
+++ b/sql/ha_myisam.cc
@@ -27,8 +27,8 @@
 #ifndef MASTER
 #include "../srclib/myisam/myisamdef.h"
 #else
-#include "../myisam/myisamdef.h"
-#include "../myisam/rt_index.h"
+#include "../storage/myisam/myisamdef.h"
+#include "../storage/myisam/rt_index.h"
 #endif
 
 ulong myisam_recover_options= HA_RECOVER_NONE;
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc
index 5d3f379081c..794f1c62dd7 100644
--- a/sql/ha_myisammrg.cc
+++ b/sql/ha_myisammrg.cc
@@ -25,7 +25,7 @@
 #ifndef MASTER
 #include "../srclib/myisammrg/myrg_def.h"
 #else
-#include "../myisammrg/myrg_def.h"
+#include "../storage/myisammrg/myrg_def.h"
 #endif
 
 /*****************************************************************************
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 27019c94284..7d182d07087 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -41,7 +41,7 @@ static const int parallelism= 0;
 
 // Default value for max number of transactions
 // createable against NDB from this handler
-static const int max_transactions= 2;
+static const int max_transactions= 3; // should really be 2 but there is a transaction to much allocated when loch table is used
 
 static const char *ha_ndb_ext=".ndb";
 
@@ -854,12 +854,10 @@ int ha_ndbcluster::get_ndb_value(NdbOperation *ndb_op, Field *field,
 /*
   Check if any set or get of blob value in current query.
 */
-bool ha_ndbcluster::uses_blob_value(bool all_fields)
+bool ha_ndbcluster::uses_blob_value()
 {
   if (table->s->blob_fields == 0)
     return FALSE;
-  if (all_fields)
-    return TRUE;
   {
     uint no_fields= table->s->fields;
     int i;
@@ -868,7 +866,8 @@ bool ha_ndbcluster::uses_blob_value(bool all_fields)
     for (i= no_fields - 1; i >= 0; i--)
     {
       Field *field= table->field[i];
-      if (thd->query_id == field->query_id)
+      if ((m_write_op && ha_get_bit_in_write_set(i+1)) ||
+          (!m_write_op && ha_get_bit_in_read_set(i+1)))
       {
         return TRUE;
       }
@@ -1141,7 +1140,7 @@ int ha_ndbcluster::get_ndb_lock_type(enum thr_lock_type type)
 {
   if (type >= TL_WRITE_ALLOW_WRITE)
     return NdbOperation::LM_Exclusive;
-  else if (uses_blob_value(m_retrieve_all_fields))
+  else if (uses_blob_value())
     return NdbOperation::LM_Read;
   else
     return NdbOperation::LM_CommittedRead;
@@ -1301,9 +1300,8 @@ int ha_ndbcluster::define_read_attrs(byte* buf, NdbOperation* op)
   for (i= 0; i < table->s->fields; i++) 
   {
     Field *field= table->field[i];
-    if ((thd->query_id == field->query_id) ||
-        ((field->flags & PRI_KEY_FLAG)) || 
-        m_retrieve_all_fields)
+    if (ha_get_bit_in_read_set(i+1) ||
+        ((field->flags & PRI_KEY_FLAG)))
     {      
       if (get_ndb_value(op, field, i, buf))
         ERR_RETURN(op->getNdbError());
@@ -1330,6 +1328,7 @@ int ha_ndbcluster::define_read_attrs(byte* buf, NdbOperation* op)
   DBUG_RETURN(0);
 } 
 
+
 /*
   Read one record from NDB using primary key
 */
@@ -1344,6 +1343,7 @@ int ha_ndbcluster::pk_read(const byte *key, uint key_len, byte *buf)
   DBUG_ENTER("pk_read");
   DBUG_PRINT("enter", ("key_len: %u", key_len));
   DBUG_DUMP("key", (char*)key, key_len);
+  m_write_op= FALSE;
 
   NdbOperation::LockMode lm=
     (NdbOperation::LockMode)get_ndb_lock_type(m_lock.type);
@@ -1395,10 +1395,13 @@ int ha_ndbcluster::complemented_pk_read(const byte *old_data, byte *new_data)
   NdbOperation *op;
   THD *thd= current_thd;
   DBUG_ENTER("complemented_pk_read");
+  m_write_op= FALSE;
 
-  if (m_retrieve_all_fields)
+  if (ha_get_all_bit_in_read_set())
+  {
     // We have allready retrieved all fields, nothing to complement
     DBUG_RETURN(0);
+  }
 
   NdbOperation::LockMode lm=
     (NdbOperation::LockMode)get_ndb_lock_type(m_lock.type);
@@ -1413,7 +1416,7 @@ int ha_ndbcluster::complemented_pk_read(const byte *old_data, byte *new_data)
   {
     Field *field= table->field[i];
     if (!((field->flags & PRI_KEY_FLAG) ||
-          (thd->query_id == field->query_id)))
+          (ha_get_bit_in_read_set(i+1))))
     {
       if (get_ndb_value(op, field, i, new_data))
         ERR_RETURN(trans->getNdbError());
@@ -1437,7 +1440,7 @@ int ha_ndbcluster::complemented_pk_read(const byte *old_data, byte *new_data)
   {
     Field *field= table->field[i];
     if (!((field->flags & PRI_KEY_FLAG) ||
-          (thd->query_id == field->query_id)))
+          (ha_get_bit_in_read_set(i+1))))
     {
       m_value[i].ptr= NULL;
     }
@@ -1815,6 +1818,7 @@ int ha_ndbcluster::ordered_index_scan(const key_range *start_key,
   DBUG_PRINT("enter", ("index: %u, sorted: %d, descending: %d",
              active_index, sorted, descending));  
   DBUG_PRINT("enter", ("Starting new ordered scan on %s", m_tabname));
+  m_write_op= FALSE;
 
   // Check that sorted seems to be initialised
   DBUG_ASSERT(sorted == 0 || sorted == 1);
@@ -1874,6 +1878,7 @@ int ha_ndbcluster::full_table_scan(byte *buf)
 
   DBUG_ENTER("full_table_scan");  
   DBUG_PRINT("enter", ("Starting new scan on %s", m_tabname));
+  m_write_op= FALSE;
 
   NdbOperation::LockMode lm=
     (NdbOperation::LockMode)get_ndb_lock_type(m_lock.type);
@@ -1903,6 +1908,7 @@ int ha_ndbcluster::write_row(byte *record)
   NdbOperation *op;
   int res;
   THD *thd= current_thd;
+  m_write_op= TRUE;
 
   DBUG_ENTER("write_row");
 
@@ -2089,13 +2095,13 @@ int ha_ndbcluster::update_row(const byte *old_data, byte *new_data)
   NdbOperation *op;
   uint i;
   DBUG_ENTER("update_row");
+  m_write_op= TRUE;
   
   statistic_increment(thd->status_var.ha_update_count, &LOCK_status);
   if (table->timestamp_field_type & TIMESTAMP_AUTO_SET_ON_UPDATE)
   {
     table->timestamp_field->set_time();
-    // Set query_id so that field is really updated
-    table->timestamp_field->query_id= thd->query_id;
+    ha_set_bit_in_write_set(table->timestamp_field->fieldnr);
   }
 
   /* Check for update of primary key for special handling */  
@@ -2160,7 +2166,7 @@ int ha_ndbcluster::update_row(const byte *old_data, byte *new_data)
     if (!(op= cursor->updateCurrentTuple()))
       ERR_RETURN(trans->getNdbError());
     m_ops_pending++;
-    if (uses_blob_value(FALSE))
+    if (uses_blob_value())
       m_blobs_pending= TRUE;
   }
   else
@@ -2198,7 +2204,7 @@ int ha_ndbcluster::update_row(const byte *old_data, byte *new_data)
   for (i= 0; i < table->s->fields; i++) 
   {
     Field *field= table->field[i];
-    if (((thd->query_id == field->query_id) || m_retrieve_all_fields) &&
+    if (ha_get_bit_in_write_set(i+1) &&
         (!(field->flags & PRI_KEY_FLAG)) &&
         set_ndb_value(op, field, i))
       ERR_RETURN(op->getNdbError());
@@ -2225,6 +2231,7 @@ int ha_ndbcluster::delete_row(const byte *record)
   NdbScanOperation* cursor= m_active_cursor;
   NdbOperation *op;
   DBUG_ENTER("delete_row");
+  m_write_op= TRUE;
 
   statistic_increment(thd->status_var.ha_delete_count,&LOCK_status);
   m_rows_changed++;
@@ -2485,6 +2492,7 @@ int ha_ndbcluster::index_read(byte *buf,
   int error;
   ndb_index_type type= get_index_type(active_index);
   const KEY* key_info= table->key_info+active_index;
+  m_write_op= FALSE;
   switch (type){
   case PRIMARY_KEY_ORDERED_INDEX:
   case PRIMARY_KEY_INDEX:
@@ -2651,6 +2659,7 @@ int ha_ndbcluster::read_range_first(const key_range *start_key,
 {
   byte* buf= table->record[0];
   DBUG_ENTER("ha_ndbcluster::read_range_first");
+  m_write_op= FALSE;
   
   DBUG_RETURN(read_range_first_to_buf(start_key,
                                       end_key,
@@ -2872,83 +2881,11 @@ int ha_ndbcluster::extra(enum ha_extra_function operation)
 {
   DBUG_ENTER("extra");
   switch (operation) {
-  case HA_EXTRA_NORMAL:              /* Optimize for space (def) */
-    DBUG_PRINT("info", ("HA_EXTRA_NORMAL"));
-    break;
-  case HA_EXTRA_QUICK:                 /* Optimize for speed */
-    DBUG_PRINT("info", ("HA_EXTRA_QUICK"));
-    break;
   case HA_EXTRA_RESET:                 /* Reset database to after open */
     DBUG_PRINT("info", ("HA_EXTRA_RESET"));
     DBUG_PRINT("info", ("Clearing condition stack"));
     cond_clear();
     break;
-  case HA_EXTRA_CACHE:                 /* Cash record in HA_rrnd() */
-    DBUG_PRINT("info", ("HA_EXTRA_CACHE"));
-    break;
-  case HA_EXTRA_NO_CACHE:              /* End cacheing of records (def) */
-    DBUG_PRINT("info", ("HA_EXTRA_NO_CACHE"));
-    break;
-  case HA_EXTRA_NO_READCHECK:          /* No readcheck on update */
-    DBUG_PRINT("info", ("HA_EXTRA_NO_READCHECK"));
-    break;
-  case HA_EXTRA_READCHECK:             /* Use readcheck (def) */
-    DBUG_PRINT("info", ("HA_EXTRA_READCHECK"));
-    break;
-  case HA_EXTRA_KEYREAD:               /* Read only key to database */
-    DBUG_PRINT("info", ("HA_EXTRA_KEYREAD"));
-    break;
-  case HA_EXTRA_NO_KEYREAD:            /* Normal read of records (def) */
-    DBUG_PRINT("info", ("HA_EXTRA_NO_KEYREAD"));
-    break;
-  case HA_EXTRA_NO_USER_CHANGE:        /* No user is allowed to write */
-    DBUG_PRINT("info", ("HA_EXTRA_NO_USER_CHANGE"));
-    break;
-  case HA_EXTRA_KEY_CACHE:
-    DBUG_PRINT("info", ("HA_EXTRA_KEY_CACHE"));
-    break;
-  case HA_EXTRA_NO_KEY_CACHE:
-    DBUG_PRINT("info", ("HA_EXTRA_NO_KEY_CACHE"));
-    break;
-  case HA_EXTRA_WAIT_LOCK:            /* Wait until file is avalably (def) */
-    DBUG_PRINT("info", ("HA_EXTRA_WAIT_LOCK"));
-    break;
-  case HA_EXTRA_NO_WAIT_LOCK:         /* If file is locked, return quickly */
-    DBUG_PRINT("info", ("HA_EXTRA_NO_WAIT_LOCK"));
-    break;
-  case HA_EXTRA_WRITE_CACHE:           /* Use write cache in ha_write() */
-    DBUG_PRINT("info", ("HA_EXTRA_WRITE_CACHE"));
-    break;
-  case HA_EXTRA_FLUSH_CACHE:           /* flush write_record_cache */
-    DBUG_PRINT("info", ("HA_EXTRA_FLUSH_CACHE"));
-    break;
-  case HA_EXTRA_NO_KEYS:               /* Remove all update of keys */
-    DBUG_PRINT("info", ("HA_EXTRA_NO_KEYS"));
-    break;
-  case HA_EXTRA_KEYREAD_CHANGE_POS:         /* Keyread, but change pos */
-    DBUG_PRINT("info", ("HA_EXTRA_KEYREAD_CHANGE_POS")); /* xxxxchk -r must be used */
-    break;                                  
-  case HA_EXTRA_REMEMBER_POS:          /* Remember pos for next/prev */
-    DBUG_PRINT("info", ("HA_EXTRA_REMEMBER_POS"));
-    break;
-  case HA_EXTRA_RESTORE_POS:
-    DBUG_PRINT("info", ("HA_EXTRA_RESTORE_POS"));
-    break;
-  case HA_EXTRA_REINIT_CACHE:          /* init cache from current record */
-    DBUG_PRINT("info", ("HA_EXTRA_REINIT_CACHE"));
-    break;
-  case HA_EXTRA_FORCE_REOPEN:          /* Datafile have changed on disk */
-    DBUG_PRINT("info", ("HA_EXTRA_FORCE_REOPEN"));
-    break;
-  case HA_EXTRA_FLUSH:                 /* Flush tables to disk */
-    DBUG_PRINT("info", ("HA_EXTRA_FLUSH"));
-    break;
-  case HA_EXTRA_NO_ROWS:               /* Don't write rows */
-    DBUG_PRINT("info", ("HA_EXTRA_NO_ROWS"));
-    break;
-  case HA_EXTRA_RESET_STATE:           /* Reset positions */
-    DBUG_PRINT("info", ("HA_EXTRA_RESET_STATE"));
-    break;
   case HA_EXTRA_IGNORE_DUP_KEY:       /* Dup keys don't rollback everything*/
     DBUG_PRINT("info", ("HA_EXTRA_IGNORE_DUP_KEY"));
     if (current_thd->lex->sql_command == SQLCOM_REPLACE)
@@ -2967,34 +2904,6 @@ int ha_ndbcluster::extra(enum ha_extra_function operation)
     m_use_write= FALSE;
     m_ignore_dup_key= FALSE;
     break;
-  case HA_EXTRA_RETRIEVE_ALL_COLS:    /* Retrieve all columns, not just those
-                                         where field->query_id is the same as
-                                         the current query id */
-    DBUG_PRINT("info", ("HA_EXTRA_RETRIEVE_ALL_COLS"));
-    m_retrieve_all_fields= TRUE;
-    break;
-  case HA_EXTRA_PREPARE_FOR_DELETE:
-    DBUG_PRINT("info", ("HA_EXTRA_PREPARE_FOR_DELETE"));
-    break;
-  case HA_EXTRA_PREPARE_FOR_UPDATE:     /* Remove read cache if problems */
-    DBUG_PRINT("info", ("HA_EXTRA_PREPARE_FOR_UPDATE"));
-    break;
-  case HA_EXTRA_PRELOAD_BUFFER_SIZE: 
-    DBUG_PRINT("info", ("HA_EXTRA_PRELOAD_BUFFER_SIZE"));
-    break;
-  case HA_EXTRA_RETRIEVE_PRIMARY_KEY: 
-    DBUG_PRINT("info", ("HA_EXTRA_RETRIEVE_PRIMARY_KEY"));
-    m_retrieve_primary_key= TRUE;
-    break;
-  case HA_EXTRA_CHANGE_KEY_TO_UNIQUE: 
-    DBUG_PRINT("info", ("HA_EXTRA_CHANGE_KEY_TO_UNIQUE"));
-    break;
-  case HA_EXTRA_CHANGE_KEY_TO_DUP: 
-    DBUG_PRINT("info", ("HA_EXTRA_CHANGE_KEY_TO_DUP"));
-  case HA_EXTRA_KEYREAD_PRESERVE_FIELDS:
-    DBUG_PRINT("info", ("HA_EXTRA_KEYREAD_PRESERVE_FIELDS"));
-    break;
-
   }
   
   DBUG_RETURN(0);
@@ -3273,8 +3182,6 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type)
     DBUG_ASSERT(m_active_trans);
     // Start of transaction
     m_rows_changed= 0;
-    m_retrieve_all_fields= FALSE;
-    m_retrieve_primary_key= FALSE;
     m_ops_pending= 0;
     {
       NDBDICT *dict= ndb->getDictionary();
@@ -3410,8 +3317,6 @@ int ha_ndbcluster::start_stmt(THD *thd)
   m_active_trans= trans;
 
   // Start of statement
-  m_retrieve_all_fields= FALSE;
-  m_retrieve_primary_key= FALSE;
   m_ops_pending= 0;    
   
   DBUG_RETURN(error);
@@ -4190,8 +4095,6 @@ ha_ndbcluster::ha_ndbcluster(TABLE *table_arg):
   m_use_write(FALSE),
   m_ignore_dup_key(FALSE),
   m_primary_key_update(FALSE),
-  m_retrieve_all_fields(FALSE),
-  m_retrieve_primary_key(FALSE),
   m_rows_to_insert((ha_rows) 1),
   m_rows_inserted((ha_rows) 0),
   m_bulk_insert_rows((ha_rows) 1024),
@@ -5515,6 +5418,7 @@ ha_ndbcluster::read_multi_range_first(KEY_MULTI_RANGE **found_range_p,
                                       HANDLER_BUFFER *buffer)
 {
   DBUG_ENTER("ha_ndbcluster::read_multi_range_first");
+  m_write_op= FALSE;
   
   int res;
   KEY* key_info= table->key_info + active_index;
@@ -5522,7 +5426,7 @@ ha_ndbcluster::read_multi_range_first(KEY_MULTI_RANGE **found_range_p,
   ulong reclength= table->s->reclength;
   NdbOperation* op;
 
-  if (uses_blob_value(m_retrieve_all_fields))
+  if (uses_blob_value())
   {
     /**
      * blobs can't be batched currently
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h
index b34f8dd063c..6efc18f2f6a 100644
--- a/sql/ha_ndbcluster.h
+++ b/sql/ha_ndbcluster.h
@@ -589,7 +589,7 @@ private:
   ulonglong get_auto_increment();
   void invalidate_dictionary_cache(bool global);
   int ndb_err(NdbTransaction*);
-  bool uses_blob_value(bool all_fields);
+  bool uses_blob_value();
 
   char *update_table_comment(const char * comment);
 
@@ -640,8 +640,7 @@ private:
   bool m_use_write;
   bool m_ignore_dup_key;
   bool m_primary_key_update;
-  bool m_retrieve_all_fields;
-  bool m_retrieve_primary_key;
+  bool m_write_op;
   ha_rows m_rows_to_insert;
   ha_rows m_rows_inserted;
   ha_rows m_bulk_insert_rows;
diff --git a/sql/handler.cc b/sql/handler.cc
index a61dce35501..bf2ce0dad4e 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -203,54 +203,67 @@ enum db_type ha_checktype(THD *thd, enum db_type database_type,
 
 handler *get_new_handler(TABLE *table, enum db_type db_type)
 {
+  handler *file;
   switch (db_type) {
 #ifndef NO_HASH
   case DB_TYPE_HASH:
-    return new ha_hash(table);
+    file= new ha_hash(table);
 #endif
 #ifdef HAVE_ISAM
   case DB_TYPE_MRG_ISAM:
-    return new ha_isammrg(table);
+    file= new ha_isammrg(table);
+    break;
   case DB_TYPE_ISAM:
-    return new ha_isam(table);
+    file= new ha_isam(table);
+    break;
 #else
   case DB_TYPE_MRG_ISAM:
-    return new ha_myisammrg(table);
+    file= new ha_myisammrg(table);
+    break;
 #endif
 #ifdef HAVE_BERKELEY_DB
   case DB_TYPE_BERKELEY_DB:
-    return new ha_berkeley(table);
+    file= new ha_berkeley(table);
+    break;
 #endif
 #ifdef HAVE_INNOBASE_DB
   case DB_TYPE_INNODB:
-    return new ha_innobase(table);
+    file= new ha_innobase(table);
+    break;
 #endif
 #ifdef HAVE_EXAMPLE_DB
   case DB_TYPE_EXAMPLE_DB:
-    return new ha_example(table);
+    file= new ha_example(table);
+    break;
 #endif
 #ifdef HAVE_ARCHIVE_DB
   case DB_TYPE_ARCHIVE_DB:
-    return new ha_archive(table);
+    file= new ha_archive(table);
+    break;
 #endif
 #ifdef HAVE_BLACKHOLE_DB
   case DB_TYPE_BLACKHOLE_DB:
-    return new ha_blackhole(table);
+    file= new ha_blackhole(table);
+    break;
 #endif
 #ifdef HAVE_FEDERATED_DB
   case DB_TYPE_FEDERATED_DB:
-    return new ha_federated(table);
+    file= new ha_federated(table);
+    break;
 #endif
 #ifdef HAVE_CSV_DB
   case DB_TYPE_CSV_DB:
-    return new ha_tina(table);
+    file= new ha_tina(table);
+    break;
 #endif
 #ifdef HAVE_NDBCLUSTER_DB
   case DB_TYPE_NDBCLUSTER:
-    return new ha_ndbcluster(table);
+    file= new ha_ndbcluster(table);
+    break;
 #endif
   case DB_TYPE_HEAP:
-    return new ha_heap(table);
+    file= new ha_heap(table);
+    break;
   default:					// should never happen
   {
     enum db_type def=(enum db_type) current_thd->variables.table_type;
@@ -260,10 +273,21 @@ handler *get_new_handler(TABLE *table, enum db_type db_type)
   }
   /* Fall back to MyISAM */
   case DB_TYPE_MYISAM:
-    return new ha_myisam(table);
+    file= new ha_myisam(table);
+    break;
   case DB_TYPE_MRG_MYISAM:
-    return new ha_myisammrg(table);
+    file= new ha_myisammrg(table);
+    break;
   }
+  if (file)
+  {
+    if (file->ha_initialise())
+    {
+      delete file;
+      file=0;
+    }
+  }
+  return file;
 }
 
 /*
@@ -1363,6 +1387,95 @@ int handler::ha_open(const char *name, int mode, int test_if_locked)
   DBUG_RETURN(error);
 }
 
+int handler::ha_initialise()
+{
+  DBUG_ENTER("ha_initialise");
+  if (table && table->s->fields &&
+      ha_allocate_read_write_set(table->s->fields))
+  {
+    DBUG_RETURN(TRUE);
+  }
+  DBUG_RETURN(FALSE);
+}
+
+int handler::ha_allocate_read_write_set(ulong no_fields)
+{
+  uint bitmap_size= 4*(((no_fields+1)+31)/32);
+  uint32 *read_buf, *write_buf;
+#ifndef DEBUG_OFF
+  my_bool r;
+#endif
+  DBUG_ENTER("ha_allocate_read_write_set");
+  DBUG_PRINT("info", ("no_fields = %d", no_fields));
+  read_set= (MY_BITMAP*)sql_alloc(sizeof(MY_BITMAP));
+  write_set= (MY_BITMAP*)sql_alloc(sizeof(MY_BITMAP));
+  read_buf= (uint32*)sql_alloc(bitmap_size);
+  write_buf= (uint32*)sql_alloc(bitmap_size);
+  if (!read_set || !write_set || !read_buf || !write_buf)
+  {
+    ha_deallocate_read_write_set();
+    DBUG_RETURN(TRUE);
+  }
+#ifndef DEBUG_OFF
+  r =
+#endif
+    bitmap_init(read_set, read_buf, no_fields+1, FALSE);
+  DBUG_ASSERT(!r /*bitmap_init(read_set...)*/);
+#ifndef DEBUG_OFF
+  r =
+#endif
+    bitmap_init(write_set, write_buf, no_fields+1, FALSE);
+  DBUG_ASSERT(!r /*bitmap_init(write_set...)*/);
+  ha_clear_all_set();
+  DBUG_RETURN(FALSE);
+}
+
+void handler::ha_deallocate_read_write_set()
+{
+  DBUG_ENTER("ha_deallocate_read_write_set");
+  read_set=write_set=0;
+  DBUG_VOID_RETURN;
+}
+
+void handler::ha_clear_all_set()
+{
+  DBUG_ENTER("ha_clear_all_set");
+  bitmap_clear_all(read_set);
+  bitmap_clear_all(write_set);
+  bitmap_set_bit(read_set, 0);
+  bitmap_set_bit(write_set, 0);
+  DBUG_VOID_RETURN;
+}
+
+int handler::ha_retrieve_all_cols()
+{
+  DBUG_ENTER("handler::ha_retrieve_all_cols");
+  bitmap_set_all(read_set);
+  DBUG_RETURN(0);
+}
+
+int handler::ha_retrieve_all_pk()
+{
+  DBUG_ENTER("ha_retrieve_all_pk");
+  ha_set_primary_key_in_read_set();
+  DBUG_RETURN(0);
+}
+
+void handler::ha_set_primary_key_in_read_set()
+{
+  ulong prim_key= table->s->primary_key;
+  DBUG_ENTER("handler::ha_set_primary_key_in_read_set");
+  DBUG_PRINT("info", ("Primary key = %d", prim_key));
+  if (prim_key != MAX_KEY)
+  {
+    KEY_PART_INFO *key_part= table->key_info[prim_key].key_part;
+    KEY_PART_INFO *key_part_end= key_part +
+              table->key_info[prim_key].key_parts;
+    for (;key_part != key_part_end; ++key_part)
+      ha_set_bit_in_read_set(key_part->fieldnr);
+  }
+  DBUG_VOID_RETURN;
+}
 /*
   Read first row (only) from a table
   This is never called for InnoDB or BDB tables, as these table types
diff --git a/sql/handler.h b/sql/handler.h
index df906e284e7..d7fe19ad884 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -444,6 +444,8 @@ class handler :public Sql_alloc
   virtual int rnd_init(bool scan) =0;
   virtual int rnd_end() { return 0; }
 
+private:
+  virtual int reset() { return extra(HA_EXTRA_RESET); }
 public:
   byte *ref;				/* Pointer to current row */
   byte *dupp_ref;			/* Pointer to dupp row */
@@ -485,6 +487,8 @@ public:
   bool  auto_increment_column_changed;
   bool implicit_emptied;                /* Can be !=0 only if HEAP */
   const COND *pushed_cond;
+  MY_BITMAP *read_set;
+  MY_BITMAP *write_set;
 
   handler(TABLE *table_arg) :table(table_arg),
     ref(0), data_file_length(0), max_data_file_length(0), index_file_length(0),
@@ -496,7 +500,12 @@ public:
     raid_type(0), ft_handler(0), inited(NONE), implicit_emptied(0),
     pushed_cond(NULL)
     {}
-  virtual ~handler(void) { /* TODO: DBUG_ASSERT(inited == NONE); */ }
+  virtual ~handler(void)
+  {
+    ha_deallocate_read_write_set();
+    /* TODO: DBUG_ASSERT(inited == NONE); */
+  }
+  virtual int ha_initialise();
   int ha_open(const char *name, int mode, int test_if_locked);
   bool update_auto_increment();
   virtual void print_error(int error, myf errflag);
@@ -556,11 +565,140 @@ public:
     inited=NONE;
     DBUG_RETURN(rnd_end());
   }
+  int ha_reset()
+  {
+    DBUG_ENTER("ha_reset");
+    ha_clear_all_set();
+    DBUG_RETURN(reset());
+  }
+    
   /* this is necessary in many places, e.g. in HANDLER command */
   int ha_index_or_rnd_end()
   {
     return inited == INDEX ? ha_index_end() : inited == RND ? ha_rnd_end() : 0;
   }
+  /*
+    These are a set of routines used to enable handlers to only read/write
+    partial lists of the fields in the table. The bit vector is maintained
+    by the server part and is used by the handler at calls to read/write
+    data in the table.
+    It replaces the use of query id's for this purpose. The benefit is that
+    the handler can also set bits in the read/write set if it has special
+    needs and it is also easy for other parts of the server to interact
+    with the handler (e.g. the replication part for row-level logging).
+    The routines are all part of the general handler and are not possible
+    to override by a handler. A handler can however set/reset bits by
+    calling these routines.
+
+    The methods ha_retrieve_all_cols and ha_retrieve_all_pk are made
+    virtual to handle InnoDB specifics. If InnoDB doesn't need the
+    extra parameters HA_EXTRA_RETRIEVE_ALL_COLS and
+    HA_EXTRA_RETRIEVE_PRIMARY_KEY anymore then these methods need not be
+    virtual anymore.
+  */
+  virtual int ha_retrieve_all_cols();
+  virtual int ha_retrieve_all_pk();
+  void ha_set_all_bits_in_read_set()
+  {
+    DBUG_ENTER("ha_set_all_bits_in_read_set");
+    bitmap_set_all(read_set);
+    DBUG_VOID_RETURN;
+  }
+  void ha_set_all_bits_in_write_set()
+  {
+    DBUG_ENTER("ha_set_all_bits_in_write_set");
+    bitmap_set_all(write_set);
+    DBUG_VOID_RETURN;
+  }
+  void ha_set_bit_in_read_set(uint fieldnr)
+  {
+    DBUG_ENTER("ha_set_bit_in_read_set");
+    DBUG_PRINT("info", ("fieldnr = %d", fieldnr));
+    bitmap_set_bit(read_set, fieldnr);
+    DBUG_VOID_RETURN;
+  }
+  void ha_clear_bit_in_read_set(uint fieldnr)
+  {
+    DBUG_ENTER("ha_clear_bit_in_read_set");
+    DBUG_PRINT("info", ("fieldnr = %d", fieldnr));
+    bitmap_clear_bit(read_set, fieldnr);
+    DBUG_VOID_RETURN;
+  }
+  void ha_set_bit_in_write_set(uint fieldnr)
+  {
+    DBUG_ENTER("ha_set_bit_in_write_set");
+    DBUG_PRINT("info", ("fieldnr = %d", fieldnr));
+    bitmap_set_bit(write_set, fieldnr);
+    DBUG_VOID_RETURN;
+  }
+  void ha_clear_bit_in_write_set(uint fieldnr)
+  {
+    DBUG_ENTER("ha_clear_bit_in_write_set");
+    DBUG_PRINT("info", ("fieldnr = %d", fieldnr));
+    bitmap_clear_bit(write_set, fieldnr);
+    DBUG_VOID_RETURN;
+  }
+  void ha_set_bit_in_rw_set(uint fieldnr, bool write_op)
+  {
+    DBUG_ENTER("ha_set_bit_in_rw_set");
+    DBUG_PRINT("info", ("Set bit %u in read set", fieldnr));
+    bitmap_set_bit(read_set, fieldnr);
+    if (!write_op) {
+      DBUG_VOID_RETURN;
+    }
+    else
+    {
+      DBUG_PRINT("info", ("Set bit %u in read and write set", fieldnr));
+      bitmap_set_bit(write_set, fieldnr);
+    }
+    DBUG_VOID_RETURN;
+  }
+  bool ha_get_bit_in_read_set(uint fieldnr)
+  {
+    bool bit_set=bitmap_is_set(read_set,fieldnr);
+    DBUG_ENTER("ha_get_bit_in_read_set");
+    DBUG_PRINT("info", ("bit %u = %u", fieldnr, bit_set));
+    DBUG_RETURN(bit_set);
+  }
+  bool ha_get_bit_in_write_set(uint fieldnr)
+  {
+    bool bit_set=bitmap_is_set(write_set,fieldnr);
+    DBUG_ENTER("ha_get_bit_in_write_set");
+    DBUG_PRINT("info", ("bit %u = %u", fieldnr, bit_set));
+    DBUG_RETURN(bit_set);
+  }
+  bool ha_get_all_bit_in_read_set()
+  {
+    bool all_bits_set= bitmap_is_set_all(read_set);
+    DBUG_ENTER("ha_get_all_bit_in_read_set");
+    DBUG_PRINT("info", ("all bits set = %u", all_bits_set));
+    DBUG_RETURN(all_bits_set);
+  }
+  bool ha_get_all_bit_in_read_clear()
+  {
+    bool all_bits_set= bitmap_is_clear_all(read_set);
+    DBUG_ENTER("ha_get_all_bit_in_read_clear");
+    DBUG_PRINT("info", ("all bits clear = %u", all_bits_set));
+    DBUG_RETURN(all_bits_set);
+  }
+  bool ha_get_all_bit_in_write_set()
+  {
+    bool all_bits_set= bitmap_is_set_all(write_set);
+    DBUG_ENTER("ha_get_all_bit_in_write_set");
+    DBUG_PRINT("info", ("all bits set = %u", all_bits_set));
+    DBUG_RETURN(all_bits_set);
+  }
+  bool ha_get_all_bit_in_write_clear()
+  {
+    bool all_bits_set= bitmap_is_clear_all(write_set);
+    DBUG_ENTER("ha_get_all_bit_in_write_clear");
+    DBUG_PRINT("info", ("all bits clear = %u", all_bits_set));
+    DBUG_RETURN(all_bits_set);
+  }
+  void ha_set_primary_key_in_read_set();
+  int ha_allocate_read_write_set(ulong no_fields);
+  void ha_deallocate_read_write_set();
+  void ha_clear_all_set();
   uint get_index(void) const { return active_index; }
   virtual int open(const char *name, int mode, uint test_if_locked)=0;
   virtual int close(void)=0;
@@ -569,6 +707,85 @@ public:
    { return  HA_ERR_WRONG_COMMAND; }
   virtual int delete_row(const byte * buf)
    { return  HA_ERR_WRONG_COMMAND; }
+  /*
+    SYNOPSIS
+      start_bulk_update()
+    RETURN
+      0   Bulk update used by handler
+      1   Bulk update not used, normal operation used
+  */
+  virtual bool start_bulk_update() { return 1; }
+  /*
+    SYNOPSIS
+      start_bulk_delete()
+    RETURN
+      0   Bulk delete used by handler
+      1   Bulk delete not used, normal operation used
+  */
+  virtual bool start_bulk_delete() { return 1; }
+  /*
+    SYNOPSIS
+    This method is similar to update_row, however the handler doesn't need
+    to execute the updates at this point in time. The handler can be certain
+    that another call to bulk_update_row will occur OR a call to
+    exec_bulk_update before the set of updates in this query is concluded.
+
+      bulk_update_row()
+        old_data       Old record
+        new_data       New record
+        dup_key_found  Number of duplicate keys found
+    RETURN
+      0   Bulk delete used by handler
+      1   Bulk delete not used, normal operation used
+  */
+  virtual int bulk_update_row(const byte *old_data, byte *new_data,
+                              uint *dup_key_found)
+  {
+    DBUG_ASSERT(FALSE);
+    return HA_ERR_WRONG_COMMAND;
+  }
+  /*
+    SYNOPSIS
+    After this call all outstanding updates must be performed. The number
+    of duplicate key errors are reported in the duplicate key parameter.
+    It is allowed to continue to the batched update after this call, the
+    handler has to wait until end_bulk_update with changing state.
+
+      exec_bulk_update()
+        dup_key_found       Number of duplicate keys found
+    RETURN
+      0           Success
+      >0          Error code
+  */
+  virtual int exec_bulk_update(uint *dup_key_found)
+  {
+    DBUG_ASSERT(FALSE);
+    return HA_ERR_WRONG_COMMAND;
+  }
+  /*
+    SYNOPSIS
+    Perform any needed clean-up, no outstanding updates are there at the
+    moment.
+
+      end_bulk_update()
+    RETURN
+      Nothing
+  */
+  virtual void end_bulk_update() { return; }
+  /*
+    SYNOPSIS
+    Execute all outstanding deletes and close down the bulk delete.
+
+      end_bulk_delete()
+    RETURN
+    0             Success
+    >0            Error code
+  */
+  virtual int end_bulk_delete()
+  {
+    DBUG_ASSERT(FALSE);
+    return HA_ERR_WRONG_COMMAND;
+  }
   virtual int index_read(byte * buf, const byte * key,
 			 uint key_len, enum ha_rkey_function find_flag)
    { return  HA_ERR_WRONG_COMMAND; }
@@ -619,7 +836,6 @@ public:
   { return 0; }
   virtual int extra_opt(enum ha_extra_function operation, ulong cache_size)
   { return extra(operation); }
-  virtual int reset() { return extra(HA_EXTRA_RESET); }
   virtual int external_lock(THD *thd, int lock_type) { return 0; }
   virtual void unlock_row() {}
   virtual int start_stmt(THD *thd) {return 0;}
diff --git a/sql/item.cc b/sql/item.cc
index 4679b62643e..c210ea3ca45 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -3039,13 +3039,18 @@ bool Item_field::fix_fields(THD *thd, Item **reference)
 
     set_field(from_field);
   }
-  else if (thd->set_query_id && field->query_id != thd->query_id)
+  else if (thd->set_query_id)
   {
-    /* We only come here in unions */
-    TABLE *table=field->table;
-    field->query_id=thd->query_id;
-    table->used_fields++;
-    table->used_keys.intersect(field->part_of_key);
+    TABLE *table= field->table;
+    table->file->ha_set_bit_in_rw_set(field->fieldnr,
+                                      (bool)(thd->set_query_id-1));
+    if (field->query_id != thd->query_id)
+    {
+      /* We only come here in unions */
+      field->query_id=thd->query_id;
+      table->used_fields++;
+      table->used_keys.intersect(field->part_of_key);
+    }
   }
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
   if (any_privileges)
diff --git a/sql/lock.cc b/sql/lock.cc
index e0a75a42661..01bc2fc303f 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -72,7 +72,7 @@ TODO:
 #ifndef MASTER
 #include "../srclib/myisammrg/myrg_def.h"
 #else
-#include "../myisammrg/myrg_def.h"
+#include "../storage/myisammrg/myrg_def.h"
 #endif
 
 static MYSQL_LOCK *get_lock_data(THD *thd, TABLE **table,uint count,
@@ -197,7 +197,6 @@ static int lock_external(THD *thd, TABLE **tables, uint count)
 	((*tables)->reginfo.lock_type >= TL_READ &&
 	 (*tables)->reginfo.lock_type <= TL_READ_NO_INSERT))
       lock_type=F_RDLCK;
-
     if ((error=(*tables)->file->external_lock(thd,lock_type)))
     {
       print_lock_error(error, (*tables)->file->table_type());
diff --git a/sql/log.cc b/sql/log.cc
index e69c0af15bd..b1b558a1915 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -24,6 +24,7 @@
 
 #include "mysql_priv.h"
 #include "sql_repl.h"
+#include "rpl_filter.h"
 
 #include <my_dir.h>
 #include <stdarg.h>
@@ -1574,10 +1575,11 @@ bool MYSQL_LOG::write(Log_event *event_info)
         binlog_[wild_]{do|ignore}_table?" (WL#1049)"
     */
     if ((thd && !(thd->options & OPTION_BIN_LOG)) ||
-	(!db_ok(local_db, binlog_do_db, binlog_ignore_db)))
+	(!binlog_filter->db_ok(local_db)))
     {
       VOID(pthread_mutex_unlock(&LOCK_log));
-      DBUG_PRINT("error",("!db_ok('%s')", local_db));
+      DBUG_PRINT("info",("db_ok('%s')==%d", local_db, 
+			 binlog_filter->db_ok(local_db)));
       DBUG_RETURN(0);
     }
 #endif /* HAVE_REPLICATION */
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 0873ee50743..1519cfb6630 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -23,6 +23,7 @@
 
 #include  "mysql_priv.h"
 #include "slave.h"
+#include "rpl_filter.h"
 #include <my_dir.h>
 #endif /* MYSQL_CLIENT */
 
@@ -1524,7 +1525,7 @@ int Query_log_event::exec_event(struct st_relay_log_info* rli, const char *query
   */
   thd->catalog= catalog_len ? (char *) catalog : (char *)"";
   thd->db_length= db_len;
-  thd->db= (char*) rewrite_db(db, &thd->db_length);
+  thd->db= (char *) rpl_filter->get_rewrite_db(db, &thd->db_length);
   thd->variables.auto_increment_increment= auto_increment_increment;
   thd->variables.auto_increment_offset=    auto_increment_offset;
 
@@ -1543,7 +1544,7 @@ int Query_log_event::exec_event(struct st_relay_log_info* rli, const char *query
 
   clear_all_errors(thd, rli);
 
-  if (db_ok(thd->db, replicate_do_db, replicate_ignore_db))
+  if (rpl_filter->db_ok(thd->db))
   {
     thd->set_time((time_t)when);
     thd->query_length= q_len_arg;
@@ -2664,7 +2665,7 @@ int Load_log_event::exec_event(NET* net, struct st_relay_log_info* rli,
 			       bool use_rli_only_for_errors)
 {
   thd->db_length= db_len;
-  thd->db= (char*) rewrite_db(db, &thd->db_length);
+  thd->db= (char *) rpl_filter->get_rewrite_db(db, &thd->db_length);
   DBUG_ASSERT(thd->query == 0);
   thd->query_length= 0;                         // Should not be needed
   thd->query_error= 0;
@@ -2693,7 +2694,7 @@ int Load_log_event::exec_event(NET* net, struct st_relay_log_info* rli,
     al. Another way is do the filtering in the I/O thread (more efficient: no
     disk writes at all).
   */
-  if (db_ok(thd->db, replicate_do_db, replicate_ignore_db))
+  if (rpl_filter->db_ok(thd->db))
   {
     thd->set_time((time_t)when);
     VOID(pthread_mutex_lock(&LOCK_thread_count));
@@ -2715,7 +2716,7 @@ int Load_log_event::exec_event(NET* net, struct st_relay_log_info* rli,
     tables.updating= 1;
 
     // the table will be opened in mysql_load    
-    if (table_rules_on && !tables_ok(thd, &tables))
+    if (rpl_filter->is_on() && !rpl_filter->tables_ok(thd->db, &tables))
     {
       // TODO: this is a bug - this needs to be moved to the I/O thread
       if (net)
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 9a3684c3865..122ac08c389 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -904,7 +904,7 @@ bool setup_tables(THD *thd, Name_resolution_context *context,
 int setup_wild(THD *thd, TABLE_LIST *tables, List<Item> &fields,
 	       List<Item> *sum_func_list, uint wild_num);
 bool setup_fields(THD *thd, Item** ref_pointer_array,
-                  List<Item> &item, bool set_query_id,
+                  List<Item> &item, ulong set_query_id,
                   List<Item> *sum_func_list, bool allow_sum_func);
 inline bool setup_fields_with_no_wrap(THD *thd, Item **ref_pointer_array,
                                      List<Item> &item, bool set_query_id,
@@ -1172,7 +1172,6 @@ extern KNOWN_DATE_TIME_FORMAT known_date_time_formats[];
 extern String null_string;
 extern HASH open_cache;
 extern TABLE *unused_tables;
-extern I_List<i_string> binlog_do_db, binlog_ignore_db;
 extern const char* any_db;
 extern struct my_option my_long_options[];
 
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 78d9af387da..30bb84a3cb4 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -19,6 +19,7 @@
 #include <my_dir.h>
 #include "slave.h"
 #include "sql_repl.h"
+#include "rpl_filter.h"
 #include "repl_failsafe.h"
 #include "stacktrace.h"
 #include "mysqld_suffix.h"
@@ -411,12 +412,10 @@ Le_creator le_creator;
 FILE *bootstrap_file;
 int bootstrap_error;
 
-I_List<i_string_pair> replicate_rewrite_db;
-I_List<i_string> replicate_do_db, replicate_ignore_db;
-// allow the user to tell us which db to replicate and which to ignore
-I_List<i_string> binlog_do_db, binlog_ignore_db;
 I_List<THD> threads;
 I_List<NAMED_LIST> key_caches;
+Rpl_filter* rpl_filter;
+Rpl_filter* binlog_filter;
 
 struct system_variables global_system_variables;
 struct system_variables max_system_variables;
@@ -1027,12 +1026,9 @@ void clean_up(bool print_message)
   free_max_user_conn();
 #ifdef HAVE_REPLICATION
   end_slave_list();
-  free_list(&replicate_do_db);
-  free_list(&replicate_ignore_db);
-  free_list(&binlog_do_db);
-  free_list(&binlog_ignore_db);
-  free_list(&replicate_rewrite_db);
 #endif
+  delete binlog_filter;
+  delete rpl_filter;
 #ifdef HAVE_OPENSSL
   if (ssl_acceptor_fd)
     my_free((gptr) ssl_acceptor_fd, MYF(MY_ALLOW_ZERO_PTR));
@@ -2993,6 +2989,15 @@ int main(int argc, char **argv)
 #endif
 {
   DEBUGGER_OFF;
+
+  rpl_filter= new Rpl_filter;
+  binlog_filter= new Rpl_filter;
+  if (!rpl_filter || !binlog_filter) 
+  {
+    sql_perror("Could not allocate replication and binlog filters");
+    exit(1);
+  }
+
   MY_INIT(argv[0]);		// init my_sys library & pthreads
 
 #ifdef _CUSTOMSTARTUPCONFIG_
@@ -3374,7 +3379,6 @@ default_service_handling(char **argv,
 
 int main(int argc, char **argv)
 {
-
   /*
     When several instances are running on the same machine, we
     need to have an  unique  named  hEventShudown  through the
@@ -5996,13 +6000,6 @@ static void mysql_init_variables(void)
     exit(1);
   multi_keycache_init(); /* set key_cache_hash.default_value = dflt_key_cache */
 
-  /* Initialize structures that is used when processing options */
-  replicate_rewrite_db.empty();
-  replicate_do_db.empty();
-  replicate_ignore_db.empty();
-  binlog_do_db.empty();
-  binlog_ignore_db.empty();
-
   /* Set directory paths */
   strmake(language, LANGUAGE, sizeof(language)-1);
   strmake(mysql_real_data_home, get_relative_path(DATADIR),
@@ -6248,14 +6245,12 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
   }
   case (int)OPT_REPLICATE_IGNORE_DB:
   {
-    i_string *db = new i_string(argument);
-    replicate_ignore_db.push_back(db);
+    rpl_filter->add_ignore_db(argument);
     break;
   }
   case (int)OPT_REPLICATE_DO_DB:
   {
-    i_string *db = new i_string(argument);
-    replicate_do_db.push_back(db);
+    rpl_filter->add_do_db(argument);
     break;
   }
   case (int)OPT_REPLICATE_REWRITE_DB:
@@ -6288,71 +6283,54 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
       exit(1);
     }
 
-    i_string_pair *db_pair = new i_string_pair(key, val);
-    replicate_rewrite_db.push_back(db_pair);
+    rpl_filter->add_db_rewrite(key, val);
     break;
   }
 
   case (int)OPT_BINLOG_IGNORE_DB:
   {
-    i_string *db = new i_string(argument);
-    binlog_ignore_db.push_back(db);
+    binlog_filter->add_ignore_db(argument);
     break;
   }
   case (int)OPT_BINLOG_DO_DB:
   {
-    i_string *db = new i_string(argument);
-    binlog_do_db.push_back(db);
+    binlog_filter->add_do_db(argument);
     break;
   }
   case (int)OPT_REPLICATE_DO_TABLE:
   {
-    if (!do_table_inited)
-      init_table_rule_hash(&replicate_do_table, &do_table_inited);
-    if (add_table_rule(&replicate_do_table, argument))
+    if (rpl_filter->add_do_table(argument))
     {
       fprintf(stderr, "Could not add do table rule '%s'!\n", argument);
       exit(1);
     }
-    table_rules_on = 1;
     break;
   }
   case (int)OPT_REPLICATE_WILD_DO_TABLE:
   {
-    if (!wild_do_table_inited)
-      init_table_rule_array(&replicate_wild_do_table,
-			    &wild_do_table_inited);
-    if (add_wild_table_rule(&replicate_wild_do_table, argument))
+    if (rpl_filter->add_wild_do_table(argument))
     {
       fprintf(stderr, "Could not add do table rule '%s'!\n", argument);
       exit(1);
     }
-    table_rules_on = 1;
     break;
   }
   case (int)OPT_REPLICATE_WILD_IGNORE_TABLE:
   {
-    if (!wild_ignore_table_inited)
-      init_table_rule_array(&replicate_wild_ignore_table,
-			    &wild_ignore_table_inited);
-    if (add_wild_table_rule(&replicate_wild_ignore_table, argument))
+    if (rpl_filter->add_wild_ignore_table(argument))
     {
       fprintf(stderr, "Could not add ignore table rule '%s'!\n", argument);
       exit(1);
     }
-    table_rules_on = 1;
     break;
   }
   case (int)OPT_REPLICATE_IGNORE_TABLE:
   {
-    if (!ignore_table_inited)
-      init_table_rule_hash(&replicate_ignore_table, &ignore_table_inited);
-    if (add_table_rule(&replicate_ignore_table, argument))
+    if (rpl_filter->add_ignore_table(argument))
     {
       fprintf(stderr, "Could not add ignore table rule '%s'!\n", argument);
       exit(1);
     }
-    table_rules_on = 1;
     break;
   }
 #endif /* HAVE_REPLICATION */
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index c2760b08b6e..e04e15788fa 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -778,9 +778,10 @@ QUICK_RANGE_SELECT::~QUICK_RANGE_SELECT()
       {
         DBUG_PRINT("info", ("Freeing separate handler %p (free=%d)", file,
                             free_file));
-        file->reset();
+        file->ha_reset();
         file->external_lock(current_thd, F_UNLCK);
         file->close();
+        delete file;
       }
     }
     delete_dynamic(&ranges); /* ranges are allocated in alloc */
@@ -916,7 +917,7 @@ int QUICK_RANGE_SELECT::init_ror_merged_scan(bool reuse_handler)
   {
     DBUG_PRINT("info", ("Reusing handler %p", file));
     if (file->extra(HA_EXTRA_KEYREAD) ||
-        file->extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) ||
+        file->ha_retrieve_all_pk() ||
         init() || reset())
     {
       DBUG_RETURN(1);
@@ -944,7 +945,7 @@ int QUICK_RANGE_SELECT::init_ror_merged_scan(bool reuse_handler)
     goto failure;
 
   if (file->extra(HA_EXTRA_KEYREAD) ||
-      file->extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) ||
+      file->ha_retrieve_all_pk() ||
       init() || reset())
   {
     file->external_lock(thd, F_UNLCK);
@@ -956,6 +957,8 @@ int QUICK_RANGE_SELECT::init_ror_merged_scan(bool reuse_handler)
   DBUG_RETURN(0);
 
 failure:
+  if (file)
+    delete file;
   file= save_file;
   DBUG_RETURN(1);
 }
@@ -1562,9 +1565,10 @@ static int fill_used_fields_bitmap(PARAM *param)
 {
   TABLE *table= param->table;
   param->fields_bitmap_size= (table->s->fields/8 + 1);
-  uchar *tmp;
+  uint32 *tmp;
   uint pk;
-  if (!(tmp= (uchar*)alloc_root(param->mem_root,param->fields_bitmap_size)) ||
+  if (!(tmp= (uint32*)alloc_root(param->mem_root,
+    bytes_word_aligned(param->fields_bitmap_size))) ||
       bitmap_init(&param->needed_fields, tmp, param->fields_bitmap_size*8,
                   FALSE))
     return 1;
@@ -2307,7 +2311,7 @@ static
 ROR_SCAN_INFO *make_ror_scan(const PARAM *param, int idx, SEL_ARG *sel_arg)
 {
   ROR_SCAN_INFO *ror_scan;
-  uchar *bitmap_buf;
+  uint32 *bitmap_buf;
   uint keynr;
   DBUG_ENTER("make_ror_scan");
 
@@ -2322,8 +2326,8 @@ ROR_SCAN_INFO *make_ror_scan(const PARAM *param, int idx, SEL_ARG *sel_arg)
   ror_scan->sel_arg= sel_arg;
   ror_scan->records= param->table->quick_rows[keynr];
 
-  if (!(bitmap_buf= (uchar*)alloc_root(param->mem_root,
-                                       param->fields_bitmap_size)))
+  if (!(bitmap_buf= (uint32*)alloc_root(param->mem_root,
+                                        bytes_word_aligned(param->fields_bitmap_size))))
     DBUG_RETURN(NULL);
 
   if (bitmap_init(&ror_scan->covered_fields, bitmap_buf,
@@ -2437,12 +2441,13 @@ static
 ROR_INTERSECT_INFO* ror_intersect_init(const PARAM *param)
 {
   ROR_INTERSECT_INFO *info;
-  uchar* buf;
+  uint32* buf;
   if (!(info= (ROR_INTERSECT_INFO*)alloc_root(param->mem_root,
                                               sizeof(ROR_INTERSECT_INFO))))
     return NULL;
   info->param= param;
-  if (!(buf= (uchar*)alloc_root(param->mem_root, param->fields_bitmap_size)))
+  if (!(buf= (uint32*)alloc_root(param->mem_root,
+                             bytes_word_aligned(param->fields_bitmap_size))))
     return NULL;
   if (bitmap_init(&info->covered_fields, buf, param->fields_bitmap_size*8,
                   FALSE))
@@ -2459,7 +2464,7 @@ void ror_intersect_cpy(ROR_INTERSECT_INFO *dst, const ROR_INTERSECT_INFO *src)
 {
   dst->param= src->param;
   memcpy(dst->covered_fields.bitmap, src->covered_fields.bitmap, 
-         src->covered_fields.bitmap_size);
+         no_bytes_in_map(&src->covered_fields));
   dst->out_rows= src->out_rows;
   dst->is_covering= src->is_covering;
   dst->index_records= src->index_records;
@@ -3001,9 +3006,9 @@ TRP_ROR_INTERSECT *get_best_covering_ror_intersect(PARAM *param,
   /*I=set of all covering indexes */
   ror_scan_mark= tree->ror_scans;
 
-  uchar buf[MAX_KEY/8+1];
+  uint32 int_buf[MAX_KEY/32+1];
   MY_BITMAP covered_fields;
-  if (bitmap_init(&covered_fields, buf, nbits, FALSE))
+  if (bitmap_init(&covered_fields, int_buf, nbits, FALSE))
     DBUG_RETURN(0);
   bitmap_clear_all(&covered_fields);
 
@@ -5775,7 +5780,7 @@ int QUICK_INDEX_MERGE_SELECT::read_keys_and_merge()
     (This also creates a deficiency - it is possible that we will retrieve
      parts of key that are not used by current query at all.)
   */
-  if (head->file->extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY))
+  if (head->file->ha_retrieve_all_pk())
     DBUG_RETURN(1);
 
   cur_quick_it.rewind();
diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc
index 0b6e44c0272..855520fb2e4 100644
--- a/sql/repl_failsafe.cc
+++ b/sql/repl_failsafe.cc
@@ -20,6 +20,7 @@
 #include "repl_failsafe.h"
 #include "sql_repl.h"
 #include "slave.h"
+#include "rpl_filter.h"
 #include "log_event.h"
 #include <mysql.h>
 
@@ -735,14 +736,14 @@ static int fetch_db_tables(THD *thd, MYSQL *mysql, const char *db,
     TABLE_LIST table;
     const char* table_name= row[0];
     int error;
-    if (table_rules_on)
+    if (rpl_filter->is_on())
     {
       bzero((char*) &table, sizeof(table)); //just for safe
       table.db= (char*) db;
       table.table_name= (char*) table_name;
       table.updating= 1;
 
-      if (!tables_ok(thd, &table))
+      if (!rpl_filter->tables_ok(thd->db, &table))
 	continue;
     }
     /* download master's table and overwrite slave's table */
@@ -860,8 +861,8 @@ bool load_master_data(THD* thd)
 	data from master
       */
 
-      if (!db_ok(db, replicate_do_db, replicate_ignore_db) ||
-          !db_ok_with_wild_table(db) ||
+      if (!rpl_filter->db_ok(db) || 
+	  !rpl_filter->db_ok_with_wild_table(db) || 
 	  !strcmp(db,"mysql"))
       {
 	*cur_table_res = 0;
diff --git a/sql/rpl_filter.cc b/sql/rpl_filter.cc
new file mode 100644
index 00000000000..f9f8a3e98a7
--- /dev/null
+++ b/sql/rpl_filter.cc
@@ -0,0 +1,539 @@
+/* Copyright (C) 2000-2003 MySQL AB
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+#include "mysql_priv.h"
+#include "rpl_filter.h"
+
+#define TABLE_RULE_HASH_SIZE   16
+#define TABLE_RULE_ARR_SIZE   16
+
+Rpl_filter::Rpl_filter() : 
+  table_rules_on(0), do_table_inited(0), ignore_table_inited(0),
+  wild_do_table_inited(0), wild_ignore_table_inited(0)
+{
+  do_db.empty();
+  ignore_db.empty();
+  rewrite_db.empty();
+}
+
+
+Rpl_filter::~Rpl_filter() 
+{
+  if (do_table_inited) 
+    hash_free(&do_table);
+  if (ignore_table_inited)
+    hash_free(&ignore_table);
+  if (wild_do_table_inited)
+    free_string_array(&wild_do_table);
+  if (wild_ignore_table_inited)
+    free_string_array(&wild_ignore_table);
+  free_list(&do_db);
+  free_list(&ignore_db);
+  free_list(&rewrite_db);
+}
+
+
+/*
+  Returns true if table should be logged/replicated 
+
+  SYNOPSIS
+    tables_ok()
+    db              db to use if db in TABLE_LIST is undefined for a table
+    tables          list of tables to check
+
+  NOTES
+    Changing table order in the list can lead to different results. 
+    
+    Note also order of precedence of do/ignore rules (see code).  For
+    that reason, users should not set conflicting rules because they
+    may get unpredicted results (precedence order is explained in the
+    manual).
+
+    If no table in the list is marked "updating", then we always
+    return 0, because there is no reason to execute this statement on
+    slave if it updates nothing.  (Currently, this can only happen if
+    statement is a multi-delete (SQLCOM_DELETE_MULTI) and "tables" are
+    the tables in the FROM):
+
+    In the case of SQLCOM_DELETE_MULTI, there will be a second call to
+    tables_ok(), with tables having "updating==TRUE" (those after the
+    DELETE), so this second call will make the decision (because
+    all_tables_not_ok() = !tables_ok(1st_list) &&
+    !tables_ok(2nd_list)).
+
+  TODO
+    "Include all tables like "abc.%" except "%.EFG"". (Can't be done now.)
+    If we supported Perl regexps, we could do it with pattern: /^abc\.(?!EFG)/
+    (I could not find an equivalent in the regex library MySQL uses).
+
+  RETURN VALUES
+    0           should not be logged/replicated
+    1           should be logged/replicated                  
+*/
+
+bool 
+Rpl_filter::tables_ok(const char* db, TABLE_LIST* tables)
+{
+  bool some_tables_updating= 0;
+  DBUG_ENTER("Rpl_filter::tables_ok");
+  
+  for (; tables; tables= tables->next_global)
+  {
+    char hash_key[2*NAME_LEN+2];
+    char *end;
+    uint len;
+
+    if (!tables->updating) 
+      continue;
+    some_tables_updating= 1;
+    end= strmov(hash_key, tables->db ? tables->db : db);
+    *end++= '.';
+    len= (uint) (strmov(end, tables->table_name) - hash_key);
+    if (do_table_inited) // if there are any do's
+    {
+      if (hash_search(&do_table, (byte*) hash_key, len))
+	DBUG_RETURN(1);
+    }
+    if (ignore_table_inited) // if there are any ignores
+    {
+      if (hash_search(&ignore_table, (byte*) hash_key, len))
+	DBUG_RETURN(0); 
+    }
+    if (wild_do_table_inited && 
+	find_wild(&wild_do_table, hash_key, len))
+      DBUG_RETURN(1);
+    if (wild_ignore_table_inited && 
+	find_wild(&wild_ignore_table, hash_key, len))
+      DBUG_RETURN(0);
+  }
+
+  /*
+    If no table was to be updated, ignore statement (no reason we play it on
+    slave, slave is supposed to replicate _changes_ only).
+    If no explicit rule found and there was a do list, do not replicate.
+    If there was no do list, go ahead
+  */
+  DBUG_RETURN(some_tables_updating &&
+              !do_table_inited && !wild_do_table_inited);
+}
+
+
+/*
+  Checks whether a db matches some do_db and ignore_db rules
+
+  SYNOPSIS
+    db_ok()
+    db              name of the db to check
+
+  RETURN VALUES
+    0           should not be logged/replicated
+    1           should be logged/replicated                  
+*/
+
+bool
+Rpl_filter::db_ok(const char* db)
+{
+  DBUG_ENTER("Rpl_filter::db_ok");
+
+  if (do_db.is_empty() && ignore_db.is_empty())
+    DBUG_RETURN(1); // Ok to replicate if the user puts no constraints
+
+  /*
+    If the user has specified restrictions on which databases to replicate
+    and db was not selected, do not replicate.
+  */
+  if (!db)
+    DBUG_RETURN(0);
+
+  if (!do_db.is_empty()) // if the do's are not empty
+  {
+    I_List_iterator<i_string> it(do_db);
+    i_string* tmp;
+
+    while ((tmp=it++))
+    {
+      if (!strcmp(tmp->ptr, db))
+	DBUG_RETURN(1); // match
+    }
+    DBUG_RETURN(0);
+  }
+  else // there are some elements in the don't, otherwise we cannot get here
+  {
+    I_List_iterator<i_string> it(ignore_db);
+    i_string* tmp;
+
+    while ((tmp=it++))
+    {
+      if (!strcmp(tmp->ptr, db))
+	DBUG_RETURN(0); // match
+    }
+    DBUG_RETURN(1);
+  }
+}
+
+
+/*
+  Checks whether a db matches wild_do_table and wild_ignore_table
+  rules (for replication)
+
+  SYNOPSIS
+    db_ok_with_wild_table()
+    db		name of the db to check.
+		Is tested with check_db_name() before calling this function.
+
+  NOTES
+    Here is the reason for this function.
+    We advise users who want to exclude a database 'db1' safely to do it
+    with replicate_wild_ignore_table='db1.%' instead of binlog_ignore_db or
+    replicate_ignore_db because the two lasts only check for the selected db,
+    which won't work in that case:
+    USE db2;
+    UPDATE db1.t SET ... #this will be replicated and should not
+    whereas replicate_wild_ignore_table will work in all cases.
+    With replicate_wild_ignore_table, we only check tables. When
+    one does 'DROP DATABASE db1', tables are not involved and the
+    statement will be replicated, while users could expect it would not (as it
+    rougly means 'DROP db1.first_table, DROP db1.second_table...').
+    In other words, we want to interpret 'db1.%' as "everything touching db1".
+    That is why we want to match 'db1' against 'db1.%' wild table rules.
+
+  RETURN VALUES
+    0           should not be logged/replicated
+    1           should be logged/replicated
+*/
+
+bool
+Rpl_filter::db_ok_with_wild_table(const char *db)
+{
+  DBUG_ENTER("Rpl_filter::db_ok_with_wild_table");
+
+  char hash_key[NAME_LEN+2];
+  char *end;
+  int len;
+  end= strmov(hash_key, db);
+  *end++= '.';
+  len= end - hash_key ;
+  if (wild_do_table_inited && find_wild(&wild_do_table, hash_key, len))
+  {
+    DBUG_PRINT("return",("1"));
+    DBUG_RETURN(1);
+  }
+  if (wild_ignore_table_inited && find_wild(&wild_ignore_table, hash_key, len))
+  {
+    DBUG_PRINT("return",("0"));
+    DBUG_RETURN(0);
+  }  
+
+  /*
+    If no explicit rule found and there was a do list, do not replicate.
+    If there was no do list, go ahead
+  */
+  DBUG_PRINT("return",("db=%s,retval=%d", db, !wild_do_table_inited));
+  DBUG_RETURN(!wild_do_table_inited);
+}
+
+
+bool
+Rpl_filter::is_on()
+{
+  return table_rules_on;
+}
+
+
+int 
+Rpl_filter::add_do_table(const char* table_spec) 
+{
+  DBUG_ENTER("Rpl_filter::add_do_table");
+  if (!do_table_inited)
+    init_table_rule_hash(&do_table, &do_table_inited);
+  table_rules_on= 1;
+  DBUG_RETURN(add_table_rule(&do_table, table_spec));
+}
+  
+
+int 
+Rpl_filter::add_ignore_table(const char* table_spec) 
+{
+  DBUG_ENTER("Rpl_filter::add_ignore_table");
+  if (!ignore_table_inited)
+    init_table_rule_hash(&ignore_table, &ignore_table_inited);
+  table_rules_on= 1;
+  DBUG_RETURN(add_table_rule(&ignore_table, table_spec));
+}
+
+
+int 
+Rpl_filter::add_wild_do_table(const char* table_spec)
+{
+  DBUG_ENTER("Rpl_filter::add_wild_do_table");
+  if (!wild_do_table_inited)
+    init_table_rule_array(&wild_do_table, &wild_do_table_inited);
+  table_rules_on= 1;
+  DBUG_RETURN(add_wild_table_rule(&wild_do_table, table_spec));
+}
+  
+
+int 
+Rpl_filter::add_wild_ignore_table(const char* table_spec) 
+{
+  DBUG_ENTER("Rpl_filter::add_wild_ignore_table");
+  if (!wild_ignore_table_inited)
+    init_table_rule_array(&wild_ignore_table, &wild_ignore_table_inited);
+  table_rules_on= 1;
+  DBUG_RETURN(add_wild_table_rule(&wild_ignore_table, table_spec));
+}
+
+
+void
+Rpl_filter::add_db_rewrite(const char* from_db, const char* to_db)
+{
+  i_string_pair *db_pair = new i_string_pair(from_db, to_db);
+  rewrite_db.push_back(db_pair);
+}
+
+
+int 
+Rpl_filter::add_table_rule(HASH* h, const char* table_spec)
+{
+  const char* dot = strchr(table_spec, '.');
+  if (!dot) return 1;
+  // len is always > 0 because we know the there exists a '.'
+  uint len = (uint)strlen(table_spec);
+  TABLE_RULE_ENT* e = (TABLE_RULE_ENT*)my_malloc(sizeof(TABLE_RULE_ENT)
+						 + len, MYF(MY_WME));
+  if (!e) return 1;
+  e->db= (char*)e + sizeof(TABLE_RULE_ENT);
+  e->tbl_name= e->db + (dot - table_spec) + 1;
+  e->key_len= len;
+  memcpy(e->db, table_spec, len);
+
+  return my_hash_insert(h, (byte*)e);
+}
+
+
+/*
+  Add table expression with wildcards to dynamic array
+*/
+
+int 
+Rpl_filter::add_wild_table_rule(DYNAMIC_ARRAY* a, const char* table_spec)
+{
+  const char* dot = strchr(table_spec, '.');
+  if (!dot) return 1;
+  uint len = (uint)strlen(table_spec);
+  TABLE_RULE_ENT* e = (TABLE_RULE_ENT*)my_malloc(sizeof(TABLE_RULE_ENT)
+						 + len, MYF(MY_WME));
+  if (!e) return 1;
+  e->db= (char*)e + sizeof(TABLE_RULE_ENT);
+  e->tbl_name= e->db + (dot - table_spec) + 1;
+  e->key_len= len;
+  memcpy(e->db, table_spec, len);
+  insert_dynamic(a, (gptr)&e);
+  return 0;
+}
+
+
+void
+Rpl_filter::add_do_db(const char* table_spec)
+{
+  DBUG_ENTER("Rpl_filter::add_do_db");
+  i_string *db = new i_string(table_spec);
+  do_db.push_back(db);
+}
+
+
+void
+Rpl_filter::add_ignore_db(const char* table_spec)
+{
+  DBUG_ENTER("Rpl_filter::add_ignore_db");
+  i_string *db = new i_string(table_spec);
+  ignore_db.push_back(db);
+}
+
+
+static byte* get_table_key(const byte* a, uint* len,
+			   my_bool __attribute__((unused)))
+{
+  TABLE_RULE_ENT *e= (TABLE_RULE_ENT *) a;
+
+  *len= e->key_len;
+  return (byte*)e->db;
+}
+
+
+static void free_table_ent(void* a)
+{
+  TABLE_RULE_ENT *e= (TABLE_RULE_ENT *) a;
+  
+  my_free((gptr) e, MYF(0));
+}
+
+
+void 
+Rpl_filter::init_table_rule_hash(HASH* h, bool* h_inited)
+{
+  hash_init(h, system_charset_info,TABLE_RULE_HASH_SIZE,0,0,
+	    get_table_key, free_table_ent, 0);
+  *h_inited = 1;
+}
+
+
+void 
+Rpl_filter::init_table_rule_array(DYNAMIC_ARRAY* a, bool* a_inited)
+{
+  my_init_dynamic_array(a, sizeof(TABLE_RULE_ENT*), TABLE_RULE_ARR_SIZE,
+			TABLE_RULE_ARR_SIZE);
+  *a_inited = 1;
+}
+
+
+TABLE_RULE_ENT* 
+Rpl_filter::find_wild(DYNAMIC_ARRAY *a, const char* key, int len)
+{
+  uint i;
+  const char* key_end= key + len;
+  
+  for (i= 0; i < a->elements; i++)
+  {
+    TABLE_RULE_ENT* e ;
+    get_dynamic(a, (gptr)&e, i);
+    if (!my_wildcmp(system_charset_info, key, key_end, 
+		    (const char*)e->db,
+		    (const char*)(e->db + e->key_len),
+		    '\\',wild_one,wild_many))
+      return e;
+  }
+  
+  return 0;
+}
+
+
+void 
+Rpl_filter::free_string_array(DYNAMIC_ARRAY *a)
+{
+  uint i;
+  for (i= 0; i < a->elements; i++)
+  {
+    char* p;
+    get_dynamic(a, (gptr) &p, i);
+    my_free(p, MYF(MY_WME));
+  }
+  delete_dynamic(a);
+}
+
+
+/*
+  Builds a String from a HASH of TABLE_RULE_ENT. Cannot be used for any other 
+  hash, as it assumes that the hash entries are TABLE_RULE_ENT.
+
+  SYNOPSIS
+    table_rule_ent_hash_to_str()
+    s               pointer to the String to fill
+    h               pointer to the HASH to read
+
+  RETURN VALUES
+    none
+*/
+
+void 
+Rpl_filter::table_rule_ent_hash_to_str(String* s, HASH* h)
+{
+  s->length(0);
+  for (uint i= 0; i < h->records; i++)
+  {
+    TABLE_RULE_ENT* e= (TABLE_RULE_ENT*) hash_element(h, i);
+    if (s->length())
+      s->append(',');
+    s->append(e->db,e->key_len);
+  }
+}
+
+
+void 
+Rpl_filter::table_rule_ent_dynamic_array_to_str(String* s, DYNAMIC_ARRAY* a)
+{
+  s->length(0);
+  for (uint i= 0; i < a->elements; i++)
+  {
+    TABLE_RULE_ENT* e;
+    get_dynamic(a, (gptr)&e, i);
+    if (s->length())
+      s->append(',');
+    s->append(e->db,e->key_len);
+  }
+}
+
+
+void
+Rpl_filter::get_do_table(String* str)
+{
+  table_rule_ent_hash_to_str(str, &do_table);
+}
+
+
+void
+Rpl_filter::get_ignore_table(String* str)
+{
+  table_rule_ent_hash_to_str(str, &ignore_table);
+}
+
+
+void
+Rpl_filter::get_wild_do_table(String* str)
+{
+  table_rule_ent_dynamic_array_to_str(str, &wild_do_table);
+}
+
+
+void
+Rpl_filter::get_wild_ignore_table(String* str)
+{
+  table_rule_ent_dynamic_array_to_str(str, &wild_ignore_table);
+}
+
+
+const char*
+Rpl_filter::get_rewrite_db(const char* db, uint32 *new_len)
+{
+  if (rewrite_db.is_empty() || !db)
+    return db;
+  I_List_iterator<i_string_pair> it(rewrite_db);
+  i_string_pair* tmp;
+
+  while ((tmp=it++))
+  {
+    if (!strcmp(tmp->key, db))
+    {
+      *new_len= strlen(tmp->val);
+      return tmp->val;
+    }
+  }
+  return db;
+}
+
+
+I_List<i_string>*
+Rpl_filter::get_do_db()
+{
+  return &do_db;
+}
+  
+
+I_List<i_string>*
+Rpl_filter::get_ignore_db()
+{
+  return &ignore_db;
+}
diff --git a/sql/rpl_filter.h b/sql/rpl_filter.h
new file mode 100644
index 00000000000..cfcb3b43607
--- /dev/null
+++ b/sql/rpl_filter.h
@@ -0,0 +1,113 @@
+/* Copyright (C) 2000-2003 MySQL AB
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+#ifndef RPL_FILTER_H
+#define RPL_FILTER_H
+
+#include "mysql.h"
+#include "my_list.h"
+
+typedef struct st_table_rule_ent
+{
+  char* db;
+  char* tbl_name;
+  uint key_len;
+} TABLE_RULE_ENT;
+
+/*
+  Rpl_filter
+
+  Inclusion and exclusion rules of tables and databases.
+  Also handles rewrites of db.
+  Used for replication and binlogging.
+ */
+class Rpl_filter 
+{
+public:
+  Rpl_filter();
+  ~Rpl_filter();
+  Rpl_filter(Rpl_filter const&);
+  Rpl_filter& operator=(Rpl_filter const&);
+ 
+  /* Checks - returns true if ok to replicate/log */
+
+  bool tables_ok(const char* db, TABLE_LIST* tables);
+  bool db_ok(const char* db);
+  bool db_ok_with_wild_table(const char *db);
+
+  bool is_on();
+
+  /* Setters - add filtering rules */
+
+  int add_do_table(const char* table_spec);
+  int add_ignore_table(const char* table_spec);
+
+  int add_wild_do_table(const char* table_spec);
+  int add_wild_ignore_table(const char* table_spec);
+
+  void add_do_db(const char* db_spec);
+  void add_ignore_db(const char* db_spec);
+
+  void add_db_rewrite(const char* from_db, const char* to_db);
+
+  /* Getters - to get information about current rules */
+
+  void get_do_table(String* str);
+  void get_ignore_table(String* str);
+
+  void get_wild_do_table(String* str);
+  void get_wild_ignore_table(String* str);
+
+  const char* get_rewrite_db(const char* db, uint32 *new_len);
+
+  I_List<i_string>* get_do_db();
+  I_List<i_string>* get_ignore_db();
+
+private:
+  bool table_rules_on;
+
+  void init_table_rule_hash(HASH* h, bool* h_inited);
+  void init_table_rule_array(DYNAMIC_ARRAY* a, bool* a_inited);
+
+  int add_table_rule(HASH* h, const char* table_spec);
+  int add_wild_table_rule(DYNAMIC_ARRAY* a, const char* table_spec);
+
+  void free_string_array(DYNAMIC_ARRAY *a);
+
+  void table_rule_ent_hash_to_str(String* s, HASH* h);
+  void table_rule_ent_dynamic_array_to_str(String* s, DYNAMIC_ARRAY* a);
+  TABLE_RULE_ENT* find_wild(DYNAMIC_ARRAY *a, const char* key, int len);
+
+  HASH do_table;
+  HASH ignore_table;
+  DYNAMIC_ARRAY wild_do_table;
+  DYNAMIC_ARRAY wild_ignore_table;
+
+  bool do_table_inited;
+  bool ignore_table_inited;
+  bool wild_do_table_inited;
+  bool wild_ignore_table_inited;
+
+  I_List<i_string> do_db;
+  I_List<i_string> ignore_db;
+
+  I_List<i_string_pair> rewrite_db;
+};
+
+extern Rpl_filter *rpl_filter;
+extern Rpl_filter *binlog_filter;
+
+#endif // RPL_FILTER_H
diff --git a/sql/slave.cc b/sql/slave.cc
index c6c0de7160b..a0779543148 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -22,6 +22,7 @@
 #include <myisam.h>
 #include "slave.h"
 #include "sql_repl.h"
+#include "rpl_filter.h"
 #include "repl_failsafe.h"
 #include <thr_alarm.h>
 #include <my_dir.h>
@@ -36,11 +37,7 @@ typedef bool (*CHECK_KILLED_FUNC)(THD*,void*);
 volatile bool slave_sql_running = 0, slave_io_running = 0;
 char* slave_load_tmpdir = 0;
 MASTER_INFO *active_mi;
-HASH replicate_do_table, replicate_ignore_table;
-DYNAMIC_ARRAY replicate_wild_do_table, replicate_wild_ignore_table;
-bool do_table_inited = 0, ignore_table_inited = 0;
-bool wild_do_table_inited = 0, wild_ignore_table_inited = 0;
-bool table_rules_on= 0, replicate_same_server_id;
+bool replicate_same_server_id;
 ulonglong relay_log_space_limit = 0;
 
 /*
@@ -194,20 +191,6 @@ err:
 }
 
 
-static void free_table_ent(TABLE_RULE_ENT* e)
-{
-  my_free((gptr) e, MYF(0));
-}
-
-
-static byte* get_table_key(TABLE_RULE_ENT* e, uint* len,
-			   my_bool not_used __attribute__((unused)))
-{
-  *len = e->key_len;
-  return (byte*)e->db;
-}
-
-
 /*
   Open the given relay log
 
@@ -809,245 +792,6 @@ int start_slave_threads(bool need_slave_mutex, bool wait_for_start,
 }
 
 
-void init_table_rule_hash(HASH* h, bool* h_inited)
-{
-  hash_init(h, system_charset_info,TABLE_RULE_HASH_SIZE,0,0,
-	    (hash_get_key) get_table_key,
-	    (hash_free_key) free_table_ent, 0);
-  *h_inited = 1;
-}
-
-
-void init_table_rule_array(DYNAMIC_ARRAY* a, bool* a_inited)
-{
-  my_init_dynamic_array(a, sizeof(TABLE_RULE_ENT*), TABLE_RULE_ARR_SIZE,
-		     TABLE_RULE_ARR_SIZE);
-  *a_inited = 1;
-}
-
-
-static TABLE_RULE_ENT* find_wild(DYNAMIC_ARRAY *a, const char* key, int len)
-{
-  uint i;
-  const char* key_end = key + len;
-  
-  for (i = 0; i < a->elements; i++)
-    {
-      TABLE_RULE_ENT* e ;
-      get_dynamic(a, (gptr)&e, i);
-      if (!my_wildcmp(system_charset_info, key, key_end, 
-                            (const char*)e->db,
-			    (const char*)(e->db + e->key_len),
-			    '\\',wild_one,wild_many))
-	return e;
-    }
-  
-  return 0;
-}
-
-
-/*
-  Checks whether tables match some (wild_)do_table and (wild_)ignore_table
-  rules (for replication)
-
-  SYNOPSIS
-    tables_ok()
-    thd             thread (SQL slave thread normally). Mustn't be null.
-    tables          list of tables to check
-
-  NOTES
-    Note that changing the order of the tables in the list can lead to
-    different results. Note also the order of precedence of the do/ignore 
-    rules (see code below). For that reason, users should not set conflicting 
-    rules because they may get unpredicted results (precedence order is
-    explained in the manual).
-    If no table of the list is marked "updating" (so far this can only happen
-    if the statement is a multi-delete (SQLCOM_DELETE_MULTI) and the "tables"
-    is the tables in the FROM): then we always return 0, because there is no
-    reason we play this statement on this slave if it updates nothing. In the
-    case of SQLCOM_DELETE_MULTI, there will be a second call to tables_ok(),
-    with tables having "updating==TRUE" (those after the DELETE), so this
-    second call will make the decision (because
-    all_tables_not_ok() = !tables_ok(1st_list) && !tables_ok(2nd_list)).
-
-    Thought which arose from a question of a big customer "I want to include
-    all tables like "abc.%" except the "%.EFG"". This can't be done now. If we
-    supported Perl regexps we could do it with this pattern: /^abc\.(?!EFG)/
-    (I could not find an equivalent in the regex library MySQL uses).
-
-  RETURN VALUES
-    0           should not be logged/replicated
-    1           should be logged/replicated                  
-*/
-
-bool tables_ok(THD* thd, TABLE_LIST* tables)
-{
-  bool some_tables_updating= 0;
-  DBUG_ENTER("tables_ok");
-
-  /*
-    In routine, can't reliably pick and choose substatements, so always
-    replicate.
-    We can't reliably know if one substatement should be executed or not:
-    consider the case of this substatement: a SELECT on a non-replicated
-    constant table; if we don't execute it maybe it was going to fill a
-    variable which was going to be used by the next substatement to update
-    a replicated table? If we execute it maybe the constant non-replicated
-    table does not exist (and so we'll fail) while there was no need to
-    execute this as this SELECT does not influence replicated tables in the
-    rest of the routine? In other words: users are used to replicate-*-table
-    specifying how to handle updates to tables, these options don't say
-    anything about reads to tables; we can't guess.
-  */
-  if (thd->spcont)
-    DBUG_RETURN(1);
-
-  for (; tables; tables= tables->next_global)
-  {
-    char hash_key[2*NAME_LEN+2];
-    char *end;
-    uint len;
-
-    if (!tables->updating) 
-      continue;
-    some_tables_updating= 1;
-    end= strmov(hash_key, tables->db ? tables->db : thd->db);
-    *end++= '.';
-    len= (uint) (strmov(end, tables->table_name) - hash_key);
-    if (do_table_inited) // if there are any do's
-    {
-      if (hash_search(&replicate_do_table, (byte*) hash_key, len))
-	DBUG_RETURN(1);
-    }
-    if (ignore_table_inited) // if there are any ignores
-    {
-      if (hash_search(&replicate_ignore_table, (byte*) hash_key, len))
-	DBUG_RETURN(0); 
-    }
-    if (wild_do_table_inited && find_wild(&replicate_wild_do_table,
-					  hash_key, len))
-      DBUG_RETURN(1);
-    if (wild_ignore_table_inited && find_wild(&replicate_wild_ignore_table,
-					      hash_key, len))
-      DBUG_RETURN(0);
-  }
-
-  /*
-    If no table was to be updated, ignore statement (no reason we play it on
-    slave, slave is supposed to replicate _changes_ only).
-    If no explicit rule found and there was a do list, do not replicate.
-    If there was no do list, go ahead
-  */
-  DBUG_RETURN(some_tables_updating &&
-              !do_table_inited && !wild_do_table_inited);
-}
-
-
-/*
-  Checks whether a db matches wild_do_table and wild_ignore_table
-  rules (for replication)
-
-  SYNOPSIS
-    db_ok_with_wild_table()
-    db		name of the db to check.
-		Is tested with check_db_name() before calling this function.
-
-  NOTES
-    Here is the reason for this function.
-    We advise users who want to exclude a database 'db1' safely to do it
-    with replicate_wild_ignore_table='db1.%' instead of binlog_ignore_db or
-    replicate_ignore_db because the two lasts only check for the selected db,
-    which won't work in that case:
-    USE db2;
-    UPDATE db1.t SET ... #this will be replicated and should not
-    whereas replicate_wild_ignore_table will work in all cases.
-    With replicate_wild_ignore_table, we only check tables. When
-    one does 'DROP DATABASE db1', tables are not involved and the
-    statement will be replicated, while users could expect it would not (as it
-    rougly means 'DROP db1.first_table, DROP db1.second_table...').
-    In other words, we want to interpret 'db1.%' as "everything touching db1".
-    That is why we want to match 'db1' against 'db1.%' wild table rules.
-
-  RETURN VALUES
-    0           should not be logged/replicated
-    1           should be logged/replicated
- */
-
-int db_ok_with_wild_table(const char *db)
-{
-  char hash_key[NAME_LEN+2];
-  char *end;
-  int len;
-  end= strmov(hash_key, db);
-  *end++= '.';
-  len= end - hash_key ;
-  if (wild_do_table_inited && find_wild(&replicate_wild_do_table,
-                                        hash_key, len))
-    return 1;
-  if (wild_ignore_table_inited && find_wild(&replicate_wild_ignore_table,
-                                            hash_key, len))
-    return 0;
-  
-  /*
-    If no explicit rule found and there was a do list, do not replicate.
-    If there was no do list, go ahead
-  */
-  return !wild_do_table_inited;
-}
-
-
-int add_table_rule(HASH* h, const char* table_spec)
-{
-  const char* dot = strchr(table_spec, '.');
-  if (!dot) return 1;
-  // len is always > 0 because we know the there exists a '.'
-  uint len = (uint)strlen(table_spec);
-  TABLE_RULE_ENT* e = (TABLE_RULE_ENT*)my_malloc(sizeof(TABLE_RULE_ENT)
-						 + len, MYF(MY_WME));
-  if (!e) return 1;
-  e->db = (char*)e + sizeof(TABLE_RULE_ENT);
-  e->tbl_name = e->db + (dot - table_spec) + 1;
-  e->key_len = len;
-  memcpy(e->db, table_spec, len);
-  (void)my_hash_insert(h, (byte*)e);
-  return 0;
-}
-
-
-/*
-  Add table expression with wildcards to dynamic array
-*/
-
-int add_wild_table_rule(DYNAMIC_ARRAY* a, const char* table_spec)
-{
-  const char* dot = strchr(table_spec, '.');
-  if (!dot) return 1;
-  uint len = (uint)strlen(table_spec);
-  TABLE_RULE_ENT* e = (TABLE_RULE_ENT*)my_malloc(sizeof(TABLE_RULE_ENT)
-						 + len, MYF(MY_WME));
-  if (!e) return 1;
-  e->db = (char*)e + sizeof(TABLE_RULE_ENT);
-  e->tbl_name = e->db + (dot - table_spec) + 1;
-  e->key_len = len;
-  memcpy(e->db, table_spec, len);
-  insert_dynamic(a, (gptr)&e);
-  return 0;
-}
-
-
-static void free_string_array(DYNAMIC_ARRAY *a)
-{
-  uint i;
-  for (i = 0; i < a->elements; i++)
-    {
-      char* p;
-      get_dynamic(a, (gptr) &p, i);
-      my_free(p, MYF(MY_WME));
-    }
-  delete_dynamic(a);
-}
-
-
 #ifdef NOT_USED_YET
 static int end_slave_on_walk(MASTER_INFO* mi, gptr /*unused*/)
 {
@@ -1083,14 +827,6 @@ void end_slave()
     */
     terminate_slave_threads(active_mi,SLAVE_FORCE_ALL);
     end_master_info(active_mi);
-    if (do_table_inited)
-      hash_free(&replicate_do_table);
-    if (ignore_table_inited)
-      hash_free(&replicate_ignore_table);
-    if (wild_do_table_inited)
-      free_string_array(&replicate_wild_do_table);
-    if (wild_ignore_table_inited)
-      free_string_array(&replicate_wild_ignore_table);
     delete active_mi;
     active_mi= 0;
   }
@@ -1170,24 +906,6 @@ bool net_request_file(NET* net, const char* fname)
 }
 
 
-const char *rewrite_db(const char* db, uint32 *new_len)
-{
-  if (replicate_rewrite_db.is_empty() || !db)
-    return db;
-  I_List_iterator<i_string_pair> it(replicate_rewrite_db);
-  i_string_pair* tmp;
-
-  while ((tmp=it++))
-  {
-    if (!strcmp(tmp->key, db))
-    {
-      *new_len= (uint32)strlen(tmp->val);
-      return tmp->val;
-    }
-  }
-  return db;
-}
-
 /*
   From other comments and tests in code, it looks like
   sometimes Query_log_event and Load_log_event can have db == 0
@@ -1200,60 +918,6 @@ const char *print_slave_db_safe(const char* db)
   return (db ? db : "");
 }
 
-/*
-  Checks whether a db matches some do_db and ignore_db rules
-  (for logging or replication)
-
-  SYNOPSIS
-    db_ok()
-    db              name of the db to check
-    do_list         either binlog_do_db or replicate_do_db
-    ignore_list     either binlog_ignore_db or replicate_ignore_db
-
-  RETURN VALUES
-    0           should not be logged/replicated
-    1           should be logged/replicated                  
-*/
-
-int db_ok(const char* db, I_List<i_string> &do_list,
-	  I_List<i_string> &ignore_list )
-{
-  if (do_list.is_empty() && ignore_list.is_empty())
-    return 1; // ok to replicate if the user puts no constraints
-
-  /*
-    If the user has specified restrictions on which databases to replicate
-    and db was not selected, do not replicate.
-  */
-  if (!db)
-    return 0;
-
-  if (!do_list.is_empty()) // if the do's are not empty
-  {
-    I_List_iterator<i_string> it(do_list);
-    i_string* tmp;
-
-    while ((tmp=it++))
-    {
-      if (!strcmp(tmp->ptr, db))
-	return 1; // match
-    }
-    return 0;
-  }
-  else // there are some elements in the don't, otherwise we cannot get here
-  {
-    I_List_iterator<i_string> it(ignore_list);
-    i_string* tmp;
-
-    while ((tmp=it++))
-    {
-      if (!strcmp(tmp->ptr, db))
-	return 0; // match
-    }
-    return 1;
-  }
-}
-
 
 static int init_strvar_from_file(char *var, int max_size, IO_CACHE *f,
 				 const char *default_val)
@@ -2262,48 +1926,6 @@ int register_slave_on_master(MYSQL* mysql)
 }
 
 
-/*
-  Builds a String from a HASH of TABLE_RULE_ENT. Cannot be used for any other 
-  hash, as it assumes that the hash entries are TABLE_RULE_ENT.
-
-  SYNOPSIS
-    table_rule_ent_hash_to_str()
-    s               pointer to the String to fill
-    h               pointer to the HASH to read
-
-  RETURN VALUES
-    none
-*/
-
-void table_rule_ent_hash_to_str(String* s, HASH* h)
-{
-  s->length(0);
-  for (uint i=0 ; i < h->records ; i++)
-  {
-    TABLE_RULE_ENT* e= (TABLE_RULE_ENT*) hash_element(h, i);
-    if (s->length())
-      s->append(',');
-    s->append(e->db,e->key_len);
-  }
-}
-
-/*
-  Mostly the same thing as above
-*/
-
-void table_rule_ent_dynamic_array_to_str(String* s, DYNAMIC_ARRAY* a)
-{
-  s->length(0);
-  for (uint i=0 ; i < a->elements ; i++)
-  {
-    TABLE_RULE_ENT* e;
-    get_dynamic(a, (gptr)&e, i);
-    if (s->length())
-      s->append(',');
-    s->append(e->db,e->key_len);
-  }
-}
-
 bool show_master_info(THD* thd, MASTER_INFO* mi)
 {
   // TODO: fix this for multi-master
@@ -2398,23 +2020,18 @@ bool show_master_info(THD* thd, MASTER_INFO* mi)
     protocol->store(mi->rli.group_master_log_name, &my_charset_bin);
     protocol->store(mi->slave_running ? "Yes":"No", &my_charset_bin);
     protocol->store(mi->rli.slave_running ? "Yes":"No", &my_charset_bin);
-    protocol->store(&replicate_do_db);
-    protocol->store(&replicate_ignore_db);
-    /*
-      We can't directly use some protocol->store for 
-      replicate_*_table,
-      as Protocol doesn't know the TABLE_RULE_ENT struct.
-      We first build Strings and then pass them to protocol->store.
-    */
+    protocol->store(rpl_filter->get_do_db());
+    protocol->store(rpl_filter->get_ignore_db());
+
     char buf[256];
     String tmp(buf, sizeof(buf), &my_charset_bin);
-    table_rule_ent_hash_to_str(&tmp, &replicate_do_table);
+    rpl_filter->get_do_table(&tmp);
     protocol->store(&tmp);
-    table_rule_ent_hash_to_str(&tmp, &replicate_ignore_table);
+    rpl_filter->get_ignore_table(&tmp);
     protocol->store(&tmp);
-    table_rule_ent_dynamic_array_to_str(&tmp, &replicate_wild_do_table);
+    rpl_filter->get_wild_do_table(&tmp);
     protocol->store(&tmp);
-    table_rule_ent_dynamic_array_to_str(&tmp, &replicate_wild_ignore_table);
+    rpl_filter->get_wild_ignore_table(&tmp);
     protocol->store(&tmp);
 
     protocol->store((uint32) mi->rli.last_slave_errno);
@@ -3886,10 +3503,8 @@ static int process_io_create_file(MASTER_INFO* mi, Create_file_log_event* cev)
 
   if (unlikely(!cev->is_valid()))
     DBUG_RETURN(1);
-  /*
-    TODO: fix to honor table rules, not only db rules
-  */
-  if (!db_ok(cev->db, replicate_do_db, replicate_ignore_db))
+
+  if (!rpl_filter->db_ok(cev->db))
   {
     skip_load_data_infile(net);
     DBUG_RETURN(0);
diff --git a/sql/slave.h b/sql/slave.h
index c41234ab2ed..ead1aa87ce6 100644
--- a/sql/slave.h
+++ b/sql/slave.h
@@ -21,6 +21,8 @@
 
 #include "mysql.h"
 #include "my_list.h"
+#include "rpl_filter.h"
+
 #define SLAVE_NET_TIMEOUT  3600
 #define MAX_SLAVE_ERRMSG   1024
 #define MAX_SLAVE_ERROR    2000
@@ -461,15 +463,6 @@ typedef struct st_master_info
 
 int queue_event(MASTER_INFO* mi,const char* buf,ulong event_len);
 
-typedef struct st_table_rule_ent
-{
-  char* db;
-  char* tbl_name;
-  uint key_len;
-} TABLE_RULE_ENT;
-
-#define TABLE_RULE_HASH_SIZE   16
-#define TABLE_RULE_ARR_SIZE   16
 #define MAX_SLAVE_ERRMSG      1024
 
 #define RPL_LOG_NAME (rli->group_master_log_name[0] ? rli->group_master_log_name :\
@@ -523,27 +516,9 @@ int mysql_table_dump(THD* thd, const char* db,
 int fetch_master_table(THD* thd, const char* db_name, const char* table_name,
 		       MASTER_INFO* mi, MYSQL* mysql, bool overwrite);
 
-void table_rule_ent_hash_to_str(String* s, HASH* h);
-void table_rule_ent_dynamic_array_to_str(String* s, DYNAMIC_ARRAY* a);
 bool show_master_info(THD* thd, MASTER_INFO* mi);
 bool show_binlog_info(THD* thd);
 
-/* See if the query uses any tables that should not be replicated */
-bool tables_ok(THD* thd, TABLE_LIST* tables);
-
-/*
-  Check to see if the database is ok to operate on with respect to the
-  do and ignore lists - used in replication
-*/
-int db_ok(const char* db, I_List<i_string> &do_list,
-	  I_List<i_string> &ignore_list );
-int db_ok_with_wild_table(const char *db);
-
-int add_table_rule(HASH* h, const char* table_spec);
-int add_wild_table_rule(DYNAMIC_ARRAY* a, const char* table_spec);
-void init_table_rule_hash(HASH* h, bool* h_inited);
-void init_table_rule_array(DYNAMIC_ARRAY* a, bool* a_inited);
-const char *rewrite_db(const char* db, uint32 *new_db_len);
 const char *print_slave_db_safe(const char *db);
 int check_expected_error(THD* thd, RELAY_LOG_INFO* rli, int error_code);
 void skip_load_data_infile(NET* net);
@@ -577,11 +552,7 @@ extern "C" pthread_handler_decl(handle_slave_sql,arg);
 extern bool volatile abort_loop;
 extern MASTER_INFO main_mi, *active_mi; /* active_mi for multi-master */
 extern LIST master_list;
-extern HASH replicate_do_table, replicate_ignore_table;
-extern DYNAMIC_ARRAY  replicate_wild_do_table, replicate_wild_ignore_table;
-extern bool do_table_inited, ignore_table_inited,
-	    wild_do_table_inited, wild_ignore_table_inited;
-extern bool table_rules_on, replicate_same_server_id;
+extern bool replicate_same_server_id;
 
 extern int disconnect_slave_event_count, abort_slave_event_count ;
 
@@ -595,8 +566,6 @@ extern my_bool master_ssl;
 extern my_string master_ssl_ca, master_ssl_capath, master_ssl_cert,
        master_ssl_cipher, master_ssl_key;
        
-extern I_List<i_string> replicate_do_db, replicate_ignore_db;
-extern I_List<i_string_pair> replicate_rewrite_db;
 extern I_List<THD> threads;
 
 #endif
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index 04666469e9c..315103aa8b1 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -27,9 +27,6 @@
 
 #include "mysql_priv.h"
 #include "hash_filo.h"
-#ifdef HAVE_REPLICATION
-#include "sql_repl.h" //for tables_ok()
-#endif
 #include <m_ctype.h>
 #include <stdarg.h>
 #include "sp_head.h"
@@ -37,6 +34,8 @@
 
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
 
+#define FIRST_NON_YN_FIELD 26
+
 class acl_entry :public hash_filo_element
 {
 public:
@@ -1506,7 +1505,7 @@ static bool update_user_table(THD *thd, const char *host, const char *user,
     GRANT and REVOKE are applied the slave in/exclusion rules as they are
     some kind of updates to the mysql.% tables.
   */
-  if (thd->slave_thread && table_rules_on)
+  if (thd->slave_thread && rpl_filter->is_on())
   {
     /*
       The tables must be marked "updating" so that tables_ok() takes them into
@@ -1514,7 +1513,7 @@ static bool update_user_table(THD *thd, const char *host, const char *user,
     */
     tables.updating= 1;
     /* Thanks to bzero, tables.next==0 */
-    if (!tables_ok(thd, &tables))
+    if (!(thd->spcont || rpl_filter->tables_ok(0, &tables)))
       DBUG_RETURN(0);
   }
 #endif
@@ -1526,7 +1525,7 @@ static bool update_user_table(THD *thd, const char *host, const char *user,
   key_copy((byte *) user_key, table->record[0], table->key_info,
            table->key_info->key_length);
 
-  table->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS);
+  table->file->ha_retrieve_all_cols();
   if (table->file->index_read_idx(table->record[0], 0,
 				  (byte *) user_key, table->key_info->key_length,
 				  HA_READ_KEY_EXACT))
@@ -1619,7 +1618,7 @@ static int replace_user_table(THD *thd, TABLE *table, const LEX_USER &combo,
   key_copy(user_key, table->record[0], table->key_info,
            table->key_info->key_length);
 
-  table->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS);
+  table->file->ha_retrieve_all_cols();
   if (table->file->index_read_idx(table->record[0], 0,
                                   user_key, table->key_info->key_length,
                                   HA_READ_KEY_EXACT))
@@ -1752,7 +1751,7 @@ static int replace_user_table(THD *thd, TABLE *table, const LEX_USER &combo,
       We should NEVER delete from the user table, as a uses can still
       use mysqld even if he doesn't have any privileges in the user table!
     */
-    table->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS);
+    table->file->ha_retrieve_all_cols();
     if (cmp_record(table,record[1]) &&
 	(error=table->file->update_row(table->record[1],table->record[0])))
     {						// This should never happen
@@ -1834,7 +1833,7 @@ static int replace_db_table(TABLE *table, const char *db,
   key_copy(user_key, table->record[0], table->key_info,
            table->key_info->key_length);
 
-  table->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS);
+  table->file->ha_retrieve_all_cols();
   if (table->file->index_read_idx(table->record[0],0,
                                   user_key, table->key_info->key_length,
                                   HA_READ_KEY_EXACT))
@@ -1870,7 +1869,7 @@ static int replace_db_table(TABLE *table, const char *db,
     /* update old existing row */
     if (rights)
     {
-      table->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS);
+      table->file->ha_retrieve_all_cols();
       if ((error=table->file->update_row(table->record[1],table->record[0])))
 	goto table_error;			/* purecov: deadcode */
     }
@@ -2209,7 +2208,7 @@ static int replace_column_table(GRANT_TABLE *g_t,
     key_copy(user_key, table->record[0], table->key_info,
              table->key_info->key_length);
 
-    table->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS);
+    table->file->ha_retrieve_all_cols();
     if (table->file->index_read(table->record[0], user_key,
 				table->key_info->key_length,
                                 HA_READ_KEY_EXACT))
@@ -2287,7 +2286,7 @@ static int replace_column_table(GRANT_TABLE *g_t,
     key_copy(user_key, table->record[0], table->key_info,
              key_prefix_length);
 
-    table->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS);
+    table->file->ha_retrieve_all_cols();
     if (table->file->index_read(table->record[0], user_key,
 				key_prefix_length,
                                 HA_READ_KEY_EXACT))
@@ -2385,7 +2384,7 @@ static int replace_table_table(THD *thd, GRANT_TABLE *grant_table,
   key_copy(user_key, table->record[0], table->key_info,
            table->key_info->key_length);
 
-  table->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS);
+  table->file->ha_retrieve_all_cols();
   if (table->file->index_read_idx(table->record[0], 0,
                                   user_key, table->key_info->key_length,
 				  HA_READ_KEY_EXACT))
@@ -2701,14 +2700,15 @@ bool mysql_table_grant(THD *thd, TABLE_LIST *table_list,
     GRANT and REVOKE are applied the slave in/exclusion rules as they are
     some kind of updates to the mysql.% tables.
   */
-  if (thd->slave_thread && table_rules_on)
+  if (thd->slave_thread && rpl_filter->is_on())
+  if (thd->slave_thread && rpl_filter->is_on())
   {
     /*
       The tables must be marked "updating" so that tables_ok() takes them into
       account in tests.
     */
     tables[0].updating= tables[1].updating= tables[2].updating= 1;
-    if (!tables_ok(thd, tables))
+    if (!(thd->spcont || rpl_filter->tables_ok(0, tables)))
       DBUG_RETURN(FALSE);
   }
 #endif
@@ -2908,14 +2908,14 @@ bool mysql_routine_grant(THD *thd, TABLE_LIST *table_list, bool is_proc,
     GRANT and REVOKE are applied the slave in/exclusion rules as they are
     some kind of updates to the mysql.% tables.
   */
-  if (thd->slave_thread && table_rules_on)
+  if (thd->slave_thread && rpl_filter->is_on())
   {
     /*
       The tables must be marked "updating" so that tables_ok() takes them into
       account in tests.
     */
     tables[0].updating= tables[1].updating= 1;
-    if (!tables_ok(thd, tables))
+    if (!(thd->spcont || rpl_filter->tables_ok(0, tables)))
       DBUG_RETURN(FALSE);
   }
 #endif
@@ -3039,14 +3039,14 @@ bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &list,
     GRANT and REVOKE are applied the slave in/exclusion rules as they are
     some kind of updates to the mysql.% tables.
   */
-  if (thd->slave_thread && table_rules_on)
+  if (thd->slave_thread && rpl_filter->is_on())
   {
     /*
       The tables must be marked "updating" so that tables_ok() takes them into
       account in tests.
     */
     tables[0].updating= tables[1].updating= 1;
-    if (!tables_ok(thd, tables))
+    if (!(thd->spcont || rpl_filter->tables_ok(0, tables)))
       DBUG_RETURN(FALSE);
   }
 #endif
@@ -4303,7 +4303,7 @@ int open_grant_tables(THD *thd, TABLE_LIST *tables)
     GRANT and REVOKE are applied the slave in/exclusion rules as they are
     some kind of updates to the mysql.% tables.
   */
-  if (thd->slave_thread && table_rules_on)
+  if (thd->slave_thread && rpl_filter->is_on())
   {
     /*
       The tables must be marked "updating" so that tables_ok() takes them into
@@ -4311,7 +4311,7 @@ int open_grant_tables(THD *thd, TABLE_LIST *tables)
     */
     tables[0].updating=tables[1].updating=tables[2].updating=
       tables[3].updating=tables[4].updating=1;
-    if (!tables_ok(thd, tables))
+    if (!(thd->spcont || rpl_filter->tables_ok(0, tables)))
       DBUG_RETURN(1);
     tables[0].updating=tables[1].updating=tables[2].updating=
       tables[3].updating=tables[4].updating=0;;
diff --git a/sql/sql_acl.h b/sql/sql_acl.h
index eba000a627a..5e62e7ce6e3 100644
--- a/sql/sql_acl.h
+++ b/sql/sql_acl.h
@@ -14,6 +14,8 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#include "slave.h" // for tables_ok(), rpl_filter
+
 #define SELECT_ACL	(1L << 0)
 #define INSERT_ACL	(1L << 1)
 #define UPDATE_ACL	(1L << 2)
@@ -50,7 +52,6 @@
 */
 #define EXTRA_ACL	(1L << 29)
 #define NO_ACCESS	(1L << 30)
-
 #define DB_ACLS \
 (UPDATE_ACL | SELECT_ACL | INSERT_ACL | DELETE_ACL | CREATE_ACL | DROP_ACL | \
  GRANT_ACL | REFERENCES_ACL | INDEX_ACL | ALTER_ACL | CREATE_TMP_ACL | \
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index c9d50bef82a..5f1031bcf83 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -566,7 +566,7 @@ bool close_thread_table(THD *thd, TABLE **table_ptr)
     else
     {
       // Free memory and reset for next loop
-      table->file->reset();
+      table->file->ha_reset();
     }
     table->in_use=0;
     if (unused_tables)
@@ -2560,6 +2560,8 @@ Field *find_field_in_real_table(THD *thd, TABLE *table,
 
   if (thd->set_query_id)
   {
+    table->file->ha_set_bit_in_rw_set(field->fieldnr,
+                                      (bool)(thd->set_query_id-1));
     if (field->query_id != thd->query_id)
     {
       field->query_id=thd->query_id;
@@ -3084,7 +3086,7 @@ int setup_wild(THD *thd, TABLE_LIST *tables, List<Item> &fields,
 ****************************************************************************/
 
 bool setup_fields(THD *thd, Item **ref_pointer_array,
-                  List<Item> &fields, bool set_query_id,
+                  List<Item> &fields, ulong set_query_id,
                   List<Item> *sum_func_list, bool allow_sum_func)
 {
   reg2 Item *item;
@@ -3517,7 +3519,10 @@ insert_fields(THD *thd, Name_resolution_context *context, const char *db_name,
 	fields marked in setup_tables during fix_fields of view columns
       */
       if (table)
+      {
 	table->used_fields= table->s->fields;
+        table->file->ha_set_all_bits_in_read_set();
+      }
     }
   }
   if (found)
@@ -3683,12 +3688,14 @@ int setup_conds(THD *thd, TABLE_LIST *tables, TABLE_LIST *leaves,
                 goto err;
               /* Mark field used for table cache */
               t2_field->query_id= thd->query_id;
+              t2->file->ha_set_bit_in_read_set(t2_field->fieldnr);
               t2->used_keys.intersect(t2_field->part_of_key);
             }
             if ((t1_field= iterator->field()))
             {
               /* Mark field used for table cache */
               t1_field->query_id= thd->query_id;
+              t1->file->ha_set_bit_in_read_set(t1_field->fieldnr);
               t1->used_keys.intersect(t1_field->part_of_key);
             }
             Item_func_eq *tmp= new Item_func_eq(iterator->create_item(thd),
diff --git a/sql/sql_bitmap.h b/sql/sql_bitmap.h
index bc1484b4fb0..00f38895fd6 100644
--- a/sql/sql_bitmap.h
+++ b/sql/sql_bitmap.h
@@ -25,7 +25,7 @@
 template <uint default_width> class Bitmap
 {
   MY_BITMAP map;
-  uchar buffer[(default_width+7)/8];
+  uint32 buffer[(default_width+31)/32];
 public:
   Bitmap() { init(); }
   Bitmap(const Bitmap& from) { *this=from; }
@@ -48,7 +48,7 @@ public:
   void intersect(ulonglong map2buff)
   {
     MY_BITMAP map2;
-    bitmap_init(&map2, (uchar *)&map2buff, sizeof(ulonglong)*8, 0);
+    bitmap_init(&map2, (uint32 *)&map2buff, sizeof(ulonglong)*8, 0);
     bitmap_intersect(&map, &map2);
   }
   void subtract(Bitmap& map2) { bitmap_subtract(&map, &map2.map); }
@@ -62,7 +62,7 @@ public:
   char *print(char *buf) const
   {
     char *s=buf;
-    const uchar *e=buffer, *b=e+sizeof(buffer)-1;
+    const uchar *e=(uchar *)buffer, *b=e+sizeof(buffer)-1;
     while (!*b && b>e)
       b--;
     if ((*s=_dig_vec_upper[*b >> 4]) != '0')
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
index e0a15b7d449..cbee80a8695 100644
--- a/sql/sql_cache.cc
+++ b/sql/sql_cache.cc
@@ -303,7 +303,7 @@ TODO list:
 #ifndef MASTER
 #include "../srclib/myisammrg/myrg_def.h"
 #else
-#include "../myisammrg/myrg_def.h"
+#include "../storage/myisammrg/myrg_def.h"
 #endif
 
 #ifdef EMBEDDED_LIBRARY
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 5642fa0d6af..66f91545f97 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -463,19 +463,20 @@ public:
 class i_string: public ilink
 {
 public:
-  char* ptr;
+  const char* ptr;
   i_string():ptr(0) { }
-  i_string(char* s) : ptr(s) {}
+  i_string(const char* s) : ptr(s) {}
 };
 
 /* needed for linked list of two strings for replicate-rewrite-db */
 class i_string_pair: public ilink
 {
 public:
-  char* key;
-  char* val;
+  const char* key;
+  const char* val;
   i_string_pair():key(0),val(0) { }
-  i_string_pair(char* key_arg, char* val_arg) : key(key_arg),val(val_arg) {}
+  i_string_pair(const char* key_arg, const char* val_arg) : 
+    key(key_arg),val(val_arg) {}
 };
 
 
@@ -774,8 +775,15 @@ public:
   /*
     - if set_query_id=1, we set field->query_id for all fields. In that case 
     field list can not contain duplicates.
+    0: Means query_id is not set and no indicator to handler of fields used
+       is set
+    1: Means query_id is set for fields in list and bit in read set is set
+       to inform handler of that field is to be read
+    2: Means query is set for fields in list and bit is set in update set
+       to inform handler that it needs to update this field in write_row
+       and update_row
   */
-  bool set_query_id;
+  ulong set_query_id;
   /*
     This variable is used in post-parse stage to declare that sum-functions,
     or functions which have sense only if GROUP BY is present, are allowed.
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc
index d83937098e2..2967e2a8a20 100644
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.cc
@@ -32,7 +32,8 @@
 bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
                   SQL_LIST *order, ha_rows limit, ulong options)
 {
-  int		error;
+  bool          will_batch;
+  int		error, loc_error;
   TABLE		*table;
   SQL_SELECT	*select=0;
   READ_RECORD	info;
@@ -169,6 +170,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
   deleted=0L;
   init_ftfuncs(thd, select_lex, 1);
   thd->proc_info="updating";
+  will_batch= !table->file->start_bulk_delete();
   while (!(error=info.read_record(&info)) && !thd->killed &&
 	 !thd->net.report_error)
   {
@@ -184,7 +186,7 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
         break;
       }
 
-      if (!(error=table->file->delete_row(table->record[0])))
+      if (!(error= table->file->delete_row(table->record[0])))
       {
 	deleted++;
         if (table->triggers &&
@@ -220,7 +222,13 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
   }
   if (thd->killed && !error)
     error= 1;					// Aborted
-  thd->proc_info="end";
+  if (will_batch && (loc_error= table->file->end_bulk_delete()))
+  {
+    if (error != 1)
+      table->file->print_error(loc_error,MYF(0));
+    error=1;
+  }
+  thd->proc_info= "end";
   end_read_record(&info);
   free_io_cache(table);				// Will not do any harm
   if (options & OPTION_QUICK)
@@ -615,7 +623,8 @@ void multi_delete::send_error(uint errcode,const char *err)
 
 int multi_delete::do_deletes()
 {
-  int local_error= 0, counter= 0;
+  int local_error= 0, counter= 0, error;
+  bool will_batch;
   DBUG_ENTER("do_deletes");
   DBUG_ASSERT(do_delete);
 
@@ -643,6 +652,7 @@ int multi_delete::do_deletes()
       been deleted by foreign key handling
     */
     info.ignore_not_found_rows= 1;
+    will_batch= !table->file->start_bulk_delete();
     while (!(local_error=info.read_record(&info)) && !thd->killed)
     {
       if (table->triggers &&
@@ -666,6 +676,14 @@ int multi_delete::do_deletes()
         break;
       }
     }
+    if (will_batch && (error= table->file->end_bulk_delete()))
+    {
+      if (!local_error)
+      {
+        local_error= error;
+        table->file->print_error(local_error,MYF(0));
+      }
+    }
     end_read_record(&info);
     if (thd->killed && !local_error)
       local_error= 1;
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 7774fce97c0..2c1d481e104 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -103,6 +103,11 @@ static int check_insert_fields(THD *thd, TABLE_LIST *table_list,
 #endif
     clear_timestamp_auto_bits(table->timestamp_field_type,
                               TIMESTAMP_AUTO_SET_ON_INSERT);
+    /*
+      No fields are provided so all fields must be provided in the values.
+      Thus we set all bits in the write set.
+    */
+    table->file->ha_set_all_bits_in_write_set();
   }
   else
   {						// Part field list
@@ -123,7 +128,11 @@ static int check_insert_fields(THD *thd, TABLE_LIST *table_list,
     /* fields only from first table */
     table_list->next_local= 0;
     context->resolve_in_table_list_only(table_list);
-    res= setup_fields(thd, 0, fields, 1, 0, 0);
+    /*
+      Indicate fields in list is to be updated by setting set_query_id
+      parameter to 2. This sets the bit in the write_set for each field.
+    */
+    res= setup_fields(thd, 0, fields, 2, 0, 0);
     table_list->next_local= save_next;
     thd->lex->select_lex.no_wrap_view_item= FALSE;
     context->table_list= save_context;
@@ -214,9 +223,10 @@ static int check_update_fields(THD *thd, TABLE_LIST *insert_table_list,
 
   /*
     Check the fields we are going to modify. This will set the query_id
-    of all used fields to the threads query_id.
+    of all used fields to the threads query_id. It will also set all
+    fields into the write set of this table.
   */
-  if (setup_fields(thd, 0, update_fields, 1, 0, 0))
+  if (setup_fields(thd, 0, update_fields, 2, 0, 0))
     return -1;
 
   if (table->timestamp_field)
@@ -226,7 +236,10 @@ static int check_update_fields(THD *thd, TABLE_LIST *insert_table_list,
       clear_timestamp_auto_bits(table->timestamp_field_type,
                                 TIMESTAMP_AUTO_SET_ON_UPDATE);
     else
+    {
       table->timestamp_field->query_id= timestamp_query_id;
+      table->file->ha_set_bit_in_write_set(table->timestamp_field->fieldnr);
+    }
   }
 
   return 0;
@@ -849,7 +862,7 @@ bool mysql_prepare_insert(THD *thd, TABLE_LIST *table_list,
     select_lex->first_execution= 0;
   }
   if (duplic == DUP_UPDATE || duplic == DUP_REPLACE)
-    table->file->extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY);
+    table->file->ha_retrieve_all_pk();
   DBUG_RETURN(FALSE);
 }
 
@@ -2174,7 +2187,7 @@ select_insert::~select_insert()
   if (table)
   {
     table->next_number_field=0;
-    table->file->reset();
+    table->file->ha_reset();
   }
   thd->count_cuted_fields= CHECK_FIELD_IGNORE;
   thd->abort_on_warning= 0;
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 1ec209aba85..0090f956521 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -171,7 +171,7 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
 
     The main thing to fix to remove this restriction is to ensure that the
     table is marked to be 'used for insert' in which case we should never
-    mark this table as as 'const table' (ie, one that has only one row).
+    mark this table as 'const table' (ie, one that has only one row).
   */
   if (unique_table(table_list, table_list->next_global))
   {
@@ -187,6 +187,10 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
     Field **field;
     for (field=table->field; *field ; field++)
       fields_vars.push_back(new Item_field(*field));
+    /*
+      Since all fields are set we set all bits in the write set
+    */
+    table->file->ha_set_all_bits_in_write_set();
     table->timestamp_field_type= TIMESTAMP_NO_AUTO_SET;
     /*
       Let us also prepare SET clause, altough it is probably empty
@@ -199,8 +203,15 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
   else
   {						// Part field list
     /* TODO: use this conds for 'WITH CHECK OPTIONS' */
-    if (setup_fields(thd, 0, fields_vars, 1, 0, 0) ||
-        setup_fields(thd, 0, set_fields, 1, 0, 0) ||
+    /*
+      Indicate that both variables in field list and fields in update_list
+      is to be included in write set of table. We do however set all bits
+      in write set anyways since it is not allowed to specify NULLs in
+      LOAD DATA
+    */
+    table->file->ha_set_all_bits_in_write_set();
+    if (setup_fields(thd, 0, fields_vars, 2, 0, 0) ||
+        setup_fields(thd, 0, set_fields, 2, 0, 0) ||
         check_that_all_fields_are_given_values(thd, table, table_list))
       DBUG_RETURN(TRUE);
     /*
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index ecaaa82553f..33db36ff255 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -16,6 +16,7 @@
 
 #include "mysql_priv.h"
 #include "sql_repl.h"
+#include "rpl_filter.h"
 #include "repl_failsafe.h"
 #include <m_ctype.h>
 #include <myisam.h>
@@ -179,10 +180,13 @@ static bool begin_trans(THD *thd)
 #ifdef HAVE_REPLICATION
 inline bool all_tables_not_ok(THD *thd, TABLE_LIST *tables)
 {
-  return (table_rules_on && tables && !tables_ok(thd,tables) &&
+  return (rpl_filter->is_on() && tables && 
+	  !(thd->spcont || rpl_filter->tables_ok(thd->db, tables)) &&
           ((thd->lex->sql_command != SQLCOM_DELETE_MULTI) ||
-           !tables_ok(thd,
-		      (TABLE_LIST *)thd->lex->auxilliary_table_list.first)));
+           !(thd->spcont || 
+	     rpl_filter->tables_ok(thd->db, 
+				   (TABLE_LIST *)
+				   thd->lex->auxilliary_table_list.first))));
 }
 #endif
 
@@ -3530,9 +3534,9 @@ end_with_restore_list:
       above was not called. So we have to check rules again here.
     */
 #ifdef HAVE_REPLICATION
-    if (thd->slave_thread &&
-	(!db_ok(lex->name, replicate_do_db, replicate_ignore_db) ||
-	 !db_ok_with_wild_table(lex->name)))
+    if (thd->slave_thread && 
+	(!rpl_filter->db_ok(lex->name) ||
+	 !rpl_filter->db_ok_with_wild_table(lex->name)))
     {
       my_message(ER_SLAVE_IGNORED_TABLE, ER(ER_SLAVE_IGNORED_TABLE), MYF(0));
       break;
@@ -3565,8 +3569,8 @@ end_with_restore_list:
     */
 #ifdef HAVE_REPLICATION
     if (thd->slave_thread && 
-	(!db_ok(lex->name, replicate_do_db, replicate_ignore_db) ||
-	 !db_ok_with_wild_table(lex->name)))
+	(!rpl_filter->db_ok(lex->name) ||
+	 !rpl_filter->db_ok_with_wild_table(lex->name)))
     {
       my_message(ER_SLAVE_IGNORED_TABLE, ER(ER_SLAVE_IGNORED_TABLE), MYF(0));
       break;
@@ -3605,8 +3609,8 @@ end_with_restore_list:
     */
 #ifdef HAVE_REPLICATION
     if (thd->slave_thread &&
-	(!db_ok(db, replicate_do_db, replicate_ignore_db) ||
-	 !db_ok_with_wild_table(db)))
+	(!rpl_filter->db_ok(lex->name) ||
+	 !rpl_filter->db_ok_with_wild_table(lex->name)))
     {
       my_message(ER_SLAVE_IGNORED_TABLE, ER(ER_SLAVE_IGNORED_TABLE), MYF(0));
       break;
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc
index 87bf5463ffa..dbefbb34b4a 100644
--- a/sql/sql_repl.cc
+++ b/sql/sql_repl.cc
@@ -19,6 +19,7 @@
 
 #include "sql_repl.h"
 #include "log_event.h"
+#include "rpl_filter.h"
 #include <my_dir.h>
 
 int max_binlog_dump_events = 0; // unlimited
@@ -1455,8 +1456,8 @@ bool show_binlog_info(THD* thd)
     int dir_len = dirname_length(li.log_file_name);
     protocol->store(li.log_file_name + dir_len, &my_charset_bin);
     protocol->store((ulonglong) li.pos);
-    protocol->store(&binlog_do_db);
-    protocol->store(&binlog_ignore_db);
+    protocol->store(binlog_filter->get_do_db());
+    protocol->store(binlog_filter->get_ignore_db());
     if (protocol->write())
       DBUG_RETURN(TRUE);
   }
diff --git a/sql/sql_repl.h b/sql/sql_repl.h
index 9eb6456ee20..ba64e626adc 100644
--- a/sql/sql_repl.h
+++ b/sql/sql_repl.h
@@ -31,7 +31,6 @@ typedef struct st_slave_info
 extern my_bool opt_show_slave_auth_info;
 extern char *master_host, *master_info_file;
 extern bool server_id_supplied;
-extern I_List<i_string> binlog_do_db, binlog_ignore_db;
 
 extern int max_binlog_dump_events;
 extern my_bool opt_sporadic_binlog_dump_fail;
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 66e783a2103..b4afab24d4c 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -941,23 +941,19 @@ JOIN::optimize()
 
   }
   /*
-    Need to tell Innobase that to play it safe, it should fetch all
-    columns of the tables: this is because MySQL may build row
-    pointers for the rows, and for all columns of the primary key the
-    field->query_id has not necessarily been set to thd->query_id by
-    MySQL.
+    Need to tell handlers that to play it safe, it should fetch all
+    columns of the primary key of the tables: this is because MySQL may
+    build row pointers for the rows, and for all columns of the primary key
+    the read set has not necessarily been set by the server code.
   */
-
-#ifdef HAVE_INNOBASE_DB
   if (need_tmp || select_distinct || group_list || order)
   {
     for (uint i_h = const_tables; i_h < tables; i_h++)
     {
       TABLE* table_h = join_tab[i_h].table;
-      table_h->file->extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY);
+      table_h->file->ha_retrieve_all_pk();
     }
   }
-#endif
 
   DBUG_EXECUTE("info",TEST_join(this););
 
@@ -8048,7 +8044,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
   uint  hidden_null_count, hidden_null_pack_length, hidden_field_count;
   uint  blob_count,group_null_items, string_count;
   uint  temp_pool_slot=MY_BIT_NONE;
-  ulong reclength, string_total_length;
+  ulong reclength, string_total_length, fieldnr= 0;
   bool  using_unique_constraint= 0;
   bool  use_packed_rows= 0;
   bool  not_all_columns= !(select_options & TMP_TABLE_ALL_COLUMNS);
@@ -8071,7 +8067,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
   statistic_increment(thd->status_var.created_tmp_tables, &LOCK_status);
 
   if (use_temp_pool)
-    temp_pool_slot = bitmap_set_next(&temp_pool);
+    temp_pool_slot = bitmap_lock_set_next(&temp_pool);
 
   if (temp_pool_slot != MY_BIT_NONE) // we got a slot
     sprintf(path, "%s_%lx_%i", tmp_file_prefix,
@@ -8123,12 +8119,12 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
 		       param->group_length : 0,
 		       NullS))
   {
-    bitmap_clear_bit(&temp_pool, temp_pool_slot);
+    bitmap_lock_clear_bit(&temp_pool, temp_pool_slot);
     DBUG_RETURN(NULL);				/* purecov: inspected */
   }
   if (!(param->copy_field=copy=new Copy_field[field_count]))
   {
-    bitmap_clear_bit(&temp_pool, temp_pool_slot);
+    bitmap_lock_clear_bit(&temp_pool, temp_pool_slot);
     my_free((gptr) table,MYF(0));		/* purecov: inspected */
     DBUG_RETURN(NULL);				/* purecov: inspected */
   }
@@ -8159,6 +8155,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
   table->s->tmp_table= TMP_TABLE;
   table->s->db_low_byte_first=1;                // True for HEAP and MyISAM
   table->s->table_charset= param->table_charset;
+  table->s->primary_key= MAX_KEY; //Indicate no primary key
   table->s->keys_for_keyread.init();
   table->s->keys_in_use.init();
   /* For easier error reporting */
@@ -8234,6 +8231,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
             (*argp)->maybe_null=1;
           }
           new_field->query_id= thd->query_id;
+          new_field->fieldnr= ++fieldnr;
 	}
       }
     }
@@ -8281,6 +8279,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
 	new_field->flags|= GROUP_FLAG;
       }
       new_field->query_id= thd->query_id;
+      new_field->fieldnr= ++fieldnr;
       new_field->field_index= (uint) (reg_field - table->field);
       *(reg_field++) =new_field;
     }
@@ -8290,6 +8289,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
   DBUG_ASSERT(field_count >= (uint) (reg_field - table->field));
   field_count= (uint) (reg_field - table->field);
   *blob_field= 0;				// End marker
+  table->s->fields= field_count;
 
   /* If result table is small; use a heap */
   if (blob_count || using_unique_constraint ||
@@ -8306,7 +8306,11 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
   {
     table->file=get_new_handler(table,table->s->db_type= DB_TYPE_HEAP);
   }
-
+  if (table->s->fields)
+  {
+    table->file->ha_set_all_bits_in_read_set();
+    table->file->ha_set_all_bits_in_write_set();
+  }
   if (!using_unique_constraint)
     reclength+= group_null_items;	// null flag is stored separately
 
@@ -8332,7 +8336,6 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
        string_total_length / string_count >= AVG_STRING_LENGTH_TO_PACK_ROWS))
     use_packed_rows= 1;
 
-  table->s->fields= field_count;
   table->s->reclength= reclength;
   {
     uint alloc_length=ALIGN_SIZE(reclength+MI_UNIQUE_HASH_LENGTH+1);
@@ -8577,7 +8580,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields,
 
  err:
   free_tmp_table(thd,table);                    /* purecov: inspected */
-  bitmap_clear_bit(&temp_pool, temp_pool_slot);
+  bitmap_lock_clear_bit(&temp_pool, temp_pool_slot);
   DBUG_RETURN(NULL);				/* purecov: inspected */
 }
 
@@ -8851,7 +8854,7 @@ free_tmp_table(THD *thd, TABLE *entry)
   my_free((gptr) entry->record[0],MYF(0));
   free_io_cache(entry);
 
-  bitmap_clear_bit(&temp_pool, entry->temp_pool_slot);
+  bitmap_lock_clear_bit(&temp_pool, entry->temp_pool_slot);
 
   my_free((gptr) entry,MYF(0));
   thd->proc_info=save_proc_info;
@@ -8947,8 +8950,8 @@ bool create_myisam_from_heap(THD *thd, TABLE *table, TMP_TABLE_PARAM *param,
   (void) new_table.file->close();
  err1:
   new_table.file->delete_table(new_table.s->table_name);
-  delete new_table.file;
  err2:
+  delete new_table.file;
   thd->proc_info=save_proc_info;
   DBUG_RETURN(1);
 }
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 5a93176b922..22eb2489451 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -1652,6 +1652,7 @@ bool mysql_create_table(THD *thd,const char *db, const char *table_name,
 end:
   VOID(pthread_mutex_unlock(&LOCK_open));
   start_waiting_global_read_lock(thd);
+  delete file;
   thd->proc_info="After create";
   DBUG_RETURN(error);
 }
@@ -3917,7 +3918,8 @@ copy_data_between_tables(TABLE *from,TABLE *to,
     this function does not set field->query_id in the columns to the
     current query id
   */
-  from->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS);
+  to->file->ha_set_all_bits_in_write_set();
+  from->file->ha_retrieve_all_cols();
   init_read_record(&info, thd, from, (SQL_SELECT *) 0, 1,1);
   if (ignore ||
       handle_duplicates == DUP_REPLACE)
@@ -4080,10 +4082,11 @@ bool mysql_checksum_table(THD *thd, TABLE_LIST *tables, HA_CHECK_OPT *check_opt)
 	/* calculating table's checksum */
 	ha_checksum crc= 0;
 
-	/* InnoDB must be told explicitly to retrieve all columns, because
-	this function does not set field->query_id in the columns to the
-	current query id */
-	t->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS);
+        /*
+          Set all bits in read set and inform InnoDB that we are reading all
+          fields
+        */
+        t->file->ha_retrieve_all_cols();
 
 	if (t->file->ha_rnd_init(1))
 	  protocol->store_null();
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc
index e0c3034a58a..453b9324e88 100644
--- a/sql/sql_udf.cc
+++ b/sql/sql_udf.cc
@@ -528,7 +528,7 @@ int mysql_drop_function(THD *thd,const LEX_STRING *udf_name)
   if (!(table = open_ltable(thd,&tables,TL_WRITE)))
     goto err;
   table->field[0]->store(udf_name->str, udf_name->length, system_charset_info);
-  table->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS);
+  table->file->ha_retrieve_all_cols();
   if (!table->file->index_read_idx(table->record[0], 0,
 				   (byte*) table->field[0]->ptr,
 				   table->key_info[0].key_length,
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index ce4a7d6394e..c5d8e0d98e2 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -119,10 +119,10 @@ int mysql_update(THD *thd,
 {
   bool		using_limit= limit != HA_POS_ERROR;
   bool		safe_update= thd->options & OPTION_SAFE_UPDATES;
-  bool		used_key_is_modified, transactional_table;
+  bool		used_key_is_modified, transactional_table, will_batch;
   int           res;
-  int		error=0;
-  uint		used_index;
+  int		error=0, loc_error;
+  uint		used_index, dup_key_found;
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
   uint		want_privilege;
 #endif
@@ -187,7 +187,11 @@ int mysql_update(THD *thd,
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
   table_list->grant.want_privilege= table->grant.want_privilege= want_privilege;
 #endif
-  if (setup_fields_with_no_wrap(thd, 0, fields, 1, 0, 0))
+  /*
+    Indicate that the set of fields is to be updated by passing 2 for
+    set_query_id.
+  */
+  if (setup_fields_with_no_wrap(thd, 0, fields, 2, 0, 0))
     DBUG_RETURN(1);                     /* purecov: inspected */
   if (table_list->view && check_fields(thd, fields))
   {
@@ -204,7 +208,10 @@ int mysql_update(THD *thd,
     if (table->timestamp_field->query_id == thd->query_id)
       table->timestamp_field_type= TIMESTAMP_NO_AUTO_SET;
     else
+    {
       table->timestamp_field->query_id=timestamp_query_id;
+      table->file->ha_set_bit_in_write_set(table->timestamp_field->fieldnr);
+    }
   }
 
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
@@ -264,7 +271,7 @@ int mysql_update(THD *thd,
       We can't update table directly;  We must first search after all
       matching rows before updating the table!
     */
-    table->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS);
+    table->file->ha_retrieve_all_cols();
     if (used_index < MAX_KEY && old_used_keys.is_set(used_index))
     {
       table->key_read=1;
@@ -388,7 +395,7 @@ int mysql_update(THD *thd,
                               (thd->variables.sql_mode &
                                (MODE_STRICT_TRANS_TABLES |
                                 MODE_STRICT_ALL_TABLES)));
-
+  will_batch= !table->file->start_bulk_update();
   while (!(error=info.read_record(&info)) && !thd->killed)
   {
     if (!(select && select->skip_record()))
@@ -415,8 +422,47 @@ int mysql_update(THD *thd,
             break;
           }
         }
-	if (!(error=table->file->update_row((byte*) table->record[1],
-					    (byte*) table->record[0])))
+        if (will_batch)
+        {
+          /*
+            Typically a batched handler can execute the batched jobs when:
+            1) When specifically told to do so
+            2) When it is not a good idea to batch anymore
+            3) When it is necessary to send batch for other reasons
+               (One such reason is when READ's must be performed)
+
+            1) is covered by exec_bulk_update calls.
+            2) and 3) is handled by the bulk_update_row method.
+            
+            bulk_update_row can execute the updates including the one
+            defined in the bulk_update_row or not including the row
+            in the call. This is up to the handler implementation and can
+            vary from call to call.
+
+            The dup_key_found reports the number of duplicate keys found
+            in those updates actually executed. It only reports those if
+            the extra call with HA_EXTRA_IGNORE_DUP_KEY have been issued.
+            If this hasn't been issued it returns an error code and can
+            ignore this number. Thus any handler that implements batching
+            for UPDATE IGNORE must also handle this extra call properly.
+
+            If a duplicate key is found on the record included in this
+            call then it should be included in the count of dup_key_found
+            and error should be set to 0 (only if these errors are ignored).
+          */
+          error= table->file->bulk_update_row(table->record[0],
+                                              table->record[1],
+                                              &dup_key_found);
+          limit+= dup_key_found;
+          updated-= dup_key_found;
+        }
+        else
+        {
+          /* Non-batched update */
+	  error= table->file->update_row((byte*) table->record[1],
+	                                 (byte*) table->record[0]);
+        }
+        if (!error)
 	{
 	  updated++;
           thd->no_trans_update= !transactional_table;
@@ -440,20 +486,74 @@ int mysql_update(THD *thd,
 
       if (!--limit && using_limit)
       {
-	error= -1;				// Simulate end of file
-	break;
+        /*
+          We have reached end-of-file in most common situations where no
+          batching has occurred and if batching was supposed to occur but
+          no updates were made and finally when the batch execution was
+          performed without error and without finding any duplicate keys.
+          If the batched updates were performed with errors we need to
+          check and if no error but duplicate key's found we need to
+          continue since those are not counted for in limit.
+        */
+        if (will_batch &&
+            ((error= table->file->exec_bulk_update(&dup_key_found)) ||
+            !dup_key_found))
+        {
+ 	  if (error)
+          {
+            /*
+              The handler should not report error of duplicate keys if they
+              are ignored. This is a requirement on batching handlers.
+            */
+            table->file->print_error(error,MYF(0));
+            error= 1;
+            break;
+          }
+          /*
+            Either an error was found and we are ignoring errors or there
+            were duplicate keys found. In both cases we need to correct
+            the counters and continue the loop.
+          */
+          limit= dup_key_found; //limit is 0 when we get here so need to +
+          updated-= dup_key_found;
+        }
+        else
+        {
+	  error= -1;				// Simulate end of file
+	  break;
+        }
       }
     }
     else
       table->file->unlock_row();
     thd->row_count++;
   }
+  dup_key_found= 0;
   if (thd->killed && !error)
     error= 1;					// Aborted
+  else if (will_batch &&
+           (loc_error= table->file->exec_bulk_update(&dup_key_found)))
+    /*
+      An error has occurred when a batched update was performed and returned
+      an error indication. It cannot be an allowed duplicate key error since
+      we require the batching handler to treat this as a normal behavior.
+
+      Otherwise we simply remove the number of duplicate keys records found
+      in the batched update.
+    */
+  {
+    thd->fatal_error();
+    table->file->print_error(loc_error,MYF(0));
+    error= 1;
+  }
+  else
+    updated-= dup_key_found;
+  if (will_batch)
+    table->file->end_bulk_update();
   end_read_record(&info);
   free_io_cache(table);				// If ORDER BY
   delete select;
-  thd->proc_info="end";
+  thd->proc_info= "end";
   VOID(table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY));
 
   /*
@@ -644,7 +744,7 @@ bool mysql_multi_update_prepare(THD *thd)
                    &lex->select_lex.leaf_tables, FALSE))
     DBUG_RETURN(TRUE);
 
-  if (setup_fields_with_no_wrap(thd, 0, *fields, 1, 0, 0))
+  if (setup_fields_with_no_wrap(thd, 0, *fields, 2, 0, 0))
     DBUG_RETURN(TRUE);
 
   for (tl= table_list; tl ; tl= tl->next_local)
@@ -760,7 +860,7 @@ bool mysql_multi_update_prepare(THD *thd)
     if (setup_tables(thd, &lex->select_lex.context,
                      table_list, &lex->select_lex.where,
                      &lex->select_lex.leaf_tables, FALSE) ||
-        setup_fields_with_no_wrap(thd, 0, *fields, 1, 0, 0))
+        setup_fields_with_no_wrap(thd, 0, *fields, 2, 0, 0))
       DBUG_RETURN(TRUE);
   }
 
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 84de06d5604..46e267fe165 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -4036,7 +4036,7 @@ select_options:
 	/* empty*/
 	| select_option_list
 	  {
-	    if (test_all_bits(Select->options, SELECT_ALL | SELECT_DISTINCT))
+	    if (Select->options & SELECT_DISTINCT && Select->options & SELECT_ALL)
 	    {
 	      my_error(ER_WRONG_USAGE, MYF(0), "ALL", "DISTINCT");
               YYABORT;
diff --git a/sql/table.cc b/sql/table.cc
index 220aba27d5b..bbf34ae2c25 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -594,6 +594,7 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat,
       goto err;			/* purecov: inspected */
     }
 
+    reg_field->fieldnr= i+1; //Set field number
     reg_field->field_index= i;
     reg_field->comment=comment;
     if (field_type == FIELD_TYPE_BIT && !f_bit_as_char(pack_flag))
@@ -855,6 +856,8 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat,
 	(*save++)= i;
     }
   }
+  if (outparam->file->ha_allocate_read_write_set(share->fields))
+    goto err;
 
   /* The table struct is now initialized;  Open the table */
   error=2;
diff --git a/sql/unireg.cc b/sql/unireg.cc
index 7f170b3ef87..2ea79d92e37 100644
--- a/sql/unireg.cc
+++ b/sql/unireg.cc
@@ -741,6 +741,7 @@ static bool make_empty_rec(THD *thd, File file,enum db_type table_type,
       {
         my_error(ER_INVALID_DEFAULT, MYF(0), regfield->field_name);
         error= 1;
+        delete regfield; //To avoid memory leak
         goto err;
       }
     }
diff --git a/storage/Makefile.am b/storage/Makefile.am
new file mode 100644
index 00000000000..d3df68449ca
--- /dev/null
+++ b/storage/Makefile.am
@@ -0,0 +1,27 @@
+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+# Process this file with automake to create Makefile.in
+
+AUTOMAKE_OPTIONS =	foreign
+
+# These are built from source in the Docs directory
+EXTRA_DIST =		
+SUBDIRS =	
+DIST_SUBDIRS = . bdb heap innobase myisam myisammrg ndb
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
diff --git a/bdb/LICENSE b/storage/bdb/LICENSE
index 1cd727bfd98..1cd727bfd98 100644
--- a/bdb/LICENSE
+++ b/storage/bdb/LICENSE
diff --git a/bdb/Makefile.in b/storage/bdb/Makefile.in
index c83d40ac8b2..c83d40ac8b2 100644
--- a/bdb/Makefile.in
+++ b/storage/bdb/Makefile.in
diff --git a/bdb/btree/bt_compare.c b/storage/bdb/btree/bt_compare.c
index cbe2a1a7170..cbe2a1a7170 100644
--- a/bdb/btree/bt_compare.c
+++ b/storage/bdb/btree/bt_compare.c
diff --git a/bdb/btree/bt_conv.c b/storage/bdb/btree/bt_conv.c
index 4264b62ffdd..4264b62ffdd 100644
--- a/bdb/btree/bt_conv.c
+++ b/storage/bdb/btree/bt_conv.c
diff --git a/bdb/btree/bt_curadj.c b/storage/bdb/btree/bt_curadj.c
index 50d3d422e49..50d3d422e49 100644
--- a/bdb/btree/bt_curadj.c
+++ b/storage/bdb/btree/bt_curadj.c
diff --git a/bdb/btree/bt_cursor.c b/storage/bdb/btree/bt_cursor.c
index 14d90e8873d..14d90e8873d 100644
--- a/bdb/btree/bt_cursor.c
+++ b/storage/bdb/btree/bt_cursor.c
diff --git a/bdb/btree/bt_delete.c b/storage/bdb/btree/bt_delete.c
index 8c76ead2922..8c76ead2922 100644
--- a/bdb/btree/bt_delete.c
+++ b/storage/bdb/btree/bt_delete.c
diff --git a/bdb/btree/bt_method.c b/storage/bdb/btree/bt_method.c
index aa27ed6bab9..aa27ed6bab9 100644
--- a/bdb/btree/bt_method.c
+++ b/storage/bdb/btree/bt_method.c
diff --git a/bdb/btree/bt_open.c b/storage/bdb/btree/bt_open.c
index 24da41e9893..24da41e9893 100644
--- a/bdb/btree/bt_open.c
+++ b/storage/bdb/btree/bt_open.c
diff --git a/bdb/btree/bt_put.c b/storage/bdb/btree/bt_put.c
index 39bd2024e76..39bd2024e76 100644
--- a/bdb/btree/bt_put.c
+++ b/storage/bdb/btree/bt_put.c
diff --git a/bdb/btree/bt_rec.c b/storage/bdb/btree/bt_rec.c
index b6443547aa5..b6443547aa5 100644
--- a/bdb/btree/bt_rec.c
+++ b/storage/bdb/btree/bt_rec.c
diff --git a/bdb/btree/bt_reclaim.c b/storage/bdb/btree/bt_reclaim.c
index ae4554ea7d6..ae4554ea7d6 100644
--- a/bdb/btree/bt_reclaim.c
+++ b/storage/bdb/btree/bt_reclaim.c
diff --git a/bdb/btree/bt_recno.c b/storage/bdb/btree/bt_recno.c
index fab684f3a5f..fab684f3a5f 100644
--- a/bdb/btree/bt_recno.c
+++ b/storage/bdb/btree/bt_recno.c
diff --git a/bdb/btree/bt_rsearch.c b/storage/bdb/btree/bt_rsearch.c
index a75181b44e2..a75181b44e2 100644
--- a/bdb/btree/bt_rsearch.c
+++ b/storage/bdb/btree/bt_rsearch.c
diff --git a/bdb/btree/bt_search.c b/storage/bdb/btree/bt_search.c
index 92b2106311d..92b2106311d 100644
--- a/bdb/btree/bt_search.c
+++ b/storage/bdb/btree/bt_search.c
diff --git a/bdb/btree/bt_split.c b/storage/bdb/btree/bt_split.c
index f3302a6905f..f3302a6905f 100644
--- a/bdb/btree/bt_split.c
+++ b/storage/bdb/btree/bt_split.c
diff --git a/bdb/btree/bt_stat.c b/storage/bdb/btree/bt_stat.c
index 4428de98294..4428de98294 100644
--- a/bdb/btree/bt_stat.c
+++ b/storage/bdb/btree/bt_stat.c
diff --git a/bdb/btree/bt_upgrade.c b/storage/bdb/btree/bt_upgrade.c
index 9f92648d739..9f92648d739 100644
--- a/bdb/btree/bt_upgrade.c
+++ b/storage/bdb/btree/bt_upgrade.c
diff --git a/bdb/btree/bt_verify.c b/storage/bdb/btree/bt_verify.c
index 0cf8a47e476..0cf8a47e476 100644
--- a/bdb/btree/bt_verify.c
+++ b/storage/bdb/btree/bt_verify.c
diff --git a/bdb/btree/btree.src b/storage/bdb/btree/btree.src
index 73f4abac874..73f4abac874 100644
--- a/bdb/btree/btree.src
+++ b/storage/bdb/btree/btree.src
diff --git a/bdb/build_unix/.IGNORE_ME b/storage/bdb/build_unix/.IGNORE_ME
index 558fd496f0c..558fd496f0c 100644
--- a/bdb/build_unix/.IGNORE_ME
+++ b/storage/bdb/build_unix/.IGNORE_ME
diff --git a/bdb/build_vxworks/BerkeleyDB.wsp b/storage/bdb/build_vxworks/BerkeleyDB.wsp
index ce2e71b0eb3..ce2e71b0eb3 100644
--- a/bdb/build_vxworks/BerkeleyDB.wsp
+++ b/storage/bdb/build_vxworks/BerkeleyDB.wsp
diff --git a/bdb/build_vxworks/dbdemo/README b/storage/bdb/build_vxworks/dbdemo/README
index 1a2c7c7d073..1a2c7c7d073 100644
--- a/bdb/build_vxworks/dbdemo/README
+++ b/storage/bdb/build_vxworks/dbdemo/README
diff --git a/bdb/build_win32/Berkeley_DB.dsw b/storage/bdb/build_win32/Berkeley_DB.dsw
index 899e31ad58d..899e31ad58d 100644
--- a/bdb/build_win32/Berkeley_DB.dsw
+++ b/storage/bdb/build_win32/Berkeley_DB.dsw
diff --git a/bdb/build_win32/app_dsp.src b/storage/bdb/build_win32/app_dsp.src
index ff98d39ec79..ff98d39ec79 100644
--- a/bdb/build_win32/app_dsp.src
+++ b/storage/bdb/build_win32/app_dsp.src
diff --git a/bdb/build_win32/build_all.dsp b/storage/bdb/build_win32/build_all.dsp
index 7ae1f9bb031..7ae1f9bb031 100644
--- a/bdb/build_win32/build_all.dsp
+++ b/storage/bdb/build_win32/build_all.dsp
diff --git a/bdb/build_win32/db_java_xa.dsp b/storage/bdb/build_win32/db_java_xa.dsp
index 9c700ffeed4..9c700ffeed4 100644
--- a/bdb/build_win32/db_java_xa.dsp
+++ b/storage/bdb/build_win32/db_java_xa.dsp
diff --git a/bdb/build_win32/db_java_xaj.mak b/storage/bdb/build_win32/db_java_xaj.mak
index c2dbc920d17..c2dbc920d17 100644
--- a/bdb/build_win32/db_java_xaj.mak
+++ b/storage/bdb/build_win32/db_java_xaj.mak
diff --git a/bdb/build_win32/db_lib.dsp b/storage/bdb/build_win32/db_lib.dsp
index a7fb4157909..a7fb4157909 100644
--- a/bdb/build_win32/db_lib.dsp
+++ b/storage/bdb/build_win32/db_lib.dsp
diff --git a/bdb/build_win32/db_test.src b/storage/bdb/build_win32/db_test.src
index 73479d3856a..73479d3856a 100644
--- a/bdb/build_win32/db_test.src
+++ b/storage/bdb/build_win32/db_test.src
diff --git a/bdb/build_win32/dbkill.cpp b/storage/bdb/build_win32/dbkill.cpp
index 23dc87b0e85..23dc87b0e85 100644
--- a/bdb/build_win32/dbkill.cpp
+++ b/storage/bdb/build_win32/dbkill.cpp
diff --git a/bdb/build_win32/dllmain.c b/storage/bdb/build_win32/dllmain.c
index 70c2e849d66..70c2e849d66 100644
--- a/bdb/build_win32/dllmain.c
+++ b/storage/bdb/build_win32/dllmain.c
diff --git a/bdb/build_win32/dynamic_dsp.src b/storage/bdb/build_win32/dynamic_dsp.src
index a92906a51f4..a92906a51f4 100644
--- a/bdb/build_win32/dynamic_dsp.src
+++ b/storage/bdb/build_win32/dynamic_dsp.src
diff --git a/bdb/build_win32/java_dsp.src b/storage/bdb/build_win32/java_dsp.src
index 15941bcab67..15941bcab67 100644
--- a/bdb/build_win32/java_dsp.src
+++ b/storage/bdb/build_win32/java_dsp.src
diff --git a/bdb/build_win32/libdb_tcl.def b/storage/bdb/build_win32/libdb_tcl.def
index b6323c66bc6..b6323c66bc6 100644
--- a/bdb/build_win32/libdb_tcl.def
+++ b/storage/bdb/build_win32/libdb_tcl.def
diff --git a/bdb/build_win32/libdbrc.src b/storage/bdb/build_win32/libdbrc.src
index 3e5d8deec6f..3e5d8deec6f 100644
--- a/bdb/build_win32/libdbrc.src
+++ b/storage/bdb/build_win32/libdbrc.src
diff --git a/bdb/build_win32/srcfile_dsp.src b/storage/bdb/build_win32/srcfile_dsp.src
index 572350e6356..572350e6356 100644
--- a/bdb/build_win32/srcfile_dsp.src
+++ b/storage/bdb/build_win32/srcfile_dsp.src
diff --git a/bdb/build_win32/static_dsp.src b/storage/bdb/build_win32/static_dsp.src
index 0c66c851025..0c66c851025 100644
--- a/bdb/build_win32/static_dsp.src
+++ b/storage/bdb/build_win32/static_dsp.src
diff --git a/bdb/build_win32/tcl_dsp.src b/storage/bdb/build_win32/tcl_dsp.src
index 4de41e6934e..4de41e6934e 100644
--- a/bdb/build_win32/tcl_dsp.src
+++ b/storage/bdb/build_win32/tcl_dsp.src
diff --git a/bdb/clib/getcwd.c b/storage/bdb/clib/getcwd.c
index bae50dfe90c..bae50dfe90c 100644
--- a/bdb/clib/getcwd.c
+++ b/storage/bdb/clib/getcwd.c
diff --git a/bdb/clib/getopt.c b/storage/bdb/clib/getopt.c
index 3f6659ea6e6..3f6659ea6e6 100644
--- a/bdb/clib/getopt.c
+++ b/storage/bdb/clib/getopt.c
diff --git a/bdb/clib/memcmp.c b/storage/bdb/clib/memcmp.c
index 979badaef30..979badaef30 100644
--- a/bdb/clib/memcmp.c
+++ b/storage/bdb/clib/memcmp.c
diff --git a/bdb/clib/memmove.c b/storage/bdb/clib/memmove.c
index 632d50788da..632d50788da 100644
--- a/bdb/clib/memmove.c
+++ b/storage/bdb/clib/memmove.c
diff --git a/bdb/clib/raise.c b/storage/bdb/clib/raise.c
index fcf3bbcbd7f..fcf3bbcbd7f 100644
--- a/bdb/clib/raise.c
+++ b/storage/bdb/clib/raise.c
diff --git a/bdb/clib/snprintf.c b/storage/bdb/clib/snprintf.c
index fa1a63425e8..fa1a63425e8 100644
--- a/bdb/clib/snprintf.c
+++ b/storage/bdb/clib/snprintf.c
diff --git a/bdb/clib/strcasecmp.c b/storage/bdb/clib/strcasecmp.c
index d5ce6d76d5f..d5ce6d76d5f 100644
--- a/bdb/clib/strcasecmp.c
+++ b/storage/bdb/clib/strcasecmp.c
diff --git a/bdb/clib/strdup.c b/storage/bdb/clib/strdup.c
index e68623f1407..e68623f1407 100644
--- a/bdb/clib/strdup.c
+++ b/storage/bdb/clib/strdup.c
diff --git a/bdb/clib/strerror.c b/storage/bdb/clib/strerror.c
index 06c28946b88..06c28946b88 100644
--- a/bdb/clib/strerror.c
+++ b/storage/bdb/clib/strerror.c
diff --git a/bdb/clib/vsnprintf.c b/storage/bdb/clib/vsnprintf.c
index 4ffea8cb0ad..4ffea8cb0ad 100644
--- a/bdb/clib/vsnprintf.c
+++ b/storage/bdb/clib/vsnprintf.c
diff --git a/bdb/common/db_byteorder.c b/storage/bdb/common/db_byteorder.c
index d42d8e6a958..d42d8e6a958 100644
--- a/bdb/common/db_byteorder.c
+++ b/storage/bdb/common/db_byteorder.c
diff --git a/bdb/common/db_err.c b/storage/bdb/common/db_err.c
index 7c9ee3c4fde..7c9ee3c4fde 100644
--- a/bdb/common/db_err.c
+++ b/storage/bdb/common/db_err.c
diff --git a/bdb/common/db_getlong.c b/storage/bdb/common/db_getlong.c
index 6ba8ebfcdaa..6ba8ebfcdaa 100644
--- a/bdb/common/db_getlong.c
+++ b/storage/bdb/common/db_getlong.c
diff --git a/bdb/common/db_idspace.c b/storage/bdb/common/db_idspace.c
index 588ffd9fca9..588ffd9fca9 100644
--- a/bdb/common/db_idspace.c
+++ b/storage/bdb/common/db_idspace.c
diff --git a/bdb/common/db_log2.c b/storage/bdb/common/db_log2.c
index cdd87dda11d..cdd87dda11d 100644
--- a/bdb/common/db_log2.c
+++ b/storage/bdb/common/db_log2.c
diff --git a/bdb/common/util_arg.c b/storage/bdb/common/util_arg.c
index e034e3bd194..e034e3bd194 100644
--- a/bdb/common/util_arg.c
+++ b/storage/bdb/common/util_arg.c
diff --git a/bdb/common/util_cache.c b/storage/bdb/common/util_cache.c
index 5ca88665cc7..5ca88665cc7 100644
--- a/bdb/common/util_cache.c
+++ b/storage/bdb/common/util_cache.c
diff --git a/bdb/common/util_log.c b/storage/bdb/common/util_log.c
index ae215fca64a..ae215fca64a 100644
--- a/bdb/common/util_log.c
+++ b/storage/bdb/common/util_log.c
diff --git a/bdb/common/util_sig.c b/storage/bdb/common/util_sig.c
index 9714427ad33..9714427ad33 100644
--- a/bdb/common/util_sig.c
+++ b/storage/bdb/common/util_sig.c
diff --git a/bdb/cxx/cxx_db.cpp b/storage/bdb/cxx/cxx_db.cpp
index 7e50a9b3f27..7e50a9b3f27 100644
--- a/bdb/cxx/cxx_db.cpp
+++ b/storage/bdb/cxx/cxx_db.cpp
diff --git a/bdb/cxx/cxx_dbc.cpp b/storage/bdb/cxx/cxx_dbc.cpp
index 4d5844f922f..4d5844f922f 100644
--- a/bdb/cxx/cxx_dbc.cpp
+++ b/storage/bdb/cxx/cxx_dbc.cpp
diff --git a/bdb/cxx/cxx_dbt.cpp b/storage/bdb/cxx/cxx_dbt.cpp
index 7a4224503ee..7a4224503ee 100644
--- a/bdb/cxx/cxx_dbt.cpp
+++ b/storage/bdb/cxx/cxx_dbt.cpp
diff --git a/bdb/cxx/cxx_env.cpp b/storage/bdb/cxx/cxx_env.cpp
index c78c6e9fa47..c78c6e9fa47 100644
--- a/bdb/cxx/cxx_env.cpp
+++ b/storage/bdb/cxx/cxx_env.cpp
diff --git a/bdb/cxx/cxx_except.cpp b/storage/bdb/cxx/cxx_except.cpp
index 40fdeae69d6..40fdeae69d6 100644
--- a/bdb/cxx/cxx_except.cpp
+++ b/storage/bdb/cxx/cxx_except.cpp
diff --git a/bdb/cxx/cxx_lock.cpp b/storage/bdb/cxx/cxx_lock.cpp
index 446eba49e27..446eba49e27 100644
--- a/bdb/cxx/cxx_lock.cpp
+++ b/storage/bdb/cxx/cxx_lock.cpp
diff --git a/bdb/cxx/cxx_logc.cpp b/storage/bdb/cxx/cxx_logc.cpp
index d1fe83dd58b..d1fe83dd58b 100644
--- a/bdb/cxx/cxx_logc.cpp
+++ b/storage/bdb/cxx/cxx_logc.cpp
diff --git a/bdb/cxx/cxx_mpool.cpp b/storage/bdb/cxx/cxx_mpool.cpp
index 3eb78d03ff4..3eb78d03ff4 100644
--- a/bdb/cxx/cxx_mpool.cpp
+++ b/storage/bdb/cxx/cxx_mpool.cpp
diff --git a/bdb/cxx/cxx_txn.cpp b/storage/bdb/cxx/cxx_txn.cpp
index b04077c0f5b..b04077c0f5b 100644
--- a/bdb/cxx/cxx_txn.cpp
+++ b/storage/bdb/cxx/cxx_txn.cpp
diff --git a/bdb/db/crdel.src b/storage/bdb/db/crdel.src
index d89fa7a0382..d89fa7a0382 100644
--- a/bdb/db/crdel.src
+++ b/storage/bdb/db/crdel.src
diff --git a/bdb/db/crdel_rec.c b/storage/bdb/db/crdel_rec.c
index 542a0c358dd..542a0c358dd 100644
--- a/bdb/db/crdel_rec.c
+++ b/storage/bdb/db/crdel_rec.c
diff --git a/bdb/db/db.c b/storage/bdb/db/db.c
index 986167d5ade..986167d5ade 100644
--- a/bdb/db/db.c
+++ b/storage/bdb/db/db.c
diff --git a/bdb/db/db.src b/storage/bdb/db/db.src
index 414321fcbbd..414321fcbbd 100644
--- a/bdb/db/db.src
+++ b/storage/bdb/db/db.src
diff --git a/bdb/db/db_am.c b/storage/bdb/db/db_am.c
index cf6ef18549b..cf6ef18549b 100644
--- a/bdb/db/db_am.c
+++ b/storage/bdb/db/db_am.c
diff --git a/bdb/db/db_cam.c b/storage/bdb/db/db_cam.c
index 4de3467d4aa..4de3467d4aa 100644
--- a/bdb/db/db_cam.c
+++ b/storage/bdb/db/db_cam.c
diff --git a/bdb/db/db_conv.c b/storage/bdb/db/db_conv.c
index f731c82d85e..f731c82d85e 100644
--- a/bdb/db/db_conv.c
+++ b/storage/bdb/db/db_conv.c
diff --git a/bdb/db/db_dispatch.c b/storage/bdb/db/db_dispatch.c
index 2cf29ec2f33..2cf29ec2f33 100644
--- a/bdb/db/db_dispatch.c
+++ b/storage/bdb/db/db_dispatch.c
diff --git a/bdb/db/db_dup.c b/storage/bdb/db/db_dup.c
index 2d33d79153f..2d33d79153f 100644
--- a/bdb/db/db_dup.c
+++ b/storage/bdb/db/db_dup.c
diff --git a/bdb/db/db_iface.c b/storage/bdb/db/db_iface.c
index b518c3b14b2..b518c3b14b2 100644
--- a/bdb/db/db_iface.c
+++ b/storage/bdb/db/db_iface.c
diff --git a/bdb/db/db_join.c b/storage/bdb/db/db_join.c
index 6281b1a8383..6281b1a8383 100644
--- a/bdb/db/db_join.c
+++ b/storage/bdb/db/db_join.c
diff --git a/bdb/db/db_meta.c b/storage/bdb/db/db_meta.c
index 015ef5c8fc7..015ef5c8fc7 100644
--- a/bdb/db/db_meta.c
+++ b/storage/bdb/db/db_meta.c
diff --git a/bdb/db/db_method.c b/storage/bdb/db/db_method.c
index 14712180df0..14712180df0 100644
--- a/bdb/db/db_method.c
+++ b/storage/bdb/db/db_method.c
diff --git a/bdb/db/db_open.c b/storage/bdb/db/db_open.c
index 8352525361f..8352525361f 100644
--- a/bdb/db/db_open.c
+++ b/storage/bdb/db/db_open.c
diff --git a/bdb/db/db_overflow.c b/storage/bdb/db/db_overflow.c
index 27dcb41a2ff..27dcb41a2ff 100644
--- a/bdb/db/db_overflow.c
+++ b/storage/bdb/db/db_overflow.c
diff --git a/bdb/db/db_pr.c b/storage/bdb/db/db_pr.c
index 235e7187f7c..235e7187f7c 100644
--- a/bdb/db/db_pr.c
+++ b/storage/bdb/db/db_pr.c
diff --git a/bdb/db/db_rec.c b/storage/bdb/db/db_rec.c
index 303ab2fe1d4..303ab2fe1d4 100644
--- a/bdb/db/db_rec.c
+++ b/storage/bdb/db/db_rec.c
diff --git a/bdb/db/db_reclaim.c b/storage/bdb/db/db_reclaim.c
index 9aa39bcfa9b..9aa39bcfa9b 100644
--- a/bdb/db/db_reclaim.c
+++ b/storage/bdb/db/db_reclaim.c
diff --git a/bdb/db/db_remove.c b/storage/bdb/db/db_remove.c
index ef11c342555..ef11c342555 100644
--- a/bdb/db/db_remove.c
+++ b/storage/bdb/db/db_remove.c
diff --git a/bdb/db/db_rename.c b/storage/bdb/db/db_rename.c
index 87f88232cda..87f88232cda 100644
--- a/bdb/db/db_rename.c
+++ b/storage/bdb/db/db_rename.c
diff --git a/bdb/db/db_ret.c b/storage/bdb/db/db_ret.c
index b1af7b4ffeb..b1af7b4ffeb 100644
--- a/bdb/db/db_ret.c
+++ b/storage/bdb/db/db_ret.c
diff --git a/bdb/db/db_truncate.c b/storage/bdb/db/db_truncate.c
index 49546ae51b9..49546ae51b9 100644
--- a/bdb/db/db_truncate.c
+++ b/storage/bdb/db/db_truncate.c
diff --git a/bdb/db/db_upg.c b/storage/bdb/db/db_upg.c
index c0eb72f3713..c0eb72f3713 100644
--- a/bdb/db/db_upg.c
+++ b/storage/bdb/db/db_upg.c
diff --git a/bdb/db/db_upg_opd.c b/storage/bdb/db/db_upg_opd.c
index f410b797bff..f410b797bff 100644
--- a/bdb/db/db_upg_opd.c
+++ b/storage/bdb/db/db_upg_opd.c
diff --git a/bdb/db/db_vrfy.c b/storage/bdb/db/db_vrfy.c
index 1bbecdbd87a..1bbecdbd87a 100644
--- a/bdb/db/db_vrfy.c
+++ b/storage/bdb/db/db_vrfy.c
diff --git a/bdb/db/db_vrfyutil.c b/storage/bdb/db/db_vrfyutil.c
index 44344ceed11..44344ceed11 100644
--- a/bdb/db/db_vrfyutil.c
+++ b/storage/bdb/db/db_vrfyutil.c
diff --git a/bdb/db185/db185.c b/storage/bdb/db185/db185.c
index 99d37bcf341..99d37bcf341 100644
--- a/bdb/db185/db185.c
+++ b/storage/bdb/db185/db185.c
diff --git a/bdb/db185/db185_int.in b/storage/bdb/db185/db185_int.in
index a4a3ce19c17..a4a3ce19c17 100644
--- a/bdb/db185/db185_int.in
+++ b/storage/bdb/db185/db185_int.in
diff --git a/bdb/db_archive/db_archive.c b/storage/bdb/db_archive/db_archive.c
index dc8718e4c03..dc8718e4c03 100644
--- a/bdb/db_archive/db_archive.c
+++ b/storage/bdb/db_archive/db_archive.c
diff --git a/bdb/db_checkpoint/db_checkpoint.c b/storage/bdb/db_checkpoint/db_checkpoint.c
index a59572c5f76..a59572c5f76 100644
--- a/bdb/db_checkpoint/db_checkpoint.c
+++ b/storage/bdb/db_checkpoint/db_checkpoint.c
diff --git a/bdb/db_deadlock/db_deadlock.c b/storage/bdb/db_deadlock/db_deadlock.c
index 523918b9ea4..523918b9ea4 100644
--- a/bdb/db_deadlock/db_deadlock.c
+++ b/storage/bdb/db_deadlock/db_deadlock.c
diff --git a/bdb/db_dump/db_dump.c b/storage/bdb/db_dump/db_dump.c
index 143884a3fa8..143884a3fa8 100644
--- a/bdb/db_dump/db_dump.c
+++ b/storage/bdb/db_dump/db_dump.c
diff --git a/bdb/db_dump185/db_dump185.c b/storage/bdb/db_dump185/db_dump185.c
index 97164f34a9a..97164f34a9a 100644
--- a/bdb/db_dump185/db_dump185.c
+++ b/storage/bdb/db_dump185/db_dump185.c
diff --git a/bdb/db_load/db_load.c b/storage/bdb/db_load/db_load.c
index d27fca04ec0..d27fca04ec0 100644
--- a/bdb/db_load/db_load.c
+++ b/storage/bdb/db_load/db_load.c
diff --git a/bdb/db_printlog/README b/storage/bdb/db_printlog/README
index d59f4c77f55..d59f4c77f55 100644
--- a/bdb/db_printlog/README
+++ b/storage/bdb/db_printlog/README
diff --git a/bdb/db_printlog/commit.awk b/storage/bdb/db_printlog/commit.awk
index 66391d3fb63..66391d3fb63 100644
--- a/bdb/db_printlog/commit.awk
+++ b/storage/bdb/db_printlog/commit.awk
diff --git a/bdb/db_printlog/count.awk b/storage/bdb/db_printlog/count.awk
index 1d5a291950f..1d5a291950f 100644
--- a/bdb/db_printlog/count.awk
+++ b/storage/bdb/db_printlog/count.awk
diff --git a/bdb/db_printlog/db_printlog.c b/storage/bdb/db_printlog/db_printlog.c
index af6d00d593a..af6d00d593a 100644
--- a/bdb/db_printlog/db_printlog.c
+++ b/storage/bdb/db_printlog/db_printlog.c
diff --git a/bdb/db_printlog/dbname.awk b/storage/bdb/db_printlog/dbname.awk
index 47955994579..47955994579 100644
--- a/bdb/db_printlog/dbname.awk
+++ b/storage/bdb/db_printlog/dbname.awk
diff --git a/bdb/db_printlog/fileid.awk b/storage/bdb/db_printlog/fileid.awk
index 020644039ab..020644039ab 100644
--- a/bdb/db_printlog/fileid.awk
+++ b/storage/bdb/db_printlog/fileid.awk
diff --git a/bdb/db_printlog/logstat.awk b/storage/bdb/db_printlog/logstat.awk
index 1009343eba4..1009343eba4 100644
--- a/bdb/db_printlog/logstat.awk
+++ b/storage/bdb/db_printlog/logstat.awk
diff --git a/bdb/db_printlog/pgno.awk b/storage/bdb/db_printlog/pgno.awk
index 289fa853bc4..289fa853bc4 100644
--- a/bdb/db_printlog/pgno.awk
+++ b/storage/bdb/db_printlog/pgno.awk
diff --git a/bdb/db_printlog/range.awk b/storage/bdb/db_printlog/range.awk
index 7abb410b40f..7abb410b40f 100644
--- a/bdb/db_printlog/range.awk
+++ b/storage/bdb/db_printlog/range.awk
diff --git a/bdb/db_printlog/rectype.awk b/storage/bdb/db_printlog/rectype.awk
index 7f7b2f5ee15..7f7b2f5ee15 100644
--- a/bdb/db_printlog/rectype.awk
+++ b/storage/bdb/db_printlog/rectype.awk
diff --git a/bdb/db_printlog/status.awk b/storage/bdb/db_printlog/status.awk
index 13df0b6194a..13df0b6194a 100644
--- a/bdb/db_printlog/status.awk
+++ b/storage/bdb/db_printlog/status.awk
diff --git a/bdb/db_printlog/txn.awk b/storage/bdb/db_printlog/txn.awk
index be8c44e1092..be8c44e1092 100644
--- a/bdb/db_printlog/txn.awk
+++ b/storage/bdb/db_printlog/txn.awk
diff --git a/bdb/db_recover/db_recover.c b/storage/bdb/db_recover/db_recover.c
index b6414267f93..b6414267f93 100644
--- a/bdb/db_recover/db_recover.c
+++ b/storage/bdb/db_recover/db_recover.c
diff --git a/bdb/db_stat/db_stat.c b/storage/bdb/db_stat/db_stat.c
index a2b01b71e0a..a2b01b71e0a 100644
--- a/bdb/db_stat/db_stat.c
+++ b/storage/bdb/db_stat/db_stat.c
diff --git a/bdb/db_upgrade/db_upgrade.c b/storage/bdb/db_upgrade/db_upgrade.c
index f46b5eabc4e..f46b5eabc4e 100644
--- a/bdb/db_upgrade/db_upgrade.c
+++ b/storage/bdb/db_upgrade/db_upgrade.c
diff --git a/bdb/db_verify/db_verify.c b/storage/bdb/db_verify/db_verify.c
index 8d63a20e7bc..8d63a20e7bc 100644
--- a/bdb/db_verify/db_verify.c
+++ b/storage/bdb/db_verify/db_verify.c
diff --git a/bdb/dbinc/btree.h b/storage/bdb/dbinc/btree.h
index 54da9c5b208..54da9c5b208 100644
--- a/bdb/dbinc/btree.h
+++ b/storage/bdb/dbinc/btree.h
diff --git a/bdb/dbinc/crypto.h b/storage/bdb/dbinc/crypto.h
index 92fad098a4a..92fad098a4a 100644
--- a/bdb/dbinc/crypto.h
+++ b/storage/bdb/dbinc/crypto.h
diff --git a/bdb/dbinc/cxx_common.h b/storage/bdb/dbinc/cxx_common.h
index e5cb3a9aef4..e5cb3a9aef4 100644
--- a/bdb/dbinc/cxx_common.h
+++ b/storage/bdb/dbinc/cxx_common.h
diff --git a/bdb/dbinc/cxx_except.h b/storage/bdb/dbinc/cxx_except.h
index f9bf4f859f8..f9bf4f859f8 100644
--- a/bdb/dbinc/cxx_except.h
+++ b/storage/bdb/dbinc/cxx_except.h
diff --git a/bdb/dbinc/cxx_int.h b/storage/bdb/dbinc/cxx_int.h
index 9af3979d9f1..9af3979d9f1 100644
--- a/bdb/dbinc/cxx_int.h
+++ b/storage/bdb/dbinc/cxx_int.h
diff --git a/bdb/dbinc/db.in b/storage/bdb/dbinc/db.in
index 208de3bd622..208de3bd622 100644
--- a/bdb/dbinc/db.in
+++ b/storage/bdb/dbinc/db.in
diff --git a/bdb/dbinc/db_185.in b/storage/bdb/dbinc/db_185.in
index 86e2290c304..86e2290c304 100644
--- a/bdb/dbinc/db_185.in
+++ b/storage/bdb/dbinc/db_185.in
diff --git a/bdb/dbinc/db_am.h b/storage/bdb/dbinc/db_am.h
index c5aa424255d..c5aa424255d 100644
--- a/bdb/dbinc/db_am.h
+++ b/storage/bdb/dbinc/db_am.h
diff --git a/bdb/dbinc/db_cxx.in b/storage/bdb/dbinc/db_cxx.in
index 6752b36ec42..6752b36ec42 100644
--- a/bdb/dbinc/db_cxx.in
+++ b/storage/bdb/dbinc/db_cxx.in
diff --git a/bdb/dbinc/db_dispatch.h b/storage/bdb/dbinc/db_dispatch.h
index 283eb1e95de..283eb1e95de 100644
--- a/bdb/dbinc/db_dispatch.h
+++ b/storage/bdb/dbinc/db_dispatch.h
diff --git a/bdb/dbinc/db_int.in b/storage/bdb/dbinc/db_int.in
index 2f46293a65d..2f46293a65d 100644
--- a/bdb/dbinc/db_int.in
+++ b/storage/bdb/dbinc/db_int.in
diff --git a/bdb/dbinc/db_join.h b/storage/bdb/dbinc/db_join.h
index 487ce3eebbb..487ce3eebbb 100644
--- a/bdb/dbinc/db_join.h
+++ b/storage/bdb/dbinc/db_join.h
diff --git a/bdb/dbinc/db_page.h b/storage/bdb/dbinc/db_page.h
index 97497556fd9..97497556fd9 100644
--- a/bdb/dbinc/db_page.h
+++ b/storage/bdb/dbinc/db_page.h
diff --git a/bdb/dbinc/db_server_int.h b/storage/bdb/dbinc/db_server_int.h
index efec539b2f8..efec539b2f8 100644
--- a/bdb/dbinc/db_server_int.h
+++ b/storage/bdb/dbinc/db_server_int.h
diff --git a/bdb/dbinc/db_shash.h b/storage/bdb/dbinc/db_shash.h
index 2c54d6145c5..2c54d6145c5 100644
--- a/bdb/dbinc/db_shash.h
+++ b/storage/bdb/dbinc/db_shash.h
diff --git a/bdb/dbinc/db_swap.h b/storage/bdb/dbinc/db_swap.h
index d5aad65385e..d5aad65385e 100644
--- a/bdb/dbinc/db_swap.h
+++ b/storage/bdb/dbinc/db_swap.h
diff --git a/bdb/dbinc/db_upgrade.h b/storage/bdb/dbinc/db_upgrade.h
index 3ccba810889..3ccba810889 100644
--- a/bdb/dbinc/db_upgrade.h
+++ b/storage/bdb/dbinc/db_upgrade.h
diff --git a/bdb/dbinc/db_verify.h b/storage/bdb/dbinc/db_verify.h
index 949c9a2a6a1..949c9a2a6a1 100644
--- a/bdb/dbinc/db_verify.h
+++ b/storage/bdb/dbinc/db_verify.h
diff --git a/bdb/dbinc/debug.h b/storage/bdb/dbinc/debug.h
index 21f80387ccc..21f80387ccc 100644
--- a/bdb/dbinc/debug.h
+++ b/storage/bdb/dbinc/debug.h
diff --git a/bdb/dbinc/fop.h b/storage/bdb/dbinc/fop.h
index c438ef7ef40..c438ef7ef40 100644
--- a/bdb/dbinc/fop.h
+++ b/storage/bdb/dbinc/fop.h
diff --git a/bdb/dbinc/globals.h b/storage/bdb/dbinc/globals.h
index 3441ade2ea9..3441ade2ea9 100644
--- a/bdb/dbinc/globals.h
+++ b/storage/bdb/dbinc/globals.h
diff --git a/bdb/dbinc/hash.h b/storage/bdb/dbinc/hash.h
index 98289735fc4..98289735fc4 100644
--- a/bdb/dbinc/hash.h
+++ b/storage/bdb/dbinc/hash.h
diff --git a/bdb/dbinc/hmac.h b/storage/bdb/dbinc/hmac.h
index 16f61fb58ad..16f61fb58ad 100644
--- a/bdb/dbinc/hmac.h
+++ b/storage/bdb/dbinc/hmac.h
diff --git a/bdb/dbinc/lock.h b/storage/bdb/dbinc/lock.h
index 7ddc9ce9988..7ddc9ce9988 100644
--- a/bdb/dbinc/lock.h
+++ b/storage/bdb/dbinc/lock.h
diff --git a/bdb/dbinc/log.h b/storage/bdb/dbinc/log.h
index 434994528ea..434994528ea 100644
--- a/bdb/dbinc/log.h
+++ b/storage/bdb/dbinc/log.h
diff --git a/bdb/dbinc/mp.h b/storage/bdb/dbinc/mp.h
index 5c805b92364..5c805b92364 100644
--- a/bdb/dbinc/mp.h
+++ b/storage/bdb/dbinc/mp.h
diff --git a/bdb/dbinc/mutex.h b/storage/bdb/dbinc/mutex.h
index 41bb1b4bb59..41bb1b4bb59 100644
--- a/bdb/dbinc/mutex.h
+++ b/storage/bdb/dbinc/mutex.h
diff --git a/bdb/dbinc/os.h b/storage/bdb/dbinc/os.h
index 01ca0ac470d..01ca0ac470d 100644
--- a/bdb/dbinc/os.h
+++ b/storage/bdb/dbinc/os.h
diff --git a/bdb/dbinc/qam.h b/storage/bdb/dbinc/qam.h
index 0306ed07d2a..0306ed07d2a 100644
--- a/bdb/dbinc/qam.h
+++ b/storage/bdb/dbinc/qam.h
diff --git a/bdb/dbinc/queue.h b/storage/bdb/dbinc/queue.h
index 8d4a771add6..8d4a771add6 100644
--- a/bdb/dbinc/queue.h
+++ b/storage/bdb/dbinc/queue.h
diff --git a/bdb/dbinc/region.h b/storage/bdb/dbinc/region.h
index 9ee6c81062f..9ee6c81062f 100644
--- a/bdb/dbinc/region.h
+++ b/storage/bdb/dbinc/region.h
diff --git a/bdb/dbinc/rep.h b/storage/bdb/dbinc/rep.h
index 1e315494c87..1e315494c87 100644
--- a/bdb/dbinc/rep.h
+++ b/storage/bdb/dbinc/rep.h
diff --git a/bdb/dbinc/shqueue.h b/storage/bdb/dbinc/shqueue.h
index 47fdf12ac92..47fdf12ac92 100644
--- a/bdb/dbinc/shqueue.h
+++ b/storage/bdb/dbinc/shqueue.h
diff --git a/bdb/dbinc/tcl_db.h b/storage/bdb/dbinc/tcl_db.h
index 8c04d545295..8c04d545295 100644
--- a/bdb/dbinc/tcl_db.h
+++ b/storage/bdb/dbinc/tcl_db.h
diff --git a/bdb/dbinc/txn.h b/storage/bdb/dbinc/txn.h
index 31b00a6ba74..31b00a6ba74 100644
--- a/bdb/dbinc/txn.h
+++ b/storage/bdb/dbinc/txn.h
diff --git a/bdb/dbinc/xa.h b/storage/bdb/dbinc/xa.h
index 64bdac8c914..64bdac8c914 100644
--- a/bdb/dbinc/xa.h
+++ b/storage/bdb/dbinc/xa.h
diff --git a/bdb/dbm/dbm.c b/storage/bdb/dbm/dbm.c
index 3aa6fff6982..3aa6fff6982 100644
--- a/bdb/dbm/dbm.c
+++ b/storage/bdb/dbm/dbm.c
diff --git a/bdb/dbreg/dbreg.c b/storage/bdb/dbreg/dbreg.c
index 289fe67ed50..289fe67ed50 100644
--- a/bdb/dbreg/dbreg.c
+++ b/storage/bdb/dbreg/dbreg.c
diff --git a/bdb/dbreg/dbreg.src b/storage/bdb/dbreg/dbreg.src
index 18429471e82..18429471e82 100644
--- a/bdb/dbreg/dbreg.src
+++ b/storage/bdb/dbreg/dbreg.src
diff --git a/bdb/dbreg/dbreg_rec.c b/storage/bdb/dbreg/dbreg_rec.c
index ba3ba0e06d9..ba3ba0e06d9 100644
--- a/bdb/dbreg/dbreg_rec.c
+++ b/storage/bdb/dbreg/dbreg_rec.c
diff --git a/bdb/dbreg/dbreg_util.c b/storage/bdb/dbreg/dbreg_util.c
index 0db5c640adb..0db5c640adb 100644
--- a/bdb/dbreg/dbreg_util.c
+++ b/storage/bdb/dbreg/dbreg_util.c
diff --git a/bdb/dist/Makefile.in b/storage/bdb/dist/Makefile.in
index a7cc0e11f34..a7cc0e11f34 100644
--- a/bdb/dist/Makefile.in
+++ b/storage/bdb/dist/Makefile.in
diff --git a/bdb/dist/RELEASE b/storage/bdb/dist/RELEASE
index 61151b8589c..61151b8589c 100644
--- a/bdb/dist/RELEASE
+++ b/storage/bdb/dist/RELEASE
diff --git a/bdb/dist/aclocal/config.ac b/storage/bdb/dist/aclocal/config.ac
index cd288425946..cd288425946 100644
--- a/bdb/dist/aclocal/config.ac
+++ b/storage/bdb/dist/aclocal/config.ac
diff --git a/bdb/dist/aclocal/cxx.ac b/storage/bdb/dist/aclocal/cxx.ac
index 49103cc661a..49103cc661a 100644
--- a/bdb/dist/aclocal/cxx.ac
+++ b/storage/bdb/dist/aclocal/cxx.ac
diff --git a/bdb/dist/aclocal/gcc.ac b/storage/bdb/dist/aclocal/gcc.ac
index 0949d982f17..0949d982f17 100644
--- a/bdb/dist/aclocal/gcc.ac
+++ b/storage/bdb/dist/aclocal/gcc.ac
diff --git a/bdb/dist/aclocal/libtool.ac b/storage/bdb/dist/aclocal/libtool.ac
index e99faf15e4e..e99faf15e4e 100644
--- a/bdb/dist/aclocal/libtool.ac
+++ b/storage/bdb/dist/aclocal/libtool.ac
diff --git a/bdb/dist/aclocal/mutex.ac b/storage/bdb/dist/aclocal/mutex.ac
index f3f5529c74f..f3f5529c74f 100644
--- a/bdb/dist/aclocal/mutex.ac
+++ b/storage/bdb/dist/aclocal/mutex.ac
diff --git a/bdb/dist/aclocal/options.ac b/storage/bdb/dist/aclocal/options.ac
index ba45c34dfe9..ba45c34dfe9 100644
--- a/bdb/dist/aclocal/options.ac
+++ b/storage/bdb/dist/aclocal/options.ac
diff --git a/bdb/dist/aclocal/programs.ac b/storage/bdb/dist/aclocal/programs.ac
index 7bfa1fa2646..7bfa1fa2646 100644
--- a/bdb/dist/aclocal/programs.ac
+++ b/storage/bdb/dist/aclocal/programs.ac
diff --git a/bdb/dist/aclocal/sosuffix.ac b/storage/bdb/dist/aclocal/sosuffix.ac
index 1197128293b..1197128293b 100644
--- a/bdb/dist/aclocal/sosuffix.ac
+++ b/storage/bdb/dist/aclocal/sosuffix.ac
diff --git a/bdb/dist/aclocal/tcl.ac b/storage/bdb/dist/aclocal/tcl.ac
index 80ed19c5a97..80ed19c5a97 100644
--- a/bdb/dist/aclocal/tcl.ac
+++ b/storage/bdb/dist/aclocal/tcl.ac
diff --git a/bdb/dist/aclocal/types.ac b/storage/bdb/dist/aclocal/types.ac
index db8aaac6884..db8aaac6884 100644
--- a/bdb/dist/aclocal/types.ac
+++ b/storage/bdb/dist/aclocal/types.ac
diff --git a/bdb/dist/aclocal_java/ac_check_class.ac b/storage/bdb/dist/aclocal_java/ac_check_class.ac
index 915198af567..915198af567 100644
--- a/bdb/dist/aclocal_java/ac_check_class.ac
+++ b/storage/bdb/dist/aclocal_java/ac_check_class.ac
diff --git a/bdb/dist/aclocal_java/ac_check_classpath.ac b/storage/bdb/dist/aclocal_java/ac_check_classpath.ac
index 4a78d0f8785..4a78d0f8785 100644
--- a/bdb/dist/aclocal_java/ac_check_classpath.ac
+++ b/storage/bdb/dist/aclocal_java/ac_check_classpath.ac
diff --git a/bdb/dist/aclocal_java/ac_check_junit.ac b/storage/bdb/dist/aclocal_java/ac_check_junit.ac
index 3b81d1dc3fc..3b81d1dc3fc 100644
--- a/bdb/dist/aclocal_java/ac_check_junit.ac
+++ b/storage/bdb/dist/aclocal_java/ac_check_junit.ac
diff --git a/bdb/dist/aclocal_java/ac_check_rqrd_class.ac b/storage/bdb/dist/aclocal_java/ac_check_rqrd_class.ac
index ab62e33c887..ab62e33c887 100644
--- a/bdb/dist/aclocal_java/ac_check_rqrd_class.ac
+++ b/storage/bdb/dist/aclocal_java/ac_check_rqrd_class.ac
diff --git a/bdb/dist/aclocal_java/ac_java_options.ac b/storage/bdb/dist/aclocal_java/ac_java_options.ac
index 567afca7fa5..567afca7fa5 100644
--- a/bdb/dist/aclocal_java/ac_java_options.ac
+++ b/storage/bdb/dist/aclocal_java/ac_java_options.ac
diff --git a/bdb/dist/aclocal_java/ac_jni_include_dirs.ac b/storage/bdb/dist/aclocal_java/ac_jni_include_dirs.ac
index 65cfbbfd13e..65cfbbfd13e 100644
--- a/bdb/dist/aclocal_java/ac_jni_include_dirs.ac
+++ b/storage/bdb/dist/aclocal_java/ac_jni_include_dirs.ac
diff --git a/bdb/dist/aclocal_java/ac_prog_jar.ac b/storage/bdb/dist/aclocal_java/ac_prog_jar.ac
index 9dfa1be6dad..9dfa1be6dad 100644
--- a/bdb/dist/aclocal_java/ac_prog_jar.ac
+++ b/storage/bdb/dist/aclocal_java/ac_prog_jar.ac
diff --git a/bdb/dist/aclocal_java/ac_prog_java.ac b/storage/bdb/dist/aclocal_java/ac_prog_java.ac
index 8cb24445132..8cb24445132 100644
--- a/bdb/dist/aclocal_java/ac_prog_java.ac
+++ b/storage/bdb/dist/aclocal_java/ac_prog_java.ac
diff --git a/bdb/dist/aclocal_java/ac_prog_java_works.ac b/storage/bdb/dist/aclocal_java/ac_prog_java_works.ac
index 36acd2676fa..36acd2676fa 100644
--- a/bdb/dist/aclocal_java/ac_prog_java_works.ac
+++ b/storage/bdb/dist/aclocal_java/ac_prog_java_works.ac
diff --git a/bdb/dist/aclocal_java/ac_prog_javac.ac b/storage/bdb/dist/aclocal_java/ac_prog_javac.ac
index 5ded7d1b7e6..5ded7d1b7e6 100644
--- a/bdb/dist/aclocal_java/ac_prog_javac.ac
+++ b/storage/bdb/dist/aclocal_java/ac_prog_javac.ac
diff --git a/bdb/dist/aclocal_java/ac_prog_javac_works.ac b/storage/bdb/dist/aclocal_java/ac_prog_javac_works.ac
index 139a99f989b..139a99f989b 100644
--- a/bdb/dist/aclocal_java/ac_prog_javac_works.ac
+++ b/storage/bdb/dist/aclocal_java/ac_prog_javac_works.ac
diff --git a/bdb/dist/aclocal_java/ac_prog_javadoc.ac b/storage/bdb/dist/aclocal_java/ac_prog_javadoc.ac
index 5154d3f1f3b..5154d3f1f3b 100644
--- a/bdb/dist/aclocal_java/ac_prog_javadoc.ac
+++ b/storage/bdb/dist/aclocal_java/ac_prog_javadoc.ac
diff --git a/bdb/dist/aclocal_java/ac_prog_javah.ac b/storage/bdb/dist/aclocal_java/ac_prog_javah.ac
index 1b16d9e24e5..1b16d9e24e5 100644
--- a/bdb/dist/aclocal_java/ac_prog_javah.ac
+++ b/storage/bdb/dist/aclocal_java/ac_prog_javah.ac
diff --git a/bdb/dist/aclocal_java/ac_try_compile_java.ac b/storage/bdb/dist/aclocal_java/ac_try_compile_java.ac
index 775569ba054..775569ba054 100644
--- a/bdb/dist/aclocal_java/ac_try_compile_java.ac
+++ b/storage/bdb/dist/aclocal_java/ac_try_compile_java.ac
diff --git a/bdb/dist/aclocal_java/ac_try_run_javac.ac b/storage/bdb/dist/aclocal_java/ac_try_run_javac.ac
index cf91306aff6..cf91306aff6 100644
--- a/bdb/dist/aclocal_java/ac_try_run_javac.ac
+++ b/storage/bdb/dist/aclocal_java/ac_try_run_javac.ac
diff --git a/bdb/dist/buildrel b/storage/bdb/dist/buildrel
index b796169c719..b796169c719 100644
--- a/bdb/dist/buildrel
+++ b/storage/bdb/dist/buildrel
diff --git a/bdb/dist/config.guess b/storage/bdb/dist/config.guess
index fd30ab0314c..fd30ab0314c 100755
--- a/bdb/dist/config.guess
+++ b/storage/bdb/dist/config.guess
diff --git a/bdb/dist/config.sub b/storage/bdb/dist/config.sub
index 9ff085efaf7..9ff085efaf7 100755
--- a/bdb/dist/config.sub
+++ b/storage/bdb/dist/config.sub
diff --git a/bdb/dist/configure.ac b/storage/bdb/dist/configure.ac
index 0bf53972f54..0bf53972f54 100644
--- a/bdb/dist/configure.ac
+++ b/storage/bdb/dist/configure.ac
diff --git a/bdb/dist/db.ecd.in b/storage/bdb/dist/db.ecd.in
index 92a6a090716..92a6a090716 100644
--- a/bdb/dist/db.ecd.in
+++ b/storage/bdb/dist/db.ecd.in
diff --git a/bdb/dist/db.spec.in b/storage/bdb/dist/db.spec.in
index ef253bcfcf4..ef253bcfcf4 100644
--- a/bdb/dist/db.spec.in
+++ b/storage/bdb/dist/db.spec.in
diff --git a/bdb/dist/gen_inc.awk b/storage/bdb/dist/gen_inc.awk
index 2f5b491cda1..2f5b491cda1 100644
--- a/bdb/dist/gen_inc.awk
+++ b/storage/bdb/dist/gen_inc.awk
diff --git a/bdb/dist/gen_rec.awk b/storage/bdb/dist/gen_rec.awk
index 75f2e86ca9e..75f2e86ca9e 100644
--- a/bdb/dist/gen_rec.awk
+++ b/storage/bdb/dist/gen_rec.awk
diff --git a/bdb/dist/gen_rpc.awk b/storage/bdb/dist/gen_rpc.awk
index 03975d7321b..03975d7321b 100644
--- a/bdb/dist/gen_rpc.awk
+++ b/storage/bdb/dist/gen_rpc.awk
diff --git a/bdb/dist/install-sh b/storage/bdb/dist/install-sh
index b41a2459161..b41a2459161 100755
--- a/bdb/dist/install-sh
+++ b/storage/bdb/dist/install-sh
diff --git a/bdb/dist/ltmain.sh b/storage/bdb/dist/ltmain.sh
index f07d424527d..f07d424527d 100644
--- a/bdb/dist/ltmain.sh
+++ b/storage/bdb/dist/ltmain.sh
diff --git a/bdb/dist/pubdef.in b/storage/bdb/dist/pubdef.in
index f42363022cd..f42363022cd 100644
--- a/bdb/dist/pubdef.in
+++ b/storage/bdb/dist/pubdef.in
diff --git a/bdb/dist/s_all b/storage/bdb/dist/s_all
index 132017def3c..132017def3c 100644
--- a/bdb/dist/s_all
+++ b/storage/bdb/dist/s_all
diff --git a/bdb/dist/s_config b/storage/bdb/dist/s_config
index 3e033da81ab..3e033da81ab 100755
--- a/bdb/dist/s_config
+++ b/storage/bdb/dist/s_config
diff --git a/bdb/dist/s_crypto b/storage/bdb/dist/s_crypto
index f7947cb3e10..f7947cb3e10 100644
--- a/bdb/dist/s_crypto
+++ b/storage/bdb/dist/s_crypto
diff --git a/bdb/dist/s_dir b/storage/bdb/dist/s_dir
index 58513a8321d..58513a8321d 100644
--- a/bdb/dist/s_dir
+++ b/storage/bdb/dist/s_dir
diff --git a/bdb/dist/s_include b/storage/bdb/dist/s_include
index 878b4a38af1..878b4a38af1 100755
--- a/bdb/dist/s_include
+++ b/storage/bdb/dist/s_include
diff --git a/bdb/dist/s_java b/storage/bdb/dist/s_java
index f7c96e823a1..f7c96e823a1 100755
--- a/bdb/dist/s_java
+++ b/storage/bdb/dist/s_java
diff --git a/bdb/dist/s_javah b/storage/bdb/dist/s_javah
index 67c41d09c4d..67c41d09c4d 100755
--- a/bdb/dist/s_javah
+++ b/storage/bdb/dist/s_javah
diff --git a/bdb/dist/s_perm b/storage/bdb/dist/s_perm
index c35278b8c83..c35278b8c83 100755
--- a/bdb/dist/s_perm
+++ b/storage/bdb/dist/s_perm
diff --git a/bdb/dist/s_readme b/storage/bdb/dist/s_readme
index 1da9f9681c0..1da9f9681c0 100755
--- a/bdb/dist/s_readme
+++ b/storage/bdb/dist/s_readme
diff --git a/bdb/dist/s_recover b/storage/bdb/dist/s_recover
index fc2e160c083..fc2e160c083 100755
--- a/bdb/dist/s_recover
+++ b/storage/bdb/dist/s_recover
diff --git a/bdb/dist/s_rpc b/storage/bdb/dist/s_rpc
index cdafa669d85..cdafa669d85 100644
--- a/bdb/dist/s_rpc
+++ b/storage/bdb/dist/s_rpc
diff --git a/bdb/dist/s_symlink b/storage/bdb/dist/s_symlink
index 8da49ca0c75..8da49ca0c75 100755
--- a/bdb/dist/s_symlink
+++ b/storage/bdb/dist/s_symlink
diff --git a/bdb/dist/s_tags b/storage/bdb/dist/s_tags
index 18b6025aa86..18b6025aa86 100755
--- a/bdb/dist/s_tags
+++ b/storage/bdb/dist/s_tags
diff --git a/bdb/dist/s_test b/storage/bdb/dist/s_test
index 16f3b9712d0..16f3b9712d0 100755
--- a/bdb/dist/s_test
+++ b/storage/bdb/dist/s_test
diff --git a/bdb/dist/s_vxworks b/storage/bdb/dist/s_vxworks
index 05c2599d02c..05c2599d02c 100644
--- a/bdb/dist/s_vxworks
+++ b/storage/bdb/dist/s_vxworks
diff --git a/bdb/dist/s_win32 b/storage/bdb/dist/s_win32
index 207978b82bb..207978b82bb 100755
--- a/bdb/dist/s_win32
+++ b/storage/bdb/dist/s_win32
diff --git a/bdb/dist/s_win32_dsp b/storage/bdb/dist/s_win32_dsp
index af5551ec248..af5551ec248 100644
--- a/bdb/dist/s_win32_dsp
+++ b/storage/bdb/dist/s_win32_dsp
diff --git a/bdb/dist/srcfiles.in b/storage/bdb/dist/srcfiles.in
index 54aeea0c1bc..54aeea0c1bc 100644
--- a/bdb/dist/srcfiles.in
+++ b/storage/bdb/dist/srcfiles.in
diff --git a/bdb/dist/template/rec_ctemp b/storage/bdb/dist/template/rec_ctemp
index 2951189c5bd..2951189c5bd 100644
--- a/bdb/dist/template/rec_ctemp
+++ b/storage/bdb/dist/template/rec_ctemp
diff --git a/bdb/dist/vx_2.0/BerkeleyDB.wpj b/storage/bdb/dist/vx_2.0/BerkeleyDB.wpj
index 78684d90067..78684d90067 100644
--- a/bdb/dist/vx_2.0/BerkeleyDB.wpj
+++ b/storage/bdb/dist/vx_2.0/BerkeleyDB.wpj
diff --git a/bdb/dist/vx_2.0/wpj.in b/storage/bdb/dist/vx_2.0/wpj.in
index 2b942bb562c..2b942bb562c 100644
--- a/bdb/dist/vx_2.0/wpj.in
+++ b/storage/bdb/dist/vx_2.0/wpj.in
diff --git a/bdb/dist/vx_3.1/Makefile.custom b/storage/bdb/dist/vx_3.1/Makefile.custom
index ca781f7b251..ca781f7b251 100644
--- a/bdb/dist/vx_3.1/Makefile.custom
+++ b/storage/bdb/dist/vx_3.1/Makefile.custom
diff --git a/bdb/dist/vx_3.1/cdf.1 b/storage/bdb/dist/vx_3.1/cdf.1
index 17db06f7e61..17db06f7e61 100644
--- a/bdb/dist/vx_3.1/cdf.1
+++ b/storage/bdb/dist/vx_3.1/cdf.1
diff --git a/bdb/dist/vx_3.1/cdf.2 b/storage/bdb/dist/vx_3.1/cdf.2
index 76f123af9fb..76f123af9fb 100644
--- a/bdb/dist/vx_3.1/cdf.2
+++ b/storage/bdb/dist/vx_3.1/cdf.2
diff --git a/bdb/dist/vx_3.1/cdf.3 b/storage/bdb/dist/vx_3.1/cdf.3
index a3146ced95a..a3146ced95a 100644
--- a/bdb/dist/vx_3.1/cdf.3
+++ b/storage/bdb/dist/vx_3.1/cdf.3
diff --git a/bdb/dist/vx_3.1/component.cdf b/storage/bdb/dist/vx_3.1/component.cdf
index 91edaa87853..91edaa87853 100644
--- a/bdb/dist/vx_3.1/component.cdf
+++ b/storage/bdb/dist/vx_3.1/component.cdf
diff --git a/bdb/dist/vx_3.1/component.wpj b/storage/bdb/dist/vx_3.1/component.wpj
index 01c51c1b97f..01c51c1b97f 100644
--- a/bdb/dist/vx_3.1/component.wpj
+++ b/storage/bdb/dist/vx_3.1/component.wpj
diff --git a/bdb/dist/vx_3.1/wpj.1 b/storage/bdb/dist/vx_3.1/wpj.1
index 414b4e8fa35..414b4e8fa35 100644
--- a/bdb/dist/vx_3.1/wpj.1
+++ b/storage/bdb/dist/vx_3.1/wpj.1
diff --git a/bdb/dist/vx_3.1/wpj.2 b/storage/bdb/dist/vx_3.1/wpj.2
index 0294f763ef7..0294f763ef7 100644
--- a/bdb/dist/vx_3.1/wpj.2
+++ b/storage/bdb/dist/vx_3.1/wpj.2
diff --git a/bdb/dist/vx_3.1/wpj.3 b/storage/bdb/dist/vx_3.1/wpj.3
index f06e6253923..f06e6253923 100644
--- a/bdb/dist/vx_3.1/wpj.3
+++ b/storage/bdb/dist/vx_3.1/wpj.3
diff --git a/bdb/dist/vx_3.1/wpj.4 b/storage/bdb/dist/vx_3.1/wpj.4
index 84de6ebf359..84de6ebf359 100644
--- a/bdb/dist/vx_3.1/wpj.4
+++ b/storage/bdb/dist/vx_3.1/wpj.4
diff --git a/bdb/dist/vx_3.1/wpj.5 b/storage/bdb/dist/vx_3.1/wpj.5
index f4056e7e22a..f4056e7e22a 100644
--- a/bdb/dist/vx_3.1/wpj.5
+++ b/storage/bdb/dist/vx_3.1/wpj.5
diff --git a/bdb/dist/vx_buildcd b/storage/bdb/dist/vx_buildcd
index a94d78db974..a94d78db974 100755
--- a/bdb/dist/vx_buildcd
+++ b/storage/bdb/dist/vx_buildcd
diff --git a/bdb/dist/vx_config.in b/storage/bdb/dist/vx_config.in
index 43fc8eb71f3..43fc8eb71f3 100644
--- a/bdb/dist/vx_config.in
+++ b/storage/bdb/dist/vx_config.in
diff --git a/bdb/dist/vx_setup/CONFIG.in b/storage/bdb/dist/vx_setup/CONFIG.in
index 6ccceee7034..6ccceee7034 100644
--- a/bdb/dist/vx_setup/CONFIG.in
+++ b/storage/bdb/dist/vx_setup/CONFIG.in
diff --git a/bdb/dist/vx_setup/LICENSE.TXT b/storage/bdb/dist/vx_setup/LICENSE.TXT
index 7814c679cd7..7814c679cd7 100644
--- a/bdb/dist/vx_setup/LICENSE.TXT
+++ b/storage/bdb/dist/vx_setup/LICENSE.TXT
diff --git a/bdb/dist/vx_setup/MESSAGES.TCL b/storage/bdb/dist/vx_setup/MESSAGES.TCL
index 718a67fbc50..718a67fbc50 100644
--- a/bdb/dist/vx_setup/MESSAGES.TCL
+++ b/storage/bdb/dist/vx_setup/MESSAGES.TCL
diff --git a/bdb/dist/vx_setup/README.in b/storage/bdb/dist/vx_setup/README.in
index f96948c37ba..f96948c37ba 100644
--- a/bdb/dist/vx_setup/README.in
+++ b/storage/bdb/dist/vx_setup/README.in
diff --git a/bdb/dist/vx_setup/SETUP.BMP b/storage/bdb/dist/vx_setup/SETUP.BMP
index 2918480b8c2..2918480b8c2 100644
--- a/bdb/dist/vx_setup/SETUP.BMP
+++ b/storage/bdb/dist/vx_setup/SETUP.BMP
diff --git a/bdb/dist/vx_setup/vx_allfile.in b/storage/bdb/dist/vx_setup/vx_allfile.in
index 61a1b8ee805..61a1b8ee805 100644
--- a/bdb/dist/vx_setup/vx_allfile.in
+++ b/storage/bdb/dist/vx_setup/vx_allfile.in
diff --git a/bdb/dist/vx_setup/vx_demofile.in b/storage/bdb/dist/vx_setup/vx_demofile.in
index 42a698ea367..42a698ea367 100644
--- a/bdb/dist/vx_setup/vx_demofile.in
+++ b/storage/bdb/dist/vx_setup/vx_demofile.in
diff --git a/bdb/dist/vx_setup/vx_setup.in b/storage/bdb/dist/vx_setup/vx_setup.in
index 7bc3f510cfa..7bc3f510cfa 100644
--- a/bdb/dist/vx_setup/vx_setup.in
+++ b/storage/bdb/dist/vx_setup/vx_setup.in
diff --git a/bdb/dist/win_config.in b/storage/bdb/dist/win_config.in
index 09acab28806..09acab28806 100644
--- a/bdb/dist/win_config.in
+++ b/storage/bdb/dist/win_config.in
diff --git a/bdb/dist/win_exports.in b/storage/bdb/dist/win_exports.in
index 52df529d028..52df529d028 100644
--- a/bdb/dist/win_exports.in
+++ b/storage/bdb/dist/win_exports.in
diff --git a/bdb/env/db_salloc.c b/storage/bdb/env/db_salloc.c
index 1ef768d4114..1ef768d4114 100644
--- a/bdb/env/db_salloc.c
+++ b/storage/bdb/env/db_salloc.c
diff --git a/bdb/env/db_shash.c b/storage/bdb/env/db_shash.c
index 743a126307d..743a126307d 100644
--- a/bdb/env/db_shash.c
+++ b/storage/bdb/env/db_shash.c
diff --git a/bdb/env/env_file.c b/storage/bdb/env/env_file.c
index f221fd8d701..f221fd8d701 100644
--- a/bdb/env/env_file.c
+++ b/storage/bdb/env/env_file.c
diff --git a/bdb/env/env_method.c b/storage/bdb/env/env_method.c
index b51237ec44a..b51237ec44a 100644
--- a/bdb/env/env_method.c
+++ b/storage/bdb/env/env_method.c
diff --git a/bdb/env/env_method.c.b b/storage/bdb/env/env_method.c.b
index b6802b8a77c..b6802b8a77c 100644
--- a/bdb/env/env_method.c.b
+++ b/storage/bdb/env/env_method.c.b
diff --git a/bdb/env/env_open.c b/storage/bdb/env/env_open.c
index ae8399f61cd..ae8399f61cd 100644
--- a/bdb/env/env_open.c
+++ b/storage/bdb/env/env_open.c
diff --git a/bdb/env/env_recover.c b/storage/bdb/env/env_recover.c
index fbe3b345b0d..fbe3b345b0d 100644
--- a/bdb/env/env_recover.c
+++ b/storage/bdb/env/env_recover.c
diff --git a/bdb/env/env_region.c b/storage/bdb/env/env_region.c
index a919cf328b4..a919cf328b4 100644
--- a/bdb/env/env_region.c
+++ b/storage/bdb/env/env_region.c
diff --git a/bdb/fileops/fileops.src b/storage/bdb/fileops/fileops.src
index 1fd39dc3c45..1fd39dc3c45 100644
--- a/bdb/fileops/fileops.src
+++ b/storage/bdb/fileops/fileops.src
diff --git a/bdb/fileops/fop_basic.c b/storage/bdb/fileops/fop_basic.c
index 08160ab2e1a..08160ab2e1a 100644
--- a/bdb/fileops/fop_basic.c
+++ b/storage/bdb/fileops/fop_basic.c
diff --git a/bdb/fileops/fop_rec.c b/storage/bdb/fileops/fop_rec.c
index 67720e01d13..67720e01d13 100644
--- a/bdb/fileops/fop_rec.c
+++ b/storage/bdb/fileops/fop_rec.c
diff --git a/bdb/fileops/fop_util.c b/storage/bdb/fileops/fop_util.c
index ea6d86ab08d..ea6d86ab08d 100644
--- a/bdb/fileops/fop_util.c
+++ b/storage/bdb/fileops/fop_util.c
diff --git a/bdb/hash/hash.c b/storage/bdb/hash/hash.c
index 2f972a3238d..2f972a3238d 100644
--- a/bdb/hash/hash.c
+++ b/storage/bdb/hash/hash.c
diff --git a/bdb/hash/hash.src b/storage/bdb/hash/hash.src
index b4b633c56e6..b4b633c56e6 100644
--- a/bdb/hash/hash.src
+++ b/storage/bdb/hash/hash.src
diff --git a/bdb/hash/hash_conv.c b/storage/bdb/hash/hash_conv.c
index a93e56a2ee4..a93e56a2ee4 100644
--- a/bdb/hash/hash_conv.c
+++ b/storage/bdb/hash/hash_conv.c
diff --git a/bdb/hash/hash_dup.c b/storage/bdb/hash/hash_dup.c
index ec70e519d54..ec70e519d54 100644
--- a/bdb/hash/hash_dup.c
+++ b/storage/bdb/hash/hash_dup.c
diff --git a/bdb/hash/hash_func.c b/storage/bdb/hash/hash_func.c
index c6cc2ad4460..c6cc2ad4460 100644
--- a/bdb/hash/hash_func.c
+++ b/storage/bdb/hash/hash_func.c
diff --git a/bdb/hash/hash_meta.c b/storage/bdb/hash/hash_meta.c
index 9f224454869..9f224454869 100644
--- a/bdb/hash/hash_meta.c
+++ b/storage/bdb/hash/hash_meta.c
diff --git a/bdb/hash/hash_method.c b/storage/bdb/hash/hash_method.c
index 9a6bf59536a..9a6bf59536a 100644
--- a/bdb/hash/hash_method.c
+++ b/storage/bdb/hash/hash_method.c
diff --git a/bdb/hash/hash_open.c b/storage/bdb/hash/hash_open.c
index f976f5b6816..f976f5b6816 100644
--- a/bdb/hash/hash_open.c
+++ b/storage/bdb/hash/hash_open.c
diff --git a/bdb/hash/hash_page.c b/storage/bdb/hash/hash_page.c
index 6788129773f..6788129773f 100644
--- a/bdb/hash/hash_page.c
+++ b/storage/bdb/hash/hash_page.c
diff --git a/bdb/hash/hash_rec.c b/storage/bdb/hash/hash_rec.c
index 24d3473c508..24d3473c508 100644
--- a/bdb/hash/hash_rec.c
+++ b/storage/bdb/hash/hash_rec.c
diff --git a/bdb/hash/hash_reclaim.c b/storage/bdb/hash/hash_reclaim.c
index ac90ffff08a..ac90ffff08a 100644
--- a/bdb/hash/hash_reclaim.c
+++ b/storage/bdb/hash/hash_reclaim.c
diff --git a/bdb/hash/hash_stat.c b/storage/bdb/hash/hash_stat.c
index f9ee1d099cb..f9ee1d099cb 100644
--- a/bdb/hash/hash_stat.c
+++ b/storage/bdb/hash/hash_stat.c
diff --git a/bdb/hash/hash_upgrade.c b/storage/bdb/hash/hash_upgrade.c
index 2dd21d7b644..2dd21d7b644 100644
--- a/bdb/hash/hash_upgrade.c
+++ b/storage/bdb/hash/hash_upgrade.c
diff --git a/bdb/hash/hash_verify.c b/storage/bdb/hash/hash_verify.c
index e6f5a2b0d65..e6f5a2b0d65 100644
--- a/bdb/hash/hash_verify.c
+++ b/storage/bdb/hash/hash_verify.c
diff --git a/bdb/hmac/hmac.c b/storage/bdb/hmac/hmac.c
index d39a154ec63..d39a154ec63 100644
--- a/bdb/hmac/hmac.c
+++ b/storage/bdb/hmac/hmac.c
diff --git a/bdb/hmac/sha1.c b/storage/bdb/hmac/sha1.c
index 2f2c806a21f..2f2c806a21f 100644
--- a/bdb/hmac/sha1.c
+++ b/storage/bdb/hmac/sha1.c
diff --git a/bdb/hsearch/hsearch.c b/storage/bdb/hsearch/hsearch.c
index 9760aeeb9e8..9760aeeb9e8 100644
--- a/bdb/hsearch/hsearch.c
+++ b/storage/bdb/hsearch/hsearch.c
diff --git a/bdb/libdb_java/checkapi.prl b/storage/bdb/libdb_java/checkapi.prl
index a27b8ffd107..a27b8ffd107 100644
--- a/bdb/libdb_java/checkapi.prl
+++ b/storage/bdb/libdb_java/checkapi.prl
diff --git a/bdb/libdb_java/com_sleepycat_db_Db.h b/storage/bdb/libdb_java/com_sleepycat_db_Db.h
index 0787ae87aed..0787ae87aed 100644
--- a/bdb/libdb_java/com_sleepycat_db_Db.h
+++ b/storage/bdb/libdb_java/com_sleepycat_db_Db.h
diff --git a/bdb/libdb_java/com_sleepycat_db_DbEnv.h b/storage/bdb/libdb_java/com_sleepycat_db_DbEnv.h
index f239dfc7593..f239dfc7593 100644
--- a/bdb/libdb_java/com_sleepycat_db_DbEnv.h
+++ b/storage/bdb/libdb_java/com_sleepycat_db_DbEnv.h
diff --git a/bdb/libdb_java/com_sleepycat_db_DbLock.h b/storage/bdb/libdb_java/com_sleepycat_db_DbLock.h
index 9f3d77d44bc..9f3d77d44bc 100644
--- a/bdb/libdb_java/com_sleepycat_db_DbLock.h
+++ b/storage/bdb/libdb_java/com_sleepycat_db_DbLock.h
diff --git a/bdb/libdb_java/com_sleepycat_db_DbLogc.h b/storage/bdb/libdb_java/com_sleepycat_db_DbLogc.h
index 8d029c761ba..8d029c761ba 100644
--- a/bdb/libdb_java/com_sleepycat_db_DbLogc.h
+++ b/storage/bdb/libdb_java/com_sleepycat_db_DbLogc.h
diff --git a/bdb/libdb_java/com_sleepycat_db_DbLsn.h b/storage/bdb/libdb_java/com_sleepycat_db_DbLsn.h
index 080fa0a8758..080fa0a8758 100644
--- a/bdb/libdb_java/com_sleepycat_db_DbLsn.h
+++ b/storage/bdb/libdb_java/com_sleepycat_db_DbLsn.h
diff --git a/bdb/libdb_java/com_sleepycat_db_DbTxn.h b/storage/bdb/libdb_java/com_sleepycat_db_DbTxn.h
index 59641c041a4..59641c041a4 100644
--- a/bdb/libdb_java/com_sleepycat_db_DbTxn.h
+++ b/storage/bdb/libdb_java/com_sleepycat_db_DbTxn.h
diff --git a/bdb/libdb_java/com_sleepycat_db_DbUtil.h b/storage/bdb/libdb_java/com_sleepycat_db_DbUtil.h
index 7f8495590c0..7f8495590c0 100644
--- a/bdb/libdb_java/com_sleepycat_db_DbUtil.h
+++ b/storage/bdb/libdb_java/com_sleepycat_db_DbUtil.h
diff --git a/bdb/libdb_java/com_sleepycat_db_Dbc.h b/storage/bdb/libdb_java/com_sleepycat_db_Dbc.h
index 447ab234844..447ab234844 100644
--- a/bdb/libdb_java/com_sleepycat_db_Dbc.h
+++ b/storage/bdb/libdb_java/com_sleepycat_db_Dbc.h
diff --git a/bdb/libdb_java/com_sleepycat_db_Dbt.h b/storage/bdb/libdb_java/com_sleepycat_db_Dbt.h
index c09bd8e6131..c09bd8e6131 100644
--- a/bdb/libdb_java/com_sleepycat_db_Dbt.h
+++ b/storage/bdb/libdb_java/com_sleepycat_db_Dbt.h
diff --git a/bdb/libdb_java/com_sleepycat_db_xa_DbXAResource.h b/storage/bdb/libdb_java/com_sleepycat_db_xa_DbXAResource.h
index 00e9e2e6893..00e9e2e6893 100644
--- a/bdb/libdb_java/com_sleepycat_db_xa_DbXAResource.h
+++ b/storage/bdb/libdb_java/com_sleepycat_db_xa_DbXAResource.h
diff --git a/bdb/libdb_java/java_Db.c b/storage/bdb/libdb_java/java_Db.c
index 465c40f7d5a..465c40f7d5a 100644
--- a/bdb/libdb_java/java_Db.c
+++ b/storage/bdb/libdb_java/java_Db.c
diff --git a/bdb/libdb_java/java_DbEnv.c b/storage/bdb/libdb_java/java_DbEnv.c
index 651c38a0e3d..651c38a0e3d 100644
--- a/bdb/libdb_java/java_DbEnv.c
+++ b/storage/bdb/libdb_java/java_DbEnv.c
diff --git a/bdb/libdb_java/java_DbLock.c b/storage/bdb/libdb_java/java_DbLock.c
index 00a9836bfa0..00a9836bfa0 100644
--- a/bdb/libdb_java/java_DbLock.c
+++ b/storage/bdb/libdb_java/java_DbLock.c
diff --git a/bdb/libdb_java/java_DbLogc.c b/storage/bdb/libdb_java/java_DbLogc.c
index 69294d9baac..69294d9baac 100644
--- a/bdb/libdb_java/java_DbLogc.c
+++ b/storage/bdb/libdb_java/java_DbLogc.c
diff --git a/bdb/libdb_java/java_DbLsn.c b/storage/bdb/libdb_java/java_DbLsn.c
index d53082826f4..d53082826f4 100644
--- a/bdb/libdb_java/java_DbLsn.c
+++ b/storage/bdb/libdb_java/java_DbLsn.c
diff --git a/bdb/libdb_java/java_DbTxn.c b/storage/bdb/libdb_java/java_DbTxn.c
index 51195501b77..51195501b77 100644
--- a/bdb/libdb_java/java_DbTxn.c
+++ b/storage/bdb/libdb_java/java_DbTxn.c
diff --git a/bdb/libdb_java/java_DbUtil.c b/storage/bdb/libdb_java/java_DbUtil.c
index edcbc6d9f15..edcbc6d9f15 100644
--- a/bdb/libdb_java/java_DbUtil.c
+++ b/storage/bdb/libdb_java/java_DbUtil.c
diff --git a/bdb/libdb_java/java_DbXAResource.c b/storage/bdb/libdb_java/java_DbXAResource.c
index 609529bfe83..609529bfe83 100644
--- a/bdb/libdb_java/java_DbXAResource.c
+++ b/storage/bdb/libdb_java/java_DbXAResource.c
diff --git a/bdb/libdb_java/java_Dbc.c b/storage/bdb/libdb_java/java_Dbc.c
index 63ab368fc03..63ab368fc03 100644
--- a/bdb/libdb_java/java_Dbc.c
+++ b/storage/bdb/libdb_java/java_Dbc.c
diff --git a/bdb/libdb_java/java_Dbt.c b/storage/bdb/libdb_java/java_Dbt.c
index d21109f3408..d21109f3408 100644
--- a/bdb/libdb_java/java_Dbt.c
+++ b/storage/bdb/libdb_java/java_Dbt.c
diff --git a/bdb/libdb_java/java_info.c b/storage/bdb/libdb_java/java_info.c
index 22fcbd23d46..22fcbd23d46 100644
--- a/bdb/libdb_java/java_info.c
+++ b/storage/bdb/libdb_java/java_info.c
diff --git a/bdb/libdb_java/java_info.h b/storage/bdb/libdb_java/java_info.h
index bda83db420e..bda83db420e 100644
--- a/bdb/libdb_java/java_info.h
+++ b/storage/bdb/libdb_java/java_info.h
diff --git a/bdb/libdb_java/java_locked.c b/storage/bdb/libdb_java/java_locked.c
index 9534a387b40..9534a387b40 100644
--- a/bdb/libdb_java/java_locked.c
+++ b/storage/bdb/libdb_java/java_locked.c
diff --git a/bdb/libdb_java/java_locked.h b/storage/bdb/libdb_java/java_locked.h
index a79d929abee..a79d929abee 100644
--- a/bdb/libdb_java/java_locked.h
+++ b/storage/bdb/libdb_java/java_locked.h
diff --git a/bdb/libdb_java/java_util.c b/storage/bdb/libdb_java/java_util.c
index 5a538ee0785..5a538ee0785 100644
--- a/bdb/libdb_java/java_util.c
+++ b/storage/bdb/libdb_java/java_util.c
diff --git a/bdb/libdb_java/java_util.h b/storage/bdb/libdb_java/java_util.h
index 08187f6b51f..08187f6b51f 100644
--- a/bdb/libdb_java/java_util.h
+++ b/storage/bdb/libdb_java/java_util.h
diff --git a/bdb/lock/Design b/storage/bdb/lock/Design
index f0bb5c6e99c..f0bb5c6e99c 100644
--- a/bdb/lock/Design
+++ b/storage/bdb/lock/Design
diff --git a/bdb/lock/lock.c b/storage/bdb/lock/lock.c
index 8eda155b822..8eda155b822 100644
--- a/bdb/lock/lock.c
+++ b/storage/bdb/lock/lock.c
diff --git a/bdb/lock/lock_deadlock.c b/storage/bdb/lock/lock_deadlock.c
index d1461b89a4f..d1461b89a4f 100644
--- a/bdb/lock/lock_deadlock.c
+++ b/storage/bdb/lock/lock_deadlock.c
diff --git a/bdb/lock/lock_method.c b/storage/bdb/lock/lock_method.c
index 72703e253bc..72703e253bc 100644
--- a/bdb/lock/lock_method.c
+++ b/storage/bdb/lock/lock_method.c
diff --git a/bdb/lock/lock_region.c b/storage/bdb/lock/lock_region.c
index 6df6937e873..6df6937e873 100644
--- a/bdb/lock/lock_region.c
+++ b/storage/bdb/lock/lock_region.c
diff --git a/bdb/lock/lock_stat.c b/storage/bdb/lock/lock_stat.c
index 0bef3e18021..0bef3e18021 100644
--- a/bdb/lock/lock_stat.c
+++ b/storage/bdb/lock/lock_stat.c
diff --git a/bdb/lock/lock_util.c b/storage/bdb/lock/lock_util.c
index 260f021b1ee..260f021b1ee 100644
--- a/bdb/lock/lock_util.c
+++ b/storage/bdb/lock/lock_util.c
diff --git a/bdb/log/log.c b/storage/bdb/log/log.c
index f57caeccb95..f57caeccb95 100644
--- a/bdb/log/log.c
+++ b/storage/bdb/log/log.c
diff --git a/bdb/log/log_archive.c b/storage/bdb/log/log_archive.c
index 19e1af5a93e..19e1af5a93e 100644
--- a/bdb/log/log_archive.c
+++ b/storage/bdb/log/log_archive.c
diff --git a/bdb/log/log_compare.c b/storage/bdb/log/log_compare.c
index 115f9c21b76..115f9c21b76 100644
--- a/bdb/log/log_compare.c
+++ b/storage/bdb/log/log_compare.c
diff --git a/bdb/log/log_get.c b/storage/bdb/log/log_get.c
index c8b028da0fb..c8b028da0fb 100644
--- a/bdb/log/log_get.c
+++ b/storage/bdb/log/log_get.c
diff --git a/bdb/log/log_method.c b/storage/bdb/log/log_method.c
index 42adaf11c6c..42adaf11c6c 100644
--- a/bdb/log/log_method.c
+++ b/storage/bdb/log/log_method.c
diff --git a/bdb/log/log_put.c b/storage/bdb/log/log_put.c
index 64276fa8315..64276fa8315 100644
--- a/bdb/log/log_put.c
+++ b/storage/bdb/log/log_put.c
diff --git a/bdb/mp/mp_alloc.c b/storage/bdb/mp/mp_alloc.c
index 96dd612d7ba..96dd612d7ba 100644
--- a/bdb/mp/mp_alloc.c
+++ b/storage/bdb/mp/mp_alloc.c
diff --git a/bdb/mp/mp_bh.c b/storage/bdb/mp/mp_bh.c
index 85d15218abf..85d15218abf 100644
--- a/bdb/mp/mp_bh.c
+++ b/storage/bdb/mp/mp_bh.c
diff --git a/bdb/mp/mp_fget.c b/storage/bdb/mp/mp_fget.c
index be0785a2184..be0785a2184 100644
--- a/bdb/mp/mp_fget.c
+++ b/storage/bdb/mp/mp_fget.c
diff --git a/bdb/mp/mp_fopen.c b/storage/bdb/mp/mp_fopen.c
index 8fdefb0f5e9..8fdefb0f5e9 100644
--- a/bdb/mp/mp_fopen.c
+++ b/storage/bdb/mp/mp_fopen.c
diff --git a/bdb/mp/mp_fput.c b/storage/bdb/mp/mp_fput.c
index 271e44a4ef8..271e44a4ef8 100644
--- a/bdb/mp/mp_fput.c
+++ b/storage/bdb/mp/mp_fput.c
diff --git a/bdb/mp/mp_fset.c b/storage/bdb/mp/mp_fset.c
index 65cd6286ac9..65cd6286ac9 100644
--- a/bdb/mp/mp_fset.c
+++ b/storage/bdb/mp/mp_fset.c
diff --git a/bdb/mp/mp_method.c b/storage/bdb/mp/mp_method.c
index 38f0a645f16..38f0a645f16 100644
--- a/bdb/mp/mp_method.c
+++ b/storage/bdb/mp/mp_method.c
diff --git a/bdb/mp/mp_region.c b/storage/bdb/mp/mp_region.c
index 06eca2f8646..06eca2f8646 100644
--- a/bdb/mp/mp_region.c
+++ b/storage/bdb/mp/mp_region.c
diff --git a/bdb/mp/mp_register.c b/storage/bdb/mp/mp_register.c
index 46eefad986f..46eefad986f 100644
--- a/bdb/mp/mp_register.c
+++ b/storage/bdb/mp/mp_register.c
diff --git a/bdb/mp/mp_stat.c b/storage/bdb/mp/mp_stat.c
index 12e72b91d70..12e72b91d70 100644
--- a/bdb/mp/mp_stat.c
+++ b/storage/bdb/mp/mp_stat.c
diff --git a/bdb/mp/mp_sync.c b/storage/bdb/mp/mp_sync.c
index 03b42208b39..03b42208b39 100644
--- a/bdb/mp/mp_sync.c
+++ b/storage/bdb/mp/mp_sync.c
diff --git a/bdb/mp/mp_trickle.c b/storage/bdb/mp/mp_trickle.c
index 71077ab60cc..71077ab60cc 100644
--- a/bdb/mp/mp_trickle.c
+++ b/storage/bdb/mp/mp_trickle.c
diff --git a/bdb/mutex/README b/storage/bdb/mutex/README
index 323c34f1e74..323c34f1e74 100644
--- a/bdb/mutex/README
+++ b/storage/bdb/mutex/README
diff --git a/bdb/mutex/mut_fcntl.c b/storage/bdb/mutex/mut_fcntl.c
index 2fdf9eff7ef..2fdf9eff7ef 100644
--- a/bdb/mutex/mut_fcntl.c
+++ b/storage/bdb/mutex/mut_fcntl.c
diff --git a/bdb/mutex/mut_pthread.c b/storage/bdb/mutex/mut_pthread.c
index 4a55ce0ca03..4a55ce0ca03 100644
--- a/bdb/mutex/mut_pthread.c
+++ b/storage/bdb/mutex/mut_pthread.c
diff --git a/bdb/mutex/mut_tas.c b/storage/bdb/mutex/mut_tas.c
index c24e09473ca..c24e09473ca 100644
--- a/bdb/mutex/mut_tas.c
+++ b/storage/bdb/mutex/mut_tas.c
diff --git a/bdb/mutex/mut_win32.c b/storage/bdb/mutex/mut_win32.c
index 49eb20a6ecf..49eb20a6ecf 100644
--- a/bdb/mutex/mut_win32.c
+++ b/storage/bdb/mutex/mut_win32.c
diff --git a/bdb/mutex/mutex.c b/storage/bdb/mutex/mutex.c
index 5418764a889..5418764a889 100644
--- a/bdb/mutex/mutex.c
+++ b/storage/bdb/mutex/mutex.c
diff --git a/bdb/mutex/tm.c b/storage/bdb/mutex/tm.c
index 4af1b1907a8..4af1b1907a8 100644
--- a/bdb/mutex/tm.c
+++ b/storage/bdb/mutex/tm.c
diff --git a/bdb/mutex/uts4_cc.s b/storage/bdb/mutex/uts4_cc.s
index 9ebc45aad54..9ebc45aad54 100644
--- a/bdb/mutex/uts4_cc.s
+++ b/storage/bdb/mutex/uts4_cc.s
diff --git a/bdb/os/os_abs.c b/storage/bdb/os/os_abs.c
index cd7d0a5d2be..cd7d0a5d2be 100644
--- a/bdb/os/os_abs.c
+++ b/storage/bdb/os/os_abs.c
diff --git a/bdb/os/os_alloc.c b/storage/bdb/os/os_alloc.c
index 5b38cc7d6f1..5b38cc7d6f1 100644
--- a/bdb/os/os_alloc.c
+++ b/storage/bdb/os/os_alloc.c
diff --git a/bdb/os/os_clock.c b/storage/bdb/os/os_clock.c
index 8da02cf6f9c..8da02cf6f9c 100644
--- a/bdb/os/os_clock.c
+++ b/storage/bdb/os/os_clock.c
diff --git a/bdb/os/os_config.c b/storage/bdb/os/os_config.c
index b64952a8302..b64952a8302 100644
--- a/bdb/os/os_config.c
+++ b/storage/bdb/os/os_config.c
diff --git a/bdb/os/os_dir.c b/storage/bdb/os/os_dir.c
index 3f59a23d963..3f59a23d963 100644
--- a/bdb/os/os_dir.c
+++ b/storage/bdb/os/os_dir.c
diff --git a/bdb/os/os_errno.c b/storage/bdb/os/os_errno.c
index 4b40f88d177..4b40f88d177 100644
--- a/bdb/os/os_errno.c
+++ b/storage/bdb/os/os_errno.c
diff --git a/bdb/os/os_fid.c b/storage/bdb/os/os_fid.c
index 125e6f0712c..125e6f0712c 100644
--- a/bdb/os/os_fid.c
+++ b/storage/bdb/os/os_fid.c
diff --git a/bdb/os/os_fsync.c b/storage/bdb/os/os_fsync.c
index 46ab4885a16..46ab4885a16 100644
--- a/bdb/os/os_fsync.c
+++ b/storage/bdb/os/os_fsync.c
diff --git a/bdb/os/os_handle.c b/storage/bdb/os/os_handle.c
index 5f617085e5d..5f617085e5d 100644
--- a/bdb/os/os_handle.c
+++ b/storage/bdb/os/os_handle.c
diff --git a/bdb/os/os_id.c b/storage/bdb/os/os_id.c
index c242bb12e23..c242bb12e23 100644
--- a/bdb/os/os_id.c
+++ b/storage/bdb/os/os_id.c
diff --git a/bdb/os/os_map.c b/storage/bdb/os/os_map.c
index 6d385b6a84d..6d385b6a84d 100644
--- a/bdb/os/os_map.c
+++ b/storage/bdb/os/os_map.c
diff --git a/bdb/os/os_method.c b/storage/bdb/os/os_method.c
index 04367654efa..04367654efa 100644
--- a/bdb/os/os_method.c
+++ b/storage/bdb/os/os_method.c
diff --git a/bdb/os/os_oflags.c b/storage/bdb/os/os_oflags.c
index f75178de75e..f75178de75e 100644
--- a/bdb/os/os_oflags.c
+++ b/storage/bdb/os/os_oflags.c
diff --git a/bdb/os/os_open.c b/storage/bdb/os/os_open.c
index 0a4dbadc6e8..0a4dbadc6e8 100644
--- a/bdb/os/os_open.c
+++ b/storage/bdb/os/os_open.c
diff --git a/bdb/os/os_region.c b/storage/bdb/os/os_region.c
index 6529f708b2c..6529f708b2c 100644
--- a/bdb/os/os_region.c
+++ b/storage/bdb/os/os_region.c
diff --git a/bdb/os/os_rename.c b/storage/bdb/os/os_rename.c
index 2569a9c3186..2569a9c3186 100644
--- a/bdb/os/os_rename.c
+++ b/storage/bdb/os/os_rename.c
diff --git a/bdb/os/os_root.c b/storage/bdb/os/os_root.c
index cd5bfc352e9..cd5bfc352e9 100644
--- a/bdb/os/os_root.c
+++ b/storage/bdb/os/os_root.c
diff --git a/bdb/os/os_rpath.c b/storage/bdb/os/os_rpath.c
index b9ccba01bd5..b9ccba01bd5 100644
--- a/bdb/os/os_rpath.c
+++ b/storage/bdb/os/os_rpath.c
diff --git a/bdb/os/os_rw.c b/storage/bdb/os/os_rw.c
index 9a79342c7b8..9a79342c7b8 100644
--- a/bdb/os/os_rw.c
+++ b/storage/bdb/os/os_rw.c
diff --git a/bdb/os/os_seek.c b/storage/bdb/os/os_seek.c
index 5b2aa45d5dd..5b2aa45d5dd 100644
--- a/bdb/os/os_seek.c
+++ b/storage/bdb/os/os_seek.c
diff --git a/bdb/os/os_sleep.c b/storage/bdb/os/os_sleep.c
index 42d496dbae7..42d496dbae7 100644
--- a/bdb/os/os_sleep.c
+++ b/storage/bdb/os/os_sleep.c
diff --git a/bdb/os/os_spin.c b/storage/bdb/os/os_spin.c
index fb36977cb44..fb36977cb44 100644
--- a/bdb/os/os_spin.c
+++ b/storage/bdb/os/os_spin.c
diff --git a/bdb/os/os_stat.c b/storage/bdb/os/os_stat.c
index c3510e36f5d..c3510e36f5d 100644
--- a/bdb/os/os_stat.c
+++ b/storage/bdb/os/os_stat.c
diff --git a/bdb/os/os_tmpdir.c b/storage/bdb/os/os_tmpdir.c
index 94645af5e71..94645af5e71 100644
--- a/bdb/os/os_tmpdir.c
+++ b/storage/bdb/os/os_tmpdir.c
diff --git a/bdb/os/os_unlink.c b/storage/bdb/os/os_unlink.c
index 28b03afd1aa..28b03afd1aa 100644
--- a/bdb/os/os_unlink.c
+++ b/storage/bdb/os/os_unlink.c
diff --git a/bdb/os_vxworks/os_vx_abs.c b/storage/bdb/os_vxworks/os_vx_abs.c
index 93e9be7269b..93e9be7269b 100644
--- a/bdb/os_vxworks/os_vx_abs.c
+++ b/storage/bdb/os_vxworks/os_vx_abs.c
diff --git a/bdb/os_vxworks/os_vx_config.c b/storage/bdb/os_vxworks/os_vx_config.c
index 810983b38ff..810983b38ff 100644
--- a/bdb/os_vxworks/os_vx_config.c
+++ b/storage/bdb/os_vxworks/os_vx_config.c
diff --git a/bdb/os_vxworks/os_vx_map.c b/storage/bdb/os_vxworks/os_vx_map.c
index 8ad4f0765ce..8ad4f0765ce 100644
--- a/bdb/os_vxworks/os_vx_map.c
+++ b/storage/bdb/os_vxworks/os_vx_map.c
diff --git a/bdb/os_win32/os_abs.c b/storage/bdb/os_win32/os_abs.c
index c8bead83ec3..c8bead83ec3 100644
--- a/bdb/os_win32/os_abs.c
+++ b/storage/bdb/os_win32/os_abs.c
diff --git a/bdb/os_win32/os_clock.c b/storage/bdb/os_win32/os_clock.c
index 1bf154f9da9..1bf154f9da9 100644
--- a/bdb/os_win32/os_clock.c
+++ b/storage/bdb/os_win32/os_clock.c
diff --git a/bdb/os_win32/os_config.c b/storage/bdb/os_win32/os_config.c
index a2c220daf1a..a2c220daf1a 100644
--- a/bdb/os_win32/os_config.c
+++ b/storage/bdb/os_win32/os_config.c
diff --git a/bdb/os_win32/os_dir.c b/storage/bdb/os_win32/os_dir.c
index 3f47c4960b0..3f47c4960b0 100644
--- a/bdb/os_win32/os_dir.c
+++ b/storage/bdb/os_win32/os_dir.c
diff --git a/bdb/os_win32/os_errno.c b/storage/bdb/os_win32/os_errno.c
index d6fac82e6f3..d6fac82e6f3 100644
--- a/bdb/os_win32/os_errno.c
+++ b/storage/bdb/os_win32/os_errno.c
diff --git a/bdb/os_win32/os_fid.c b/storage/bdb/os_win32/os_fid.c
index 1190ad26e81..1190ad26e81 100644
--- a/bdb/os_win32/os_fid.c
+++ b/storage/bdb/os_win32/os_fid.c
diff --git a/bdb/os_win32/os_fsync.c b/storage/bdb/os_win32/os_fsync.c
index 6fd3e1dcdf4..6fd3e1dcdf4 100644
--- a/bdb/os_win32/os_fsync.c
+++ b/storage/bdb/os_win32/os_fsync.c
diff --git a/bdb/os_win32/os_handle.c b/storage/bdb/os_win32/os_handle.c
index 7db9c3da977..7db9c3da977 100644
--- a/bdb/os_win32/os_handle.c
+++ b/storage/bdb/os_win32/os_handle.c
diff --git a/bdb/os_win32/os_map.c b/storage/bdb/os_win32/os_map.c
index 1f16c9fead4..1f16c9fead4 100644
--- a/bdb/os_win32/os_map.c
+++ b/storage/bdb/os_win32/os_map.c
diff --git a/bdb/os_win32/os_open.c b/storage/bdb/os_win32/os_open.c
index c8bae54d585..c8bae54d585 100644
--- a/bdb/os_win32/os_open.c
+++ b/storage/bdb/os_win32/os_open.c
diff --git a/bdb/os_win32/os_rename.c b/storage/bdb/os_win32/os_rename.c
index 67c3846649b..67c3846649b 100644
--- a/bdb/os_win32/os_rename.c
+++ b/storage/bdb/os_win32/os_rename.c
diff --git a/bdb/os_win32/os_rw.c b/storage/bdb/os_win32/os_rw.c
index 63d1f715c53..63d1f715c53 100644
--- a/bdb/os_win32/os_rw.c
+++ b/storage/bdb/os_win32/os_rw.c
diff --git a/bdb/os_win32/os_seek.c b/storage/bdb/os_win32/os_seek.c
index 40140f51534..40140f51534 100644
--- a/bdb/os_win32/os_seek.c
+++ b/storage/bdb/os_win32/os_seek.c
diff --git a/bdb/os_win32/os_sleep.c b/storage/bdb/os_win32/os_sleep.c
index 12b4a7dbc2d..12b4a7dbc2d 100644
--- a/bdb/os_win32/os_sleep.c
+++ b/storage/bdb/os_win32/os_sleep.c
diff --git a/bdb/os_win32/os_spin.c b/storage/bdb/os_win32/os_spin.c
index eb50b3b53ff..eb50b3b53ff 100644
--- a/bdb/os_win32/os_spin.c
+++ b/storage/bdb/os_win32/os_spin.c
diff --git a/bdb/os_win32/os_stat.c b/storage/bdb/os_win32/os_stat.c
index c1cba698bea..c1cba698bea 100644
--- a/bdb/os_win32/os_stat.c
+++ b/storage/bdb/os_win32/os_stat.c
diff --git a/bdb/os_win32/os_type.c b/storage/bdb/os_win32/os_type.c
index 583da0aaf1e..583da0aaf1e 100644
--- a/bdb/os_win32/os_type.c
+++ b/storage/bdb/os_win32/os_type.c
diff --git a/bdb/perl/BerkeleyDB/BerkeleyDB.pm b/storage/bdb/perl/BerkeleyDB/BerkeleyDB.pm
index c56390ba71f..c56390ba71f 100644
--- a/bdb/perl/BerkeleyDB/BerkeleyDB.pm
+++ b/storage/bdb/perl/BerkeleyDB/BerkeleyDB.pm
diff --git a/bdb/perl/BerkeleyDB/BerkeleyDB.pod b/storage/bdb/perl/BerkeleyDB/BerkeleyDB.pod
index 60f30e2abfb..60f30e2abfb 100644
--- a/bdb/perl/BerkeleyDB/BerkeleyDB.pod
+++ b/storage/bdb/perl/BerkeleyDB/BerkeleyDB.pod
diff --git a/bdb/perl/BerkeleyDB/BerkeleyDB.pod.P b/storage/bdb/perl/BerkeleyDB/BerkeleyDB.pod.P
index 4a848f5388d..4a848f5388d 100644
--- a/bdb/perl/BerkeleyDB/BerkeleyDB.pod.P
+++ b/storage/bdb/perl/BerkeleyDB/BerkeleyDB.pod.P
diff --git a/bdb/perl/BerkeleyDB/BerkeleyDB.xs b/storage/bdb/perl/BerkeleyDB/BerkeleyDB.xs
index 531b38a655f..531b38a655f 100644
--- a/bdb/perl/BerkeleyDB/BerkeleyDB.xs
+++ b/storage/bdb/perl/BerkeleyDB/BerkeleyDB.xs
diff --git a/bdb/perl/BerkeleyDB/BerkeleyDB/Btree.pm b/storage/bdb/perl/BerkeleyDB/BerkeleyDB/Btree.pm
index ba9a9c0085d..ba9a9c0085d 100644
--- a/bdb/perl/BerkeleyDB/BerkeleyDB/Btree.pm
+++ b/storage/bdb/perl/BerkeleyDB/BerkeleyDB/Btree.pm
diff --git a/bdb/perl/BerkeleyDB/BerkeleyDB/Hash.pm b/storage/bdb/perl/BerkeleyDB/BerkeleyDB/Hash.pm
index 8e7bc7e78c7..8e7bc7e78c7 100644
--- a/bdb/perl/BerkeleyDB/BerkeleyDB/Hash.pm
+++ b/storage/bdb/perl/BerkeleyDB/BerkeleyDB/Hash.pm
diff --git a/bdb/perl/BerkeleyDB/Changes b/storage/bdb/perl/BerkeleyDB/Changes
index cbeb1a34d73..cbeb1a34d73 100644
--- a/bdb/perl/BerkeleyDB/Changes
+++ b/storage/bdb/perl/BerkeleyDB/Changes
diff --git a/bdb/perl/BerkeleyDB/MANIFEST b/storage/bdb/perl/BerkeleyDB/MANIFEST
index 7da51ef7d7c..7da51ef7d7c 100644
--- a/bdb/perl/BerkeleyDB/MANIFEST
+++ b/storage/bdb/perl/BerkeleyDB/MANIFEST
diff --git a/bdb/perl/BerkeleyDB/Makefile.PL b/storage/bdb/perl/BerkeleyDB/Makefile.PL
index 86da9a845af..86da9a845af 100644
--- a/bdb/perl/BerkeleyDB/Makefile.PL
+++ b/storage/bdb/perl/BerkeleyDB/Makefile.PL
diff --git a/bdb/perl/BerkeleyDB/README b/storage/bdb/perl/BerkeleyDB/README
index a600e313193..a600e313193 100644
--- a/bdb/perl/BerkeleyDB/README
+++ b/storage/bdb/perl/BerkeleyDB/README
diff --git a/bdb/perl/BerkeleyDB/Todo b/storage/bdb/perl/BerkeleyDB/Todo
index 12d53bcf91c..12d53bcf91c 100644
--- a/bdb/perl/BerkeleyDB/Todo
+++ b/storage/bdb/perl/BerkeleyDB/Todo
diff --git a/bdb/perl/BerkeleyDB/config.in b/storage/bdb/perl/BerkeleyDB/config.in
index fd1bb1caede..fd1bb1caede 100644
--- a/bdb/perl/BerkeleyDB/config.in
+++ b/storage/bdb/perl/BerkeleyDB/config.in
diff --git a/bdb/perl/BerkeleyDB/constants.h b/storage/bdb/perl/BerkeleyDB/constants.h
index d86cef15513..d86cef15513 100644
--- a/bdb/perl/BerkeleyDB/constants.h
+++ b/storage/bdb/perl/BerkeleyDB/constants.h
diff --git a/bdb/perl/BerkeleyDB/constants.xs b/storage/bdb/perl/BerkeleyDB/constants.xs
index 1b2c8b2c3c8..1b2c8b2c3c8 100644
--- a/bdb/perl/BerkeleyDB/constants.xs
+++ b/storage/bdb/perl/BerkeleyDB/constants.xs
diff --git a/bdb/perl/BerkeleyDB/dbinfo b/storage/bdb/perl/BerkeleyDB/dbinfo
index af2c45facf5..af2c45facf5 100755
--- a/bdb/perl/BerkeleyDB/dbinfo
+++ b/storage/bdb/perl/BerkeleyDB/dbinfo
diff --git a/bdb/perl/BerkeleyDB/hints/dec_osf.pl b/storage/bdb/perl/BerkeleyDB/hints/dec_osf.pl
index 6d7faeed2e2..6d7faeed2e2 100644
--- a/bdb/perl/BerkeleyDB/hints/dec_osf.pl
+++ b/storage/bdb/perl/BerkeleyDB/hints/dec_osf.pl
diff --git a/bdb/perl/BerkeleyDB/hints/irix_6_5.pl b/storage/bdb/perl/BerkeleyDB/hints/irix_6_5.pl
index b531673e6e0..b531673e6e0 100644
--- a/bdb/perl/BerkeleyDB/hints/irix_6_5.pl
+++ b/storage/bdb/perl/BerkeleyDB/hints/irix_6_5.pl
diff --git a/bdb/perl/BerkeleyDB/hints/solaris.pl b/storage/bdb/perl/BerkeleyDB/hints/solaris.pl
index ddd941d634a..ddd941d634a 100644
--- a/bdb/perl/BerkeleyDB/hints/solaris.pl
+++ b/storage/bdb/perl/BerkeleyDB/hints/solaris.pl
diff --git a/bdb/perl/BerkeleyDB/mkconsts b/storage/bdb/perl/BerkeleyDB/mkconsts
index 7e0964333cc..7e0964333cc 100644
--- a/bdb/perl/BerkeleyDB/mkconsts
+++ b/storage/bdb/perl/BerkeleyDB/mkconsts
diff --git a/bdb/perl/BerkeleyDB/mkpod b/storage/bdb/perl/BerkeleyDB/mkpod
index 44bbf3fbf4f..44bbf3fbf4f 100755
--- a/bdb/perl/BerkeleyDB/mkpod
+++ b/storage/bdb/perl/BerkeleyDB/mkpod
diff --git a/bdb/perl/BerkeleyDB/patches/5.004 b/storage/bdb/perl/BerkeleyDB/patches/5.004
index 143ec95afbc..143ec95afbc 100644
--- a/bdb/perl/BerkeleyDB/patches/5.004
+++ b/storage/bdb/perl/BerkeleyDB/patches/5.004
diff --git a/bdb/perl/BerkeleyDB/patches/5.004_01 b/storage/bdb/perl/BerkeleyDB/patches/5.004_01
index 1b05eb4e02b..1b05eb4e02b 100644
--- a/bdb/perl/BerkeleyDB/patches/5.004_01
+++ b/storage/bdb/perl/BerkeleyDB/patches/5.004_01
diff --git a/bdb/perl/BerkeleyDB/patches/5.004_02 b/storage/bdb/perl/BerkeleyDB/patches/5.004_02
index 238f8737941..238f8737941 100644
--- a/bdb/perl/BerkeleyDB/patches/5.004_02
+++ b/storage/bdb/perl/BerkeleyDB/patches/5.004_02
diff --git a/bdb/perl/BerkeleyDB/patches/5.004_03 b/storage/bdb/perl/BerkeleyDB/patches/5.004_03
index 06331eac922..06331eac922 100644
--- a/bdb/perl/BerkeleyDB/patches/5.004_03
+++ b/storage/bdb/perl/BerkeleyDB/patches/5.004_03
diff --git a/bdb/perl/BerkeleyDB/patches/5.004_04 b/storage/bdb/perl/BerkeleyDB/patches/5.004_04
index a227dc700d9..a227dc700d9 100644
--- a/bdb/perl/BerkeleyDB/patches/5.004_04
+++ b/storage/bdb/perl/BerkeleyDB/patches/5.004_04
diff --git a/bdb/perl/BerkeleyDB/patches/5.004_05 b/storage/bdb/perl/BerkeleyDB/patches/5.004_05
index 51c8bf35009..51c8bf35009 100644
--- a/bdb/perl/BerkeleyDB/patches/5.004_05
+++ b/storage/bdb/perl/BerkeleyDB/patches/5.004_05
diff --git a/bdb/perl/BerkeleyDB/patches/5.005 b/storage/bdb/perl/BerkeleyDB/patches/5.005
index effee3e8275..effee3e8275 100644
--- a/bdb/perl/BerkeleyDB/patches/5.005
+++ b/storage/bdb/perl/BerkeleyDB/patches/5.005
diff --git a/bdb/perl/BerkeleyDB/patches/5.005_01 b/storage/bdb/perl/BerkeleyDB/patches/5.005_01
index 2a05dd545f6..2a05dd545f6 100644
--- a/bdb/perl/BerkeleyDB/patches/5.005_01
+++ b/storage/bdb/perl/BerkeleyDB/patches/5.005_01
diff --git a/bdb/perl/BerkeleyDB/patches/5.005_02 b/storage/bdb/perl/BerkeleyDB/patches/5.005_02
index 5dd57ddc03f..5dd57ddc03f 100644
--- a/bdb/perl/BerkeleyDB/patches/5.005_02
+++ b/storage/bdb/perl/BerkeleyDB/patches/5.005_02
diff --git a/bdb/perl/BerkeleyDB/patches/5.005_03 b/storage/bdb/perl/BerkeleyDB/patches/5.005_03
index 115f9f5b909..115f9f5b909 100644
--- a/bdb/perl/BerkeleyDB/patches/5.005_03
+++ b/storage/bdb/perl/BerkeleyDB/patches/5.005_03
diff --git a/bdb/perl/BerkeleyDB/patches/5.6.0 b/storage/bdb/perl/BerkeleyDB/patches/5.6.0
index 1f9b3b620de..1f9b3b620de 100644
--- a/bdb/perl/BerkeleyDB/patches/5.6.0
+++ b/storage/bdb/perl/BerkeleyDB/patches/5.6.0
diff --git a/bdb/perl/BerkeleyDB/ppport.h b/storage/bdb/perl/BerkeleyDB/ppport.h
index 0887c2159a9..0887c2159a9 100644
--- a/bdb/perl/BerkeleyDB/ppport.h
+++ b/storage/bdb/perl/BerkeleyDB/ppport.h
diff --git a/bdb/perl/BerkeleyDB/scan b/storage/bdb/perl/BerkeleyDB/scan
index eb064950b2e..eb064950b2e 100644
--- a/bdb/perl/BerkeleyDB/scan
+++ b/storage/bdb/perl/BerkeleyDB/scan
diff --git a/bdb/perl/BerkeleyDB/t/btree.t b/storage/bdb/perl/BerkeleyDB/t/btree.t
index fd6ed8f1268..fd6ed8f1268 100644
--- a/bdb/perl/BerkeleyDB/t/btree.t
+++ b/storage/bdb/perl/BerkeleyDB/t/btree.t
diff --git a/bdb/perl/BerkeleyDB/t/destroy.t b/storage/bdb/perl/BerkeleyDB/t/destroy.t
index 7457d36c583..7457d36c583 100644
--- a/bdb/perl/BerkeleyDB/t/destroy.t
+++ b/storage/bdb/perl/BerkeleyDB/t/destroy.t
diff --git a/bdb/perl/BerkeleyDB/t/env.t b/storage/bdb/perl/BerkeleyDB/t/env.t
index 3905abfae43..3905abfae43 100644
--- a/bdb/perl/BerkeleyDB/t/env.t
+++ b/storage/bdb/perl/BerkeleyDB/t/env.t
diff --git a/bdb/perl/BerkeleyDB/t/examples.t b/storage/bdb/perl/BerkeleyDB/t/examples.t
index 69b7f8ff8c5..69b7f8ff8c5 100644
--- a/bdb/perl/BerkeleyDB/t/examples.t
+++ b/storage/bdb/perl/BerkeleyDB/t/examples.t
diff --git a/bdb/perl/BerkeleyDB/t/examples.t.T b/storage/bdb/perl/BerkeleyDB/t/examples.t.T
index fe9bdf76b06..fe9bdf76b06 100644
--- a/bdb/perl/BerkeleyDB/t/examples.t.T
+++ b/storage/bdb/perl/BerkeleyDB/t/examples.t.T
diff --git a/bdb/perl/BerkeleyDB/t/examples3.t b/storage/bdb/perl/BerkeleyDB/t/examples3.t
index 22e94b770e1..22e94b770e1 100644
--- a/bdb/perl/BerkeleyDB/t/examples3.t
+++ b/storage/bdb/perl/BerkeleyDB/t/examples3.t
diff --git a/bdb/perl/BerkeleyDB/t/examples3.t.T b/storage/bdb/perl/BerkeleyDB/t/examples3.t.T
index 5eeaa14d00c..5eeaa14d00c 100644
--- a/bdb/perl/BerkeleyDB/t/examples3.t.T
+++ b/storage/bdb/perl/BerkeleyDB/t/examples3.t.T
diff --git a/bdb/perl/BerkeleyDB/t/filter.t b/storage/bdb/perl/BerkeleyDB/t/filter.t
index 47a7c107acf..47a7c107acf 100644
--- a/bdb/perl/BerkeleyDB/t/filter.t
+++ b/storage/bdb/perl/BerkeleyDB/t/filter.t
diff --git a/bdb/perl/BerkeleyDB/t/hash.t b/storage/bdb/perl/BerkeleyDB/t/hash.t
index 0e683851c3d..0e683851c3d 100644
--- a/bdb/perl/BerkeleyDB/t/hash.t
+++ b/storage/bdb/perl/BerkeleyDB/t/hash.t
diff --git a/bdb/perl/BerkeleyDB/t/join.t b/storage/bdb/perl/BerkeleyDB/t/join.t
index ed9b6a269cb..ed9b6a269cb 100644
--- a/bdb/perl/BerkeleyDB/t/join.t
+++ b/storage/bdb/perl/BerkeleyDB/t/join.t
diff --git a/bdb/perl/BerkeleyDB/t/mldbm.t b/storage/bdb/perl/BerkeleyDB/t/mldbm.t
index d35f7e15895..d35f7e15895 100644
--- a/bdb/perl/BerkeleyDB/t/mldbm.t
+++ b/storage/bdb/perl/BerkeleyDB/t/mldbm.t
diff --git a/bdb/perl/BerkeleyDB/t/queue.t b/storage/bdb/perl/BerkeleyDB/t/queue.t
index 86add129ca4..86add129ca4 100644
--- a/bdb/perl/BerkeleyDB/t/queue.t
+++ b/storage/bdb/perl/BerkeleyDB/t/queue.t
diff --git a/bdb/perl/BerkeleyDB/t/recno.t b/storage/bdb/perl/BerkeleyDB/t/recno.t
index 64b1803f736..64b1803f736 100644
--- a/bdb/perl/BerkeleyDB/t/recno.t
+++ b/storage/bdb/perl/BerkeleyDB/t/recno.t
diff --git a/bdb/perl/BerkeleyDB/t/strict.t b/storage/bdb/perl/BerkeleyDB/t/strict.t
index ab41d44cb41..ab41d44cb41 100644
--- a/bdb/perl/BerkeleyDB/t/strict.t
+++ b/storage/bdb/perl/BerkeleyDB/t/strict.t
diff --git a/bdb/perl/BerkeleyDB/t/subdb.t b/storage/bdb/perl/BerkeleyDB/t/subdb.t
index 23016d6463f..23016d6463f 100644
--- a/bdb/perl/BerkeleyDB/t/subdb.t
+++ b/storage/bdb/perl/BerkeleyDB/t/subdb.t
diff --git a/bdb/perl/BerkeleyDB/t/txn.t b/storage/bdb/perl/BerkeleyDB/t/txn.t
index ba6b636cdc8..ba6b636cdc8 100644
--- a/bdb/perl/BerkeleyDB/t/txn.t
+++ b/storage/bdb/perl/BerkeleyDB/t/txn.t
diff --git a/bdb/perl/BerkeleyDB/t/unknown.t b/storage/bdb/perl/BerkeleyDB/t/unknown.t
index f2630b585c0..f2630b585c0 100644
--- a/bdb/perl/BerkeleyDB/t/unknown.t
+++ b/storage/bdb/perl/BerkeleyDB/t/unknown.t
diff --git a/bdb/perl/BerkeleyDB/t/util.pm b/storage/bdb/perl/BerkeleyDB/t/util.pm
index 1a1449751eb..1a1449751eb 100644
--- a/bdb/perl/BerkeleyDB/t/util.pm
+++ b/storage/bdb/perl/BerkeleyDB/t/util.pm
diff --git a/bdb/perl/BerkeleyDB/typemap b/storage/bdb/perl/BerkeleyDB/typemap
index 81ead2c36d9..81ead2c36d9 100644
--- a/bdb/perl/BerkeleyDB/typemap
+++ b/storage/bdb/perl/BerkeleyDB/typemap
diff --git a/bdb/perl/DB_File/Changes b/storage/bdb/perl/DB_File/Changes
index 7883cbdfef0..7883cbdfef0 100644
--- a/bdb/perl/DB_File/Changes
+++ b/storage/bdb/perl/DB_File/Changes
diff --git a/bdb/perl/DB_File/DB_File.pm b/storage/bdb/perl/DB_File/DB_File.pm
index 49004ffa148..49004ffa148 100644
--- a/bdb/perl/DB_File/DB_File.pm
+++ b/storage/bdb/perl/DB_File/DB_File.pm
diff --git a/bdb/perl/DB_File/DB_File.xs b/storage/bdb/perl/DB_File/DB_File.xs
index fba8dede791..fba8dede791 100644
--- a/bdb/perl/DB_File/DB_File.xs
+++ b/storage/bdb/perl/DB_File/DB_File.xs
diff --git a/bdb/perl/DB_File/DB_File_BS b/storage/bdb/perl/DB_File/DB_File_BS
index 9282c498811..9282c498811 100644
--- a/bdb/perl/DB_File/DB_File_BS
+++ b/storage/bdb/perl/DB_File/DB_File_BS
diff --git a/bdb/perl/DB_File/MANIFEST b/storage/bdb/perl/DB_File/MANIFEST
index b3e1a7bd85b..b3e1a7bd85b 100644
--- a/bdb/perl/DB_File/MANIFEST
+++ b/storage/bdb/perl/DB_File/MANIFEST
diff --git a/bdb/perl/DB_File/Makefile.PL b/storage/bdb/perl/DB_File/Makefile.PL
index 4c1565d8d01..4c1565d8d01 100644
--- a/bdb/perl/DB_File/Makefile.PL
+++ b/storage/bdb/perl/DB_File/Makefile.PL
diff --git a/bdb/perl/DB_File/README b/storage/bdb/perl/DB_File/README
index b09aa9d8aee..b09aa9d8aee 100644
--- a/bdb/perl/DB_File/README
+++ b/storage/bdb/perl/DB_File/README
diff --git a/bdb/perl/DB_File/config.in b/storage/bdb/perl/DB_File/config.in
index 292b09a5fb3..292b09a5fb3 100644
--- a/bdb/perl/DB_File/config.in
+++ b/storage/bdb/perl/DB_File/config.in
diff --git a/bdb/perl/DB_File/dbinfo b/storage/bdb/perl/DB_File/dbinfo
index af2c45facf5..af2c45facf5 100644
--- a/bdb/perl/DB_File/dbinfo
+++ b/storage/bdb/perl/DB_File/dbinfo
diff --git a/bdb/perl/DB_File/fallback.h b/storage/bdb/perl/DB_File/fallback.h
index 0213308a0ee..0213308a0ee 100644
--- a/bdb/perl/DB_File/fallback.h
+++ b/storage/bdb/perl/DB_File/fallback.h
diff --git a/bdb/perl/DB_File/fallback.xs b/storage/bdb/perl/DB_File/fallback.xs
index 8650cdf7646..8650cdf7646 100644
--- a/bdb/perl/DB_File/fallback.xs
+++ b/storage/bdb/perl/DB_File/fallback.xs
diff --git a/bdb/perl/DB_File/hints/dynixptx.pl b/storage/bdb/perl/DB_File/hints/dynixptx.pl
index bb5ffa56e6b..bb5ffa56e6b 100644
--- a/bdb/perl/DB_File/hints/dynixptx.pl
+++ b/storage/bdb/perl/DB_File/hints/dynixptx.pl
diff --git a/bdb/perl/DB_File/hints/sco.pl b/storage/bdb/perl/DB_File/hints/sco.pl
index ff604409496..ff604409496 100644
--- a/bdb/perl/DB_File/hints/sco.pl
+++ b/storage/bdb/perl/DB_File/hints/sco.pl
diff --git a/bdb/perl/DB_File/patches/5.004 b/storage/bdb/perl/DB_File/patches/5.004
index 143ec95afbc..143ec95afbc 100644
--- a/bdb/perl/DB_File/patches/5.004
+++ b/storage/bdb/perl/DB_File/patches/5.004
diff --git a/bdb/perl/DB_File/patches/5.004_01 b/storage/bdb/perl/DB_File/patches/5.004_01
index 1b05eb4e02b..1b05eb4e02b 100644
--- a/bdb/perl/DB_File/patches/5.004_01
+++ b/storage/bdb/perl/DB_File/patches/5.004_01
diff --git a/bdb/perl/DB_File/patches/5.004_02 b/storage/bdb/perl/DB_File/patches/5.004_02
index 238f8737941..238f8737941 100644
--- a/bdb/perl/DB_File/patches/5.004_02
+++ b/storage/bdb/perl/DB_File/patches/5.004_02
diff --git a/bdb/perl/DB_File/patches/5.004_03 b/storage/bdb/perl/DB_File/patches/5.004_03
index 06331eac922..06331eac922 100644
--- a/bdb/perl/DB_File/patches/5.004_03
+++ b/storage/bdb/perl/DB_File/patches/5.004_03
diff --git a/bdb/perl/DB_File/patches/5.004_04 b/storage/bdb/perl/DB_File/patches/5.004_04
index a227dc700d9..a227dc700d9 100644
--- a/bdb/perl/DB_File/patches/5.004_04
+++ b/storage/bdb/perl/DB_File/patches/5.004_04
diff --git a/bdb/perl/DB_File/patches/5.004_05 b/storage/bdb/perl/DB_File/patches/5.004_05
index 51c8bf35009..51c8bf35009 100644
--- a/bdb/perl/DB_File/patches/5.004_05
+++ b/storage/bdb/perl/DB_File/patches/5.004_05
diff --git a/bdb/perl/DB_File/patches/5.005 b/storage/bdb/perl/DB_File/patches/5.005
index effee3e8275..effee3e8275 100644
--- a/bdb/perl/DB_File/patches/5.005
+++ b/storage/bdb/perl/DB_File/patches/5.005
diff --git a/bdb/perl/DB_File/patches/5.005_01 b/storage/bdb/perl/DB_File/patches/5.005_01
index 2a05dd545f6..2a05dd545f6 100644
--- a/bdb/perl/DB_File/patches/5.005_01
+++ b/storage/bdb/perl/DB_File/patches/5.005_01
diff --git a/bdb/perl/DB_File/patches/5.005_02 b/storage/bdb/perl/DB_File/patches/5.005_02
index 5dd57ddc03f..5dd57ddc03f 100644
--- a/bdb/perl/DB_File/patches/5.005_02
+++ b/storage/bdb/perl/DB_File/patches/5.005_02
diff --git a/bdb/perl/DB_File/patches/5.005_03 b/storage/bdb/perl/DB_File/patches/5.005_03
index 115f9f5b909..115f9f5b909 100644
--- a/bdb/perl/DB_File/patches/5.005_03
+++ b/storage/bdb/perl/DB_File/patches/5.005_03
diff --git a/bdb/perl/DB_File/patches/5.6.0 b/storage/bdb/perl/DB_File/patches/5.6.0
index 1f9b3b620de..1f9b3b620de 100644
--- a/bdb/perl/DB_File/patches/5.6.0
+++ b/storage/bdb/perl/DB_File/patches/5.6.0
diff --git a/bdb/perl/DB_File/ppport.h b/storage/bdb/perl/DB_File/ppport.h
index 0887c2159a9..0887c2159a9 100644
--- a/bdb/perl/DB_File/ppport.h
+++ b/storage/bdb/perl/DB_File/ppport.h
diff --git a/bdb/perl/DB_File/t/db-btree.t b/storage/bdb/perl/DB_File/t/db-btree.t
index a990a5c4ba5..a990a5c4ba5 100644
--- a/bdb/perl/DB_File/t/db-btree.t
+++ b/storage/bdb/perl/DB_File/t/db-btree.t
diff --git a/bdb/perl/DB_File/t/db-hash.t b/storage/bdb/perl/DB_File/t/db-hash.t
index 10623cc82a7..10623cc82a7 100644
--- a/bdb/perl/DB_File/t/db-hash.t
+++ b/storage/bdb/perl/DB_File/t/db-hash.t
diff --git a/bdb/perl/DB_File/t/db-recno.t b/storage/bdb/perl/DB_File/t/db-recno.t
index 5390b549376..5390b549376 100644
--- a/bdb/perl/DB_File/t/db-recno.t
+++ b/storage/bdb/perl/DB_File/t/db-recno.t
diff --git a/bdb/perl/DB_File/typemap b/storage/bdb/perl/DB_File/typemap
index 8ad7b1282dc..8ad7b1282dc 100644
--- a/bdb/perl/DB_File/typemap
+++ b/storage/bdb/perl/DB_File/typemap
diff --git a/bdb/perl/DB_File/version.c b/storage/bdb/perl/DB_File/version.c
index 03b17c18e60..03b17c18e60 100644
--- a/bdb/perl/DB_File/version.c
+++ b/storage/bdb/perl/DB_File/version.c
diff --git a/bdb/qam/qam.c b/storage/bdb/qam/qam.c
index b10f8743439..b10f8743439 100644
--- a/bdb/qam/qam.c
+++ b/storage/bdb/qam/qam.c
diff --git a/bdb/qam/qam.src b/storage/bdb/qam/qam.src
index f8bf4da4dd0..f8bf4da4dd0 100644
--- a/bdb/qam/qam.src
+++ b/storage/bdb/qam/qam.src
diff --git a/bdb/qam/qam_conv.c b/storage/bdb/qam/qam_conv.c
index d89fe06b0cf..d89fe06b0cf 100644
--- a/bdb/qam/qam_conv.c
+++ b/storage/bdb/qam/qam_conv.c
diff --git a/bdb/qam/qam_files.c b/storage/bdb/qam/qam_files.c
index f15a88d546d..f15a88d546d 100644
--- a/bdb/qam/qam_files.c
+++ b/storage/bdb/qam/qam_files.c
diff --git a/bdb/qam/qam_method.c b/storage/bdb/qam/qam_method.c
index 5415fc5d00c..5415fc5d00c 100644
--- a/bdb/qam/qam_method.c
+++ b/storage/bdb/qam/qam_method.c
diff --git a/bdb/qam/qam_open.c b/storage/bdb/qam/qam_open.c
index efe4dfc540e..efe4dfc540e 100644
--- a/bdb/qam/qam_open.c
+++ b/storage/bdb/qam/qam_open.c
diff --git a/bdb/qam/qam_rec.c b/storage/bdb/qam/qam_rec.c
index 2c0f1227752..2c0f1227752 100644
--- a/bdb/qam/qam_rec.c
+++ b/storage/bdb/qam/qam_rec.c
diff --git a/bdb/qam/qam_stat.c b/storage/bdb/qam/qam_stat.c
index 57c67da4292..57c67da4292 100644
--- a/bdb/qam/qam_stat.c
+++ b/storage/bdb/qam/qam_stat.c
diff --git a/bdb/qam/qam_upgrade.c b/storage/bdb/qam/qam_upgrade.c
index 6bd79fc948a..6bd79fc948a 100644
--- a/bdb/qam/qam_upgrade.c
+++ b/storage/bdb/qam/qam_upgrade.c
diff --git a/bdb/qam/qam_verify.c b/storage/bdb/qam/qam_verify.c
index 5b020c2c335..5b020c2c335 100644
--- a/bdb/qam/qam_verify.c
+++ b/storage/bdb/qam/qam_verify.c
diff --git a/bdb/rep/rep_method.c b/storage/bdb/rep/rep_method.c
index 6773a537f4f..6773a537f4f 100644
--- a/bdb/rep/rep_method.c
+++ b/storage/bdb/rep/rep_method.c
diff --git a/bdb/rep/rep_record.c b/storage/bdb/rep/rep_record.c
index d3619f509b4..d3619f509b4 100644
--- a/bdb/rep/rep_record.c
+++ b/storage/bdb/rep/rep_record.c
diff --git a/bdb/rep/rep_region.c b/storage/bdb/rep/rep_region.c
index 1ac3fb8a20c..1ac3fb8a20c 100644
--- a/bdb/rep/rep_region.c
+++ b/storage/bdb/rep/rep_region.c
diff --git a/bdb/rep/rep_util.c b/storage/bdb/rep/rep_util.c
index 9c99d33ed4a..9c99d33ed4a 100644
--- a/bdb/rep/rep_util.c
+++ b/storage/bdb/rep/rep_util.c
diff --git a/bdb/rpc_client/client.c b/storage/bdb/rpc_client/client.c
index b6367e21449..b6367e21449 100644
--- a/bdb/rpc_client/client.c
+++ b/storage/bdb/rpc_client/client.c
diff --git a/bdb/rpc_client/gen_client_ret.c b/storage/bdb/rpc_client/gen_client_ret.c
index f35589738cd..f35589738cd 100644
--- a/bdb/rpc_client/gen_client_ret.c
+++ b/storage/bdb/rpc_client/gen_client_ret.c
diff --git a/bdb/rpc_server/c/db_server_proc.c.in b/storage/bdb/rpc_server/c/db_server_proc.c.in
index d5d1f49508a..d5d1f49508a 100644
--- a/bdb/rpc_server/c/db_server_proc.c.in
+++ b/storage/bdb/rpc_server/c/db_server_proc.c.in
diff --git a/bdb/rpc_server/c/db_server_util.c b/storage/bdb/rpc_server/c/db_server_util.c
index 2ea270c2d19..2ea270c2d19 100644
--- a/bdb/rpc_server/c/db_server_util.c
+++ b/storage/bdb/rpc_server/c/db_server_util.c
diff --git a/bdb/rpc_server/clsrv.html b/storage/bdb/rpc_server/clsrv.html
index 599ad56f557..599ad56f557 100644
--- a/bdb/rpc_server/clsrv.html
+++ b/storage/bdb/rpc_server/clsrv.html
diff --git a/bdb/rpc_server/cxx/db_server_cxxproc.cpp b/storage/bdb/rpc_server/cxx/db_server_cxxproc.cpp
index 25278273555..25278273555 100644
--- a/bdb/rpc_server/cxx/db_server_cxxproc.cpp
+++ b/storage/bdb/rpc_server/cxx/db_server_cxxproc.cpp
diff --git a/bdb/rpc_server/cxx/db_server_cxxutil.cpp b/storage/bdb/rpc_server/cxx/db_server_cxxutil.cpp
index 60865264c00..60865264c00 100644
--- a/bdb/rpc_server/cxx/db_server_cxxutil.cpp
+++ b/storage/bdb/rpc_server/cxx/db_server_cxxutil.cpp
diff --git a/bdb/rpc_server/java/DbDispatcher.java b/storage/bdb/rpc_server/java/DbDispatcher.java
index 5c5e63fc2ad..5c5e63fc2ad 100644
--- a/bdb/rpc_server/java/DbDispatcher.java
+++ b/storage/bdb/rpc_server/java/DbDispatcher.java
diff --git a/bdb/rpc_server/java/DbServer.java b/storage/bdb/rpc_server/java/DbServer.java
index 9b20becbcdc..9b20becbcdc 100644
--- a/bdb/rpc_server/java/DbServer.java
+++ b/storage/bdb/rpc_server/java/DbServer.java
diff --git a/bdb/rpc_server/java/FreeList.java b/storage/bdb/rpc_server/java/FreeList.java
index e831c466137..e831c466137 100644
--- a/bdb/rpc_server/java/FreeList.java
+++ b/storage/bdb/rpc_server/java/FreeList.java
diff --git a/bdb/rpc_server/java/LocalIterator.java b/storage/bdb/rpc_server/java/LocalIterator.java
index eecb0b5e78d..eecb0b5e78d 100644
--- a/bdb/rpc_server/java/LocalIterator.java
+++ b/storage/bdb/rpc_server/java/LocalIterator.java
diff --git a/bdb/rpc_server/java/README b/storage/bdb/rpc_server/java/README
index c2d8f3abd57..c2d8f3abd57 100644
--- a/bdb/rpc_server/java/README
+++ b/storage/bdb/rpc_server/java/README
diff --git a/bdb/rpc_server/java/RpcDb.java b/storage/bdb/rpc_server/java/RpcDb.java
index 59da9be67dc..59da9be67dc 100644
--- a/bdb/rpc_server/java/RpcDb.java
+++ b/storage/bdb/rpc_server/java/RpcDb.java
diff --git a/bdb/rpc_server/java/RpcDbEnv.java b/storage/bdb/rpc_server/java/RpcDbEnv.java
index 9d9f1ba4324..9d9f1ba4324 100644
--- a/bdb/rpc_server/java/RpcDbEnv.java
+++ b/storage/bdb/rpc_server/java/RpcDbEnv.java
diff --git a/bdb/rpc_server/java/RpcDbTxn.java b/storage/bdb/rpc_server/java/RpcDbTxn.java
index a3207b5e35d..a3207b5e35d 100644
--- a/bdb/rpc_server/java/RpcDbTxn.java
+++ b/storage/bdb/rpc_server/java/RpcDbTxn.java
diff --git a/bdb/rpc_server/java/RpcDbc.java b/storage/bdb/rpc_server/java/RpcDbc.java
index a37b4ee4896..a37b4ee4896 100644
--- a/bdb/rpc_server/java/RpcDbc.java
+++ b/storage/bdb/rpc_server/java/RpcDbc.java
diff --git a/bdb/rpc_server/java/Timer.java b/storage/bdb/rpc_server/java/Timer.java
index e16f3084f95..e16f3084f95 100644
--- a/bdb/rpc_server/java/Timer.java
+++ b/storage/bdb/rpc_server/java/Timer.java
diff --git a/bdb/rpc_server/java/gen/DbServerStub.java b/storage/bdb/rpc_server/java/gen/DbServerStub.java
index 90fc13a6d9c..90fc13a6d9c 100644
--- a/bdb/rpc_server/java/gen/DbServerStub.java
+++ b/storage/bdb/rpc_server/java/gen/DbServerStub.java
diff --git a/bdb/rpc_server/java/gen/__db_associate_msg.java b/storage/bdb/rpc_server/java/gen/__db_associate_msg.java
index 8977303b99a..8977303b99a 100644
--- a/bdb/rpc_server/java/gen/__db_associate_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__db_associate_msg.java
diff --git a/bdb/rpc_server/java/gen/__db_associate_reply.java b/storage/bdb/rpc_server/java/gen/__db_associate_reply.java
index 476d0868b33..476d0868b33 100644
--- a/bdb/rpc_server/java/gen/__db_associate_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__db_associate_reply.java
diff --git a/bdb/rpc_server/java/gen/__db_bt_maxkey_msg.java b/storage/bdb/rpc_server/java/gen/__db_bt_maxkey_msg.java
index 007ce16a974..007ce16a974 100644
--- a/bdb/rpc_server/java/gen/__db_bt_maxkey_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__db_bt_maxkey_msg.java
diff --git a/bdb/rpc_server/java/gen/__db_bt_maxkey_reply.java b/storage/bdb/rpc_server/java/gen/__db_bt_maxkey_reply.java
index 855573271b3..855573271b3 100644
--- a/bdb/rpc_server/java/gen/__db_bt_maxkey_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__db_bt_maxkey_reply.java
diff --git a/bdb/rpc_server/java/gen/__db_bt_minkey_msg.java b/storage/bdb/rpc_server/java/gen/__db_bt_minkey_msg.java
index c86ec382456..c86ec382456 100644
--- a/bdb/rpc_server/java/gen/__db_bt_minkey_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__db_bt_minkey_msg.java
diff --git a/bdb/rpc_server/java/gen/__db_bt_minkey_reply.java b/storage/bdb/rpc_server/java/gen/__db_bt_minkey_reply.java
index 4d944b6bf33..4d944b6bf33 100644
--- a/bdb/rpc_server/java/gen/__db_bt_minkey_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__db_bt_minkey_reply.java
diff --git a/bdb/rpc_server/java/gen/__db_close_msg.java b/storage/bdb/rpc_server/java/gen/__db_close_msg.java
index ce8d213701b..ce8d213701b 100644
--- a/bdb/rpc_server/java/gen/__db_close_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__db_close_msg.java
diff --git a/bdb/rpc_server/java/gen/__db_close_reply.java b/storage/bdb/rpc_server/java/gen/__db_close_reply.java
index a9380e9c053..a9380e9c053 100644
--- a/bdb/rpc_server/java/gen/__db_close_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__db_close_reply.java
diff --git a/bdb/rpc_server/java/gen/__db_create_msg.java b/storage/bdb/rpc_server/java/gen/__db_create_msg.java
index d21ca50f807..d21ca50f807 100644
--- a/bdb/rpc_server/java/gen/__db_create_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__db_create_msg.java
diff --git a/bdb/rpc_server/java/gen/__db_create_reply.java b/storage/bdb/rpc_server/java/gen/__db_create_reply.java
index e3dcbbab14e..e3dcbbab14e 100644
--- a/bdb/rpc_server/java/gen/__db_create_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__db_create_reply.java
diff --git a/bdb/rpc_server/java/gen/__db_cursor_msg.java b/storage/bdb/rpc_server/java/gen/__db_cursor_msg.java
index 60e09db6ebb..60e09db6ebb 100644
--- a/bdb/rpc_server/java/gen/__db_cursor_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__db_cursor_msg.java
diff --git a/bdb/rpc_server/java/gen/__db_cursor_reply.java b/storage/bdb/rpc_server/java/gen/__db_cursor_reply.java
index bafd2817c67..bafd2817c67 100644
--- a/bdb/rpc_server/java/gen/__db_cursor_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__db_cursor_reply.java
diff --git a/bdb/rpc_server/java/gen/__db_del_msg.java b/storage/bdb/rpc_server/java/gen/__db_del_msg.java
index fdf47907dd6..fdf47907dd6 100644
--- a/bdb/rpc_server/java/gen/__db_del_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__db_del_msg.java
diff --git a/bdb/rpc_server/java/gen/__db_del_reply.java b/storage/bdb/rpc_server/java/gen/__db_del_reply.java
index 8a55445944f..8a55445944f 100644
--- a/bdb/rpc_server/java/gen/__db_del_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__db_del_reply.java
diff --git a/bdb/rpc_server/java/gen/__db_encrypt_msg.java b/storage/bdb/rpc_server/java/gen/__db_encrypt_msg.java
index 46d9f8ee7e8..46d9f8ee7e8 100644
--- a/bdb/rpc_server/java/gen/__db_encrypt_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__db_encrypt_msg.java
diff --git a/bdb/rpc_server/java/gen/__db_encrypt_reply.java b/storage/bdb/rpc_server/java/gen/__db_encrypt_reply.java
index a97cc98c90b..a97cc98c90b 100644
--- a/bdb/rpc_server/java/gen/__db_encrypt_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__db_encrypt_reply.java
diff --git a/bdb/rpc_server/java/gen/__db_extentsize_msg.java b/storage/bdb/rpc_server/java/gen/__db_extentsize_msg.java
index 41a51cff9c4..41a51cff9c4 100644
--- a/bdb/rpc_server/java/gen/__db_extentsize_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__db_extentsize_msg.java
diff --git a/bdb/rpc_server/java/gen/__db_extentsize_reply.java b/storage/bdb/rpc_server/java/gen/__db_extentsize_reply.java
index 409625486c7..409625486c7 100644
--- a/bdb/rpc_server/java/gen/__db_extentsize_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__db_extentsize_reply.java
diff --git a/bdb/rpc_server/java/gen/__db_flags_msg.java b/storage/bdb/rpc_server/java/gen/__db_flags_msg.java
index d8752e2e4dd..d8752e2e4dd 100644
--- a/bdb/rpc_server/java/gen/__db_flags_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__db_flags_msg.java
diff --git a/bdb/rpc_server/java/gen/__db_flags_reply.java b/storage/bdb/rpc_server/java/gen/__db_flags_reply.java
index c4ec253db83..c4ec253db83 100644
--- a/bdb/rpc_server/java/gen/__db_flags_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__db_flags_reply.java
diff --git a/bdb/rpc_server/java/gen/__db_get_msg.java b/storage/bdb/rpc_server/java/gen/__db_get_msg.java
index 3dfe8e9d86e..3dfe8e9d86e 100644
--- a/bdb/rpc_server/java/gen/__db_get_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__db_get_msg.java
diff --git a/bdb/rpc_server/java/gen/__db_get_reply.java b/storage/bdb/rpc_server/java/gen/__db_get_reply.java
index 64ce525728a..64ce525728a 100644
--- a/bdb/rpc_server/java/gen/__db_get_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__db_get_reply.java
diff --git a/bdb/rpc_server/java/gen/__db_h_ffactor_msg.java b/storage/bdb/rpc_server/java/gen/__db_h_ffactor_msg.java
index 8d2ed1b1c0b..8d2ed1b1c0b 100644
--- a/bdb/rpc_server/java/gen/__db_h_ffactor_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__db_h_ffactor_msg.java
diff --git a/bdb/rpc_server/java/gen/__db_h_ffactor_reply.java b/storage/bdb/rpc_server/java/gen/__db_h_ffactor_reply.java
index 1885ec50240..1885ec50240 100644
--- a/bdb/rpc_server/java/gen/__db_h_ffactor_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__db_h_ffactor_reply.java
diff --git a/bdb/rpc_server/java/gen/__db_h_nelem_msg.java b/storage/bdb/rpc_server/java/gen/__db_h_nelem_msg.java
index 7d084351755..7d084351755 100644
--- a/bdb/rpc_server/java/gen/__db_h_nelem_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__db_h_nelem_msg.java
diff --git a/bdb/rpc_server/java/gen/__db_h_nelem_reply.java b/storage/bdb/rpc_server/java/gen/__db_h_nelem_reply.java
index 20c5c774e69..20c5c774e69 100644
--- a/bdb/rpc_server/java/gen/__db_h_nelem_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__db_h_nelem_reply.java
diff --git a/bdb/rpc_server/java/gen/__db_join_msg.java b/storage/bdb/rpc_server/java/gen/__db_join_msg.java
index 88c72dbd6ba..88c72dbd6ba 100644
--- a/bdb/rpc_server/java/gen/__db_join_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__db_join_msg.java
diff --git a/bdb/rpc_server/java/gen/__db_join_reply.java b/storage/bdb/rpc_server/java/gen/__db_join_reply.java
index 80980e23d6c..80980e23d6c 100644
--- a/bdb/rpc_server/java/gen/__db_join_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__db_join_reply.java
diff --git a/bdb/rpc_server/java/gen/__db_key_range_msg.java b/storage/bdb/rpc_server/java/gen/__db_key_range_msg.java
index 233077e0964..233077e0964 100644
--- a/bdb/rpc_server/java/gen/__db_key_range_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__db_key_range_msg.java
diff --git a/bdb/rpc_server/java/gen/__db_key_range_reply.java b/storage/bdb/rpc_server/java/gen/__db_key_range_reply.java
index 09244c13d1d..09244c13d1d 100644
--- a/bdb/rpc_server/java/gen/__db_key_range_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__db_key_range_reply.java
diff --git a/bdb/rpc_server/java/gen/__db_lorder_msg.java b/storage/bdb/rpc_server/java/gen/__db_lorder_msg.java
index 3399ad8daf0..3399ad8daf0 100644
--- a/bdb/rpc_server/java/gen/__db_lorder_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__db_lorder_msg.java
diff --git a/bdb/rpc_server/java/gen/__db_lorder_reply.java b/storage/bdb/rpc_server/java/gen/__db_lorder_reply.java
index cdcda4d4f43..cdcda4d4f43 100644
--- a/bdb/rpc_server/java/gen/__db_lorder_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__db_lorder_reply.java
diff --git a/bdb/rpc_server/java/gen/__db_open_msg.java b/storage/bdb/rpc_server/java/gen/__db_open_msg.java
index 14dbd9e3b0c..14dbd9e3b0c 100644
--- a/bdb/rpc_server/java/gen/__db_open_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__db_open_msg.java
diff --git a/bdb/rpc_server/java/gen/__db_open_reply.java b/storage/bdb/rpc_server/java/gen/__db_open_reply.java
index d90c3754c2f..d90c3754c2f 100644
--- a/bdb/rpc_server/java/gen/__db_open_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__db_open_reply.java
diff --git a/bdb/rpc_server/java/gen/__db_pagesize_msg.java b/storage/bdb/rpc_server/java/gen/__db_pagesize_msg.java
index a452ea4e381..a452ea4e381 100644
--- a/bdb/rpc_server/java/gen/__db_pagesize_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__db_pagesize_msg.java
diff --git a/bdb/rpc_server/java/gen/__db_pagesize_reply.java b/storage/bdb/rpc_server/java/gen/__db_pagesize_reply.java
index 830b2078b34..830b2078b34 100644
--- a/bdb/rpc_server/java/gen/__db_pagesize_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__db_pagesize_reply.java
diff --git a/bdb/rpc_server/java/gen/__db_pget_msg.java b/storage/bdb/rpc_server/java/gen/__db_pget_msg.java
index 11d27ca9e46..11d27ca9e46 100644
--- a/bdb/rpc_server/java/gen/__db_pget_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__db_pget_msg.java
diff --git a/bdb/rpc_server/java/gen/__db_pget_reply.java b/storage/bdb/rpc_server/java/gen/__db_pget_reply.java
index 86c9c2111b9..86c9c2111b9 100644
--- a/bdb/rpc_server/java/gen/__db_pget_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__db_pget_reply.java
diff --git a/bdb/rpc_server/java/gen/__db_put_msg.java b/storage/bdb/rpc_server/java/gen/__db_put_msg.java
index b6159cff3a8..b6159cff3a8 100644
--- a/bdb/rpc_server/java/gen/__db_put_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__db_put_msg.java
diff --git a/bdb/rpc_server/java/gen/__db_put_reply.java b/storage/bdb/rpc_server/java/gen/__db_put_reply.java
index fc89ae1c3bd..fc89ae1c3bd 100644
--- a/bdb/rpc_server/java/gen/__db_put_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__db_put_reply.java
diff --git a/bdb/rpc_server/java/gen/__db_re_delim_msg.java b/storage/bdb/rpc_server/java/gen/__db_re_delim_msg.java
index c386bddd256..c386bddd256 100644
--- a/bdb/rpc_server/java/gen/__db_re_delim_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__db_re_delim_msg.java
diff --git a/bdb/rpc_server/java/gen/__db_re_delim_reply.java b/storage/bdb/rpc_server/java/gen/__db_re_delim_reply.java
index aa8a797f53d..aa8a797f53d 100644
--- a/bdb/rpc_server/java/gen/__db_re_delim_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__db_re_delim_reply.java
diff --git a/bdb/rpc_server/java/gen/__db_re_len_msg.java b/storage/bdb/rpc_server/java/gen/__db_re_len_msg.java
index 664de5c899c..664de5c899c 100644
--- a/bdb/rpc_server/java/gen/__db_re_len_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__db_re_len_msg.java
diff --git a/bdb/rpc_server/java/gen/__db_re_len_reply.java b/storage/bdb/rpc_server/java/gen/__db_re_len_reply.java
index dda27c8c123..dda27c8c123 100644
--- a/bdb/rpc_server/java/gen/__db_re_len_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__db_re_len_reply.java
diff --git a/bdb/rpc_server/java/gen/__db_re_pad_msg.java b/storage/bdb/rpc_server/java/gen/__db_re_pad_msg.java
index 2c1290b6e74..2c1290b6e74 100644
--- a/bdb/rpc_server/java/gen/__db_re_pad_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__db_re_pad_msg.java
diff --git a/bdb/rpc_server/java/gen/__db_re_pad_reply.java b/storage/bdb/rpc_server/java/gen/__db_re_pad_reply.java
index f0aaa9a3a70..f0aaa9a3a70 100644
--- a/bdb/rpc_server/java/gen/__db_re_pad_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__db_re_pad_reply.java
diff --git a/bdb/rpc_server/java/gen/__db_remove_msg.java b/storage/bdb/rpc_server/java/gen/__db_remove_msg.java
index dfa9066a7ec..dfa9066a7ec 100644
--- a/bdb/rpc_server/java/gen/__db_remove_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__db_remove_msg.java
diff --git a/bdb/rpc_server/java/gen/__db_remove_reply.java b/storage/bdb/rpc_server/java/gen/__db_remove_reply.java
index a2b86c04985..a2b86c04985 100644
--- a/bdb/rpc_server/java/gen/__db_remove_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__db_remove_reply.java
diff --git a/bdb/rpc_server/java/gen/__db_rename_msg.java b/storage/bdb/rpc_server/java/gen/__db_rename_msg.java
index 12b434e3375..12b434e3375 100644
--- a/bdb/rpc_server/java/gen/__db_rename_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__db_rename_msg.java
diff --git a/bdb/rpc_server/java/gen/__db_rename_reply.java b/storage/bdb/rpc_server/java/gen/__db_rename_reply.java
index 4e4a22be570..4e4a22be570 100644
--- a/bdb/rpc_server/java/gen/__db_rename_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__db_rename_reply.java
diff --git a/bdb/rpc_server/java/gen/__db_stat_msg.java b/storage/bdb/rpc_server/java/gen/__db_stat_msg.java
index af536b5f707..af536b5f707 100644
--- a/bdb/rpc_server/java/gen/__db_stat_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__db_stat_msg.java
diff --git a/bdb/rpc_server/java/gen/__db_stat_reply.java b/storage/bdb/rpc_server/java/gen/__db_stat_reply.java
index 8df1460149a..8df1460149a 100644
--- a/bdb/rpc_server/java/gen/__db_stat_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__db_stat_reply.java
diff --git a/bdb/rpc_server/java/gen/__db_sync_msg.java b/storage/bdb/rpc_server/java/gen/__db_sync_msg.java
index c6594670fc6..c6594670fc6 100644
--- a/bdb/rpc_server/java/gen/__db_sync_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__db_sync_msg.java
diff --git a/bdb/rpc_server/java/gen/__db_sync_reply.java b/storage/bdb/rpc_server/java/gen/__db_sync_reply.java
index d0a8bc8b196..d0a8bc8b196 100644
--- a/bdb/rpc_server/java/gen/__db_sync_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__db_sync_reply.java
diff --git a/bdb/rpc_server/java/gen/__db_truncate_msg.java b/storage/bdb/rpc_server/java/gen/__db_truncate_msg.java
index 38810d65660..38810d65660 100644
--- a/bdb/rpc_server/java/gen/__db_truncate_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__db_truncate_msg.java
diff --git a/bdb/rpc_server/java/gen/__db_truncate_reply.java b/storage/bdb/rpc_server/java/gen/__db_truncate_reply.java
index c4f68869007..c4f68869007 100644
--- a/bdb/rpc_server/java/gen/__db_truncate_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__db_truncate_reply.java
diff --git a/bdb/rpc_server/java/gen/__dbc_close_msg.java b/storage/bdb/rpc_server/java/gen/__dbc_close_msg.java
index eb1ca7f7e17..eb1ca7f7e17 100644
--- a/bdb/rpc_server/java/gen/__dbc_close_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__dbc_close_msg.java
diff --git a/bdb/rpc_server/java/gen/__dbc_close_reply.java b/storage/bdb/rpc_server/java/gen/__dbc_close_reply.java
index 47459aace36..47459aace36 100644
--- a/bdb/rpc_server/java/gen/__dbc_close_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__dbc_close_reply.java
diff --git a/bdb/rpc_server/java/gen/__dbc_count_msg.java b/storage/bdb/rpc_server/java/gen/__dbc_count_msg.java
index 5f554e18a1b..5f554e18a1b 100644
--- a/bdb/rpc_server/java/gen/__dbc_count_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__dbc_count_msg.java
diff --git a/bdb/rpc_server/java/gen/__dbc_count_reply.java b/storage/bdb/rpc_server/java/gen/__dbc_count_reply.java
index 4daecdd2296..4daecdd2296 100644
--- a/bdb/rpc_server/java/gen/__dbc_count_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__dbc_count_reply.java
diff --git a/bdb/rpc_server/java/gen/__dbc_del_msg.java b/storage/bdb/rpc_server/java/gen/__dbc_del_msg.java
index bc4bd05f573..bc4bd05f573 100644
--- a/bdb/rpc_server/java/gen/__dbc_del_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__dbc_del_msg.java
diff --git a/bdb/rpc_server/java/gen/__dbc_del_reply.java b/storage/bdb/rpc_server/java/gen/__dbc_del_reply.java
index e55ac9ffaf6..e55ac9ffaf6 100644
--- a/bdb/rpc_server/java/gen/__dbc_del_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__dbc_del_reply.java
diff --git a/bdb/rpc_server/java/gen/__dbc_dup_msg.java b/storage/bdb/rpc_server/java/gen/__dbc_dup_msg.java
index 9a3894e6158..9a3894e6158 100644
--- a/bdb/rpc_server/java/gen/__dbc_dup_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__dbc_dup_msg.java
diff --git a/bdb/rpc_server/java/gen/__dbc_dup_reply.java b/storage/bdb/rpc_server/java/gen/__dbc_dup_reply.java
index 6b942f1a61a..6b942f1a61a 100644
--- a/bdb/rpc_server/java/gen/__dbc_dup_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__dbc_dup_reply.java
diff --git a/bdb/rpc_server/java/gen/__dbc_get_msg.java b/storage/bdb/rpc_server/java/gen/__dbc_get_msg.java
index 672ace43fdd..672ace43fdd 100644
--- a/bdb/rpc_server/java/gen/__dbc_get_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__dbc_get_msg.java
diff --git a/bdb/rpc_server/java/gen/__dbc_get_reply.java b/storage/bdb/rpc_server/java/gen/__dbc_get_reply.java
index 8671fec6335..8671fec6335 100644
--- a/bdb/rpc_server/java/gen/__dbc_get_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__dbc_get_reply.java
diff --git a/bdb/rpc_server/java/gen/__dbc_pget_msg.java b/storage/bdb/rpc_server/java/gen/__dbc_pget_msg.java
index 8ca3c6171a1..8ca3c6171a1 100644
--- a/bdb/rpc_server/java/gen/__dbc_pget_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__dbc_pget_msg.java
diff --git a/bdb/rpc_server/java/gen/__dbc_pget_reply.java b/storage/bdb/rpc_server/java/gen/__dbc_pget_reply.java
index 16cc795878d..16cc795878d 100644
--- a/bdb/rpc_server/java/gen/__dbc_pget_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__dbc_pget_reply.java
diff --git a/bdb/rpc_server/java/gen/__dbc_put_msg.java b/storage/bdb/rpc_server/java/gen/__dbc_put_msg.java
index 98d12423dc5..98d12423dc5 100644
--- a/bdb/rpc_server/java/gen/__dbc_put_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__dbc_put_msg.java
diff --git a/bdb/rpc_server/java/gen/__dbc_put_reply.java b/storage/bdb/rpc_server/java/gen/__dbc_put_reply.java
index 385f9f783fb..385f9f783fb 100644
--- a/bdb/rpc_server/java/gen/__dbc_put_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__dbc_put_reply.java
diff --git a/bdb/rpc_server/java/gen/__env_cachesize_msg.java b/storage/bdb/rpc_server/java/gen/__env_cachesize_msg.java
index d1fce1ffa35..d1fce1ffa35 100644
--- a/bdb/rpc_server/java/gen/__env_cachesize_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__env_cachesize_msg.java
diff --git a/bdb/rpc_server/java/gen/__env_cachesize_reply.java b/storage/bdb/rpc_server/java/gen/__env_cachesize_reply.java
index 193f8355d71..193f8355d71 100644
--- a/bdb/rpc_server/java/gen/__env_cachesize_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__env_cachesize_reply.java
diff --git a/bdb/rpc_server/java/gen/__env_close_msg.java b/storage/bdb/rpc_server/java/gen/__env_close_msg.java
index 5e657bacfa5..5e657bacfa5 100644
--- a/bdb/rpc_server/java/gen/__env_close_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__env_close_msg.java
diff --git a/bdb/rpc_server/java/gen/__env_close_reply.java b/storage/bdb/rpc_server/java/gen/__env_close_reply.java
index 11e61f7c8c3..11e61f7c8c3 100644
--- a/bdb/rpc_server/java/gen/__env_close_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__env_close_reply.java
diff --git a/bdb/rpc_server/java/gen/__env_create_msg.java b/storage/bdb/rpc_server/java/gen/__env_create_msg.java
index dbe546ae23a..dbe546ae23a 100644
--- a/bdb/rpc_server/java/gen/__env_create_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__env_create_msg.java
diff --git a/bdb/rpc_server/java/gen/__env_create_reply.java b/storage/bdb/rpc_server/java/gen/__env_create_reply.java
index 5427fc4bc1e..5427fc4bc1e 100644
--- a/bdb/rpc_server/java/gen/__env_create_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__env_create_reply.java
diff --git a/bdb/rpc_server/java/gen/__env_dbremove_msg.java b/storage/bdb/rpc_server/java/gen/__env_dbremove_msg.java
index 9730a92c590..9730a92c590 100644
--- a/bdb/rpc_server/java/gen/__env_dbremove_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__env_dbremove_msg.java
diff --git a/bdb/rpc_server/java/gen/__env_dbremove_reply.java b/storage/bdb/rpc_server/java/gen/__env_dbremove_reply.java
index 75cc5a940cc..75cc5a940cc 100644
--- a/bdb/rpc_server/java/gen/__env_dbremove_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__env_dbremove_reply.java
diff --git a/bdb/rpc_server/java/gen/__env_dbrename_msg.java b/storage/bdb/rpc_server/java/gen/__env_dbrename_msg.java
index 0bbda262b64..0bbda262b64 100644
--- a/bdb/rpc_server/java/gen/__env_dbrename_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__env_dbrename_msg.java
diff --git a/bdb/rpc_server/java/gen/__env_dbrename_reply.java b/storage/bdb/rpc_server/java/gen/__env_dbrename_reply.java
index 0cc8882305d..0cc8882305d 100644
--- a/bdb/rpc_server/java/gen/__env_dbrename_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__env_dbrename_reply.java
diff --git a/bdb/rpc_server/java/gen/__env_encrypt_msg.java b/storage/bdb/rpc_server/java/gen/__env_encrypt_msg.java
index 84e9a36d372..84e9a36d372 100644
--- a/bdb/rpc_server/java/gen/__env_encrypt_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__env_encrypt_msg.java
diff --git a/bdb/rpc_server/java/gen/__env_encrypt_reply.java b/storage/bdb/rpc_server/java/gen/__env_encrypt_reply.java
index e202a3089d0..e202a3089d0 100644
--- a/bdb/rpc_server/java/gen/__env_encrypt_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__env_encrypt_reply.java
diff --git a/bdb/rpc_server/java/gen/__env_flags_msg.java b/storage/bdb/rpc_server/java/gen/__env_flags_msg.java
index 25cd5f85f6d..25cd5f85f6d 100644
--- a/bdb/rpc_server/java/gen/__env_flags_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__env_flags_msg.java
diff --git a/bdb/rpc_server/java/gen/__env_flags_reply.java b/storage/bdb/rpc_server/java/gen/__env_flags_reply.java
index d348a9224ea..d348a9224ea 100644
--- a/bdb/rpc_server/java/gen/__env_flags_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__env_flags_reply.java
diff --git a/bdb/rpc_server/java/gen/__env_open_msg.java b/storage/bdb/rpc_server/java/gen/__env_open_msg.java
index e4649b41f9e..e4649b41f9e 100644
--- a/bdb/rpc_server/java/gen/__env_open_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__env_open_msg.java
diff --git a/bdb/rpc_server/java/gen/__env_open_reply.java b/storage/bdb/rpc_server/java/gen/__env_open_reply.java
index 1994afb4cf2..1994afb4cf2 100644
--- a/bdb/rpc_server/java/gen/__env_open_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__env_open_reply.java
diff --git a/bdb/rpc_server/java/gen/__env_remove_msg.java b/storage/bdb/rpc_server/java/gen/__env_remove_msg.java
index b32d758f0f5..b32d758f0f5 100644
--- a/bdb/rpc_server/java/gen/__env_remove_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__env_remove_msg.java
diff --git a/bdb/rpc_server/java/gen/__env_remove_reply.java b/storage/bdb/rpc_server/java/gen/__env_remove_reply.java
index 19e4d52f662..19e4d52f662 100644
--- a/bdb/rpc_server/java/gen/__env_remove_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__env_remove_reply.java
diff --git a/bdb/rpc_server/java/gen/__txn_abort_msg.java b/storage/bdb/rpc_server/java/gen/__txn_abort_msg.java
index ff44c534e46..ff44c534e46 100644
--- a/bdb/rpc_server/java/gen/__txn_abort_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__txn_abort_msg.java
diff --git a/bdb/rpc_server/java/gen/__txn_abort_reply.java b/storage/bdb/rpc_server/java/gen/__txn_abort_reply.java
index 58f275c1a8f..58f275c1a8f 100644
--- a/bdb/rpc_server/java/gen/__txn_abort_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__txn_abort_reply.java
diff --git a/bdb/rpc_server/java/gen/__txn_begin_msg.java b/storage/bdb/rpc_server/java/gen/__txn_begin_msg.java
index 877031e8d3a..877031e8d3a 100644
--- a/bdb/rpc_server/java/gen/__txn_begin_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__txn_begin_msg.java
diff --git a/bdb/rpc_server/java/gen/__txn_begin_reply.java b/storage/bdb/rpc_server/java/gen/__txn_begin_reply.java
index 65a0c4016c2..65a0c4016c2 100644
--- a/bdb/rpc_server/java/gen/__txn_begin_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__txn_begin_reply.java
diff --git a/bdb/rpc_server/java/gen/__txn_commit_msg.java b/storage/bdb/rpc_server/java/gen/__txn_commit_msg.java
index 4b988d0c282..4b988d0c282 100644
--- a/bdb/rpc_server/java/gen/__txn_commit_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__txn_commit_msg.java
diff --git a/bdb/rpc_server/java/gen/__txn_commit_reply.java b/storage/bdb/rpc_server/java/gen/__txn_commit_reply.java
index b26937b82dd..b26937b82dd 100644
--- a/bdb/rpc_server/java/gen/__txn_commit_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__txn_commit_reply.java
diff --git a/bdb/rpc_server/java/gen/__txn_discard_msg.java b/storage/bdb/rpc_server/java/gen/__txn_discard_msg.java
index 87f5d4f77a7..87f5d4f77a7 100644
--- a/bdb/rpc_server/java/gen/__txn_discard_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__txn_discard_msg.java
diff --git a/bdb/rpc_server/java/gen/__txn_discard_reply.java b/storage/bdb/rpc_server/java/gen/__txn_discard_reply.java
index 9792211afcc..9792211afcc 100644
--- a/bdb/rpc_server/java/gen/__txn_discard_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__txn_discard_reply.java
diff --git a/bdb/rpc_server/java/gen/__txn_prepare_msg.java b/storage/bdb/rpc_server/java/gen/__txn_prepare_msg.java
index 6e09f2c7771..6e09f2c7771 100644
--- a/bdb/rpc_server/java/gen/__txn_prepare_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__txn_prepare_msg.java
diff --git a/bdb/rpc_server/java/gen/__txn_prepare_reply.java b/storage/bdb/rpc_server/java/gen/__txn_prepare_reply.java
index d7590117952..d7590117952 100644
--- a/bdb/rpc_server/java/gen/__txn_prepare_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__txn_prepare_reply.java
diff --git a/bdb/rpc_server/java/gen/__txn_recover_msg.java b/storage/bdb/rpc_server/java/gen/__txn_recover_msg.java
index 65153334403..65153334403 100644
--- a/bdb/rpc_server/java/gen/__txn_recover_msg.java
+++ b/storage/bdb/rpc_server/java/gen/__txn_recover_msg.java
diff --git a/bdb/rpc_server/java/gen/__txn_recover_reply.java b/storage/bdb/rpc_server/java/gen/__txn_recover_reply.java
index 0161ec949da..0161ec949da 100644
--- a/bdb/rpc_server/java/gen/__txn_recover_reply.java
+++ b/storage/bdb/rpc_server/java/gen/__txn_recover_reply.java
diff --git a/bdb/rpc_server/java/gen/db_server.java b/storage/bdb/rpc_server/java/gen/db_server.java
index a14a77028a2..a14a77028a2 100644
--- a/bdb/rpc_server/java/gen/db_server.java
+++ b/storage/bdb/rpc_server/java/gen/db_server.java
diff --git a/bdb/rpc_server/java/jrpcgen.jar b/storage/bdb/rpc_server/java/jrpcgen.jar
index 338825b848d..338825b848d 100644
--- a/bdb/rpc_server/java/jrpcgen.jar
+++ b/storage/bdb/rpc_server/java/jrpcgen.jar
diff --git a/bdb/rpc_server/java/oncrpc.jar b/storage/bdb/rpc_server/java/oncrpc.jar
index e0f5cfa6966..e0f5cfa6966 100644
--- a/bdb/rpc_server/java/oncrpc.jar
+++ b/storage/bdb/rpc_server/java/oncrpc.jar
diff --git a/bdb/rpc_server/java/s_jrpcgen b/storage/bdb/rpc_server/java/s_jrpcgen
index fed8cbf56bb..fed8cbf56bb 100644
--- a/bdb/rpc_server/java/s_jrpcgen
+++ b/storage/bdb/rpc_server/java/s_jrpcgen
diff --git a/bdb/rpc_server/rpc.src b/storage/bdb/rpc_server/rpc.src
index 7afee49b066..7afee49b066 100644
--- a/bdb/rpc_server/rpc.src
+++ b/storage/bdb/rpc_server/rpc.src
diff --git a/bdb/tcl/docs/db.html b/storage/bdb/tcl/docs/db.html
index 4f04c2c4f96..4f04c2c4f96 100644
--- a/bdb/tcl/docs/db.html
+++ b/storage/bdb/tcl/docs/db.html
diff --git a/bdb/tcl/docs/env.html b/storage/bdb/tcl/docs/env.html
index 79c349841ac..79c349841ac 100644
--- a/bdb/tcl/docs/env.html
+++ b/storage/bdb/tcl/docs/env.html
diff --git a/bdb/tcl/docs/historic.html b/storage/bdb/tcl/docs/historic.html
index 85f474fbc0f..85f474fbc0f 100644
--- a/bdb/tcl/docs/historic.html
+++ b/storage/bdb/tcl/docs/historic.html
diff --git a/bdb/tcl/docs/index.html b/storage/bdb/tcl/docs/index.html
index 845b6ca81e2..845b6ca81e2 100644
--- a/bdb/tcl/docs/index.html
+++ b/storage/bdb/tcl/docs/index.html
diff --git a/bdb/tcl/docs/library.html b/storage/bdb/tcl/docs/library.html
index bfb1588c3f2..bfb1588c3f2 100644
--- a/bdb/tcl/docs/library.html
+++ b/storage/bdb/tcl/docs/library.html
diff --git a/bdb/tcl/docs/lock.html b/storage/bdb/tcl/docs/lock.html
index d65142b798b..d65142b798b 100644
--- a/bdb/tcl/docs/lock.html
+++ b/storage/bdb/tcl/docs/lock.html
diff --git a/bdb/tcl/docs/log.html b/storage/bdb/tcl/docs/log.html
index 49f2f0ad2e0..49f2f0ad2e0 100644
--- a/bdb/tcl/docs/log.html
+++ b/storage/bdb/tcl/docs/log.html
diff --git a/bdb/tcl/docs/mpool.html b/storage/bdb/tcl/docs/mpool.html
index 7f2359b36e9..7f2359b36e9 100644
--- a/bdb/tcl/docs/mpool.html
+++ b/storage/bdb/tcl/docs/mpool.html
diff --git a/bdb/tcl/docs/rep.html b/storage/bdb/tcl/docs/rep.html
index 079fe443a63..079fe443a63 100644
--- a/bdb/tcl/docs/rep.html
+++ b/storage/bdb/tcl/docs/rep.html
diff --git a/bdb/tcl/docs/test.html b/storage/bdb/tcl/docs/test.html
index 603ae56a51e..603ae56a51e 100644
--- a/bdb/tcl/docs/test.html
+++ b/storage/bdb/tcl/docs/test.html
diff --git a/bdb/tcl/docs/txn.html b/storage/bdb/tcl/docs/txn.html
index 07c88c0fe1d..07c88c0fe1d 100644
--- a/bdb/tcl/docs/txn.html
+++ b/storage/bdb/tcl/docs/txn.html
diff --git a/bdb/tcl/tcl_compat.c b/storage/bdb/tcl/tcl_compat.c
index e77bc32aedf..e77bc32aedf 100644
--- a/bdb/tcl/tcl_compat.c
+++ b/storage/bdb/tcl/tcl_compat.c
diff --git a/bdb/tcl/tcl_db.c b/storage/bdb/tcl/tcl_db.c
index 7df2e48311c..7df2e48311c 100644
--- a/bdb/tcl/tcl_db.c
+++ b/storage/bdb/tcl/tcl_db.c
diff --git a/bdb/tcl/tcl_db_pkg.c b/storage/bdb/tcl/tcl_db_pkg.c
index ce37598dc1a..ce37598dc1a 100644
--- a/bdb/tcl/tcl_db_pkg.c
+++ b/storage/bdb/tcl/tcl_db_pkg.c
diff --git a/bdb/tcl/tcl_dbcursor.c b/storage/bdb/tcl/tcl_dbcursor.c
index fb426e53f48..fb426e53f48 100644
--- a/bdb/tcl/tcl_dbcursor.c
+++ b/storage/bdb/tcl/tcl_dbcursor.c
diff --git a/bdb/tcl/tcl_env.c b/storage/bdb/tcl/tcl_env.c
index cdf4890e9fc..cdf4890e9fc 100644
--- a/bdb/tcl/tcl_env.c
+++ b/storage/bdb/tcl/tcl_env.c
diff --git a/bdb/tcl/tcl_internal.c b/storage/bdb/tcl/tcl_internal.c
index 2d6ad4df444..2d6ad4df444 100644
--- a/bdb/tcl/tcl_internal.c
+++ b/storage/bdb/tcl/tcl_internal.c
diff --git a/bdb/tcl/tcl_lock.c b/storage/bdb/tcl/tcl_lock.c
index 6cb96dbb0da..6cb96dbb0da 100644
--- a/bdb/tcl/tcl_lock.c
+++ b/storage/bdb/tcl/tcl_lock.c
diff --git a/bdb/tcl/tcl_log.c b/storage/bdb/tcl/tcl_log.c
index be6eebfb013..be6eebfb013 100644
--- a/bdb/tcl/tcl_log.c
+++ b/storage/bdb/tcl/tcl_log.c
diff --git a/bdb/tcl/tcl_mp.c b/storage/bdb/tcl/tcl_mp.c
index 0c4411cb58a..0c4411cb58a 100644
--- a/bdb/tcl/tcl_mp.c
+++ b/storage/bdb/tcl/tcl_mp.c
diff --git a/bdb/tcl/tcl_rep.c b/storage/bdb/tcl/tcl_rep.c
index c72c9971338..c72c9971338 100644
--- a/bdb/tcl/tcl_rep.c
+++ b/storage/bdb/tcl/tcl_rep.c
diff --git a/bdb/tcl/tcl_txn.c b/storage/bdb/tcl/tcl_txn.c
index b5fab637943..b5fab637943 100644
--- a/bdb/tcl/tcl_txn.c
+++ b/storage/bdb/tcl/tcl_txn.c
diff --git a/bdb/tcl/tcl_util.c b/storage/bdb/tcl/tcl_util.c
index 3c0665f9e38..3c0665f9e38 100644
--- a/bdb/tcl/tcl_util.c
+++ b/storage/bdb/tcl/tcl_util.c
diff --git a/bdb/test/archive.tcl b/storage/bdb/test/archive.tcl
index 9b5e764b2b4..9b5e764b2b4 100644
--- a/bdb/test/archive.tcl
+++ b/storage/bdb/test/archive.tcl
diff --git a/bdb/test/bigfile001.tcl b/storage/bdb/test/bigfile001.tcl
index 78dcd940f5e..78dcd940f5e 100644
--- a/bdb/test/bigfile001.tcl
+++ b/storage/bdb/test/bigfile001.tcl
diff --git a/bdb/test/bigfile002.tcl b/storage/bdb/test/bigfile002.tcl
index f3e6defeaba..f3e6defeaba 100644
--- a/bdb/test/bigfile002.tcl
+++ b/storage/bdb/test/bigfile002.tcl
diff --git a/bdb/test/byteorder.tcl b/storage/bdb/test/byteorder.tcl
index 823ca46270d..823ca46270d 100644
--- a/bdb/test/byteorder.tcl
+++ b/storage/bdb/test/byteorder.tcl
diff --git a/bdb/test/conscript.tcl b/storage/bdb/test/conscript.tcl
index fd12c6e51a0..fd12c6e51a0 100644
--- a/bdb/test/conscript.tcl
+++ b/storage/bdb/test/conscript.tcl
diff --git a/bdb/test/dbm.tcl b/storage/bdb/test/dbm.tcl
index a392c7a9f3a..a392c7a9f3a 100644
--- a/bdb/test/dbm.tcl
+++ b/storage/bdb/test/dbm.tcl
diff --git a/bdb/test/dbscript.tcl b/storage/bdb/test/dbscript.tcl
index 5decc493e9e..5decc493e9e 100644
--- a/bdb/test/dbscript.tcl
+++ b/storage/bdb/test/dbscript.tcl
diff --git a/bdb/test/ddoyscript.tcl b/storage/bdb/test/ddoyscript.tcl
index 5478a1a98e0..5478a1a98e0 100644
--- a/bdb/test/ddoyscript.tcl
+++ b/storage/bdb/test/ddoyscript.tcl
diff --git a/bdb/test/ddscript.tcl b/storage/bdb/test/ddscript.tcl
index 621906233a9..621906233a9 100644
--- a/bdb/test/ddscript.tcl
+++ b/storage/bdb/test/ddscript.tcl
diff --git a/bdb/test/dead001.tcl b/storage/bdb/test/dead001.tcl
index e9853a87e53..e9853a87e53 100644
--- a/bdb/test/dead001.tcl
+++ b/storage/bdb/test/dead001.tcl
diff --git a/bdb/test/dead002.tcl b/storage/bdb/test/dead002.tcl
index bc19e7127e5..bc19e7127e5 100644
--- a/bdb/test/dead002.tcl
+++ b/storage/bdb/test/dead002.tcl
diff --git a/bdb/test/dead003.tcl b/storage/bdb/test/dead003.tcl
index 48088e1427c..48088e1427c 100644
--- a/bdb/test/dead003.tcl
+++ b/storage/bdb/test/dead003.tcl
diff --git a/bdb/test/dead004.tcl b/storage/bdb/test/dead004.tcl
index f5306a0d892..f5306a0d892 100644
--- a/bdb/test/dead004.tcl
+++ b/storage/bdb/test/dead004.tcl
diff --git a/bdb/test/dead005.tcl b/storage/bdb/test/dead005.tcl
index 71be8b1713f..71be8b1713f 100644
--- a/bdb/test/dead005.tcl
+++ b/storage/bdb/test/dead005.tcl
diff --git a/bdb/test/dead006.tcl b/storage/bdb/test/dead006.tcl
index b70e011fb74..b70e011fb74 100644
--- a/bdb/test/dead006.tcl
+++ b/storage/bdb/test/dead006.tcl
diff --git a/bdb/test/dead007.tcl b/storage/bdb/test/dead007.tcl
index 2b6a78cb4b9..2b6a78cb4b9 100644
--- a/bdb/test/dead007.tcl
+++ b/storage/bdb/test/dead007.tcl
diff --git a/bdb/test/env001.tcl b/storage/bdb/test/env001.tcl
index 781029f6a5c..781029f6a5c 100644
--- a/bdb/test/env001.tcl
+++ b/storage/bdb/test/env001.tcl
diff --git a/bdb/test/env002.tcl b/storage/bdb/test/env002.tcl
index 89c44f63a12..89c44f63a12 100644
--- a/bdb/test/env002.tcl
+++ b/storage/bdb/test/env002.tcl
diff --git a/bdb/test/env003.tcl b/storage/bdb/test/env003.tcl
index c16b54dd5e0..c16b54dd5e0 100644
--- a/bdb/test/env003.tcl
+++ b/storage/bdb/test/env003.tcl
diff --git a/bdb/test/env004.tcl b/storage/bdb/test/env004.tcl
index e93a0d95308..e93a0d95308 100644
--- a/bdb/test/env004.tcl
+++ b/storage/bdb/test/env004.tcl
diff --git a/bdb/test/env005.tcl b/storage/bdb/test/env005.tcl
index 03bb1b40b34..03bb1b40b34 100644
--- a/bdb/test/env005.tcl
+++ b/storage/bdb/test/env005.tcl
diff --git a/bdb/test/env006.tcl b/storage/bdb/test/env006.tcl
index 48fc6982772..48fc6982772 100644
--- a/bdb/test/env006.tcl
+++ b/storage/bdb/test/env006.tcl
diff --git a/bdb/test/env007.tcl b/storage/bdb/test/env007.tcl
index 5748d2dbc89..5748d2dbc89 100644
--- a/bdb/test/env007.tcl
+++ b/storage/bdb/test/env007.tcl
diff --git a/bdb/test/env008.tcl b/storage/bdb/test/env008.tcl
index dccdb41f612..dccdb41f612 100644
--- a/bdb/test/env008.tcl
+++ b/storage/bdb/test/env008.tcl
diff --git a/bdb/test/env009.tcl b/storage/bdb/test/env009.tcl
index 264d5e2dfec..264d5e2dfec 100644
--- a/bdb/test/env009.tcl
+++ b/storage/bdb/test/env009.tcl
diff --git a/bdb/test/env010.tcl b/storage/bdb/test/env010.tcl
index 4444e34e439..4444e34e439 100644
--- a/bdb/test/env010.tcl
+++ b/storage/bdb/test/env010.tcl
diff --git a/bdb/test/env011.tcl b/storage/bdb/test/env011.tcl
index 4061bb3fe51..4061bb3fe51 100644
--- a/bdb/test/env011.tcl
+++ b/storage/bdb/test/env011.tcl
diff --git a/bdb/test/hsearch.tcl b/storage/bdb/test/hsearch.tcl
index afeed93f74e..afeed93f74e 100644
--- a/bdb/test/hsearch.tcl
+++ b/storage/bdb/test/hsearch.tcl
diff --git a/bdb/test/join.tcl b/storage/bdb/test/join.tcl
index 87b0d1fae58..87b0d1fae58 100644
--- a/bdb/test/join.tcl
+++ b/storage/bdb/test/join.tcl
diff --git a/bdb/test/lock001.tcl b/storage/bdb/test/lock001.tcl
index 1afcc471fc1..1afcc471fc1 100644
--- a/bdb/test/lock001.tcl
+++ b/storage/bdb/test/lock001.tcl
diff --git a/bdb/test/lock002.tcl b/storage/bdb/test/lock002.tcl
index a1ad8760c9d..a1ad8760c9d 100644
--- a/bdb/test/lock002.tcl
+++ b/storage/bdb/test/lock002.tcl
diff --git a/bdb/test/lock003.tcl b/storage/bdb/test/lock003.tcl
index 91a8a2e90f6..91a8a2e90f6 100644
--- a/bdb/test/lock003.tcl
+++ b/storage/bdb/test/lock003.tcl
diff --git a/bdb/test/lock004.tcl b/storage/bdb/test/lock004.tcl
index 7fd51ee42f2..7fd51ee42f2 100644
--- a/bdb/test/lock004.tcl
+++ b/storage/bdb/test/lock004.tcl
diff --git a/bdb/test/lock005.tcl b/storage/bdb/test/lock005.tcl
index 5afe7344d36..5afe7344d36 100644
--- a/bdb/test/lock005.tcl
+++ b/storage/bdb/test/lock005.tcl
diff --git a/bdb/test/lockscript.tcl b/storage/bdb/test/lockscript.tcl
index 812339a4a70..812339a4a70 100644
--- a/bdb/test/lockscript.tcl
+++ b/storage/bdb/test/lockscript.tcl
diff --git a/bdb/test/log001.tcl b/storage/bdb/test/log001.tcl
index 87df780cb5a..87df780cb5a 100644
--- a/bdb/test/log001.tcl
+++ b/storage/bdb/test/log001.tcl
diff --git a/bdb/test/log002.tcl b/storage/bdb/test/log002.tcl
index 6e91f55398f..6e91f55398f 100644
--- a/bdb/test/log002.tcl
+++ b/storage/bdb/test/log002.tcl
diff --git a/bdb/test/log003.tcl b/storage/bdb/test/log003.tcl
index 11297b59d50..11297b59d50 100644
--- a/bdb/test/log003.tcl
+++ b/storage/bdb/test/log003.tcl
diff --git a/bdb/test/log004.tcl b/storage/bdb/test/log004.tcl
index 66968a8c1b4..66968a8c1b4 100644
--- a/bdb/test/log004.tcl
+++ b/storage/bdb/test/log004.tcl
diff --git a/bdb/test/log005.tcl b/storage/bdb/test/log005.tcl
index ab2ad703c55..ab2ad703c55 100644
--- a/bdb/test/log005.tcl
+++ b/storage/bdb/test/log005.tcl
diff --git a/bdb/test/logtrack.tcl b/storage/bdb/test/logtrack.tcl
index ad6b480b4e3..ad6b480b4e3 100644
--- a/bdb/test/logtrack.tcl
+++ b/storage/bdb/test/logtrack.tcl
diff --git a/bdb/test/mdbscript.tcl b/storage/bdb/test/mdbscript.tcl
index 9f3c971ee3c..9f3c971ee3c 100644
--- a/bdb/test/mdbscript.tcl
+++ b/storage/bdb/test/mdbscript.tcl
diff --git a/bdb/test/memp001.tcl b/storage/bdb/test/memp001.tcl
index c4bbf99b9b2..c4bbf99b9b2 100644
--- a/bdb/test/memp001.tcl
+++ b/storage/bdb/test/memp001.tcl
diff --git a/bdb/test/memp002.tcl b/storage/bdb/test/memp002.tcl
index d55f2987f06..d55f2987f06 100644
--- a/bdb/test/memp002.tcl
+++ b/storage/bdb/test/memp002.tcl
diff --git a/bdb/test/memp003.tcl b/storage/bdb/test/memp003.tcl
index 31eb55b757c..31eb55b757c 100644
--- a/bdb/test/memp003.tcl
+++ b/storage/bdb/test/memp003.tcl
diff --git a/bdb/test/mpoolscript.tcl b/storage/bdb/test/mpoolscript.tcl
index c13f70eb945..c13f70eb945 100644
--- a/bdb/test/mpoolscript.tcl
+++ b/storage/bdb/test/mpoolscript.tcl
diff --git a/bdb/test/mutex001.tcl b/storage/bdb/test/mutex001.tcl
index 93f858993a5..93f858993a5 100644
--- a/bdb/test/mutex001.tcl
+++ b/storage/bdb/test/mutex001.tcl
diff --git a/bdb/test/mutex002.tcl b/storage/bdb/test/mutex002.tcl
index 193e600fe8b..193e600fe8b 100644
--- a/bdb/test/mutex002.tcl
+++ b/storage/bdb/test/mutex002.tcl
diff --git a/bdb/test/mutex003.tcl b/storage/bdb/test/mutex003.tcl
index da35ac0d115..da35ac0d115 100644
--- a/bdb/test/mutex003.tcl
+++ b/storage/bdb/test/mutex003.tcl
diff --git a/bdb/test/mutexscript.tcl b/storage/bdb/test/mutexscript.tcl
index bc410f2716d..bc410f2716d 100644
--- a/bdb/test/mutexscript.tcl
+++ b/storage/bdb/test/mutexscript.tcl
diff --git a/bdb/test/ndbm.tcl b/storage/bdb/test/ndbm.tcl
index 0bf8e0cc87c..0bf8e0cc87c 100644
--- a/bdb/test/ndbm.tcl
+++ b/storage/bdb/test/ndbm.tcl
diff --git a/bdb/test/parallel.tcl b/storage/bdb/test/parallel.tcl
index 4e101c088cb..4e101c088cb 100644
--- a/bdb/test/parallel.tcl
+++ b/storage/bdb/test/parallel.tcl
diff --git a/bdb/test/recd001.tcl b/storage/bdb/test/recd001.tcl
index bc7ac6d896a..bc7ac6d896a 100644
--- a/bdb/test/recd001.tcl
+++ b/storage/bdb/test/recd001.tcl
diff --git a/bdb/test/recd002.tcl b/storage/bdb/test/recd002.tcl
index ed579291283..ed579291283 100644
--- a/bdb/test/recd002.tcl
+++ b/storage/bdb/test/recd002.tcl
diff --git a/bdb/test/recd003.tcl b/storage/bdb/test/recd003.tcl
index 0fd054832ce..0fd054832ce 100644
--- a/bdb/test/recd003.tcl
+++ b/storage/bdb/test/recd003.tcl
diff --git a/bdb/test/recd004.tcl b/storage/bdb/test/recd004.tcl
index 74504ac3cd7..74504ac3cd7 100644
--- a/bdb/test/recd004.tcl
+++ b/storage/bdb/test/recd004.tcl
diff --git a/bdb/test/recd005.tcl b/storage/bdb/test/recd005.tcl
index 7668c9e3be3..7668c9e3be3 100644
--- a/bdb/test/recd005.tcl
+++ b/storage/bdb/test/recd005.tcl
diff --git a/bdb/test/recd006.tcl b/storage/bdb/test/recd006.tcl
index fc35e755b08..fc35e755b08 100644
--- a/bdb/test/recd006.tcl
+++ b/storage/bdb/test/recd006.tcl
diff --git a/bdb/test/recd007.tcl b/storage/bdb/test/recd007.tcl
index aeac3bea2c1..aeac3bea2c1 100644
--- a/bdb/test/recd007.tcl
+++ b/storage/bdb/test/recd007.tcl
diff --git a/bdb/test/recd008.tcl b/storage/bdb/test/recd008.tcl
index 548813a403b..548813a403b 100644
--- a/bdb/test/recd008.tcl
+++ b/storage/bdb/test/recd008.tcl
diff --git a/bdb/test/recd009.tcl b/storage/bdb/test/recd009.tcl
index 5538d2d7652..5538d2d7652 100644
--- a/bdb/test/recd009.tcl
+++ b/storage/bdb/test/recd009.tcl
diff --git a/bdb/test/recd010.tcl b/storage/bdb/test/recd010.tcl
index 2549e03a2c0..2549e03a2c0 100644
--- a/bdb/test/recd010.tcl
+++ b/storage/bdb/test/recd010.tcl
diff --git a/bdb/test/recd011.tcl b/storage/bdb/test/recd011.tcl
index 74108a30650..74108a30650 100644
--- a/bdb/test/recd011.tcl
+++ b/storage/bdb/test/recd011.tcl
diff --git a/bdb/test/recd012.tcl b/storage/bdb/test/recd012.tcl
index 8231e648588..8231e648588 100644
--- a/bdb/test/recd012.tcl
+++ b/storage/bdb/test/recd012.tcl
diff --git a/bdb/test/recd013.tcl b/storage/bdb/test/recd013.tcl
index e08654f34e0..e08654f34e0 100644
--- a/bdb/test/recd013.tcl
+++ b/storage/bdb/test/recd013.tcl
diff --git a/bdb/test/recd014.tcl b/storage/bdb/test/recd014.tcl
index 6796341dca2..6796341dca2 100644
--- a/bdb/test/recd014.tcl
+++ b/storage/bdb/test/recd014.tcl
diff --git a/bdb/test/recd015.tcl b/storage/bdb/test/recd015.tcl
index 8c3ad612419..8c3ad612419 100644
--- a/bdb/test/recd015.tcl
+++ b/storage/bdb/test/recd015.tcl
diff --git a/bdb/test/recd016.tcl b/storage/bdb/test/recd016.tcl
index 504aca09617..504aca09617 100644
--- a/bdb/test/recd016.tcl
+++ b/storage/bdb/test/recd016.tcl
diff --git a/bdb/test/recd017.tcl b/storage/bdb/test/recd017.tcl
index 9f8208c1b3e..9f8208c1b3e 100644
--- a/bdb/test/recd017.tcl
+++ b/storage/bdb/test/recd017.tcl
diff --git a/bdb/test/recd018.tcl b/storage/bdb/test/recd018.tcl
index fb5a589d851..fb5a589d851 100644
--- a/bdb/test/recd018.tcl
+++ b/storage/bdb/test/recd018.tcl
diff --git a/bdb/test/recd019.tcl b/storage/bdb/test/recd019.tcl
index dd67b7dcb2a..dd67b7dcb2a 100644
--- a/bdb/test/recd019.tcl
+++ b/storage/bdb/test/recd019.tcl
diff --git a/bdb/test/recd020.tcl b/storage/bdb/test/recd020.tcl
index 93a89f32578..93a89f32578 100644
--- a/bdb/test/recd020.tcl
+++ b/storage/bdb/test/recd020.tcl
diff --git a/bdb/test/recd15scr.tcl b/storage/bdb/test/recd15scr.tcl
index e1238907a71..e1238907a71 100644
--- a/bdb/test/recd15scr.tcl
+++ b/storage/bdb/test/recd15scr.tcl
diff --git a/bdb/test/recdscript.tcl b/storage/bdb/test/recdscript.tcl
index a2afde46e4d..a2afde46e4d 100644
--- a/bdb/test/recdscript.tcl
+++ b/storage/bdb/test/recdscript.tcl
diff --git a/bdb/test/rep001.tcl b/storage/bdb/test/rep001.tcl
index 97a640029f5..97a640029f5 100644
--- a/bdb/test/rep001.tcl
+++ b/storage/bdb/test/rep001.tcl
diff --git a/bdb/test/rep002.tcl b/storage/bdb/test/rep002.tcl
index 68666b0d0f0..68666b0d0f0 100644
--- a/bdb/test/rep002.tcl
+++ b/storage/bdb/test/rep002.tcl
diff --git a/bdb/test/rep003.tcl b/storage/bdb/test/rep003.tcl
index 7bb7e00ddbf..7bb7e00ddbf 100644
--- a/bdb/test/rep003.tcl
+++ b/storage/bdb/test/rep003.tcl
diff --git a/bdb/test/rep004.tcl b/storage/bdb/test/rep004.tcl
index e1d4d3b65c7..e1d4d3b65c7 100644
--- a/bdb/test/rep004.tcl
+++ b/storage/bdb/test/rep004.tcl
diff --git a/bdb/test/rep005.tcl b/storage/bdb/test/rep005.tcl
index e0515f1cd62..e0515f1cd62 100644
--- a/bdb/test/rep005.tcl
+++ b/storage/bdb/test/rep005.tcl
diff --git a/bdb/test/reputils.tcl b/storage/bdb/test/reputils.tcl
index 340e359f26d..340e359f26d 100644
--- a/bdb/test/reputils.tcl
+++ b/storage/bdb/test/reputils.tcl
diff --git a/bdb/test/rpc001.tcl b/storage/bdb/test/rpc001.tcl
index 1b65639014f..1b65639014f 100644
--- a/bdb/test/rpc001.tcl
+++ b/storage/bdb/test/rpc001.tcl
diff --git a/bdb/test/rpc002.tcl b/storage/bdb/test/rpc002.tcl
index 4b69265bf3a..4b69265bf3a 100644
--- a/bdb/test/rpc002.tcl
+++ b/storage/bdb/test/rpc002.tcl
diff --git a/bdb/test/rpc003.tcl b/storage/bdb/test/rpc003.tcl
index 76f0dca6c07..76f0dca6c07 100644
--- a/bdb/test/rpc003.tcl
+++ b/storage/bdb/test/rpc003.tcl
diff --git a/bdb/test/rpc004.tcl b/storage/bdb/test/rpc004.tcl
index ca1462f3a89..ca1462f3a89 100644
--- a/bdb/test/rpc004.tcl
+++ b/storage/bdb/test/rpc004.tcl
diff --git a/bdb/test/rpc005.tcl b/storage/bdb/test/rpc005.tcl
index f46e7355e5a..f46e7355e5a 100644
--- a/bdb/test/rpc005.tcl
+++ b/storage/bdb/test/rpc005.tcl
diff --git a/bdb/test/rsrc001.tcl b/storage/bdb/test/rsrc001.tcl
index 1d57769fda2..1d57769fda2 100644
--- a/bdb/test/rsrc001.tcl
+++ b/storage/bdb/test/rsrc001.tcl
diff --git a/bdb/test/rsrc002.tcl b/storage/bdb/test/rsrc002.tcl
index 0cb3cf752e6..0cb3cf752e6 100644
--- a/bdb/test/rsrc002.tcl
+++ b/storage/bdb/test/rsrc002.tcl
diff --git a/bdb/test/rsrc003.tcl b/storage/bdb/test/rsrc003.tcl
index f357a1e7f80..f357a1e7f80 100644
--- a/bdb/test/rsrc003.tcl
+++ b/storage/bdb/test/rsrc003.tcl
diff --git a/bdb/test/rsrc004.tcl b/storage/bdb/test/rsrc004.tcl
index f6c2f997eb8..f6c2f997eb8 100644
--- a/bdb/test/rsrc004.tcl
+++ b/storage/bdb/test/rsrc004.tcl
diff --git a/bdb/test/scr001/chk.code b/storage/bdb/test/scr001/chk.code
index eb01d8614b3..eb01d8614b3 100644
--- a/bdb/test/scr001/chk.code
+++ b/storage/bdb/test/scr001/chk.code
diff --git a/bdb/test/scr002/chk.def b/storage/bdb/test/scr002/chk.def
index 7d5e6670f63..7d5e6670f63 100644
--- a/bdb/test/scr002/chk.def
+++ b/storage/bdb/test/scr002/chk.def
diff --git a/bdb/test/scr003/chk.define b/storage/bdb/test/scr003/chk.define
index f73355eddf6..f73355eddf6 100644
--- a/bdb/test/scr003/chk.define
+++ b/storage/bdb/test/scr003/chk.define
diff --git a/bdb/test/scr004/chk.javafiles b/storage/bdb/test/scr004/chk.javafiles
index d30c5e3e779..d30c5e3e779 100644
--- a/bdb/test/scr004/chk.javafiles
+++ b/storage/bdb/test/scr004/chk.javafiles
diff --git a/bdb/test/scr005/chk.nl b/storage/bdb/test/scr005/chk.nl
index 47c7ff74d4b..47c7ff74d4b 100644
--- a/bdb/test/scr005/chk.nl
+++ b/storage/bdb/test/scr005/chk.nl
diff --git a/bdb/test/scr006/chk.offt b/storage/bdb/test/scr006/chk.offt
index 6800268d2a2..6800268d2a2 100644
--- a/bdb/test/scr006/chk.offt
+++ b/storage/bdb/test/scr006/chk.offt
diff --git a/bdb/test/scr007/chk.proto b/storage/bdb/test/scr007/chk.proto
index ae406fa23fe..ae406fa23fe 100644
--- a/bdb/test/scr007/chk.proto
+++ b/storage/bdb/test/scr007/chk.proto
diff --git a/bdb/test/scr008/chk.pubdef b/storage/bdb/test/scr008/chk.pubdef
index 4f59e831b25..4f59e831b25 100644
--- a/bdb/test/scr008/chk.pubdef
+++ b/storage/bdb/test/scr008/chk.pubdef
diff --git a/bdb/test/scr009/chk.srcfiles b/storage/bdb/test/scr009/chk.srcfiles
index 4f09a2890f6..4f09a2890f6 100644
--- a/bdb/test/scr009/chk.srcfiles
+++ b/storage/bdb/test/scr009/chk.srcfiles
diff --git a/bdb/test/scr010/chk.str b/storage/bdb/test/scr010/chk.str
index 2b5698c0ff2..2b5698c0ff2 100644
--- a/bdb/test/scr010/chk.str
+++ b/storage/bdb/test/scr010/chk.str
diff --git a/bdb/test/scr010/spell.ok b/storage/bdb/test/scr010/spell.ok
index 18af8d1306d..18af8d1306d 100644
--- a/bdb/test/scr010/spell.ok
+++ b/storage/bdb/test/scr010/spell.ok
diff --git a/bdb/test/scr011/chk.tags b/storage/bdb/test/scr011/chk.tags
index 14a3c4e011d..14a3c4e011d 100644
--- a/bdb/test/scr011/chk.tags
+++ b/storage/bdb/test/scr011/chk.tags
diff --git a/bdb/test/scr012/chk.vx_code b/storage/bdb/test/scr012/chk.vx_code
index 8d7ca608f93..8d7ca608f93 100644
--- a/bdb/test/scr012/chk.vx_code
+++ b/storage/bdb/test/scr012/chk.vx_code
diff --git a/bdb/test/scr013/chk.stats b/storage/bdb/test/scr013/chk.stats
index 3a404699668..3a404699668 100644
--- a/bdb/test/scr013/chk.stats
+++ b/storage/bdb/test/scr013/chk.stats
diff --git a/bdb/test/scr014/chk.err b/storage/bdb/test/scr014/chk.err
index 72b4a62719f..72b4a62719f 100644
--- a/bdb/test/scr014/chk.err
+++ b/storage/bdb/test/scr014/chk.err
diff --git a/bdb/test/scr015/README b/storage/bdb/test/scr015/README
index 75a356eea06..75a356eea06 100644
--- a/bdb/test/scr015/README
+++ b/storage/bdb/test/scr015/README
diff --git a/bdb/test/scr015/TestConstruct01.cpp b/storage/bdb/test/scr015/TestConstruct01.cpp
index 7ae328d458c..7ae328d458c 100644
--- a/bdb/test/scr015/TestConstruct01.cpp
+++ b/storage/bdb/test/scr015/TestConstruct01.cpp
diff --git a/bdb/test/scr015/TestConstruct01.testerr b/storage/bdb/test/scr015/TestConstruct01.testerr
index 1ba627d103b..1ba627d103b 100644
--- a/bdb/test/scr015/TestConstruct01.testerr
+++ b/storage/bdb/test/scr015/TestConstruct01.testerr
diff --git a/bdb/test/scr015/TestConstruct01.testout b/storage/bdb/test/scr015/TestConstruct01.testout
index 9b840f9fcf4..9b840f9fcf4 100644
--- a/bdb/test/scr015/TestConstruct01.testout
+++ b/storage/bdb/test/scr015/TestConstruct01.testout
diff --git a/bdb/test/scr015/TestExceptInclude.cpp b/storage/bdb/test/scr015/TestExceptInclude.cpp
index 28bc498222f..28bc498222f 100644
--- a/bdb/test/scr015/TestExceptInclude.cpp
+++ b/storage/bdb/test/scr015/TestExceptInclude.cpp
diff --git a/bdb/test/scr015/TestGetSetMethods.cpp b/storage/bdb/test/scr015/TestGetSetMethods.cpp
index 81ef914eac3..81ef914eac3 100644
--- a/bdb/test/scr015/TestGetSetMethods.cpp
+++ b/storage/bdb/test/scr015/TestGetSetMethods.cpp
diff --git a/bdb/test/scr015/TestKeyRange.cpp b/storage/bdb/test/scr015/TestKeyRange.cpp
index 980d2f518e0..980d2f518e0 100644
--- a/bdb/test/scr015/TestKeyRange.cpp
+++ b/storage/bdb/test/scr015/TestKeyRange.cpp
diff --git a/bdb/test/scr015/TestKeyRange.testin b/storage/bdb/test/scr015/TestKeyRange.testin
index a2b6bd74e7b..a2b6bd74e7b 100644
--- a/bdb/test/scr015/TestKeyRange.testin
+++ b/storage/bdb/test/scr015/TestKeyRange.testin
diff --git a/bdb/test/scr015/TestKeyRange.testout b/storage/bdb/test/scr015/TestKeyRange.testout
index 25b2e1a835c..25b2e1a835c 100644
--- a/bdb/test/scr015/TestKeyRange.testout
+++ b/storage/bdb/test/scr015/TestKeyRange.testout
diff --git a/bdb/test/scr015/TestLogc.cpp b/storage/bdb/test/scr015/TestLogc.cpp
index 94fcfa0b3ec..94fcfa0b3ec 100644
--- a/bdb/test/scr015/TestLogc.cpp
+++ b/storage/bdb/test/scr015/TestLogc.cpp
diff --git a/bdb/test/scr015/TestLogc.testout b/storage/bdb/test/scr015/TestLogc.testout
index afac3af7eda..afac3af7eda 100644
--- a/bdb/test/scr015/TestLogc.testout
+++ b/storage/bdb/test/scr015/TestLogc.testout
diff --git a/bdb/test/scr015/TestSimpleAccess.cpp b/storage/bdb/test/scr015/TestSimpleAccess.cpp
index 2450b9b3030..2450b9b3030 100644
--- a/bdb/test/scr015/TestSimpleAccess.cpp
+++ b/storage/bdb/test/scr015/TestSimpleAccess.cpp
diff --git a/bdb/test/scr015/TestSimpleAccess.testout b/storage/bdb/test/scr015/TestSimpleAccess.testout
index dc88d4788e4..dc88d4788e4 100644
--- a/bdb/test/scr015/TestSimpleAccess.testout
+++ b/storage/bdb/test/scr015/TestSimpleAccess.testout
diff --git a/bdb/test/scr015/TestTruncate.cpp b/storage/bdb/test/scr015/TestTruncate.cpp
index d5c0dc6de29..d5c0dc6de29 100644
--- a/bdb/test/scr015/TestTruncate.cpp
+++ b/storage/bdb/test/scr015/TestTruncate.cpp
diff --git a/bdb/test/scr015/TestTruncate.testout b/storage/bdb/test/scr015/TestTruncate.testout
index 0a4bc98165d..0a4bc98165d 100644
--- a/bdb/test/scr015/TestTruncate.testout
+++ b/storage/bdb/test/scr015/TestTruncate.testout
diff --git a/bdb/test/scr015/chk.cxxtests b/storage/bdb/test/scr015/chk.cxxtests
index 5c21e27208c..5c21e27208c 100644
--- a/bdb/test/scr015/chk.cxxtests
+++ b/storage/bdb/test/scr015/chk.cxxtests
diff --git a/bdb/test/scr015/ignore b/storage/bdb/test/scr015/ignore
index 55ce82ae372..55ce82ae372 100644
--- a/bdb/test/scr015/ignore
+++ b/storage/bdb/test/scr015/ignore
diff --git a/bdb/test/scr015/testall b/storage/bdb/test/scr015/testall
index a2d493a8b22..a2d493a8b22 100644
--- a/bdb/test/scr015/testall
+++ b/storage/bdb/test/scr015/testall
diff --git a/bdb/test/scr015/testone b/storage/bdb/test/scr015/testone
index 3bbba3f90f0..3bbba3f90f0 100644
--- a/bdb/test/scr015/testone
+++ b/storage/bdb/test/scr015/testone
diff --git a/bdb/test/scr016/CallbackTest.java b/storage/bdb/test/scr016/CallbackTest.java
index eede964a027..eede964a027 100644
--- a/bdb/test/scr016/CallbackTest.java
+++ b/storage/bdb/test/scr016/CallbackTest.java
diff --git a/bdb/test/scr016/CallbackTest.testout b/storage/bdb/test/scr016/CallbackTest.testout
index 68797d4a2de..68797d4a2de 100644
--- a/bdb/test/scr016/CallbackTest.testout
+++ b/storage/bdb/test/scr016/CallbackTest.testout
diff --git a/bdb/test/scr016/README b/storage/bdb/test/scr016/README
index 226a8aa3b77..226a8aa3b77 100644
--- a/bdb/test/scr016/README
+++ b/storage/bdb/test/scr016/README
diff --git a/bdb/test/scr016/TestAppendRecno.java b/storage/bdb/test/scr016/TestAppendRecno.java
index f4ea70ca084..f4ea70ca084 100644
--- a/bdb/test/scr016/TestAppendRecno.java
+++ b/storage/bdb/test/scr016/TestAppendRecno.java
diff --git a/bdb/test/scr016/TestAppendRecno.testout b/storage/bdb/test/scr016/TestAppendRecno.testout
index 970174e7a96..970174e7a96 100644
--- a/bdb/test/scr016/TestAppendRecno.testout
+++ b/storage/bdb/test/scr016/TestAppendRecno.testout
diff --git a/bdb/test/scr016/TestAssociate.java b/storage/bdb/test/scr016/TestAssociate.java
index 4105b9cb0a1..4105b9cb0a1 100644
--- a/bdb/test/scr016/TestAssociate.java
+++ b/storage/bdb/test/scr016/TestAssociate.java
diff --git a/bdb/test/scr016/TestAssociate.testout b/storage/bdb/test/scr016/TestAssociate.testout
index 34414b660d1..34414b660d1 100644
--- a/bdb/test/scr016/TestAssociate.testout
+++ b/storage/bdb/test/scr016/TestAssociate.testout
diff --git a/bdb/test/scr016/TestClosedDb.java b/storage/bdb/test/scr016/TestClosedDb.java
index 3bd6e5380f8..3bd6e5380f8 100644
--- a/bdb/test/scr016/TestClosedDb.java
+++ b/storage/bdb/test/scr016/TestClosedDb.java
diff --git a/bdb/test/scr016/TestClosedDb.testout b/storage/bdb/test/scr016/TestClosedDb.testout
index ce13883f63a..ce13883f63a 100644
--- a/bdb/test/scr016/TestClosedDb.testout
+++ b/storage/bdb/test/scr016/TestClosedDb.testout
diff --git a/bdb/test/scr016/TestConstruct01.java b/storage/bdb/test/scr016/TestConstruct01.java
index b60073ebc0d..b60073ebc0d 100644
--- a/bdb/test/scr016/TestConstruct01.java
+++ b/storage/bdb/test/scr016/TestConstruct01.java
diff --git a/bdb/test/scr016/TestConstruct01.testerr b/storage/bdb/test/scr016/TestConstruct01.testerr
index e69de29bb2d..e69de29bb2d 100644
--- a/bdb/test/scr016/TestConstruct01.testerr
+++ b/storage/bdb/test/scr016/TestConstruct01.testerr
diff --git a/bdb/test/scr016/TestConstruct01.testout b/storage/bdb/test/scr016/TestConstruct01.testout
index 5d2041cd197..5d2041cd197 100644
--- a/bdb/test/scr016/TestConstruct01.testout
+++ b/storage/bdb/test/scr016/TestConstruct01.testout
diff --git a/bdb/test/scr016/TestConstruct02.java b/storage/bdb/test/scr016/TestConstruct02.java
index 5bbb55ccd56..5bbb55ccd56 100644
--- a/bdb/test/scr016/TestConstruct02.java
+++ b/storage/bdb/test/scr016/TestConstruct02.java
diff --git a/bdb/test/scr016/TestConstruct02.testout b/storage/bdb/test/scr016/TestConstruct02.testout
index 5d2041cd197..5d2041cd197 100644
--- a/bdb/test/scr016/TestConstruct02.testout
+++ b/storage/bdb/test/scr016/TestConstruct02.testout
diff --git a/bdb/test/scr016/TestDbtFlags.java b/storage/bdb/test/scr016/TestDbtFlags.java
index 98527e6b3e7..98527e6b3e7 100644
--- a/bdb/test/scr016/TestDbtFlags.java
+++ b/storage/bdb/test/scr016/TestDbtFlags.java
diff --git a/bdb/test/scr016/TestDbtFlags.testerr b/storage/bdb/test/scr016/TestDbtFlags.testerr
index 7666868ebd4..7666868ebd4 100644
--- a/bdb/test/scr016/TestDbtFlags.testerr
+++ b/storage/bdb/test/scr016/TestDbtFlags.testerr
diff --git a/bdb/test/scr016/TestDbtFlags.testout b/storage/bdb/test/scr016/TestDbtFlags.testout
index b8deb1bcc16..b8deb1bcc16 100644
--- a/bdb/test/scr016/TestDbtFlags.testout
+++ b/storage/bdb/test/scr016/TestDbtFlags.testout
diff --git a/bdb/test/scr016/TestGetSetMethods.java b/storage/bdb/test/scr016/TestGetSetMethods.java
index a1b2722d8fd..a1b2722d8fd 100644
--- a/bdb/test/scr016/TestGetSetMethods.java
+++ b/storage/bdb/test/scr016/TestGetSetMethods.java
diff --git a/bdb/test/scr016/TestKeyRange.java b/storage/bdb/test/scr016/TestKeyRange.java
index 8eda2de426f..8eda2de426f 100644
--- a/bdb/test/scr016/TestKeyRange.java
+++ b/storage/bdb/test/scr016/TestKeyRange.java
diff --git a/bdb/test/scr016/TestKeyRange.testout b/storage/bdb/test/scr016/TestKeyRange.testout
index c265f3289fb..c265f3289fb 100644
--- a/bdb/test/scr016/TestKeyRange.testout
+++ b/storage/bdb/test/scr016/TestKeyRange.testout
diff --git a/bdb/test/scr016/TestLockVec.java b/storage/bdb/test/scr016/TestLockVec.java
index ad48e9f2f9a..ad48e9f2f9a 100644
--- a/bdb/test/scr016/TestLockVec.java
+++ b/storage/bdb/test/scr016/TestLockVec.java
diff --git a/bdb/test/scr016/TestLockVec.testout b/storage/bdb/test/scr016/TestLockVec.testout
index 1cf16c6ac4e..1cf16c6ac4e 100644
--- a/bdb/test/scr016/TestLockVec.testout
+++ b/storage/bdb/test/scr016/TestLockVec.testout
diff --git a/bdb/test/scr016/TestLogc.java b/storage/bdb/test/scr016/TestLogc.java
index ec9c373a93b..ec9c373a93b 100644
--- a/bdb/test/scr016/TestLogc.java
+++ b/storage/bdb/test/scr016/TestLogc.java
diff --git a/bdb/test/scr016/TestLogc.testout b/storage/bdb/test/scr016/TestLogc.testout
index afac3af7eda..afac3af7eda 100644
--- a/bdb/test/scr016/TestLogc.testout
+++ b/storage/bdb/test/scr016/TestLogc.testout
diff --git a/bdb/test/scr016/TestOpenEmpty.java b/storage/bdb/test/scr016/TestOpenEmpty.java
index ae92fd363d9..ae92fd363d9 100644
--- a/bdb/test/scr016/TestOpenEmpty.java
+++ b/storage/bdb/test/scr016/TestOpenEmpty.java
diff --git a/bdb/test/scr016/TestOpenEmpty.testerr b/storage/bdb/test/scr016/TestOpenEmpty.testerr
index dd3e01c7ab7..dd3e01c7ab7 100644
--- a/bdb/test/scr016/TestOpenEmpty.testerr
+++ b/storage/bdb/test/scr016/TestOpenEmpty.testerr
diff --git a/bdb/test/scr016/TestReplication.java b/storage/bdb/test/scr016/TestReplication.java
index 87cb683d60f..87cb683d60f 100644
--- a/bdb/test/scr016/TestReplication.java
+++ b/storage/bdb/test/scr016/TestReplication.java
diff --git a/bdb/test/scr016/TestRpcServer.java b/storage/bdb/test/scr016/TestRpcServer.java
index ef325cef075..ef325cef075 100644
--- a/bdb/test/scr016/TestRpcServer.java
+++ b/storage/bdb/test/scr016/TestRpcServer.java
diff --git a/bdb/test/scr016/TestSameDbt.java b/storage/bdb/test/scr016/TestSameDbt.java
index 9866ed49307..9866ed49307 100644
--- a/bdb/test/scr016/TestSameDbt.java
+++ b/storage/bdb/test/scr016/TestSameDbt.java
diff --git a/bdb/test/scr016/TestSameDbt.testout b/storage/bdb/test/scr016/TestSameDbt.testout
index be4bbbe59e9..be4bbbe59e9 100644
--- a/bdb/test/scr016/TestSameDbt.testout
+++ b/storage/bdb/test/scr016/TestSameDbt.testout
diff --git a/bdb/test/scr016/TestSimpleAccess.java b/storage/bdb/test/scr016/TestSimpleAccess.java
index ba7390cada1..ba7390cada1 100644
--- a/bdb/test/scr016/TestSimpleAccess.java
+++ b/storage/bdb/test/scr016/TestSimpleAccess.java
diff --git a/bdb/test/scr016/TestSimpleAccess.testout b/storage/bdb/test/scr016/TestSimpleAccess.testout
index dc88d4788e4..dc88d4788e4 100644
--- a/bdb/test/scr016/TestSimpleAccess.testout
+++ b/storage/bdb/test/scr016/TestSimpleAccess.testout
diff --git a/bdb/test/scr016/TestStat.java b/storage/bdb/test/scr016/TestStat.java
index 55ba9823115..55ba9823115 100644
--- a/bdb/test/scr016/TestStat.java
+++ b/storage/bdb/test/scr016/TestStat.java
diff --git a/bdb/test/scr016/TestStat.testout b/storage/bdb/test/scr016/TestStat.testout
index caf9db1fb13..caf9db1fb13 100644
--- a/bdb/test/scr016/TestStat.testout
+++ b/storage/bdb/test/scr016/TestStat.testout
diff --git a/bdb/test/scr016/TestTruncate.java b/storage/bdb/test/scr016/TestTruncate.java
index 71377236246..71377236246 100644
--- a/bdb/test/scr016/TestTruncate.java
+++ b/storage/bdb/test/scr016/TestTruncate.java
diff --git a/bdb/test/scr016/TestTruncate.testout b/storage/bdb/test/scr016/TestTruncate.testout
index 23f291df754..23f291df754 100644
--- a/bdb/test/scr016/TestTruncate.testout
+++ b/storage/bdb/test/scr016/TestTruncate.testout
diff --git a/bdb/test/scr016/TestUtil.java b/storage/bdb/test/scr016/TestUtil.java
index 1bddfb0b014..1bddfb0b014 100644
--- a/bdb/test/scr016/TestUtil.java
+++ b/storage/bdb/test/scr016/TestUtil.java
diff --git a/bdb/test/scr016/TestXAServlet.java b/storage/bdb/test/scr016/TestXAServlet.java
index 8b9fe57e261..8b9fe57e261 100644
--- a/bdb/test/scr016/TestXAServlet.java
+++ b/storage/bdb/test/scr016/TestXAServlet.java
diff --git a/bdb/test/scr016/chk.javatests b/storage/bdb/test/scr016/chk.javatests
index 34d7dfe78d7..34d7dfe78d7 100644
--- a/bdb/test/scr016/chk.javatests
+++ b/storage/bdb/test/scr016/chk.javatests
diff --git a/bdb/test/scr016/ignore b/storage/bdb/test/scr016/ignore
index 1dfaf6adea4..1dfaf6adea4 100644
--- a/bdb/test/scr016/ignore
+++ b/storage/bdb/test/scr016/ignore
diff --git a/bdb/test/scr016/testall b/storage/bdb/test/scr016/testall
index a4e1b5a8c70..a4e1b5a8c70 100644
--- a/bdb/test/scr016/testall
+++ b/storage/bdb/test/scr016/testall
diff --git a/bdb/test/scr016/testone b/storage/bdb/test/scr016/testone
index 5f5d2e0017d..5f5d2e0017d 100644
--- a/bdb/test/scr016/testone
+++ b/storage/bdb/test/scr016/testone
diff --git a/bdb/test/scr017/O.BH b/storage/bdb/test/scr017/O.BH
index cd499d38779..cd499d38779 100644
--- a/bdb/test/scr017/O.BH
+++ b/storage/bdb/test/scr017/O.BH
diff --git a/bdb/test/scr017/O.R b/storage/bdb/test/scr017/O.R
index d78a04727d8..d78a04727d8 100644
--- a/bdb/test/scr017/O.R
+++ b/storage/bdb/test/scr017/O.R
diff --git a/bdb/test/scr017/chk.db185 b/storage/bdb/test/scr017/chk.db185
index c2a07c51d26..c2a07c51d26 100644
--- a/bdb/test/scr017/chk.db185
+++ b/storage/bdb/test/scr017/chk.db185
diff --git a/bdb/test/scr017/t.c b/storage/bdb/test/scr017/t.c
index f03b33880d6..f03b33880d6 100644
--- a/bdb/test/scr017/t.c
+++ b/storage/bdb/test/scr017/t.c
diff --git a/bdb/test/scr018/chk.comma b/storage/bdb/test/scr018/chk.comma
index 42df48d1881..42df48d1881 100644
--- a/bdb/test/scr018/chk.comma
+++ b/storage/bdb/test/scr018/chk.comma
diff --git a/bdb/test/scr018/t.c b/storage/bdb/test/scr018/t.c
index 4056a605928..4056a605928 100644
--- a/bdb/test/scr018/t.c
+++ b/storage/bdb/test/scr018/t.c
diff --git a/bdb/test/scr019/chk.include b/storage/bdb/test/scr019/chk.include
index 444217bedb4..444217bedb4 100644
--- a/bdb/test/scr019/chk.include
+++ b/storage/bdb/test/scr019/chk.include
diff --git a/bdb/test/scr020/chk.inc b/storage/bdb/test/scr020/chk.inc
index 189126b10c3..189126b10c3 100644
--- a/bdb/test/scr020/chk.inc
+++ b/storage/bdb/test/scr020/chk.inc
diff --git a/bdb/test/scr021/chk.flags b/storage/bdb/test/scr021/chk.flags
index 1b2bb62cca7..1b2bb62cca7 100644
--- a/bdb/test/scr021/chk.flags
+++ b/storage/bdb/test/scr021/chk.flags
diff --git a/bdb/test/scr022/chk.rr b/storage/bdb/test/scr022/chk.rr
index df230315299..df230315299 100644
--- a/bdb/test/scr022/chk.rr
+++ b/storage/bdb/test/scr022/chk.rr
diff --git a/bdb/test/sdb001.tcl b/storage/bdb/test/sdb001.tcl
index a03160e0ab7..a03160e0ab7 100644
--- a/bdb/test/sdb001.tcl
+++ b/storage/bdb/test/sdb001.tcl
diff --git a/bdb/test/sdb002.tcl b/storage/bdb/test/sdb002.tcl
index 4757e12afc7..4757e12afc7 100644
--- a/bdb/test/sdb002.tcl
+++ b/storage/bdb/test/sdb002.tcl
diff --git a/bdb/test/sdb003.tcl b/storage/bdb/test/sdb003.tcl
index 5d1536d8c84..5d1536d8c84 100644
--- a/bdb/test/sdb003.tcl
+++ b/storage/bdb/test/sdb003.tcl
diff --git a/bdb/test/sdb004.tcl b/storage/bdb/test/sdb004.tcl
index d3d95f1fde0..d3d95f1fde0 100644
--- a/bdb/test/sdb004.tcl
+++ b/storage/bdb/test/sdb004.tcl
diff --git a/bdb/test/sdb005.tcl b/storage/bdb/test/sdb005.tcl
index 98cea5b348b..98cea5b348b 100644
--- a/bdb/test/sdb005.tcl
+++ b/storage/bdb/test/sdb005.tcl
diff --git a/bdb/test/sdb006.tcl b/storage/bdb/test/sdb006.tcl
index fd6066b08d6..fd6066b08d6 100644
--- a/bdb/test/sdb006.tcl
+++ b/storage/bdb/test/sdb006.tcl
diff --git a/bdb/test/sdb007.tcl b/storage/bdb/test/sdb007.tcl
index 0f9488a92a1..0f9488a92a1 100644
--- a/bdb/test/sdb007.tcl
+++ b/storage/bdb/test/sdb007.tcl
diff --git a/bdb/test/sdb008.tcl b/storage/bdb/test/sdb008.tcl
index 1c46aed2087..1c46aed2087 100644
--- a/bdb/test/sdb008.tcl
+++ b/storage/bdb/test/sdb008.tcl
diff --git a/bdb/test/sdb009.tcl b/storage/bdb/test/sdb009.tcl
index 4e4869643ef..4e4869643ef 100644
--- a/bdb/test/sdb009.tcl
+++ b/storage/bdb/test/sdb009.tcl
diff --git a/bdb/test/sdb010.tcl b/storage/bdb/test/sdb010.tcl
index 51f25976c56..51f25976c56 100644
--- a/bdb/test/sdb010.tcl
+++ b/storage/bdb/test/sdb010.tcl
diff --git a/bdb/test/sdb011.tcl b/storage/bdb/test/sdb011.tcl
index 862e32f73ed..862e32f73ed 100644
--- a/bdb/test/sdb011.tcl
+++ b/storage/bdb/test/sdb011.tcl
diff --git a/bdb/test/sdb012.tcl b/storage/bdb/test/sdb012.tcl
index 9c05d977daf..9c05d977daf 100644
--- a/bdb/test/sdb012.tcl
+++ b/storage/bdb/test/sdb012.tcl
diff --git a/bdb/test/sdbscript.tcl b/storage/bdb/test/sdbscript.tcl
index d1978ccb048..d1978ccb048 100644
--- a/bdb/test/sdbscript.tcl
+++ b/storage/bdb/test/sdbscript.tcl
diff --git a/bdb/test/sdbtest001.tcl b/storage/bdb/test/sdbtest001.tcl
index b8b4508c2a4..b8b4508c2a4 100644
--- a/bdb/test/sdbtest001.tcl
+++ b/storage/bdb/test/sdbtest001.tcl
diff --git a/bdb/test/sdbtest002.tcl b/storage/bdb/test/sdbtest002.tcl
index 95717413a7b..95717413a7b 100644
--- a/bdb/test/sdbtest002.tcl
+++ b/storage/bdb/test/sdbtest002.tcl
diff --git a/bdb/test/sdbutils.tcl b/storage/bdb/test/sdbutils.tcl
index 3221a422e18..3221a422e18 100644
--- a/bdb/test/sdbutils.tcl
+++ b/storage/bdb/test/sdbutils.tcl
diff --git a/bdb/test/sec001.tcl b/storage/bdb/test/sec001.tcl
index eb4bcc24dd2..eb4bcc24dd2 100644
--- a/bdb/test/sec001.tcl
+++ b/storage/bdb/test/sec001.tcl
diff --git a/bdb/test/sec002.tcl b/storage/bdb/test/sec002.tcl
index d790162f1d7..d790162f1d7 100644
--- a/bdb/test/sec002.tcl
+++ b/storage/bdb/test/sec002.tcl
diff --git a/bdb/test/shelltest.tcl b/storage/bdb/test/shelltest.tcl
index 6190bac1f8d..6190bac1f8d 100644
--- a/bdb/test/shelltest.tcl
+++ b/storage/bdb/test/shelltest.tcl
diff --git a/bdb/test/si001.tcl b/storage/bdb/test/si001.tcl
index 1a2247c5f8b..1a2247c5f8b 100644
--- a/bdb/test/si001.tcl
+++ b/storage/bdb/test/si001.tcl
diff --git a/bdb/test/si002.tcl b/storage/bdb/test/si002.tcl
index 46ba86e7560..46ba86e7560 100644
--- a/bdb/test/si002.tcl
+++ b/storage/bdb/test/si002.tcl
diff --git a/bdb/test/si003.tcl b/storage/bdb/test/si003.tcl
index 1cc8c884e75..1cc8c884e75 100644
--- a/bdb/test/si003.tcl
+++ b/storage/bdb/test/si003.tcl
diff --git a/bdb/test/si004.tcl b/storage/bdb/test/si004.tcl
index 291100da6b3..291100da6b3 100644
--- a/bdb/test/si004.tcl
+++ b/storage/bdb/test/si004.tcl
diff --git a/bdb/test/si005.tcl b/storage/bdb/test/si005.tcl
index e5ed49175c9..e5ed49175c9 100644
--- a/bdb/test/si005.tcl
+++ b/storage/bdb/test/si005.tcl
diff --git a/bdb/test/si006.tcl b/storage/bdb/test/si006.tcl
index 3a1dbb3c4f8..3a1dbb3c4f8 100644
--- a/bdb/test/si006.tcl
+++ b/storage/bdb/test/si006.tcl
diff --git a/bdb/test/sindex.tcl b/storage/bdb/test/sindex.tcl
index fc2a0fc2f31..fc2a0fc2f31 100644
--- a/bdb/test/sindex.tcl
+++ b/storage/bdb/test/sindex.tcl
diff --git a/bdb/test/sysscript.tcl b/storage/bdb/test/sysscript.tcl
index 810b0df6cef..810b0df6cef 100644
--- a/bdb/test/sysscript.tcl
+++ b/storage/bdb/test/sysscript.tcl
diff --git a/bdb/test/test.tcl b/storage/bdb/test/test.tcl
index 10ee9425b7a..10ee9425b7a 100644
--- a/bdb/test/test.tcl
+++ b/storage/bdb/test/test.tcl
diff --git a/bdb/test/test001.tcl b/storage/bdb/test/test001.tcl
index f0b562bbf24..f0b562bbf24 100644
--- a/bdb/test/test001.tcl
+++ b/storage/bdb/test/test001.tcl
diff --git a/bdb/test/test002.tcl b/storage/bdb/test/test002.tcl
index bc28994d6a7..bc28994d6a7 100644
--- a/bdb/test/test002.tcl
+++ b/storage/bdb/test/test002.tcl
diff --git a/bdb/test/test003.tcl b/storage/bdb/test/test003.tcl
index c7bfe6c15ad..c7bfe6c15ad 100644
--- a/bdb/test/test003.tcl
+++ b/storage/bdb/test/test003.tcl
diff --git a/bdb/test/test004.tcl b/storage/bdb/test/test004.tcl
index 7bea6f88eca..7bea6f88eca 100644
--- a/bdb/test/test004.tcl
+++ b/storage/bdb/test/test004.tcl
diff --git a/bdb/test/test005.tcl b/storage/bdb/test/test005.tcl
index f3e37f2149d..f3e37f2149d 100644
--- a/bdb/test/test005.tcl
+++ b/storage/bdb/test/test005.tcl
diff --git a/bdb/test/test006.tcl b/storage/bdb/test/test006.tcl
index fbaebfe8ac8..fbaebfe8ac8 100644
--- a/bdb/test/test006.tcl
+++ b/storage/bdb/test/test006.tcl
diff --git a/bdb/test/test007.tcl b/storage/bdb/test/test007.tcl
index 1e99d107a2d..1e99d107a2d 100644
--- a/bdb/test/test007.tcl
+++ b/storage/bdb/test/test007.tcl
diff --git a/bdb/test/test008.tcl b/storage/bdb/test/test008.tcl
index 0af97a40110..0af97a40110 100644
--- a/bdb/test/test008.tcl
+++ b/storage/bdb/test/test008.tcl
diff --git a/bdb/test/test009.tcl b/storage/bdb/test/test009.tcl
index 7ef46d8c818..7ef46d8c818 100644
--- a/bdb/test/test009.tcl
+++ b/storage/bdb/test/test009.tcl
diff --git a/bdb/test/test010.tcl b/storage/bdb/test/test010.tcl
index 0b5f5531795..0b5f5531795 100644
--- a/bdb/test/test010.tcl
+++ b/storage/bdb/test/test010.tcl
diff --git a/bdb/test/test011.tcl b/storage/bdb/test/test011.tcl
index 63e2203efe4..63e2203efe4 100644
--- a/bdb/test/test011.tcl
+++ b/storage/bdb/test/test011.tcl
diff --git a/bdb/test/test012.tcl b/storage/bdb/test/test012.tcl
index e7237d27267..e7237d27267 100644
--- a/bdb/test/test012.tcl
+++ b/storage/bdb/test/test012.tcl
diff --git a/bdb/test/test013.tcl b/storage/bdb/test/test013.tcl
index 96d7757b0d8..96d7757b0d8 100644
--- a/bdb/test/test013.tcl
+++ b/storage/bdb/test/test013.tcl
diff --git a/bdb/test/test014.tcl b/storage/bdb/test/test014.tcl
index 00d69d3352e..00d69d3352e 100644
--- a/bdb/test/test014.tcl
+++ b/storage/bdb/test/test014.tcl
diff --git a/bdb/test/test015.tcl b/storage/bdb/test/test015.tcl
index f129605a405..f129605a405 100644
--- a/bdb/test/test015.tcl
+++ b/storage/bdb/test/test015.tcl
diff --git a/bdb/test/test016.tcl b/storage/bdb/test/test016.tcl
index af289f866f4..af289f866f4 100644
--- a/bdb/test/test016.tcl
+++ b/storage/bdb/test/test016.tcl
diff --git a/bdb/test/test017.tcl b/storage/bdb/test/test017.tcl
index 1f99aa328fb..1f99aa328fb 100644
--- a/bdb/test/test017.tcl
+++ b/storage/bdb/test/test017.tcl
diff --git a/bdb/test/test018.tcl b/storage/bdb/test/test018.tcl
index 8fc8a14e95e..8fc8a14e95e 100644
--- a/bdb/test/test018.tcl
+++ b/storage/bdb/test/test018.tcl
diff --git a/bdb/test/test019.tcl b/storage/bdb/test/test019.tcl
index aa3a58a0bcd..aa3a58a0bcd 100644
--- a/bdb/test/test019.tcl
+++ b/storage/bdb/test/test019.tcl
diff --git a/bdb/test/test020.tcl b/storage/bdb/test/test020.tcl
index 9b6d939acad..9b6d939acad 100644
--- a/bdb/test/test020.tcl
+++ b/storage/bdb/test/test020.tcl
diff --git a/bdb/test/test021.tcl b/storage/bdb/test/test021.tcl
index 56936da389a..56936da389a 100644
--- a/bdb/test/test021.tcl
+++ b/storage/bdb/test/test021.tcl
diff --git a/bdb/test/test022.tcl b/storage/bdb/test/test022.tcl
index d25d7ecdffe..d25d7ecdffe 100644
--- a/bdb/test/test022.tcl
+++ b/storage/bdb/test/test022.tcl
diff --git a/bdb/test/test023.tcl b/storage/bdb/test/test023.tcl
index c37539a0f55..c37539a0f55 100644
--- a/bdb/test/test023.tcl
+++ b/storage/bdb/test/test023.tcl
diff --git a/bdb/test/test024.tcl b/storage/bdb/test/test024.tcl
index bbdc8fb2253..bbdc8fb2253 100644
--- a/bdb/test/test024.tcl
+++ b/storage/bdb/test/test024.tcl
diff --git a/bdb/test/test025.tcl b/storage/bdb/test/test025.tcl
index 180a1aa2939..180a1aa2939 100644
--- a/bdb/test/test025.tcl
+++ b/storage/bdb/test/test025.tcl
diff --git a/bdb/test/test026.tcl b/storage/bdb/test/test026.tcl
index ce65e925d35..ce65e925d35 100644
--- a/bdb/test/test026.tcl
+++ b/storage/bdb/test/test026.tcl
diff --git a/bdb/test/test027.tcl b/storage/bdb/test/test027.tcl
index a0f6dfa4dcb..a0f6dfa4dcb 100644
--- a/bdb/test/test027.tcl
+++ b/storage/bdb/test/test027.tcl
diff --git a/bdb/test/test028.tcl b/storage/bdb/test/test028.tcl
index a546744fdac..a546744fdac 100644
--- a/bdb/test/test028.tcl
+++ b/storage/bdb/test/test028.tcl
diff --git a/bdb/test/test029.tcl b/storage/bdb/test/test029.tcl
index 8e4b8aa6e41..8e4b8aa6e41 100644
--- a/bdb/test/test029.tcl
+++ b/storage/bdb/test/test029.tcl
diff --git a/bdb/test/test030.tcl b/storage/bdb/test/test030.tcl
index d91359f07a0..d91359f07a0 100644
--- a/bdb/test/test030.tcl
+++ b/storage/bdb/test/test030.tcl
diff --git a/bdb/test/test031.tcl b/storage/bdb/test/test031.tcl
index 0006deb2d99..0006deb2d99 100644
--- a/bdb/test/test031.tcl
+++ b/storage/bdb/test/test031.tcl
diff --git a/bdb/test/test032.tcl b/storage/bdb/test/test032.tcl
index 2076b744851..2076b744851 100644
--- a/bdb/test/test032.tcl
+++ b/storage/bdb/test/test032.tcl
diff --git a/bdb/test/test033.tcl b/storage/bdb/test/test033.tcl
index a7796ce99d6..a7796ce99d6 100644
--- a/bdb/test/test033.tcl
+++ b/storage/bdb/test/test033.tcl
diff --git a/bdb/test/test034.tcl b/storage/bdb/test/test034.tcl
index 647ad940815..647ad940815 100644
--- a/bdb/test/test034.tcl
+++ b/storage/bdb/test/test034.tcl
diff --git a/bdb/test/test035.tcl b/storage/bdb/test/test035.tcl
index 06796b1e9aa..06796b1e9aa 100644
--- a/bdb/test/test035.tcl
+++ b/storage/bdb/test/test035.tcl
diff --git a/bdb/test/test036.tcl b/storage/bdb/test/test036.tcl
index 4e54f363ff8..4e54f363ff8 100644
--- a/bdb/test/test036.tcl
+++ b/storage/bdb/test/test036.tcl
diff --git a/bdb/test/test037.tcl b/storage/bdb/test/test037.tcl
index 0b2e2989949..0b2e2989949 100644
--- a/bdb/test/test037.tcl
+++ b/storage/bdb/test/test037.tcl
diff --git a/bdb/test/test038.tcl b/storage/bdb/test/test038.tcl
index 3babde8fe0b..3babde8fe0b 100644
--- a/bdb/test/test038.tcl
+++ b/storage/bdb/test/test038.tcl
diff --git a/bdb/test/test039.tcl b/storage/bdb/test/test039.tcl
index 2bbc83ebe05..2bbc83ebe05 100644
--- a/bdb/test/test039.tcl
+++ b/storage/bdb/test/test039.tcl
diff --git a/bdb/test/test040.tcl b/storage/bdb/test/test040.tcl
index 1856f78fc2e..1856f78fc2e 100644
--- a/bdb/test/test040.tcl
+++ b/storage/bdb/test/test040.tcl
diff --git a/bdb/test/test041.tcl b/storage/bdb/test/test041.tcl
index fdcbdbef3d7..fdcbdbef3d7 100644
--- a/bdb/test/test041.tcl
+++ b/storage/bdb/test/test041.tcl
diff --git a/bdb/test/test042.tcl b/storage/bdb/test/test042.tcl
index 9f444b8349c..9f444b8349c 100644
--- a/bdb/test/test042.tcl
+++ b/storage/bdb/test/test042.tcl
diff --git a/bdb/test/test043.tcl b/storage/bdb/test/test043.tcl
index eea7ec86d54..eea7ec86d54 100644
--- a/bdb/test/test043.tcl
+++ b/storage/bdb/test/test043.tcl
diff --git a/bdb/test/test044.tcl b/storage/bdb/test/test044.tcl
index 67cf3ea24b8..67cf3ea24b8 100644
--- a/bdb/test/test044.tcl
+++ b/storage/bdb/test/test044.tcl
diff --git a/bdb/test/test045.tcl b/storage/bdb/test/test045.tcl
index 3825135facd..3825135facd 100644
--- a/bdb/test/test045.tcl
+++ b/storage/bdb/test/test045.tcl
diff --git a/bdb/test/test046.tcl b/storage/bdb/test/test046.tcl
index 4136f30aaa7..4136f30aaa7 100644
--- a/bdb/test/test046.tcl
+++ b/storage/bdb/test/test046.tcl
diff --git a/bdb/test/test047.tcl b/storage/bdb/test/test047.tcl
index 61c1d0864c5..61c1d0864c5 100644
--- a/bdb/test/test047.tcl
+++ b/storage/bdb/test/test047.tcl
diff --git a/bdb/test/test048.tcl b/storage/bdb/test/test048.tcl
index 2131f6f553c..2131f6f553c 100644
--- a/bdb/test/test048.tcl
+++ b/storage/bdb/test/test048.tcl
diff --git a/bdb/test/test049.tcl b/storage/bdb/test/test049.tcl
index 3040727c469..3040727c469 100644
--- a/bdb/test/test049.tcl
+++ b/storage/bdb/test/test049.tcl
diff --git a/bdb/test/test050.tcl b/storage/bdb/test/test050.tcl
index dfaeddd035c..dfaeddd035c 100644
--- a/bdb/test/test050.tcl
+++ b/storage/bdb/test/test050.tcl
diff --git a/bdb/test/test051.tcl b/storage/bdb/test/test051.tcl
index 830b7630788..830b7630788 100644
--- a/bdb/test/test051.tcl
+++ b/storage/bdb/test/test051.tcl
diff --git a/bdb/test/test052.tcl b/storage/bdb/test/test052.tcl
index 1f386449630..1f386449630 100644
--- a/bdb/test/test052.tcl
+++ b/storage/bdb/test/test052.tcl
diff --git a/bdb/test/test053.tcl b/storage/bdb/test/test053.tcl
index 3e217a2b55f..3e217a2b55f 100644
--- a/bdb/test/test053.tcl
+++ b/storage/bdb/test/test053.tcl
diff --git a/bdb/test/test054.tcl b/storage/bdb/test/test054.tcl
index f53f5a658bf..f53f5a658bf 100644
--- a/bdb/test/test054.tcl
+++ b/storage/bdb/test/test054.tcl
diff --git a/bdb/test/test055.tcl b/storage/bdb/test/test055.tcl
index 25134dca4be..25134dca4be 100644
--- a/bdb/test/test055.tcl
+++ b/storage/bdb/test/test055.tcl
diff --git a/bdb/test/test056.tcl b/storage/bdb/test/test056.tcl
index ef310332ed1..ef310332ed1 100644
--- a/bdb/test/test056.tcl
+++ b/storage/bdb/test/test056.tcl
diff --git a/bdb/test/test057.tcl b/storage/bdb/test/test057.tcl
index 04fb09ef260..04fb09ef260 100644
--- a/bdb/test/test057.tcl
+++ b/storage/bdb/test/test057.tcl
diff --git a/bdb/test/test058.tcl b/storage/bdb/test/test058.tcl
index daf164fd6e2..daf164fd6e2 100644
--- a/bdb/test/test058.tcl
+++ b/storage/bdb/test/test058.tcl
diff --git a/bdb/test/test059.tcl b/storage/bdb/test/test059.tcl
index 596ea7a3c94..596ea7a3c94 100644
--- a/bdb/test/test059.tcl
+++ b/storage/bdb/test/test059.tcl
diff --git a/bdb/test/test060.tcl b/storage/bdb/test/test060.tcl
index 4a18c97f42f..4a18c97f42f 100644
--- a/bdb/test/test060.tcl
+++ b/storage/bdb/test/test060.tcl
diff --git a/bdb/test/test061.tcl b/storage/bdb/test/test061.tcl
index 65544e88deb..65544e88deb 100644
--- a/bdb/test/test061.tcl
+++ b/storage/bdb/test/test061.tcl
diff --git a/bdb/test/test062.tcl b/storage/bdb/test/test062.tcl
index 5cacd98a2c0..5cacd98a2c0 100644
--- a/bdb/test/test062.tcl
+++ b/storage/bdb/test/test062.tcl
diff --git a/bdb/test/test063.tcl b/storage/bdb/test/test063.tcl
index 2e8726c8f96..2e8726c8f96 100644
--- a/bdb/test/test063.tcl
+++ b/storage/bdb/test/test063.tcl
diff --git a/bdb/test/test064.tcl b/storage/bdb/test/test064.tcl
index c306b0d9d46..c306b0d9d46 100644
--- a/bdb/test/test064.tcl
+++ b/storage/bdb/test/test064.tcl
diff --git a/bdb/test/test065.tcl b/storage/bdb/test/test065.tcl
index ea29b4d2db7..ea29b4d2db7 100644
--- a/bdb/test/test065.tcl
+++ b/storage/bdb/test/test065.tcl
diff --git a/bdb/test/test066.tcl b/storage/bdb/test/test066.tcl
index 13d0894dcae..13d0894dcae 100644
--- a/bdb/test/test066.tcl
+++ b/storage/bdb/test/test066.tcl
diff --git a/bdb/test/test067.tcl b/storage/bdb/test/test067.tcl
index 5f5a88c4be1..5f5a88c4be1 100644
--- a/bdb/test/test067.tcl
+++ b/storage/bdb/test/test067.tcl
diff --git a/bdb/test/test068.tcl b/storage/bdb/test/test068.tcl
index 31f4272ba55..31f4272ba55 100644
--- a/bdb/test/test068.tcl
+++ b/storage/bdb/test/test068.tcl
diff --git a/bdb/test/test069.tcl b/storage/bdb/test/test069.tcl
index d986c861358..d986c861358 100644
--- a/bdb/test/test069.tcl
+++ b/storage/bdb/test/test069.tcl
diff --git a/bdb/test/test070.tcl b/storage/bdb/test/test070.tcl
index 986fd079589..986fd079589 100644
--- a/bdb/test/test070.tcl
+++ b/storage/bdb/test/test070.tcl
diff --git a/bdb/test/test071.tcl b/storage/bdb/test/test071.tcl
index 3f2604022f1..3f2604022f1 100644
--- a/bdb/test/test071.tcl
+++ b/storage/bdb/test/test071.tcl
diff --git a/bdb/test/test072.tcl b/storage/bdb/test/test072.tcl
index 3c08f93975d..3c08f93975d 100644
--- a/bdb/test/test072.tcl
+++ b/storage/bdb/test/test072.tcl
diff --git a/bdb/test/test073.tcl b/storage/bdb/test/test073.tcl
index 02a0f3b0d19..02a0f3b0d19 100644
--- a/bdb/test/test073.tcl
+++ b/storage/bdb/test/test073.tcl
diff --git a/bdb/test/test074.tcl b/storage/bdb/test/test074.tcl
index 7f620db2d97..7f620db2d97 100644
--- a/bdb/test/test074.tcl
+++ b/storage/bdb/test/test074.tcl
diff --git a/bdb/test/test075.tcl b/storage/bdb/test/test075.tcl
index 540d8f0ed73..540d8f0ed73 100644
--- a/bdb/test/test075.tcl
+++ b/storage/bdb/test/test075.tcl
diff --git a/bdb/test/test076.tcl b/storage/bdb/test/test076.tcl
index 9f7b1ed2972..9f7b1ed2972 100644
--- a/bdb/test/test076.tcl
+++ b/storage/bdb/test/test076.tcl
diff --git a/bdb/test/test077.tcl b/storage/bdb/test/test077.tcl
index 99cf432af20..99cf432af20 100644
--- a/bdb/test/test077.tcl
+++ b/storage/bdb/test/test077.tcl
diff --git a/bdb/test/test078.tcl b/storage/bdb/test/test078.tcl
index 45a1d46466e..45a1d46466e 100644
--- a/bdb/test/test078.tcl
+++ b/storage/bdb/test/test078.tcl
diff --git a/bdb/test/test079.tcl b/storage/bdb/test/test079.tcl
index 70fd4e05090..70fd4e05090 100644
--- a/bdb/test/test079.tcl
+++ b/storage/bdb/test/test079.tcl
diff --git a/bdb/test/test080.tcl b/storage/bdb/test/test080.tcl
index 9f649496f68..9f649496f68 100644
--- a/bdb/test/test080.tcl
+++ b/storage/bdb/test/test080.tcl
diff --git a/bdb/test/test081.tcl b/storage/bdb/test/test081.tcl
index 37c2b44ac33..37c2b44ac33 100644
--- a/bdb/test/test081.tcl
+++ b/storage/bdb/test/test081.tcl
diff --git a/bdb/test/test082.tcl b/storage/bdb/test/test082.tcl
index e8c1fa45a92..e8c1fa45a92 100644
--- a/bdb/test/test082.tcl
+++ b/storage/bdb/test/test082.tcl
diff --git a/bdb/test/test083.tcl b/storage/bdb/test/test083.tcl
index e4168ee1c43..e4168ee1c43 100644
--- a/bdb/test/test083.tcl
+++ b/storage/bdb/test/test083.tcl
diff --git a/bdb/test/test084.tcl b/storage/bdb/test/test084.tcl
index 89bc13978b0..89bc13978b0 100644
--- a/bdb/test/test084.tcl
+++ b/storage/bdb/test/test084.tcl
diff --git a/bdb/test/test085.tcl b/storage/bdb/test/test085.tcl
index b0412d6fe68..b0412d6fe68 100644
--- a/bdb/test/test085.tcl
+++ b/storage/bdb/test/test085.tcl
diff --git a/bdb/test/test086.tcl b/storage/bdb/test/test086.tcl
index e15aa1d8bb9..e15aa1d8bb9 100644
--- a/bdb/test/test086.tcl
+++ b/storage/bdb/test/test086.tcl
diff --git a/bdb/test/test087.tcl b/storage/bdb/test/test087.tcl
index 089664a0002..089664a0002 100644
--- a/bdb/test/test087.tcl
+++ b/storage/bdb/test/test087.tcl
diff --git a/bdb/test/test088.tcl b/storage/bdb/test/test088.tcl
index 7065b4cd642..7065b4cd642 100644
--- a/bdb/test/test088.tcl
+++ b/storage/bdb/test/test088.tcl
diff --git a/bdb/test/test089.tcl b/storage/bdb/test/test089.tcl
index d378152f203..d378152f203 100644
--- a/bdb/test/test089.tcl
+++ b/storage/bdb/test/test089.tcl
diff --git a/bdb/test/test090.tcl b/storage/bdb/test/test090.tcl
index da90688ffc5..da90688ffc5 100644
--- a/bdb/test/test090.tcl
+++ b/storage/bdb/test/test090.tcl
diff --git a/bdb/test/test091.tcl b/storage/bdb/test/test091.tcl
index cfd2a60ebb5..cfd2a60ebb5 100644
--- a/bdb/test/test091.tcl
+++ b/storage/bdb/test/test091.tcl
diff --git a/bdb/test/test092.tcl b/storage/bdb/test/test092.tcl
index 29c1c55a9a9..29c1c55a9a9 100644
--- a/bdb/test/test092.tcl
+++ b/storage/bdb/test/test092.tcl
diff --git a/bdb/test/test093.tcl b/storage/bdb/test/test093.tcl
index e3f8f0103c6..e3f8f0103c6 100644
--- a/bdb/test/test093.tcl
+++ b/storage/bdb/test/test093.tcl
diff --git a/bdb/test/test094.tcl b/storage/bdb/test/test094.tcl
index 781052913f4..781052913f4 100644
--- a/bdb/test/test094.tcl
+++ b/storage/bdb/test/test094.tcl
diff --git a/bdb/test/test095.tcl b/storage/bdb/test/test095.tcl
index 5543f346b7e..5543f346b7e 100644
--- a/bdb/test/test095.tcl
+++ b/storage/bdb/test/test095.tcl
diff --git a/bdb/test/test096.tcl b/storage/bdb/test/test096.tcl
index 042df19eac7..042df19eac7 100644
--- a/bdb/test/test096.tcl
+++ b/storage/bdb/test/test096.tcl
diff --git a/bdb/test/test097.tcl b/storage/bdb/test/test097.tcl
index 6e43b820b2f..6e43b820b2f 100644
--- a/bdb/test/test097.tcl
+++ b/storage/bdb/test/test097.tcl
diff --git a/bdb/test/test098.tcl b/storage/bdb/test/test098.tcl
index 320e0258a84..320e0258a84 100644
--- a/bdb/test/test098.tcl
+++ b/storage/bdb/test/test098.tcl
diff --git a/bdb/test/test099.tcl b/storage/bdb/test/test099.tcl
index db177ce5fff..db177ce5fff 100644
--- a/bdb/test/test099.tcl
+++ b/storage/bdb/test/test099.tcl
diff --git a/bdb/test/test100.tcl b/storage/bdb/test/test100.tcl
index f80b2e526dd..f80b2e526dd 100644
--- a/bdb/test/test100.tcl
+++ b/storage/bdb/test/test100.tcl
diff --git a/bdb/test/test101.tcl b/storage/bdb/test/test101.tcl
index 7e5c8fc30fc..7e5c8fc30fc 100644
--- a/bdb/test/test101.tcl
+++ b/storage/bdb/test/test101.tcl
diff --git a/bdb/test/testparams.tcl b/storage/bdb/test/testparams.tcl
index 6628db532d7..6628db532d7 100644
--- a/bdb/test/testparams.tcl
+++ b/storage/bdb/test/testparams.tcl
diff --git a/bdb/test/testutils.tcl b/storage/bdb/test/testutils.tcl
index d1f89dd1e15..d1f89dd1e15 100644
--- a/bdb/test/testutils.tcl
+++ b/storage/bdb/test/testutils.tcl
diff --git a/bdb/test/txn001.tcl b/storage/bdb/test/txn001.tcl
index 406ef35751c..406ef35751c 100644
--- a/bdb/test/txn001.tcl
+++ b/storage/bdb/test/txn001.tcl
diff --git a/bdb/test/txn002.tcl b/storage/bdb/test/txn002.tcl
index 5107472644d..5107472644d 100644
--- a/bdb/test/txn002.tcl
+++ b/storage/bdb/test/txn002.tcl
diff --git a/bdb/test/txn003.tcl b/storage/bdb/test/txn003.tcl
index 71e450cf9ce..71e450cf9ce 100644
--- a/bdb/test/txn003.tcl
+++ b/storage/bdb/test/txn003.tcl
diff --git a/bdb/test/txn004.tcl b/storage/bdb/test/txn004.tcl
index 75e1b40043f..75e1b40043f 100644
--- a/bdb/test/txn004.tcl
+++ b/storage/bdb/test/txn004.tcl
diff --git a/bdb/test/txn005.tcl b/storage/bdb/test/txn005.tcl
index 604f3ad7de4..604f3ad7de4 100644
--- a/bdb/test/txn005.tcl
+++ b/storage/bdb/test/txn005.tcl
diff --git a/bdb/test/txn006.tcl b/storage/bdb/test/txn006.tcl
index 7bf37d34dfc..7bf37d34dfc 100644
--- a/bdb/test/txn006.tcl
+++ b/storage/bdb/test/txn006.tcl
diff --git a/bdb/test/txn007.tcl b/storage/bdb/test/txn007.tcl
index f67dc209f92..f67dc209f92 100644
--- a/bdb/test/txn007.tcl
+++ b/storage/bdb/test/txn007.tcl
diff --git a/bdb/test/txn008.tcl b/storage/bdb/test/txn008.tcl
index ad57ea0eeaa..ad57ea0eeaa 100644
--- a/bdb/test/txn008.tcl
+++ b/storage/bdb/test/txn008.tcl
diff --git a/bdb/test/txn009.tcl b/storage/bdb/test/txn009.tcl
index 784c0068a41..784c0068a41 100644
--- a/bdb/test/txn009.tcl
+++ b/storage/bdb/test/txn009.tcl
diff --git a/bdb/test/txnscript.tcl b/storage/bdb/test/txnscript.tcl
index 1a4a1b6f2ec..1a4a1b6f2ec 100644
--- a/bdb/test/txnscript.tcl
+++ b/storage/bdb/test/txnscript.tcl
diff --git a/bdb/test/update.tcl b/storage/bdb/test/update.tcl
index 2bedfacc793..2bedfacc793 100644
--- a/bdb/test/update.tcl
+++ b/storage/bdb/test/update.tcl
diff --git a/bdb/test/upgrade.tcl b/storage/bdb/test/upgrade.tcl
index 1c0ffc5461a..1c0ffc5461a 100644
--- a/bdb/test/upgrade.tcl
+++ b/storage/bdb/test/upgrade.tcl
diff --git a/bdb/test/wordlist b/storage/bdb/test/wordlist
index 03ea15f7277..03ea15f7277 100644
--- a/bdb/test/wordlist
+++ b/storage/bdb/test/wordlist
diff --git a/bdb/test/wrap.tcl b/storage/bdb/test/wrap.tcl
index aaceb4f74e6..aaceb4f74e6 100644
--- a/bdb/test/wrap.tcl
+++ b/storage/bdb/test/wrap.tcl
diff --git a/bdb/txn/txn.c b/storage/bdb/txn/txn.c
index 78c54791d06..78c54791d06 100644
--- a/bdb/txn/txn.c
+++ b/storage/bdb/txn/txn.c
diff --git a/bdb/txn/txn.src b/storage/bdb/txn/txn.src
index 3f69b29e3ff..3f69b29e3ff 100644
--- a/bdb/txn/txn.src
+++ b/storage/bdb/txn/txn.src
diff --git a/bdb/txn/txn_method.c b/storage/bdb/txn/txn_method.c
index 60fdf30583e..60fdf30583e 100644
--- a/bdb/txn/txn_method.c
+++ b/storage/bdb/txn/txn_method.c
diff --git a/bdb/txn/txn_rec.c b/storage/bdb/txn/txn_rec.c
index 69af6a1f907..69af6a1f907 100644
--- a/bdb/txn/txn_rec.c
+++ b/storage/bdb/txn/txn_rec.c
diff --git a/bdb/txn/txn_recover.c b/storage/bdb/txn/txn_recover.c
index 732a82e5030..732a82e5030 100644
--- a/bdb/txn/txn_recover.c
+++ b/storage/bdb/txn/txn_recover.c
diff --git a/bdb/txn/txn_region.c b/storage/bdb/txn/txn_region.c
index bf72d4f1d2c..bf72d4f1d2c 100644
--- a/bdb/txn/txn_region.c
+++ b/storage/bdb/txn/txn_region.c
diff --git a/bdb/txn/txn_stat.c b/storage/bdb/txn/txn_stat.c
index f7d84e8f4c6..f7d84e8f4c6 100644
--- a/bdb/txn/txn_stat.c
+++ b/storage/bdb/txn/txn_stat.c
diff --git a/bdb/txn/txn_util.c b/storage/bdb/txn/txn_util.c
index cbfbc419615..cbfbc419615 100644
--- a/bdb/txn/txn_util.c
+++ b/storage/bdb/txn/txn_util.c
diff --git a/bdb/xa/xa.c b/storage/bdb/xa/xa.c
index 6667d14c2bf..6667d14c2bf 100644
--- a/bdb/xa/xa.c
+++ b/storage/bdb/xa/xa.c
diff --git a/bdb/xa/xa_db.c b/storage/bdb/xa/xa_db.c
index b84bb1c9fa9..b84bb1c9fa9 100644
--- a/bdb/xa/xa_db.c
+++ b/storage/bdb/xa/xa_db.c
diff --git a/bdb/xa/xa_map.c b/storage/bdb/xa/xa_map.c
index 42fa4b20ed2..42fa4b20ed2 100644
--- a/bdb/xa/xa_map.c
+++ b/storage/bdb/xa/xa_map.c
diff --git a/heap/.cvsignore b/storage/heap/.cvsignore
index 675df8a3eb6..675df8a3eb6 100644
--- a/heap/.cvsignore
+++ b/storage/heap/.cvsignore
diff --git a/heap/ChangeLog b/storage/heap/ChangeLog
index 9d3ced84cc9..9d3ced84cc9 100644
--- a/heap/ChangeLog
+++ b/storage/heap/ChangeLog
diff --git a/storage/heap/Makefile.am b/storage/heap/Makefile.am
new file mode 100644
index 00000000000..2890dc6ee23
--- /dev/null
+++ b/storage/heap/Makefile.am
@@ -0,0 +1,34 @@
+# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include 
+LDADD =			libheap.a $(top_srcdir)/mysys/libmysys.a \
+			$(top_srcdir)/dbug/libdbug.a \
+			$(top_srcdir)/strings/libmystrings.a
+pkglib_LIBRARIES =	libheap.a
+noinst_PROGRAMS	=	hp_test1 hp_test2
+hp_test1_LDFLAGS = @NOINST_LDFLAGS@
+hp_test2_LDFLAGS = @NOINST_LDFLAGS@
+noinst_HEADERS =	heapdef.h
+libheap_a_SOURCES =	hp_open.c hp_extra.c hp_close.c hp_panic.c hp_info.c \
+			hp_rrnd.c hp_scan.c hp_update.c hp_write.c hp_delete.c \
+			hp_rsame.c hp_create.c hp_rename.c hp_rfirst.c \
+			hp_rnext.c hp_rlast.c hp_rprev.c hp_clear.c \
+			hp_rkey.c hp_block.c \
+			hp_hash.c _check.c _rectest.c hp_static.c
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
diff --git a/heap/_check.c b/storage/heap/_check.c
index 4316a9926f7..4316a9926f7 100644
--- a/heap/_check.c
+++ b/storage/heap/_check.c
diff --git a/heap/_rectest.c b/storage/heap/_rectest.c
index eb350263cec..eb350263cec 100644
--- a/heap/_rectest.c
+++ b/storage/heap/_rectest.c
diff --git a/heap/heapdef.h b/storage/heap/heapdef.h
index 68d9405138f..68d9405138f 100644
--- a/heap/heapdef.h
+++ b/storage/heap/heapdef.h
diff --git a/heap/hp_block.c b/storage/heap/hp_block.c
index f26b208b521..f26b208b521 100644
--- a/heap/hp_block.c
+++ b/storage/heap/hp_block.c
diff --git a/heap/hp_clear.c b/storage/heap/hp_clear.c
index 596d71ebe9c..596d71ebe9c 100644
--- a/heap/hp_clear.c
+++ b/storage/heap/hp_clear.c
diff --git a/heap/hp_close.c b/storage/heap/hp_close.c
index 3e0c9003ac8..3e0c9003ac8 100644
--- a/heap/hp_close.c
+++ b/storage/heap/hp_close.c
diff --git a/heap/hp_create.c b/storage/heap/hp_create.c
index 8fcf7dde000..8fcf7dde000 100644
--- a/heap/hp_create.c
+++ b/storage/heap/hp_create.c
diff --git a/heap/hp_delete.c b/storage/heap/hp_delete.c
index 5287533ae0a..5287533ae0a 100644
--- a/heap/hp_delete.c
+++ b/storage/heap/hp_delete.c
diff --git a/heap/hp_extra.c b/storage/heap/hp_extra.c
index dd41d6c5f19..dd41d6c5f19 100644
--- a/heap/hp_extra.c
+++ b/storage/heap/hp_extra.c
diff --git a/heap/hp_hash.c b/storage/heap/hp_hash.c
index d643f776731..d643f776731 100644
--- a/heap/hp_hash.c
+++ b/storage/heap/hp_hash.c
diff --git a/heap/hp_info.c b/storage/heap/hp_info.c
index 2e56d030234..2e56d030234 100644
--- a/heap/hp_info.c
+++ b/storage/heap/hp_info.c
diff --git a/heap/hp_open.c b/storage/heap/hp_open.c
index fd937229b0d..fd937229b0d 100644
--- a/heap/hp_open.c
+++ b/storage/heap/hp_open.c
diff --git a/heap/hp_panic.c b/storage/heap/hp_panic.c
index 2b659cbfbb3..2b659cbfbb3 100644
--- a/heap/hp_panic.c
+++ b/storage/heap/hp_panic.c
diff --git a/heap/hp_rename.c b/storage/heap/hp_rename.c
index 93906a66c37..93906a66c37 100644
--- a/heap/hp_rename.c
+++ b/storage/heap/hp_rename.c
diff --git a/heap/hp_rfirst.c b/storage/heap/hp_rfirst.c
index 85548fea212..85548fea212 100644
--- a/heap/hp_rfirst.c
+++ b/storage/heap/hp_rfirst.c
diff --git a/heap/hp_rkey.c b/storage/heap/hp_rkey.c
index f5f22a877a1..f5f22a877a1 100644
--- a/heap/hp_rkey.c
+++ b/storage/heap/hp_rkey.c
diff --git a/heap/hp_rlast.c b/storage/heap/hp_rlast.c
index b1a49739108..b1a49739108 100644
--- a/heap/hp_rlast.c
+++ b/storage/heap/hp_rlast.c
diff --git a/heap/hp_rnext.c b/storage/heap/hp_rnext.c
index a1bc480333e..a1bc480333e 100644
--- a/heap/hp_rnext.c
+++ b/storage/heap/hp_rnext.c
diff --git a/heap/hp_rprev.c b/storage/heap/hp_rprev.c
index d8f5c01dcea..d8f5c01dcea 100644
--- a/heap/hp_rprev.c
+++ b/storage/heap/hp_rprev.c
diff --git a/heap/hp_rrnd.c b/storage/heap/hp_rrnd.c
index 4daa3a06377..4daa3a06377 100644
--- a/heap/hp_rrnd.c
+++ b/storage/heap/hp_rrnd.c
diff --git a/heap/hp_rsame.c b/storage/heap/hp_rsame.c
index 6a375753b1a..6a375753b1a 100644
--- a/heap/hp_rsame.c
+++ b/storage/heap/hp_rsame.c
diff --git a/heap/hp_scan.c b/storage/heap/hp_scan.c
index 59e544ca590..59e544ca590 100644
--- a/heap/hp_scan.c
+++ b/storage/heap/hp_scan.c
diff --git a/heap/hp_static.c b/storage/heap/hp_static.c
index a458b742b9c..a458b742b9c 100644
--- a/heap/hp_static.c
+++ b/storage/heap/hp_static.c
diff --git a/heap/hp_test1.c b/storage/heap/hp_test1.c
index dd696528eb8..dd696528eb8 100644
--- a/heap/hp_test1.c
+++ b/storage/heap/hp_test1.c
diff --git a/heap/hp_test2.c b/storage/heap/hp_test2.c
index 2de49bcb66b..2de49bcb66b 100644
--- a/heap/hp_test2.c
+++ b/storage/heap/hp_test2.c
diff --git a/heap/hp_update.c b/storage/heap/hp_update.c
index 63ada225f06..63ada225f06 100644
--- a/heap/hp_update.c
+++ b/storage/heap/hp_update.c
diff --git a/heap/hp_write.c b/storage/heap/hp_write.c
index a60d32eecb6..a60d32eecb6 100644
--- a/heap/hp_write.c
+++ b/storage/heap/hp_write.c
diff --git a/heap/make-ccc b/storage/heap/make-ccc
index 192647298ad..192647298ad 100755
--- a/heap/make-ccc
+++ b/storage/heap/make-ccc
diff --git a/innobase/Makefile.am b/storage/innobase/Makefile.am
index 8ff90d16a2c..8ff90d16a2c 100644
--- a/innobase/Makefile.am
+++ b/storage/innobase/Makefile.am
diff --git a/innobase/btr/Makefile.am b/storage/innobase/btr/Makefile.am
index ed61facb695..ed61facb695 100644
--- a/innobase/btr/Makefile.am
+++ b/storage/innobase/btr/Makefile.am
diff --git a/innobase/btr/btr0btr.c b/storage/innobase/btr/btr0btr.c
index c27fb73ff8d..c27fb73ff8d 100644
--- a/innobase/btr/btr0btr.c
+++ b/storage/innobase/btr/btr0btr.c
diff --git a/innobase/btr/btr0cur.c b/storage/innobase/btr/btr0cur.c
index f81cce5b8e9..f81cce5b8e9 100644
--- a/innobase/btr/btr0cur.c
+++ b/storage/innobase/btr/btr0cur.c
diff --git a/innobase/btr/btr0pcur.c b/storage/innobase/btr/btr0pcur.c
index cb398b4afab..cb398b4afab 100644
--- a/innobase/btr/btr0pcur.c
+++ b/storage/innobase/btr/btr0pcur.c
diff --git a/innobase/btr/btr0sea.c b/storage/innobase/btr/btr0sea.c
index f705fee4275..f705fee4275 100644
--- a/innobase/btr/btr0sea.c
+++ b/storage/innobase/btr/btr0sea.c
diff --git a/innobase/btr/makefilewin b/storage/innobase/btr/makefilewin
index a5806b74a51..a5806b74a51 100644
--- a/innobase/btr/makefilewin
+++ b/storage/innobase/btr/makefilewin
diff --git a/innobase/buf/Makefile.am b/storage/innobase/buf/Makefile.am
index 3f56c8b02d7..3f56c8b02d7 100644
--- a/innobase/buf/Makefile.am
+++ b/storage/innobase/buf/Makefile.am
diff --git a/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
index fe4498e6f10..fe4498e6f10 100644
--- a/innobase/buf/buf0buf.c
+++ b/storage/innobase/buf/buf0buf.c
diff --git a/innobase/buf/buf0flu.c b/storage/innobase/buf/buf0flu.c
index ffb16790b2d..ffb16790b2d 100644
--- a/innobase/buf/buf0flu.c
+++ b/storage/innobase/buf/buf0flu.c
diff --git a/innobase/buf/buf0lru.c b/storage/innobase/buf/buf0lru.c
index a0157da2d42..a0157da2d42 100644
--- a/innobase/buf/buf0lru.c
+++ b/storage/innobase/buf/buf0lru.c
diff --git a/innobase/buf/buf0rea.c b/storage/innobase/buf/buf0rea.c
index 813ca589907..813ca589907 100644
--- a/innobase/buf/buf0rea.c
+++ b/storage/innobase/buf/buf0rea.c
diff --git a/innobase/buf/makefilewin b/storage/innobase/buf/makefilewin
index ce62cb95958..ce62cb95958 100644
--- a/innobase/buf/makefilewin
+++ b/storage/innobase/buf/makefilewin
diff --git a/innobase/configure.in b/storage/innobase/configure.in
index c56bd8274c4..c56bd8274c4 100644
--- a/innobase/configure.in
+++ b/storage/innobase/configure.in
diff --git a/innobase/data/Makefile.am b/storage/innobase/data/Makefile.am
index eeb6f129de0..eeb6f129de0 100644
--- a/innobase/data/Makefile.am
+++ b/storage/innobase/data/Makefile.am
diff --git a/innobase/data/data0data.c b/storage/innobase/data/data0data.c
index 194213a04e1..194213a04e1 100644
--- a/innobase/data/data0data.c
+++ b/storage/innobase/data/data0data.c
diff --git a/innobase/data/data0type.c b/storage/innobase/data/data0type.c
index d4264ad2926..d4264ad2926 100644
--- a/innobase/data/data0type.c
+++ b/storage/innobase/data/data0type.c
diff --git a/innobase/data/makefilewin b/storage/innobase/data/makefilewin
index 785b75fbb2b..785b75fbb2b 100644
--- a/innobase/data/makefilewin
+++ b/storage/innobase/data/makefilewin
diff --git a/innobase/db/db0err.h b/storage/innobase/db/db0err.h
index 34513545faa..34513545faa 100644
--- a/innobase/db/db0err.h
+++ b/storage/innobase/db/db0err.h
diff --git a/innobase/dict/Makefile.am b/storage/innobase/dict/Makefile.am
index 0034d2f8f1e..0034d2f8f1e 100644
--- a/innobase/dict/Makefile.am
+++ b/storage/innobase/dict/Makefile.am
diff --git a/innobase/dict/dict0boot.c b/storage/innobase/dict/dict0boot.c
index 18a707a1b93..18a707a1b93 100644
--- a/innobase/dict/dict0boot.c
+++ b/storage/innobase/dict/dict0boot.c
diff --git a/innobase/dict/dict0crea.c b/storage/innobase/dict/dict0crea.c
index c7d6ffd2c22..c7d6ffd2c22 100644
--- a/innobase/dict/dict0crea.c
+++ b/storage/innobase/dict/dict0crea.c
diff --git a/innobase/dict/dict0dict.c b/storage/innobase/dict/dict0dict.c
index 9580a80e7e7..9580a80e7e7 100644
--- a/innobase/dict/dict0dict.c
+++ b/storage/innobase/dict/dict0dict.c
diff --git a/innobase/dict/dict0load.c b/storage/innobase/dict/dict0load.c
index 9bafcf33553..9bafcf33553 100644
--- a/innobase/dict/dict0load.c
+++ b/storage/innobase/dict/dict0load.c
diff --git a/innobase/dict/dict0mem.c b/storage/innobase/dict/dict0mem.c
index eec35310039..eec35310039 100644
--- a/innobase/dict/dict0mem.c
+++ b/storage/innobase/dict/dict0mem.c
diff --git a/innobase/dict/makefilewin b/storage/innobase/dict/makefilewin
index e828d06943c..e828d06943c 100644
--- a/innobase/dict/makefilewin
+++ b/storage/innobase/dict/makefilewin
diff --git a/innobase/dyn/Makefile.am b/storage/innobase/dyn/Makefile.am
index ec33a3c18a9..ec33a3c18a9 100644
--- a/innobase/dyn/Makefile.am
+++ b/storage/innobase/dyn/Makefile.am
diff --git a/innobase/dyn/dyn0dyn.c b/storage/innobase/dyn/dyn0dyn.c
index 0afe6eda856..0afe6eda856 100644
--- a/innobase/dyn/dyn0dyn.c
+++ b/storage/innobase/dyn/dyn0dyn.c
diff --git a/innobase/dyn/makefilewin b/storage/innobase/dyn/makefilewin
index 71a58a756c1..71a58a756c1 100644
--- a/innobase/dyn/makefilewin
+++ b/storage/innobase/dyn/makefilewin
diff --git a/innobase/eval/Makefile.am b/storage/innobase/eval/Makefile.am
index aebffb91be3..aebffb91be3 100644
--- a/innobase/eval/Makefile.am
+++ b/storage/innobase/eval/Makefile.am
diff --git a/innobase/eval/eval0eval.c b/storage/innobase/eval/eval0eval.c
index 5b2d1f857b1..5b2d1f857b1 100644
--- a/innobase/eval/eval0eval.c
+++ b/storage/innobase/eval/eval0eval.c
diff --git a/innobase/eval/eval0proc.c b/storage/innobase/eval/eval0proc.c
index 50676e4f3fc..50676e4f3fc 100644
--- a/innobase/eval/eval0proc.c
+++ b/storage/innobase/eval/eval0proc.c
diff --git a/innobase/eval/makefilewin b/storage/innobase/eval/makefilewin
index f587f2a05a6..f587f2a05a6 100644
--- a/innobase/eval/makefilewin
+++ b/storage/innobase/eval/makefilewin
diff --git a/innobase/fil/Makefile.am b/storage/innobase/fil/Makefile.am
index dc0baff7d1a..dc0baff7d1a 100644
--- a/innobase/fil/Makefile.am
+++ b/storage/innobase/fil/Makefile.am
diff --git a/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c
index 20f522c1a60..20f522c1a60 100644
--- a/innobase/fil/fil0fil.c
+++ b/storage/innobase/fil/fil0fil.c
diff --git a/innobase/fil/makefilewin b/storage/innobase/fil/makefilewin
index 1b2d6ab2dbb..1b2d6ab2dbb 100644
--- a/innobase/fil/makefilewin
+++ b/storage/innobase/fil/makefilewin
diff --git a/innobase/fsp/Makefile.am b/storage/innobase/fsp/Makefile.am
index edf06bda0d6..edf06bda0d6 100644
--- a/innobase/fsp/Makefile.am
+++ b/storage/innobase/fsp/Makefile.am
diff --git a/innobase/fsp/fsp0fsp.c b/storage/innobase/fsp/fsp0fsp.c
index ad4228f6797..ad4228f6797 100644
--- a/innobase/fsp/fsp0fsp.c
+++ b/storage/innobase/fsp/fsp0fsp.c
diff --git a/innobase/fsp/makefilewin b/storage/innobase/fsp/makefilewin
index 503cf27f490..503cf27f490 100644
--- a/innobase/fsp/makefilewin
+++ b/storage/innobase/fsp/makefilewin
diff --git a/innobase/fut/Makefile.am b/storage/innobase/fut/Makefile.am
index 839fdb1580e..839fdb1580e 100644
--- a/innobase/fut/Makefile.am
+++ b/storage/innobase/fut/Makefile.am
diff --git a/innobase/fut/fut0fut.c b/storage/innobase/fut/fut0fut.c
index 7f7a8fa39e7..7f7a8fa39e7 100644
--- a/innobase/fut/fut0fut.c
+++ b/storage/innobase/fut/fut0fut.c
diff --git a/innobase/fut/fut0lst.c b/storage/innobase/fut/fut0lst.c
index 8deaa8adb3f..8deaa8adb3f 100644
--- a/innobase/fut/fut0lst.c
+++ b/storage/innobase/fut/fut0lst.c
diff --git a/innobase/fut/makefilewin b/storage/innobase/fut/makefilewin
index 40f3161015c..40f3161015c 100644
--- a/innobase/fut/makefilewin
+++ b/storage/innobase/fut/makefilewin
diff --git a/innobase/ha/Makefile.am b/storage/innobase/ha/Makefile.am
index 121bafe167d..121bafe167d 100644
--- a/innobase/ha/Makefile.am
+++ b/storage/innobase/ha/Makefile.am
diff --git a/innobase/ha/ha0ha.c b/storage/innobase/ha/ha0ha.c
index ad1391ff83e..ad1391ff83e 100644
--- a/innobase/ha/ha0ha.c
+++ b/storage/innobase/ha/ha0ha.c
diff --git a/innobase/ha/hash0hash.c b/storage/innobase/ha/hash0hash.c
index facdea66198..facdea66198 100644
--- a/innobase/ha/hash0hash.c
+++ b/storage/innobase/ha/hash0hash.c
diff --git a/innobase/ha/makefilewin b/storage/innobase/ha/makefilewin
index c7cd130ceea..c7cd130ceea 100644
--- a/innobase/ha/makefilewin
+++ b/storage/innobase/ha/makefilewin
diff --git a/innobase/ibuf/Makefile.am b/storage/innobase/ibuf/Makefile.am
index fb813d38ee5..fb813d38ee5 100644
--- a/innobase/ibuf/Makefile.am
+++ b/storage/innobase/ibuf/Makefile.am
diff --git a/innobase/ibuf/ibuf0ibuf.c b/storage/innobase/ibuf/ibuf0ibuf.c
index d7fa48b6e66..d7fa48b6e66 100644
--- a/innobase/ibuf/ibuf0ibuf.c
+++ b/storage/innobase/ibuf/ibuf0ibuf.c
diff --git a/innobase/ibuf/makefilewin b/storage/innobase/ibuf/makefilewin
index 86bf9794520..86bf9794520 100644
--- a/innobase/ibuf/makefilewin
+++ b/storage/innobase/ibuf/makefilewin
diff --git a/innobase/include/Makefile.am b/storage/innobase/include/Makefile.am
index eb1e3b72877..eb1e3b72877 100644
--- a/innobase/include/Makefile.am
+++ b/storage/innobase/include/Makefile.am
diff --git a/storage/innobase/include/Makefile.i b/storage/innobase/include/Makefile.i
new file mode 100644
index 00000000000..87952a7abc8
--- /dev/null
+++ b/storage/innobase/include/Makefile.i
@@ -0,0 +1,6 @@
+# Makefile included in Makefile.am in every subdirectory
+
+INCLUDES =		-I$(top_srcdir)/include -I$(top_srcdir)/../../include
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
diff --git a/innobase/include/btr0btr.h b/storage/innobase/include/btr0btr.h
index 1f3a32fa70c..1f3a32fa70c 100644
--- a/innobase/include/btr0btr.h
+++ b/storage/innobase/include/btr0btr.h
diff --git a/innobase/include/btr0btr.ic b/storage/innobase/include/btr0btr.ic
index a0860b1c3a7..a0860b1c3a7 100644
--- a/innobase/include/btr0btr.ic
+++ b/storage/innobase/include/btr0btr.ic
diff --git a/innobase/include/btr0cur.h b/storage/innobase/include/btr0cur.h
index 352d1739b6a..352d1739b6a 100644
--- a/innobase/include/btr0cur.h
+++ b/storage/innobase/include/btr0cur.h
diff --git a/innobase/include/btr0cur.ic b/storage/innobase/include/btr0cur.ic
index bf8a6efb68d..bf8a6efb68d 100644
--- a/innobase/include/btr0cur.ic
+++ b/storage/innobase/include/btr0cur.ic
diff --git a/innobase/include/btr0pcur.h b/storage/innobase/include/btr0pcur.h
index eb3822aab7a..eb3822aab7a 100644
--- a/innobase/include/btr0pcur.h
+++ b/storage/innobase/include/btr0pcur.h
diff --git a/innobase/include/btr0pcur.ic b/storage/innobase/include/btr0pcur.ic
index 9a7d7867025..9a7d7867025 100644
--- a/innobase/include/btr0pcur.ic
+++ b/storage/innobase/include/btr0pcur.ic
diff --git a/innobase/include/btr0sea.h b/storage/innobase/include/btr0sea.h
index 78e88a24083..78e88a24083 100644
--- a/innobase/include/btr0sea.h
+++ b/storage/innobase/include/btr0sea.h
diff --git a/innobase/include/btr0sea.ic b/storage/innobase/include/btr0sea.ic
index 8a41042f713..8a41042f713 100644
--- a/innobase/include/btr0sea.ic
+++ b/storage/innobase/include/btr0sea.ic
diff --git a/innobase/include/btr0types.h b/storage/innobase/include/btr0types.h
index 03a61480e2e..03a61480e2e 100644
--- a/innobase/include/btr0types.h
+++ b/storage/innobase/include/btr0types.h
diff --git a/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h
index ae8d0411c12..ae8d0411c12 100644
--- a/innobase/include/buf0buf.h
+++ b/storage/innobase/include/buf0buf.h
diff --git a/innobase/include/buf0buf.ic b/storage/innobase/include/buf0buf.ic
index d949254d47d..d949254d47d 100644
--- a/innobase/include/buf0buf.ic
+++ b/storage/innobase/include/buf0buf.ic
diff --git a/innobase/include/buf0flu.h b/storage/innobase/include/buf0flu.h
index 1b40acaa269..1b40acaa269 100644
--- a/innobase/include/buf0flu.h
+++ b/storage/innobase/include/buf0flu.h
diff --git a/innobase/include/buf0flu.ic b/storage/innobase/include/buf0flu.ic
index 9a8a021e029..9a8a021e029 100644
--- a/innobase/include/buf0flu.ic
+++ b/storage/innobase/include/buf0flu.ic
diff --git a/innobase/include/buf0lru.h b/storage/innobase/include/buf0lru.h
index fb29b44ba98..fb29b44ba98 100644
--- a/innobase/include/buf0lru.h
+++ b/storage/innobase/include/buf0lru.h
diff --git a/innobase/include/buf0lru.ic b/storage/innobase/include/buf0lru.ic
index 7b8ee457b0b..7b8ee457b0b 100644
--- a/innobase/include/buf0lru.ic
+++ b/storage/innobase/include/buf0lru.ic
diff --git a/innobase/include/buf0rea.h b/storage/innobase/include/buf0rea.h
index 380a42f4b80..380a42f4b80 100644
--- a/innobase/include/buf0rea.h
+++ b/storage/innobase/include/buf0rea.h
diff --git a/innobase/include/buf0types.h b/storage/innobase/include/buf0types.h
index 44fdfa80e73..44fdfa80e73 100644
--- a/innobase/include/buf0types.h
+++ b/storage/innobase/include/buf0types.h
diff --git a/innobase/include/data0data.h b/storage/innobase/include/data0data.h
index 2136de0f9b3..2136de0f9b3 100644
--- a/innobase/include/data0data.h
+++ b/storage/innobase/include/data0data.h
diff --git a/innobase/include/data0data.ic b/storage/innobase/include/data0data.ic
index 0769372e16f..0769372e16f 100644
--- a/innobase/include/data0data.ic
+++ b/storage/innobase/include/data0data.ic
diff --git a/innobase/include/data0type.h b/storage/innobase/include/data0type.h
index 7e9692eca5a..7e9692eca5a 100644
--- a/innobase/include/data0type.h
+++ b/storage/innobase/include/data0type.h
diff --git a/innobase/include/data0type.ic b/storage/innobase/include/data0type.ic
index 06d45dd5501..06d45dd5501 100644
--- a/innobase/include/data0type.ic
+++ b/storage/innobase/include/data0type.ic
diff --git a/innobase/include/data0types.h b/storage/innobase/include/data0types.h
index ab314f8f471..ab314f8f471 100644
--- a/innobase/include/data0types.h
+++ b/storage/innobase/include/data0types.h
diff --git a/innobase/include/db0err.h b/storage/innobase/include/db0err.h
index de5ac44e73f..de5ac44e73f 100644
--- a/innobase/include/db0err.h
+++ b/storage/innobase/include/db0err.h
diff --git a/innobase/include/dict0boot.h b/storage/innobase/include/dict0boot.h
index 86702cbca05..86702cbca05 100644
--- a/innobase/include/dict0boot.h
+++ b/storage/innobase/include/dict0boot.h
diff --git a/innobase/include/dict0boot.ic b/storage/innobase/include/dict0boot.ic
index 8a91feed018..8a91feed018 100644
--- a/innobase/include/dict0boot.ic
+++ b/storage/innobase/include/dict0boot.ic
diff --git a/innobase/include/dict0crea.h b/storage/innobase/include/dict0crea.h
index 5dd571be59c..5dd571be59c 100644
--- a/innobase/include/dict0crea.h
+++ b/storage/innobase/include/dict0crea.h
diff --git a/innobase/include/dict0crea.ic b/storage/innobase/include/dict0crea.ic
index b4da2d7e03f..b4da2d7e03f 100644
--- a/innobase/include/dict0crea.ic
+++ b/storage/innobase/include/dict0crea.ic
diff --git a/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h
index d9cda402bac..d9cda402bac 100644
--- a/innobase/include/dict0dict.h
+++ b/storage/innobase/include/dict0dict.h
diff --git a/innobase/include/dict0dict.ic b/storage/innobase/include/dict0dict.ic
index 928a693f860..928a693f860 100644
--- a/innobase/include/dict0dict.ic
+++ b/storage/innobase/include/dict0dict.ic
diff --git a/innobase/include/dict0load.h b/storage/innobase/include/dict0load.h
index f13620bc6e8..f13620bc6e8 100644
--- a/innobase/include/dict0load.h
+++ b/storage/innobase/include/dict0load.h
diff --git a/innobase/include/dict0load.ic b/storage/innobase/include/dict0load.ic
index 1a207fbf0fd..1a207fbf0fd 100644
--- a/innobase/include/dict0load.ic
+++ b/storage/innobase/include/dict0load.ic
diff --git a/innobase/include/dict0mem.h b/storage/innobase/include/dict0mem.h
index ff6c4ec9b28..ff6c4ec9b28 100644
--- a/innobase/include/dict0mem.h
+++ b/storage/innobase/include/dict0mem.h
diff --git a/innobase/include/dict0mem.ic b/storage/innobase/include/dict0mem.ic
index 9bcefc2a51f..9bcefc2a51f 100644
--- a/innobase/include/dict0mem.ic
+++ b/storage/innobase/include/dict0mem.ic
diff --git a/innobase/include/dict0types.h b/storage/innobase/include/dict0types.h
index bd8a1a996d1..bd8a1a996d1 100644
--- a/innobase/include/dict0types.h
+++ b/storage/innobase/include/dict0types.h
diff --git a/innobase/include/dyn0dyn.h b/storage/innobase/include/dyn0dyn.h
index 1df976a5301..1df976a5301 100644
--- a/innobase/include/dyn0dyn.h
+++ b/storage/innobase/include/dyn0dyn.h
diff --git a/innobase/include/dyn0dyn.ic b/storage/innobase/include/dyn0dyn.ic
index c1b8f2cb8ce..c1b8f2cb8ce 100644
--- a/innobase/include/dyn0dyn.ic
+++ b/storage/innobase/include/dyn0dyn.ic
diff --git a/innobase/include/eval0eval.h b/storage/innobase/include/eval0eval.h
index 6561f0c8ae7..6561f0c8ae7 100644
--- a/innobase/include/eval0eval.h
+++ b/storage/innobase/include/eval0eval.h
diff --git a/innobase/include/eval0eval.ic b/storage/innobase/include/eval0eval.ic
index 069cbfe5f37..069cbfe5f37 100644
--- a/innobase/include/eval0eval.ic
+++ b/storage/innobase/include/eval0eval.ic
diff --git a/innobase/include/eval0proc.h b/storage/innobase/include/eval0proc.h
index 5d685ad9076..5d685ad9076 100644
--- a/innobase/include/eval0proc.h
+++ b/storage/innobase/include/eval0proc.h
diff --git a/innobase/include/eval0proc.ic b/storage/innobase/include/eval0proc.ic
index 0d7ecb6d1dc..0d7ecb6d1dc 100644
--- a/innobase/include/eval0proc.ic
+++ b/storage/innobase/include/eval0proc.ic
diff --git a/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h
index aa1ec5c25a5..aa1ec5c25a5 100644
--- a/innobase/include/fil0fil.h
+++ b/storage/innobase/include/fil0fil.h
diff --git a/innobase/include/fsp0fsp.h b/storage/innobase/include/fsp0fsp.h
index 2fcde882df7..2fcde882df7 100644
--- a/innobase/include/fsp0fsp.h
+++ b/storage/innobase/include/fsp0fsp.h
diff --git a/innobase/include/fsp0fsp.ic b/storage/innobase/include/fsp0fsp.ic
index 89cd9263bd6..89cd9263bd6 100644
--- a/innobase/include/fsp0fsp.ic
+++ b/storage/innobase/include/fsp0fsp.ic
diff --git a/innobase/include/fut0fut.h b/storage/innobase/include/fut0fut.h
index b9546b4e1a0..b9546b4e1a0 100644
--- a/innobase/include/fut0fut.h
+++ b/storage/innobase/include/fut0fut.h
diff --git a/innobase/include/fut0fut.ic b/storage/innobase/include/fut0fut.ic
index 6a107786376..6a107786376 100644
--- a/innobase/include/fut0fut.ic
+++ b/storage/innobase/include/fut0fut.ic
diff --git a/innobase/include/fut0lst.h b/storage/innobase/include/fut0lst.h
index 5427e2248da..5427e2248da 100644
--- a/innobase/include/fut0lst.h
+++ b/storage/innobase/include/fut0lst.h
diff --git a/innobase/include/fut0lst.ic b/storage/innobase/include/fut0lst.ic
index c0d61833b48..c0d61833b48 100644
--- a/innobase/include/fut0lst.ic
+++ b/storage/innobase/include/fut0lst.ic
diff --git a/innobase/include/ha0ha.h b/storage/innobase/include/ha0ha.h
index bdaecfcc57a..bdaecfcc57a 100644
--- a/innobase/include/ha0ha.h
+++ b/storage/innobase/include/ha0ha.h
diff --git a/innobase/include/ha0ha.ic b/storage/innobase/include/ha0ha.ic
index 63cd19fafc3..63cd19fafc3 100644
--- a/innobase/include/ha0ha.ic
+++ b/storage/innobase/include/ha0ha.ic
diff --git a/innobase/include/hash0hash.h b/storage/innobase/include/hash0hash.h
index 51315e40875..51315e40875 100644
--- a/innobase/include/hash0hash.h
+++ b/storage/innobase/include/hash0hash.h
diff --git a/innobase/include/hash0hash.ic b/storage/innobase/include/hash0hash.ic
index 0d713140c13..0d713140c13 100644
--- a/innobase/include/hash0hash.ic
+++ b/storage/innobase/include/hash0hash.ic
diff --git a/innobase/include/ibuf0ibuf.h b/storage/innobase/include/ibuf0ibuf.h
index 4f38ab4f1e9..4f38ab4f1e9 100644
--- a/innobase/include/ibuf0ibuf.h
+++ b/storage/innobase/include/ibuf0ibuf.h
diff --git a/innobase/include/ibuf0ibuf.ic b/storage/innobase/include/ibuf0ibuf.ic
index 68f7ce9c1d0..68f7ce9c1d0 100644
--- a/innobase/include/ibuf0ibuf.ic
+++ b/storage/innobase/include/ibuf0ibuf.ic
diff --git a/innobase/include/ibuf0types.h b/storage/innobase/include/ibuf0types.h
index fb202ac44b0..fb202ac44b0 100644
--- a/innobase/include/ibuf0types.h
+++ b/storage/innobase/include/ibuf0types.h
diff --git a/innobase/include/lock0lock.h b/storage/innobase/include/lock0lock.h
index 20b1f1d7145..20b1f1d7145 100644
--- a/innobase/include/lock0lock.h
+++ b/storage/innobase/include/lock0lock.h
diff --git a/innobase/include/lock0lock.ic b/storage/innobase/include/lock0lock.ic
index c7a71bb45d8..c7a71bb45d8 100644
--- a/innobase/include/lock0lock.ic
+++ b/storage/innobase/include/lock0lock.ic
diff --git a/innobase/include/lock0types.h b/storage/innobase/include/lock0types.h
index 6c3e54ee1fc..6c3e54ee1fc 100644
--- a/innobase/include/lock0types.h
+++ b/storage/innobase/include/lock0types.h
diff --git a/innobase/include/log0log.h b/storage/innobase/include/log0log.h
index 7f3f10438b4..7f3f10438b4 100644
--- a/innobase/include/log0log.h
+++ b/storage/innobase/include/log0log.h
diff --git a/innobase/include/log0log.ic b/storage/innobase/include/log0log.ic
index ca7531783a2..ca7531783a2 100644
--- a/innobase/include/log0log.ic
+++ b/storage/innobase/include/log0log.ic
diff --git a/innobase/include/log0recv.h b/storage/innobase/include/log0recv.h
index 658df4d5586..658df4d5586 100644
--- a/innobase/include/log0recv.h
+++ b/storage/innobase/include/log0recv.h
diff --git a/innobase/include/log0recv.ic b/storage/innobase/include/log0recv.ic
index 489641bade2..489641bade2 100644
--- a/innobase/include/log0recv.ic
+++ b/storage/innobase/include/log0recv.ic
diff --git a/innobase/include/mach0data.h b/storage/innobase/include/mach0data.h
index f9a3ff521d5..f9a3ff521d5 100644
--- a/innobase/include/mach0data.h
+++ b/storage/innobase/include/mach0data.h
diff --git a/innobase/include/mach0data.ic b/storage/innobase/include/mach0data.ic
index 888f3f743e4..888f3f743e4 100644
--- a/innobase/include/mach0data.ic
+++ b/storage/innobase/include/mach0data.ic
diff --git a/innobase/include/makefilewin.i b/storage/innobase/include/makefilewin.i
index f756cf2ea3a..f756cf2ea3a 100644
--- a/innobase/include/makefilewin.i
+++ b/storage/innobase/include/makefilewin.i
diff --git a/innobase/include/mem0dbg.h b/storage/innobase/include/mem0dbg.h
index 96f30842df6..96f30842df6 100644
--- a/innobase/include/mem0dbg.h
+++ b/storage/innobase/include/mem0dbg.h
diff --git a/innobase/include/mem0dbg.ic b/storage/innobase/include/mem0dbg.ic
index 7ce5f6f1ba5..7ce5f6f1ba5 100644
--- a/innobase/include/mem0dbg.ic
+++ b/storage/innobase/include/mem0dbg.ic
diff --git a/innobase/include/mem0mem.h b/storage/innobase/include/mem0mem.h
index 87afdb8f91c..87afdb8f91c 100644
--- a/innobase/include/mem0mem.h
+++ b/storage/innobase/include/mem0mem.h
diff --git a/innobase/include/mem0mem.ic b/storage/innobase/include/mem0mem.ic
index 8c87c884d78..8c87c884d78 100644
--- a/innobase/include/mem0mem.ic
+++ b/storage/innobase/include/mem0mem.ic
diff --git a/innobase/include/mem0pool.h b/storage/innobase/include/mem0pool.h
index 43707bd5f61..43707bd5f61 100644
--- a/innobase/include/mem0pool.h
+++ b/storage/innobase/include/mem0pool.h
diff --git a/innobase/include/mem0pool.ic b/storage/innobase/include/mem0pool.ic
index 4e8c08733ed..4e8c08733ed 100644
--- a/innobase/include/mem0pool.ic
+++ b/storage/innobase/include/mem0pool.ic
diff --git a/innobase/include/mtr0log.h b/storage/innobase/include/mtr0log.h
index 6a3920aa8a1..6a3920aa8a1 100644
--- a/innobase/include/mtr0log.h
+++ b/storage/innobase/include/mtr0log.h
diff --git a/innobase/include/mtr0log.ic b/storage/innobase/include/mtr0log.ic
index 08d9a6448eb..08d9a6448eb 100644
--- a/innobase/include/mtr0log.ic
+++ b/storage/innobase/include/mtr0log.ic
diff --git a/innobase/include/mtr0mtr.h b/storage/innobase/include/mtr0mtr.h
index f44e813cf6b..f44e813cf6b 100644
--- a/innobase/include/mtr0mtr.h
+++ b/storage/innobase/include/mtr0mtr.h
diff --git a/innobase/include/mtr0mtr.ic b/storage/innobase/include/mtr0mtr.ic
index 4fc6dd2f6a9..4fc6dd2f6a9 100644
--- a/innobase/include/mtr0mtr.ic
+++ b/storage/innobase/include/mtr0mtr.ic
diff --git a/innobase/include/mtr0types.h b/storage/innobase/include/mtr0types.h
index e3b6ec9a84f..e3b6ec9a84f 100644
--- a/innobase/include/mtr0types.h
+++ b/storage/innobase/include/mtr0types.h
diff --git a/innobase/include/os0file.h b/storage/innobase/include/os0file.h
index 362e3552411..362e3552411 100644
--- a/innobase/include/os0file.h
+++ b/storage/innobase/include/os0file.h
diff --git a/innobase/include/os0proc.h b/storage/innobase/include/os0proc.h
index b0b72e18675..b0b72e18675 100644
--- a/innobase/include/os0proc.h
+++ b/storage/innobase/include/os0proc.h
diff --git a/innobase/include/os0proc.ic b/storage/innobase/include/os0proc.ic
index 651ba1f17e3..651ba1f17e3 100644
--- a/innobase/include/os0proc.ic
+++ b/storage/innobase/include/os0proc.ic
diff --git a/innobase/include/os0sync.h b/storage/innobase/include/os0sync.h
index d27b1676f1b..d27b1676f1b 100644
--- a/innobase/include/os0sync.h
+++ b/storage/innobase/include/os0sync.h
diff --git a/innobase/include/os0sync.ic b/storage/innobase/include/os0sync.ic
index 1337e97152a..1337e97152a 100644
--- a/innobase/include/os0sync.ic
+++ b/storage/innobase/include/os0sync.ic
diff --git a/innobase/include/os0thread.h b/storage/innobase/include/os0thread.h
index c00d28baf60..c00d28baf60 100644
--- a/innobase/include/os0thread.h
+++ b/storage/innobase/include/os0thread.h
diff --git a/innobase/include/os0thread.ic b/storage/innobase/include/os0thread.ic
index a75aa3abb34..a75aa3abb34 100644
--- a/innobase/include/os0thread.ic
+++ b/storage/innobase/include/os0thread.ic
diff --git a/innobase/include/page0cur.h b/storage/innobase/include/page0cur.h
index b03302b0e77..b03302b0e77 100644
--- a/innobase/include/page0cur.h
+++ b/storage/innobase/include/page0cur.h
diff --git a/innobase/include/page0cur.ic b/storage/innobase/include/page0cur.ic
index f8346819e84..f8346819e84 100644
--- a/innobase/include/page0cur.ic
+++ b/storage/innobase/include/page0cur.ic
diff --git a/innobase/include/page0page.h b/storage/innobase/include/page0page.h
index c4ffa39d3ac..c4ffa39d3ac 100644
--- a/innobase/include/page0page.h
+++ b/storage/innobase/include/page0page.h
diff --git a/innobase/include/page0page.ic b/storage/innobase/include/page0page.ic
index fd5281fdbec..fd5281fdbec 100644
--- a/innobase/include/page0page.ic
+++ b/storage/innobase/include/page0page.ic
diff --git a/innobase/include/page0types.h b/storage/innobase/include/page0types.h
index 525a0366a6f..525a0366a6f 100644
--- a/innobase/include/page0types.h
+++ b/storage/innobase/include/page0types.h
diff --git a/innobase/include/pars0grm.h b/storage/innobase/include/pars0grm.h
index b2790949057..b2790949057 100644
--- a/innobase/include/pars0grm.h
+++ b/storage/innobase/include/pars0grm.h
diff --git a/innobase/include/pars0opt.h b/storage/innobase/include/pars0opt.h
index d091c3ee2d0..d091c3ee2d0 100644
--- a/innobase/include/pars0opt.h
+++ b/storage/innobase/include/pars0opt.h
diff --git a/innobase/include/pars0opt.ic b/storage/innobase/include/pars0opt.ic
index 0bfa8526bee..0bfa8526bee 100644
--- a/innobase/include/pars0opt.ic
+++ b/storage/innobase/include/pars0opt.ic
diff --git a/innobase/include/pars0pars.h b/storage/innobase/include/pars0pars.h
index 62a41a881e8..62a41a881e8 100644
--- a/innobase/include/pars0pars.h
+++ b/storage/innobase/include/pars0pars.h
diff --git a/innobase/include/pars0pars.ic b/storage/innobase/include/pars0pars.ic
index 155b6659ace..155b6659ace 100644
--- a/innobase/include/pars0pars.ic
+++ b/storage/innobase/include/pars0pars.ic
diff --git a/innobase/include/pars0sym.h b/storage/innobase/include/pars0sym.h
index 633a49e3cb5..633a49e3cb5 100644
--- a/innobase/include/pars0sym.h
+++ b/storage/innobase/include/pars0sym.h
diff --git a/innobase/include/pars0sym.ic b/storage/innobase/include/pars0sym.ic
index 9508d423769..9508d423769 100644
--- a/innobase/include/pars0sym.ic
+++ b/storage/innobase/include/pars0sym.ic
diff --git a/innobase/include/pars0types.h b/storage/innobase/include/pars0types.h
index 9fbfd6efaa1..9fbfd6efaa1 100644
--- a/innobase/include/pars0types.h
+++ b/storage/innobase/include/pars0types.h
diff --git a/innobase/include/que0que.h b/storage/innobase/include/que0que.h
index 4113e52d425..4113e52d425 100644
--- a/innobase/include/que0que.h
+++ b/storage/innobase/include/que0que.h
diff --git a/innobase/include/que0que.ic b/storage/innobase/include/que0que.ic
index ae4ed10560f..ae4ed10560f 100644
--- a/innobase/include/que0que.ic
+++ b/storage/innobase/include/que0que.ic
diff --git a/innobase/include/que0types.h b/storage/innobase/include/que0types.h
index e59c2313a5a..e59c2313a5a 100644
--- a/innobase/include/que0types.h
+++ b/storage/innobase/include/que0types.h
diff --git a/innobase/include/read0read.h b/storage/innobase/include/read0read.h
index db6bf888095..db6bf888095 100644
--- a/innobase/include/read0read.h
+++ b/storage/innobase/include/read0read.h
diff --git a/innobase/include/read0read.ic b/storage/innobase/include/read0read.ic
index ec9ef5814bb..ec9ef5814bb 100644
--- a/innobase/include/read0read.ic
+++ b/storage/innobase/include/read0read.ic
diff --git a/innobase/include/read0types.h b/storage/innobase/include/read0types.h
index 5eb3e533f89..5eb3e533f89 100644
--- a/innobase/include/read0types.h
+++ b/storage/innobase/include/read0types.h
diff --git a/innobase/include/rem0cmp.h b/storage/innobase/include/rem0cmp.h
index 1b1ee26b809..1b1ee26b809 100644
--- a/innobase/include/rem0cmp.h
+++ b/storage/innobase/include/rem0cmp.h
diff --git a/innobase/include/rem0cmp.ic b/storage/innobase/include/rem0cmp.ic
index b86534e0a6a..b86534e0a6a 100644
--- a/innobase/include/rem0cmp.ic
+++ b/storage/innobase/include/rem0cmp.ic
diff --git a/innobase/include/rem0rec.h b/storage/innobase/include/rem0rec.h
index 1d15b8d1c77..1d15b8d1c77 100644
--- a/innobase/include/rem0rec.h
+++ b/storage/innobase/include/rem0rec.h
diff --git a/innobase/include/rem0rec.ic b/storage/innobase/include/rem0rec.ic
index e2dceb6bae5..e2dceb6bae5 100644
--- a/innobase/include/rem0rec.ic
+++ b/storage/innobase/include/rem0rec.ic
diff --git a/innobase/include/rem0types.h b/storage/innobase/include/rem0types.h
index 94c394499c5..94c394499c5 100644
--- a/innobase/include/rem0types.h
+++ b/storage/innobase/include/rem0types.h
diff --git a/innobase/include/row0ins.h b/storage/innobase/include/row0ins.h
index a5b4b74e7fc..a5b4b74e7fc 100644
--- a/innobase/include/row0ins.h
+++ b/storage/innobase/include/row0ins.h
diff --git a/innobase/include/row0ins.ic b/storage/innobase/include/row0ins.ic
index 80a232d41ee..80a232d41ee 100644
--- a/innobase/include/row0ins.ic
+++ b/storage/innobase/include/row0ins.ic
diff --git a/innobase/include/row0mysql.h b/storage/innobase/include/row0mysql.h
index 4e6ff73b0f8..4e6ff73b0f8 100644
--- a/innobase/include/row0mysql.h
+++ b/storage/innobase/include/row0mysql.h
diff --git a/innobase/include/row0mysql.ic b/storage/innobase/include/row0mysql.ic
index aa8a70d8761..aa8a70d8761 100644
--- a/innobase/include/row0mysql.ic
+++ b/storage/innobase/include/row0mysql.ic
diff --git a/innobase/include/row0purge.h b/storage/innobase/include/row0purge.h
index 4c863441442..4c863441442 100644
--- a/innobase/include/row0purge.h
+++ b/storage/innobase/include/row0purge.h
diff --git a/innobase/include/row0purge.ic b/storage/innobase/include/row0purge.ic
index 50aabf0bc1b..50aabf0bc1b 100644
--- a/innobase/include/row0purge.ic
+++ b/storage/innobase/include/row0purge.ic
diff --git a/innobase/include/row0row.h b/storage/innobase/include/row0row.h
index 782973d8f5d..782973d8f5d 100644
--- a/innobase/include/row0row.h
+++ b/storage/innobase/include/row0row.h
diff --git a/innobase/include/row0row.ic b/storage/innobase/include/row0row.ic
index 85410beacf0..85410beacf0 100644
--- a/innobase/include/row0row.ic
+++ b/storage/innobase/include/row0row.ic
diff --git a/innobase/include/row0sel.h b/storage/innobase/include/row0sel.h
index 8d5187bfc1c..8d5187bfc1c 100644
--- a/innobase/include/row0sel.h
+++ b/storage/innobase/include/row0sel.h
diff --git a/innobase/include/row0sel.ic b/storage/innobase/include/row0sel.ic
index 600c6204571..600c6204571 100644
--- a/innobase/include/row0sel.ic
+++ b/storage/innobase/include/row0sel.ic
diff --git a/innobase/include/row0types.h b/storage/innobase/include/row0types.h
index 79b864f4835..79b864f4835 100644
--- a/innobase/include/row0types.h
+++ b/storage/innobase/include/row0types.h
diff --git a/innobase/include/row0uins.h b/storage/innobase/include/row0uins.h
index fc57881f691..fc57881f691 100644
--- a/innobase/include/row0uins.h
+++ b/storage/innobase/include/row0uins.h
diff --git a/innobase/include/row0uins.ic b/storage/innobase/include/row0uins.ic
index 2b3d5a10f95..2b3d5a10f95 100644
--- a/innobase/include/row0uins.ic
+++ b/storage/innobase/include/row0uins.ic
diff --git a/innobase/include/row0umod.h b/storage/innobase/include/row0umod.h
index 2c8e19a80ae..2c8e19a80ae 100644
--- a/innobase/include/row0umod.h
+++ b/storage/innobase/include/row0umod.h
diff --git a/innobase/include/row0umod.ic b/storage/innobase/include/row0umod.ic
index fcbf4dbc1f3..fcbf4dbc1f3 100644
--- a/innobase/include/row0umod.ic
+++ b/storage/innobase/include/row0umod.ic
diff --git a/innobase/include/row0undo.h b/storage/innobase/include/row0undo.h
index d64a00dcb8f..d64a00dcb8f 100644
--- a/innobase/include/row0undo.h
+++ b/storage/innobase/include/row0undo.h
diff --git a/innobase/include/row0undo.ic b/storage/innobase/include/row0undo.ic
index e7f89c7de67..e7f89c7de67 100644
--- a/innobase/include/row0undo.ic
+++ b/storage/innobase/include/row0undo.ic
diff --git a/innobase/include/row0upd.h b/storage/innobase/include/row0upd.h
index 673e0511153..673e0511153 100644
--- a/innobase/include/row0upd.h
+++ b/storage/innobase/include/row0upd.h
diff --git a/innobase/include/row0upd.ic b/storage/innobase/include/row0upd.ic
index acbb11aa1c7..acbb11aa1c7 100644
--- a/innobase/include/row0upd.ic
+++ b/storage/innobase/include/row0upd.ic
diff --git a/innobase/include/row0vers.h b/storage/innobase/include/row0vers.h
index 079d841f7f3..079d841f7f3 100644
--- a/innobase/include/row0vers.h
+++ b/storage/innobase/include/row0vers.h
diff --git a/innobase/include/row0vers.ic b/storage/innobase/include/row0vers.ic
index ab1e264635b..ab1e264635b 100644
--- a/innobase/include/row0vers.ic
+++ b/storage/innobase/include/row0vers.ic
diff --git a/innobase/include/srv0que.h b/storage/innobase/include/srv0que.h
index 05c339cdd32..05c339cdd32 100644
--- a/innobase/include/srv0que.h
+++ b/storage/innobase/include/srv0que.h
diff --git a/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
index 116ae7b6438..116ae7b6438 100644
--- a/innobase/include/srv0srv.h
+++ b/storage/innobase/include/srv0srv.h
diff --git a/innobase/include/srv0srv.ic b/storage/innobase/include/srv0srv.ic
index 73e0729660f..73e0729660f 100644
--- a/innobase/include/srv0srv.ic
+++ b/storage/innobase/include/srv0srv.ic
diff --git a/innobase/include/srv0start.h b/storage/innobase/include/srv0start.h
index d24f119c0b0..d24f119c0b0 100644
--- a/innobase/include/srv0start.h
+++ b/storage/innobase/include/srv0start.h
diff --git a/innobase/include/sync0arr.h b/storage/innobase/include/sync0arr.h
index fecd910683e..fecd910683e 100644
--- a/innobase/include/sync0arr.h
+++ b/storage/innobase/include/sync0arr.h
diff --git a/innobase/include/sync0arr.ic b/storage/innobase/include/sync0arr.ic
index dbe35c033e5..dbe35c033e5 100644
--- a/innobase/include/sync0arr.ic
+++ b/storage/innobase/include/sync0arr.ic
diff --git a/innobase/include/sync0rw.h b/storage/innobase/include/sync0rw.h
index 911c8ac3f4a..911c8ac3f4a 100644
--- a/innobase/include/sync0rw.h
+++ b/storage/innobase/include/sync0rw.h
diff --git a/innobase/include/sync0rw.ic b/storage/innobase/include/sync0rw.ic
index b1ae636010a..b1ae636010a 100644
--- a/innobase/include/sync0rw.ic
+++ b/storage/innobase/include/sync0rw.ic
diff --git a/innobase/include/sync0sync.h b/storage/innobase/include/sync0sync.h
index c798c047fa3..c798c047fa3 100644
--- a/innobase/include/sync0sync.h
+++ b/storage/innobase/include/sync0sync.h
diff --git a/innobase/include/sync0sync.ic b/storage/innobase/include/sync0sync.ic
index b3fde61db5e..b3fde61db5e 100644
--- a/innobase/include/sync0sync.ic
+++ b/storage/innobase/include/sync0sync.ic
diff --git a/innobase/include/sync0types.h b/storage/innobase/include/sync0types.h
index 57478426f25..57478426f25 100644
--- a/innobase/include/sync0types.h
+++ b/storage/innobase/include/sync0types.h
diff --git a/innobase/include/thr0loc.h b/storage/innobase/include/thr0loc.h
index 32e2dc3ae93..32e2dc3ae93 100644
--- a/innobase/include/thr0loc.h
+++ b/storage/innobase/include/thr0loc.h
diff --git a/innobase/include/thr0loc.ic b/storage/innobase/include/thr0loc.ic
index b8b8136180c..b8b8136180c 100644
--- a/innobase/include/thr0loc.ic
+++ b/storage/innobase/include/thr0loc.ic
diff --git a/innobase/include/trx0purge.h b/storage/innobase/include/trx0purge.h
index 049c79aec9b..049c79aec9b 100644
--- a/innobase/include/trx0purge.h
+++ b/storage/innobase/include/trx0purge.h
diff --git a/innobase/include/trx0purge.ic b/storage/innobase/include/trx0purge.ic
index 451e8ca31d0..451e8ca31d0 100644
--- a/innobase/include/trx0purge.ic
+++ b/storage/innobase/include/trx0purge.ic
diff --git a/innobase/include/trx0rec.h b/storage/innobase/include/trx0rec.h
index 4387ce1a61e..4387ce1a61e 100644
--- a/innobase/include/trx0rec.h
+++ b/storage/innobase/include/trx0rec.h
diff --git a/innobase/include/trx0rec.ic b/storage/innobase/include/trx0rec.ic
index cd02ed9e04c..cd02ed9e04c 100644
--- a/innobase/include/trx0rec.ic
+++ b/storage/innobase/include/trx0rec.ic
diff --git a/innobase/include/trx0roll.h b/storage/innobase/include/trx0roll.h
index 944142a299d..944142a299d 100644
--- a/innobase/include/trx0roll.h
+++ b/storage/innobase/include/trx0roll.h
diff --git a/innobase/include/trx0roll.ic b/storage/innobase/include/trx0roll.ic
index dfde83ac478..dfde83ac478 100644
--- a/innobase/include/trx0roll.ic
+++ b/storage/innobase/include/trx0roll.ic
diff --git a/innobase/include/trx0rseg.h b/storage/innobase/include/trx0rseg.h
index fd64612ab3f..fd64612ab3f 100644
--- a/innobase/include/trx0rseg.h
+++ b/storage/innobase/include/trx0rseg.h
diff --git a/innobase/include/trx0rseg.ic b/storage/innobase/include/trx0rseg.ic
index c9ac50ebf16..c9ac50ebf16 100644
--- a/innobase/include/trx0rseg.ic
+++ b/storage/innobase/include/trx0rseg.ic
diff --git a/innobase/include/trx0sys.h b/storage/innobase/include/trx0sys.h
index 31e8607f8a0..31e8607f8a0 100644
--- a/innobase/include/trx0sys.h
+++ b/storage/innobase/include/trx0sys.h
diff --git a/innobase/include/trx0sys.ic b/storage/innobase/include/trx0sys.ic
index 24610bef827..24610bef827 100644
--- a/innobase/include/trx0sys.ic
+++ b/storage/innobase/include/trx0sys.ic
diff --git a/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h
index 146730d46f8..146730d46f8 100644
--- a/innobase/include/trx0trx.h
+++ b/storage/innobase/include/trx0trx.h
diff --git a/innobase/include/trx0trx.ic b/storage/innobase/include/trx0trx.ic
index 54cf2ff331f..54cf2ff331f 100644
--- a/innobase/include/trx0trx.ic
+++ b/storage/innobase/include/trx0trx.ic
diff --git a/innobase/include/trx0types.h b/storage/innobase/include/trx0types.h
index 2965eb4451f..2965eb4451f 100644
--- a/innobase/include/trx0types.h
+++ b/storage/innobase/include/trx0types.h
diff --git a/innobase/include/trx0undo.h b/storage/innobase/include/trx0undo.h
index bd7337e4f90..bd7337e4f90 100644
--- a/innobase/include/trx0undo.h
+++ b/storage/innobase/include/trx0undo.h
diff --git a/innobase/include/trx0undo.ic b/storage/innobase/include/trx0undo.ic
index a04b234b495..a04b234b495 100644
--- a/innobase/include/trx0undo.ic
+++ b/storage/innobase/include/trx0undo.ic
diff --git a/innobase/include/trx0xa.h b/storage/innobase/include/trx0xa.h
index 34b7a2f95a8..34b7a2f95a8 100644
--- a/innobase/include/trx0xa.h
+++ b/storage/innobase/include/trx0xa.h
diff --git a/innobase/include/univ.i b/storage/innobase/include/univ.i
index 132ac9e18c5..132ac9e18c5 100644
--- a/innobase/include/univ.i
+++ b/storage/innobase/include/univ.i
diff --git a/innobase/include/usr0sess.h b/storage/innobase/include/usr0sess.h
index c7bcfb20fed..c7bcfb20fed 100644
--- a/innobase/include/usr0sess.h
+++ b/storage/innobase/include/usr0sess.h
diff --git a/innobase/include/usr0sess.ic b/storage/innobase/include/usr0sess.ic
index c851d5745b9..c851d5745b9 100644
--- a/innobase/include/usr0sess.ic
+++ b/storage/innobase/include/usr0sess.ic
diff --git a/innobase/include/usr0types.h b/storage/innobase/include/usr0types.h
index 29359425169..29359425169 100644
--- a/innobase/include/usr0types.h
+++ b/storage/innobase/include/usr0types.h
diff --git a/innobase/include/ut0byte.h b/storage/innobase/include/ut0byte.h
index 22d488abeaf..22d488abeaf 100644
--- a/innobase/include/ut0byte.h
+++ b/storage/innobase/include/ut0byte.h
diff --git a/innobase/include/ut0byte.ic b/storage/innobase/include/ut0byte.ic
index e141de3aa3f..e141de3aa3f 100644
--- a/innobase/include/ut0byte.ic
+++ b/storage/innobase/include/ut0byte.ic
diff --git a/innobase/include/ut0dbg.h b/storage/innobase/include/ut0dbg.h
index bc3f852626a..bc3f852626a 100644
--- a/innobase/include/ut0dbg.h
+++ b/storage/innobase/include/ut0dbg.h
diff --git a/innobase/include/ut0lst.h b/storage/innobase/include/ut0lst.h
index d290c476963..d290c476963 100644
--- a/innobase/include/ut0lst.h
+++ b/storage/innobase/include/ut0lst.h
diff --git a/innobase/include/ut0mem.h b/storage/innobase/include/ut0mem.h
index 74357f6bf13..74357f6bf13 100644
--- a/innobase/include/ut0mem.h
+++ b/storage/innobase/include/ut0mem.h
diff --git a/innobase/include/ut0mem.ic b/storage/innobase/include/ut0mem.ic
index 76c721112a0..76c721112a0 100644
--- a/innobase/include/ut0mem.ic
+++ b/storage/innobase/include/ut0mem.ic
diff --git a/innobase/include/ut0rnd.h b/storage/innobase/include/ut0rnd.h
index aeec5d2f6eb..aeec5d2f6eb 100644
--- a/innobase/include/ut0rnd.h
+++ b/storage/innobase/include/ut0rnd.h
diff --git a/innobase/include/ut0rnd.ic b/storage/innobase/include/ut0rnd.ic
index d2ab087d491..d2ab087d491 100644
--- a/innobase/include/ut0rnd.ic
+++ b/storage/innobase/include/ut0rnd.ic
diff --git a/innobase/include/ut0sort.h b/storage/innobase/include/ut0sort.h
index d0a3d34e79e..d0a3d34e79e 100644
--- a/innobase/include/ut0sort.h
+++ b/storage/innobase/include/ut0sort.h
diff --git a/innobase/include/ut0ut.h b/storage/innobase/include/ut0ut.h
index 8938957cd12..8938957cd12 100644
--- a/innobase/include/ut0ut.h
+++ b/storage/innobase/include/ut0ut.h
diff --git a/innobase/include/ut0ut.ic b/storage/innobase/include/ut0ut.ic
index 9a0ef1c0d5b..9a0ef1c0d5b 100644
--- a/innobase/include/ut0ut.ic
+++ b/storage/innobase/include/ut0ut.ic
diff --git a/innobase/lock/Makefile.am b/storage/innobase/lock/Makefile.am
index 549eb2604e3..549eb2604e3 100644
--- a/innobase/lock/Makefile.am
+++ b/storage/innobase/lock/Makefile.am
diff --git a/innobase/lock/lock0lock.c b/storage/innobase/lock/lock0lock.c
index 280c4871ee9..280c4871ee9 100644
--- a/innobase/lock/lock0lock.c
+++ b/storage/innobase/lock/lock0lock.c
diff --git a/innobase/lock/makefilewin b/storage/innobase/lock/makefilewin
index 149b0a2fed6..149b0a2fed6 100644
--- a/innobase/lock/makefilewin
+++ b/storage/innobase/lock/makefilewin
diff --git a/innobase/log/Makefile.am b/storage/innobase/log/Makefile.am
index 2dbaf93e6d9..2dbaf93e6d9 100644
--- a/innobase/log/Makefile.am
+++ b/storage/innobase/log/Makefile.am
diff --git a/innobase/log/log0log.c b/storage/innobase/log/log0log.c
index 2f76bf450db..2f76bf450db 100644
--- a/innobase/log/log0log.c
+++ b/storage/innobase/log/log0log.c
diff --git a/innobase/log/log0recv.c b/storage/innobase/log/log0recv.c
index 42e854398ba..42e854398ba 100644
--- a/innobase/log/log0recv.c
+++ b/storage/innobase/log/log0recv.c
diff --git a/innobase/log/makefilewin b/storage/innobase/log/makefilewin
index a690af3bb35..a690af3bb35 100644
--- a/innobase/log/makefilewin
+++ b/storage/innobase/log/makefilewin
diff --git a/innobase/mach/Makefile.am b/storage/innobase/mach/Makefile.am
index ce827c8033f..ce827c8033f 100644
--- a/innobase/mach/Makefile.am
+++ b/storage/innobase/mach/Makefile.am
diff --git a/innobase/mach/mach0data.c b/storage/innobase/mach/mach0data.c
index ff7265b34f4..ff7265b34f4 100644
--- a/innobase/mach/mach0data.c
+++ b/storage/innobase/mach/mach0data.c
diff --git a/innobase/mach/makefilewin b/storage/innobase/mach/makefilewin
index 5306b0fe14c..5306b0fe14c 100644
--- a/innobase/mach/makefilewin
+++ b/storage/innobase/mach/makefilewin
diff --git a/innobase/makefilewin b/storage/innobase/makefilewin
index 1bd8d96e5e7..1bd8d96e5e7 100644
--- a/innobase/makefilewin
+++ b/storage/innobase/makefilewin
diff --git a/innobase/mem/Makefile.am b/storage/innobase/mem/Makefile.am
index 10b7771b580..10b7771b580 100644
--- a/innobase/mem/Makefile.am
+++ b/storage/innobase/mem/Makefile.am
diff --git a/innobase/mem/makefilewin b/storage/innobase/mem/makefilewin
index 8a30f8a6e71..8a30f8a6e71 100644
--- a/innobase/mem/makefilewin
+++ b/storage/innobase/mem/makefilewin
diff --git a/innobase/mem/mem0dbg.c b/storage/innobase/mem/mem0dbg.c
index 7c0be818948..7c0be818948 100644
--- a/innobase/mem/mem0dbg.c
+++ b/storage/innobase/mem/mem0dbg.c
diff --git a/innobase/mem/mem0mem.c b/storage/innobase/mem/mem0mem.c
index 85f0119d02a..85f0119d02a 100644
--- a/innobase/mem/mem0mem.c
+++ b/storage/innobase/mem/mem0mem.c
diff --git a/innobase/mem/mem0pool.c b/storage/innobase/mem/mem0pool.c
index cb891a03092..cb891a03092 100644
--- a/innobase/mem/mem0pool.c
+++ b/storage/innobase/mem/mem0pool.c
diff --git a/innobase/mtr/Makefile.am b/storage/innobase/mtr/Makefile.am
index 1e93a34ce23..1e93a34ce23 100644
--- a/innobase/mtr/Makefile.am
+++ b/storage/innobase/mtr/Makefile.am
diff --git a/innobase/mtr/makefilewin b/storage/innobase/mtr/makefilewin
index 9da0863bd28..9da0863bd28 100644
--- a/innobase/mtr/makefilewin
+++ b/storage/innobase/mtr/makefilewin
diff --git a/innobase/mtr/mtr0log.c b/storage/innobase/mtr/mtr0log.c
index 0308619073a..0308619073a 100644
--- a/innobase/mtr/mtr0log.c
+++ b/storage/innobase/mtr/mtr0log.c
diff --git a/innobase/mtr/mtr0mtr.c b/storage/innobase/mtr/mtr0mtr.c
index da045be1f62..da045be1f62 100644
--- a/innobase/mtr/mtr0mtr.c
+++ b/storage/innobase/mtr/mtr0mtr.c
diff --git a/innobase/my_cnf b/storage/innobase/my_cnf
index 94365237841..94365237841 100644
--- a/innobase/my_cnf
+++ b/storage/innobase/my_cnf
diff --git a/innobase/os/Makefile.am b/storage/innobase/os/Makefile.am
index 3b09a10efb5..3b09a10efb5 100644
--- a/innobase/os/Makefile.am
+++ b/storage/innobase/os/Makefile.am
diff --git a/innobase/os/makefilewin b/storage/innobase/os/makefilewin
index 8bc8d08611b..8bc8d08611b 100644
--- a/innobase/os/makefilewin
+++ b/storage/innobase/os/makefilewin
diff --git a/innobase/os/os0file.c b/storage/innobase/os/os0file.c
index 48dc808e36c..48dc808e36c 100644
--- a/innobase/os/os0file.c
+++ b/storage/innobase/os/os0file.c
diff --git a/innobase/os/os0proc.c b/storage/innobase/os/os0proc.c
index 167aed93de7..167aed93de7 100644
--- a/innobase/os/os0proc.c
+++ b/storage/innobase/os/os0proc.c
diff --git a/innobase/os/os0sync.c b/storage/innobase/os/os0sync.c
index 356d7c8c163..356d7c8c163 100644
--- a/innobase/os/os0sync.c
+++ b/storage/innobase/os/os0sync.c
diff --git a/innobase/os/os0thread.c b/storage/innobase/os/os0thread.c
index 847d0ee1cc7..847d0ee1cc7 100644
--- a/innobase/os/os0thread.c
+++ b/storage/innobase/os/os0thread.c
diff --git a/innobase/page/Makefile.am b/storage/innobase/page/Makefile.am
index 2e260787438..2e260787438 100644
--- a/innobase/page/Makefile.am
+++ b/storage/innobase/page/Makefile.am
diff --git a/innobase/page/makefilewin b/storage/innobase/page/makefilewin
index 4a132cf828c..4a132cf828c 100644
--- a/innobase/page/makefilewin
+++ b/storage/innobase/page/makefilewin
diff --git a/innobase/page/page0cur.c b/storage/innobase/page/page0cur.c
index d0b89e81787..d0b89e81787 100644
--- a/innobase/page/page0cur.c
+++ b/storage/innobase/page/page0cur.c
diff --git a/innobase/page/page0page.c b/storage/innobase/page/page0page.c
index 7e09cdf073e..7e09cdf073e 100644
--- a/innobase/page/page0page.c
+++ b/storage/innobase/page/page0page.c
diff --git a/innobase/pars/Makefile.am b/storage/innobase/pars/Makefile.am
index 2356f330486..2356f330486 100644
--- a/innobase/pars/Makefile.am
+++ b/storage/innobase/pars/Makefile.am
diff --git a/innobase/pars/lexyy.c b/storage/innobase/pars/lexyy.c
index 1145ca295e7..1145ca295e7 100644
--- a/innobase/pars/lexyy.c
+++ b/storage/innobase/pars/lexyy.c
diff --git a/innobase/pars/makefilewin b/storage/innobase/pars/makefilewin
index f183d89cbe2..f183d89cbe2 100644
--- a/innobase/pars/makefilewin
+++ b/storage/innobase/pars/makefilewin
diff --git a/innobase/pars/pars0grm.c b/storage/innobase/pars/pars0grm.c
index 05b75398084..05b75398084 100644
--- a/innobase/pars/pars0grm.c
+++ b/storage/innobase/pars/pars0grm.c
diff --git a/innobase/pars/pars0grm.h b/storage/innobase/pars/pars0grm.h
index b2790949057..b2790949057 100644
--- a/innobase/pars/pars0grm.h
+++ b/storage/innobase/pars/pars0grm.h
diff --git a/innobase/pars/pars0grm.y b/storage/innobase/pars/pars0grm.y
index a142d04301e..a142d04301e 100644
--- a/innobase/pars/pars0grm.y
+++ b/storage/innobase/pars/pars0grm.y
diff --git a/innobase/pars/pars0lex.l b/storage/innobase/pars/pars0lex.l
index e481634f77e..e481634f77e 100644
--- a/innobase/pars/pars0lex.l
+++ b/storage/innobase/pars/pars0lex.l
diff --git a/innobase/pars/pars0opt.c b/storage/innobase/pars/pars0opt.c
index 88022e2efe1..88022e2efe1 100644
--- a/innobase/pars/pars0opt.c
+++ b/storage/innobase/pars/pars0opt.c
diff --git a/innobase/pars/pars0pars.c b/storage/innobase/pars/pars0pars.c
index c62184abd85..c62184abd85 100644
--- a/innobase/pars/pars0pars.c
+++ b/storage/innobase/pars/pars0pars.c
diff --git a/innobase/pars/pars0sym.c b/storage/innobase/pars/pars0sym.c
index 8ade5579e47..8ade5579e47 100644
--- a/innobase/pars/pars0sym.c
+++ b/storage/innobase/pars/pars0sym.c
diff --git a/innobase/que/Makefile.am b/storage/innobase/que/Makefile.am
index d9c046b4f4c..d9c046b4f4c 100644
--- a/innobase/que/Makefile.am
+++ b/storage/innobase/que/Makefile.am
diff --git a/innobase/que/makefilewin b/storage/innobase/que/makefilewin
index 9661c716551..9661c716551 100644
--- a/innobase/que/makefilewin
+++ b/storage/innobase/que/makefilewin
diff --git a/innobase/que/que0que.c b/storage/innobase/que/que0que.c
index a0a6adf9b83..a0a6adf9b83 100644
--- a/innobase/que/que0que.c
+++ b/storage/innobase/que/que0que.c
diff --git a/innobase/read/Makefile.am b/storage/innobase/read/Makefile.am
index 7edf2a5a2e1..7edf2a5a2e1 100644
--- a/innobase/read/Makefile.am
+++ b/storage/innobase/read/Makefile.am
diff --git a/innobase/read/makefilewin b/storage/innobase/read/makefilewin
index 39593993a67..39593993a67 100644
--- a/innobase/read/makefilewin
+++ b/storage/innobase/read/makefilewin
diff --git a/innobase/read/read0read.c b/storage/innobase/read/read0read.c
index 0c4a037508e..0c4a037508e 100644
--- a/innobase/read/read0read.c
+++ b/storage/innobase/read/read0read.c
diff --git a/innobase/rem/Makefile.am b/storage/innobase/rem/Makefile.am
index e2b2fdaf669..e2b2fdaf669 100644
--- a/innobase/rem/Makefile.am
+++ b/storage/innobase/rem/Makefile.am
diff --git a/innobase/rem/makefilewin b/storage/innobase/rem/makefilewin
index 51ca4a92012..51ca4a92012 100644
--- a/innobase/rem/makefilewin
+++ b/storage/innobase/rem/makefilewin
diff --git a/innobase/rem/rem0cmp.c b/storage/innobase/rem/rem0cmp.c
index 7c33476fb9e..7c33476fb9e 100644
--- a/innobase/rem/rem0cmp.c
+++ b/storage/innobase/rem/rem0cmp.c
diff --git a/innobase/rem/rem0rec.c b/storage/innobase/rem/rem0rec.c
index fbc33aea669..fbc33aea669 100644
--- a/innobase/rem/rem0rec.c
+++ b/storage/innobase/rem/rem0rec.c
diff --git a/innobase/row/Makefile.am b/storage/innobase/row/Makefile.am
index bd09f9a237d..bd09f9a237d 100644
--- a/innobase/row/Makefile.am
+++ b/storage/innobase/row/Makefile.am
diff --git a/innobase/row/makefilewin b/storage/innobase/row/makefilewin
index c17240c6119..c17240c6119 100644
--- a/innobase/row/makefilewin
+++ b/storage/innobase/row/makefilewin
diff --git a/innobase/row/row0ins.c b/storage/innobase/row/row0ins.c
index bce775c25d6..bce775c25d6 100644
--- a/innobase/row/row0ins.c
+++ b/storage/innobase/row/row0ins.c
diff --git a/innobase/row/row0mysql.c b/storage/innobase/row/row0mysql.c
index 2ac0824b331..2ac0824b331 100644
--- a/innobase/row/row0mysql.c
+++ b/storage/innobase/row/row0mysql.c
diff --git a/innobase/row/row0purge.c b/storage/innobase/row/row0purge.c
index abcf97110d9..abcf97110d9 100644
--- a/innobase/row/row0purge.c
+++ b/storage/innobase/row/row0purge.c
diff --git a/innobase/row/row0row.c b/storage/innobase/row/row0row.c
index 9a74397dc08..9a74397dc08 100644
--- a/innobase/row/row0row.c
+++ b/storage/innobase/row/row0row.c
diff --git a/innobase/row/row0sel.c b/storage/innobase/row/row0sel.c
index 15439bed7e7..15439bed7e7 100644
--- a/innobase/row/row0sel.c
+++ b/storage/innobase/row/row0sel.c
diff --git a/innobase/row/row0uins.c b/storage/innobase/row/row0uins.c
index 9dc860d70b1..9dc860d70b1 100644
--- a/innobase/row/row0uins.c
+++ b/storage/innobase/row/row0uins.c
diff --git a/innobase/row/row0umod.c b/storage/innobase/row/row0umod.c
index 0225a9faec5..0225a9faec5 100644
--- a/innobase/row/row0umod.c
+++ b/storage/innobase/row/row0umod.c
diff --git a/innobase/row/row0undo.c b/storage/innobase/row/row0undo.c
index 435c0279dbb..435c0279dbb 100644
--- a/innobase/row/row0undo.c
+++ b/storage/innobase/row/row0undo.c
diff --git a/innobase/row/row0upd.c b/storage/innobase/row/row0upd.c
index 514fb6bd577..514fb6bd577 100644
--- a/innobase/row/row0upd.c
+++ b/storage/innobase/row/row0upd.c
diff --git a/innobase/row/row0vers.c b/storage/innobase/row/row0vers.c
index 8e747423047..8e747423047 100644
--- a/innobase/row/row0vers.c
+++ b/storage/innobase/row/row0vers.c
diff --git a/innobase/srv/Makefile.am b/storage/innobase/srv/Makefile.am
index 752683b82b8..752683b82b8 100644
--- a/innobase/srv/Makefile.am
+++ b/storage/innobase/srv/Makefile.am
diff --git a/innobase/srv/makefilewin b/storage/innobase/srv/makefilewin
index 129c65ec220..129c65ec220 100644
--- a/innobase/srv/makefilewin
+++ b/storage/innobase/srv/makefilewin
diff --git a/innobase/srv/srv0que.c b/storage/innobase/srv/srv0que.c
index 9dc9ae453d9..9dc9ae453d9 100644
--- a/innobase/srv/srv0que.c
+++ b/storage/innobase/srv/srv0que.c
diff --git a/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c
index 837c5be2bb6..837c5be2bb6 100644
--- a/innobase/srv/srv0srv.c
+++ b/storage/innobase/srv/srv0srv.c
diff --git a/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c
index 7798e0c8e32..7798e0c8e32 100644
--- a/innobase/srv/srv0start.c
+++ b/storage/innobase/srv/srv0start.c
diff --git a/innobase/sync/Makefile.am b/storage/innobase/sync/Makefile.am
index c95955a733b..c95955a733b 100644
--- a/innobase/sync/Makefile.am
+++ b/storage/innobase/sync/Makefile.am
diff --git a/innobase/sync/makefilewin b/storage/innobase/sync/makefilewin
index 73cff40405a..73cff40405a 100644
--- a/innobase/sync/makefilewin
+++ b/storage/innobase/sync/makefilewin
diff --git a/innobase/sync/sync0arr.c b/storage/innobase/sync/sync0arr.c
index 198ef49ca9f..198ef49ca9f 100644
--- a/innobase/sync/sync0arr.c
+++ b/storage/innobase/sync/sync0arr.c
diff --git a/innobase/sync/sync0rw.c b/storage/innobase/sync/sync0rw.c
index 973b46fdd50..973b46fdd50 100644
--- a/innobase/sync/sync0rw.c
+++ b/storage/innobase/sync/sync0rw.c
diff --git a/innobase/sync/sync0sync.c b/storage/innobase/sync/sync0sync.c
index f0f0e9a3a2e..f0f0e9a3a2e 100644
--- a/innobase/sync/sync0sync.c
+++ b/storage/innobase/sync/sync0sync.c
diff --git a/innobase/thr/Makefile.am b/storage/innobase/thr/Makefile.am
index 62c39492c07..62c39492c07 100644
--- a/innobase/thr/Makefile.am
+++ b/storage/innobase/thr/Makefile.am
diff --git a/innobase/thr/makefilewin b/storage/innobase/thr/makefilewin
index 3f29ea1d3e3..3f29ea1d3e3 100644
--- a/innobase/thr/makefilewin
+++ b/storage/innobase/thr/makefilewin
diff --git a/innobase/thr/thr0loc.c b/storage/innobase/thr/thr0loc.c
index 033bb22807f..033bb22807f 100644
--- a/innobase/thr/thr0loc.c
+++ b/storage/innobase/thr/thr0loc.c
diff --git a/innobase/trx/Makefile.am b/storage/innobase/trx/Makefile.am
index 9e2b3c398e3..9e2b3c398e3 100644
--- a/innobase/trx/Makefile.am
+++ b/storage/innobase/trx/Makefile.am
diff --git a/innobase/trx/makefilewin b/storage/innobase/trx/makefilewin
index 35588779d66..35588779d66 100644
--- a/innobase/trx/makefilewin
+++ b/storage/innobase/trx/makefilewin
diff --git a/innobase/trx/trx0purge.c b/storage/innobase/trx/trx0purge.c
index 3df34111281..3df34111281 100644
--- a/innobase/trx/trx0purge.c
+++ b/storage/innobase/trx/trx0purge.c
diff --git a/innobase/trx/trx0rec.c b/storage/innobase/trx/trx0rec.c
index 3b7171e6038..3b7171e6038 100644
--- a/innobase/trx/trx0rec.c
+++ b/storage/innobase/trx/trx0rec.c
diff --git a/innobase/trx/trx0roll.c b/storage/innobase/trx/trx0roll.c
index fdfb7428129..fdfb7428129 100644
--- a/innobase/trx/trx0roll.c
+++ b/storage/innobase/trx/trx0roll.c
diff --git a/innobase/trx/trx0rseg.c b/storage/innobase/trx/trx0rseg.c
index a01d4bb835d..a01d4bb835d 100644
--- a/innobase/trx/trx0rseg.c
+++ b/storage/innobase/trx/trx0rseg.c
diff --git a/innobase/trx/trx0sys.c b/storage/innobase/trx/trx0sys.c
index 68fe6d5079a..68fe6d5079a 100644
--- a/innobase/trx/trx0sys.c
+++ b/storage/innobase/trx/trx0sys.c
diff --git a/innobase/trx/trx0trx.c b/storage/innobase/trx/trx0trx.c
index 10fbf3468c0..10fbf3468c0 100644
--- a/innobase/trx/trx0trx.c
+++ b/storage/innobase/trx/trx0trx.c
diff --git a/innobase/trx/trx0undo.c b/storage/innobase/trx/trx0undo.c
index 7441dd3f152..7441dd3f152 100644
--- a/innobase/trx/trx0undo.c
+++ b/storage/innobase/trx/trx0undo.c
diff --git a/innobase/usr/Makefile.am b/storage/innobase/usr/Makefile.am
index bdcc832a76e..bdcc832a76e 100644
--- a/innobase/usr/Makefile.am
+++ b/storage/innobase/usr/Makefile.am
diff --git a/innobase/usr/makefilewin b/storage/innobase/usr/makefilewin
index 66a77275e9b..66a77275e9b 100644
--- a/innobase/usr/makefilewin
+++ b/storage/innobase/usr/makefilewin
diff --git a/innobase/usr/usr0sess.c b/storage/innobase/usr/usr0sess.c
index 359c1552421..359c1552421 100644
--- a/innobase/usr/usr0sess.c
+++ b/storage/innobase/usr/usr0sess.c
diff --git a/innobase/ut/Makefile.am b/storage/innobase/ut/Makefile.am
index 2fdbb99e0f3..2fdbb99e0f3 100644
--- a/innobase/ut/Makefile.am
+++ b/storage/innobase/ut/Makefile.am
diff --git a/innobase/ut/makefilewin b/storage/innobase/ut/makefilewin
index 2fda190773b..2fda190773b 100644
--- a/innobase/ut/makefilewin
+++ b/storage/innobase/ut/makefilewin
diff --git a/innobase/ut/ut0byte.c b/storage/innobase/ut/ut0byte.c
index cc83aacc90b..cc83aacc90b 100644
--- a/innobase/ut/ut0byte.c
+++ b/storage/innobase/ut/ut0byte.c
diff --git a/innobase/ut/ut0dbg.c b/storage/innobase/ut/ut0dbg.c
index e810d8dead7..e810d8dead7 100644
--- a/innobase/ut/ut0dbg.c
+++ b/storage/innobase/ut/ut0dbg.c
diff --git a/innobase/ut/ut0mem.c b/storage/innobase/ut/ut0mem.c
index 3e8fd79a739..3e8fd79a739 100644
--- a/innobase/ut/ut0mem.c
+++ b/storage/innobase/ut/ut0mem.c
diff --git a/innobase/ut/ut0rnd.c b/storage/innobase/ut/ut0rnd.c
index 85d2e6094c3..85d2e6094c3 100644
--- a/innobase/ut/ut0rnd.c
+++ b/storage/innobase/ut/ut0rnd.c
diff --git a/innobase/ut/ut0ut.c b/storage/innobase/ut/ut0ut.c
index 1be5939303a..1be5939303a 100644
--- a/innobase/ut/ut0ut.c
+++ b/storage/innobase/ut/ut0ut.c
diff --git a/myisam/.cvsignore b/storage/myisam/.cvsignore
index ef6d92c6e18..ef6d92c6e18 100644
--- a/myisam/.cvsignore
+++ b/storage/myisam/.cvsignore
diff --git a/myisam/ChangeLog b/storage/myisam/ChangeLog
index 504202be43f..504202be43f 100644
--- a/myisam/ChangeLog
+++ b/storage/myisam/ChangeLog
diff --git a/myisam/Makefile.am b/storage/myisam/Makefile.am
index e4327070997..e4327070997 100644
--- a/myisam/Makefile.am
+++ b/storage/myisam/Makefile.am
diff --git a/myisam/NEWS b/storage/myisam/NEWS
index bb1f141610b..bb1f141610b 100644
--- a/myisam/NEWS
+++ b/storage/myisam/NEWS
diff --git a/myisam/TODO b/storage/myisam/TODO
index cad9486e1bb..cad9486e1bb 100644
--- a/myisam/TODO
+++ b/storage/myisam/TODO
diff --git a/storage/myisam/ft_boolean_search.c b/storage/myisam/ft_boolean_search.c
new file mode 100644
index 00000000000..34c3fe138a3
--- /dev/null
+++ b/storage/myisam/ft_boolean_search.c
@@ -0,0 +1,772 @@
+/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+/* Written by Sergei A. Golubchik, who has a shared copyright to this code */
+
+/*  TODO: add caching - pre-read several index entries at once */
+
+/*
+  Added optimization for full-text queries with plus-words. It was
+  implemented by sharing maximal document id (max_docid) variable
+  inside plus subtree. max_docid could be used by any word in plus
+  subtree, but it could be updated by plus-word only.
+
+  The idea is: there is no need to search for docid smaller than
+  biggest docid inside current plus subtree.
+
+  Examples:
+  +word1 word2
+    share same max_docid
+    max_docid updated by word1
+  +word1 +(word2 word3)
+    share same max_docid
+    max_docid updated by word1
+  +(word1 -word2) +(+word3 word4)
+    share same max_docid
+    max_docid updated by word3
+*/
+
+#define FT_CORE
+#include "ftdefs.h"
+
+/* search with boolean queries */
+
+static double _wghts[11]=
+{
+  0.131687242798354,
+  0.197530864197531,
+  0.296296296296296,
+  0.444444444444444,
+  0.666666666666667,
+  1.000000000000000,
+  1.500000000000000,
+  2.250000000000000,
+  3.375000000000000,
+  5.062500000000000,
+  7.593750000000000};
+static double *wghts=_wghts+5; /* wghts[i] = 1.5**i */
+
+static double _nwghts[11]=
+{
+ -0.065843621399177,
+ -0.098765432098766,
+ -0.148148148148148,
+ -0.222222222222222,
+ -0.333333333333334,
+ -0.500000000000000,
+ -0.750000000000000,
+ -1.125000000000000,
+ -1.687500000000000,
+ -2.531250000000000,
+ -3.796875000000000};
+static double *nwghts=_nwghts+5; /* nwghts[i] = -0.5*1.5**i */
+
+#define FTB_FLAG_TRUNC 1
+/* At most one of the following flags can be set */
+#define FTB_FLAG_YES   2
+#define FTB_FLAG_NO    4
+#define FTB_FLAG_WONLY 8
+
+typedef struct st_ftb_expr FTB_EXPR;
+struct st_ftb_expr
+{
+  FTB_EXPR *up;
+  uint      flags;
+/* ^^^^^^^^^^^^^^^^^^ FTB_{EXPR,WORD} common section */
+  my_off_t  docid[2];
+  my_off_t  max_docid;
+  float     weight;
+  float     cur_weight;
+  LIST     *phrase;               /* phrase words */
+  uint      yesses;               /* number of "yes" words matched */
+  uint      nos;                  /* number of "no"  words matched */
+  uint      ythresh;              /* number of "yes" words in expr */
+  uint      yweaks;               /* number of "yes" words for scan only */
+};
+
+typedef struct st_ftb_word
+{
+  FTB_EXPR  *up;
+  uint       flags;
+/* ^^^^^^^^^^^^^^^^^^ FTB_{EXPR,WORD} common section */
+  my_off_t   docid[2];             /* for index search and for scan */
+  my_off_t   key_root;
+  my_off_t  *max_docid;
+  MI_KEYDEF *keyinfo;
+  float      weight;
+  uint       ndepth;
+  uint       len;
+  uchar      off;
+  byte       word[1];
+} FTB_WORD;
+
+typedef struct st_ft_info
+{
+  struct _ft_vft *please;
+  MI_INFO   *info;
+  CHARSET_INFO *charset;
+  FTB_EXPR  *root;
+  FTB_WORD **list;
+  MEM_ROOT   mem_root;
+  QUEUE      queue;
+  TREE       no_dupes;
+  my_off_t   lastpos;
+  uint       keynr;
+  uchar      with_scan;
+  enum { UNINITIALIZED, READY, INDEX_SEARCH, INDEX_DONE } state;
+} FTB;
+
+static int FTB_WORD_cmp(my_off_t *v, FTB_WORD *a, FTB_WORD *b)
+{
+  int i;
+
+  /* if a==curdoc, take it as  a < b */
+  if (v && a->docid[0] == *v)
+    return -1;
+
+  /* ORDER BY docid, ndepth DESC */
+  i=CMP_NUM(a->docid[0], b->docid[0]);
+  if (!i)
+    i=CMP_NUM(b->ndepth,a->ndepth);
+  return i;
+}
+
+static int FTB_WORD_cmp_list(CHARSET_INFO *cs, FTB_WORD **a, FTB_WORD **b)
+{
+  /* ORDER BY word DESC, ndepth DESC */
+  int i= mi_compare_text(cs, (uchar*) (*b)->word+1,(*b)->len-1,
+                             (uchar*) (*a)->word+1,(*a)->len-1,0,0);
+  if (!i)
+    i=CMP_NUM((*b)->ndepth,(*a)->ndepth);
+  return i;
+}
+
+static void _ftb_parse_query(FTB *ftb, byte **start, byte *end,
+                      FTB_EXPR *up, uint depth, byte *up_quot)
+{
+  byte        res;
+  FTB_PARAM   param;
+  FT_WORD     w;
+  FTB_WORD   *ftbw;
+  FTB_EXPR   *ftbe;
+  FTB_EXPR   *tmp_expr;
+  FT_WORD    *phrase_word;
+  LIST       *phrase_list;
+  uint  extra=HA_FT_WLEN+ftb->info->s->rec_reflength; /* just a shortcut */
+
+  if (ftb->state != UNINITIALIZED)
+    return;
+
+  param.prev=' ';
+  param.quot= up_quot;
+  while ((res=ft_get_word(ftb->charset,start,end,&w,&param)))
+  {
+    int   r=param.plusminus;
+    float weight= (float) (param.pmsign ? nwghts : wghts)[(r>5)?5:((r<-5)?-5:r)];
+    switch (res) {
+      case 1: /* word found */
+        ftbw=(FTB_WORD *)alloc_root(&ftb->mem_root,
+                                    sizeof(FTB_WORD) +
+                                    (param.trunc ? MI_MAX_KEY_BUFF :
+                                     w.len*ftb->charset->mbmaxlen+extra));
+        ftbw->len=w.len+1;
+        ftbw->flags=0;
+        ftbw->off=0;
+        if (param.yesno>0) ftbw->flags|=FTB_FLAG_YES;
+        if (param.yesno<0) ftbw->flags|=FTB_FLAG_NO;
+        if (param.trunc)   ftbw->flags|=FTB_FLAG_TRUNC;
+        ftbw->weight=weight;
+        ftbw->up=up;
+        ftbw->docid[0]=ftbw->docid[1]=HA_OFFSET_ERROR;
+        ftbw->ndepth= (param.yesno<0) + depth;
+        ftbw->key_root=HA_OFFSET_ERROR;
+        memcpy(ftbw->word+1, w.pos, w.len);
+        ftbw->word[0]=w.len;
+        if (param.yesno > 0) up->ythresh++;
+        queue_insert(& ftb->queue, (byte *)ftbw);
+        ftb->with_scan|=(param.trunc & FTB_FLAG_TRUNC);
+        for (tmp_expr= up; tmp_expr->up; tmp_expr= tmp_expr->up)
+          if (! (tmp_expr->flags & FTB_FLAG_YES))
+            break;
+        ftbw->max_docid= &tmp_expr->max_docid;
+      case 4: /* not indexed word (stopword or too short/long) */
+        if (! up_quot) break;
+        phrase_word= (FT_WORD *)alloc_root(&ftb->mem_root, sizeof(FT_WORD));
+        phrase_list= (LIST *)alloc_root(&ftb->mem_root, sizeof(LIST));
+        phrase_word->pos= w.pos;
+        phrase_word->len= w.len;
+        phrase_list->data= (void *)phrase_word;
+        up->phrase= list_add(up->phrase, phrase_list);
+        break;
+      case 2: /* left bracket */
+        ftbe=(FTB_EXPR *)alloc_root(&ftb->mem_root, sizeof(FTB_EXPR));
+        ftbe->flags=0;
+        if (param.yesno>0) ftbe->flags|=FTB_FLAG_YES;
+        if (param.yesno<0) ftbe->flags|=FTB_FLAG_NO;
+        ftbe->weight=weight;
+        ftbe->up=up;
+        ftbe->max_docid= ftbe->ythresh= ftbe->yweaks= 0;
+        ftbe->docid[0]=ftbe->docid[1]=HA_OFFSET_ERROR;
+        ftbe->phrase= NULL;
+        if (param.quot) ftb->with_scan|=2;
+        if (param.yesno > 0) up->ythresh++;
+        _ftb_parse_query(ftb, start, end, ftbe, depth+1, param.quot);
+        param.quot=0;
+        break;
+      case 3: /* right bracket */
+        if (up_quot) up->phrase= list_reverse(up->phrase);
+        return;
+    }
+  }
+  return;
+}
+
+static int _ftb_no_dupes_cmp(void* not_used __attribute__((unused)),
+                             const void *a,const void *b)
+{
+  return CMP_NUM((*((my_off_t*)a)), (*((my_off_t*)b)));
+}
+
+/* returns 1 if the search was finished (must-word wasn't found) */
+static int _ft2_search(FTB *ftb, FTB_WORD *ftbw, my_bool init_search)
+{
+  int r;
+  int subkeys=1;
+  my_bool can_go_down;
+  MI_INFO *info=ftb->info;
+  uint off, extra=HA_FT_WLEN+info->s->base.rec_reflength;
+  byte *lastkey_buf=ftbw->word+ftbw->off;
+
+  LINT_INIT(off);
+  if (ftbw->flags & FTB_FLAG_TRUNC)
+    lastkey_buf+=ftbw->len;
+
+  if (init_search)
+  {
+    ftbw->key_root=info->s->state.key_root[ftb->keynr];
+    ftbw->keyinfo=info->s->keyinfo+ftb->keynr;
+
+    r=_mi_search(info, ftbw->keyinfo, (uchar*) ftbw->word, ftbw->len,
+                 SEARCH_FIND | SEARCH_BIGGER, ftbw->key_root);
+  }
+  else
+  {
+    uint sflag= SEARCH_BIGGER;
+    if (ftbw->docid[0] < *ftbw->max_docid)
+    {
+      sflag|= SEARCH_SAME;
+      _mi_dpointer(info, (uchar *)(ftbw->word + ftbw->len + HA_FT_WLEN),
+                   *ftbw->max_docid);
+    }
+    r=_mi_search(info, ftbw->keyinfo, (uchar*) lastkey_buf,
+                   USE_WHOLE_KEY, sflag, ftbw->key_root);
+  }
+
+  can_go_down=(!ftbw->off && (init_search || (ftbw->flags & FTB_FLAG_TRUNC)));
+  /* Skip rows inserted by concurrent insert */
+  while (!r)
+  {
+    if (can_go_down)
+    {
+      /* going down ? */
+      off=info->lastkey_length-extra;
+      subkeys=ft_sintXkorr(info->lastkey+off);
+    }
+    if (subkeys<0 || info->lastpos < info->state->data_file_length)
+      break;
+    r= _mi_search_next(info, ftbw->keyinfo, info->lastkey,
+                       info->lastkey_length,
+		       SEARCH_BIGGER, ftbw->key_root);
+  }
+
+  if (!r && !ftbw->off)
+  {
+    r= mi_compare_text(ftb->charset,
+                       info->lastkey+1,
+                       info->lastkey_length-extra-1,
+              (uchar*) ftbw->word+1,
+                       ftbw->len-1,
+             (my_bool) (ftbw->flags & FTB_FLAG_TRUNC),0);
+  }
+
+  if (r) /* not found */
+  {
+    if (!ftbw->off || !(ftbw->flags & FTB_FLAG_TRUNC))
+    {
+      ftbw->docid[0]=HA_OFFSET_ERROR;
+      if ((ftbw->flags & FTB_FLAG_YES) && ftbw->up->up==0)
+      {
+        /*
+          This word MUST BE present in every document returned,
+          so we can stop the search right now
+        */
+        ftb->state=INDEX_DONE;
+        return 1; /* search is done */
+      }
+      else
+        return 0;
+    }
+
+    /* going up to the first-level tree to continue search there */
+    _mi_dpointer(info, (uchar*) (lastkey_buf+HA_FT_WLEN), ftbw->key_root);
+    ftbw->key_root=info->s->state.key_root[ftb->keynr];
+    ftbw->keyinfo=info->s->keyinfo+ftb->keynr;
+    ftbw->off=0;
+    return _ft2_search(ftb, ftbw, 0);
+  }
+
+  /* matching key found */
+  memcpy(lastkey_buf, info->lastkey, info->lastkey_length);
+  if (lastkey_buf == ftbw->word)
+    ftbw->len=info->lastkey_length-extra;
+
+  /* going down ? */
+  if (subkeys<0)
+  {
+    /*
+      yep, going down, to the second-level tree
+      TODO here: subkey-based optimization
+    */
+    ftbw->off=off;
+    ftbw->key_root=info->lastpos;
+    ftbw->keyinfo=& info->s->ft2_keyinfo;
+    r=_mi_search_first(info, ftbw->keyinfo, ftbw->key_root);
+    DBUG_ASSERT(r==0);  /* found something */
+    memcpy(lastkey_buf+off, info->lastkey, info->lastkey_length);
+  }
+  ftbw->docid[0]=info->lastpos;
+  if (ftbw->flags & FTB_FLAG_YES)
+    *ftbw->max_docid= info->lastpos;
+  return 0;
+}
+
+static void _ftb_init_index_search(FT_INFO *ftb)
+{
+  int i;
+  FTB_WORD   *ftbw;
+
+  if ((ftb->state != READY && ftb->state !=INDEX_DONE) ||
+      ftb->keynr == NO_SUCH_KEY)
+    return;
+  ftb->state=INDEX_SEARCH;
+
+  for (i=ftb->queue.elements; i; i--)
+  {
+    ftbw=(FTB_WORD *)(ftb->queue.root[i]);
+
+    if (ftbw->flags & FTB_FLAG_TRUNC)
+    {
+      /*
+        special treatment for truncation operator
+        1. there are some (besides this) +words
+           | no need to search in the index, it can never ADD new rows
+           | to the result, and to remove half-matched rows we do scan anyway
+        2. -trunc*
+           | same as 1.
+        3. in 1 and 2, +/- need not be on the same expr. level,
+           but can be on any upper level, as in +word +(trunc1* trunc2*)
+        4. otherwise
+           | We have to index-search for this prefix.
+           | It may cause duplicates, as in the index (sorted by <word,docid>)
+           |   <aaaa,row1>
+           |   <aabb,row2>
+           |   <aacc,row1>
+           | Searching for "aa*" will find row1 twice...
+      */
+      FTB_EXPR *ftbe;
+      for (ftbe=(FTB_EXPR*)ftbw;
+           ftbe->up && !(ftbe->up->flags & FTB_FLAG_TRUNC);
+           ftbe->up->flags|= FTB_FLAG_TRUNC, ftbe=ftbe->up)
+      {
+        if (ftbe->flags & FTB_FLAG_NO ||                     /* 2 */
+             ftbe->up->ythresh - ftbe->up->yweaks >1)        /* 1 */
+        {
+          FTB_EXPR *top_ftbe=ftbe->up;
+          ftbw->docid[0]=HA_OFFSET_ERROR;
+          for (ftbe=(FTB_EXPR *)ftbw;
+               ftbe != top_ftbe && !(ftbe->flags & FTB_FLAG_NO);
+               ftbe=ftbe->up)
+              ftbe->up->yweaks++;
+          ftbe=0;
+          break;
+        }
+      }
+      if (!ftbe)
+        continue;
+      /* 4 */
+      if (!is_tree_inited(& ftb->no_dupes))
+        init_tree(& ftb->no_dupes,0,0,sizeof(my_off_t),
+            _ftb_no_dupes_cmp,0,0,0);
+      else
+        reset_tree(& ftb->no_dupes);
+    }
+
+    ftbw->off=0; /* in case of reinit */
+    if (_ft2_search(ftb, ftbw, 1))
+      return;
+  }
+  queue_fix(& ftb->queue);
+}
+
+
+FT_INFO * ft_init_boolean_search(MI_INFO *info, uint keynr, byte *query,
+                                 uint query_len, CHARSET_INFO *cs)
+{
+  FTB       *ftb;
+  FTB_EXPR  *ftbe;
+  uint       res;
+
+  if (!(ftb=(FTB *)my_malloc(sizeof(FTB), MYF(MY_WME))))
+    return 0;
+  ftb->please= (struct _ft_vft *) & _ft_vft_boolean;
+  ftb->state=UNINITIALIZED;
+  ftb->info=info;
+  ftb->keynr=keynr;
+  ftb->charset=cs;
+  DBUG_ASSERT(keynr==NO_SUCH_KEY || cs == info->s->keyinfo[keynr].seg->charset);
+  ftb->with_scan=0;
+  ftb->lastpos=HA_OFFSET_ERROR;
+  bzero(& ftb->no_dupes, sizeof(TREE));
+
+  init_alloc_root(&ftb->mem_root, 1024, 1024);
+
+  /*
+    Hack: instead of init_queue, we'll use reinit queue to be able
+    to alloc queue with alloc_root()
+  */
+  res=ftb->queue.max_elements=1+query_len/2;
+  if (!(ftb->queue.root=
+        (byte **)alloc_root(&ftb->mem_root, (res+1)*sizeof(void*))))
+    goto err;
+  reinit_queue(& ftb->queue, res, 0, 0,
+                         (int (*)(void*,byte*,byte*))FTB_WORD_cmp, 0);
+  if (!(ftbe=(FTB_EXPR *)alloc_root(&ftb->mem_root, sizeof(FTB_EXPR))))
+    goto err;
+  ftbe->weight=1;
+  ftbe->flags=FTB_FLAG_YES;
+  ftbe->nos=1;
+  ftbe->up=0;
+  ftbe->max_docid= ftbe->ythresh= ftbe->yweaks= 0;
+  ftbe->docid[0]=ftbe->docid[1]=HA_OFFSET_ERROR;
+  ftbe->phrase= NULL;
+  ftb->root=ftbe;
+  _ftb_parse_query(ftb, &query, query+query_len, ftbe, 0, NULL);
+  ftb->list=(FTB_WORD **)alloc_root(&ftb->mem_root,
+                                     sizeof(FTB_WORD *)*ftb->queue.elements);
+  memcpy(ftb->list, ftb->queue.root+1, sizeof(FTB_WORD *)*ftb->queue.elements);
+  qsort2(ftb->list, ftb->queue.elements, sizeof(FTB_WORD *),
+                              (qsort2_cmp)FTB_WORD_cmp_list, ftb->charset);
+  if (ftb->queue.elements<2) ftb->with_scan &= ~FTB_FLAG_TRUNC;
+  ftb->state=READY;
+  return ftb;
+err:
+  free_root(& ftb->mem_root, MYF(0));
+  my_free((gptr)ftb,MYF(0));
+  return 0;
+}
+
+
+/*
+  Checks if given buffer matches phrase list.
+
+  SYNOPSIS
+    _ftb_check_phrase()
+    s0     start of buffer
+    e0     end of buffer
+    phrase broken into list phrase
+    cs     charset info
+
+  RETURN VALUE
+    1 is returned if phrase found, 0 else.
+*/
+
+static int _ftb_check_phrase(const byte *s0, const byte *e0,
+                LIST *phrase, CHARSET_INFO *cs)
+{
+  FT_WORD h_word;
+  const byte *h_start= s0;
+  DBUG_ENTER("_ftb_strstr");
+  DBUG_ASSERT(phrase);
+
+  while (ft_simple_get_word(cs, (byte **)&h_start, e0, &h_word, FALSE))
+  {
+    FT_WORD *n_word;
+    LIST *phrase_element= phrase;
+    const byte *h_start1= h_start;
+    for (;;)
+    {
+      n_word= (FT_WORD *)phrase_element->data;
+      if (my_strnncoll(cs, h_word.pos, h_word.len, n_word->pos, n_word->len))
+        break;
+      if (! (phrase_element= phrase_element->next))
+        DBUG_RETURN(1);
+      if (! ft_simple_get_word(cs, (byte **)&h_start1, e0, &h_word, FALSE))
+        DBUG_RETURN(0);
+    }
+  }
+  DBUG_RETURN(0);
+}
+
+
+static void _ftb_climb_the_tree(FTB *ftb, FTB_WORD *ftbw, FT_SEG_ITERATOR *ftsi_orig)
+{
+  FT_SEG_ITERATOR ftsi;
+  FTB_EXPR *ftbe;
+  float weight=ftbw->weight;
+  int  yn=ftbw->flags, ythresh, mode=(ftsi_orig != 0);
+  my_off_t curdoc=ftbw->docid[mode];
+
+  for (ftbe=ftbw->up; ftbe; ftbe=ftbe->up)
+  {
+    ythresh = ftbe->ythresh - (mode ? 0 : ftbe->yweaks);
+    if (ftbe->docid[mode] != curdoc)
+    {
+      ftbe->cur_weight=0;
+      ftbe->yesses=ftbe->nos=0;
+      ftbe->docid[mode]=curdoc;
+    }
+    if (ftbe->nos)
+      break;
+    if (yn & FTB_FLAG_YES)
+    {
+      weight /= ftbe->ythresh;
+      ftbe->cur_weight += weight;
+      if ((int) ++ftbe->yesses == ythresh)
+      {
+        yn=ftbe->flags;
+        weight=ftbe->cur_weight*ftbe->weight;
+        if (mode && ftbe->phrase)
+        {
+          int not_found=1;
+
+          memcpy(&ftsi, ftsi_orig, sizeof(ftsi));
+          while (_mi_ft_segiterator(&ftsi) && not_found)
+          {
+            if (!ftsi.pos)
+              continue;
+            not_found = ! _ftb_check_phrase(ftsi.pos, ftsi.pos+ftsi.len,
+                                      ftbe->phrase, ftb->charset);
+          }
+          if (not_found) break;
+        } /* ftbe->quot */
+      }
+      else
+        break;
+    }
+    else
+    if (yn & FTB_FLAG_NO)
+    {
+      /*
+        NOTE: special sort function of queue assures that all
+        (yn & FTB_FLAG_NO) != 0
+        events for every particular subexpression will
+        "auto-magically" happen BEFORE all the
+        (yn & FTB_FLAG_YES) != 0 events. So no
+        already matched expression can become not-matched again.
+      */
+      ++ftbe->nos;
+      break;
+    }
+    else
+    {
+      if (ftbe->ythresh)
+        weight/=3;
+      ftbe->cur_weight +=  weight;
+      if ((int) ftbe->yesses < ythresh)
+        break;
+      if (!(yn & FTB_FLAG_WONLY))
+        yn= ((int) ftbe->yesses++ == ythresh) ? ftbe->flags : FTB_FLAG_WONLY ;
+      weight*= ftbe->weight;
+    }
+  }
+}
+
+
+int ft_boolean_read_next(FT_INFO *ftb, char *record)
+{
+  FTB_EXPR  *ftbe;
+  FTB_WORD  *ftbw;
+  MI_INFO   *info=ftb->info;
+  my_off_t   curdoc;
+
+  if (ftb->state != INDEX_SEARCH && ftb->state != INDEX_DONE)
+    return -1;
+
+  /* black magic ON */
+  if ((int) _mi_check_index(info, ftb->keynr) < 0)
+    return my_errno;
+  if (_mi_readinfo(info, F_RDLCK, 1))
+    return my_errno;
+  /* black magic OFF */
+
+  if (!ftb->queue.elements)
+    return my_errno=HA_ERR_END_OF_FILE;
+
+  /* Attention!!! Address of a local variable is used here! See err: label */
+  ftb->queue.first_cmp_arg=(void *)&curdoc;
+
+  while (ftb->state == INDEX_SEARCH &&
+         (curdoc=((FTB_WORD *)queue_top(& ftb->queue))->docid[0]) !=
+         HA_OFFSET_ERROR)
+  {
+    while (curdoc == (ftbw=(FTB_WORD *)queue_top(& ftb->queue))->docid[0])
+    {
+      _ftb_climb_the_tree(ftb, ftbw, 0);
+
+      /* update queue */
+      _ft2_search(ftb, ftbw, 0);
+      queue_replaced(& ftb->queue);
+    }
+
+    ftbe=ftb->root;
+    if (ftbe->docid[0]==curdoc && ftbe->cur_weight>0 &&
+        ftbe->yesses>=(ftbe->ythresh-ftbe->yweaks) && !ftbe->nos)
+    {
+      /* curdoc matched ! */
+      if (is_tree_inited(&ftb->no_dupes) &&
+          tree_insert(&ftb->no_dupes, &curdoc, 0,
+                      ftb->no_dupes.custom_arg)->count >1)
+        /* but it managed already to get past this line once */
+        continue;
+
+      info->lastpos=curdoc;
+      /* Clear all states, except that the table was updated */
+      info->update&= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED);
+
+      if (!(*info->read_record)(info,curdoc,record))
+      {
+        info->update|= HA_STATE_AKTIV;          /* Record is read */
+        if (ftb->with_scan && ft_boolean_find_relevance(ftb,record,0)==0)
+            continue; /* no match */
+        my_errno=0;
+        goto err;
+      }
+      goto err;
+    }
+  }
+  ftb->state=INDEX_DONE;
+  my_errno=HA_ERR_END_OF_FILE;
+err:
+  ftb->queue.first_cmp_arg=(void *)0;
+  return my_errno;
+}
+
+
+float ft_boolean_find_relevance(FT_INFO *ftb, byte *record, uint length)
+{
+  FT_WORD word;
+  FTB_WORD *ftbw;
+  FTB_EXPR *ftbe;
+  FT_SEG_ITERATOR ftsi, ftsi2;
+  const byte *end;
+  my_off_t  docid=ftb->info->lastpos;
+
+  if (docid == HA_OFFSET_ERROR)
+    return -2.0;
+  if (!ftb->queue.elements)
+    return 0;
+
+  if (ftb->state != INDEX_SEARCH && docid <= ftb->lastpos)
+  {
+    FTB_EXPR *x;
+    uint i;
+
+    for (i=0; i < ftb->queue.elements; i++)
+    {
+      ftb->list[i]->docid[1]=HA_OFFSET_ERROR;
+      for (x=ftb->list[i]->up; x; x=x->up)
+        x->docid[1]=HA_OFFSET_ERROR;
+    }
+  }
+
+  ftb->lastpos=docid;
+
+  if (ftb->keynr==NO_SUCH_KEY)
+    _mi_ft_segiterator_dummy_init(record, length, &ftsi);
+  else
+    _mi_ft_segiterator_init(ftb->info, ftb->keynr, record, &ftsi);
+  memcpy(&ftsi2, &ftsi, sizeof(ftsi));
+
+  while (_mi_ft_segiterator(&ftsi))
+  {
+    if (!ftsi.pos)
+      continue;
+
+    end=ftsi.pos+ftsi.len;
+    while (ft_simple_get_word(ftb->charset, (byte **) &ftsi.pos,
+                              (byte *) end, &word, TRUE))
+    {
+      int a, b, c;
+      for (a=0, b=ftb->queue.elements, c=(a+b)/2; b-a>1; c=(a+b)/2)
+      {
+        ftbw=ftb->list[c];
+        if (mi_compare_text(ftb->charset, (uchar*) word.pos, word.len,
+                            (uchar*) ftbw->word+1, ftbw->len-1,
+                            (my_bool) (ftbw->flags&FTB_FLAG_TRUNC),0) >0)
+          b=c;
+        else
+          a=c;
+      }
+      for (; c>=0; c--)
+      {
+        ftbw=ftb->list[c];
+        if (mi_compare_text(ftb->charset, (uchar*) word.pos, word.len,
+                            (uchar*) ftbw->word+1,ftbw->len-1,
+                            (my_bool) (ftbw->flags&FTB_FLAG_TRUNC),0))
+          break;
+        if (ftbw->docid[1] == docid)
+          continue;
+        ftbw->docid[1]=docid;
+        _ftb_climb_the_tree(ftb, ftbw, &ftsi2);
+      }
+    }
+  }
+
+  ftbe=ftb->root;
+  if (ftbe->docid[1]==docid && ftbe->cur_weight>0 &&
+      ftbe->yesses>=ftbe->ythresh && !ftbe->nos)
+  { /* row matched ! */
+    return ftbe->cur_weight;
+  }
+  else
+  { /* match failed ! */
+    return 0.0;
+  }
+}
+
+
+void ft_boolean_close_search(FT_INFO *ftb)
+{
+  if (is_tree_inited(& ftb->no_dupes))
+  {
+    delete_tree(& ftb->no_dupes);
+  }
+  free_root(& ftb->mem_root, MYF(0));
+  my_free((gptr)ftb,MYF(0));
+}
+
+
+float ft_boolean_get_relevance(FT_INFO *ftb)
+{
+  return ftb->root->cur_weight;
+}
+
+
+void ft_boolean_reinit_search(FT_INFO *ftb)
+{
+  _ftb_init_index_search(ftb);
+}
+
diff --git a/myisam/ft_eval.c b/storage/myisam/ft_eval.c
index 34248c69f20..34248c69f20 100644
--- a/myisam/ft_eval.c
+++ b/storage/myisam/ft_eval.c
diff --git a/myisam/ft_eval.h b/storage/myisam/ft_eval.h
index 5501fe9d34b..5501fe9d34b 100644
--- a/myisam/ft_eval.h
+++ b/storage/myisam/ft_eval.h
diff --git a/myisam/ft_nlq_search.c b/storage/myisam/ft_nlq_search.c
index 7a506fd11c6..7a506fd11c6 100644
--- a/myisam/ft_nlq_search.c
+++ b/storage/myisam/ft_nlq_search.c
diff --git a/myisam/ft_parser.c b/storage/myisam/ft_parser.c
index 2fad2363ae2..2fad2363ae2 100644
--- a/myisam/ft_parser.c
+++ b/storage/myisam/ft_parser.c
diff --git a/myisam/ft_static.c b/storage/myisam/ft_static.c
index e221950f445..e221950f445 100644
--- a/myisam/ft_static.c
+++ b/storage/myisam/ft_static.c
diff --git a/myisam/ft_stem.c b/storage/myisam/ft_stem.c
index 846d5d2247f..846d5d2247f 100644
--- a/myisam/ft_stem.c
+++ b/storage/myisam/ft_stem.c
diff --git a/myisam/ft_stopwords.c b/storage/myisam/ft_stopwords.c
index ab51afb0e82..ab51afb0e82 100644
--- a/myisam/ft_stopwords.c
+++ b/storage/myisam/ft_stopwords.c
diff --git a/myisam/ft_test1.c b/storage/myisam/ft_test1.c
index 14be9aa1e8c..14be9aa1e8c 100644
--- a/myisam/ft_test1.c
+++ b/storage/myisam/ft_test1.c
diff --git a/myisam/ft_test1.h b/storage/myisam/ft_test1.h
index e360244057b..e360244057b 100644
--- a/myisam/ft_test1.h
+++ b/storage/myisam/ft_test1.h
diff --git a/myisam/ft_update.c b/storage/myisam/ft_update.c
index b8cd925bf4f..b8cd925bf4f 100644
--- a/myisam/ft_update.c
+++ b/storage/myisam/ft_update.c
diff --git a/myisam/ftbench/Ecompare.pl b/storage/myisam/ftbench/Ecompare.pl
index 265534e704d..265534e704d 100755
--- a/myisam/ftbench/Ecompare.pl
+++ b/storage/myisam/ftbench/Ecompare.pl
diff --git a/myisam/ftbench/Ecreate.pl b/storage/myisam/ftbench/Ecreate.pl
index d90a6f7a0ad..d90a6f7a0ad 100755
--- a/myisam/ftbench/Ecreate.pl
+++ b/storage/myisam/ftbench/Ecreate.pl
diff --git a/myisam/ftbench/Ereport.pl b/storage/myisam/ftbench/Ereport.pl
index 5969304da09..5969304da09 100755
--- a/myisam/ftbench/Ereport.pl
+++ b/storage/myisam/ftbench/Ereport.pl
diff --git a/myisam/ftbench/README b/storage/myisam/ftbench/README
index b1f8b66b15f..b1f8b66b15f 100644
--- a/myisam/ftbench/README
+++ b/storage/myisam/ftbench/README
diff --git a/myisam/ftbench/ft-test-run.sh b/storage/myisam/ftbench/ft-test-run.sh
index ceba818fa5c..ceba818fa5c 100755
--- a/myisam/ftbench/ft-test-run.sh
+++ b/storage/myisam/ftbench/ft-test-run.sh
diff --git a/myisam/ftdefs.h b/storage/myisam/ftdefs.h
index 91c679a1e58..91c679a1e58 100644
--- a/myisam/ftdefs.h
+++ b/storage/myisam/ftdefs.h
diff --git a/myisam/fulltext.h b/storage/myisam/fulltext.h
index d8c74d4e94b..d8c74d4e94b 100644
--- a/myisam/fulltext.h
+++ b/storage/myisam/fulltext.h
diff --git a/myisam/make-ccc b/storage/myisam/make-ccc
index 6d1303729db..6d1303729db 100755
--- a/myisam/make-ccc
+++ b/storage/myisam/make-ccc
diff --git a/myisam/mi_cache.c b/storage/myisam/mi_cache.c
index 8dee068c50e..8dee068c50e 100644
--- a/myisam/mi_cache.c
+++ b/storage/myisam/mi_cache.c
diff --git a/myisam/mi_changed.c b/storage/myisam/mi_changed.c
index c2ab5568eba..c2ab5568eba 100644
--- a/myisam/mi_changed.c
+++ b/storage/myisam/mi_changed.c
diff --git a/myisam/mi_check.c b/storage/myisam/mi_check.c
index 9e003a18dac..9e003a18dac 100644
--- a/myisam/mi_check.c
+++ b/storage/myisam/mi_check.c
diff --git a/myisam/mi_checksum.c b/storage/myisam/mi_checksum.c
index 33a51068fb0..33a51068fb0 100644
--- a/myisam/mi_checksum.c
+++ b/storage/myisam/mi_checksum.c
diff --git a/myisam/mi_close.c b/storage/myisam/mi_close.c
index 62f5617de1a..62f5617de1a 100644
--- a/myisam/mi_close.c
+++ b/storage/myisam/mi_close.c
diff --git a/myisam/mi_create.c b/storage/myisam/mi_create.c
index 33b344405ec..33b344405ec 100644
--- a/myisam/mi_create.c
+++ b/storage/myisam/mi_create.c
diff --git a/myisam/mi_dbug.c b/storage/myisam/mi_dbug.c
index e782d21afe7..e782d21afe7 100644
--- a/myisam/mi_dbug.c
+++ b/storage/myisam/mi_dbug.c
diff --git a/myisam/mi_delete.c b/storage/myisam/mi_delete.c
index cc4a17182f7..cc4a17182f7 100644
--- a/myisam/mi_delete.c
+++ b/storage/myisam/mi_delete.c
diff --git a/myisam/mi_delete_all.c b/storage/myisam/mi_delete_all.c
index 3033249886f..3033249886f 100644
--- a/myisam/mi_delete_all.c
+++ b/storage/myisam/mi_delete_all.c
diff --git a/myisam/mi_delete_table.c b/storage/myisam/mi_delete_table.c
index 6843881568d..6843881568d 100644
--- a/myisam/mi_delete_table.c
+++ b/storage/myisam/mi_delete_table.c
diff --git a/myisam/mi_dynrec.c b/storage/myisam/mi_dynrec.c
index 8de500a7351..8de500a7351 100644
--- a/myisam/mi_dynrec.c
+++ b/storage/myisam/mi_dynrec.c
diff --git a/myisam/mi_extra.c b/storage/myisam/mi_extra.c
index ba32bb9115a..ba32bb9115a 100644
--- a/myisam/mi_extra.c
+++ b/storage/myisam/mi_extra.c
diff --git a/myisam/mi_info.c b/storage/myisam/mi_info.c
index bdece9c2ee3..bdece9c2ee3 100644
--- a/myisam/mi_info.c
+++ b/storage/myisam/mi_info.c
diff --git a/myisam/mi_key.c b/storage/myisam/mi_key.c
index ae50900a190..ae50900a190 100644
--- a/myisam/mi_key.c
+++ b/storage/myisam/mi_key.c
diff --git a/myisam/mi_keycache.c b/storage/myisam/mi_keycache.c
index fb13f3703a2..fb13f3703a2 100644
--- a/myisam/mi_keycache.c
+++ b/storage/myisam/mi_keycache.c
diff --git a/myisam/mi_locking.c b/storage/myisam/mi_locking.c
index 8d48c5242e5..8d48c5242e5 100644
--- a/myisam/mi_locking.c
+++ b/storage/myisam/mi_locking.c
diff --git a/myisam/mi_log.c b/storage/myisam/mi_log.c
index 13842c56828..13842c56828 100644
--- a/myisam/mi_log.c
+++ b/storage/myisam/mi_log.c
diff --git a/myisam/mi_open.c b/storage/myisam/mi_open.c
index 74b97a65609..74b97a65609 100644
--- a/myisam/mi_open.c
+++ b/storage/myisam/mi_open.c
diff --git a/myisam/mi_packrec.c b/storage/myisam/mi_packrec.c
index c251e4dda4a..c251e4dda4a 100644
--- a/myisam/mi_packrec.c
+++ b/storage/myisam/mi_packrec.c
diff --git a/myisam/mi_page.c b/storage/myisam/mi_page.c
index 5240c063fba..5240c063fba 100644
--- a/myisam/mi_page.c
+++ b/storage/myisam/mi_page.c
diff --git a/myisam/mi_panic.c b/storage/myisam/mi_panic.c
index 78698d88c54..78698d88c54 100644
--- a/myisam/mi_panic.c
+++ b/storage/myisam/mi_panic.c
diff --git a/myisam/mi_preload.c b/storage/myisam/mi_preload.c
index 317ab4ad7fe..317ab4ad7fe 100644
--- a/myisam/mi_preload.c
+++ b/storage/myisam/mi_preload.c
diff --git a/myisam/mi_range.c b/storage/myisam/mi_range.c
index e78f3b11625..e78f3b11625 100644
--- a/myisam/mi_range.c
+++ b/storage/myisam/mi_range.c
diff --git a/myisam/mi_rename.c b/storage/myisam/mi_rename.c
index 8380ee1bfad..8380ee1bfad 100644
--- a/myisam/mi_rename.c
+++ b/storage/myisam/mi_rename.c
diff --git a/myisam/mi_rfirst.c b/storage/myisam/mi_rfirst.c
index e30f61801a0..e30f61801a0 100644
--- a/myisam/mi_rfirst.c
+++ b/storage/myisam/mi_rfirst.c
diff --git a/myisam/mi_rkey.c b/storage/myisam/mi_rkey.c
index 635a7eb2c48..635a7eb2c48 100644
--- a/myisam/mi_rkey.c
+++ b/storage/myisam/mi_rkey.c
diff --git a/myisam/mi_rlast.c b/storage/myisam/mi_rlast.c
index 61c3ff58fd5..61c3ff58fd5 100644
--- a/myisam/mi_rlast.c
+++ b/storage/myisam/mi_rlast.c
diff --git a/myisam/mi_rnext.c b/storage/myisam/mi_rnext.c
index 69bf5c8deae..69bf5c8deae 100644
--- a/myisam/mi_rnext.c
+++ b/storage/myisam/mi_rnext.c
diff --git a/myisam/mi_rnext_same.c b/storage/myisam/mi_rnext_same.c
index 4d770258a72..4d770258a72 100644
--- a/myisam/mi_rnext_same.c
+++ b/storage/myisam/mi_rnext_same.c
diff --git a/myisam/mi_rprev.c b/storage/myisam/mi_rprev.c
index b787210e037..b787210e037 100644
--- a/myisam/mi_rprev.c
+++ b/storage/myisam/mi_rprev.c
diff --git a/myisam/mi_rrnd.c b/storage/myisam/mi_rrnd.c
index f6a2f021662..f6a2f021662 100644
--- a/myisam/mi_rrnd.c
+++ b/storage/myisam/mi_rrnd.c
diff --git a/myisam/mi_rsame.c b/storage/myisam/mi_rsame.c
index 56c8d1226ca..56c8d1226ca 100644
--- a/myisam/mi_rsame.c
+++ b/storage/myisam/mi_rsame.c
diff --git a/myisam/mi_rsamepos.c b/storage/myisam/mi_rsamepos.c
index a1d96fb7104..a1d96fb7104 100644
--- a/myisam/mi_rsamepos.c
+++ b/storage/myisam/mi_rsamepos.c
diff --git a/myisam/mi_scan.c b/storage/myisam/mi_scan.c
index 90bc3430ba7..90bc3430ba7 100644
--- a/myisam/mi_scan.c
+++ b/storage/myisam/mi_scan.c
diff --git a/myisam/mi_search.c b/storage/myisam/mi_search.c
index c669a8be8f8..c669a8be8f8 100644
--- a/myisam/mi_search.c
+++ b/storage/myisam/mi_search.c
diff --git a/myisam/mi_static.c b/storage/myisam/mi_static.c
index 4c9d814f7d6..4c9d814f7d6 100644
--- a/myisam/mi_static.c
+++ b/storage/myisam/mi_static.c
diff --git a/myisam/mi_statrec.c b/storage/myisam/mi_statrec.c
index 42352f63c66..42352f63c66 100644
--- a/myisam/mi_statrec.c
+++ b/storage/myisam/mi_statrec.c
diff --git a/myisam/mi_test1.c b/storage/myisam/mi_test1.c
index 5727c699469..5727c699469 100644
--- a/myisam/mi_test1.c
+++ b/storage/myisam/mi_test1.c
diff --git a/myisam/mi_test2.c b/storage/myisam/mi_test2.c
index 95c8ce56a13..95c8ce56a13 100644
--- a/myisam/mi_test2.c
+++ b/storage/myisam/mi_test2.c
diff --git a/myisam/mi_test3.c b/storage/myisam/mi_test3.c
index be4277cc65c..be4277cc65c 100644
--- a/myisam/mi_test3.c
+++ b/storage/myisam/mi_test3.c
diff --git a/myisam/mi_test_all.res b/storage/myisam/mi_test_all.res
index 16b517d3f76..16b517d3f76 100644
--- a/myisam/mi_test_all.res
+++ b/storage/myisam/mi_test_all.res
diff --git a/myisam/mi_test_all.sh b/storage/myisam/mi_test_all.sh
index 07e71d65675..07e71d65675 100755
--- a/myisam/mi_test_all.sh
+++ b/storage/myisam/mi_test_all.sh
diff --git a/myisam/mi_unique.c b/storage/myisam/mi_unique.c
index 34f5f595f30..34f5f595f30 100644
--- a/myisam/mi_unique.c
+++ b/storage/myisam/mi_unique.c
diff --git a/myisam/mi_update.c b/storage/myisam/mi_update.c
index cda60694008..cda60694008 100644
--- a/myisam/mi_update.c
+++ b/storage/myisam/mi_update.c
diff --git a/myisam/mi_write.c b/storage/myisam/mi_write.c
index dd062b79769..dd062b79769 100644
--- a/myisam/mi_write.c
+++ b/storage/myisam/mi_write.c
diff --git a/myisam/myisam_ftdump.c b/storage/myisam/myisam_ftdump.c
index 28aac0a8ecf..28aac0a8ecf 100644
--- a/myisam/myisam_ftdump.c
+++ b/storage/myisam/myisam_ftdump.c
diff --git a/myisam/myisamchk.c b/storage/myisam/myisamchk.c
index 519e123e9da..519e123e9da 100644
--- a/myisam/myisamchk.c
+++ b/storage/myisam/myisamchk.c
diff --git a/myisam/myisamdef.h b/storage/myisam/myisamdef.h
index 5688b377d3d..5688b377d3d 100644
--- a/myisam/myisamdef.h
+++ b/storage/myisam/myisamdef.h
diff --git a/myisam/myisamlog.c b/storage/myisam/myisamlog.c
index dc98d813266..dc98d813266 100644
--- a/myisam/myisamlog.c
+++ b/storage/myisam/myisamlog.c
diff --git a/myisam/myisampack.c b/storage/myisam/myisampack.c
index daf2bbdf85c..daf2bbdf85c 100644
--- a/myisam/myisampack.c
+++ b/storage/myisam/myisampack.c
diff --git a/myisam/rt_index.c b/storage/myisam/rt_index.c
index 97554dca4e6..97554dca4e6 100644
--- a/myisam/rt_index.c
+++ b/storage/myisam/rt_index.c
diff --git a/myisam/rt_index.h b/storage/myisam/rt_index.h
index d3fcd934719..d3fcd934719 100644
--- a/myisam/rt_index.h
+++ b/storage/myisam/rt_index.h
diff --git a/myisam/rt_key.c b/storage/myisam/rt_key.c
index e2a402fbefd..e2a402fbefd 100644
--- a/myisam/rt_key.c
+++ b/storage/myisam/rt_key.c
diff --git a/myisam/rt_key.h b/storage/myisam/rt_key.h
index df4f8aa03a2..df4f8aa03a2 100644
--- a/myisam/rt_key.h
+++ b/storage/myisam/rt_key.h
diff --git a/myisam/rt_mbr.c b/storage/myisam/rt_mbr.c
index c43daec2f7c..c43daec2f7c 100644
--- a/myisam/rt_mbr.c
+++ b/storage/myisam/rt_mbr.c
diff --git a/myisam/rt_mbr.h b/storage/myisam/rt_mbr.h
index 2153faad2b4..2153faad2b4 100644
--- a/myisam/rt_mbr.h
+++ b/storage/myisam/rt_mbr.h
diff --git a/myisam/rt_split.c b/storage/myisam/rt_split.c
index 31a7d09ab4f..31a7d09ab4f 100644
--- a/myisam/rt_split.c
+++ b/storage/myisam/rt_split.c
diff --git a/myisam/rt_test.c b/storage/myisam/rt_test.c
index 4f04aa11fce..4f04aa11fce 100644
--- a/myisam/rt_test.c
+++ b/storage/myisam/rt_test.c
diff --git a/myisam/sort.c b/storage/myisam/sort.c
index 9d2af2e8c70..9d2af2e8c70 100644
--- a/myisam/sort.c
+++ b/storage/myisam/sort.c
diff --git a/myisam/sp_defs.h b/storage/myisam/sp_defs.h
index 4cc2267a1bd..4cc2267a1bd 100644
--- a/myisam/sp_defs.h
+++ b/storage/myisam/sp_defs.h
diff --git a/myisam/sp_key.c b/storage/myisam/sp_key.c
index 1d43f89cba9..1d43f89cba9 100644
--- a/myisam/sp_key.c
+++ b/storage/myisam/sp_key.c
diff --git a/myisam/sp_test.c b/storage/myisam/sp_test.c
index f0b48dbd5d8..f0b48dbd5d8 100644
--- a/myisam/sp_test.c
+++ b/storage/myisam/sp_test.c
diff --git a/myisam/test_pack b/storage/myisam/test_pack
index 0cbeb57ba70..0cbeb57ba70 100755
--- a/myisam/test_pack
+++ b/storage/myisam/test_pack
diff --git a/myisammrg/.cvsignore b/storage/myisammrg/.cvsignore
index e9955884756..e9955884756 100644
--- a/myisammrg/.cvsignore
+++ b/storage/myisammrg/.cvsignore
diff --git a/myisammrg/Makefile.am b/storage/myisammrg/Makefile.am
index 14e3295c1ae..14e3295c1ae 100644
--- a/myisammrg/Makefile.am
+++ b/storage/myisammrg/Makefile.am
diff --git a/myisammrg/make-ccc b/storage/myisammrg/make-ccc
index a7e3dfc3cdb..a7e3dfc3cdb 100755
--- a/myisammrg/make-ccc
+++ b/storage/myisammrg/make-ccc
diff --git a/myisammrg/myrg_close.c b/storage/myisammrg/myrg_close.c
index 897020c6865..897020c6865 100644
--- a/myisammrg/myrg_close.c
+++ b/storage/myisammrg/myrg_close.c
diff --git a/myisammrg/myrg_create.c b/storage/myisammrg/myrg_create.c
index 7ddb7ecb3b9..7ddb7ecb3b9 100644
--- a/myisammrg/myrg_create.c
+++ b/storage/myisammrg/myrg_create.c
diff --git a/myisammrg/myrg_def.h b/storage/myisammrg/myrg_def.h
index 00e7950bccf..00e7950bccf 100644
--- a/myisammrg/myrg_def.h
+++ b/storage/myisammrg/myrg_def.h
diff --git a/myisammrg/myrg_delete.c b/storage/myisammrg/myrg_delete.c
index 8b89ed62ac1..8b89ed62ac1 100644
--- a/myisammrg/myrg_delete.c
+++ b/storage/myisammrg/myrg_delete.c
diff --git a/myisammrg/myrg_extra.c b/storage/myisammrg/myrg_extra.c
index 62cf5f01aba..62cf5f01aba 100644
--- a/myisammrg/myrg_extra.c
+++ b/storage/myisammrg/myrg_extra.c
diff --git a/myisammrg/myrg_info.c b/storage/myisammrg/myrg_info.c
index ba840ac444b..ba840ac444b 100644
--- a/myisammrg/myrg_info.c
+++ b/storage/myisammrg/myrg_info.c
diff --git a/myisammrg/myrg_locking.c b/storage/myisammrg/myrg_locking.c
index e5a8d3f3d9d..e5a8d3f3d9d 100644
--- a/myisammrg/myrg_locking.c
+++ b/storage/myisammrg/myrg_locking.c
diff --git a/myisammrg/myrg_open.c b/storage/myisammrg/myrg_open.c
index f9cdc2bb205..f9cdc2bb205 100644
--- a/myisammrg/myrg_open.c
+++ b/storage/myisammrg/myrg_open.c
diff --git a/myisammrg/myrg_panic.c b/storage/myisammrg/myrg_panic.c
index ab08b8082c3..ab08b8082c3 100644
--- a/myisammrg/myrg_panic.c
+++ b/storage/myisammrg/myrg_panic.c
diff --git a/myisammrg/myrg_queue.c b/storage/myisammrg/myrg_queue.c
index dfb434d6397..dfb434d6397 100644
--- a/myisammrg/myrg_queue.c
+++ b/storage/myisammrg/myrg_queue.c
diff --git a/myisammrg/myrg_range.c b/storage/myisammrg/myrg_range.c
index aafdf70525c..aafdf70525c 100644
--- a/myisammrg/myrg_range.c
+++ b/storage/myisammrg/myrg_range.c
diff --git a/myisammrg/myrg_rfirst.c b/storage/myisammrg/myrg_rfirst.c
index 9ba07686c47..9ba07686c47 100644
--- a/myisammrg/myrg_rfirst.c
+++ b/storage/myisammrg/myrg_rfirst.c
diff --git a/myisammrg/myrg_rkey.c b/storage/myisammrg/myrg_rkey.c
index a85ef6a3b5e..a85ef6a3b5e 100644
--- a/myisammrg/myrg_rkey.c
+++ b/storage/myisammrg/myrg_rkey.c
diff --git a/myisammrg/myrg_rlast.c b/storage/myisammrg/myrg_rlast.c
index 96bb798bd4f..96bb798bd4f 100644
--- a/myisammrg/myrg_rlast.c
+++ b/storage/myisammrg/myrg_rlast.c
diff --git a/myisammrg/myrg_rnext.c b/storage/myisammrg/myrg_rnext.c
index 0929c63fc1d..0929c63fc1d 100644
--- a/myisammrg/myrg_rnext.c
+++ b/storage/myisammrg/myrg_rnext.c
diff --git a/myisammrg/myrg_rnext_same.c b/storage/myisammrg/myrg_rnext_same.c
index 997e4100acd..997e4100acd 100644
--- a/myisammrg/myrg_rnext_same.c
+++ b/storage/myisammrg/myrg_rnext_same.c
diff --git a/myisammrg/myrg_rprev.c b/storage/myisammrg/myrg_rprev.c
index 797993e903d..797993e903d 100644
--- a/myisammrg/myrg_rprev.c
+++ b/storage/myisammrg/myrg_rprev.c
diff --git a/myisammrg/myrg_rrnd.c b/storage/myisammrg/myrg_rrnd.c
index d623ea8ea9c..d623ea8ea9c 100644
--- a/myisammrg/myrg_rrnd.c
+++ b/storage/myisammrg/myrg_rrnd.c
diff --git a/myisammrg/myrg_rsame.c b/storage/myisammrg/myrg_rsame.c
index f6b2164dc21..f6b2164dc21 100644
--- a/myisammrg/myrg_rsame.c
+++ b/storage/myisammrg/myrg_rsame.c
diff --git a/myisammrg/myrg_static.c b/storage/myisammrg/myrg_static.c
index 9e76cbae07b..9e76cbae07b 100644
--- a/myisammrg/myrg_static.c
+++ b/storage/myisammrg/myrg_static.c
diff --git a/myisammrg/myrg_update.c b/storage/myisammrg/myrg_update.c
index 7b9f614b965..7b9f614b965 100644
--- a/myisammrg/myrg_update.c
+++ b/storage/myisammrg/myrg_update.c
diff --git a/myisammrg/myrg_write.c b/storage/myisammrg/myrg_write.c
index 532709e361d..532709e361d 100644
--- a/myisammrg/myrg_write.c
+++ b/storage/myisammrg/myrg_write.c
diff --git a/storage/ndb/Makefile.am b/storage/ndb/Makefile.am
new file mode 100644
index 00000000000..9adb67f89fc
--- /dev/null
+++ b/storage/ndb/Makefile.am
@@ -0,0 +1,30 @@
+SUBDIRS = src tools . include @ndb_opt_subdirs@
+DIST_SUBDIRS = src tools include test docs
+EXTRA_DIST = config ndbapi-examples
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+
+dist-hook:
+	-rm -rf `find $(distdir) -type d -name SCCS`
+	-rm -rf `find $(distdir) -type d -name old_files`
+	-rm -rf `find $(distdir)/ndbapi-examples -name '*.o'`
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" != "." -a "$$subdir" != "include"; then \
+	    files="`find $$subdir -name '*\.h'` `find $$subdir -name '*\.hpp'`"; \
+	    for f in $$files; do \
+	      if test -d "$(distdir)/`dirname $$f`" -a ! -e "$(distdir)/$$f"; then \
+	        cp $$f $(distdir)/$$f; \
+	      fi; \
+	    done; \
+	  fi; \
+	done
+
+windoze:
+	for i in `find . -name 'Makefile.am'`; do make -C `dirname $$i` windoze-dsp; done
+
+windoze-dsp:
+
+all-windoze-dsp: windoze
+	find . -name '*.dsp' | grep -v SCCS | xargs unix2dos
+	$(top_srcdir)/storage/ndb/config/make-win-dsw.sh | unix2dos > ndb.dsw
+	tar cvfz ndb-win-dsp.tar.gz ndb.dsw `find . -name '*.dsp' | grep -v SCCS`
diff --git a/ndb/bin/.empty b/storage/ndb/bin/.empty
index e69de29bb2d..e69de29bb2d 100644
--- a/ndb/bin/.empty
+++ b/storage/ndb/bin/.empty
diff --git a/ndb/bin/check-regression.sh b/storage/ndb/bin/check-regression.sh
index 93a31ccb39c..93a31ccb39c 100755
--- a/ndb/bin/check-regression.sh
+++ b/storage/ndb/bin/check-regression.sh
diff --git a/ndb/bin/makeTestPrograms_html.sh b/storage/ndb/bin/makeTestPrograms_html.sh
index ac31c8a6267..ac31c8a6267 100755
--- a/ndb/bin/makeTestPrograms_html.sh
+++ b/storage/ndb/bin/makeTestPrograms_html.sh
diff --git a/storage/ndb/config/common.mk.am b/storage/ndb/config/common.mk.am
new file mode 100644
index 00000000000..1fc254ef57c
--- /dev/null
+++ b/storage/ndb/config/common.mk.am
@@ -0,0 +1,12 @@
+ndbbindir        = "$(libexecdir)"
+ndbtoolsdir      = "$(bindir)"
+ndbtestdir       = "$(bindir)"
+ndblibdir        = "$(pkglibdir)"
+ndbincludedir    = "$(pkgincludedir)/storage/ndb"
+ndbapiincludedir = "$(pkgincludedir)/storage/ndb/ndbapi"
+mgmapiincludedir = "$(pkgincludedir)/storage/ndb/mgmapi"
+
+INCLUDES = $(INCLUDES_LOC)
+LDADD = $(top_srcdir)/storage/ndb/src/common/portlib/gcc.cpp $(LDADD_LOC)
+DEFS = @DEFS@ @NDB_DEFS@ $(DEFS_LOC) $(NDB_EXTRA_FLAGS)
+NDB_CXXFLAGS=@ndb_cxxflags_fix@ $(NDB_CXXFLAGS_LOC) 
diff --git a/ndb/config/make-win-dsw.sh b/storage/ndb/config/make-win-dsw.sh
index b0613620f8a..b0613620f8a 100755
--- a/ndb/config/make-win-dsw.sh
+++ b/storage/ndb/config/make-win-dsw.sh
diff --git a/storage/ndb/config/type_kernel.mk.am b/storage/ndb/config/type_kernel.mk.am
new file mode 100644
index 00000000000..710cdbd80fa
--- /dev/null
+++ b/storage/ndb/config/type_kernel.mk.am
@@ -0,0 +1,18 @@
+
+INCLUDES += \
+        -I$(srcdir) -I$(top_srcdir)/include \
+	-I$(top_srcdir)/storage/ndb/include \
+        -I$(top_srcdir)/storage/ndb/src/kernel/vm \
+        -I$(top_srcdir)/storage/ndb/src/kernel/error \
+	-I$(top_srcdir)/storage/ndb/src/kernel \
+	-I$(top_srcdir)/storage/ndb/include/kernel \
+	-I$(top_srcdir)/storage/ndb/include/transporter \
+	-I$(top_srcdir)/storage/ndb/include/debugger \
+	-I$(top_srcdir)/storage/ndb/include/mgmapi \
+	-I$(top_srcdir)/storage/ndb/include/mgmcommon \
+        -I$(top_srcdir)/storage/ndb/include/ndbapi \
+        -I$(top_srcdir)/storage/ndb/include/util \
+	-I$(top_srcdir)/storage/ndb/include/portlib \
+	-I$(top_srcdir)/storage/ndb/include/logger
+
+#AM_LDFLAGS = @ndb_ldflags@
diff --git a/storage/ndb/config/type_mgmapiclient.mk.am b/storage/ndb/config/type_mgmapiclient.mk.am
new file mode 100644
index 00000000000..d1d002962ae
--- /dev/null
+++ b/storage/ndb/config/type_mgmapiclient.mk.am
@@ -0,0 +1,2 @@
+
+INCLUDES += -I$(top_srcdir)/storage/ndb/include/mgmapi
diff --git a/storage/ndb/config/type_ndbapi.mk.am b/storage/ndb/config/type_ndbapi.mk.am
new file mode 100644
index 00000000000..d4be0c40b36
--- /dev/null
+++ b/storage/ndb/config/type_ndbapi.mk.am
@@ -0,0 +1,12 @@
+
+INCLUDES += \
+        -I$(srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/storage/ndb/include \
+	-I$(top_srcdir)/storage/ndb/include/kernel \
+	-I$(top_srcdir)/storage/ndb/include/transporter \
+	-I$(top_srcdir)/storage/ndb/include/debugger \
+	-I$(top_srcdir)/storage/ndb/include/mgmapi \
+	-I$(top_srcdir)/storage/ndb/include/mgmcommon \
+        -I$(top_srcdir)/storage/ndb/include/ndbapi \
+        -I$(top_srcdir)/storage/ndb/include/util \
+	-I$(top_srcdir)/storage/ndb/include/portlib \
+	-I$(top_srcdir)/storage/ndb/include/logger
diff --git a/storage/ndb/config/type_ndbapiclient.mk.am b/storage/ndb/config/type_ndbapiclient.mk.am
new file mode 100644
index 00000000000..eae7ca73ea2
--- /dev/null
+++ b/storage/ndb/config/type_ndbapiclient.mk.am
@@ -0,0 +1,2 @@
+
+INCLUDES += -I$(top_srcdir)/storage/ndb/include/ndbapi
diff --git a/storage/ndb/config/type_ndbapitest.mk.am b/storage/ndb/config/type_ndbapitest.mk.am
new file mode 100644
index 00000000000..f4a339b27c7
--- /dev/null
+++ b/storage/ndb/config/type_ndbapitest.mk.am
@@ -0,0 +1,14 @@
+
+LDADD += $(top_builddir)/storage/ndb/test/src/libNDBT.a \
+         $(top_builddir)/storage/ndb/src/libndbclient.la \
+         $(top_builddir)/dbug/libdbug.a \
+         $(top_builddir)/mysys/libmysys.a \
+         $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
+
+INCLUDES += -I$(top_srcdir) -I$(top_srcdir)/include \
+	-I$(top_srcdir)/storage/ndb/include \
+        -I$(top_srcdir)/storage/ndb/include/ndbapi \
+        -I$(top_srcdir)/storage/ndb/include/util \
+        -I$(top_srcdir)/storage/ndb/include/portlib \
+        -I$(top_srcdir)/storage/ndb/test/include \
+        -I$(top_srcdir)/storage/ndb/include/mgmapi
diff --git a/storage/ndb/config/type_ndbapitools.mk.am b/storage/ndb/config/type_ndbapitools.mk.am
new file mode 100644
index 00000000000..e0f2fd1c0f6
--- /dev/null
+++ b/storage/ndb/config/type_ndbapitools.mk.am
@@ -0,0 +1,15 @@
+
+LDADD += \
+         $(top_builddir)/storage/ndb/src/libndbclient.la \
+         $(top_builddir)/dbug/libdbug.a \
+         $(top_builddir)/mysys/libmysys.a \
+         $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
+
+INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \
+	-I$(top_srcdir)/storage/ndb/include \
+        -I$(top_srcdir)/storage/ndb/include/ndbapi \
+        -I$(top_srcdir)/storage/ndb/include/util \
+        -I$(top_srcdir)/storage/ndb/include/portlib \
+        -I$(top_srcdir)/storage/ndb/test/include \
+        -I$(top_srcdir)/storage/ndb/include/mgmapi \
+        -I$(top_srcdir)/storage/ndb/include/kernel
diff --git a/storage/ndb/config/type_util.mk.am b/storage/ndb/config/type_util.mk.am
new file mode 100644
index 00000000000..5d7ad6e57b9
--- /dev/null
+++ b/storage/ndb/config/type_util.mk.am
@@ -0,0 +1,6 @@
+
+INCLUDES += -I$(srcdir) -I$(top_srcdir)/include \
+	-I$(top_srcdir)/storage/ndb/include \
+        -I$(top_srcdir)/storage/ndb/include/util \
+        -I$(top_srcdir)/storage/ndb/include/portlib \
+        -I$(top_srcdir)/storage/ndb/include/logger
diff --git a/ndb/config/win-includes b/storage/ndb/config/win-includes
index fa5984fd25e..fa5984fd25e 100755
--- a/ndb/config/win-includes
+++ b/storage/ndb/config/win-includes
diff --git a/ndb/config/win-lib.am b/storage/ndb/config/win-lib.am
index 05ac1ec8a40..05ac1ec8a40 100644
--- a/ndb/config/win-lib.am
+++ b/storage/ndb/config/win-lib.am
diff --git a/ndb/config/win-libraries b/storage/ndb/config/win-libraries
index c7a6fb696ee..c7a6fb696ee 100755
--- a/ndb/config/win-libraries
+++ b/storage/ndb/config/win-libraries
diff --git a/ndb/config/win-name b/storage/ndb/config/win-name
index 036f2b9cc2e..036f2b9cc2e 100755
--- a/ndb/config/win-name
+++ b/storage/ndb/config/win-name
diff --git a/ndb/config/win-prg.am b/storage/ndb/config/win-prg.am
index 10a8cfbca02..10a8cfbca02 100644
--- a/ndb/config/win-prg.am
+++ b/storage/ndb/config/win-prg.am
diff --git a/ndb/config/win-sources b/storage/ndb/config/win-sources
index a383bb0e613..a383bb0e613 100755
--- a/ndb/config/win-sources
+++ b/storage/ndb/config/win-sources
diff --git a/ndb/demos/1-node/1-api-3/Ndb.cfg b/storage/ndb/demos/1-node/1-api-3/Ndb.cfg
index 61309af029e..61309af029e 100644
--- a/ndb/demos/1-node/1-api-3/Ndb.cfg
+++ b/storage/ndb/demos/1-node/1-api-3/Ndb.cfg
diff --git a/ndb/demos/1-node/1-db-2/Ndb.cfg b/storage/ndb/demos/1-node/1-db-2/Ndb.cfg
index 9315950b67a..9315950b67a 100644
--- a/ndb/demos/1-node/1-db-2/Ndb.cfg
+++ b/storage/ndb/demos/1-node/1-db-2/Ndb.cfg
diff --git a/ndb/demos/1-node/1-mgm-1/Ndb.cfg b/storage/ndb/demos/1-node/1-mgm-1/Ndb.cfg
index 61d4c0ecc17..61d4c0ecc17 100644
--- a/ndb/demos/1-node/1-mgm-1/Ndb.cfg
+++ b/storage/ndb/demos/1-node/1-mgm-1/Ndb.cfg
diff --git a/ndb/demos/1-node/1-mgm-1/template_config.ini b/storage/ndb/demos/1-node/1-mgm-1/template_config.ini
index 76bb7867e3c..76bb7867e3c 100644
--- a/ndb/demos/1-node/1-mgm-1/template_config.ini
+++ b/storage/ndb/demos/1-node/1-mgm-1/template_config.ini
diff --git a/ndb/demos/2-node/2-api-4/Ndb.cfg b/storage/ndb/demos/2-node/2-api-4/Ndb.cfg
index 1713a9b5893..1713a9b5893 100644
--- a/ndb/demos/2-node/2-api-4/Ndb.cfg
+++ b/storage/ndb/demos/2-node/2-api-4/Ndb.cfg
diff --git a/ndb/demos/2-node/2-api-5/Ndb.cfg b/storage/ndb/demos/2-node/2-api-5/Ndb.cfg
index faa2882eeea..faa2882eeea 100644
--- a/ndb/demos/2-node/2-api-5/Ndb.cfg
+++ b/storage/ndb/demos/2-node/2-api-5/Ndb.cfg
diff --git a/ndb/demos/2-node/2-api-6/Ndb.cfg b/storage/ndb/demos/2-node/2-api-6/Ndb.cfg
index bc2c4809453..bc2c4809453 100644
--- a/ndb/demos/2-node/2-api-6/Ndb.cfg
+++ b/storage/ndb/demos/2-node/2-api-6/Ndb.cfg
diff --git a/ndb/demos/2-node/2-api-7/Ndb.cfg b/storage/ndb/demos/2-node/2-api-7/Ndb.cfg
index 4107fdb6c5e..4107fdb6c5e 100644
--- a/ndb/demos/2-node/2-api-7/Ndb.cfg
+++ b/storage/ndb/demos/2-node/2-api-7/Ndb.cfg
diff --git a/ndb/demos/2-node/2-db-2/Ndb.cfg b/storage/ndb/demos/2-node/2-db-2/Ndb.cfg
index 9315950b67a..9315950b67a 100644
--- a/ndb/demos/2-node/2-db-2/Ndb.cfg
+++ b/storage/ndb/demos/2-node/2-db-2/Ndb.cfg
diff --git a/ndb/demos/2-node/2-db-3/Ndb.cfg b/storage/ndb/demos/2-node/2-db-3/Ndb.cfg
index 61309af029e..61309af029e 100644
--- a/ndb/demos/2-node/2-db-3/Ndb.cfg
+++ b/storage/ndb/demos/2-node/2-db-3/Ndb.cfg
diff --git a/ndb/demos/2-node/2-mgm-1/Ndb.cfg b/storage/ndb/demos/2-node/2-mgm-1/Ndb.cfg
index 61d4c0ecc17..61d4c0ecc17 100644
--- a/ndb/demos/2-node/2-mgm-1/Ndb.cfg
+++ b/storage/ndb/demos/2-node/2-mgm-1/Ndb.cfg
diff --git a/ndb/demos/2-node/2-mgm-1/template_config.ini b/storage/ndb/demos/2-node/2-mgm-1/template_config.ini
index 3edb909609a..3edb909609a 100644
--- a/ndb/demos/2-node/2-mgm-1/template_config.ini
+++ b/storage/ndb/demos/2-node/2-mgm-1/template_config.ini
diff --git a/ndb/demos/config-templates/config_template-1-REP.ini b/storage/ndb/demos/config-templates/config_template-1-REP.ini
index 71be3f2f53f..71be3f2f53f 100644
--- a/ndb/demos/config-templates/config_template-1-REP.ini
+++ b/storage/ndb/demos/config-templates/config_template-1-REP.ini
diff --git a/ndb/demos/config-templates/config_template-4.ini b/storage/ndb/demos/config-templates/config_template-4.ini
index e47c9037344..e47c9037344 100644
--- a/ndb/demos/config-templates/config_template-4.ini
+++ b/storage/ndb/demos/config-templates/config_template-4.ini
diff --git a/ndb/demos/config-templates/config_template-install.ini b/storage/ndb/demos/config-templates/config_template-install.ini
index e31906ba609..e31906ba609 100644
--- a/ndb/demos/config-templates/config_template-install.ini
+++ b/storage/ndb/demos/config-templates/config_template-install.ini
diff --git a/ndb/demos/run_demo1-PS-SS_common.sh b/storage/ndb/demos/run_demo1-PS-SS_common.sh
index 625e9655087..625e9655087 100644
--- a/ndb/demos/run_demo1-PS-SS_common.sh
+++ b/storage/ndb/demos/run_demo1-PS-SS_common.sh
diff --git a/ndb/demos/run_demo1-PS.sh b/storage/ndb/demos/run_demo1-PS.sh
index 82cfdd5e65b..82cfdd5e65b 100755
--- a/ndb/demos/run_demo1-PS.sh
+++ b/storage/ndb/demos/run_demo1-PS.sh
diff --git a/ndb/demos/run_demo1-SS.sh b/storage/ndb/demos/run_demo1-SS.sh
index 5ede57c44c4..5ede57c44c4 100755
--- a/ndb/demos/run_demo1-SS.sh
+++ b/storage/ndb/demos/run_demo1-SS.sh
diff --git a/ndb/demos/run_demo1.sh b/storage/ndb/demos/run_demo1.sh
index df6e3fc799d..df6e3fc799d 100755
--- a/ndb/demos/run_demo1.sh
+++ b/storage/ndb/demos/run_demo1.sh
diff --git a/ndb/demos/run_demo2.sh b/storage/ndb/demos/run_demo2.sh
index 9bae7517d5f..9bae7517d5f 100755
--- a/ndb/demos/run_demo2.sh
+++ b/storage/ndb/demos/run_demo2.sh
diff --git a/storage/ndb/docs/Makefile.am b/storage/ndb/docs/Makefile.am
new file mode 100644
index 00000000000..d10228d419d
--- /dev/null
+++ b/storage/ndb/docs/Makefile.am
@@ -0,0 +1,114 @@
+DOXYDIR = doxygen
+noinst_HEADERS = $(DOXYDIR)/predoxy.pl $(DOXYDIR)/postdoxy.pl $(DOXYDIR)/Doxyfile.ndbapi $(DOXYDIR)/Doxyfile.mgmapi $(DOXYDIR)/header.ndbapi.tex $(DOXYDIR)/header.mgmapi.tex
+
+all: 	do-check-html ndbapidoc-html mgmapidoc-html
+all-pdf: 	do-check-pdf ndbapidoc-pdf mgmapidoc-pdf
+
+DOXYTMP =	.doxytmp
+DOXYOUT =	.doxyout
+
+NDB_RELEASE = @NDB_VERSION_MAJOR@.@NDB_VERSION_MINOR@.@NDB_VERSION_BUILD@-@NDB_VERSION_STATUS@
+
+clean-local:
+	rm -rf ndbapi.pdf ndbapi.html mgmapi.pdf mgmapi.html
+	rm -rf $(DOXYTMP) $(DOXYOUT)
+
+do-check-html:
+	@set -x; \
+	if test @PERL@ = no ; then \
+	  echo "Perl needed to make docs"; \
+	  exit 1; \
+	fi; \
+	if test @DOXYGEN@ = no ; then \
+	  echo "Doxygen needed to make docs"; \
+	  exit 1; \
+	fi;
+
+do-check-pdf: do-check-html
+	if test @PDFLATEX@ = no ; then \
+	  echo "Pdflatex needed to make docs"; \
+	  exit 1; \
+	fi; \
+	if test @MAKEINDEX@ = no ; then \
+	  echo "Makeindex needed to make docs"; \
+	  exit 1; \
+	fi;
+
+###
+#
+#  NDB API Programmer's Guide
+#
+ndbapidoc-html: ndbapi.html
+ndbapidoc-pdf: ndbapi.pdf
+
+ndbapi.html: $(noinst_HEADERS)
+	@set -x; \
+	export NDB_RELEASE=$(NDB_RELEASE); \
+	@RM@ -f ndbapi.pdf ndbapi.html; \
+	@RM@ -rf $(DOXYTMP) $(DOXYOUT); \
+	mkdir -p $(DOXYTMP) $(DOXYOUT); \
+	@CP@ $(top_srcdir)/storage/ndb/include/ndbapi/*  $(DOXYTMP); \
+	@CP@ $(top_srcdir)/storage/ndb/ndbapi-examples/*/*.[ch]pp $(DOXYTMP); \
+	@PERL@ $(DOXYDIR)/predoxy.pl; \
+	mv footer.html $(DOXYTMP); \
+	(cd $(DOXYTMP) ; @DOXYGEN@ ../$(DOXYDIR)/Doxyfile.ndbapi); \
+	@PERL@ $(DOXYDIR)/postdoxy.pl $(DOXYOUT)/ndbapi.latex "MySQL Cluster NDB API Programmer Guide"; \
+	(cd $(DOXYOUT) && \
+		find ndbapi.html -print | cpio -pdm ..);
+
+ndbapi.pdf: ndbapi.html
+	(cd $(DOXYOUT)/ndbapi.latex && \
+		@PDFLATEX@ refman.tex && @MAKEINDEX@ refman && @PDFLATEX@ refman.tex && \
+		cp -p refman.pdf ../../ndbapi.pdf);
+
+###
+#
+#  MGM API Guide
+#
+mgmapidoc-html: mgmapi.html
+mgmapidoc-pdf: mgmapi.pdf
+
+mgmapi.html: $(noinst_HEADERS)
+	@set -x; \
+	export NDB_RELEASE=$(NDB_RELEASE); \
+	@RM@ -f mgmapi.pdf mgmapi.html; \
+	@RM@ -rf $(DOXYTMP) $(DOXYOUT); \
+	mkdir -p $(DOXYTMP) $(DOXYOUT); \
+	@CP@ $(top_srcdir)/storage/ndb/include/mgmapi/*  $(DOXYTMP); \
+	@PERL@ $(DOXYDIR)/predoxy.pl; \
+	mv footer.html $(DOXYTMP); \
+	(cd $(DOXYTMP) ; @DOXYGEN@ ../$(DOXYDIR)/Doxyfile.mgmapi); \
+	@PERL@ $(DOXYDIR)/postdoxy.pl $(DOXYOUT)/mgmapi.latex "MySQL Cluster MGM API Guide"; \
+	(cd $(DOXYOUT) && \
+		find mgmapi.html -print | cpio -pdm ..);
+
+mgmapi.pdf: mgmapi.html
+	(cd $(DOXYOUT)/mgmapi.latex && \
+		@PDFLATEX@ refman.tex && @MAKEINDEX@ refman && @PDFLATEX@ refman.tex && \
+		cp -p refman.pdf ../../mgmapi.pdf);
+
+###
+#  
+#  Complete Source Browser except for 
+#        ndbapi odbc test tools win32 lib examples docs CVS config bin 
+#        include/ndbapi 
+#        include/newtonapi src/newtonapi
+#        include/mgmapi src/mgmapi
+#        src/client
+ndbdoc: DUMMY
+	mkdir -p $(OUTDIR)
+	cd $(top_srcdir)/storage/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.ndb
+
+###
+#
+#  odbcdoc - Complete Source Browser for NDB ODBC (src/client/odbc)
+
+odbcdoc: DUMMY
+	mkdir -p $(OUTDIR)
+	cd $(top_srcdir)/storage/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.odbc
+
+testdoc: DUMMY
+	mkdir -p $(OUTDIR)
+	cd $(top_srcdir)/storage/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.test
+
+windoze-dsp:
diff --git a/ndb/docs/README b/storage/ndb/docs/README
index 262e9003aca..262e9003aca 100644
--- a/ndb/docs/README
+++ b/storage/ndb/docs/README
diff --git a/ndb/docs/doxygen/Doxyfile.mgmapi b/storage/ndb/docs/doxygen/Doxyfile.mgmapi
index 1e743dcb60e..1e743dcb60e 100644
--- a/ndb/docs/doxygen/Doxyfile.mgmapi
+++ b/storage/ndb/docs/doxygen/Doxyfile.mgmapi
diff --git a/ndb/docs/doxygen/Doxyfile.ndb b/storage/ndb/docs/doxygen/Doxyfile.ndb
index 3986a7cd17f..3986a7cd17f 100644
--- a/ndb/docs/doxygen/Doxyfile.ndb
+++ b/storage/ndb/docs/doxygen/Doxyfile.ndb
diff --git a/ndb/docs/doxygen/Doxyfile.ndbapi b/storage/ndb/docs/doxygen/Doxyfile.ndbapi
index da610148468..da610148468 100644
--- a/ndb/docs/doxygen/Doxyfile.ndbapi
+++ b/storage/ndb/docs/doxygen/Doxyfile.ndbapi
diff --git a/ndb/docs/doxygen/Doxyfile.odbc b/storage/ndb/docs/doxygen/Doxyfile.odbc
index 262513852b7..262513852b7 100644
--- a/ndb/docs/doxygen/Doxyfile.odbc
+++ b/storage/ndb/docs/doxygen/Doxyfile.odbc
diff --git a/ndb/docs/doxygen/Doxyfile.test b/storage/ndb/docs/doxygen/Doxyfile.test
index 801c82cf380..801c82cf380 100644
--- a/ndb/docs/doxygen/Doxyfile.test
+++ b/storage/ndb/docs/doxygen/Doxyfile.test
diff --git a/ndb/docs/doxygen/header.mgmapi.tex b/storage/ndb/docs/doxygen/header.mgmapi.tex
index 1b55ceb15c7..1b55ceb15c7 100644
--- a/ndb/docs/doxygen/header.mgmapi.tex
+++ b/storage/ndb/docs/doxygen/header.mgmapi.tex
diff --git a/ndb/docs/doxygen/header.ndbapi.tex b/storage/ndb/docs/doxygen/header.ndbapi.tex
index c37ce286ed8..c37ce286ed8 100644
--- a/ndb/docs/doxygen/header.ndbapi.tex
+++ b/storage/ndb/docs/doxygen/header.ndbapi.tex
diff --git a/ndb/docs/doxygen/postdoxy.pl b/storage/ndb/docs/doxygen/postdoxy.pl
index ad0edb44a31..ad0edb44a31 100755
--- a/ndb/docs/doxygen/postdoxy.pl
+++ b/storage/ndb/docs/doxygen/postdoxy.pl
diff --git a/ndb/docs/doxygen/predoxy.pl b/storage/ndb/docs/doxygen/predoxy.pl
index 3994054dcf6..3994054dcf6 100755
--- a/ndb/docs/doxygen/predoxy.pl
+++ b/storage/ndb/docs/doxygen/predoxy.pl
diff --git a/ndb/docs/wl2077.txt b/storage/ndb/docs/wl2077.txt
index f5b10bb702e..f5b10bb702e 100644
--- a/ndb/docs/wl2077.txt
+++ b/storage/ndb/docs/wl2077.txt
diff --git a/ndb/home/bin/Linuxmkisofs b/storage/ndb/home/bin/Linuxmkisofs
index a531f4cca7b..a531f4cca7b 100755
--- a/ndb/home/bin/Linuxmkisofs
+++ b/storage/ndb/home/bin/Linuxmkisofs
diff --git a/ndb/home/bin/Solarismkisofs b/storage/ndb/home/bin/Solarismkisofs
index b239eaed6ad..b239eaed6ad 100755
--- a/ndb/home/bin/Solarismkisofs
+++ b/storage/ndb/home/bin/Solarismkisofs
diff --git a/ndb/home/bin/cvs2cl.pl b/storage/ndb/home/bin/cvs2cl.pl
index 9e6da5acf5b..9e6da5acf5b 100755
--- a/ndb/home/bin/cvs2cl.pl
+++ b/storage/ndb/home/bin/cvs2cl.pl
diff --git a/ndb/home/bin/fix-cvs-root b/storage/ndb/home/bin/fix-cvs-root
index 2c4f158f825..2c4f158f825 100755
--- a/ndb/home/bin/fix-cvs-root
+++ b/storage/ndb/home/bin/fix-cvs-root
diff --git a/ndb/home/bin/import-from-bk.sh b/storage/ndb/home/bin/import-from-bk.sh
index 4e3957be6d5..4e3957be6d5 100755
--- a/ndb/home/bin/import-from-bk.sh
+++ b/storage/ndb/home/bin/import-from-bk.sh
diff --git a/ndb/home/bin/ndb_deploy b/storage/ndb/home/bin/ndb_deploy
index 773fc9b8fd7..773fc9b8fd7 100755
--- a/ndb/home/bin/ndb_deploy
+++ b/storage/ndb/home/bin/ndb_deploy
diff --git a/ndb/home/bin/ndbdoxy.pl b/storage/ndb/home/bin/ndbdoxy.pl
index 89b7de8440e..89b7de8440e 100755
--- a/ndb/home/bin/ndbdoxy.pl
+++ b/storage/ndb/home/bin/ndbdoxy.pl
diff --git a/ndb/home/bin/ngcalc b/storage/ndb/home/bin/ngcalc
index a289d384db9..a289d384db9 100755
--- a/ndb/home/bin/ngcalc
+++ b/storage/ndb/home/bin/ngcalc
diff --git a/ndb/home/bin/parseConfigFile.awk b/storage/ndb/home/bin/parseConfigFile.awk
index 6903949156c..6903949156c 100644
--- a/ndb/home/bin/parseConfigFile.awk
+++ b/storage/ndb/home/bin/parseConfigFile.awk
diff --git a/ndb/home/bin/setup-test.sh b/storage/ndb/home/bin/setup-test.sh
index 61097c30027..61097c30027 100755
--- a/ndb/home/bin/setup-test.sh
+++ b/storage/ndb/home/bin/setup-test.sh
diff --git a/ndb/home/bin/signallog2html.lib/signallog2list.awk b/storage/ndb/home/bin/signallog2html.lib/signallog2list.awk
index 9839f314556..9839f314556 100644
--- a/ndb/home/bin/signallog2html.lib/signallog2list.awk
+++ b/storage/ndb/home/bin/signallog2html.lib/signallog2list.awk
diff --git a/ndb/home/bin/signallog2html.lib/uniq_blocks.awk b/storage/ndb/home/bin/signallog2html.lib/uniq_blocks.awk
index 43f48d1cde1..43f48d1cde1 100644
--- a/ndb/home/bin/signallog2html.lib/uniq_blocks.awk
+++ b/storage/ndb/home/bin/signallog2html.lib/uniq_blocks.awk
diff --git a/ndb/home/bin/signallog2html.sh b/storage/ndb/home/bin/signallog2html.sh
index 5665275807c..5665275807c 100755
--- a/ndb/home/bin/signallog2html.sh
+++ b/storage/ndb/home/bin/signallog2html.sh
diff --git a/ndb/home/bin/stripcr b/storage/ndb/home/bin/stripcr
index 540418f88cf..540418f88cf 100755
--- a/ndb/home/bin/stripcr
+++ b/storage/ndb/home/bin/stripcr
diff --git a/ndb/home/lib/funcs.sh b/storage/ndb/home/lib/funcs.sh
index b7d8914035e..b7d8914035e 100644
--- a/ndb/home/lib/funcs.sh
+++ b/storage/ndb/home/lib/funcs.sh
diff --git a/storage/ndb/include/Makefile.am b/storage/ndb/include/Makefile.am
new file mode 100644
index 00000000000..f702514d4e2
--- /dev/null
+++ b/storage/ndb/include/Makefile.am
@@ -0,0 +1,51 @@
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+
+ndbinclude_HEADERS = \
+ndb_constants.h \
+ndb_init.h \
+ndb_types.h \
+ndb_version.h
+
+ndbapiinclude_HEADERS = \
+ndbapi/ndbapi_limits.h \
+ndbapi/ndb_opt_defaults.h \
+ndbapi/Ndb.hpp \
+ndbapi/NdbApi.hpp \
+ndbapi/NdbTransaction.hpp \
+ndbapi/NdbDictionary.hpp \
+ndbapi/NdbError.hpp \
+ndbapi/NdbEventOperation.hpp \
+ndbapi/NdbIndexOperation.hpp \
+ndbapi/NdbOperation.hpp \
+ndbapi/ndb_cluster_connection.hpp \
+ndbapi/NdbBlob.hpp \
+ndbapi/NdbPool.hpp \
+ndbapi/NdbRecAttr.hpp \
+ndbapi/NdbReceiver.hpp \
+ndbapi/NdbScanFilter.hpp \
+ndbapi/NdbScanOperation.hpp \
+ndbapi/NdbIndexScanOperation.hpp \
+ndbapi/ndberror.h
+
+mgmapiinclude_HEADERS = \
+mgmapi/mgmapi.h \
+mgmapi/mgmapi_debug.h \
+mgmapi/mgmapi_config_parameters.h \
+mgmapi/mgmapi_config_parameters_debug.h \
+mgmapi/ndb_logevent.h
+
+noinst_HEADERS = \
+ndb_global.h \
+ndb_net.h
+
+EXTRA_DIST = debugger editline kernel logger mgmcommon \
+portlib transporter util
+
+dist-hook:
+	-rm -rf `find $(distdir) -type d -name SCCS`
+
+windoze-dsp:
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
diff --git a/ndb/include/debugger/DebuggerNames.hpp b/storage/ndb/include/debugger/DebuggerNames.hpp
index cf9b1b57226..cf9b1b57226 100644
--- a/ndb/include/debugger/DebuggerNames.hpp
+++ b/storage/ndb/include/debugger/DebuggerNames.hpp
diff --git a/ndb/include/debugger/EventLogger.hpp b/storage/ndb/include/debugger/EventLogger.hpp
index 6308cf25465..6308cf25465 100644
--- a/ndb/include/debugger/EventLogger.hpp
+++ b/storage/ndb/include/debugger/EventLogger.hpp
diff --git a/ndb/include/debugger/GrepError.hpp b/storage/ndb/include/debugger/GrepError.hpp
index beedbd95c80..beedbd95c80 100644
--- a/ndb/include/debugger/GrepError.hpp
+++ b/storage/ndb/include/debugger/GrepError.hpp
diff --git a/ndb/include/debugger/SignalLoggerManager.hpp b/storage/ndb/include/debugger/SignalLoggerManager.hpp
index d212329bf78..d212329bf78 100644
--- a/ndb/include/debugger/SignalLoggerManager.hpp
+++ b/storage/ndb/include/debugger/SignalLoggerManager.hpp
diff --git a/ndb/include/editline/editline.h b/storage/ndb/include/editline/editline.h
index 2757e385968..2757e385968 100644
--- a/ndb/include/editline/editline.h
+++ b/storage/ndb/include/editline/editline.h
diff --git a/ndb/include/kernel/AttributeDescriptor.hpp b/storage/ndb/include/kernel/AttributeDescriptor.hpp
index af28e777213..af28e777213 100644
--- a/ndb/include/kernel/AttributeDescriptor.hpp
+++ b/storage/ndb/include/kernel/AttributeDescriptor.hpp
diff --git a/ndb/include/kernel/AttributeHeader.hpp b/storage/ndb/include/kernel/AttributeHeader.hpp
index 3cb432067eb..3cb432067eb 100644
--- a/ndb/include/kernel/AttributeHeader.hpp
+++ b/storage/ndb/include/kernel/AttributeHeader.hpp
diff --git a/ndb/include/kernel/AttributeList.hpp b/storage/ndb/include/kernel/AttributeList.hpp
index 70b178c6c79..70b178c6c79 100644
--- a/ndb/include/kernel/AttributeList.hpp
+++ b/storage/ndb/include/kernel/AttributeList.hpp
diff --git a/ndb/include/kernel/BlockNumbers.h b/storage/ndb/include/kernel/BlockNumbers.h
index cb3cc697eee..cb3cc697eee 100644
--- a/ndb/include/kernel/BlockNumbers.h
+++ b/storage/ndb/include/kernel/BlockNumbers.h
diff --git a/ndb/include/kernel/GlobalSignalNumbers.h b/storage/ndb/include/kernel/GlobalSignalNumbers.h
index 9413f4ef56a..9413f4ef56a 100644
--- a/ndb/include/kernel/GlobalSignalNumbers.h
+++ b/storage/ndb/include/kernel/GlobalSignalNumbers.h
diff --git a/ndb/include/kernel/GrepEvent.hpp b/storage/ndb/include/kernel/GrepEvent.hpp
index 2073a7072c9..2073a7072c9 100644
--- a/ndb/include/kernel/GrepEvent.hpp
+++ b/storage/ndb/include/kernel/GrepEvent.hpp
diff --git a/ndb/include/kernel/Interpreter.hpp b/storage/ndb/include/kernel/Interpreter.hpp
index 69c952ea7c3..69c952ea7c3 100644
--- a/ndb/include/kernel/Interpreter.hpp
+++ b/storage/ndb/include/kernel/Interpreter.hpp
diff --git a/ndb/include/kernel/LogLevel.hpp b/storage/ndb/include/kernel/LogLevel.hpp
index 60dcd36ab56..60dcd36ab56 100644
--- a/ndb/include/kernel/LogLevel.hpp
+++ b/storage/ndb/include/kernel/LogLevel.hpp
diff --git a/ndb/include/kernel/NodeBitmask.hpp b/storage/ndb/include/kernel/NodeBitmask.hpp
index 423c01cd841..423c01cd841 100644
--- a/ndb/include/kernel/NodeBitmask.hpp
+++ b/storage/ndb/include/kernel/NodeBitmask.hpp
diff --git a/ndb/include/kernel/NodeInfo.hpp b/storage/ndb/include/kernel/NodeInfo.hpp
index 5377f001949..5377f001949 100644
--- a/ndb/include/kernel/NodeInfo.hpp
+++ b/storage/ndb/include/kernel/NodeInfo.hpp
diff --git a/ndb/include/kernel/NodeState.hpp b/storage/ndb/include/kernel/NodeState.hpp
index 16784ecde79..16784ecde79 100644
--- a/ndb/include/kernel/NodeState.hpp
+++ b/storage/ndb/include/kernel/NodeState.hpp
diff --git a/ndb/include/kernel/RefConvert.hpp b/storage/ndb/include/kernel/RefConvert.hpp
index 7604b1cf224..7604b1cf224 100644
--- a/ndb/include/kernel/RefConvert.hpp
+++ b/storage/ndb/include/kernel/RefConvert.hpp
diff --git a/ndb/include/kernel/kernel_config_parameters.h b/storage/ndb/include/kernel/kernel_config_parameters.h
index bb7c6ebd42c..bb7c6ebd42c 100644
--- a/ndb/include/kernel/kernel_config_parameters.h
+++ b/storage/ndb/include/kernel/kernel_config_parameters.h
diff --git a/ndb/include/kernel/kernel_types.h b/storage/ndb/include/kernel/kernel_types.h
index b176d20798c..b176d20798c 100644
--- a/ndb/include/kernel/kernel_types.h
+++ b/storage/ndb/include/kernel/kernel_types.h
diff --git a/ndb/include/kernel/ndb_limits.h b/storage/ndb/include/kernel/ndb_limits.h
index e60153e60ec..e60153e60ec 100644
--- a/ndb/include/kernel/ndb_limits.h
+++ b/storage/ndb/include/kernel/ndb_limits.h
diff --git a/ndb/include/kernel/signaldata/AbortAll.hpp b/storage/ndb/include/kernel/signaldata/AbortAll.hpp
index a3d7f483953..a3d7f483953 100644
--- a/ndb/include/kernel/signaldata/AbortAll.hpp
+++ b/storage/ndb/include/kernel/signaldata/AbortAll.hpp
diff --git a/ndb/include/kernel/signaldata/AccFrag.hpp b/storage/ndb/include/kernel/signaldata/AccFrag.hpp
index e28ab0d1ee6..e28ab0d1ee6 100644
--- a/ndb/include/kernel/signaldata/AccFrag.hpp
+++ b/storage/ndb/include/kernel/signaldata/AccFrag.hpp
diff --git a/ndb/include/kernel/signaldata/AccLock.hpp b/storage/ndb/include/kernel/signaldata/AccLock.hpp
index 1a41b4c9334..1a41b4c9334 100644
--- a/ndb/include/kernel/signaldata/AccLock.hpp
+++ b/storage/ndb/include/kernel/signaldata/AccLock.hpp
diff --git a/ndb/include/kernel/signaldata/AccScan.hpp b/storage/ndb/include/kernel/signaldata/AccScan.hpp
index d94d4da8cca..d94d4da8cca 100644
--- a/ndb/include/kernel/signaldata/AccScan.hpp
+++ b/storage/ndb/include/kernel/signaldata/AccScan.hpp
diff --git a/ndb/include/kernel/signaldata/AccSizeAltReq.hpp b/storage/ndb/include/kernel/signaldata/AccSizeAltReq.hpp
index ac348444826..ac348444826 100644
--- a/ndb/include/kernel/signaldata/AccSizeAltReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/AccSizeAltReq.hpp
diff --git a/ndb/include/kernel/signaldata/AlterIndx.hpp b/storage/ndb/include/kernel/signaldata/AlterIndx.hpp
index f5ad835b6f3..f5ad835b6f3 100644
--- a/ndb/include/kernel/signaldata/AlterIndx.hpp
+++ b/storage/ndb/include/kernel/signaldata/AlterIndx.hpp
diff --git a/ndb/include/kernel/signaldata/AlterTab.hpp b/storage/ndb/include/kernel/signaldata/AlterTab.hpp
index 02d4eb95d2e..02d4eb95d2e 100644
--- a/ndb/include/kernel/signaldata/AlterTab.hpp
+++ b/storage/ndb/include/kernel/signaldata/AlterTab.hpp
diff --git a/ndb/include/kernel/signaldata/AlterTable.hpp b/storage/ndb/include/kernel/signaldata/AlterTable.hpp
index 30f8727551d..30f8727551d 100644
--- a/ndb/include/kernel/signaldata/AlterTable.hpp
+++ b/storage/ndb/include/kernel/signaldata/AlterTable.hpp
diff --git a/ndb/include/kernel/signaldata/AlterTrig.hpp b/storage/ndb/include/kernel/signaldata/AlterTrig.hpp
index a97c1fd0196..a97c1fd0196 100644
--- a/ndb/include/kernel/signaldata/AlterTrig.hpp
+++ b/storage/ndb/include/kernel/signaldata/AlterTrig.hpp
diff --git a/ndb/include/kernel/signaldata/ApiRegSignalData.hpp b/storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp
index 84dca8fb260..84dca8fb260 100644
--- a/ndb/include/kernel/signaldata/ApiRegSignalData.hpp
+++ b/storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp
diff --git a/ndb/include/kernel/signaldata/ApiVersion.hpp b/storage/ndb/include/kernel/signaldata/ApiVersion.hpp
index 28281e7d186..28281e7d186 100644
--- a/ndb/include/kernel/signaldata/ApiVersion.hpp
+++ b/storage/ndb/include/kernel/signaldata/ApiVersion.hpp
diff --git a/ndb/include/kernel/signaldata/ArbitSignalData.hpp b/storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp
index 34b73644a13..34b73644a13 100644
--- a/ndb/include/kernel/signaldata/ArbitSignalData.hpp
+++ b/storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp
diff --git a/ndb/include/kernel/signaldata/AttrInfo.hpp b/storage/ndb/include/kernel/signaldata/AttrInfo.hpp
index c87470db8b0..c87470db8b0 100644
--- a/ndb/include/kernel/signaldata/AttrInfo.hpp
+++ b/storage/ndb/include/kernel/signaldata/AttrInfo.hpp
diff --git a/ndb/include/kernel/signaldata/BackupContinueB.hpp b/storage/ndb/include/kernel/signaldata/BackupContinueB.hpp
index d3d3f79f310..d3d3f79f310 100644
--- a/ndb/include/kernel/signaldata/BackupContinueB.hpp
+++ b/storage/ndb/include/kernel/signaldata/BackupContinueB.hpp
diff --git a/ndb/include/kernel/signaldata/BackupImpl.hpp b/storage/ndb/include/kernel/signaldata/BackupImpl.hpp
index 2032e2347b5..2032e2347b5 100644
--- a/ndb/include/kernel/signaldata/BackupImpl.hpp
+++ b/storage/ndb/include/kernel/signaldata/BackupImpl.hpp
diff --git a/ndb/include/kernel/signaldata/BackupSignalData.hpp b/storage/ndb/include/kernel/signaldata/BackupSignalData.hpp
index b38dd8d14b2..b38dd8d14b2 100644
--- a/ndb/include/kernel/signaldata/BackupSignalData.hpp
+++ b/storage/ndb/include/kernel/signaldata/BackupSignalData.hpp
diff --git a/ndb/include/kernel/signaldata/BlockCommitOrd.hpp b/storage/ndb/include/kernel/signaldata/BlockCommitOrd.hpp
index 3b33dceb758..3b33dceb758 100644
--- a/ndb/include/kernel/signaldata/BlockCommitOrd.hpp
+++ b/storage/ndb/include/kernel/signaldata/BlockCommitOrd.hpp
diff --git a/ndb/include/kernel/signaldata/BuildIndx.hpp b/storage/ndb/include/kernel/signaldata/BuildIndx.hpp
index a6ea84c5ea0..a6ea84c5ea0 100644
--- a/ndb/include/kernel/signaldata/BuildIndx.hpp
+++ b/storage/ndb/include/kernel/signaldata/BuildIndx.hpp
diff --git a/ndb/include/kernel/signaldata/CheckNodeGroups.hpp b/storage/ndb/include/kernel/signaldata/CheckNodeGroups.hpp
index b3e79949c68..b3e79949c68 100644
--- a/ndb/include/kernel/signaldata/CheckNodeGroups.hpp
+++ b/storage/ndb/include/kernel/signaldata/CheckNodeGroups.hpp
diff --git a/ndb/include/kernel/signaldata/CloseComReqConf.hpp b/storage/ndb/include/kernel/signaldata/CloseComReqConf.hpp
index 3d3dc54ba64..3d3dc54ba64 100644
--- a/ndb/include/kernel/signaldata/CloseComReqConf.hpp
+++ b/storage/ndb/include/kernel/signaldata/CloseComReqConf.hpp
diff --git a/ndb/include/kernel/signaldata/CmInit.hpp b/storage/ndb/include/kernel/signaldata/CmInit.hpp
index b59547b767b..b59547b767b 100644
--- a/ndb/include/kernel/signaldata/CmInit.hpp
+++ b/storage/ndb/include/kernel/signaldata/CmInit.hpp
diff --git a/ndb/include/kernel/signaldata/CmRegSignalData.hpp b/storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp
index f33c991249f..f33c991249f 100644
--- a/ndb/include/kernel/signaldata/CmRegSignalData.hpp
+++ b/storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp
diff --git a/ndb/include/kernel/signaldata/CmvmiCfgConf.hpp b/storage/ndb/include/kernel/signaldata/CmvmiCfgConf.hpp
index 12b785723d9..12b785723d9 100644
--- a/ndb/include/kernel/signaldata/CmvmiCfgConf.hpp
+++ b/storage/ndb/include/kernel/signaldata/CmvmiCfgConf.hpp
diff --git a/ndb/include/kernel/signaldata/CntrMasterConf.hpp b/storage/ndb/include/kernel/signaldata/CntrMasterConf.hpp
index e6bf363ea68..e6bf363ea68 100644
--- a/ndb/include/kernel/signaldata/CntrMasterConf.hpp
+++ b/storage/ndb/include/kernel/signaldata/CntrMasterConf.hpp
diff --git a/ndb/include/kernel/signaldata/CntrMasterReq.hpp b/storage/ndb/include/kernel/signaldata/CntrMasterReq.hpp
index caf9efb1243..caf9efb1243 100644
--- a/ndb/include/kernel/signaldata/CntrMasterReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/CntrMasterReq.hpp
diff --git a/ndb/include/kernel/signaldata/CntrStart.hpp b/storage/ndb/include/kernel/signaldata/CntrStart.hpp
index abdd1003c0f..abdd1003c0f 100644
--- a/ndb/include/kernel/signaldata/CntrStart.hpp
+++ b/storage/ndb/include/kernel/signaldata/CntrStart.hpp
diff --git a/ndb/include/kernel/signaldata/ConfigParamId.hpp b/storage/ndb/include/kernel/signaldata/ConfigParamId.hpp
index 9d9e04957ab..9d9e04957ab 100644
--- a/ndb/include/kernel/signaldata/ConfigParamId.hpp
+++ b/storage/ndb/include/kernel/signaldata/ConfigParamId.hpp
diff --git a/ndb/include/kernel/signaldata/ContinueFragmented.hpp b/storage/ndb/include/kernel/signaldata/ContinueFragmented.hpp
index 3d12b9e51eb..3d12b9e51eb 100644
--- a/ndb/include/kernel/signaldata/ContinueFragmented.hpp
+++ b/storage/ndb/include/kernel/signaldata/ContinueFragmented.hpp
diff --git a/ndb/include/kernel/signaldata/CopyActive.hpp b/storage/ndb/include/kernel/signaldata/CopyActive.hpp
index 19b05bda072..19b05bda072 100644
--- a/ndb/include/kernel/signaldata/CopyActive.hpp
+++ b/storage/ndb/include/kernel/signaldata/CopyActive.hpp
diff --git a/ndb/include/kernel/signaldata/CopyFrag.hpp b/storage/ndb/include/kernel/signaldata/CopyFrag.hpp
index 67b935dda64..67b935dda64 100644
--- a/ndb/include/kernel/signaldata/CopyFrag.hpp
+++ b/storage/ndb/include/kernel/signaldata/CopyFrag.hpp
diff --git a/ndb/include/kernel/signaldata/CopyGCIReq.hpp b/storage/ndb/include/kernel/signaldata/CopyGCIReq.hpp
index 4b401654de3..4b401654de3 100644
--- a/ndb/include/kernel/signaldata/CopyGCIReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/CopyGCIReq.hpp
diff --git a/ndb/include/kernel/signaldata/CreateEvnt.hpp b/storage/ndb/include/kernel/signaldata/CreateEvnt.hpp
index 8712ce8890c..8712ce8890c 100644
--- a/ndb/include/kernel/signaldata/CreateEvnt.hpp
+++ b/storage/ndb/include/kernel/signaldata/CreateEvnt.hpp
diff --git a/ndb/include/kernel/signaldata/CreateFrag.hpp b/storage/ndb/include/kernel/signaldata/CreateFrag.hpp
index a7b3f836353..a7b3f836353 100644
--- a/ndb/include/kernel/signaldata/CreateFrag.hpp
+++ b/storage/ndb/include/kernel/signaldata/CreateFrag.hpp
diff --git a/ndb/include/kernel/signaldata/CreateFragmentation.hpp b/storage/ndb/include/kernel/signaldata/CreateFragmentation.hpp
index 7d53dd91154..7d53dd91154 100644
--- a/ndb/include/kernel/signaldata/CreateFragmentation.hpp
+++ b/storage/ndb/include/kernel/signaldata/CreateFragmentation.hpp
diff --git a/ndb/include/kernel/signaldata/CreateIndx.hpp b/storage/ndb/include/kernel/signaldata/CreateIndx.hpp
index a9dc653f349..a9dc653f349 100644
--- a/ndb/include/kernel/signaldata/CreateIndx.hpp
+++ b/storage/ndb/include/kernel/signaldata/CreateIndx.hpp
diff --git a/ndb/include/kernel/signaldata/CreateTab.hpp b/storage/ndb/include/kernel/signaldata/CreateTab.hpp
index b2ef52a6bf7..b2ef52a6bf7 100644
--- a/ndb/include/kernel/signaldata/CreateTab.hpp
+++ b/storage/ndb/include/kernel/signaldata/CreateTab.hpp
diff --git a/ndb/include/kernel/signaldata/CreateTable.hpp b/storage/ndb/include/kernel/signaldata/CreateTable.hpp
index 481b323fdb0..481b323fdb0 100644
--- a/ndb/include/kernel/signaldata/CreateTable.hpp
+++ b/storage/ndb/include/kernel/signaldata/CreateTable.hpp
diff --git a/ndb/include/kernel/signaldata/CreateTrig.hpp b/storage/ndb/include/kernel/signaldata/CreateTrig.hpp
index 62627256dcf..62627256dcf 100644
--- a/ndb/include/kernel/signaldata/CreateTrig.hpp
+++ b/storage/ndb/include/kernel/signaldata/CreateTrig.hpp
diff --git a/ndb/include/kernel/signaldata/DiAddTab.hpp b/storage/ndb/include/kernel/signaldata/DiAddTab.hpp
index 6b17515eb6f..6b17515eb6f 100644
--- a/ndb/include/kernel/signaldata/DiAddTab.hpp
+++ b/storage/ndb/include/kernel/signaldata/DiAddTab.hpp
diff --git a/ndb/include/kernel/signaldata/DiGetNodes.hpp b/storage/ndb/include/kernel/signaldata/DiGetNodes.hpp
index 05ab6bfebb3..05ab6bfebb3 100644
--- a/ndb/include/kernel/signaldata/DiGetNodes.hpp
+++ b/storage/ndb/include/kernel/signaldata/DiGetNodes.hpp
diff --git a/ndb/include/kernel/signaldata/DictSchemaInfo.hpp b/storage/ndb/include/kernel/signaldata/DictSchemaInfo.hpp
index c15dcf2fd7a..c15dcf2fd7a 100644
--- a/ndb/include/kernel/signaldata/DictSchemaInfo.hpp
+++ b/storage/ndb/include/kernel/signaldata/DictSchemaInfo.hpp
diff --git a/ndb/include/kernel/signaldata/DictSizeAltReq.hpp b/storage/ndb/include/kernel/signaldata/DictSizeAltReq.hpp
index b40f0c8c1af..b40f0c8c1af 100644
--- a/ndb/include/kernel/signaldata/DictSizeAltReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/DictSizeAltReq.hpp
diff --git a/ndb/include/kernel/signaldata/DictStart.hpp b/storage/ndb/include/kernel/signaldata/DictStart.hpp
index 59310601f48..59310601f48 100644
--- a/ndb/include/kernel/signaldata/DictStart.hpp
+++ b/storage/ndb/include/kernel/signaldata/DictStart.hpp
diff --git a/ndb/include/kernel/signaldata/DictTabInfo.hpp b/storage/ndb/include/kernel/signaldata/DictTabInfo.hpp
index 09b00cf8993..09b00cf8993 100644
--- a/ndb/include/kernel/signaldata/DictTabInfo.hpp
+++ b/storage/ndb/include/kernel/signaldata/DictTabInfo.hpp
diff --git a/ndb/include/kernel/signaldata/DihAddFrag.hpp b/storage/ndb/include/kernel/signaldata/DihAddFrag.hpp
index 6e5a24ee413..6e5a24ee413 100644
--- a/ndb/include/kernel/signaldata/DihAddFrag.hpp
+++ b/storage/ndb/include/kernel/signaldata/DihAddFrag.hpp
diff --git a/ndb/include/kernel/signaldata/DihContinueB.hpp b/storage/ndb/include/kernel/signaldata/DihContinueB.hpp
index 77ecf360601..77ecf360601 100644
--- a/ndb/include/kernel/signaldata/DihContinueB.hpp
+++ b/storage/ndb/include/kernel/signaldata/DihContinueB.hpp
diff --git a/ndb/include/kernel/signaldata/DihSizeAltReq.hpp b/storage/ndb/include/kernel/signaldata/DihSizeAltReq.hpp
index 73279447859..73279447859 100644
--- a/ndb/include/kernel/signaldata/DihSizeAltReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/DihSizeAltReq.hpp
diff --git a/ndb/include/kernel/signaldata/DihStartTab.hpp b/storage/ndb/include/kernel/signaldata/DihStartTab.hpp
index 75443e6070e..75443e6070e 100644
--- a/ndb/include/kernel/signaldata/DihStartTab.hpp
+++ b/storage/ndb/include/kernel/signaldata/DihStartTab.hpp
diff --git a/ndb/include/kernel/signaldata/DihSwitchReplica.hpp b/storage/ndb/include/kernel/signaldata/DihSwitchReplica.hpp
index d4212f510f3..d4212f510f3 100644
--- a/ndb/include/kernel/signaldata/DihSwitchReplica.hpp
+++ b/storage/ndb/include/kernel/signaldata/DihSwitchReplica.hpp
diff --git a/ndb/include/kernel/signaldata/DisconnectRep.hpp b/storage/ndb/include/kernel/signaldata/DisconnectRep.hpp
index d7fcdc4fb35..d7fcdc4fb35 100644
--- a/ndb/include/kernel/signaldata/DisconnectRep.hpp
+++ b/storage/ndb/include/kernel/signaldata/DisconnectRep.hpp
diff --git a/ndb/include/kernel/signaldata/DropIndx.hpp b/storage/ndb/include/kernel/signaldata/DropIndx.hpp
index fd2ea7f0b7b..fd2ea7f0b7b 100644
--- a/ndb/include/kernel/signaldata/DropIndx.hpp
+++ b/storage/ndb/include/kernel/signaldata/DropIndx.hpp
diff --git a/ndb/include/kernel/signaldata/DropTab.hpp b/storage/ndb/include/kernel/signaldata/DropTab.hpp
index dd3946d8cc0..dd3946d8cc0 100644
--- a/ndb/include/kernel/signaldata/DropTab.hpp
+++ b/storage/ndb/include/kernel/signaldata/DropTab.hpp
diff --git a/ndb/include/kernel/signaldata/DropTabFile.hpp b/storage/ndb/include/kernel/signaldata/DropTabFile.hpp
index 9ae4dae41c1..9ae4dae41c1 100644
--- a/ndb/include/kernel/signaldata/DropTabFile.hpp
+++ b/storage/ndb/include/kernel/signaldata/DropTabFile.hpp
diff --git a/ndb/include/kernel/signaldata/DropTable.hpp b/storage/ndb/include/kernel/signaldata/DropTable.hpp
index 7a5b96e4cd1..7a5b96e4cd1 100644
--- a/ndb/include/kernel/signaldata/DropTable.hpp
+++ b/storage/ndb/include/kernel/signaldata/DropTable.hpp
diff --git a/ndb/include/kernel/signaldata/DropTrig.hpp b/storage/ndb/include/kernel/signaldata/DropTrig.hpp
index 7c5049f3de8..7c5049f3de8 100644
--- a/ndb/include/kernel/signaldata/DropTrig.hpp
+++ b/storage/ndb/include/kernel/signaldata/DropTrig.hpp
diff --git a/ndb/include/kernel/signaldata/DumpStateOrd.hpp b/storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
index 7368a0ec40d..7368a0ec40d 100644
--- a/ndb/include/kernel/signaldata/DumpStateOrd.hpp
+++ b/storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
diff --git a/ndb/include/kernel/signaldata/EmptyLcp.hpp b/storage/ndb/include/kernel/signaldata/EmptyLcp.hpp
index 32ea6c13231..32ea6c13231 100644
--- a/ndb/include/kernel/signaldata/EmptyLcp.hpp
+++ b/storage/ndb/include/kernel/signaldata/EmptyLcp.hpp
diff --git a/ndb/include/kernel/signaldata/EndTo.hpp b/storage/ndb/include/kernel/signaldata/EndTo.hpp
index 944cca3ca98..944cca3ca98 100644
--- a/ndb/include/kernel/signaldata/EndTo.hpp
+++ b/storage/ndb/include/kernel/signaldata/EndTo.hpp
diff --git a/ndb/include/kernel/signaldata/EventReport.hpp b/storage/ndb/include/kernel/signaldata/EventReport.hpp
index 9822a0539cf..9822a0539cf 100644
--- a/ndb/include/kernel/signaldata/EventReport.hpp
+++ b/storage/ndb/include/kernel/signaldata/EventReport.hpp
diff --git a/ndb/include/kernel/signaldata/EventSubscribeReq.hpp b/storage/ndb/include/kernel/signaldata/EventSubscribeReq.hpp
index 84a1717b1de..84a1717b1de 100644
--- a/ndb/include/kernel/signaldata/EventSubscribeReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/EventSubscribeReq.hpp
diff --git a/ndb/include/kernel/signaldata/ExecFragReq.hpp b/storage/ndb/include/kernel/signaldata/ExecFragReq.hpp
index e40213d6e29..e40213d6e29 100644
--- a/ndb/include/kernel/signaldata/ExecFragReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/ExecFragReq.hpp
diff --git a/ndb/include/kernel/signaldata/FailRep.hpp b/storage/ndb/include/kernel/signaldata/FailRep.hpp
index 44577f07fdc..44577f07fdc 100644
--- a/ndb/include/kernel/signaldata/FailRep.hpp
+++ b/storage/ndb/include/kernel/signaldata/FailRep.hpp
diff --git a/ndb/include/kernel/signaldata/FireTrigOrd.hpp b/storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp
index 20a0a863094..20a0a863094 100644
--- a/ndb/include/kernel/signaldata/FireTrigOrd.hpp
+++ b/storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp
diff --git a/ndb/include/kernel/signaldata/FsAppendReq.hpp b/storage/ndb/include/kernel/signaldata/FsAppendReq.hpp
index e2fd61f8a11..e2fd61f8a11 100644
--- a/ndb/include/kernel/signaldata/FsAppendReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/FsAppendReq.hpp
diff --git a/ndb/include/kernel/signaldata/FsCloseReq.hpp b/storage/ndb/include/kernel/signaldata/FsCloseReq.hpp
index 10d094fb30b..10d094fb30b 100644
--- a/ndb/include/kernel/signaldata/FsCloseReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/FsCloseReq.hpp
diff --git a/ndb/include/kernel/signaldata/FsConf.hpp b/storage/ndb/include/kernel/signaldata/FsConf.hpp
index f66d9feea49..f66d9feea49 100644
--- a/ndb/include/kernel/signaldata/FsConf.hpp
+++ b/storage/ndb/include/kernel/signaldata/FsConf.hpp
diff --git a/ndb/include/kernel/signaldata/FsOpenReq.hpp b/storage/ndb/include/kernel/signaldata/FsOpenReq.hpp
index 906bb947128..906bb947128 100644
--- a/ndb/include/kernel/signaldata/FsOpenReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/FsOpenReq.hpp
diff --git a/ndb/include/kernel/signaldata/FsReadWriteReq.hpp b/storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp
index 6e4fa4d260e..6e4fa4d260e 100644
--- a/ndb/include/kernel/signaldata/FsReadWriteReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp
diff --git a/ndb/include/kernel/signaldata/FsRef.hpp b/storage/ndb/include/kernel/signaldata/FsRef.hpp
index 650f6520fb5..650f6520fb5 100644
--- a/ndb/include/kernel/signaldata/FsRef.hpp
+++ b/storage/ndb/include/kernel/signaldata/FsRef.hpp
diff --git a/ndb/include/kernel/signaldata/FsRemoveReq.hpp b/storage/ndb/include/kernel/signaldata/FsRemoveReq.hpp
index efb566d883a..efb566d883a 100644
--- a/ndb/include/kernel/signaldata/FsRemoveReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/FsRemoveReq.hpp
diff --git a/ndb/include/kernel/signaldata/GCPSave.hpp b/storage/ndb/include/kernel/signaldata/GCPSave.hpp
index 2b4a25e6bb2..2b4a25e6bb2 100644
--- a/ndb/include/kernel/signaldata/GCPSave.hpp
+++ b/storage/ndb/include/kernel/signaldata/GCPSave.hpp
diff --git a/ndb/include/kernel/signaldata/GetTabInfo.hpp b/storage/ndb/include/kernel/signaldata/GetTabInfo.hpp
index 6b223cab119..6b223cab119 100644
--- a/ndb/include/kernel/signaldata/GetTabInfo.hpp
+++ b/storage/ndb/include/kernel/signaldata/GetTabInfo.hpp
diff --git a/ndb/include/kernel/signaldata/GetTableId.hpp b/storage/ndb/include/kernel/signaldata/GetTableId.hpp
index fb91c2e10d7..fb91c2e10d7 100644
--- a/ndb/include/kernel/signaldata/GetTableId.hpp
+++ b/storage/ndb/include/kernel/signaldata/GetTableId.hpp
diff --git a/ndb/include/kernel/signaldata/GrepImpl.hpp b/storage/ndb/include/kernel/signaldata/GrepImpl.hpp
index 95b93df0a58..95b93df0a58 100644
--- a/ndb/include/kernel/signaldata/GrepImpl.hpp
+++ b/storage/ndb/include/kernel/signaldata/GrepImpl.hpp
diff --git a/ndb/include/kernel/signaldata/HotSpareRep.hpp b/storage/ndb/include/kernel/signaldata/HotSpareRep.hpp
index fb9d338be1b..fb9d338be1b 100644
--- a/ndb/include/kernel/signaldata/HotSpareRep.hpp
+++ b/storage/ndb/include/kernel/signaldata/HotSpareRep.hpp
diff --git a/ndb/include/kernel/signaldata/IndxAttrInfo.hpp b/storage/ndb/include/kernel/signaldata/IndxAttrInfo.hpp
index ec5790d84f3..ec5790d84f3 100755
--- a/ndb/include/kernel/signaldata/IndxAttrInfo.hpp
+++ b/storage/ndb/include/kernel/signaldata/IndxAttrInfo.hpp
diff --git a/ndb/include/kernel/signaldata/IndxKeyInfo.hpp b/storage/ndb/include/kernel/signaldata/IndxKeyInfo.hpp
index 7cd7795ec71..7cd7795ec71 100755
--- a/ndb/include/kernel/signaldata/IndxKeyInfo.hpp
+++ b/storage/ndb/include/kernel/signaldata/IndxKeyInfo.hpp
diff --git a/ndb/include/kernel/signaldata/InvalidateNodeLCPConf.hpp b/storage/ndb/include/kernel/signaldata/InvalidateNodeLCPConf.hpp
index 2497af354ce..2497af354ce 100644
--- a/ndb/include/kernel/signaldata/InvalidateNodeLCPConf.hpp
+++ b/storage/ndb/include/kernel/signaldata/InvalidateNodeLCPConf.hpp
diff --git a/ndb/include/kernel/signaldata/InvalidateNodeLCPReq.hpp b/storage/ndb/include/kernel/signaldata/InvalidateNodeLCPReq.hpp
index e55a58710b4..e55a58710b4 100644
--- a/ndb/include/kernel/signaldata/InvalidateNodeLCPReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/InvalidateNodeLCPReq.hpp
diff --git a/ndb/include/kernel/signaldata/KeyInfo.hpp b/storage/ndb/include/kernel/signaldata/KeyInfo.hpp
index 686f3ae053d..686f3ae053d 100644
--- a/ndb/include/kernel/signaldata/KeyInfo.hpp
+++ b/storage/ndb/include/kernel/signaldata/KeyInfo.hpp
diff --git a/ndb/include/kernel/signaldata/LCP.hpp b/storage/ndb/include/kernel/signaldata/LCP.hpp
index 7d3fb71ae7e..7d3fb71ae7e 100644
--- a/ndb/include/kernel/signaldata/LCP.hpp
+++ b/storage/ndb/include/kernel/signaldata/LCP.hpp
diff --git a/ndb/include/kernel/signaldata/ListTables.hpp b/storage/ndb/include/kernel/signaldata/ListTables.hpp
index 7fbfab1294c..7fbfab1294c 100644
--- a/ndb/include/kernel/signaldata/ListTables.hpp
+++ b/storage/ndb/include/kernel/signaldata/ListTables.hpp
diff --git a/ndb/include/kernel/signaldata/LqhFrag.hpp b/storage/ndb/include/kernel/signaldata/LqhFrag.hpp
index 13dfafcc653..13dfafcc653 100644
--- a/ndb/include/kernel/signaldata/LqhFrag.hpp
+++ b/storage/ndb/include/kernel/signaldata/LqhFrag.hpp
diff --git a/ndb/include/kernel/signaldata/LqhKey.hpp b/storage/ndb/include/kernel/signaldata/LqhKey.hpp
index e937180e3f7..e937180e3f7 100644
--- a/ndb/include/kernel/signaldata/LqhKey.hpp
+++ b/storage/ndb/include/kernel/signaldata/LqhKey.hpp
diff --git a/ndb/include/kernel/signaldata/LqhSizeAltReq.hpp b/storage/ndb/include/kernel/signaldata/LqhSizeAltReq.hpp
index e47ce39897a..e47ce39897a 100644
--- a/ndb/include/kernel/signaldata/LqhSizeAltReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/LqhSizeAltReq.hpp
diff --git a/ndb/include/kernel/signaldata/LqhTransConf.hpp b/storage/ndb/include/kernel/signaldata/LqhTransConf.hpp
index f62dfd07f51..f62dfd07f51 100644
--- a/ndb/include/kernel/signaldata/LqhTransConf.hpp
+++ b/storage/ndb/include/kernel/signaldata/LqhTransConf.hpp
diff --git a/ndb/include/kernel/signaldata/ManagementServer.hpp b/storage/ndb/include/kernel/signaldata/ManagementServer.hpp
index ce14e30c81d..ce14e30c81d 100644
--- a/ndb/include/kernel/signaldata/ManagementServer.hpp
+++ b/storage/ndb/include/kernel/signaldata/ManagementServer.hpp
diff --git a/ndb/include/kernel/signaldata/MasterGCP.hpp b/storage/ndb/include/kernel/signaldata/MasterGCP.hpp
index ebe6857a107..ebe6857a107 100644
--- a/ndb/include/kernel/signaldata/MasterGCP.hpp
+++ b/storage/ndb/include/kernel/signaldata/MasterGCP.hpp
diff --git a/ndb/include/kernel/signaldata/MasterLCP.hpp b/storage/ndb/include/kernel/signaldata/MasterLCP.hpp
index bf84ac73309..bf84ac73309 100644
--- a/ndb/include/kernel/signaldata/MasterLCP.hpp
+++ b/storage/ndb/include/kernel/signaldata/MasterLCP.hpp
diff --git a/ndb/include/kernel/signaldata/NFCompleteRep.hpp b/storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp
index c8bde705a86..c8bde705a86 100644
--- a/ndb/include/kernel/signaldata/NFCompleteRep.hpp
+++ b/storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp
diff --git a/ndb/include/kernel/signaldata/NdbSttor.hpp b/storage/ndb/include/kernel/signaldata/NdbSttor.hpp
index edd93ef96a8..edd93ef96a8 100644
--- a/ndb/include/kernel/signaldata/NdbSttor.hpp
+++ b/storage/ndb/include/kernel/signaldata/NdbSttor.hpp
diff --git a/ndb/include/kernel/signaldata/NdbfsContinueB.hpp b/storage/ndb/include/kernel/signaldata/NdbfsContinueB.hpp
index 6154e5c19b1..6154e5c19b1 100644
--- a/ndb/include/kernel/signaldata/NdbfsContinueB.hpp
+++ b/storage/ndb/include/kernel/signaldata/NdbfsContinueB.hpp
diff --git a/ndb/include/kernel/signaldata/NextScan.hpp b/storage/ndb/include/kernel/signaldata/NextScan.hpp
index a502a89108c..a502a89108c 100644
--- a/ndb/include/kernel/signaldata/NextScan.hpp
+++ b/storage/ndb/include/kernel/signaldata/NextScan.hpp
diff --git a/ndb/include/kernel/signaldata/NodeFailRep.hpp b/storage/ndb/include/kernel/signaldata/NodeFailRep.hpp
index 060acd6a3e2..060acd6a3e2 100644
--- a/ndb/include/kernel/signaldata/NodeFailRep.hpp
+++ b/storage/ndb/include/kernel/signaldata/NodeFailRep.hpp
diff --git a/ndb/include/kernel/signaldata/NodeStateSignalData.hpp b/storage/ndb/include/kernel/signaldata/NodeStateSignalData.hpp
index 391d8f89566..391d8f89566 100644
--- a/ndb/include/kernel/signaldata/NodeStateSignalData.hpp
+++ b/storage/ndb/include/kernel/signaldata/NodeStateSignalData.hpp
diff --git a/ndb/include/kernel/signaldata/PackedSignal.hpp b/storage/ndb/include/kernel/signaldata/PackedSignal.hpp
index ea0ff6db526..ea0ff6db526 100644
--- a/ndb/include/kernel/signaldata/PackedSignal.hpp
+++ b/storage/ndb/include/kernel/signaldata/PackedSignal.hpp
diff --git a/ndb/include/kernel/signaldata/PrepDropTab.hpp b/storage/ndb/include/kernel/signaldata/PrepDropTab.hpp
index c54b2474aa3..c54b2474aa3 100644
--- a/ndb/include/kernel/signaldata/PrepDropTab.hpp
+++ b/storage/ndb/include/kernel/signaldata/PrepDropTab.hpp
diff --git a/ndb/include/kernel/signaldata/PrepFailReqRef.hpp b/storage/ndb/include/kernel/signaldata/PrepFailReqRef.hpp
index 90b568237b8..90b568237b8 100644
--- a/ndb/include/kernel/signaldata/PrepFailReqRef.hpp
+++ b/storage/ndb/include/kernel/signaldata/PrepFailReqRef.hpp
diff --git a/ndb/include/kernel/signaldata/ReadConfig.hpp b/storage/ndb/include/kernel/signaldata/ReadConfig.hpp
index 0835b252a32..0835b252a32 100644
--- a/ndb/include/kernel/signaldata/ReadConfig.hpp
+++ b/storage/ndb/include/kernel/signaldata/ReadConfig.hpp
diff --git a/ndb/include/kernel/signaldata/ReadNodesConf.hpp b/storage/ndb/include/kernel/signaldata/ReadNodesConf.hpp
index 0507007f71a..0507007f71a 100644
--- a/ndb/include/kernel/signaldata/ReadNodesConf.hpp
+++ b/storage/ndb/include/kernel/signaldata/ReadNodesConf.hpp
diff --git a/ndb/include/kernel/signaldata/RelTabMem.hpp b/storage/ndb/include/kernel/signaldata/RelTabMem.hpp
index 9cf1787bba4..9cf1787bba4 100644
--- a/ndb/include/kernel/signaldata/RelTabMem.hpp
+++ b/storage/ndb/include/kernel/signaldata/RelTabMem.hpp
diff --git a/ndb/include/kernel/signaldata/RepImpl.hpp b/storage/ndb/include/kernel/signaldata/RepImpl.hpp
index 0de1389a4a9..0de1389a4a9 100644
--- a/ndb/include/kernel/signaldata/RepImpl.hpp
+++ b/storage/ndb/include/kernel/signaldata/RepImpl.hpp
diff --git a/ndb/include/kernel/signaldata/ResumeReq.hpp b/storage/ndb/include/kernel/signaldata/ResumeReq.hpp
index a4880474ca8..a4880474ca8 100644
--- a/ndb/include/kernel/signaldata/ResumeReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/ResumeReq.hpp
diff --git a/ndb/include/kernel/signaldata/ScanFrag.hpp b/storage/ndb/include/kernel/signaldata/ScanFrag.hpp
index f21a3eef7ac..f21a3eef7ac 100644
--- a/ndb/include/kernel/signaldata/ScanFrag.hpp
+++ b/storage/ndb/include/kernel/signaldata/ScanFrag.hpp
diff --git a/ndb/include/kernel/signaldata/ScanTab.hpp b/storage/ndb/include/kernel/signaldata/ScanTab.hpp
index 8cb282270ff..8cb282270ff 100644
--- a/ndb/include/kernel/signaldata/ScanTab.hpp
+++ b/storage/ndb/include/kernel/signaldata/ScanTab.hpp
diff --git a/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp b/storage/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp
index 2923029f8f6..2923029f8f6 100644
--- a/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp
+++ b/storage/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp
diff --git a/ndb/include/kernel/signaldata/SetVarReq.hpp b/storage/ndb/include/kernel/signaldata/SetVarReq.hpp
index 8cb3e78be8b..8cb3e78be8b 100644
--- a/ndb/include/kernel/signaldata/SetVarReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/SetVarReq.hpp
diff --git a/ndb/include/kernel/signaldata/SignalData.hpp b/storage/ndb/include/kernel/signaldata/SignalData.hpp
index f825b0feb7b..f825b0feb7b 100644
--- a/ndb/include/kernel/signaldata/SignalData.hpp
+++ b/storage/ndb/include/kernel/signaldata/SignalData.hpp
diff --git a/ndb/include/kernel/signaldata/SignalDataPrint.hpp b/storage/ndb/include/kernel/signaldata/SignalDataPrint.hpp
index 17ab07acd4e..17ab07acd4e 100644
--- a/ndb/include/kernel/signaldata/SignalDataPrint.hpp
+++ b/storage/ndb/include/kernel/signaldata/SignalDataPrint.hpp
diff --git a/ndb/include/kernel/signaldata/SignalDroppedRep.hpp b/storage/ndb/include/kernel/signaldata/SignalDroppedRep.hpp
index 20863524358..20863524358 100644
--- a/ndb/include/kernel/signaldata/SignalDroppedRep.hpp
+++ b/storage/ndb/include/kernel/signaldata/SignalDroppedRep.hpp
diff --git a/ndb/include/kernel/signaldata/SrFragidConf.hpp b/storage/ndb/include/kernel/signaldata/SrFragidConf.hpp
index 9a6088ad57f..9a6088ad57f 100644
--- a/ndb/include/kernel/signaldata/SrFragidConf.hpp
+++ b/storage/ndb/include/kernel/signaldata/SrFragidConf.hpp
diff --git a/ndb/include/kernel/signaldata/StartFragReq.hpp b/storage/ndb/include/kernel/signaldata/StartFragReq.hpp
index ec05c1ee366..ec05c1ee366 100644
--- a/ndb/include/kernel/signaldata/StartFragReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/StartFragReq.hpp
diff --git a/ndb/include/kernel/signaldata/StartInfo.hpp b/storage/ndb/include/kernel/signaldata/StartInfo.hpp
index d0850b13ef4..d0850b13ef4 100644
--- a/ndb/include/kernel/signaldata/StartInfo.hpp
+++ b/storage/ndb/include/kernel/signaldata/StartInfo.hpp
diff --git a/ndb/include/kernel/signaldata/StartMe.hpp b/storage/ndb/include/kernel/signaldata/StartMe.hpp
index 6593a9e9741..6593a9e9741 100644
--- a/ndb/include/kernel/signaldata/StartMe.hpp
+++ b/storage/ndb/include/kernel/signaldata/StartMe.hpp
diff --git a/ndb/include/kernel/signaldata/StartOrd.hpp b/storage/ndb/include/kernel/signaldata/StartOrd.hpp
index 43a48f70ba9..43a48f70ba9 100644
--- a/ndb/include/kernel/signaldata/StartOrd.hpp
+++ b/storage/ndb/include/kernel/signaldata/StartOrd.hpp
diff --git a/ndb/include/kernel/signaldata/StartPerm.hpp b/storage/ndb/include/kernel/signaldata/StartPerm.hpp
index 38be72835a3..38be72835a3 100644
--- a/ndb/include/kernel/signaldata/StartPerm.hpp
+++ b/storage/ndb/include/kernel/signaldata/StartPerm.hpp
diff --git a/ndb/include/kernel/signaldata/StartRec.hpp b/storage/ndb/include/kernel/signaldata/StartRec.hpp
index f8a4e01a094..f8a4e01a094 100644
--- a/ndb/include/kernel/signaldata/StartRec.hpp
+++ b/storage/ndb/include/kernel/signaldata/StartRec.hpp
diff --git a/ndb/include/kernel/signaldata/StartTo.hpp b/storage/ndb/include/kernel/signaldata/StartTo.hpp
index 5aecef6275d..5aecef6275d 100644
--- a/ndb/include/kernel/signaldata/StartTo.hpp
+++ b/storage/ndb/include/kernel/signaldata/StartTo.hpp
diff --git a/ndb/include/kernel/signaldata/StopMe.hpp b/storage/ndb/include/kernel/signaldata/StopMe.hpp
index 51d944a3b96..51d944a3b96 100644
--- a/ndb/include/kernel/signaldata/StopMe.hpp
+++ b/storage/ndb/include/kernel/signaldata/StopMe.hpp
diff --git a/ndb/include/kernel/signaldata/StopPerm.hpp b/storage/ndb/include/kernel/signaldata/StopPerm.hpp
index 95fb82c8cde..95fb82c8cde 100644
--- a/ndb/include/kernel/signaldata/StopPerm.hpp
+++ b/storage/ndb/include/kernel/signaldata/StopPerm.hpp
diff --git a/ndb/include/kernel/signaldata/StopReq.hpp b/storage/ndb/include/kernel/signaldata/StopReq.hpp
index ea453ae115d..ea453ae115d 100644
--- a/ndb/include/kernel/signaldata/StopReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/StopReq.hpp
diff --git a/ndb/include/kernel/signaldata/SumaImpl.hpp b/storage/ndb/include/kernel/signaldata/SumaImpl.hpp
index 75fb65e1ad2..75fb65e1ad2 100644
--- a/ndb/include/kernel/signaldata/SumaImpl.hpp
+++ b/storage/ndb/include/kernel/signaldata/SumaImpl.hpp
diff --git a/ndb/include/kernel/signaldata/SystemError.hpp b/storage/ndb/include/kernel/signaldata/SystemError.hpp
index 7b4d47c5c2e..7b4d47c5c2e 100644
--- a/ndb/include/kernel/signaldata/SystemError.hpp
+++ b/storage/ndb/include/kernel/signaldata/SystemError.hpp
diff --git a/ndb/include/kernel/signaldata/TamperOrd.hpp b/storage/ndb/include/kernel/signaldata/TamperOrd.hpp
index eb6cd47b093..eb6cd47b093 100644
--- a/ndb/include/kernel/signaldata/TamperOrd.hpp
+++ b/storage/ndb/include/kernel/signaldata/TamperOrd.hpp
diff --git a/ndb/include/kernel/signaldata/TcCommit.hpp b/storage/ndb/include/kernel/signaldata/TcCommit.hpp
index dcbca0cb6f2..dcbca0cb6f2 100644
--- a/ndb/include/kernel/signaldata/TcCommit.hpp
+++ b/storage/ndb/include/kernel/signaldata/TcCommit.hpp
diff --git a/ndb/include/kernel/signaldata/TcContinueB.hpp b/storage/ndb/include/kernel/signaldata/TcContinueB.hpp
index 85213791b2a..85213791b2a 100644
--- a/ndb/include/kernel/signaldata/TcContinueB.hpp
+++ b/storage/ndb/include/kernel/signaldata/TcContinueB.hpp
diff --git a/ndb/include/kernel/signaldata/TcHbRep.hpp b/storage/ndb/include/kernel/signaldata/TcHbRep.hpp
index 7e701b510f9..7e701b510f9 100644
--- a/ndb/include/kernel/signaldata/TcHbRep.hpp
+++ b/storage/ndb/include/kernel/signaldata/TcHbRep.hpp
diff --git a/ndb/include/kernel/signaldata/TcIndx.hpp b/storage/ndb/include/kernel/signaldata/TcIndx.hpp
index c5e7d2489ba..c5e7d2489ba 100644
--- a/ndb/include/kernel/signaldata/TcIndx.hpp
+++ b/storage/ndb/include/kernel/signaldata/TcIndx.hpp
diff --git a/ndb/include/kernel/signaldata/TcKeyConf.hpp b/storage/ndb/include/kernel/signaldata/TcKeyConf.hpp
index c23e94951dc..c23e94951dc 100644
--- a/ndb/include/kernel/signaldata/TcKeyConf.hpp
+++ b/storage/ndb/include/kernel/signaldata/TcKeyConf.hpp
diff --git a/ndb/include/kernel/signaldata/TcKeyFailConf.hpp b/storage/ndb/include/kernel/signaldata/TcKeyFailConf.hpp
index 7c0a766df40..7c0a766df40 100644
--- a/ndb/include/kernel/signaldata/TcKeyFailConf.hpp
+++ b/storage/ndb/include/kernel/signaldata/TcKeyFailConf.hpp
diff --git a/ndb/include/kernel/signaldata/TcKeyRef.hpp b/storage/ndb/include/kernel/signaldata/TcKeyRef.hpp
index c773920713a..c773920713a 100644
--- a/ndb/include/kernel/signaldata/TcKeyRef.hpp
+++ b/storage/ndb/include/kernel/signaldata/TcKeyRef.hpp
diff --git a/ndb/include/kernel/signaldata/TcKeyReq.hpp b/storage/ndb/include/kernel/signaldata/TcKeyReq.hpp
index d7c11ca773c..d7c11ca773c 100644
--- a/ndb/include/kernel/signaldata/TcKeyReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/TcKeyReq.hpp
diff --git a/ndb/include/kernel/signaldata/TcRollbackRep.hpp b/storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp
index febbd4f86b1..febbd4f86b1 100644
--- a/ndb/include/kernel/signaldata/TcRollbackRep.hpp
+++ b/storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp
diff --git a/ndb/include/kernel/signaldata/TcSizeAltReq.hpp b/storage/ndb/include/kernel/signaldata/TcSizeAltReq.hpp
index 34eacfe5a93..34eacfe5a93 100644
--- a/ndb/include/kernel/signaldata/TcSizeAltReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/TcSizeAltReq.hpp
diff --git a/ndb/include/kernel/signaldata/TestOrd.hpp b/storage/ndb/include/kernel/signaldata/TestOrd.hpp
index 1600df08884..1600df08884 100644
--- a/ndb/include/kernel/signaldata/TestOrd.hpp
+++ b/storage/ndb/include/kernel/signaldata/TestOrd.hpp
diff --git a/ndb/include/kernel/signaldata/TransIdAI.hpp b/storage/ndb/include/kernel/signaldata/TransIdAI.hpp
index 5beaf6eba4b..5beaf6eba4b 100755
--- a/ndb/include/kernel/signaldata/TransIdAI.hpp
+++ b/storage/ndb/include/kernel/signaldata/TransIdAI.hpp
diff --git a/ndb/include/kernel/signaldata/TrigAttrInfo.hpp b/storage/ndb/include/kernel/signaldata/TrigAttrInfo.hpp
index e2c029b9033..e2c029b9033 100644
--- a/ndb/include/kernel/signaldata/TrigAttrInfo.hpp
+++ b/storage/ndb/include/kernel/signaldata/TrigAttrInfo.hpp
diff --git a/ndb/include/kernel/signaldata/TupCommit.hpp b/storage/ndb/include/kernel/signaldata/TupCommit.hpp
index 7c5a7931e6c..7c5a7931e6c 100644
--- a/ndb/include/kernel/signaldata/TupCommit.hpp
+++ b/storage/ndb/include/kernel/signaldata/TupCommit.hpp
diff --git a/ndb/include/kernel/signaldata/TupFrag.hpp b/storage/ndb/include/kernel/signaldata/TupFrag.hpp
index 8acb3d28bd6..8acb3d28bd6 100644
--- a/ndb/include/kernel/signaldata/TupFrag.hpp
+++ b/storage/ndb/include/kernel/signaldata/TupFrag.hpp
diff --git a/ndb/include/kernel/signaldata/TupKey.hpp b/storage/ndb/include/kernel/signaldata/TupKey.hpp
index ffd57d81e64..ffd57d81e64 100644
--- a/ndb/include/kernel/signaldata/TupKey.hpp
+++ b/storage/ndb/include/kernel/signaldata/TupKey.hpp
diff --git a/ndb/include/kernel/signaldata/TupSizeAltReq.hpp b/storage/ndb/include/kernel/signaldata/TupSizeAltReq.hpp
index 215493bc188..215493bc188 100644
--- a/ndb/include/kernel/signaldata/TupSizeAltReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/TupSizeAltReq.hpp
diff --git a/ndb/include/kernel/signaldata/TuxBound.hpp b/storage/ndb/include/kernel/signaldata/TuxBound.hpp
index 7e12897407b..7e12897407b 100644
--- a/ndb/include/kernel/signaldata/TuxBound.hpp
+++ b/storage/ndb/include/kernel/signaldata/TuxBound.hpp
diff --git a/ndb/include/kernel/signaldata/TuxContinueB.hpp b/storage/ndb/include/kernel/signaldata/TuxContinueB.hpp
index 385d85715e2..385d85715e2 100644
--- a/ndb/include/kernel/signaldata/TuxContinueB.hpp
+++ b/storage/ndb/include/kernel/signaldata/TuxContinueB.hpp
diff --git a/ndb/include/kernel/signaldata/TuxMaint.hpp b/storage/ndb/include/kernel/signaldata/TuxMaint.hpp
index 4518f0531ea..4518f0531ea 100644
--- a/ndb/include/kernel/signaldata/TuxMaint.hpp
+++ b/storage/ndb/include/kernel/signaldata/TuxMaint.hpp
diff --git a/ndb/include/kernel/signaldata/TuxSizeAltReq.hpp b/storage/ndb/include/kernel/signaldata/TuxSizeAltReq.hpp
index 5d5a0e102ba..5d5a0e102ba 100644
--- a/ndb/include/kernel/signaldata/TuxSizeAltReq.hpp
+++ b/storage/ndb/include/kernel/signaldata/TuxSizeAltReq.hpp
diff --git a/ndb/include/kernel/signaldata/UpdateTo.hpp b/storage/ndb/include/kernel/signaldata/UpdateTo.hpp
index 0fa5f31b6b4..0fa5f31b6b4 100644
--- a/ndb/include/kernel/signaldata/UpdateTo.hpp
+++ b/storage/ndb/include/kernel/signaldata/UpdateTo.hpp
diff --git a/ndb/include/kernel/signaldata/UpgradeStartup.hpp b/storage/ndb/include/kernel/signaldata/UpgradeStartup.hpp
index 93fef323789..93fef323789 100644
--- a/ndb/include/kernel/signaldata/UpgradeStartup.hpp
+++ b/storage/ndb/include/kernel/signaldata/UpgradeStartup.hpp
diff --git a/ndb/include/kernel/signaldata/UtilDelete.hpp b/storage/ndb/include/kernel/signaldata/UtilDelete.hpp
index 67c13b8c2d5..67c13b8c2d5 100644
--- a/ndb/include/kernel/signaldata/UtilDelete.hpp
+++ b/storage/ndb/include/kernel/signaldata/UtilDelete.hpp
diff --git a/ndb/include/kernel/signaldata/UtilExecute.hpp b/storage/ndb/include/kernel/signaldata/UtilExecute.hpp
index 551fb172cac..551fb172cac 100644
--- a/ndb/include/kernel/signaldata/UtilExecute.hpp
+++ b/storage/ndb/include/kernel/signaldata/UtilExecute.hpp
diff --git a/ndb/include/kernel/signaldata/UtilLock.hpp b/storage/ndb/include/kernel/signaldata/UtilLock.hpp
index 318024fd706..318024fd706 100644
--- a/ndb/include/kernel/signaldata/UtilLock.hpp
+++ b/storage/ndb/include/kernel/signaldata/UtilLock.hpp
diff --git a/ndb/include/kernel/signaldata/UtilPrepare.hpp b/storage/ndb/include/kernel/signaldata/UtilPrepare.hpp
index 8508487ce15..8508487ce15 100644
--- a/ndb/include/kernel/signaldata/UtilPrepare.hpp
+++ b/storage/ndb/include/kernel/signaldata/UtilPrepare.hpp
diff --git a/ndb/include/kernel/signaldata/UtilRelease.hpp b/storage/ndb/include/kernel/signaldata/UtilRelease.hpp
index d2864f02f47..d2864f02f47 100644
--- a/ndb/include/kernel/signaldata/UtilRelease.hpp
+++ b/storage/ndb/include/kernel/signaldata/UtilRelease.hpp
diff --git a/ndb/include/kernel/signaldata/UtilSequence.hpp b/storage/ndb/include/kernel/signaldata/UtilSequence.hpp
index 50e5d673e99..50e5d673e99 100644
--- a/ndb/include/kernel/signaldata/UtilSequence.hpp
+++ b/storage/ndb/include/kernel/signaldata/UtilSequence.hpp
diff --git a/ndb/include/kernel/signaldata/WaitGCP.hpp b/storage/ndb/include/kernel/signaldata/WaitGCP.hpp
index ebed28714d2..ebed28714d2 100644
--- a/ndb/include/kernel/signaldata/WaitGCP.hpp
+++ b/storage/ndb/include/kernel/signaldata/WaitGCP.hpp
diff --git a/ndb/include/kernel/trigger_definitions.h b/storage/ndb/include/kernel/trigger_definitions.h
index 11410654a15..11410654a15 100644
--- a/ndb/include/kernel/trigger_definitions.h
+++ b/storage/ndb/include/kernel/trigger_definitions.h
diff --git a/ndb/include/logger/ConsoleLogHandler.hpp b/storage/ndb/include/logger/ConsoleLogHandler.hpp
index ae77b13d3b7..ae77b13d3b7 100644
--- a/ndb/include/logger/ConsoleLogHandler.hpp
+++ b/storage/ndb/include/logger/ConsoleLogHandler.hpp
diff --git a/ndb/include/logger/FileLogHandler.hpp b/storage/ndb/include/logger/FileLogHandler.hpp
index 8fb25e72be7..8fb25e72be7 100644
--- a/ndb/include/logger/FileLogHandler.hpp
+++ b/storage/ndb/include/logger/FileLogHandler.hpp
diff --git a/ndb/include/logger/LogHandler.hpp b/storage/ndb/include/logger/LogHandler.hpp
index 7df6ad864e5..7df6ad864e5 100644
--- a/ndb/include/logger/LogHandler.hpp
+++ b/storage/ndb/include/logger/LogHandler.hpp
diff --git a/ndb/include/logger/Logger.hpp b/storage/ndb/include/logger/Logger.hpp
index ee762098fb6..ee762098fb6 100644
--- a/ndb/include/logger/Logger.hpp
+++ b/storage/ndb/include/logger/Logger.hpp
diff --git a/ndb/include/logger/SysLogHandler.hpp b/storage/ndb/include/logger/SysLogHandler.hpp
index 0dfc1cb2d43..0dfc1cb2d43 100644
--- a/ndb/include/logger/SysLogHandler.hpp
+++ b/storage/ndb/include/logger/SysLogHandler.hpp
diff --git a/ndb/include/mgmapi/mgmapi.h b/storage/ndb/include/mgmapi/mgmapi.h
index 018e554de7c..018e554de7c 100644
--- a/ndb/include/mgmapi/mgmapi.h
+++ b/storage/ndb/include/mgmapi/mgmapi.h
diff --git a/ndb/include/mgmapi/mgmapi_config_parameters.h b/storage/ndb/include/mgmapi/mgmapi_config_parameters.h
index 33134899d1e..33134899d1e 100644
--- a/ndb/include/mgmapi/mgmapi_config_parameters.h
+++ b/storage/ndb/include/mgmapi/mgmapi_config_parameters.h
diff --git a/ndb/include/mgmapi/mgmapi_config_parameters_debug.h b/storage/ndb/include/mgmapi/mgmapi_config_parameters_debug.h
index 0241dca90ef..0241dca90ef 100644
--- a/ndb/include/mgmapi/mgmapi_config_parameters_debug.h
+++ b/storage/ndb/include/mgmapi/mgmapi_config_parameters_debug.h
diff --git a/ndb/include/mgmapi/mgmapi_debug.h b/storage/ndb/include/mgmapi/mgmapi_debug.h
index e86d9d4b768..e86d9d4b768 100644
--- a/ndb/include/mgmapi/mgmapi_debug.h
+++ b/storage/ndb/include/mgmapi/mgmapi_debug.h
diff --git a/ndb/include/mgmapi/ndb_logevent.h b/storage/ndb/include/mgmapi/ndb_logevent.h
index d5744b0fffe..d5744b0fffe 100644
--- a/ndb/include/mgmapi/ndb_logevent.h
+++ b/storage/ndb/include/mgmapi/ndb_logevent.h
diff --git a/ndb/include/mgmcommon/ConfigRetriever.hpp b/storage/ndb/include/mgmcommon/ConfigRetriever.hpp
index c0b877af07d..c0b877af07d 100644
--- a/ndb/include/mgmcommon/ConfigRetriever.hpp
+++ b/storage/ndb/include/mgmcommon/ConfigRetriever.hpp
diff --git a/ndb/include/mgmcommon/IPCConfig.hpp b/storage/ndb/include/mgmcommon/IPCConfig.hpp
index 1e23cdf9807..1e23cdf9807 100644
--- a/ndb/include/mgmcommon/IPCConfig.hpp
+++ b/storage/ndb/include/mgmcommon/IPCConfig.hpp
diff --git a/ndb/include/mgmcommon/MgmtErrorReporter.hpp b/storage/ndb/include/mgmcommon/MgmtErrorReporter.hpp
index 0d980aa7245..0d980aa7245 100644
--- a/ndb/include/mgmcommon/MgmtErrorReporter.hpp
+++ b/storage/ndb/include/mgmcommon/MgmtErrorReporter.hpp
diff --git a/ndb/include/ndb_constants.h b/storage/ndb/include/ndb_constants.h
index c292880749b..c292880749b 100644
--- a/ndb/include/ndb_constants.h
+++ b/storage/ndb/include/ndb_constants.h
diff --git a/ndb/include/ndb_global.h.in b/storage/ndb/include/ndb_global.h.in
index 43f90e1f8b5..43f90e1f8b5 100644
--- a/ndb/include/ndb_global.h.in
+++ b/storage/ndb/include/ndb_global.h.in
diff --git a/ndb/include/ndb_init.h b/storage/ndb/include/ndb_init.h
index 0ff53e6a2af..0ff53e6a2af 100644
--- a/ndb/include/ndb_init.h
+++ b/storage/ndb/include/ndb_init.h
diff --git a/ndb/include/ndb_net.h b/storage/ndb/include/ndb_net.h
index 279beb471a7..279beb471a7 100644
--- a/ndb/include/ndb_net.h
+++ b/storage/ndb/include/ndb_net.h
diff --git a/ndb/include/ndb_types.h.in b/storage/ndb/include/ndb_types.h.in
index 2a5d576ffea..2a5d576ffea 100644
--- a/ndb/include/ndb_types.h.in
+++ b/storage/ndb/include/ndb_types.h.in
diff --git a/ndb/include/ndb_version.h.in b/storage/ndb/include/ndb_version.h.in
index d7f43eae40a..d7f43eae40a 100644
--- a/ndb/include/ndb_version.h.in
+++ b/storage/ndb/include/ndb_version.h.in
diff --git a/ndb/include/ndbapi/Ndb.hpp b/storage/ndb/include/ndbapi/Ndb.hpp
index db2212075e8..db2212075e8 100644
--- a/ndb/include/ndbapi/Ndb.hpp
+++ b/storage/ndb/include/ndbapi/Ndb.hpp
diff --git a/ndb/include/ndbapi/NdbApi.hpp b/storage/ndb/include/ndbapi/NdbApi.hpp
index aed4d5efbd7..aed4d5efbd7 100644
--- a/ndb/include/ndbapi/NdbApi.hpp
+++ b/storage/ndb/include/ndbapi/NdbApi.hpp
diff --git a/ndb/include/ndbapi/NdbBlob.hpp b/storage/ndb/include/ndbapi/NdbBlob.hpp
index 271287b765c..271287b765c 100644
--- a/ndb/include/ndbapi/NdbBlob.hpp
+++ b/storage/ndb/include/ndbapi/NdbBlob.hpp
diff --git a/ndb/include/ndbapi/NdbDictionary.hpp b/storage/ndb/include/ndbapi/NdbDictionary.hpp
index 86130be4c4b..86130be4c4b 100644
--- a/ndb/include/ndbapi/NdbDictionary.hpp
+++ b/storage/ndb/include/ndbapi/NdbDictionary.hpp
diff --git a/ndb/include/ndbapi/NdbError.hpp b/storage/ndb/include/ndbapi/NdbError.hpp
index f67b3c4ccaa..f67b3c4ccaa 100644
--- a/ndb/include/ndbapi/NdbError.hpp
+++ b/storage/ndb/include/ndbapi/NdbError.hpp
diff --git a/ndb/include/ndbapi/NdbEventOperation.hpp b/storage/ndb/include/ndbapi/NdbEventOperation.hpp
index 55ee96b3144..55ee96b3144 100644
--- a/ndb/include/ndbapi/NdbEventOperation.hpp
+++ b/storage/ndb/include/ndbapi/NdbEventOperation.hpp
diff --git a/ndb/include/ndbapi/NdbIndexOperation.hpp b/storage/ndb/include/ndbapi/NdbIndexOperation.hpp
index 3de6835238e..3de6835238e 100644
--- a/ndb/include/ndbapi/NdbIndexOperation.hpp
+++ b/storage/ndb/include/ndbapi/NdbIndexOperation.hpp
diff --git a/ndb/include/ndbapi/NdbIndexScanOperation.hpp b/storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp
index 0a31f228921..0a31f228921 100644
--- a/ndb/include/ndbapi/NdbIndexScanOperation.hpp
+++ b/storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp
diff --git a/ndb/include/ndbapi/NdbOperation.hpp b/storage/ndb/include/ndbapi/NdbOperation.hpp
index fca610772cc..fca610772cc 100644
--- a/ndb/include/ndbapi/NdbOperation.hpp
+++ b/storage/ndb/include/ndbapi/NdbOperation.hpp
diff --git a/ndb/include/ndbapi/NdbPool.hpp b/storage/ndb/include/ndbapi/NdbPool.hpp
index 64cba5a008c..64cba5a008c 100644
--- a/ndb/include/ndbapi/NdbPool.hpp
+++ b/storage/ndb/include/ndbapi/NdbPool.hpp
diff --git a/ndb/include/ndbapi/NdbRecAttr.hpp b/storage/ndb/include/ndbapi/NdbRecAttr.hpp
index 50de4f3277e..50de4f3277e 100644
--- a/ndb/include/ndbapi/NdbRecAttr.hpp
+++ b/storage/ndb/include/ndbapi/NdbRecAttr.hpp
diff --git a/ndb/include/ndbapi/NdbReceiver.hpp b/storage/ndb/include/ndbapi/NdbReceiver.hpp
index ff6debc7fd3..ff6debc7fd3 100644
--- a/ndb/include/ndbapi/NdbReceiver.hpp
+++ b/storage/ndb/include/ndbapi/NdbReceiver.hpp
diff --git a/ndb/include/ndbapi/NdbScanFilter.hpp b/storage/ndb/include/ndbapi/NdbScanFilter.hpp
index b5457bab99b..b5457bab99b 100644
--- a/ndb/include/ndbapi/NdbScanFilter.hpp
+++ b/storage/ndb/include/ndbapi/NdbScanFilter.hpp
diff --git a/ndb/include/ndbapi/NdbScanOperation.hpp b/storage/ndb/include/ndbapi/NdbScanOperation.hpp
index bf8f362cefc..bf8f362cefc 100644
--- a/ndb/include/ndbapi/NdbScanOperation.hpp
+++ b/storage/ndb/include/ndbapi/NdbScanOperation.hpp
diff --git a/ndb/include/ndbapi/NdbTransaction.hpp b/storage/ndb/include/ndbapi/NdbTransaction.hpp
index 2e102b104d8..2e102b104d8 100644
--- a/ndb/include/ndbapi/NdbTransaction.hpp
+++ b/storage/ndb/include/ndbapi/NdbTransaction.hpp
diff --git a/ndb/include/ndbapi/ndb_cluster_connection.hpp b/storage/ndb/include/ndbapi/ndb_cluster_connection.hpp
index 97db76563aa..97db76563aa 100644
--- a/ndb/include/ndbapi/ndb_cluster_connection.hpp
+++ b/storage/ndb/include/ndbapi/ndb_cluster_connection.hpp
diff --git a/ndb/include/ndbapi/ndb_opt_defaults.h b/storage/ndb/include/ndbapi/ndb_opt_defaults.h
index d03a9dcc36f..d03a9dcc36f 100644
--- a/ndb/include/ndbapi/ndb_opt_defaults.h
+++ b/storage/ndb/include/ndbapi/ndb_opt_defaults.h
diff --git a/ndb/include/ndbapi/ndbapi_limits.h b/storage/ndb/include/ndbapi/ndbapi_limits.h
index 5c4db71b747..5c4db71b747 100644
--- a/ndb/include/ndbapi/ndbapi_limits.h
+++ b/storage/ndb/include/ndbapi/ndbapi_limits.h
diff --git a/ndb/include/ndbapi/ndberror.h b/storage/ndb/include/ndbapi/ndberror.h
index 2225f68f08d..2225f68f08d 100644
--- a/ndb/include/ndbapi/ndberror.h
+++ b/storage/ndb/include/ndbapi/ndberror.h
diff --git a/ndb/include/newtonapi/dba.h b/storage/ndb/include/newtonapi/dba.h
index 4cfc0ec8eb9..4cfc0ec8eb9 100644
--- a/ndb/include/newtonapi/dba.h
+++ b/storage/ndb/include/newtonapi/dba.h
diff --git a/ndb/include/newtonapi/defs/pcn_types.h b/storage/ndb/include/newtonapi/defs/pcn_types.h
index eae6c67899d..eae6c67899d 100644
--- a/ndb/include/newtonapi/defs/pcn_types.h
+++ b/storage/ndb/include/newtonapi/defs/pcn_types.h
diff --git a/ndb/include/portlib/NdbCondition.h b/storage/ndb/include/portlib/NdbCondition.h
index 3d959a0db41..3d959a0db41 100644
--- a/ndb/include/portlib/NdbCondition.h
+++ b/storage/ndb/include/portlib/NdbCondition.h
diff --git a/ndb/include/portlib/NdbConfig.h b/storage/ndb/include/portlib/NdbConfig.h
index 1bca825ab8d..1bca825ab8d 100644
--- a/ndb/include/portlib/NdbConfig.h
+++ b/storage/ndb/include/portlib/NdbConfig.h
diff --git a/ndb/include/portlib/NdbDaemon.h b/storage/ndb/include/portlib/NdbDaemon.h
index 74ea3f06419..74ea3f06419 100644
--- a/ndb/include/portlib/NdbDaemon.h
+++ b/storage/ndb/include/portlib/NdbDaemon.h
diff --git a/ndb/include/portlib/NdbEnv.h b/storage/ndb/include/portlib/NdbEnv.h
index 1611bf3152e..1611bf3152e 100644
--- a/ndb/include/portlib/NdbEnv.h
+++ b/storage/ndb/include/portlib/NdbEnv.h
diff --git a/ndb/include/portlib/NdbHost.h b/storage/ndb/include/portlib/NdbHost.h
index 90e7b781137..90e7b781137 100644
--- a/ndb/include/portlib/NdbHost.h
+++ b/storage/ndb/include/portlib/NdbHost.h
diff --git a/ndb/include/portlib/NdbMain.h b/storage/ndb/include/portlib/NdbMain.h
index 7cc7a877750..7cc7a877750 100644
--- a/ndb/include/portlib/NdbMain.h
+++ b/storage/ndb/include/portlib/NdbMain.h
diff --git a/ndb/include/portlib/NdbMem.h b/storage/ndb/include/portlib/NdbMem.h
index 0f2de80200e..0f2de80200e 100644
--- a/ndb/include/portlib/NdbMem.h
+++ b/storage/ndb/include/portlib/NdbMem.h
diff --git a/ndb/include/portlib/NdbMutex.h b/storage/ndb/include/portlib/NdbMutex.h
index b0b985ecef5..b0b985ecef5 100644
--- a/ndb/include/portlib/NdbMutex.h
+++ b/storage/ndb/include/portlib/NdbMutex.h
diff --git a/ndb/include/portlib/NdbSleep.h b/storage/ndb/include/portlib/NdbSleep.h
index 3b26710154f..3b26710154f 100644
--- a/ndb/include/portlib/NdbSleep.h
+++ b/storage/ndb/include/portlib/NdbSleep.h
diff --git a/ndb/include/portlib/NdbTCP.h b/storage/ndb/include/portlib/NdbTCP.h
index 8138a2ef354..8138a2ef354 100644
--- a/ndb/include/portlib/NdbTCP.h
+++ b/storage/ndb/include/portlib/NdbTCP.h
diff --git a/ndb/include/portlib/NdbThread.h b/storage/ndb/include/portlib/NdbThread.h
index e86deee4354..e86deee4354 100644
--- a/ndb/include/portlib/NdbThread.h
+++ b/storage/ndb/include/portlib/NdbThread.h
diff --git a/ndb/include/portlib/NdbTick.h b/storage/ndb/include/portlib/NdbTick.h
index 9bd8eca22bd..9bd8eca22bd 100644
--- a/ndb/include/portlib/NdbTick.h
+++ b/storage/ndb/include/portlib/NdbTick.h
diff --git a/ndb/include/portlib/PortDefs.h b/storage/ndb/include/portlib/PortDefs.h
index a115c60cfe1..a115c60cfe1 100644
--- a/ndb/include/portlib/PortDefs.h
+++ b/storage/ndb/include/portlib/PortDefs.h
diff --git a/ndb/include/portlib/prefetch.h b/storage/ndb/include/portlib/prefetch.h
index 729c80bd93e..729c80bd93e 100644
--- a/ndb/include/portlib/prefetch.h
+++ b/storage/ndb/include/portlib/prefetch.h
diff --git a/ndb/include/transporter/TransporterCallback.hpp b/storage/ndb/include/transporter/TransporterCallback.hpp
index 9f910f31728..9f910f31728 100644
--- a/ndb/include/transporter/TransporterCallback.hpp
+++ b/storage/ndb/include/transporter/TransporterCallback.hpp
diff --git a/ndb/include/transporter/TransporterDefinitions.hpp b/storage/ndb/include/transporter/TransporterDefinitions.hpp
index e9c5ffa2c80..e9c5ffa2c80 100644
--- a/ndb/include/transporter/TransporterDefinitions.hpp
+++ b/storage/ndb/include/transporter/TransporterDefinitions.hpp
diff --git a/ndb/include/transporter/TransporterRegistry.hpp b/storage/ndb/include/transporter/TransporterRegistry.hpp
index 1ae8a4068c4..1ae8a4068c4 100644
--- a/ndb/include/transporter/TransporterRegistry.hpp
+++ b/storage/ndb/include/transporter/TransporterRegistry.hpp
diff --git a/ndb/include/util/Base64.hpp b/storage/ndb/include/util/Base64.hpp
index f4b11ad9214..f4b11ad9214 100644
--- a/ndb/include/util/Base64.hpp
+++ b/storage/ndb/include/util/Base64.hpp
diff --git a/ndb/include/util/BaseString.hpp b/storage/ndb/include/util/BaseString.hpp
index 02a6a3b3e66..02a6a3b3e66 100644
--- a/ndb/include/util/BaseString.hpp
+++ b/storage/ndb/include/util/BaseString.hpp
diff --git a/ndb/include/util/Bitmask.hpp b/storage/ndb/include/util/Bitmask.hpp
index ade57a5ee57..ade57a5ee57 100644
--- a/ndb/include/util/Bitmask.hpp
+++ b/storage/ndb/include/util/Bitmask.hpp
diff --git a/ndb/include/util/ConfigValues.hpp b/storage/ndb/include/util/ConfigValues.hpp
index 457488e3c42..457488e3c42 100644
--- a/ndb/include/util/ConfigValues.hpp
+++ b/storage/ndb/include/util/ConfigValues.hpp
diff --git a/ndb/include/util/File.hpp b/storage/ndb/include/util/File.hpp
index 3ed0ad7a6f9..3ed0ad7a6f9 100644
--- a/ndb/include/util/File.hpp
+++ b/storage/ndb/include/util/File.hpp
diff --git a/ndb/include/util/InputStream.hpp b/storage/ndb/include/util/InputStream.hpp
index b2a56b1e433..b2a56b1e433 100644
--- a/ndb/include/util/InputStream.hpp
+++ b/storage/ndb/include/util/InputStream.hpp
diff --git a/ndb/include/util/NdbAutoPtr.hpp b/storage/ndb/include/util/NdbAutoPtr.hpp
index ff747e3de68..ff747e3de68 100644
--- a/ndb/include/util/NdbAutoPtr.hpp
+++ b/storage/ndb/include/util/NdbAutoPtr.hpp
diff --git a/ndb/include/util/NdbOut.hpp b/storage/ndb/include/util/NdbOut.hpp
index d85d5cc6305..d85d5cc6305 100644
--- a/ndb/include/util/NdbOut.hpp
+++ b/storage/ndb/include/util/NdbOut.hpp
diff --git a/ndb/include/util/NdbSqlUtil.hpp b/storage/ndb/include/util/NdbSqlUtil.hpp
index 3e98dcd1805..3e98dcd1805 100644
--- a/ndb/include/util/NdbSqlUtil.hpp
+++ b/storage/ndb/include/util/NdbSqlUtil.hpp
diff --git a/ndb/include/util/OutputStream.hpp b/storage/ndb/include/util/OutputStream.hpp
index c7e009d4537..c7e009d4537 100644
--- a/ndb/include/util/OutputStream.hpp
+++ b/storage/ndb/include/util/OutputStream.hpp
diff --git a/ndb/include/util/Parser.hpp b/storage/ndb/include/util/Parser.hpp
index c117498e1ba..c117498e1ba 100644
--- a/ndb/include/util/Parser.hpp
+++ b/storage/ndb/include/util/Parser.hpp
diff --git a/ndb/include/util/Properties.hpp b/storage/ndb/include/util/Properties.hpp
index e6668744211..e6668744211 100644
--- a/ndb/include/util/Properties.hpp
+++ b/storage/ndb/include/util/Properties.hpp
diff --git a/ndb/include/util/SimpleProperties.hpp b/storage/ndb/include/util/SimpleProperties.hpp
index 438426fb62b..438426fb62b 100644
--- a/ndb/include/util/SimpleProperties.hpp
+++ b/storage/ndb/include/util/SimpleProperties.hpp
diff --git a/ndb/include/util/SocketAuthenticator.hpp b/storage/ndb/include/util/SocketAuthenticator.hpp
index 1b82567feaa..1b82567feaa 100644
--- a/ndb/include/util/SocketAuthenticator.hpp
+++ b/storage/ndb/include/util/SocketAuthenticator.hpp
diff --git a/ndb/include/util/SocketClient.hpp b/storage/ndb/include/util/SocketClient.hpp
index bf1ad7d45d6..bf1ad7d45d6 100644
--- a/ndb/include/util/SocketClient.hpp
+++ b/storage/ndb/include/util/SocketClient.hpp
diff --git a/ndb/include/util/SocketServer.hpp b/storage/ndb/include/util/SocketServer.hpp
index 2e1afb74945..2e1afb74945 100644
--- a/ndb/include/util/SocketServer.hpp
+++ b/storage/ndb/include/util/SocketServer.hpp
diff --git a/ndb/include/util/UtilBuffer.hpp b/storage/ndb/include/util/UtilBuffer.hpp
index f43fc960a16..f43fc960a16 100644
--- a/ndb/include/util/UtilBuffer.hpp
+++ b/storage/ndb/include/util/UtilBuffer.hpp
diff --git a/ndb/include/util/Vector.hpp b/storage/ndb/include/util/Vector.hpp
index 480dddf8243..480dddf8243 100644
--- a/ndb/include/util/Vector.hpp
+++ b/storage/ndb/include/util/Vector.hpp
diff --git a/ndb/include/util/basestring_vsnprintf.h b/storage/ndb/include/util/basestring_vsnprintf.h
index 7c804f22841..7c804f22841 100644
--- a/ndb/include/util/basestring_vsnprintf.h
+++ b/storage/ndb/include/util/basestring_vsnprintf.h
diff --git a/ndb/include/util/md5_hash.hpp b/storage/ndb/include/util/md5_hash.hpp
index b79dce3b5a9..b79dce3b5a9 100644
--- a/ndb/include/util/md5_hash.hpp
+++ b/storage/ndb/include/util/md5_hash.hpp
diff --git a/ndb/include/util/ndb_opts.h b/storage/ndb/include/util/ndb_opts.h
index 72abd6d5d7a..72abd6d5d7a 100644
--- a/ndb/include/util/ndb_opts.h
+++ b/storage/ndb/include/util/ndb_opts.h
diff --git a/ndb/include/util/random.h b/storage/ndb/include/util/random.h
index 1b83e5fec93..1b83e5fec93 100644
--- a/ndb/include/util/random.h
+++ b/storage/ndb/include/util/random.h
diff --git a/ndb/include/util/socket_io.h b/storage/ndb/include/util/socket_io.h
index a0e6c4e369d..a0e6c4e369d 100644
--- a/ndb/include/util/socket_io.h
+++ b/storage/ndb/include/util/socket_io.h
diff --git a/ndb/include/util/uucode.h b/storage/ndb/include/util/uucode.h
index f5569d033a5..f5569d033a5 100644
--- a/ndb/include/util/uucode.h
+++ b/storage/ndb/include/util/uucode.h
diff --git a/ndb/include/util/version.h b/storage/ndb/include/util/version.h
index 5459e44b818..5459e44b818 100644
--- a/ndb/include/util/version.h
+++ b/storage/ndb/include/util/version.h
diff --git a/ndb/lib/.empty b/storage/ndb/lib/.empty
index e69de29bb2d..e69de29bb2d 100644
--- a/ndb/lib/.empty
+++ b/storage/ndb/lib/.empty
diff --git a/ndb/ndbapi-examples/Makefile b/storage/ndb/ndbapi-examples/Makefile
index 965dc3ec29f..965dc3ec29f 100644
--- a/ndb/ndbapi-examples/Makefile
+++ b/storage/ndb/ndbapi-examples/Makefile
diff --git a/ndb/ndbapi-examples/mgmapi_logevent_example/Makefile b/storage/ndb/ndbapi-examples/mgmapi_logevent_example/Makefile
index c1ca32dfe17..c1ca32dfe17 100644
--- a/ndb/ndbapi-examples/mgmapi_logevent_example/Makefile
+++ b/storage/ndb/ndbapi-examples/mgmapi_logevent_example/Makefile
diff --git a/ndb/ndbapi-examples/mgmapi_logevent_example/mgmapi_logevent.cpp b/storage/ndb/ndbapi-examples/mgmapi_logevent_example/mgmapi_logevent.cpp
index 5ec1fba6314..5ec1fba6314 100644
--- a/ndb/ndbapi-examples/mgmapi_logevent_example/mgmapi_logevent.cpp
+++ b/storage/ndb/ndbapi-examples/mgmapi_logevent_example/mgmapi_logevent.cpp
diff --git a/ndb/ndbapi-examples/ndbapi_async_example/Makefile b/storage/ndb/ndbapi-examples/ndbapi_async_example/Makefile
index 55e4a13343f..55e4a13343f 100644
--- a/ndb/ndbapi-examples/ndbapi_async_example/Makefile
+++ b/storage/ndb/ndbapi-examples/ndbapi_async_example/Makefile
diff --git a/ndb/ndbapi-examples/ndbapi_async_example/ndbapi_async.cpp b/storage/ndb/ndbapi-examples/ndbapi_async_example/ndbapi_async.cpp
index aa745f4d28d..aa745f4d28d 100644
--- a/ndb/ndbapi-examples/ndbapi_async_example/ndbapi_async.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_async_example/ndbapi_async.cpp
diff --git a/ndb/ndbapi-examples/ndbapi_async_example/readme.txt b/storage/ndb/ndbapi-examples/ndbapi_async_example/readme.txt
index 47cb4bf9ffa..47cb4bf9ffa 100644
--- a/ndb/ndbapi-examples/ndbapi_async_example/readme.txt
+++ b/storage/ndb/ndbapi-examples/ndbapi_async_example/readme.txt
diff --git a/ndb/ndbapi-examples/ndbapi_async_example1/Makefile b/storage/ndb/ndbapi-examples/ndbapi_async_example1/Makefile
index 7f6ea0b4d25..7f6ea0b4d25 100644
--- a/ndb/ndbapi-examples/ndbapi_async_example1/Makefile
+++ b/storage/ndb/ndbapi-examples/ndbapi_async_example1/Makefile
diff --git a/ndb/ndbapi-examples/ndbapi_async_example1/ndbapi_async1.cpp b/storage/ndb/ndbapi-examples/ndbapi_async_example1/ndbapi_async1.cpp
index e8bc19e267b..e8bc19e267b 100644
--- a/ndb/ndbapi-examples/ndbapi_async_example1/ndbapi_async1.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_async_example1/ndbapi_async1.cpp
diff --git a/ndb/ndbapi-examples/ndbapi_event_example/Makefile b/storage/ndb/ndbapi-examples/ndbapi_event_example/Makefile
index 12e109c654f..12e109c654f 100644
--- a/ndb/ndbapi-examples/ndbapi_event_example/Makefile
+++ b/storage/ndb/ndbapi-examples/ndbapi_event_example/Makefile
diff --git a/ndb/ndbapi-examples/ndbapi_event_example/ndbapi_event.cpp b/storage/ndb/ndbapi-examples/ndbapi_event_example/ndbapi_event.cpp
index 286f6fafbab..286f6fafbab 100644
--- a/ndb/ndbapi-examples/ndbapi_event_example/ndbapi_event.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_event_example/ndbapi_event.cpp
diff --git a/ndb/ndbapi-examples/ndbapi_retries_example/Makefile b/storage/ndb/ndbapi-examples/ndbapi_retries_example/Makefile
index 829a7009031..829a7009031 100644
--- a/ndb/ndbapi-examples/ndbapi_retries_example/Makefile
+++ b/storage/ndb/ndbapi-examples/ndbapi_retries_example/Makefile
diff --git a/ndb/ndbapi-examples/ndbapi_retries_example/ndbapi_retries.cpp b/storage/ndb/ndbapi-examples/ndbapi_retries_example/ndbapi_retries.cpp
index 8c29fe31446..8c29fe31446 100644
--- a/ndb/ndbapi-examples/ndbapi_retries_example/ndbapi_retries.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_retries_example/ndbapi_retries.cpp
diff --git a/ndb/ndbapi-examples/ndbapi_scan_example/Makefile b/storage/ndb/ndbapi-examples/ndbapi_scan_example/Makefile
index 31886b02bf1..31886b02bf1 100644
--- a/ndb/ndbapi-examples/ndbapi_scan_example/Makefile
+++ b/storage/ndb/ndbapi-examples/ndbapi_scan_example/Makefile
diff --git a/ndb/ndbapi-examples/ndbapi_scan_example/ndbapi_scan.cpp b/storage/ndb/ndbapi-examples/ndbapi_scan_example/ndbapi_scan.cpp
index 69ffd99b8ca..69ffd99b8ca 100644
--- a/ndb/ndbapi-examples/ndbapi_scan_example/ndbapi_scan.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_scan_example/ndbapi_scan.cpp
diff --git a/ndb/ndbapi-examples/ndbapi_scan_example/readme.txt b/storage/ndb/ndbapi-examples/ndbapi_scan_example/readme.txt
index 47cb4bf9ffa..47cb4bf9ffa 100644
--- a/ndb/ndbapi-examples/ndbapi_scan_example/readme.txt
+++ b/storage/ndb/ndbapi-examples/ndbapi_scan_example/readme.txt
diff --git a/ndb/ndbapi-examples/ndbapi_simple_example/Makefile b/storage/ndb/ndbapi-examples/ndbapi_simple_example/Makefile
index 0a59584fb66..0a59584fb66 100644
--- a/ndb/ndbapi-examples/ndbapi_simple_example/Makefile
+++ b/storage/ndb/ndbapi-examples/ndbapi_simple_example/Makefile
diff --git a/ndb/ndbapi-examples/ndbapi_simple_example/ndbapi_simple.cpp b/storage/ndb/ndbapi-examples/ndbapi_simple_example/ndbapi_simple.cpp
index 152d4fa44af..152d4fa44af 100644
--- a/ndb/ndbapi-examples/ndbapi_simple_example/ndbapi_simple.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_simple_example/ndbapi_simple.cpp
diff --git a/ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile b/storage/ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile
index d4356055935..d4356055935 100644
--- a/ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile
+++ b/storage/ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile
diff --git a/ndb/ndbapi-examples/ndbapi_simple_index_example/ndbapi_simple_index.cpp b/storage/ndb/ndbapi-examples/ndbapi_simple_index_example/ndbapi_simple_index.cpp
index 5afaf6078d1..5afaf6078d1 100644
--- a/ndb/ndbapi-examples/ndbapi_simple_index_example/ndbapi_simple_index.cpp
+++ b/storage/ndb/ndbapi-examples/ndbapi_simple_index_example/ndbapi_simple_index.cpp
diff --git a/storage/ndb/src/Makefile.am b/storage/ndb/src/Makefile.am
new file mode 100644
index 00000000000..23ba5f6f9e4
--- /dev/null
+++ b/storage/ndb/src/Makefile.am
@@ -0,0 +1,33 @@
+SUBDIRS = common mgmapi ndbapi . kernel mgmclient mgmsrv cw
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+
+ndblib_LTLIBRARIES = libndbclient.la
+
+libndbclient_la_SOURCES =
+
+libndbclient_la_LIBADD =  \
+              ndbapi/libndbapi.la \
+              common/transporter/libtransporter.la   \
+              common/debugger/libtrace.la     \
+              common/debugger/signaldata/libsignaldataprint.la \
+              mgmapi/libmgmapi.la \
+              common/mgmcommon/libmgmsrvcommon.la \
+              common/logger/liblogger.la       \
+              common/portlib/libportlib.la      \
+              common/util/libgeneral.la 
+
+windoze-dsp: libndbclient.dsp
+
+libndbclient.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(ndblib_LTLIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ dummy.cpp
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(libndbclient_la_LIBADD)
+	@touch dummy.cpp
diff --git a/ndb/src/common/Makefile.am b/storage/ndb/src/common/Makefile.am
index 0059f3fb210..0059f3fb210 100644
--- a/ndb/src/common/Makefile.am
+++ b/storage/ndb/src/common/Makefile.am
diff --git a/ndb/src/common/debugger/BlockNames.cpp b/storage/ndb/src/common/debugger/BlockNames.cpp
index 44650b84c5c..44650b84c5c 100644
--- a/ndb/src/common/debugger/BlockNames.cpp
+++ b/storage/ndb/src/common/debugger/BlockNames.cpp
diff --git a/ndb/src/common/debugger/DebuggerNames.cpp b/storage/ndb/src/common/debugger/DebuggerNames.cpp
index 8571b8ece86..8571b8ece86 100644
--- a/ndb/src/common/debugger/DebuggerNames.cpp
+++ b/storage/ndb/src/common/debugger/DebuggerNames.cpp
diff --git a/ndb/src/common/debugger/EventLogger.cpp b/storage/ndb/src/common/debugger/EventLogger.cpp
index 5a534b36b59..5a534b36b59 100644
--- a/ndb/src/common/debugger/EventLogger.cpp
+++ b/storage/ndb/src/common/debugger/EventLogger.cpp
diff --git a/ndb/src/common/debugger/GrepError.cpp b/storage/ndb/src/common/debugger/GrepError.cpp
index 20aeaa6dd77..20aeaa6dd77 100644
--- a/ndb/src/common/debugger/GrepError.cpp
+++ b/storage/ndb/src/common/debugger/GrepError.cpp
diff --git a/storage/ndb/src/common/debugger/Makefile.am b/storage/ndb/src/common/debugger/Makefile.am
new file mode 100644
index 00000000000..71b8ed55561
--- /dev/null
+++ b/storage/ndb/src/common/debugger/Makefile.am
@@ -0,0 +1,25 @@
+SUBDIRS = signaldata
+
+noinst_LTLIBRARIES = libtrace.la
+
+libtrace_la_SOURCES = SignalLoggerManager.cpp DebuggerNames.cpp BlockNames.cpp EventLogger.cpp GrepError.cpp
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: libtrace.dsp
+
+libtrace.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libtrace_la_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/common/debugger/SignalLoggerManager.cpp b/storage/ndb/src/common/debugger/SignalLoggerManager.cpp
index d8710d2058f..d8710d2058f 100644
--- a/ndb/src/common/debugger/SignalLoggerManager.cpp
+++ b/storage/ndb/src/common/debugger/SignalLoggerManager.cpp
diff --git a/ndb/src/common/debugger/signaldata/AccLock.cpp b/storage/ndb/src/common/debugger/signaldata/AccLock.cpp
index affed431957..affed431957 100644
--- a/ndb/src/common/debugger/signaldata/AccLock.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/AccLock.cpp
diff --git a/ndb/src/common/debugger/signaldata/AlterIndx.cpp b/storage/ndb/src/common/debugger/signaldata/AlterIndx.cpp
index e1865136fc3..e1865136fc3 100644
--- a/ndb/src/common/debugger/signaldata/AlterIndx.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/AlterIndx.cpp
diff --git a/ndb/src/common/debugger/signaldata/AlterTab.cpp b/storage/ndb/src/common/debugger/signaldata/AlterTab.cpp
index f9521984095..f9521984095 100644
--- a/ndb/src/common/debugger/signaldata/AlterTab.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/AlterTab.cpp
diff --git a/ndb/src/common/debugger/signaldata/AlterTable.cpp b/storage/ndb/src/common/debugger/signaldata/AlterTable.cpp
index 59909c8e490..59909c8e490 100644
--- a/ndb/src/common/debugger/signaldata/AlterTable.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/AlterTable.cpp
diff --git a/ndb/src/common/debugger/signaldata/AlterTrig.cpp b/storage/ndb/src/common/debugger/signaldata/AlterTrig.cpp
index d488fd6e348..d488fd6e348 100644
--- a/ndb/src/common/debugger/signaldata/AlterTrig.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/AlterTrig.cpp
diff --git a/ndb/src/common/debugger/signaldata/BackupImpl.cpp b/storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp
index e9b0188d93b..e9b0188d93b 100644
--- a/ndb/src/common/debugger/signaldata/BackupImpl.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp
diff --git a/ndb/src/common/debugger/signaldata/BackupSignalData.cpp b/storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp
index 4b0a0e07b66..4b0a0e07b66 100644
--- a/ndb/src/common/debugger/signaldata/BackupSignalData.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp
diff --git a/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp b/storage/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp
index 84410a2b2db..84410a2b2db 100644
--- a/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp
diff --git a/ndb/src/common/debugger/signaldata/CntrStart.cpp b/storage/ndb/src/common/debugger/signaldata/CntrStart.cpp
index 154013f40b0..154013f40b0 100644
--- a/ndb/src/common/debugger/signaldata/CntrStart.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/CntrStart.cpp
diff --git a/ndb/src/common/debugger/signaldata/ContinueB.cpp b/storage/ndb/src/common/debugger/signaldata/ContinueB.cpp
index c295041bc01..c295041bc01 100644
--- a/ndb/src/common/debugger/signaldata/ContinueB.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/ContinueB.cpp
diff --git a/ndb/src/common/debugger/signaldata/CopyGCI.cpp b/storage/ndb/src/common/debugger/signaldata/CopyGCI.cpp
index 173b3f6708f..173b3f6708f 100644
--- a/ndb/src/common/debugger/signaldata/CopyGCI.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/CopyGCI.cpp
diff --git a/ndb/src/common/debugger/signaldata/CreateEvnt.cpp b/storage/ndb/src/common/debugger/signaldata/CreateEvnt.cpp
index 7b497d6a974..7b497d6a974 100644
--- a/ndb/src/common/debugger/signaldata/CreateEvnt.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/CreateEvnt.cpp
diff --git a/ndb/src/common/debugger/signaldata/CreateFragmentation.cpp b/storage/ndb/src/common/debugger/signaldata/CreateFragmentation.cpp
index 027f743b5ea..027f743b5ea 100644
--- a/ndb/src/common/debugger/signaldata/CreateFragmentation.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/CreateFragmentation.cpp
diff --git a/ndb/src/common/debugger/signaldata/CreateIndx.cpp b/storage/ndb/src/common/debugger/signaldata/CreateIndx.cpp
index 8fcbb9279ed..8fcbb9279ed 100644
--- a/ndb/src/common/debugger/signaldata/CreateIndx.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/CreateIndx.cpp
diff --git a/ndb/src/common/debugger/signaldata/CreateTrig.cpp b/storage/ndb/src/common/debugger/signaldata/CreateTrig.cpp
index db5344cfbe7..db5344cfbe7 100644
--- a/ndb/src/common/debugger/signaldata/CreateTrig.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/CreateTrig.cpp
diff --git a/ndb/src/common/debugger/signaldata/DictTabInfo.cpp b/storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp
index 43c129347c0..43c129347c0 100644
--- a/ndb/src/common/debugger/signaldata/DictTabInfo.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp
diff --git a/ndb/src/common/debugger/signaldata/DihContinueB.cpp b/storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp
index 9fece17315c..9fece17315c 100644
--- a/ndb/src/common/debugger/signaldata/DihContinueB.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp
diff --git a/ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp b/storage/ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp
index 2e4318f4033..2e4318f4033 100644
--- a/ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp
diff --git a/ndb/src/common/debugger/signaldata/DisconnectRep.cpp b/storage/ndb/src/common/debugger/signaldata/DisconnectRep.cpp
index 3a73747a978..3a73747a978 100644
--- a/ndb/src/common/debugger/signaldata/DisconnectRep.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/DisconnectRep.cpp
diff --git a/ndb/src/common/debugger/signaldata/DropIndx.cpp b/storage/ndb/src/common/debugger/signaldata/DropIndx.cpp
index 0d59a981a18..0d59a981a18 100644
--- a/ndb/src/common/debugger/signaldata/DropIndx.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/DropIndx.cpp
diff --git a/ndb/src/common/debugger/signaldata/DropTab.cpp b/storage/ndb/src/common/debugger/signaldata/DropTab.cpp
index 83c95b0e344..83c95b0e344 100644
--- a/ndb/src/common/debugger/signaldata/DropTab.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/DropTab.cpp
diff --git a/ndb/src/common/debugger/signaldata/DropTrig.cpp b/storage/ndb/src/common/debugger/signaldata/DropTrig.cpp
index 54e8734439f..54e8734439f 100644
--- a/ndb/src/common/debugger/signaldata/DropTrig.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/DropTrig.cpp
diff --git a/ndb/src/common/debugger/signaldata/FailRep.cpp b/storage/ndb/src/common/debugger/signaldata/FailRep.cpp
index d70912fe8c7..d70912fe8c7 100644
--- a/ndb/src/common/debugger/signaldata/FailRep.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/FailRep.cpp
diff --git a/ndb/src/common/debugger/signaldata/FireTrigOrd.cpp b/storage/ndb/src/common/debugger/signaldata/FireTrigOrd.cpp
index d86aa2e06de..d86aa2e06de 100644
--- a/ndb/src/common/debugger/signaldata/FireTrigOrd.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/FireTrigOrd.cpp
diff --git a/ndb/src/common/debugger/signaldata/FsAppendReq.cpp b/storage/ndb/src/common/debugger/signaldata/FsAppendReq.cpp
index 6e443ffe5fc..6e443ffe5fc 100644
--- a/ndb/src/common/debugger/signaldata/FsAppendReq.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/FsAppendReq.cpp
diff --git a/ndb/src/common/debugger/signaldata/FsCloseReq.cpp b/storage/ndb/src/common/debugger/signaldata/FsCloseReq.cpp
index df9f3cc9fbc..df9f3cc9fbc 100644
--- a/ndb/src/common/debugger/signaldata/FsCloseReq.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/FsCloseReq.cpp
diff --git a/ndb/src/common/debugger/signaldata/FsConf.cpp b/storage/ndb/src/common/debugger/signaldata/FsConf.cpp
index f0ab57aadcf..f0ab57aadcf 100644
--- a/ndb/src/common/debugger/signaldata/FsConf.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/FsConf.cpp
diff --git a/ndb/src/common/debugger/signaldata/FsOpenReq.cpp b/storage/ndb/src/common/debugger/signaldata/FsOpenReq.cpp
index 31d351a8a84..31d351a8a84 100644
--- a/ndb/src/common/debugger/signaldata/FsOpenReq.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/FsOpenReq.cpp
diff --git a/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp b/storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp
index a9f240d3cb4..a9f240d3cb4 100644
--- a/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp
diff --git a/ndb/src/common/debugger/signaldata/FsRef.cpp b/storage/ndb/src/common/debugger/signaldata/FsRef.cpp
index ccf3d6da9c8..ccf3d6da9c8 100644
--- a/ndb/src/common/debugger/signaldata/FsRef.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/FsRef.cpp
diff --git a/ndb/src/common/debugger/signaldata/GCPSave.cpp b/storage/ndb/src/common/debugger/signaldata/GCPSave.cpp
index 7566f004bfd..7566f004bfd 100644
--- a/ndb/src/common/debugger/signaldata/GCPSave.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/GCPSave.cpp
diff --git a/ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp b/storage/ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp
index 2ef5feaada7..2ef5feaada7 100755
--- a/ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp
diff --git a/ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp b/storage/ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp
index 6fe5567188d..6fe5567188d 100755
--- a/ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp
diff --git a/ndb/src/common/debugger/signaldata/LCP.cpp b/storage/ndb/src/common/debugger/signaldata/LCP.cpp
index 6b4bb13e2cd..6b4bb13e2cd 100644
--- a/ndb/src/common/debugger/signaldata/LCP.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/LCP.cpp
diff --git a/ndb/src/common/debugger/signaldata/LqhFrag.cpp b/storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp
index 6d727959a67..6d727959a67 100644
--- a/ndb/src/common/debugger/signaldata/LqhFrag.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp
diff --git a/ndb/src/common/debugger/signaldata/LqhKey.cpp b/storage/ndb/src/common/debugger/signaldata/LqhKey.cpp
index 2796437fd8b..2796437fd8b 100644
--- a/ndb/src/common/debugger/signaldata/LqhKey.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/LqhKey.cpp
diff --git a/ndb/src/common/debugger/signaldata/LqhTrans.cpp b/storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp
index 8282530cae6..8282530cae6 100644
--- a/ndb/src/common/debugger/signaldata/LqhTrans.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp
diff --git a/storage/ndb/src/common/debugger/signaldata/Makefile.am b/storage/ndb/src/common/debugger/signaldata/Makefile.am
new file mode 100644
index 00000000000..af9d343de44
--- /dev/null
+++ b/storage/ndb/src/common/debugger/signaldata/Makefile.am
@@ -0,0 +1,47 @@
+
+noinst_LTLIBRARIES = libsignaldataprint.la
+
+libsignaldataprint_la_SOURCES = \
+          TcKeyReq.cpp TcKeyConf.cpp TcKeyRef.cpp \
+	  TcRollbackRep.cpp \
+          TupKey.cpp TupCommit.cpp LqhKey.cpp \
+          FsOpenReq.cpp FsCloseReq.cpp FsRef.cpp FsConf.cpp FsReadWriteReq.cpp\
+          SignalDataPrint.cpp SignalNames.cpp \
+          ContinueB.cpp DihContinueB.cpp NdbfsContinueB.cpp \
+          CloseComReqConf.cpp PackedSignal.cpp PrepFailReqRef.cpp \
+	  GCPSave.cpp DictTabInfo.cpp \
+	  AlterTable.cpp AlterTab.cpp \
+	  CreateTrig.cpp AlterTrig.cpp DropTrig.cpp \
+	  FireTrigOrd.cpp TrigAttrInfo.cpp \
+	  CreateIndx.cpp AlterIndx.cpp DropIndx.cpp TcIndx.cpp \
+	  IndxKeyInfo.cpp IndxAttrInfo.cpp \
+          FsAppendReq.cpp ScanTab.cpp \
+          BackupImpl.cpp BackupSignalData.cpp \
+          UtilSequence.cpp UtilPrepare.cpp UtilDelete.cpp UtilExecute.cpp \
+          LqhFrag.cpp DropTab.cpp PrepDropTab.cpp LCP.cpp MasterLCP.cpp \
+          CopyGCI.cpp SystemError.cpp StartRec.cpp NFCompleteRep.cpp \
+          FailRep.cpp DisconnectRep.cpp SignalDroppedRep.cpp \
+          SumaImpl.cpp NdbSttor.cpp CreateFragmentation.cpp \
+	  UtilLock.cpp TuxMaint.cpp AccLock.cpp \
+          LqhTrans.cpp ReadNodesConf.cpp CntrStart.cpp \
+          ScanFrag.cpp
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: libsignaldataprint.dsp
+
+libsignaldataprint.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libsignaldataprint_la_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/common/debugger/signaldata/MasterLCP.cpp b/storage/ndb/src/common/debugger/signaldata/MasterLCP.cpp
index 078b92f6f2e..078b92f6f2e 100644
--- a/ndb/src/common/debugger/signaldata/MasterLCP.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/MasterLCP.cpp
diff --git a/ndb/src/common/debugger/signaldata/NFCompleteRep.cpp b/storage/ndb/src/common/debugger/signaldata/NFCompleteRep.cpp
index f2d6f2f104a..f2d6f2f104a 100644
--- a/ndb/src/common/debugger/signaldata/NFCompleteRep.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/NFCompleteRep.cpp
diff --git a/ndb/src/common/debugger/signaldata/NdbSttor.cpp b/storage/ndb/src/common/debugger/signaldata/NdbSttor.cpp
index 9fd081313be..9fd081313be 100644
--- a/ndb/src/common/debugger/signaldata/NdbSttor.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/NdbSttor.cpp
diff --git a/ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp b/storage/ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp
index 9f55efae017..9f55efae017 100644
--- a/ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp
diff --git a/ndb/src/common/debugger/signaldata/PackedSignal.cpp b/storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp
index f0f7aee74e4..f0f7aee74e4 100644
--- a/ndb/src/common/debugger/signaldata/PackedSignal.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp
diff --git a/ndb/src/common/debugger/signaldata/PrepDropTab.cpp b/storage/ndb/src/common/debugger/signaldata/PrepDropTab.cpp
index 59001bcd6f6..59001bcd6f6 100644
--- a/ndb/src/common/debugger/signaldata/PrepDropTab.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/PrepDropTab.cpp
diff --git a/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp b/storage/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp
index 2e900de8f70..2e900de8f70 100644
--- a/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp
diff --git a/ndb/src/common/debugger/signaldata/ReadNodesConf.cpp b/storage/ndb/src/common/debugger/signaldata/ReadNodesConf.cpp
index 103f4a884f1..103f4a884f1 100644
--- a/ndb/src/common/debugger/signaldata/ReadNodesConf.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/ReadNodesConf.cpp
diff --git a/ndb/src/common/debugger/signaldata/ScanFrag.cpp b/storage/ndb/src/common/debugger/signaldata/ScanFrag.cpp
index 4d19a325637..4d19a325637 100644
--- a/ndb/src/common/debugger/signaldata/ScanFrag.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/ScanFrag.cpp
diff --git a/ndb/src/common/debugger/signaldata/ScanTab.cpp b/storage/ndb/src/common/debugger/signaldata/ScanTab.cpp
index d78beb4740a..d78beb4740a 100644
--- a/ndb/src/common/debugger/signaldata/ScanTab.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/ScanTab.cpp
diff --git a/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp b/storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
index ab23c04bffa..ab23c04bffa 100644
--- a/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
diff --git a/ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp b/storage/ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp
index be31b4edb22..be31b4edb22 100644
--- a/ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp
diff --git a/ndb/src/common/debugger/signaldata/SignalNames.cpp b/storage/ndb/src/common/debugger/signaldata/SignalNames.cpp
index 984d28819c0..984d28819c0 100644
--- a/ndb/src/common/debugger/signaldata/SignalNames.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/SignalNames.cpp
diff --git a/ndb/src/common/debugger/signaldata/StartRec.cpp b/storage/ndb/src/common/debugger/signaldata/StartRec.cpp
index 482e3cb0728..482e3cb0728 100644
--- a/ndb/src/common/debugger/signaldata/StartRec.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/StartRec.cpp
diff --git a/ndb/src/common/debugger/signaldata/SumaImpl.cpp b/storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp
index e50a3040fe3..e50a3040fe3 100644
--- a/ndb/src/common/debugger/signaldata/SumaImpl.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp
diff --git a/ndb/src/common/debugger/signaldata/SystemError.cpp b/storage/ndb/src/common/debugger/signaldata/SystemError.cpp
index 549c34710a0..549c34710a0 100644
--- a/ndb/src/common/debugger/signaldata/SystemError.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/SystemError.cpp
diff --git a/ndb/src/common/debugger/signaldata/TcIndx.cpp b/storage/ndb/src/common/debugger/signaldata/TcIndx.cpp
index b0578f5b646..b0578f5b646 100644
--- a/ndb/src/common/debugger/signaldata/TcIndx.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/TcIndx.cpp
diff --git a/ndb/src/common/debugger/signaldata/TcKeyConf.cpp b/storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp
index 652c2b8a557..652c2b8a557 100644
--- a/ndb/src/common/debugger/signaldata/TcKeyConf.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp
diff --git a/ndb/src/common/debugger/signaldata/TcKeyRef.cpp b/storage/ndb/src/common/debugger/signaldata/TcKeyRef.cpp
index 0dba9909caf..0dba9909caf 100644
--- a/ndb/src/common/debugger/signaldata/TcKeyRef.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/TcKeyRef.cpp
diff --git a/ndb/src/common/debugger/signaldata/TcKeyReq.cpp b/storage/ndb/src/common/debugger/signaldata/TcKeyReq.cpp
index 3918bd5db26..3918bd5db26 100644
--- a/ndb/src/common/debugger/signaldata/TcKeyReq.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/TcKeyReq.cpp
diff --git a/ndb/src/common/debugger/signaldata/TcRollbackRep.cpp b/storage/ndb/src/common/debugger/signaldata/TcRollbackRep.cpp
index 961f0c3619d..961f0c3619d 100644
--- a/ndb/src/common/debugger/signaldata/TcRollbackRep.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/TcRollbackRep.cpp
diff --git a/ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp b/storage/ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp
index 7a8d176ec61..7a8d176ec61 100644
--- a/ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp
diff --git a/ndb/src/common/debugger/signaldata/TupCommit.cpp b/storage/ndb/src/common/debugger/signaldata/TupCommit.cpp
index d0391b2a8e6..d0391b2a8e6 100644
--- a/ndb/src/common/debugger/signaldata/TupCommit.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/TupCommit.cpp
diff --git a/ndb/src/common/debugger/signaldata/TupKey.cpp b/storage/ndb/src/common/debugger/signaldata/TupKey.cpp
index 134b5fde8bc..134b5fde8bc 100644
--- a/ndb/src/common/debugger/signaldata/TupKey.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/TupKey.cpp
diff --git a/ndb/src/common/debugger/signaldata/TuxMaint.cpp b/storage/ndb/src/common/debugger/signaldata/TuxMaint.cpp
index ba6a299b77d..ba6a299b77d 100644
--- a/ndb/src/common/debugger/signaldata/TuxMaint.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/TuxMaint.cpp
diff --git a/ndb/src/common/debugger/signaldata/UtilDelete.cpp b/storage/ndb/src/common/debugger/signaldata/UtilDelete.cpp
index b6ba53559ac..b6ba53559ac 100644
--- a/ndb/src/common/debugger/signaldata/UtilDelete.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/UtilDelete.cpp
diff --git a/ndb/src/common/debugger/signaldata/UtilExecute.cpp b/storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp
index 2c88fa174d4..2c88fa174d4 100644
--- a/ndb/src/common/debugger/signaldata/UtilExecute.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp
diff --git a/ndb/src/common/debugger/signaldata/UtilLock.cpp b/storage/ndb/src/common/debugger/signaldata/UtilLock.cpp
index 34e37c3e2d8..34e37c3e2d8 100644
--- a/ndb/src/common/debugger/signaldata/UtilLock.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/UtilLock.cpp
diff --git a/ndb/src/common/debugger/signaldata/UtilPrepare.cpp b/storage/ndb/src/common/debugger/signaldata/UtilPrepare.cpp
index adc2e299380..adc2e299380 100644
--- a/ndb/src/common/debugger/signaldata/UtilPrepare.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/UtilPrepare.cpp
diff --git a/ndb/src/common/debugger/signaldata/UtilSequence.cpp b/storage/ndb/src/common/debugger/signaldata/UtilSequence.cpp
index e91999d9abf..e91999d9abf 100644
--- a/ndb/src/common/debugger/signaldata/UtilSequence.cpp
+++ b/storage/ndb/src/common/debugger/signaldata/UtilSequence.cpp
diff --git a/ndb/src/common/debugger/signaldata/print.awk b/storage/ndb/src/common/debugger/signaldata/print.awk
index 9730fb4a236..9730fb4a236 100644
--- a/ndb/src/common/debugger/signaldata/print.awk
+++ b/storage/ndb/src/common/debugger/signaldata/print.awk
diff --git a/ndb/src/common/logger/ConsoleLogHandler.cpp b/storage/ndb/src/common/logger/ConsoleLogHandler.cpp
index 94367d2fc45..94367d2fc45 100644
--- a/ndb/src/common/logger/ConsoleLogHandler.cpp
+++ b/storage/ndb/src/common/logger/ConsoleLogHandler.cpp
diff --git a/ndb/src/common/logger/FileLogHandler.cpp b/storage/ndb/src/common/logger/FileLogHandler.cpp
index 8678b999b6f..8678b999b6f 100644
--- a/ndb/src/common/logger/FileLogHandler.cpp
+++ b/storage/ndb/src/common/logger/FileLogHandler.cpp
diff --git a/ndb/src/common/logger/LogHandler.cpp b/storage/ndb/src/common/logger/LogHandler.cpp
index ec4137297f1..ec4137297f1 100644
--- a/ndb/src/common/logger/LogHandler.cpp
+++ b/storage/ndb/src/common/logger/LogHandler.cpp
diff --git a/ndb/src/common/logger/LogHandlerList.cpp b/storage/ndb/src/common/logger/LogHandlerList.cpp
index 62495d7566b..62495d7566b 100644
--- a/ndb/src/common/logger/LogHandlerList.cpp
+++ b/storage/ndb/src/common/logger/LogHandlerList.cpp
diff --git a/ndb/src/common/logger/LogHandlerList.hpp b/storage/ndb/src/common/logger/LogHandlerList.hpp
index 21344023560..21344023560 100644
--- a/ndb/src/common/logger/LogHandlerList.hpp
+++ b/storage/ndb/src/common/logger/LogHandlerList.hpp
diff --git a/ndb/src/common/logger/Logger.cpp b/storage/ndb/src/common/logger/Logger.cpp
index 4a48236053d..4a48236053d 100644
--- a/ndb/src/common/logger/Logger.cpp
+++ b/storage/ndb/src/common/logger/Logger.cpp
diff --git a/storage/ndb/src/common/logger/Makefile.am b/storage/ndb/src/common/logger/Makefile.am
new file mode 100644
index 00000000000..8a26d4258f1
--- /dev/null
+++ b/storage/ndb/src/common/logger/Makefile.am
@@ -0,0 +1,25 @@
+
+noinst_LTLIBRARIES = liblogger.la
+
+SOURCE_WIN = Logger.cpp LogHandlerList.cpp LogHandler.cpp \
+           ConsoleLogHandler.cpp FileLogHandler.cpp
+liblogger_la_SOURCES = $(SOURCE_WIN) SysLogHandler.cpp
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+windoze-dsp: liblogger.dsp
+
+liblogger.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(SOURCE_WIN)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/common/logger/SysLogHandler.cpp b/storage/ndb/src/common/logger/SysLogHandler.cpp
index 5b1b8d85ca7..5b1b8d85ca7 100644
--- a/ndb/src/common/logger/SysLogHandler.cpp
+++ b/storage/ndb/src/common/logger/SysLogHandler.cpp
diff --git a/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp b/storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp
index 7de9ee46479..7de9ee46479 100644
--- a/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp
+++ b/storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp
diff --git a/ndb/src/common/logger/listtest/LogHandlerListUnitTest.hpp b/storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.hpp
index e98a2722b8d..e98a2722b8d 100644
--- a/ndb/src/common/logger/listtest/LogHandlerListUnitTest.hpp
+++ b/storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.hpp
diff --git a/ndb/src/common/logger/listtest/Makefile b/storage/ndb/src/common/logger/listtest/Makefile
index 4688a5e5a2f..4688a5e5a2f 100644
--- a/ndb/src/common/logger/listtest/Makefile
+++ b/storage/ndb/src/common/logger/listtest/Makefile
diff --git a/ndb/src/common/logger/loggertest/LoggerUnitTest.cpp b/storage/ndb/src/common/logger/loggertest/LoggerUnitTest.cpp
index 990d2e0eada..990d2e0eada 100644
--- a/ndb/src/common/logger/loggertest/LoggerUnitTest.cpp
+++ b/storage/ndb/src/common/logger/loggertest/LoggerUnitTest.cpp
diff --git a/ndb/src/common/logger/loggertest/LoggerUnitTest.hpp b/storage/ndb/src/common/logger/loggertest/LoggerUnitTest.hpp
index 79f560750d5..79f560750d5 100644
--- a/ndb/src/common/logger/loggertest/LoggerUnitTest.hpp
+++ b/storage/ndb/src/common/logger/loggertest/LoggerUnitTest.hpp
diff --git a/ndb/src/common/logger/loggertest/Makefile b/storage/ndb/src/common/logger/loggertest/Makefile
index 0aef0ca2bce..0aef0ca2bce 100644
--- a/ndb/src/common/logger/loggertest/Makefile
+++ b/storage/ndb/src/common/logger/loggertest/Makefile
diff --git a/ndb/src/common/mgmcommon/ConfigRetriever.cpp b/storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp
index 0e9b2a83e2f..0e9b2a83e2f 100644
--- a/ndb/src/common/mgmcommon/ConfigRetriever.cpp
+++ b/storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp
diff --git a/ndb/src/common/mgmcommon/IPCConfig.cpp b/storage/ndb/src/common/mgmcommon/IPCConfig.cpp
index f935f8ffab4..f935f8ffab4 100644
--- a/ndb/src/common/mgmcommon/IPCConfig.cpp
+++ b/storage/ndb/src/common/mgmcommon/IPCConfig.cpp
diff --git a/storage/ndb/src/common/mgmcommon/Makefile.am b/storage/ndb/src/common/mgmcommon/Makefile.am
new file mode 100644
index 00000000000..0540ef012b8
--- /dev/null
+++ b/storage/ndb/src/common/mgmcommon/Makefile.am
@@ -0,0 +1,28 @@
+noinst_LTLIBRARIES = libmgmsrvcommon.la
+
+libmgmsrvcommon_la_SOURCES = \
+	ConfigRetriever.cpp \
+	IPCConfig.cpp
+
+INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/mgmapi -I$(top_srcdir)/storage/ndb/src/mgmsrv
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
+include $(top_srcdir)/storage/ndb/config/type_mgmapiclient.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: libmgmsrvcommon.dsp
+
+libmgmsrvcommon.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libmgmsrvcommon_la_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/common/mgmcommon/printConfig/Makefile b/storage/ndb/src/common/mgmcommon/printConfig/Makefile
index 77e8943e2c6..77e8943e2c6 100644
--- a/ndb/src/common/mgmcommon/printConfig/Makefile
+++ b/storage/ndb/src/common/mgmcommon/printConfig/Makefile
diff --git a/ndb/src/common/mgmcommon/printConfig/printConfig.cpp b/storage/ndb/src/common/mgmcommon/printConfig/printConfig.cpp
index 7cedbb451e2..7cedbb451e2 100644
--- a/ndb/src/common/mgmcommon/printConfig/printConfig.cpp
+++ b/storage/ndb/src/common/mgmcommon/printConfig/printConfig.cpp
diff --git a/storage/ndb/src/common/portlib/Makefile.am b/storage/ndb/src/common/portlib/Makefile.am
new file mode 100644
index 00000000000..cdefa46af50
--- /dev/null
+++ b/storage/ndb/src/common/portlib/Makefile.am
@@ -0,0 +1,43 @@
+noinst_HEADERS = gcc.cpp
+
+noinst_LTLIBRARIES = libportlib.la
+
+libportlib_la_SOURCES = \
+	NdbCondition.c NdbMutex.c NdbSleep.c NdbTick.c \
+	NdbEnv.c NdbThread.c NdbHost.c NdbTCP.cpp	    \
+	NdbDaemon.c NdbMem.c \
+	NdbConfig.c
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_util.mk.am
+
+EXTRA_PROGRAMS = memtest PortLibTest munmaptest
+
+PortLibTest_SOURCES = NdbPortLibTest.cpp
+munmaptest_SOURCES = munmaptest.cpp
+
+# Don't update the files from bitkeeper
+WIN_src = win32/NdbCondition.c \
+              win32/NdbDaemon.c \
+              win32/NdbEnv.c \
+              win32/NdbHost.c \
+              win32/NdbMem.c \
+              win32/NdbMutex.c \
+              win32/NdbSleep.c \
+              win32/NdbTCP.c \
+              win32/NdbThread.c \
+              win32/NdbTick.c
+
+windoze-dsp: libportlib.dsp
+
+libportlib.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(WIN_src)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/common/portlib/NdbCondition.c b/storage/ndb/src/common/portlib/NdbCondition.c
index df312c7cc24..df312c7cc24 100644
--- a/ndb/src/common/portlib/NdbCondition.c
+++ b/storage/ndb/src/common/portlib/NdbCondition.c
diff --git a/ndb/src/common/portlib/NdbConfig.c b/storage/ndb/src/common/portlib/NdbConfig.c
index b275143646f..b275143646f 100644
--- a/ndb/src/common/portlib/NdbConfig.c
+++ b/storage/ndb/src/common/portlib/NdbConfig.c
diff --git a/ndb/src/common/portlib/NdbDaemon.c b/storage/ndb/src/common/portlib/NdbDaemon.c
index 3f1c1998501..3f1c1998501 100644
--- a/ndb/src/common/portlib/NdbDaemon.c
+++ b/storage/ndb/src/common/portlib/NdbDaemon.c
diff --git a/ndb/src/common/portlib/NdbEnv.c b/storage/ndb/src/common/portlib/NdbEnv.c
index d294e0b52ca..d294e0b52ca 100644
--- a/ndb/src/common/portlib/NdbEnv.c
+++ b/storage/ndb/src/common/portlib/NdbEnv.c
diff --git a/ndb/src/common/portlib/NdbHost.c b/storage/ndb/src/common/portlib/NdbHost.c
index 4749bb39ea7..4749bb39ea7 100644
--- a/ndb/src/common/portlib/NdbHost.c
+++ b/storage/ndb/src/common/portlib/NdbHost.c
diff --git a/ndb/src/common/portlib/NdbMem.c b/storage/ndb/src/common/portlib/NdbMem.c
index f964f4d9937..f964f4d9937 100644
--- a/ndb/src/common/portlib/NdbMem.c
+++ b/storage/ndb/src/common/portlib/NdbMem.c
diff --git a/ndb/src/common/portlib/NdbMutex.c b/storage/ndb/src/common/portlib/NdbMutex.c
index d3d39ea8cf7..d3d39ea8cf7 100644
--- a/ndb/src/common/portlib/NdbMutex.c
+++ b/storage/ndb/src/common/portlib/NdbMutex.c
diff --git a/ndb/src/common/portlib/NdbPortLibTest.cpp b/storage/ndb/src/common/portlib/NdbPortLibTest.cpp
index d7892411851..d7892411851 100644
--- a/ndb/src/common/portlib/NdbPortLibTest.cpp
+++ b/storage/ndb/src/common/portlib/NdbPortLibTest.cpp
diff --git a/ndb/src/common/portlib/NdbSleep.c b/storage/ndb/src/common/portlib/NdbSleep.c
index 44bafe98a37..44bafe98a37 100644
--- a/ndb/src/common/portlib/NdbSleep.c
+++ b/storage/ndb/src/common/portlib/NdbSleep.c
diff --git a/ndb/src/common/portlib/NdbTCP.cpp b/storage/ndb/src/common/portlib/NdbTCP.cpp
index a63f5a7ba27..a63f5a7ba27 100644
--- a/ndb/src/common/portlib/NdbTCP.cpp
+++ b/storage/ndb/src/common/portlib/NdbTCP.cpp
diff --git a/ndb/src/common/portlib/NdbThread.c b/storage/ndb/src/common/portlib/NdbThread.c
index aaee9b45069..aaee9b45069 100644
--- a/ndb/src/common/portlib/NdbThread.c
+++ b/storage/ndb/src/common/portlib/NdbThread.c
diff --git a/ndb/src/common/portlib/NdbTick.c b/storage/ndb/src/common/portlib/NdbTick.c
index d8f0b6ec27a..d8f0b6ec27a 100644
--- a/ndb/src/common/portlib/NdbTick.c
+++ b/storage/ndb/src/common/portlib/NdbTick.c
diff --git a/ndb/src/common/portlib/gcc.cpp b/storage/ndb/src/common/portlib/gcc.cpp
index 4e49d787d3c..4e49d787d3c 100644
--- a/ndb/src/common/portlib/gcc.cpp
+++ b/storage/ndb/src/common/portlib/gcc.cpp
diff --git a/ndb/src/common/portlib/memtest.c b/storage/ndb/src/common/portlib/memtest.c
index 673f23fa803..673f23fa803 100644
--- a/ndb/src/common/portlib/memtest.c
+++ b/storage/ndb/src/common/portlib/memtest.c
diff --git a/ndb/src/common/portlib/mmslist.cpp b/storage/ndb/src/common/portlib/mmslist.cpp
index 05538785293..05538785293 100644
--- a/ndb/src/common/portlib/mmslist.cpp
+++ b/storage/ndb/src/common/portlib/mmslist.cpp
diff --git a/ndb/src/common/portlib/mmstest.cpp b/storage/ndb/src/common/portlib/mmstest.cpp
index 9cc7d810985..9cc7d810985 100644
--- a/ndb/src/common/portlib/mmstest.cpp
+++ b/storage/ndb/src/common/portlib/mmstest.cpp
diff --git a/ndb/src/common/portlib/munmaptest.cpp b/storage/ndb/src/common/portlib/munmaptest.cpp
index b1d84131810..b1d84131810 100644
--- a/ndb/src/common/portlib/munmaptest.cpp
+++ b/storage/ndb/src/common/portlib/munmaptest.cpp
diff --git a/ndb/src/common/portlib/old_dirs/memtest/Makefile b/storage/ndb/src/common/portlib/old_dirs/memtest/Makefile
index 716cdbdea82..716cdbdea82 100644
--- a/ndb/src/common/portlib/old_dirs/memtest/Makefile
+++ b/storage/ndb/src/common/portlib/old_dirs/memtest/Makefile
diff --git a/ndb/src/common/portlib/old_dirs/memtest/munmaptest/Makefile b/storage/ndb/src/common/portlib/old_dirs/memtest/munmaptest/Makefile
index ea8c5238d1c..ea8c5238d1c 100644
--- a/ndb/src/common/portlib/old_dirs/memtest/munmaptest/Makefile
+++ b/storage/ndb/src/common/portlib/old_dirs/memtest/munmaptest/Makefile
diff --git a/ndb/src/common/portlib/old_dirs/ose/Makefile b/storage/ndb/src/common/portlib/old_dirs/ose/Makefile
index 4ef93b7824a..4ef93b7824a 100644
--- a/ndb/src/common/portlib/old_dirs/ose/Makefile
+++ b/storage/ndb/src/common/portlib/old_dirs/ose/Makefile
diff --git a/ndb/src/common/portlib/old_dirs/ose/NdbCondition.c b/storage/ndb/src/common/portlib/old_dirs/ose/NdbCondition.c
index 73a2dbc5d66..73a2dbc5d66 100644
--- a/ndb/src/common/portlib/old_dirs/ose/NdbCondition.c
+++ b/storage/ndb/src/common/portlib/old_dirs/ose/NdbCondition.c
diff --git a/ndb/src/common/portlib/old_dirs/ose/NdbConditionOSE.h b/storage/ndb/src/common/portlib/old_dirs/ose/NdbConditionOSE.h
index bd0306261cc..bd0306261cc 100644
--- a/ndb/src/common/portlib/old_dirs/ose/NdbConditionOSE.h
+++ b/storage/ndb/src/common/portlib/old_dirs/ose/NdbConditionOSE.h
diff --git a/ndb/src/common/portlib/old_dirs/ose/NdbEnv.c b/storage/ndb/src/common/portlib/old_dirs/ose/NdbEnv.c
index e2ac4d879d2..e2ac4d879d2 100644
--- a/ndb/src/common/portlib/old_dirs/ose/NdbEnv.c
+++ b/storage/ndb/src/common/portlib/old_dirs/ose/NdbEnv.c
diff --git a/ndb/src/common/portlib/old_dirs/ose/NdbHost.c b/storage/ndb/src/common/portlib/old_dirs/ose/NdbHost.c
index f5e1e511c16..f5e1e511c16 100644
--- a/ndb/src/common/portlib/old_dirs/ose/NdbHost.c
+++ b/storage/ndb/src/common/portlib/old_dirs/ose/NdbHost.c
diff --git a/ndb/src/common/portlib/old_dirs/ose/NdbMem.c b/storage/ndb/src/common/portlib/old_dirs/ose/NdbMem.c
index 0e38024bbb4..0e38024bbb4 100644
--- a/ndb/src/common/portlib/old_dirs/ose/NdbMem.c
+++ b/storage/ndb/src/common/portlib/old_dirs/ose/NdbMem.c
diff --git a/ndb/src/common/portlib/old_dirs/ose/NdbMem_SoftOse.cpp b/storage/ndb/src/common/portlib/old_dirs/ose/NdbMem_SoftOse.cpp
index cad22c0474b..cad22c0474b 100644
--- a/ndb/src/common/portlib/old_dirs/ose/NdbMem_SoftOse.cpp
+++ b/storage/ndb/src/common/portlib/old_dirs/ose/NdbMem_SoftOse.cpp
diff --git a/ndb/src/common/portlib/old_dirs/ose/NdbMutex.c b/storage/ndb/src/common/portlib/old_dirs/ose/NdbMutex.c
index 253c0e412ff..253c0e412ff 100644
--- a/ndb/src/common/portlib/old_dirs/ose/NdbMutex.c
+++ b/storage/ndb/src/common/portlib/old_dirs/ose/NdbMutex.c
diff --git a/ndb/src/common/portlib/old_dirs/ose/NdbOut.cpp b/storage/ndb/src/common/portlib/old_dirs/ose/NdbOut.cpp
index eb81bc9d971..eb81bc9d971 100644
--- a/ndb/src/common/portlib/old_dirs/ose/NdbOut.cpp
+++ b/storage/ndb/src/common/portlib/old_dirs/ose/NdbOut.cpp
diff --git a/ndb/src/common/portlib/old_dirs/ose/NdbSleep.c b/storage/ndb/src/common/portlib/old_dirs/ose/NdbSleep.c
index 70fd83117ef..70fd83117ef 100644
--- a/ndb/src/common/portlib/old_dirs/ose/NdbSleep.c
+++ b/storage/ndb/src/common/portlib/old_dirs/ose/NdbSleep.c
diff --git a/ndb/src/common/portlib/old_dirs/ose/NdbTCP.c b/storage/ndb/src/common/portlib/old_dirs/ose/NdbTCP.c
index 9994697b3f8..9994697b3f8 100644
--- a/ndb/src/common/portlib/old_dirs/ose/NdbTCP.c
+++ b/storage/ndb/src/common/portlib/old_dirs/ose/NdbTCP.c
diff --git a/ndb/src/common/portlib/old_dirs/ose/NdbThread.c b/storage/ndb/src/common/portlib/old_dirs/ose/NdbThread.c
index e46903a5cce..e46903a5cce 100644
--- a/ndb/src/common/portlib/old_dirs/ose/NdbThread.c
+++ b/storage/ndb/src/common/portlib/old_dirs/ose/NdbThread.c
diff --git a/ndb/src/common/portlib/old_dirs/ose/NdbTick.c b/storage/ndb/src/common/portlib/old_dirs/ose/NdbTick.c
index c3deae2bec3..c3deae2bec3 100644
--- a/ndb/src/common/portlib/old_dirs/ose/NdbTick.c
+++ b/storage/ndb/src/common/portlib/old_dirs/ose/NdbTick.c
diff --git a/ndb/src/common/portlib/old_dirs/test/Makefile b/storage/ndb/src/common/portlib/old_dirs/test/Makefile
index 4edc98ede75..4edc98ede75 100644
--- a/ndb/src/common/portlib/old_dirs/test/Makefile
+++ b/storage/ndb/src/common/portlib/old_dirs/test/Makefile
diff --git a/ndb/src/common/portlib/old_dirs/win32/Makefile b/storage/ndb/src/common/portlib/old_dirs/win32/Makefile
index bb29ac5547e..bb29ac5547e 100644
--- a/ndb/src/common/portlib/old_dirs/win32/Makefile
+++ b/storage/ndb/src/common/portlib/old_dirs/win32/Makefile
diff --git a/ndb/src/common/portlib/old_dirs/win32/NdbCondition.c b/storage/ndb/src/common/portlib/old_dirs/win32/NdbCondition.c
index 77869b673de..77869b673de 100644
--- a/ndb/src/common/portlib/old_dirs/win32/NdbCondition.c
+++ b/storage/ndb/src/common/portlib/old_dirs/win32/NdbCondition.c
diff --git a/ndb/src/common/portlib/old_dirs/win32/NdbDaemon.c b/storage/ndb/src/common/portlib/old_dirs/win32/NdbDaemon.c
index 972fb1b88d8..972fb1b88d8 100644
--- a/ndb/src/common/portlib/old_dirs/win32/NdbDaemon.c
+++ b/storage/ndb/src/common/portlib/old_dirs/win32/NdbDaemon.c
diff --git a/ndb/src/common/portlib/old_dirs/win32/NdbEnv.c b/storage/ndb/src/common/portlib/old_dirs/win32/NdbEnv.c
index 0df703a5e97..0df703a5e97 100644
--- a/ndb/src/common/portlib/old_dirs/win32/NdbEnv.c
+++ b/storage/ndb/src/common/portlib/old_dirs/win32/NdbEnv.c
diff --git a/ndb/src/common/portlib/old_dirs/win32/NdbHost.c b/storage/ndb/src/common/portlib/old_dirs/win32/NdbHost.c
index f91dd1a531c..f91dd1a531c 100644
--- a/ndb/src/common/portlib/old_dirs/win32/NdbHost.c
+++ b/storage/ndb/src/common/portlib/old_dirs/win32/NdbHost.c
diff --git a/ndb/src/common/portlib/old_dirs/win32/NdbMem.c b/storage/ndb/src/common/portlib/old_dirs/win32/NdbMem.c
index ab7123b0a29..ab7123b0a29 100644
--- a/ndb/src/common/portlib/old_dirs/win32/NdbMem.c
+++ b/storage/ndb/src/common/portlib/old_dirs/win32/NdbMem.c
diff --git a/ndb/src/common/portlib/old_dirs/win32/NdbMutex.c b/storage/ndb/src/common/portlib/old_dirs/win32/NdbMutex.c
index e797024d5bb..e797024d5bb 100644
--- a/ndb/src/common/portlib/old_dirs/win32/NdbMutex.c
+++ b/storage/ndb/src/common/portlib/old_dirs/win32/NdbMutex.c
diff --git a/ndb/src/common/portlib/old_dirs/win32/NdbSleep.c b/storage/ndb/src/common/portlib/old_dirs/win32/NdbSleep.c
index ac0f44dd07f..ac0f44dd07f 100644
--- a/ndb/src/common/portlib/old_dirs/win32/NdbSleep.c
+++ b/storage/ndb/src/common/portlib/old_dirs/win32/NdbSleep.c
diff --git a/ndb/src/common/portlib/old_dirs/win32/NdbTCP.c b/storage/ndb/src/common/portlib/old_dirs/win32/NdbTCP.c
index 483a53bd606..483a53bd606 100644
--- a/ndb/src/common/portlib/old_dirs/win32/NdbTCP.c
+++ b/storage/ndb/src/common/portlib/old_dirs/win32/NdbTCP.c
diff --git a/ndb/src/common/portlib/old_dirs/win32/NdbThread.c b/storage/ndb/src/common/portlib/old_dirs/win32/NdbThread.c
index 1f052f034e8..1f052f034e8 100644
--- a/ndb/src/common/portlib/old_dirs/win32/NdbThread.c
+++ b/storage/ndb/src/common/portlib/old_dirs/win32/NdbThread.c
diff --git a/ndb/src/common/portlib/old_dirs/win32/NdbTick.c b/storage/ndb/src/common/portlib/old_dirs/win32/NdbTick.c
index e3a67d8437d..e3a67d8437d 100644
--- a/ndb/src/common/portlib/old_dirs/win32/NdbTick.c
+++ b/storage/ndb/src/common/portlib/old_dirs/win32/NdbTick.c
diff --git a/ndb/src/common/portlib/win32/NdbCondition.c b/storage/ndb/src/common/portlib/win32/NdbCondition.c
index 4046db1d60a..4046db1d60a 100644
--- a/ndb/src/common/portlib/win32/NdbCondition.c
+++ b/storage/ndb/src/common/portlib/win32/NdbCondition.c
diff --git a/ndb/src/common/portlib/win32/NdbDaemon.c b/storage/ndb/src/common/portlib/win32/NdbDaemon.c
index b96d4c20260..b96d4c20260 100644
--- a/ndb/src/common/portlib/win32/NdbDaemon.c
+++ b/storage/ndb/src/common/portlib/win32/NdbDaemon.c
diff --git a/ndb/src/common/portlib/win32/NdbEnv.c b/storage/ndb/src/common/portlib/win32/NdbEnv.c
index f42e685fe15..f42e685fe15 100644
--- a/ndb/src/common/portlib/win32/NdbEnv.c
+++ b/storage/ndb/src/common/portlib/win32/NdbEnv.c
diff --git a/ndb/src/common/portlib/win32/NdbHost.c b/storage/ndb/src/common/portlib/win32/NdbHost.c
index 7df96c45991..7df96c45991 100644
--- a/ndb/src/common/portlib/win32/NdbHost.c
+++ b/storage/ndb/src/common/portlib/win32/NdbHost.c
diff --git a/ndb/src/common/portlib/win32/NdbMem.c b/storage/ndb/src/common/portlib/win32/NdbMem.c
index 313ca9dff66..313ca9dff66 100644
--- a/ndb/src/common/portlib/win32/NdbMem.c
+++ b/storage/ndb/src/common/portlib/win32/NdbMem.c
diff --git a/ndb/src/common/portlib/win32/NdbMutex.c b/storage/ndb/src/common/portlib/win32/NdbMutex.c
index e6d1f081e9a..e6d1f081e9a 100644
--- a/ndb/src/common/portlib/win32/NdbMutex.c
+++ b/storage/ndb/src/common/portlib/win32/NdbMutex.c
diff --git a/ndb/src/common/portlib/win32/NdbSleep.c b/storage/ndb/src/common/portlib/win32/NdbSleep.c
index 8f5bdc49acd..8f5bdc49acd 100644
--- a/ndb/src/common/portlib/win32/NdbSleep.c
+++ b/storage/ndb/src/common/portlib/win32/NdbSleep.c
diff --git a/ndb/src/common/portlib/win32/NdbTCP.c b/storage/ndb/src/common/portlib/win32/NdbTCP.c
index b936cd2db6c..b936cd2db6c 100644
--- a/ndb/src/common/portlib/win32/NdbTCP.c
+++ b/storage/ndb/src/common/portlib/win32/NdbTCP.c
diff --git a/ndb/src/common/portlib/win32/NdbThread.c b/storage/ndb/src/common/portlib/win32/NdbThread.c
index 98db0d5c287..98db0d5c287 100644
--- a/ndb/src/common/portlib/win32/NdbThread.c
+++ b/storage/ndb/src/common/portlib/win32/NdbThread.c
diff --git a/ndb/src/common/portlib/win32/NdbTick.c b/storage/ndb/src/common/portlib/win32/NdbTick.c
index 4430cbf419b..4430cbf419b 100644
--- a/ndb/src/common/portlib/win32/NdbTick.c
+++ b/storage/ndb/src/common/portlib/win32/NdbTick.c
diff --git a/storage/ndb/src/common/transporter/Makefile.am b/storage/ndb/src/common/transporter/Makefile.am
new file mode 100644
index 00000000000..bf7b64af186
--- /dev/null
+++ b/storage/ndb/src/common/transporter/Makefile.am
@@ -0,0 +1,36 @@
+
+noinst_LTLIBRARIES = libtransporter.la
+
+libtransporter_la_SOURCES = \
+	Transporter.cpp \
+	SendBuffer.cpp   \
+	TCP_Transporter.cpp \
+	TransporterRegistry.cpp \
+        Packer.cpp
+
+EXTRA_libtransporter_la_SOURCES = SHM_Transporter.cpp SHM_Transporter.unix.cpp SCI_Transporter.cpp
+
+libtransporter_la_LIBADD = @ndb_transporter_opt_objs@
+libtransporter_la_DEPENDENCIES = @ndb_transporter_opt_objs@
+
+INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/include/mgmapi -I$(top_srcdir)/storage/ndb/src/mgmapi -I$(top_srcdir)/storage/ndb/include/debugger -I$(top_srcdir)/storage/ndb/include/kernel -I$(top_srcdir)/storage/ndb/include/transporter @NDB_SCI_INCLUDES@
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_util.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: libtransporter.dsp
+
+libtransporter.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libtransporter_la_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/common/transporter/OSE_Receiver.cpp b/storage/ndb/src/common/transporter/OSE_Receiver.cpp
index 63a33fc8f24..63a33fc8f24 100644
--- a/ndb/src/common/transporter/OSE_Receiver.cpp
+++ b/storage/ndb/src/common/transporter/OSE_Receiver.cpp
diff --git a/ndb/src/common/transporter/OSE_Receiver.hpp b/storage/ndb/src/common/transporter/OSE_Receiver.hpp
index 1812ab51065..1812ab51065 100644
--- a/ndb/src/common/transporter/OSE_Receiver.hpp
+++ b/storage/ndb/src/common/transporter/OSE_Receiver.hpp
diff --git a/ndb/src/common/transporter/OSE_Signals.hpp b/storage/ndb/src/common/transporter/OSE_Signals.hpp
index 3f6cc07b473..3f6cc07b473 100644
--- a/ndb/src/common/transporter/OSE_Signals.hpp
+++ b/storage/ndb/src/common/transporter/OSE_Signals.hpp
diff --git a/ndb/src/common/transporter/OSE_Transporter.cpp b/storage/ndb/src/common/transporter/OSE_Transporter.cpp
index ad67791fc0c..ad67791fc0c 100644
--- a/ndb/src/common/transporter/OSE_Transporter.cpp
+++ b/storage/ndb/src/common/transporter/OSE_Transporter.cpp
diff --git a/ndb/src/common/transporter/OSE_Transporter.hpp b/storage/ndb/src/common/transporter/OSE_Transporter.hpp
index 898352366ba..898352366ba 100644
--- a/ndb/src/common/transporter/OSE_Transporter.hpp
+++ b/storage/ndb/src/common/transporter/OSE_Transporter.hpp
diff --git a/ndb/src/common/transporter/Packer.cpp b/storage/ndb/src/common/transporter/Packer.cpp
index bcfac8417bb..bcfac8417bb 100644
--- a/ndb/src/common/transporter/Packer.cpp
+++ b/storage/ndb/src/common/transporter/Packer.cpp
diff --git a/ndb/src/common/transporter/Packer.hpp b/storage/ndb/src/common/transporter/Packer.hpp
index 5c191203201..5c191203201 100644
--- a/ndb/src/common/transporter/Packer.hpp
+++ b/storage/ndb/src/common/transporter/Packer.hpp
diff --git a/ndb/src/common/transporter/SCI_Transporter.cpp b/storage/ndb/src/common/transporter/SCI_Transporter.cpp
index 1fe276249e5..1fe276249e5 100644
--- a/ndb/src/common/transporter/SCI_Transporter.cpp
+++ b/storage/ndb/src/common/transporter/SCI_Transporter.cpp
diff --git a/ndb/src/common/transporter/SCI_Transporter.hpp b/storage/ndb/src/common/transporter/SCI_Transporter.hpp
index cb42e437118..cb42e437118 100644
--- a/ndb/src/common/transporter/SCI_Transporter.hpp
+++ b/storage/ndb/src/common/transporter/SCI_Transporter.hpp
diff --git a/ndb/src/common/transporter/SHM_Buffer.hpp b/storage/ndb/src/common/transporter/SHM_Buffer.hpp
index 27321a3191f..27321a3191f 100644
--- a/ndb/src/common/transporter/SHM_Buffer.hpp
+++ b/storage/ndb/src/common/transporter/SHM_Buffer.hpp
diff --git a/ndb/src/common/transporter/SHM_Transporter.cpp b/storage/ndb/src/common/transporter/SHM_Transporter.cpp
index a225988d37f..a225988d37f 100644
--- a/ndb/src/common/transporter/SHM_Transporter.cpp
+++ b/storage/ndb/src/common/transporter/SHM_Transporter.cpp
diff --git a/ndb/src/common/transporter/SHM_Transporter.hpp b/storage/ndb/src/common/transporter/SHM_Transporter.hpp
index e7a76225471..e7a76225471 100644
--- a/ndb/src/common/transporter/SHM_Transporter.hpp
+++ b/storage/ndb/src/common/transporter/SHM_Transporter.hpp
diff --git a/ndb/src/common/transporter/SHM_Transporter.unix.cpp b/storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp
index 28882324fc0..28882324fc0 100644
--- a/ndb/src/common/transporter/SHM_Transporter.unix.cpp
+++ b/storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp
diff --git a/ndb/src/common/transporter/SHM_Transporter.win32.cpp b/storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp
index c289a85da0e..c289a85da0e 100644
--- a/ndb/src/common/transporter/SHM_Transporter.win32.cpp
+++ b/storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp
diff --git a/ndb/src/common/transporter/SendBuffer.cpp b/storage/ndb/src/common/transporter/SendBuffer.cpp
index 8f69eb4bd40..8f69eb4bd40 100644
--- a/ndb/src/common/transporter/SendBuffer.cpp
+++ b/storage/ndb/src/common/transporter/SendBuffer.cpp
diff --git a/ndb/src/common/transporter/SendBuffer.hpp b/storage/ndb/src/common/transporter/SendBuffer.hpp
index 7ebeb6d890e..7ebeb6d890e 100644
--- a/ndb/src/common/transporter/SendBuffer.hpp
+++ b/storage/ndb/src/common/transporter/SendBuffer.hpp
diff --git a/ndb/src/common/transporter/TCP_Transporter.cpp b/storage/ndb/src/common/transporter/TCP_Transporter.cpp
index 5db12d3985c..5db12d3985c 100644
--- a/ndb/src/common/transporter/TCP_Transporter.cpp
+++ b/storage/ndb/src/common/transporter/TCP_Transporter.cpp
diff --git a/ndb/src/common/transporter/TCP_Transporter.hpp b/storage/ndb/src/common/transporter/TCP_Transporter.hpp
index df4149531b4..df4149531b4 100644
--- a/ndb/src/common/transporter/TCP_Transporter.hpp
+++ b/storage/ndb/src/common/transporter/TCP_Transporter.hpp
diff --git a/ndb/src/common/transporter/Transporter.cpp b/storage/ndb/src/common/transporter/Transporter.cpp
index 124ed5f7241..124ed5f7241 100644
--- a/ndb/src/common/transporter/Transporter.cpp
+++ b/storage/ndb/src/common/transporter/Transporter.cpp
diff --git a/ndb/src/common/transporter/Transporter.hpp b/storage/ndb/src/common/transporter/Transporter.hpp
index 8c5e96226a3..8c5e96226a3 100644
--- a/ndb/src/common/transporter/Transporter.hpp
+++ b/storage/ndb/src/common/transporter/Transporter.hpp
diff --git a/ndb/src/common/transporter/TransporterInternalDefinitions.hpp b/storage/ndb/src/common/transporter/TransporterInternalDefinitions.hpp
index 624b495422f..624b495422f 100644
--- a/ndb/src/common/transporter/TransporterInternalDefinitions.hpp
+++ b/storage/ndb/src/common/transporter/TransporterInternalDefinitions.hpp
diff --git a/ndb/src/common/transporter/TransporterRegistry.cpp b/storage/ndb/src/common/transporter/TransporterRegistry.cpp
index 3776bce7452..3776bce7452 100644
--- a/ndb/src/common/transporter/TransporterRegistry.cpp
+++ b/storage/ndb/src/common/transporter/TransporterRegistry.cpp
diff --git a/ndb/src/common/transporter/basictest/Makefile b/storage/ndb/src/common/transporter/basictest/Makefile
index d86af360408..d86af360408 100644
--- a/ndb/src/common/transporter/basictest/Makefile
+++ b/storage/ndb/src/common/transporter/basictest/Makefile
diff --git a/ndb/src/common/transporter/basictest/basicTransporterTest.cpp b/storage/ndb/src/common/transporter/basictest/basicTransporterTest.cpp
index c0a437c4907..c0a437c4907 100644
--- a/ndb/src/common/transporter/basictest/basicTransporterTest.cpp
+++ b/storage/ndb/src/common/transporter/basictest/basicTransporterTest.cpp
diff --git a/ndb/src/common/transporter/buddy.cpp b/storage/ndb/src/common/transporter/buddy.cpp
index dc25e2dc66c..dc25e2dc66c 100644
--- a/ndb/src/common/transporter/buddy.cpp
+++ b/storage/ndb/src/common/transporter/buddy.cpp
diff --git a/ndb/src/common/transporter/buddy.hpp b/storage/ndb/src/common/transporter/buddy.hpp
index f720e9e61a1..f720e9e61a1 100644
--- a/ndb/src/common/transporter/buddy.hpp
+++ b/storage/ndb/src/common/transporter/buddy.hpp
diff --git a/ndb/src/common/transporter/failoverSCI/Makefile b/storage/ndb/src/common/transporter/failoverSCI/Makefile
index 1e3d5f4a4b7..1e3d5f4a4b7 100644
--- a/ndb/src/common/transporter/failoverSCI/Makefile
+++ b/storage/ndb/src/common/transporter/failoverSCI/Makefile
diff --git a/ndb/src/common/transporter/failoverSCI/failoverSCI.cpp b/storage/ndb/src/common/transporter/failoverSCI/failoverSCI.cpp
index 803029ee565..803029ee565 100644
--- a/ndb/src/common/transporter/failoverSCI/failoverSCI.cpp
+++ b/storage/ndb/src/common/transporter/failoverSCI/failoverSCI.cpp
diff --git a/ndb/src/common/transporter/perftest/Makefile b/storage/ndb/src/common/transporter/perftest/Makefile
index 01869e1acf9..01869e1acf9 100644
--- a/ndb/src/common/transporter/perftest/Makefile
+++ b/storage/ndb/src/common/transporter/perftest/Makefile
diff --git a/ndb/src/common/transporter/perftest/perfTransporterTest.cpp b/storage/ndb/src/common/transporter/perftest/perfTransporterTest.cpp
index 71df9f12a4c..71df9f12a4c 100644
--- a/ndb/src/common/transporter/perftest/perfTransporterTest.cpp
+++ b/storage/ndb/src/common/transporter/perftest/perfTransporterTest.cpp
diff --git a/ndb/src/common/transporter/priotest/Makefile b/storage/ndb/src/common/transporter/priotest/Makefile
index 483fc0f1f07..483fc0f1f07 100644
--- a/ndb/src/common/transporter/priotest/Makefile
+++ b/storage/ndb/src/common/transporter/priotest/Makefile
diff --git a/ndb/src/common/transporter/priotest/prioOSE/Makefile b/storage/ndb/src/common/transporter/priotest/prioOSE/Makefile
index 4df66fa35e0..4df66fa35e0 100644
--- a/ndb/src/common/transporter/priotest/prioOSE/Makefile
+++ b/storage/ndb/src/common/transporter/priotest/prioOSE/Makefile
diff --git a/ndb/src/common/transporter/priotest/prioSCI/Makefile b/storage/ndb/src/common/transporter/priotest/prioSCI/Makefile
index 7d403539bf3..7d403539bf3 100644
--- a/ndb/src/common/transporter/priotest/prioSCI/Makefile
+++ b/storage/ndb/src/common/transporter/priotest/prioSCI/Makefile
diff --git a/ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp b/storage/ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp
index 6218b764e09..6218b764e09 100644
--- a/ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp
+++ b/storage/ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp
diff --git a/ndb/src/common/transporter/priotest/prioSHM/Makefile b/storage/ndb/src/common/transporter/priotest/prioSHM/Makefile
index a827c6e3f1e..a827c6e3f1e 100644
--- a/ndb/src/common/transporter/priotest/prioSHM/Makefile
+++ b/storage/ndb/src/common/transporter/priotest/prioSHM/Makefile
diff --git a/ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp b/storage/ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp
index 4c1701a91e4..4c1701a91e4 100644
--- a/ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp
+++ b/storage/ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp
diff --git a/ndb/src/common/transporter/priotest/prioTCP/Makefile b/storage/ndb/src/common/transporter/priotest/prioTCP/Makefile
index 92abf3e7424..92abf3e7424 100644
--- a/ndb/src/common/transporter/priotest/prioTCP/Makefile
+++ b/storage/ndb/src/common/transporter/priotest/prioTCP/Makefile
diff --git a/ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp b/storage/ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp
index f993dd05ac8..f993dd05ac8 100644
--- a/ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp
+++ b/storage/ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp
diff --git a/ndb/src/common/transporter/priotest/prioTransporterTest.cpp b/storage/ndb/src/common/transporter/priotest/prioTransporterTest.cpp
index 6c5623a49a6..6c5623a49a6 100644
--- a/ndb/src/common/transporter/priotest/prioTransporterTest.cpp
+++ b/storage/ndb/src/common/transporter/priotest/prioTransporterTest.cpp
diff --git a/ndb/src/common/transporter/priotest/prioTransporterTest.hpp b/storage/ndb/src/common/transporter/priotest/prioTransporterTest.hpp
index 787a9f46433..787a9f46433 100644
--- a/ndb/src/common/transporter/priotest/prioTransporterTest.hpp
+++ b/storage/ndb/src/common/transporter/priotest/prioTransporterTest.hpp
diff --git a/ndb/src/common/util/Base64.cpp b/storage/ndb/src/common/util/Base64.cpp
index 3db911f481f..3db911f481f 100644
--- a/ndb/src/common/util/Base64.cpp
+++ b/storage/ndb/src/common/util/Base64.cpp
diff --git a/ndb/src/common/util/BaseString.cpp b/storage/ndb/src/common/util/BaseString.cpp
index dbff44c377d..dbff44c377d 100644
--- a/ndb/src/common/util/BaseString.cpp
+++ b/storage/ndb/src/common/util/BaseString.cpp
diff --git a/ndb/src/common/util/Bitmask.cpp b/storage/ndb/src/common/util/Bitmask.cpp
index 0aa39a37204..0aa39a37204 100644
--- a/ndb/src/common/util/Bitmask.cpp
+++ b/storage/ndb/src/common/util/Bitmask.cpp
diff --git a/ndb/src/common/util/ConfigValues.cpp b/storage/ndb/src/common/util/ConfigValues.cpp
index 5c4b17c73ca..5c4b17c73ca 100644
--- a/ndb/src/common/util/ConfigValues.cpp
+++ b/storage/ndb/src/common/util/ConfigValues.cpp
diff --git a/ndb/src/common/util/File.cpp b/storage/ndb/src/common/util/File.cpp
index e514ad8e122..e514ad8e122 100644
--- a/ndb/src/common/util/File.cpp
+++ b/storage/ndb/src/common/util/File.cpp
diff --git a/ndb/src/common/util/InputStream.cpp b/storage/ndb/src/common/util/InputStream.cpp
index 410e9a70e9c..410e9a70e9c 100644
--- a/ndb/src/common/util/InputStream.cpp
+++ b/storage/ndb/src/common/util/InputStream.cpp
diff --git a/storage/ndb/src/common/util/Makefile.am b/storage/ndb/src/common/util/Makefile.am
new file mode 100644
index 00000000000..7ba3ef941c5
--- /dev/null
+++ b/storage/ndb/src/common/util/Makefile.am
@@ -0,0 +1,49 @@
+
+noinst_LTLIBRARIES = libgeneral.la
+
+libgeneral_la_SOURCES = \
+	    File.cpp md5_hash.cpp Properties.cpp socket_io.cpp \
+            SimpleProperties.cpp Parser.cpp InputStream.cpp \
+            SocketServer.cpp SocketClient.cpp SocketAuthenticator.cpp\
+	    OutputStream.cpp NdbOut.cpp BaseString.cpp Base64.cpp \
+	    NdbSqlUtil.cpp new.cpp \
+            uucode.c random.c version.c \
+            strdup.c \
+            ConfigValues.cpp ndb_init.c basestring_vsnprintf.c \
+            Bitmask.cpp
+
+EXTRA_PROGRAMS = testBitmask
+testBitmask_SOURCES =  testBitmask.cpp
+testBitmask_LDFLAGS = @ndb_bin_am_ldflags@ \
+  $(top_builddir)/storage/ndb/src/libndbclient.la \
+         $(top_builddir)/dbug/libdbug.a \
+         $(top_builddir)/mysys/libmysys.a \
+         $(top_builddir)/strings/libmystrings.a
+
+testBitmask.cpp : Bitmask.cpp
+	rm -f testBitmask.cpp
+	@LN_CP_F@ Bitmask.cpp testBitmask.cpp
+
+testBitmask.o:	$(testBitmask_SOURCES)
+		$(CXXCOMPILE) -c $(INCLUDES) -D__TEST_BITMASK__ $<
+
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_util.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: libgeneral.dsp
+
+libgeneral.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libgeneral_la_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/common/util/NdbErrHnd.cpp b/storage/ndb/src/common/util/NdbErrHnd.cpp
index 38a67f29853..38a67f29853 100644
--- a/ndb/src/common/util/NdbErrHnd.cpp
+++ b/storage/ndb/src/common/util/NdbErrHnd.cpp
diff --git a/ndb/src/common/util/NdbOut.cpp b/storage/ndb/src/common/util/NdbOut.cpp
index e20119a7987..e20119a7987 100644
--- a/ndb/src/common/util/NdbOut.cpp
+++ b/storage/ndb/src/common/util/NdbOut.cpp
diff --git a/ndb/src/common/util/NdbSqlUtil.cpp b/storage/ndb/src/common/util/NdbSqlUtil.cpp
index 09e150dbacf..09e150dbacf 100644
--- a/ndb/src/common/util/NdbSqlUtil.cpp
+++ b/storage/ndb/src/common/util/NdbSqlUtil.cpp
diff --git a/ndb/src/common/util/OutputStream.cpp b/storage/ndb/src/common/util/OutputStream.cpp
index a41eef649dd..a41eef649dd 100644
--- a/ndb/src/common/util/OutputStream.cpp
+++ b/storage/ndb/src/common/util/OutputStream.cpp
diff --git a/ndb/src/common/util/Parser.cpp b/storage/ndb/src/common/util/Parser.cpp
index dea128ccf66..dea128ccf66 100644
--- a/ndb/src/common/util/Parser.cpp
+++ b/storage/ndb/src/common/util/Parser.cpp
diff --git a/ndb/src/common/util/Properties.cpp b/storage/ndb/src/common/util/Properties.cpp
index 0edcda0e726..0edcda0e726 100644
--- a/ndb/src/common/util/Properties.cpp
+++ b/storage/ndb/src/common/util/Properties.cpp
diff --git a/ndb/src/common/util/SimpleProperties.cpp b/storage/ndb/src/common/util/SimpleProperties.cpp
index c25aaea491a..c25aaea491a 100644
--- a/ndb/src/common/util/SimpleProperties.cpp
+++ b/storage/ndb/src/common/util/SimpleProperties.cpp
diff --git a/ndb/src/common/util/SocketAuthenticator.cpp b/storage/ndb/src/common/util/SocketAuthenticator.cpp
index aed4db39231..aed4db39231 100644
--- a/ndb/src/common/util/SocketAuthenticator.cpp
+++ b/storage/ndb/src/common/util/SocketAuthenticator.cpp
diff --git a/ndb/src/common/util/SocketClient.cpp b/storage/ndb/src/common/util/SocketClient.cpp
index 38df1417eb8..38df1417eb8 100644
--- a/ndb/src/common/util/SocketClient.cpp
+++ b/storage/ndb/src/common/util/SocketClient.cpp
diff --git a/ndb/src/common/util/SocketServer.cpp b/storage/ndb/src/common/util/SocketServer.cpp
index 6019d24d736..6019d24d736 100644
--- a/ndb/src/common/util/SocketServer.cpp
+++ b/storage/ndb/src/common/util/SocketServer.cpp
diff --git a/ndb/src/common/util/basestring_vsnprintf.c b/storage/ndb/src/common/util/basestring_vsnprintf.c
index f5d01fb1532..f5d01fb1532 100644
--- a/ndb/src/common/util/basestring_vsnprintf.c
+++ b/storage/ndb/src/common/util/basestring_vsnprintf.c
diff --git a/ndb/src/common/util/filetest/FileUnitTest.cpp b/storage/ndb/src/common/util/filetest/FileUnitTest.cpp
index b6e7b7e8ec0..b6e7b7e8ec0 100644
--- a/ndb/src/common/util/filetest/FileUnitTest.cpp
+++ b/storage/ndb/src/common/util/filetest/FileUnitTest.cpp
diff --git a/ndb/src/common/util/filetest/FileUnitTest.hpp b/storage/ndb/src/common/util/filetest/FileUnitTest.hpp
index a589615e9b2..a589615e9b2 100644
--- a/ndb/src/common/util/filetest/FileUnitTest.hpp
+++ b/storage/ndb/src/common/util/filetest/FileUnitTest.hpp
diff --git a/ndb/src/common/util/filetest/Makefile b/storage/ndb/src/common/util/filetest/Makefile
index fe1842921f9..fe1842921f9 100644
--- a/ndb/src/common/util/filetest/Makefile
+++ b/storage/ndb/src/common/util/filetest/Makefile
diff --git a/ndb/src/common/util/getarg.cat3 b/storage/ndb/src/common/util/getarg.cat3
index 31685510537..31685510537 100644
--- a/ndb/src/common/util/getarg.cat3
+++ b/storage/ndb/src/common/util/getarg.cat3
diff --git a/ndb/src/common/util/md5_hash.cpp b/storage/ndb/src/common/util/md5_hash.cpp
index d4eedbc40fb..d4eedbc40fb 100644
--- a/ndb/src/common/util/md5_hash.cpp
+++ b/storage/ndb/src/common/util/md5_hash.cpp
diff --git a/ndb/src/common/util/ndb_init.c b/storage/ndb/src/common/util/ndb_init.c
index f3aa734d7f9..f3aa734d7f9 100644
--- a/ndb/src/common/util/ndb_init.c
+++ b/storage/ndb/src/common/util/ndb_init.c
diff --git a/ndb/src/common/util/new.cpp b/storage/ndb/src/common/util/new.cpp
index 643800f1582..643800f1582 100644
--- a/ndb/src/common/util/new.cpp
+++ b/storage/ndb/src/common/util/new.cpp
diff --git a/ndb/src/common/util/random.c b/storage/ndb/src/common/util/random.c
index 21235763793..21235763793 100644
--- a/ndb/src/common/util/random.c
+++ b/storage/ndb/src/common/util/random.c
diff --git a/ndb/src/common/util/socket_io.cpp b/storage/ndb/src/common/util/socket_io.cpp
index 83a546de773..83a546de773 100644
--- a/ndb/src/common/util/socket_io.cpp
+++ b/storage/ndb/src/common/util/socket_io.cpp
diff --git a/ndb/src/common/util/strdup.c b/storage/ndb/src/common/util/strdup.c
index d8f4d99bd28..d8f4d99bd28 100644
--- a/ndb/src/common/util/strdup.c
+++ b/storage/ndb/src/common/util/strdup.c
diff --git a/ndb/src/common/util/testConfigValues/Makefile b/storage/ndb/src/common/util/testConfigValues/Makefile
index 5b7400f5ee3..5b7400f5ee3 100644
--- a/ndb/src/common/util/testConfigValues/Makefile
+++ b/storage/ndb/src/common/util/testConfigValues/Makefile
diff --git a/ndb/src/common/util/testConfigValues/testConfigValues.cpp b/storage/ndb/src/common/util/testConfigValues/testConfigValues.cpp
index 362deb1ddad..362deb1ddad 100644
--- a/ndb/src/common/util/testConfigValues/testConfigValues.cpp
+++ b/storage/ndb/src/common/util/testConfigValues/testConfigValues.cpp
diff --git a/ndb/src/common/util/testProperties/Makefile b/storage/ndb/src/common/util/testProperties/Makefile
index 343c07a49e7..343c07a49e7 100644
--- a/ndb/src/common/util/testProperties/Makefile
+++ b/storage/ndb/src/common/util/testProperties/Makefile
diff --git a/ndb/src/common/util/testProperties/testProperties.cpp b/storage/ndb/src/common/util/testProperties/testProperties.cpp
index e445f7ca3e4..e445f7ca3e4 100644
--- a/ndb/src/common/util/testProperties/testProperties.cpp
+++ b/storage/ndb/src/common/util/testProperties/testProperties.cpp
diff --git a/ndb/src/common/util/testSimpleProperties/Makefile b/storage/ndb/src/common/util/testSimpleProperties/Makefile
index 89d33fa8dd8..89d33fa8dd8 100644
--- a/ndb/src/common/util/testSimpleProperties/Makefile
+++ b/storage/ndb/src/common/util/testSimpleProperties/Makefile
diff --git a/ndb/src/common/util/testSimpleProperties/sp_test.cpp b/storage/ndb/src/common/util/testSimpleProperties/sp_test.cpp
index d4052b64132..d4052b64132 100644
--- a/ndb/src/common/util/testSimpleProperties/sp_test.cpp
+++ b/storage/ndb/src/common/util/testSimpleProperties/sp_test.cpp
diff --git a/ndb/src/common/util/uucode.c b/storage/ndb/src/common/util/uucode.c
index da34d565153..da34d565153 100644
--- a/ndb/src/common/util/uucode.c
+++ b/storage/ndb/src/common/util/uucode.c
diff --git a/storage/ndb/src/common/util/version.c b/storage/ndb/src/common/util/version.c
new file mode 100644
index 00000000000..4eff039e1b5
--- /dev/null
+++ b/storage/ndb/src/common/util/version.c
@@ -0,0 +1,242 @@
+/* Copyright (C) 2003 MySQL AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+#include <ndb_global.h>
+#include <ndb_version.h>
+#include <version.h>
+#include <basestring_vsnprintf.h>
+#include <NdbEnv.h>
+#include <NdbOut.hpp>
+
+Uint32 getMajor(Uint32 version) {
+  return (version >> 16) & 0xFF;
+}
+
+Uint32 getMinor(Uint32 version) {
+  return (version >> 8) & 0xFF;
+}
+
+Uint32 getBuild(Uint32 version) {
+  return (version >> 0) & 0xFF;
+}
+
+Uint32 makeVersion(Uint32 major, Uint32 minor, Uint32 build) {
+  return MAKE_VERSION(major, minor, build);
+  
+}
+
+const char * getVersionString(Uint32 version, const char * status) {
+  char buff[100];
+  if (status && status[0] != 0)
+	  basestring_snprintf(buff, sizeof(buff),
+	     "Version %d.%d.%d (%s)",
+	     getMajor(version),
+	     getMinor(version),
+	     getBuild(version),
+	     status);
+  else
+    basestring_snprintf(buff, sizeof(buff),
+	     "Version %d.%d.%d",
+	     getMajor(version),
+	     getMinor(version),
+	     getBuild(version));
+  return strdup(buff);
+}
+
+typedef enum {
+  UG_Null,
+  UG_Range,
+  UG_Exact
+} UG_MatchType;
+
+struct NdbUpGradeCompatible {
+  Uint32 ownVersion;
+  Uint32 otherVersion;
+  UG_MatchType matchType;
+};
+
+/*#define TEST_VERSION*/
+
+#define HAVE_NDB_SETVERSION
+#ifdef HAVE_NDB_SETVERSION
+Uint32 ndbOwnVersionTesting = 0;
+void
+ndbSetOwnVersion() {
+  char buf[256];
+  if (NdbEnv_GetEnv("NDB_SETVERSION", buf, sizeof(buf))) {
+    Uint32 _v1,_v2,_v3;
+    if (sscanf(buf, "%u.%u.%u", &_v1, &_v2, &_v3) == 3) {
+      ndbOwnVersionTesting = MAKE_VERSION(_v1,_v2,_v3);
+      ndbout_c("Testing: Version set to 0x%x",  ndbOwnVersionTesting);
+    }
+  }
+}
+#else
+void ndbSetOwnVersion() {}
+#endif
+
+#ifndef TEST_VERSION
+struct NdbUpGradeCompatible ndbCompatibleTable_full[] = {
+  { MAKE_VERSION(5,1,NDB_VERSION_BUILD), MAKE_VERSION(5,1,0), UG_Range},
+  { MAKE_VERSION(5,0,8), MAKE_VERSION(5,0,3), UG_Range},
+  { MAKE_VERSION(5,0,3), MAKE_VERSION(5,0,2), UG_Exact },
+  { MAKE_VERSION(4,1,12), MAKE_VERSION(4,1,10), UG_Range },
+  { MAKE_VERSION(4,1,10), MAKE_VERSION(4,1,9), UG_Exact },
+  { MAKE_VERSION(4,1,9), MAKE_VERSION(4,1,8), UG_Exact },
+  { MAKE_VERSION(3,5,2), MAKE_VERSION(3,5,1), UG_Exact },
+  { 0, 0, UG_Null }
+};
+
+struct NdbUpGradeCompatible ndbCompatibleTable_upgrade[] = {
+  { MAKE_VERSION(5,0,2), MAKE_VERSION(4,1,8), UG_Exact },
+  { MAKE_VERSION(3,5,4), MAKE_VERSION(3,5,3), UG_Exact },
+  { 0, 0, UG_Null }
+};
+
+#else /* testing purposes */
+
+struct NdbUpGradeCompatible ndbCompatibleTable_full[] = {
+  { MAKE_VERSION(4,1,5), MAKE_VERSION(4,1,0), UG_Range },
+  { MAKE_VERSION(3,6,9), MAKE_VERSION(3,6,1), UG_Range },
+  { MAKE_VERSION(3,6,2), MAKE_VERSION(3,6,1), UG_Range },
+  { MAKE_VERSION(3,5,7), MAKE_VERSION(3,5,0), UG_Range },
+  { MAKE_VERSION(3,5,1), MAKE_VERSION(3,5,0), UG_Range },
+  { NDB_VERSION_D      , MAKE_VERSION(NDB_VERSION_MAJOR,NDB_VERSION_MINOR,2), UG_Range },
+  { 0, 0, UG_Null }
+};
+
+struct NdbUpGradeCompatible ndbCompatibleTable_upgrade[] = {
+  { MAKE_VERSION(4,1,5), MAKE_VERSION(3,6,9), UG_Exact },
+  { MAKE_VERSION(3,6,2), MAKE_VERSION(3,5,7), UG_Exact },
+  { MAKE_VERSION(3,5,1), NDB_VERSION_D      , UG_Exact },
+  { 0, 0, UG_Null }
+};
+
+
+#endif
+
+void ndbPrintVersion()
+{
+  printf("Version: %u.%u.%u\n",
+	 getMajor(ndbGetOwnVersion()),
+	 getMinor(ndbGetOwnVersion()),
+	 getBuild(ndbGetOwnVersion()));
+}
+
+Uint32
+ndbGetOwnVersion()
+{
+#ifdef HAVE_NDB_SETVERSION
+  if (ndbOwnVersionTesting == 0)
+    return NDB_VERSION_D;
+  else
+    return ndbOwnVersionTesting;
+#else
+  return NDB_VERSION_D;
+#endif
+}
+
+int
+ndbSearchUpgradeCompatibleTable(Uint32 ownVersion, Uint32 otherVersion,
+				struct NdbUpGradeCompatible table[])
+{
+  int i;
+  for (i = 0; table[i].ownVersion != 0 && table[i].otherVersion != 0; i++) {
+    if (table[i].ownVersion == ownVersion ||
+	table[i].ownVersion == (Uint32) ~0) {
+      switch (table[i].matchType) {
+      case UG_Range:
+	if (otherVersion >= table[i].otherVersion){
+	  return 1;
+	}
+	break;
+      case UG_Exact:
+	if (otherVersion == table[i].otherVersion){
+	  return 1;
+	}
+	break;
+      default:
+	break;
+      }
+    }
+  }
+  return 0;
+}
+
+int
+ndbCompatible(Uint32 ownVersion, Uint32 otherVersion, struct NdbUpGradeCompatible table[])
+{
+  if (otherVersion >= ownVersion) {
+    return 1;
+  }
+  return ndbSearchUpgradeCompatibleTable(ownVersion, otherVersion, table);
+}
+
+int
+ndbCompatible_full(Uint32 ownVersion, Uint32 otherVersion)
+{
+  return ndbCompatible(ownVersion, otherVersion, ndbCompatibleTable_full);
+}
+
+int
+ndbCompatible_upgrade(Uint32 ownVersion, Uint32 otherVersion)
+{
+  if (ndbCompatible_full(ownVersion, otherVersion))
+    return 1;
+  return ndbCompatible(ownVersion, otherVersion, ndbCompatibleTable_upgrade);
+}
+
+int
+ndbCompatible_mgmt_ndb(Uint32 ownVersion, Uint32 otherVersion)
+{
+  return ndbCompatible_upgrade(ownVersion, otherVersion);
+}
+
+int
+ndbCompatible_mgmt_api(Uint32 ownVersion, Uint32 otherVersion)
+{
+  return ndbCompatible_upgrade(ownVersion, otherVersion);
+}
+
+int
+ndbCompatible_ndb_mgmt(Uint32 ownVersion, Uint32 otherVersion)
+{
+  return ndbCompatible_full(ownVersion, otherVersion);
+}
+
+int
+ndbCompatible_api_mgmt(Uint32 ownVersion, Uint32 otherVersion)
+{
+  return ndbCompatible_full(ownVersion, otherVersion);
+}
+
+int
+ndbCompatible_api_ndb(Uint32 ownVersion, Uint32 otherVersion)
+{
+  return ndbCompatible_full(ownVersion, otherVersion);
+}
+
+int
+ndbCompatible_ndb_api(Uint32 ownVersion, Uint32 otherVersion)
+{
+  return ndbCompatible_upgrade(ownVersion, otherVersion);
+}
+
+int
+ndbCompatible_ndb_ndb(Uint32 ownVersion, Uint32 otherVersion)
+{
+  return ndbCompatible_upgrade(ownVersion, otherVersion);
+}
diff --git a/ndb/src/cw/Makefile.am b/storage/ndb/src/cw/Makefile.am
index 7348fc9eab6..7348fc9eab6 100644
--- a/ndb/src/cw/Makefile.am
+++ b/storage/ndb/src/cw/Makefile.am
diff --git a/ndb/src/cw/cpcc-win32/C++/CPC_GUI.cpp b/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.cpp
index 59ee3e90451..59ee3e90451 100644
--- a/ndb/src/cw/cpcc-win32/C++/CPC_GUI.cpp
+++ b/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.cpp
diff --git a/ndb/src/cw/cpcc-win32/C++/CPC_GUI.dsp b/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.dsp
index 91007b0a47e..91007b0a47e 100644
--- a/ndb/src/cw/cpcc-win32/C++/CPC_GUI.dsp
+++ b/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.dsp
diff --git a/ndb/src/cw/cpcc-win32/C++/CPC_GUI.dsw b/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.dsw
index 1f163a31662..1f163a31662 100644
--- a/ndb/src/cw/cpcc-win32/C++/CPC_GUI.dsw
+++ b/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.dsw
diff --git a/ndb/src/cw/cpcc-win32/C++/CPC_GUI.h b/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.h
index cf7670948a7..cf7670948a7 100644
--- a/ndb/src/cw/cpcc-win32/C++/CPC_GUI.h
+++ b/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.h
diff --git a/ndb/src/cw/cpcc-win32/C++/CPC_GUI.ico b/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.ico
index 386883523bc..386883523bc 100644
--- a/ndb/src/cw/cpcc-win32/C++/CPC_GUI.ico
+++ b/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.ico
diff --git a/ndb/src/cw/cpcc-win32/C++/CPC_GUI.rc b/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.rc
index 41d75b2b282..41d75b2b282 100644
--- a/ndb/src/cw/cpcc-win32/C++/CPC_GUI.rc
+++ b/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.rc
diff --git a/ndb/src/cw/cpcc-win32/C++/CPC_GUI.sln b/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.sln
index 86b574d851d..86b574d851d 100644
--- a/ndb/src/cw/cpcc-win32/C++/CPC_GUI.sln
+++ b/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.sln
diff --git a/ndb/src/cw/cpcc-win32/C++/CPC_GUI.suo b/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.suo
index e7d178f04c3..e7d178f04c3 100644
--- a/ndb/src/cw/cpcc-win32/C++/CPC_GUI.suo
+++ b/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.suo
diff --git a/ndb/src/cw/cpcc-win32/C++/CPC_GUI.vcproj b/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.vcproj
index 56f9f3a8511..56f9f3a8511 100644
--- a/ndb/src/cw/cpcc-win32/C++/CPC_GUI.vcproj
+++ b/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.vcproj
diff --git a/ndb/src/cw/cpcc-win32/C++/Closed.ICO b/storage/ndb/src/cw/cpcc-win32/C++/Closed.ICO
index 044042b42fb..044042b42fb 100644
--- a/ndb/src/cw/cpcc-win32/C++/Closed.ICO
+++ b/storage/ndb/src/cw/cpcc-win32/C++/Closed.ICO
diff --git a/ndb/src/cw/cpcc-win32/C++/NdbControls.cpp b/storage/ndb/src/cw/cpcc-win32/C++/NdbControls.cpp
index 6bbc9a9859b..6bbc9a9859b 100644
--- a/ndb/src/cw/cpcc-win32/C++/NdbControls.cpp
+++ b/storage/ndb/src/cw/cpcc-win32/C++/NdbControls.cpp
diff --git a/ndb/src/cw/cpcc-win32/C++/Open.ICO b/storage/ndb/src/cw/cpcc-win32/C++/Open.ICO
index ab7b05d9df7..ab7b05d9df7 100644
--- a/ndb/src/cw/cpcc-win32/C++/Open.ICO
+++ b/storage/ndb/src/cw/cpcc-win32/C++/Open.ICO
diff --git a/ndb/src/cw/cpcc-win32/C++/StdAfx.cpp b/storage/ndb/src/cw/cpcc-win32/C++/StdAfx.cpp
index 8fcdb4ce158..8fcdb4ce158 100644
--- a/ndb/src/cw/cpcc-win32/C++/StdAfx.cpp
+++ b/storage/ndb/src/cw/cpcc-win32/C++/StdAfx.cpp
diff --git a/ndb/src/cw/cpcc-win32/C++/StdAfx.h b/storage/ndb/src/cw/cpcc-win32/C++/StdAfx.h
index 370d04fb466..370d04fb466 100644
--- a/ndb/src/cw/cpcc-win32/C++/StdAfx.h
+++ b/storage/ndb/src/cw/cpcc-win32/C++/StdAfx.h
diff --git a/ndb/src/cw/cpcc-win32/C++/TreeView.cpp b/storage/ndb/src/cw/cpcc-win32/C++/TreeView.cpp
index db5c62f14bb..db5c62f14bb 100644
--- a/ndb/src/cw/cpcc-win32/C++/TreeView.cpp
+++ b/storage/ndb/src/cw/cpcc-win32/C++/TreeView.cpp
diff --git a/ndb/src/cw/cpcc-win32/C++/TreeView.h b/storage/ndb/src/cw/cpcc-win32/C++/TreeView.h
index 595f9bd6cdc..595f9bd6cdc 100644
--- a/ndb/src/cw/cpcc-win32/C++/TreeView.h
+++ b/storage/ndb/src/cw/cpcc-win32/C++/TreeView.h
diff --git a/ndb/src/cw/cpcc-win32/C++/bmp00001.bmp b/storage/ndb/src/cw/cpcc-win32/C++/bmp00001.bmp
index e50af403eda..e50af403eda 100644
--- a/ndb/src/cw/cpcc-win32/C++/bmp00001.bmp
+++ b/storage/ndb/src/cw/cpcc-win32/C++/bmp00001.bmp
diff --git a/ndb/src/cw/cpcc-win32/C++/resource.h b/storage/ndb/src/cw/cpcc-win32/C++/resource.h
index 0bec552edf6..0bec552edf6 100644
--- a/ndb/src/cw/cpcc-win32/C++/resource.h
+++ b/storage/ndb/src/cw/cpcc-win32/C++/resource.h
diff --git a/ndb/src/cw/cpcc-win32/C++/small.ico b/storage/ndb/src/cw/cpcc-win32/C++/small.ico
index 8f94d9aa828..8f94d9aa828 100644
--- a/ndb/src/cw/cpcc-win32/C++/small.ico
+++ b/storage/ndb/src/cw/cpcc-win32/C++/small.ico
diff --git a/ndb/src/cw/cpcc-win32/C++/toolbar.bmp b/storage/ndb/src/cw/cpcc-win32/C++/toolbar.bmp
index a1059352c66..a1059352c66 100644
--- a/ndb/src/cw/cpcc-win32/C++/toolbar.bmp
+++ b/storage/ndb/src/cw/cpcc-win32/C++/toolbar.bmp
diff --git a/ndb/src/cw/cpcc-win32/csharp/App.ico b/storage/ndb/src/cw/cpcc-win32/csharp/App.ico
index 3a5525fd794..3a5525fd794 100644
--- a/ndb/src/cw/cpcc-win32/csharp/App.ico
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/App.ico
diff --git a/ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs b/storage/ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs
index ea1798c8c67..ea1798c8c67 100644
--- a/ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs
diff --git a/ndb/src/cw/cpcc-win32/csharp/Computer.cs b/storage/ndb/src/cw/cpcc-win32/csharp/Computer.cs
index 9763fac5622..9763fac5622 100644
--- a/ndb/src/cw/cpcc-win32/csharp/Computer.cs
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/Computer.cs
diff --git a/ndb/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs b/storage/ndb/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs
index c01e41f3e60..c01e41f3e60 100644
--- a/ndb/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs
diff --git a/ndb/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs b/storage/ndb/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs
index 5b4d1b56df7..5b4d1b56df7 100644
--- a/ndb/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs
diff --git a/ndb/src/cw/cpcc-win32/csharp/DATABASE.ICO b/storage/ndb/src/cw/cpcc-win32/csharp/DATABASE.ICO
index 9689aa88361..9689aa88361 100644
--- a/ndb/src/cw/cpcc-win32/csharp/DATABASE.ICO
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/DATABASE.ICO
diff --git a/ndb/src/cw/cpcc-win32/csharp/Database.cs b/storage/ndb/src/cw/cpcc-win32/csharp/Database.cs
index 39b8c160159..39b8c160159 100644
--- a/ndb/src/cw/cpcc-win32/csharp/Database.cs
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/Database.cs
diff --git a/ndb/src/cw/cpcc-win32/csharp/NDB_CPC.csproj b/storage/ndb/src/cw/cpcc-win32/csharp/NDB_CPC.csproj
index 6384eff8329..6384eff8329 100644
--- a/ndb/src/cw/cpcc-win32/csharp/NDB_CPC.csproj
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/NDB_CPC.csproj
diff --git a/ndb/src/cw/cpcc-win32/csharp/NDB_CPC.csproj.user b/storage/ndb/src/cw/cpcc-win32/csharp/NDB_CPC.csproj.user
index 68937906d93..68937906d93 100644
--- a/ndb/src/cw/cpcc-win32/csharp/NDB_CPC.csproj.user
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/NDB_CPC.csproj.user
diff --git a/ndb/src/cw/cpcc-win32/csharp/NDB_CPC.ncb b/storage/ndb/src/cw/cpcc-win32/csharp/NDB_CPC.ncb
index ed3460476b0..ed3460476b0 100644
--- a/ndb/src/cw/cpcc-win32/csharp/NDB_CPC.ncb
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/NDB_CPC.ncb
diff --git a/ndb/src/cw/cpcc-win32/csharp/NDB_CPC.sln b/storage/ndb/src/cw/cpcc-win32/csharp/NDB_CPC.sln
index ef18b5e94ce..ef18b5e94ce 100644
--- a/ndb/src/cw/cpcc-win32/csharp/NDB_CPC.sln
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/NDB_CPC.sln
diff --git a/ndb/src/cw/cpcc-win32/csharp/PanelWizard.cs b/storage/ndb/src/cw/cpcc-win32/csharp/PanelWizard.cs
index f492aa64c60..f492aa64c60 100644
--- a/ndb/src/cw/cpcc-win32/csharp/PanelWizard.cs
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/PanelWizard.cs
diff --git a/ndb/src/cw/cpcc-win32/csharp/Process.cs b/storage/ndb/src/cw/cpcc-win32/csharp/Process.cs
index c1ee1b2fe9e..c1ee1b2fe9e 100644
--- a/ndb/src/cw/cpcc-win32/csharp/Process.cs
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/Process.cs
diff --git a/ndb/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs b/storage/ndb/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs
index 581b8383e7c..581b8383e7c 100644
--- a/ndb/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs
diff --git a/ndb/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs b/storage/ndb/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs
index b3a2361bcb0..b3a2361bcb0 100644
--- a/ndb/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs
diff --git a/ndb/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs b/storage/ndb/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs
index b8ff2844af9..b8ff2844af9 100644
--- a/ndb/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs
diff --git a/ndb/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs b/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs
index 2cef5d34f17..2cef5d34f17 100644
--- a/ndb/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs
diff --git a/ndb/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs b/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs
index 9c0d82a0b27..9c0d82a0b27 100644
--- a/ndb/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs
diff --git a/ndb/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs b/storage/ndb/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs
index cecfcaeb0f3..cecfcaeb0f3 100644
--- a/ndb/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs
diff --git a/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs b/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs
index a7966947e1f..a7966947e1f 100644
--- a/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs
+++ b/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs
diff --git a/ndb/src/cw/cpcc-win32/vb6/Computer.cls b/storage/ndb/src/cw/cpcc-win32/vb6/Computer.cls
index 5b42dfeadb6..5b42dfeadb6 100644
--- a/ndb/src/cw/cpcc-win32/vb6/Computer.cls
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/Computer.cls
diff --git a/ndb/src/cw/cpcc-win32/vb6/Database.cls b/storage/ndb/src/cw/cpcc-win32/vb6/Database.cls
index dfb1195d910..dfb1195d910 100644
--- a/ndb/src/cw/cpcc-win32/vb6/Database.cls
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/Database.cls
diff --git a/ndb/src/cw/cpcc-win32/vb6/Icon 110.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 110.ico
index 34b85992394..34b85992394 100644
--- a/ndb/src/cw/cpcc-win32/vb6/Icon 110.ico
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 110.ico
diff --git a/ndb/src/cw/cpcc-win32/vb6/Icon 231.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 231.ico
index fe30ff5d1e6..fe30ff5d1e6 100644
--- a/ndb/src/cw/cpcc-win32/vb6/Icon 231.ico
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 231.ico
diff --git a/ndb/src/cw/cpcc-win32/vb6/Icon 237.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 237.ico
index af0a1294f9e..af0a1294f9e 100644
--- a/ndb/src/cw/cpcc-win32/vb6/Icon 237.ico
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 237.ico
diff --git a/ndb/src/cw/cpcc-win32/vb6/Icon 241.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 241.ico
index e8caf6e9a73..e8caf6e9a73 100644
--- a/ndb/src/cw/cpcc-win32/vb6/Icon 241.ico
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 241.ico
diff --git a/ndb/src/cw/cpcc-win32/vb6/Icon 242.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 242.ico
index 2deff5472bc..2deff5472bc 100644
--- a/ndb/src/cw/cpcc-win32/vb6/Icon 242.ico
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 242.ico
diff --git a/ndb/src/cw/cpcc-win32/vb6/Icon 270.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 270.ico
index 9cab239de23..9cab239de23 100644
--- a/ndb/src/cw/cpcc-win32/vb6/Icon 270.ico
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 270.ico
diff --git a/ndb/src/cw/cpcc-win32/vb6/Icon 271.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 271.ico
index f05c95f74fe..f05c95f74fe 100644
--- a/ndb/src/cw/cpcc-win32/vb6/Icon 271.ico
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 271.ico
diff --git a/ndb/src/cw/cpcc-win32/vb6/Icon 273.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 273.ico
index 800606eda0c..800606eda0c 100644
--- a/ndb/src/cw/cpcc-win32/vb6/Icon 273.ico
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 273.ico
diff --git a/ndb/src/cw/cpcc-win32/vb6/Icon 31.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 31.ico
index a2404977771..a2404977771 100644
--- a/ndb/src/cw/cpcc-win32/vb6/Icon 31.ico
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 31.ico
diff --git a/ndb/src/cw/cpcc-win32/vb6/Icon 337.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 337.ico
index 9dadb12cfbe..9dadb12cfbe 100644
--- a/ndb/src/cw/cpcc-win32/vb6/Icon 337.ico
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 337.ico
diff --git a/ndb/src/cw/cpcc-win32/vb6/Icon 338.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 338.ico
index a13c80c81b4..a13c80c81b4 100644
--- a/ndb/src/cw/cpcc-win32/vb6/Icon 338.ico
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 338.ico
diff --git a/ndb/src/cw/cpcc-win32/vb6/Icon 339.ico b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 339.ico
index 5eb4c06815d..5eb4c06815d 100644
--- a/ndb/src/cw/cpcc-win32/vb6/Icon 339.ico
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/Icon 339.ico
diff --git a/ndb/src/cw/cpcc-win32/vb6/MSSCCPRJ.SCC b/storage/ndb/src/cw/cpcc-win32/vb6/MSSCCPRJ.SCC
index 3100640f8bd..3100640f8bd 100644
--- a/ndb/src/cw/cpcc-win32/vb6/MSSCCPRJ.SCC
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/MSSCCPRJ.SCC
diff --git a/ndb/src/cw/cpcc-win32/vb6/Module1.bas b/storage/ndb/src/cw/cpcc-win32/vb6/Module1.bas
index ae8ed444a41..ae8ed444a41 100644
--- a/ndb/src/cw/cpcc-win32/vb6/Module1.bas
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/Module1.bas
diff --git a/ndb/src/cw/cpcc-win32/vb6/NdbCPC.vbp b/storage/ndb/src/cw/cpcc-win32/vb6/NdbCPC.vbp
index dc8f3780a74..dc8f3780a74 100644
--- a/ndb/src/cw/cpcc-win32/vb6/NdbCPC.vbp
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/NdbCPC.vbp
diff --git a/ndb/src/cw/cpcc-win32/vb6/NdbCPC.vbw b/storage/ndb/src/cw/cpcc-win32/vb6/NdbCPC.vbw
index 825abbc923a..825abbc923a 100644
--- a/ndb/src/cw/cpcc-win32/vb6/NdbCPC.vbw
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/NdbCPC.vbw
diff --git a/ndb/src/cw/cpcc-win32/vb6/Process.cls b/storage/ndb/src/cw/cpcc-win32/vb6/Process.cls
index fcb4c2cbb2c..fcb4c2cbb2c 100644
--- a/ndb/src/cw/cpcc-win32/vb6/Process.cls
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/Process.cls
diff --git a/ndb/src/cw/cpcc-win32/vb6/closed folder.ico b/storage/ndb/src/cw/cpcc-win32/vb6/closed folder.ico
index fe82350d376..fe82350d376 100644
--- a/ndb/src/cw/cpcc-win32/vb6/closed folder.ico
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/closed folder.ico
diff --git a/ndb/src/cw/cpcc-win32/vb6/computer.ico b/storage/ndb/src/cw/cpcc-win32/vb6/computer.ico
index d73302d1cd5..d73302d1cd5 100644
--- a/ndb/src/cw/cpcc-win32/vb6/computer.ico
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/computer.ico
diff --git a/ndb/src/cw/cpcc-win32/vb6/frmAbout.frm b/storage/ndb/src/cw/cpcc-win32/vb6/frmAbout.frm
index b842d20de21..b842d20de21 100644
--- a/ndb/src/cw/cpcc-win32/vb6/frmAbout.frm
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/frmAbout.frm
diff --git a/ndb/src/cw/cpcc-win32/vb6/frmLogin.frm b/storage/ndb/src/cw/cpcc-win32/vb6/frmLogin.frm
index d4d663c93c2..d4d663c93c2 100644
--- a/ndb/src/cw/cpcc-win32/vb6/frmLogin.frm
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/frmLogin.frm
diff --git a/ndb/src/cw/cpcc-win32/vb6/frmMain.frm b/storage/ndb/src/cw/cpcc-win32/vb6/frmMain.frm
index a4bf5b58941..a4bf5b58941 100644
--- a/ndb/src/cw/cpcc-win32/vb6/frmMain.frm
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/frmMain.frm
diff --git a/ndb/src/cw/cpcc-win32/vb6/frmNewComputer.frm b/storage/ndb/src/cw/cpcc-win32/vb6/frmNewComputer.frm
index eae5802493c..eae5802493c 100644
--- a/ndb/src/cw/cpcc-win32/vb6/frmNewComputer.frm
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/frmNewComputer.frm
diff --git a/ndb/src/cw/cpcc-win32/vb6/frmNewComputer.frx b/storage/ndb/src/cw/cpcc-win32/vb6/frmNewComputer.frx
index 593f4708db8..593f4708db8 100644
--- a/ndb/src/cw/cpcc-win32/vb6/frmNewComputer.frx
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/frmNewComputer.frx
diff --git a/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase.frx b/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase.frx
index b20c2b651ae..b20c2b651ae 100644
--- a/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase.frx
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase.frx
diff --git a/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase1.frm b/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase1.frm
index 3fa1fd4c4e8..3fa1fd4c4e8 100644
--- a/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase1.frm
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase1.frm
diff --git a/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase2.frm b/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase2.frm
index 49806a695ea..49806a695ea 100644
--- a/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase2.frm
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase2.frm
diff --git a/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase2.log b/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase2.log
index 808b21866e5..808b21866e5 100644
--- a/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase2.log
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase2.log
diff --git a/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase3.frm b/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase3.frm
index ba050a58a09..ba050a58a09 100644
--- a/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase3.frm
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/frmNewDatabase3.frm
diff --git a/ndb/src/cw/cpcc-win32/vb6/frmOptions.frm b/storage/ndb/src/cw/cpcc-win32/vb6/frmOptions.frm
index e526a35b3ec..e526a35b3ec 100644
--- a/ndb/src/cw/cpcc-win32/vb6/frmOptions.frm
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/frmOptions.frm
diff --git a/ndb/src/cw/cpcc-win32/vb6/frmSplash.frx b/storage/ndb/src/cw/cpcc-win32/vb6/frmSplash.frx
index fee0c5c59de..fee0c5c59de 100644
--- a/ndb/src/cw/cpcc-win32/vb6/frmSplash.frx
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/frmSplash.frx
diff --git a/ndb/src/cw/cpcc-win32/vb6/networking.ico b/storage/ndb/src/cw/cpcc-win32/vb6/networking.ico
index 6bbf8022fc6..6bbf8022fc6 100644
--- a/ndb/src/cw/cpcc-win32/vb6/networking.ico
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/networking.ico
diff --git a/ndb/src/cw/cpcc-win32/vb6/open folder.ico b/storage/ndb/src/cw/cpcc-win32/vb6/open folder.ico
index 7bb32cc83d3..7bb32cc83d3 100644
--- a/ndb/src/cw/cpcc-win32/vb6/open folder.ico
+++ b/storage/ndb/src/cw/cpcc-win32/vb6/open folder.ico
diff --git a/ndb/src/cw/cpcd/APIService.cpp b/storage/ndb/src/cw/cpcd/APIService.cpp
index e7a2092c15d..e7a2092c15d 100644
--- a/ndb/src/cw/cpcd/APIService.cpp
+++ b/storage/ndb/src/cw/cpcd/APIService.cpp
diff --git a/ndb/src/cw/cpcd/APIService.hpp b/storage/ndb/src/cw/cpcd/APIService.hpp
index 3586d64187e..3586d64187e 100644
--- a/ndb/src/cw/cpcd/APIService.hpp
+++ b/storage/ndb/src/cw/cpcd/APIService.hpp
diff --git a/ndb/src/cw/cpcd/CPCD.cpp b/storage/ndb/src/cw/cpcd/CPCD.cpp
index 69a7b840528..69a7b840528 100644
--- a/ndb/src/cw/cpcd/CPCD.cpp
+++ b/storage/ndb/src/cw/cpcd/CPCD.cpp
diff --git a/ndb/src/cw/cpcd/CPCD.hpp b/storage/ndb/src/cw/cpcd/CPCD.hpp
index aecc43150c4..aecc43150c4 100644
--- a/ndb/src/cw/cpcd/CPCD.hpp
+++ b/storage/ndb/src/cw/cpcd/CPCD.hpp
diff --git a/storage/ndb/src/cw/cpcd/Makefile.am b/storage/ndb/src/cw/cpcd/Makefile.am
new file mode 100644
index 00000000000..e0b22be6b8d
--- /dev/null
+++ b/storage/ndb/src/cw/cpcd/Makefile.am
@@ -0,0 +1,20 @@
+
+ndbbin_PROGRAMS = ndb_cpcd
+
+ndb_cpcd_SOURCES = main.cpp CPCD.cpp Process.cpp APIService.cpp Monitor.cpp common.cpp
+
+LDADD_LOC = \
+            $(top_builddir)/storage/ndb/src/libndbclient.la      \
+            $(top_builddir)/dbug/libdbug.a \
+            $(top_builddir)/mysys/libmysys.a \
+            $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_util.mk.am
+
+ndb_cpcd_LDFLAGS = @ndb_bin_am_ldflags@
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp:
diff --git a/ndb/src/cw/cpcd/Monitor.cpp b/storage/ndb/src/cw/cpcd/Monitor.cpp
index 141de926d4d..141de926d4d 100644
--- a/ndb/src/cw/cpcd/Monitor.cpp
+++ b/storage/ndb/src/cw/cpcd/Monitor.cpp
diff --git a/ndb/src/cw/cpcd/Process.cpp b/storage/ndb/src/cw/cpcd/Process.cpp
index 431c96e3320..431c96e3320 100644
--- a/ndb/src/cw/cpcd/Process.cpp
+++ b/storage/ndb/src/cw/cpcd/Process.cpp
diff --git a/ndb/src/cw/cpcd/common.cpp b/storage/ndb/src/cw/cpcd/common.cpp
index 53c0e4d5a64..53c0e4d5a64 100644
--- a/ndb/src/cw/cpcd/common.cpp
+++ b/storage/ndb/src/cw/cpcd/common.cpp
diff --git a/ndb/src/cw/cpcd/common.hpp b/storage/ndb/src/cw/cpcd/common.hpp
index 4f5f702762f..4f5f702762f 100644
--- a/ndb/src/cw/cpcd/common.hpp
+++ b/storage/ndb/src/cw/cpcd/common.hpp
diff --git a/ndb/src/cw/cpcd/main.cpp b/storage/ndb/src/cw/cpcd/main.cpp
index c320f07ef04..c320f07ef04 100644
--- a/ndb/src/cw/cpcd/main.cpp
+++ b/storage/ndb/src/cw/cpcd/main.cpp
diff --git a/ndb/src/cw/test/socketclient/Makefile b/storage/ndb/src/cw/test/socketclient/Makefile
index 04f11f031e5..04f11f031e5 100644
--- a/ndb/src/cw/test/socketclient/Makefile
+++ b/storage/ndb/src/cw/test/socketclient/Makefile
diff --git a/ndb/src/cw/test/socketclient/socketClientTest.cpp b/storage/ndb/src/cw/test/socketclient/socketClientTest.cpp
index 423c196aa43..423c196aa43 100644
--- a/ndb/src/cw/test/socketclient/socketClientTest.cpp
+++ b/storage/ndb/src/cw/test/socketclient/socketClientTest.cpp
diff --git a/ndb/src/cw/util/ClientInterface.cpp b/storage/ndb/src/cw/util/ClientInterface.cpp
index 627b622f1dd..627b622f1dd 100644
--- a/ndb/src/cw/util/ClientInterface.cpp
+++ b/storage/ndb/src/cw/util/ClientInterface.cpp
diff --git a/ndb/src/cw/util/ClientInterface.hpp b/storage/ndb/src/cw/util/ClientInterface.hpp
index 66ecfe05197..66ecfe05197 100644
--- a/ndb/src/cw/util/ClientInterface.hpp
+++ b/storage/ndb/src/cw/util/ClientInterface.hpp
diff --git a/ndb/src/cw/util/Makefile b/storage/ndb/src/cw/util/Makefile
index f5ab16721be..f5ab16721be 100644
--- a/ndb/src/cw/util/Makefile
+++ b/storage/ndb/src/cw/util/Makefile
diff --git a/ndb/src/cw/util/SocketRegistry.cpp b/storage/ndb/src/cw/util/SocketRegistry.cpp
index 1dbb402f7c9..1dbb402f7c9 100644
--- a/ndb/src/cw/util/SocketRegistry.cpp
+++ b/storage/ndb/src/cw/util/SocketRegistry.cpp
diff --git a/ndb/src/cw/util/SocketRegistry.hpp b/storage/ndb/src/cw/util/SocketRegistry.hpp
index 2b079156967..2b079156967 100644
--- a/ndb/src/cw/util/SocketRegistry.hpp
+++ b/storage/ndb/src/cw/util/SocketRegistry.hpp
diff --git a/ndb/src/cw/util/SocketService.cpp b/storage/ndb/src/cw/util/SocketService.cpp
index b993ec8c2c1..b993ec8c2c1 100644
--- a/ndb/src/cw/util/SocketService.cpp
+++ b/storage/ndb/src/cw/util/SocketService.cpp
diff --git a/ndb/src/cw/util/SocketService.hpp b/storage/ndb/src/cw/util/SocketService.hpp
index 7a0c3a2fd91..7a0c3a2fd91 100644
--- a/ndb/src/cw/util/SocketService.hpp
+++ b/storage/ndb/src/cw/util/SocketService.hpp
diff --git a/ndb/src/external/WIN32.x86/sci/lib/SISCI_LIBRARY_WIN32.TXT b/storage/ndb/src/external/WIN32.x86/sci/lib/SISCI_LIBRARY_WIN32.TXT
index 97fe959bb2c..97fe959bb2c 100644
--- a/ndb/src/external/WIN32.x86/sci/lib/SISCI_LIBRARY_WIN32.TXT
+++ b/storage/ndb/src/external/WIN32.x86/sci/lib/SISCI_LIBRARY_WIN32.TXT
diff --git a/ndb/src/external/WIN32.x86/sci/lib/scilib.lib b/storage/ndb/src/external/WIN32.x86/sci/lib/scilib.lib
index 572169a2016..572169a2016 100644
--- a/ndb/src/external/WIN32.x86/sci/lib/scilib.lib
+++ b/storage/ndb/src/external/WIN32.x86/sci/lib/scilib.lib
diff --git a/ndb/src/external/WIN32.x86/sci/lib/scilib_md.lib b/storage/ndb/src/external/WIN32.x86/sci/lib/scilib_md.lib
index f18cba61336..f18cba61336 100644
--- a/ndb/src/external/WIN32.x86/sci/lib/scilib_md.lib
+++ b/storage/ndb/src/external/WIN32.x86/sci/lib/scilib_md.lib
diff --git a/ndb/src/external/WIN32.x86/sci/lib/scilib_mt.lib b/storage/ndb/src/external/WIN32.x86/sci/lib/scilib_mt.lib
index 3e9982468ea..3e9982468ea 100644
--- a/ndb/src/external/WIN32.x86/sci/lib/scilib_mt.lib
+++ b/storage/ndb/src/external/WIN32.x86/sci/lib/scilib_mt.lib
diff --git a/ndb/src/external/WIN32.x86/sci/lib/sisci_api.lib b/storage/ndb/src/external/WIN32.x86/sci/lib/sisci_api.lib
index 3fbff6ec809..3fbff6ec809 100644
--- a/ndb/src/external/WIN32.x86/sci/lib/sisci_api.lib
+++ b/storage/ndb/src/external/WIN32.x86/sci/lib/sisci_api.lib
diff --git a/ndb/src/external/WIN32.x86/sci/lib/sisci_api_md.lib b/storage/ndb/src/external/WIN32.x86/sci/lib/sisci_api_md.lib
index 1d8d42d1d35..1d8d42d1d35 100644
--- a/ndb/src/external/WIN32.x86/sci/lib/sisci_api_md.lib
+++ b/storage/ndb/src/external/WIN32.x86/sci/lib/sisci_api_md.lib
diff --git a/ndb/src/external/WIN32.x86/sci/lib/sisci_api_mt.lib b/storage/ndb/src/external/WIN32.x86/sci/lib/sisci_api_mt.lib
index 017fad7ba31..017fad7ba31 100644
--- a/ndb/src/external/WIN32.x86/sci/lib/sisci_api_mt.lib
+++ b/storage/ndb/src/external/WIN32.x86/sci/lib/sisci_api_mt.lib
diff --git a/storage/ndb/src/kernel/Makefile.am b/storage/ndb/src/kernel/Makefile.am
new file mode 100644
index 00000000000..6e3664f0997
--- /dev/null
+++ b/storage/ndb/src/kernel/Makefile.am
@@ -0,0 +1,75 @@
+SUBDIRS = error blocks vm
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+
+ndbbin_PROGRAMS = ndbd
+
+ndbd_SOURCES = main.cpp SimBlockList.cpp
+
+include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
+
+INCLUDES += \
+              -Iblocks/cmvmi \
+              -Iblocks/dbacc \
+              -Iblocks/dbdict \
+              -Iblocks/dbdih \
+              -Iblocks/dblqh \
+              -Iblocks/dbtc \
+              -Iblocks/dbtup \
+              -Iblocks/ndbfs \
+              -Iblocks/ndbcntr \
+              -Iblocks/qmgr \
+              -Iblocks/trix \
+              -Iblocks/backup \
+              -Iblocks/dbutil \
+              -Iblocks/suma \
+              -Iblocks/grep \
+              -Iblocks/dbtux
+
+LDADD +=  \
+              blocks/cmvmi/libcmvmi.a \
+              blocks/dbacc/libdbacc.a \
+              blocks/dbdict/libdbdict.a \
+              blocks/dbdih/libdbdih.a \
+              blocks/dblqh/libdblqh.a \
+              blocks/dbtc/libdbtc.a \
+              blocks/dbtup/libdbtup.a \
+              blocks/ndbfs/libndbfs.a \
+              blocks/ndbcntr/libndbcntr.a \
+              blocks/qmgr/libqmgr.a \
+              blocks/trix/libtrix.a \
+              blocks/backup/libbackup.a \
+              blocks/dbutil/libdbutil.a \
+              blocks/suma/libsuma.a \
+              blocks/grep/libgrep.a \
+              blocks/dbtux/libdbtux.a \
+              vm/libkernel.a	\
+              error/liberror.a \
+              $(top_builddir)/storage/ndb/src/common/transporter/libtransporter.la   \
+              $(top_builddir)/storage/ndb/src/common/debugger/libtrace.la     \
+              $(top_builddir)/storage/ndb/src/common/debugger/signaldata/libsignaldataprint.la \
+              $(top_builddir)/storage/ndb/src/common/logger/liblogger.la       \
+              $(top_builddir)/storage/ndb/src/common/mgmcommon/libmgmsrvcommon.la \
+              $(top_builddir)/storage/ndb/src/mgmapi/libmgmapi.la \
+              $(top_builddir)/storage/ndb/src/common/portlib/libportlib.la      \
+              $(top_builddir)/storage/ndb/src/common/util/libgeneral.la  \
+         $(top_builddir)/dbug/libdbug.a \
+         $(top_builddir)/mysys/libmysys.a \
+         $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: ndbd.dsp
+
+storage/ndbd.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-prg.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(ndbbin_PROGRAMS)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndbd_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
diff --git a/ndb/src/kernel/SimBlockList.cpp b/storage/ndb/src/kernel/SimBlockList.cpp
index bf3958cf137..bf3958cf137 100644
--- a/ndb/src/kernel/SimBlockList.cpp
+++ b/storage/ndb/src/kernel/SimBlockList.cpp
diff --git a/ndb/src/kernel/blocks/ERROR_codes.txt b/storage/ndb/src/kernel/blocks/ERROR_codes.txt
index fedddb58c0d..fedddb58c0d 100644
--- a/ndb/src/kernel/blocks/ERROR_codes.txt
+++ b/storage/ndb/src/kernel/blocks/ERROR_codes.txt
diff --git a/ndb/src/kernel/blocks/Makefile.am b/storage/ndb/src/kernel/blocks/Makefile.am
index 7ee90e6239f..7ee90e6239f 100644
--- a/ndb/src/kernel/blocks/Makefile.am
+++ b/storage/ndb/src/kernel/blocks/Makefile.am
diff --git a/ndb/src/kernel/blocks/NodeRestart.new.txt b/storage/ndb/src/kernel/blocks/NodeRestart.new.txt
index 00ab8f0c208..00ab8f0c208 100644
--- a/ndb/src/kernel/blocks/NodeRestart.new.txt
+++ b/storage/ndb/src/kernel/blocks/NodeRestart.new.txt
diff --git a/ndb/src/kernel/blocks/NodeRestart.txt b/storage/ndb/src/kernel/blocks/NodeRestart.txt
index e9f277bb39e..e9f277bb39e 100644
--- a/ndb/src/kernel/blocks/NodeRestart.txt
+++ b/storage/ndb/src/kernel/blocks/NodeRestart.txt
diff --git a/ndb/src/kernel/blocks/Start.txt b/storage/ndb/src/kernel/blocks/Start.txt
index 3e805ebab55..3e805ebab55 100644
--- a/ndb/src/kernel/blocks/Start.txt
+++ b/storage/ndb/src/kernel/blocks/Start.txt
diff --git a/ndb/src/kernel/blocks/SystemRestart.new.txt b/storage/ndb/src/kernel/blocks/SystemRestart.new.txt
index 3738de28df8..3738de28df8 100644
--- a/ndb/src/kernel/blocks/SystemRestart.new.txt
+++ b/storage/ndb/src/kernel/blocks/SystemRestart.new.txt
diff --git a/ndb/src/kernel/blocks/SystemRestart.txt b/storage/ndb/src/kernel/blocks/SystemRestart.txt
index 235dfb968fa..235dfb968fa 100644
--- a/ndb/src/kernel/blocks/SystemRestart.txt
+++ b/storage/ndb/src/kernel/blocks/SystemRestart.txt
diff --git a/ndb/src/kernel/blocks/backup/Backup.cpp b/storage/ndb/src/kernel/blocks/backup/Backup.cpp
index 327fcc33aff..327fcc33aff 100644
--- a/ndb/src/kernel/blocks/backup/Backup.cpp
+++ b/storage/ndb/src/kernel/blocks/backup/Backup.cpp
diff --git a/ndb/src/kernel/blocks/backup/Backup.hpp b/storage/ndb/src/kernel/blocks/backup/Backup.hpp
index 7bcea5655b4..7bcea5655b4 100644
--- a/ndb/src/kernel/blocks/backup/Backup.hpp
+++ b/storage/ndb/src/kernel/blocks/backup/Backup.hpp
diff --git a/ndb/src/kernel/blocks/backup/Backup.txt b/storage/ndb/src/kernel/blocks/backup/Backup.txt
index 73942c6ebdc..73942c6ebdc 100644
--- a/ndb/src/kernel/blocks/backup/Backup.txt
+++ b/storage/ndb/src/kernel/blocks/backup/Backup.txt
diff --git a/ndb/src/kernel/blocks/backup/BackupFormat.hpp b/storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp
index 65dd2ad9053..65dd2ad9053 100644
--- a/ndb/src/kernel/blocks/backup/BackupFormat.hpp
+++ b/storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp
diff --git a/ndb/src/kernel/blocks/backup/BackupInit.cpp b/storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
index eae72f43db5..eae72f43db5 100644
--- a/ndb/src/kernel/blocks/backup/BackupInit.cpp
+++ b/storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
diff --git a/ndb/src/kernel/blocks/backup/FsBuffer.hpp b/storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp
index 2f3c7daae43..2f3c7daae43 100644
--- a/ndb/src/kernel/blocks/backup/FsBuffer.hpp
+++ b/storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp
diff --git a/storage/ndb/src/kernel/blocks/backup/Makefile.am b/storage/ndb/src/kernel/blocks/backup/Makefile.am
new file mode 100644
index 00000000000..8d1df032514
--- /dev/null
+++ b/storage/ndb/src/kernel/blocks/backup/Makefile.am
@@ -0,0 +1,24 @@
+
+noinst_LIBRARIES = libbackup.a
+
+libbackup_a_SOURCES = Backup.cpp BackupInit.cpp
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: libbackup.dsp
+
+libbackup.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libbackup_a_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/backup/read.cpp b/storage/ndb/src/kernel/blocks/backup/read.cpp
index 89cc08ee9de..89cc08ee9de 100644
--- a/ndb/src/kernel/blocks/backup/read.cpp
+++ b/storage/ndb/src/kernel/blocks/backup/read.cpp
diff --git a/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp b/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
index c313abc28eb..c313abc28eb 100644
--- a/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
+++ b/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
diff --git a/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp b/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp
index 1c91f564749..1c91f564749 100644
--- a/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp
+++ b/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp
diff --git a/storage/ndb/src/kernel/blocks/cmvmi/Makefile.am b/storage/ndb/src/kernel/blocks/cmvmi/Makefile.am
new file mode 100644
index 00000000000..c9a105dc613
--- /dev/null
+++ b/storage/ndb/src/kernel/blocks/cmvmi/Makefile.am
@@ -0,0 +1,24 @@
+
+noinst_LIBRARIES = libcmvmi.a
+
+libcmvmi_a_SOURCES = Cmvmi.cpp
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: libcmvmi.dsp
+
+libcmvmi.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libcmvmi_a_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/dbacc/Dbacc.hpp b/storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
index a2d6fe4d64a..a2d6fe4d64a 100644
--- a/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
+++ b/storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
diff --git a/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp b/storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
index 90839163a72..90839163a72 100644
--- a/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
+++ b/storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
diff --git a/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp b/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
index 24f9715c8b4..24f9715c8b4 100644
--- a/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
+++ b/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
diff --git a/storage/ndb/src/kernel/blocks/dbacc/Makefile.am b/storage/ndb/src/kernel/blocks/dbacc/Makefile.am
new file mode 100644
index 00000000000..75a457da5bb
--- /dev/null
+++ b/storage/ndb/src/kernel/blocks/dbacc/Makefile.am
@@ -0,0 +1,26 @@
+
+noinst_LIBRARIES = libdbacc.a
+
+libdbacc_a_SOURCES = DbaccInit.cpp DbaccMain.cpp
+
+INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/kernel/blocks/dbtup
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: libdbacc.dsp
+
+libdbacc.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdbacc_a_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/dbdict/CreateIndex.txt b/storage/ndb/src/kernel/blocks/dbdict/CreateIndex.txt
index 3d11e501c07..3d11e501c07 100644
--- a/ndb/src/kernel/blocks/dbdict/CreateIndex.txt
+++ b/storage/ndb/src/kernel/blocks/dbdict/CreateIndex.txt
diff --git a/ndb/src/kernel/blocks/dbdict/CreateTable.new.txt b/storage/ndb/src/kernel/blocks/dbdict/CreateTable.new.txt
index d37732dcda1..d37732dcda1 100644
--- a/ndb/src/kernel/blocks/dbdict/CreateTable.new.txt
+++ b/storage/ndb/src/kernel/blocks/dbdict/CreateTable.new.txt
diff --git a/ndb/src/kernel/blocks/dbdict/CreateTable.txt b/storage/ndb/src/kernel/blocks/dbdict/CreateTable.txt
index 0b37e5d767f..0b37e5d767f 100644
--- a/ndb/src/kernel/blocks/dbdict/CreateTable.txt
+++ b/storage/ndb/src/kernel/blocks/dbdict/CreateTable.txt
diff --git a/ndb/src/kernel/blocks/dbdict/Dbdict.cpp b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
index d51f9537154..d51f9537154 100644
--- a/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
+++ b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
diff --git a/ndb/src/kernel/blocks/dbdict/Dbdict.hpp b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
index 68bb9b628d4..68bb9b628d4 100644
--- a/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
+++ b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
diff --git a/ndb/src/kernel/blocks/dbdict/Dbdict.txt b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.txt
index 8d4267a1c42..8d4267a1c42 100644
--- a/ndb/src/kernel/blocks/dbdict/Dbdict.txt
+++ b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.txt
diff --git a/ndb/src/kernel/blocks/dbdict/DropTable.txt b/storage/ndb/src/kernel/blocks/dbdict/DropTable.txt
index 8d364d15c57..8d364d15c57 100644
--- a/ndb/src/kernel/blocks/dbdict/DropTable.txt
+++ b/storage/ndb/src/kernel/blocks/dbdict/DropTable.txt
diff --git a/ndb/src/kernel/blocks/dbdict/Event.txt b/storage/ndb/src/kernel/blocks/dbdict/Event.txt
index 553c915d9c5..553c915d9c5 100644
--- a/ndb/src/kernel/blocks/dbdict/Event.txt
+++ b/storage/ndb/src/kernel/blocks/dbdict/Event.txt
diff --git a/storage/ndb/src/kernel/blocks/dbdict/Makefile.am b/storage/ndb/src/kernel/blocks/dbdict/Makefile.am
new file mode 100644
index 00000000000..0c22e06b855
--- /dev/null
+++ b/storage/ndb/src/kernel/blocks/dbdict/Makefile.am
@@ -0,0 +1,25 @@
+#SUBDIRS = printSchemafile
+
+noinst_LIBRARIES = libdbdict.a
+
+libdbdict_a_SOURCES = Dbdict.cpp
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: libdbdict.dsp
+
+libdbdict.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdbdict_a_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/dbdict/Master_AddTable.sfl b/storage/ndb/src/kernel/blocks/dbdict/Master_AddTable.sfl
index 1bcec156ef7..1bcec156ef7 100644
--- a/ndb/src/kernel/blocks/dbdict/Master_AddTable.sfl
+++ b/storage/ndb/src/kernel/blocks/dbdict/Master_AddTable.sfl
diff --git a/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp b/storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp
index 0226991a073..0226991a073 100644
--- a/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp
+++ b/storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp
diff --git a/ndb/src/kernel/blocks/dbdict/Slave_AddTable.sfl b/storage/ndb/src/kernel/blocks/dbdict/Slave_AddTable.sfl
index 8740be9595d..8740be9595d 100644
--- a/ndb/src/kernel/blocks/dbdict/Slave_AddTable.sfl
+++ b/storage/ndb/src/kernel/blocks/dbdict/Slave_AddTable.sfl
diff --git a/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp b/storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp
index b9b144cd977..b9b144cd977 100644
--- a/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp
+++ b/storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp
diff --git a/ndb/src/kernel/blocks/dbdih/Dbdih.hpp b/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
index ee67bf47d7b..ee67bf47d7b 100644
--- a/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
+++ b/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
diff --git a/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp b/storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
index 9a5efebc56e..9a5efebc56e 100644
--- a/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
diff --git a/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
index 2a661104347..2a661104347 100644
--- a/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
diff --git a/ndb/src/kernel/blocks/dbdih/LCP.txt b/storage/ndb/src/kernel/blocks/dbdih/LCP.txt
index 500c82f6baf..500c82f6baf 100644
--- a/ndb/src/kernel/blocks/dbdih/LCP.txt
+++ b/storage/ndb/src/kernel/blocks/dbdih/LCP.txt
diff --git a/storage/ndb/src/kernel/blocks/dbdih/Makefile.am b/storage/ndb/src/kernel/blocks/dbdih/Makefile.am
new file mode 100644
index 00000000000..0b35884a586
--- /dev/null
+++ b/storage/ndb/src/kernel/blocks/dbdih/Makefile.am
@@ -0,0 +1,23 @@
+noinst_LIBRARIES = libdbdih.a
+
+libdbdih_a_SOURCES = DbdihInit.cpp DbdihMain.cpp
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: libdbdih.dsp
+
+libdbdih.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdbdih_a_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/dbdih/Sysfile.hpp b/storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp
index 3e2f3b0dd48..3e2f3b0dd48 100644
--- a/ndb/src/kernel/blocks/dbdih/Sysfile.hpp
+++ b/storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp
diff --git a/ndb/src/kernel/blocks/dbdih/printSysfile/Makefile b/storage/ndb/src/kernel/blocks/dbdih/printSysfile/Makefile
index 4c4b1026aff..4c4b1026aff 100644
--- a/ndb/src/kernel/blocks/dbdih/printSysfile/Makefile
+++ b/storage/ndb/src/kernel/blocks/dbdih/printSysfile/Makefile
diff --git a/ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp b/storage/ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp
index efa4b9c92c5..efa4b9c92c5 100644
--- a/ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp
+++ b/storage/ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp
diff --git a/ndb/src/kernel/blocks/dblqh/Dblqh.hpp b/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
index fa7e8667e27..fa7e8667e27 100644
--- a/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
+++ b/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
diff --git a/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp b/storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
index e39d0ca68a6..e39d0ca68a6 100644
--- a/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
diff --git a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
index 725ea04c148..725ea04c148 100644
--- a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
diff --git a/storage/ndb/src/kernel/blocks/dblqh/Makefile.am b/storage/ndb/src/kernel/blocks/dblqh/Makefile.am
new file mode 100644
index 00000000000..4807a8ec5d0
--- /dev/null
+++ b/storage/ndb/src/kernel/blocks/dblqh/Makefile.am
@@ -0,0 +1,25 @@
+#SUBDIRS = redoLogReader
+
+noinst_LIBRARIES = libdblqh.a
+
+libdblqh_a_SOURCES = DblqhInit.cpp DblqhMain.cpp
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: libdblqh.dsp
+
+libdblqh.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdblqh_a_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/dblqh/redoLogReader/Makefile b/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/Makefile
index a89b648de77..a89b648de77 100644
--- a/ndb/src/kernel/blocks/dblqh/redoLogReader/Makefile
+++ b/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/Makefile
diff --git a/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp b/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp
index 092b7840c20..092b7840c20 100644
--- a/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp
+++ b/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp
diff --git a/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp b/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp
index e73986e4d73..e73986e4d73 100644
--- a/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp
+++ b/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp
diff --git a/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp b/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp
index 540df7b507e..540df7b507e 100644
--- a/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp
+++ b/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp
diff --git a/ndb/src/kernel/blocks/dbtc/Dbtc.hpp b/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
index 2983b02de67..2983b02de67 100644
--- a/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
+++ b/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
diff --git a/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp b/storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
index f99b4bf15af..f99b4bf15af 100644
--- a/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
diff --git a/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
index e4cce29ba30..e4cce29ba30 100644
--- a/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
diff --git a/storage/ndb/src/kernel/blocks/dbtc/Makefile.am b/storage/ndb/src/kernel/blocks/dbtc/Makefile.am
new file mode 100644
index 00000000000..4b3b102d8ac
--- /dev/null
+++ b/storage/ndb/src/kernel/blocks/dbtc/Makefile.am
@@ -0,0 +1,23 @@
+noinst_LIBRARIES = libdbtc.a
+
+libdbtc_a_SOURCES = DbtcInit.cpp DbtcMain.cpp
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: libdbtc.dsp
+
+libdbtc.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdbtc_a_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp b/storage/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp
index 2c62adab3e5..2c62adab3e5 100644
--- a/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp
diff --git a/ndb/src/kernel/blocks/dbtup/Dbtup.hpp b/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
index f985e44d307..f985e44d307 100644
--- a/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp
index e9043a8b52d..e9043a8b52d 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp
index 6a478bea917..6a478bea917 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
index 470b98fd04c..470b98fd04c 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp
index 8c43de52a75..8c43de52a75 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
index 761f959acdc..761f959acdc 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp
index cdd54ba2337..cdd54ba2337 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
index 03f02dd0b92..03f02dd0b92 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
index ab6e0642e11..ab6e0642e11 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupLCP.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupLCP.cpp
index 370ef4c4ba5..370ef4c4ba5 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupLCP.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupLCP.cpp
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
index 4ce807528c4..4ce807528c4 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp
index 9722aa437c0..9722aa437c0 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp
index 1f674876642..1f674876642 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
index 3170d23499a..3170d23499a 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp
index 396404faa8c..396404faa8c 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp
index 3b957688a1c..3b957688a1c 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp
index 33d63e8ce49..33d63e8ce49 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp
index 642ba270760..642ba270760 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
index 2b65a8402c2..2b65a8402c2 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupUndoLog.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupUndoLog.cpp
index 869f399583f..869f399583f 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupUndoLog.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupUndoLog.cpp
diff --git a/storage/ndb/src/kernel/blocks/dbtup/Makefile.am b/storage/ndb/src/kernel/blocks/dbtup/Makefile.am
new file mode 100644
index 00000000000..3aee511d039
--- /dev/null
+++ b/storage/ndb/src/kernel/blocks/dbtup/Makefile.am
@@ -0,0 +1,42 @@
+noinst_LIBRARIES = libdbtup.a
+
+libdbtup_a_SOURCES = \
+        DbtupExecQuery.cpp \
+        DbtupBuffer.cpp \
+        DbtupRoutines.cpp \
+        DbtupCommit.cpp \
+        DbtupFixAlloc.cpp \
+        DbtupTrigger.cpp \
+        DbtupAbort.cpp \
+        DbtupLCP.cpp \
+        DbtupUndoLog.cpp \
+        DbtupPageMap.cpp \
+        DbtupPagMan.cpp  \
+        DbtupStoredProcDef.cpp \
+        DbtupMeta.cpp \
+        DbtupTabDesMan.cpp \
+	DbtupGen.cpp \
+        DbtupSystemRestart.cpp \
+	DbtupIndex.cpp \
+	DbtupScan.cpp \
+        DbtupDebug.cpp
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: libdbtup.dsp
+
+libdbtup.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdbtup_a_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/dbtup/Notes.txt b/storage/ndb/src/kernel/blocks/dbtup/Notes.txt
index c2973bb0a76..c2973bb0a76 100644
--- a/ndb/src/kernel/blocks/dbtup/Notes.txt
+++ b/storage/ndb/src/kernel/blocks/dbtup/Notes.txt
diff --git a/ndb/src/kernel/blocks/dbtux/Dbtux.hpp b/storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
index d4a44b9e641..d4a44b9e641 100644
--- a/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
diff --git a/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp
index cf815b14c1a..cf815b14c1a 100644
--- a/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp
diff --git a/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp
index ed29dc57915..ed29dc57915 100644
--- a/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp
diff --git a/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
index 5640fdf2899..5640fdf2899 100644
--- a/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
diff --git a/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp
index 4b568badc67..4b568badc67 100644
--- a/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp
diff --git a/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp
index 93c4a583624..93c4a583624 100644
--- a/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp
diff --git a/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp
index 68a3e78ce9e..68a3e78ce9e 100644
--- a/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp
diff --git a/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp
index a61b7c1f5ca..a61b7c1f5ca 100644
--- a/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp
diff --git a/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp
index b0e2a664bfd..b0e2a664bfd 100644
--- a/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp
diff --git a/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp b/storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp
index 5107a8d8e31..5107a8d8e31 100644
--- a/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp
+++ b/storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp
diff --git a/storage/ndb/src/kernel/blocks/dbtux/Makefile.am b/storage/ndb/src/kernel/blocks/dbtux/Makefile.am
new file mode 100644
index 00000000000..12d450e8632
--- /dev/null
+++ b/storage/ndb/src/kernel/blocks/dbtux/Makefile.am
@@ -0,0 +1,34 @@
+noinst_LIBRARIES = libdbtux.a
+
+libdbtux_a_SOURCES = \
+                        DbtuxGen.cpp \
+			DbtuxMeta.cpp \
+			DbtuxMaint.cpp \
+			DbtuxNode.cpp \
+			DbtuxTree.cpp \
+			DbtuxScan.cpp \
+			DbtuxSearch.cpp \
+			DbtuxCmp.cpp \
+			DbtuxDebug.cpp
+
+INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/kernel/blocks/dbtup
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: libdbtux.dsp
+
+libdbtux.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdbtux_a_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/dbtux/Times.txt b/storage/ndb/src/kernel/blocks/dbtux/Times.txt
index 68120084846..68120084846 100644
--- a/ndb/src/kernel/blocks/dbtux/Times.txt
+++ b/storage/ndb/src/kernel/blocks/dbtux/Times.txt
diff --git a/ndb/src/kernel/blocks/dbtux/tuxstatus.html b/storage/ndb/src/kernel/blocks/dbtux/tuxstatus.html
index 264809cefd3..264809cefd3 100644
--- a/ndb/src/kernel/blocks/dbtux/tuxstatus.html
+++ b/storage/ndb/src/kernel/blocks/dbtux/tuxstatus.html
diff --git a/ndb/src/kernel/blocks/dbutil/DbUtil.cpp b/storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
index b94bb8e6d7e..b94bb8e6d7e 100644
--- a/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
+++ b/storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
diff --git a/ndb/src/kernel/blocks/dbutil/DbUtil.hpp b/storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp
index 5499970fde3..5499970fde3 100644
--- a/ndb/src/kernel/blocks/dbutil/DbUtil.hpp
+++ b/storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp
diff --git a/ndb/src/kernel/blocks/dbutil/DbUtil.txt b/storage/ndb/src/kernel/blocks/dbutil/DbUtil.txt
index cc8c1985009..cc8c1985009 100644
--- a/ndb/src/kernel/blocks/dbutil/DbUtil.txt
+++ b/storage/ndb/src/kernel/blocks/dbutil/DbUtil.txt
diff --git a/storage/ndb/src/kernel/blocks/dbutil/Makefile.am b/storage/ndb/src/kernel/blocks/dbutil/Makefile.am
new file mode 100644
index 00000000000..4a0b180283e
--- /dev/null
+++ b/storage/ndb/src/kernel/blocks/dbutil/Makefile.am
@@ -0,0 +1,23 @@
+noinst_LIBRARIES = libdbutil.a
+
+libdbutil_a_SOURCES = DbUtil.cpp
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: libdbutil.dsp
+
+libdbutil.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdbutil_a_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/grep/Grep.cpp b/storage/ndb/src/kernel/blocks/grep/Grep.cpp
index 0527c5415ab..0527c5415ab 100644
--- a/ndb/src/kernel/blocks/grep/Grep.cpp
+++ b/storage/ndb/src/kernel/blocks/grep/Grep.cpp
diff --git a/ndb/src/kernel/blocks/grep/Grep.hpp b/storage/ndb/src/kernel/blocks/grep/Grep.hpp
index a14143294e1..a14143294e1 100644
--- a/ndb/src/kernel/blocks/grep/Grep.hpp
+++ b/storage/ndb/src/kernel/blocks/grep/Grep.hpp
diff --git a/ndb/src/kernel/blocks/grep/GrepInit.cpp b/storage/ndb/src/kernel/blocks/grep/GrepInit.cpp
index d764fb1f473..d764fb1f473 100644
--- a/ndb/src/kernel/blocks/grep/GrepInit.cpp
+++ b/storage/ndb/src/kernel/blocks/grep/GrepInit.cpp
diff --git a/storage/ndb/src/kernel/blocks/grep/Makefile.am b/storage/ndb/src/kernel/blocks/grep/Makefile.am
new file mode 100644
index 00000000000..92d75d002a5
--- /dev/null
+++ b/storage/ndb/src/kernel/blocks/grep/Makefile.am
@@ -0,0 +1,23 @@
+noinst_LIBRARIES = libgrep.a
+
+libgrep_a_SOURCES = Grep.cpp GrepInit.cpp 
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: libgrep.dsp
+
+libgrep.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libgrep_a_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/grep/systab_test/Makefile b/storage/ndb/src/kernel/blocks/grep/systab_test/Makefile
index bd69e0f3799..bd69e0f3799 100644
--- a/ndb/src/kernel/blocks/grep/systab_test/Makefile
+++ b/storage/ndb/src/kernel/blocks/grep/systab_test/Makefile
diff --git a/ndb/src/kernel/blocks/grep/systab_test/grep_systab_test.cpp b/storage/ndb/src/kernel/blocks/grep/systab_test/grep_systab_test.cpp
index e3a77af4e4e..e3a77af4e4e 100644
--- a/ndb/src/kernel/blocks/grep/systab_test/grep_systab_test.cpp
+++ b/storage/ndb/src/kernel/blocks/grep/systab_test/grep_systab_test.cpp
diff --git a/ndb/src/kernel/blocks/mutexes.hpp b/storage/ndb/src/kernel/blocks/mutexes.hpp
index 5c0276fc4fa..5c0276fc4fa 100644
--- a/ndb/src/kernel/blocks/mutexes.hpp
+++ b/storage/ndb/src/kernel/blocks/mutexes.hpp
diff --git a/storage/ndb/src/kernel/blocks/ndbcntr/Makefile.am b/storage/ndb/src/kernel/blocks/ndbcntr/Makefile.am
new file mode 100644
index 00000000000..7bdcf046a19
--- /dev/null
+++ b/storage/ndb/src/kernel/blocks/ndbcntr/Makefile.am
@@ -0,0 +1,26 @@
+noinst_LIBRARIES = libndbcntr.a
+
+libndbcntr_a_SOURCES = \
+	NdbcntrInit.cpp	\
+	NdbcntrSysTable.cpp \
+	NdbcntrMain.cpp
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: libndbcntr.dsp
+
+libndbcntr.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libstorage/ndbcntr_a_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp b/storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp
index 639d300d6df..639d300d6df 100644
--- a/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp
+++ b/storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp
diff --git a/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp b/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
index c7b472fc91a..c7b472fc91a 100644
--- a/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
diff --git a/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp b/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
index 524a40697bf..524a40697bf 100644
--- a/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
diff --git a/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp b/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp
index 2a65271a32a..2a65271a32a 100644
--- a/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp
diff --git a/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
index f76440a462a..f76440a462a 100644
--- a/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
diff --git a/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp
index 2176c93c5d5..2176c93c5d5 100644
--- a/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp
diff --git a/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp
index 004752c9543..004752c9543 100644
--- a/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp
diff --git a/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/Makefile b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/Makefile
index b0356e6da68..b0356e6da68 100644
--- a/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/Makefile
+++ b/storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/Makefile
diff --git a/ndb/src/kernel/blocks/ndbfs/CircularIndex.cpp b/storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.cpp
index 30b40097c9b..30b40097c9b 100644
--- a/ndb/src/kernel/blocks/ndbfs/CircularIndex.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.cpp
diff --git a/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp b/storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp
index 349cccdbcb4..349cccdbcb4 100644
--- a/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp
diff --git a/ndb/src/kernel/blocks/ndbfs/Filename.cpp b/storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp
index 15158ec19ef..15158ec19ef 100644
--- a/ndb/src/kernel/blocks/ndbfs/Filename.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp
diff --git a/ndb/src/kernel/blocks/ndbfs/Filename.hpp b/storage/ndb/src/kernel/blocks/ndbfs/Filename.hpp
index 249c1b1ca10..249c1b1ca10 100644
--- a/ndb/src/kernel/blocks/ndbfs/Filename.hpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/Filename.hpp
diff --git a/storage/ndb/src/kernel/blocks/ndbfs/Makefile.am b/storage/ndb/src/kernel/blocks/ndbfs/Makefile.am
new file mode 100644
index 00000000000..b4233720003
--- /dev/null
+++ b/storage/ndb/src/kernel/blocks/ndbfs/Makefile.am
@@ -0,0 +1,27 @@
+noinst_LIBRARIES = libndbfs.a
+
+libndbfs_a_SOURCES = \
+	AsyncFile.cpp			\
+	Ndbfs.cpp VoidFs.cpp	\
+	Filename.cpp			\
+	CircularIndex.cpp
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: libndbfs.dsp
+
+libndbfs.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libstorage/ndbfs_a_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp b/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp
index a1aebdef7a1..a1aebdef7a1 100644
--- a/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp
diff --git a/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp b/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp
index 03911d195ec..03911d195ec 100644
--- a/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp
diff --git a/ndb/src/kernel/blocks/ndbfs/MemoryChannelOSE.hpp b/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelOSE.hpp
index ca90bc60153..ca90bc60153 100644
--- a/ndb/src/kernel/blocks/ndbfs/MemoryChannelOSE.hpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelOSE.hpp
diff --git a/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/Makefile b/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/Makefile
index 68f71bfc4cd..68f71bfc4cd 100644
--- a/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/Makefile
+++ b/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/Makefile
diff --git a/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp b/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp
index b98c60693f4..b98c60693f4 100644
--- a/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp
diff --git a/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp b/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
index 6f848d7fe16..6f848d7fe16 100644
--- a/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
diff --git a/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp b/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp
index c5aaa4e5c49..c5aaa4e5c49 100644
--- a/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp
diff --git a/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp b/storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp
index 0fee687f1bc..0fee687f1bc 100644
--- a/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp
diff --git a/ndb/src/kernel/blocks/ndbfs/Pool.hpp b/storage/ndb/src/kernel/blocks/ndbfs/Pool.hpp
index 0410673af6f..0410673af6f 100644
--- a/ndb/src/kernel/blocks/ndbfs/Pool.hpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/Pool.hpp
diff --git a/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp b/storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp
index d093089acfc..d093089acfc 100644
--- a/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp
+++ b/storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp
diff --git a/ndb/src/kernel/blocks/new-block.tar.gz b/storage/ndb/src/kernel/blocks/new-block.tar.gz
index 327503ea0b1..327503ea0b1 100644
--- a/ndb/src/kernel/blocks/new-block.tar.gz
+++ b/storage/ndb/src/kernel/blocks/new-block.tar.gz
diff --git a/storage/ndb/src/kernel/blocks/qmgr/Makefile.am b/storage/ndb/src/kernel/blocks/qmgr/Makefile.am
new file mode 100644
index 00000000000..577a31348ad
--- /dev/null
+++ b/storage/ndb/src/kernel/blocks/qmgr/Makefile.am
@@ -0,0 +1,25 @@
+noinst_LIBRARIES = libqmgr.a
+
+libqmgr_a_SOURCES = \
+	QmgrInit.cpp	\
+	QmgrMain.cpp
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: libqmgr.dsp
+
+libqmgr.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libqmgr_a_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/qmgr/Qmgr.hpp b/storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp
index bff79215264..bff79215264 100644
--- a/ndb/src/kernel/blocks/qmgr/Qmgr.hpp
+++ b/storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp
diff --git a/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp b/storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
index ecaeadff47a..ecaeadff47a 100644
--- a/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
+++ b/storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
diff --git a/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp b/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
index 04373dae93c..04373dae93c 100644
--- a/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
+++ b/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
diff --git a/ndb/src/kernel/blocks/qmgr/timer.hpp b/storage/ndb/src/kernel/blocks/qmgr/timer.hpp
index 9c35a23766c..9c35a23766c 100644
--- a/ndb/src/kernel/blocks/qmgr/timer.hpp
+++ b/storage/ndb/src/kernel/blocks/qmgr/timer.hpp
diff --git a/storage/ndb/src/kernel/blocks/suma/Makefile.am b/storage/ndb/src/kernel/blocks/suma/Makefile.am
new file mode 100644
index 00000000000..6fd7033e068
--- /dev/null
+++ b/storage/ndb/src/kernel/blocks/suma/Makefile.am
@@ -0,0 +1,23 @@
+noinst_LIBRARIES = libsuma.a
+
+libsuma_a_SOURCES = Suma.cpp SumaInit.cpp
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: libsuma.dsp
+
+libsuma.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libsuma_a_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/suma/Suma.cpp b/storage/ndb/src/kernel/blocks/suma/Suma.cpp
index ed54505b729..ed54505b729 100644
--- a/ndb/src/kernel/blocks/suma/Suma.cpp
+++ b/storage/ndb/src/kernel/blocks/suma/Suma.cpp
diff --git a/ndb/src/kernel/blocks/suma/Suma.hpp b/storage/ndb/src/kernel/blocks/suma/Suma.hpp
index 65869f44423..65869f44423 100644
--- a/ndb/src/kernel/blocks/suma/Suma.hpp
+++ b/storage/ndb/src/kernel/blocks/suma/Suma.hpp
diff --git a/ndb/src/kernel/blocks/suma/Suma.txt b/storage/ndb/src/kernel/blocks/suma/Suma.txt
index eba031226ef..eba031226ef 100644
--- a/ndb/src/kernel/blocks/suma/Suma.txt
+++ b/storage/ndb/src/kernel/blocks/suma/Suma.txt
diff --git a/ndb/src/kernel/blocks/suma/SumaInit.cpp b/storage/ndb/src/kernel/blocks/suma/SumaInit.cpp
index b5945db3811..b5945db3811 100644
--- a/ndb/src/kernel/blocks/suma/SumaInit.cpp
+++ b/storage/ndb/src/kernel/blocks/suma/SumaInit.cpp
diff --git a/storage/ndb/src/kernel/blocks/trix/Makefile.am b/storage/ndb/src/kernel/blocks/trix/Makefile.am
new file mode 100644
index 00000000000..886a9dc60f0
--- /dev/null
+++ b/storage/ndb/src/kernel/blocks/trix/Makefile.am
@@ -0,0 +1,23 @@
+noinst_LIBRARIES = libtrix.a
+
+libtrix_a_SOURCES = Trix.cpp
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: libtrix.dsp
+
+libtrix.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libtrix_a_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/blocks/trix/Trix.cpp b/storage/ndb/src/kernel/blocks/trix/Trix.cpp
index cd11cb4d575..cd11cb4d575 100644
--- a/ndb/src/kernel/blocks/trix/Trix.cpp
+++ b/storage/ndb/src/kernel/blocks/trix/Trix.cpp
diff --git a/ndb/src/kernel/blocks/trix/Trix.hpp b/storage/ndb/src/kernel/blocks/trix/Trix.hpp
index 8dc01375fa1..8dc01375fa1 100644
--- a/ndb/src/kernel/blocks/trix/Trix.hpp
+++ b/storage/ndb/src/kernel/blocks/trix/Trix.hpp
diff --git a/ndb/src/kernel/error/Error.hpp b/storage/ndb/src/kernel/error/Error.hpp
index e19d6782793..e19d6782793 100644
--- a/ndb/src/kernel/error/Error.hpp
+++ b/storage/ndb/src/kernel/error/Error.hpp
diff --git a/ndb/src/kernel/error/ErrorHandlingMacros.hpp b/storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp
index d8bb7ff759b..d8bb7ff759b 100644
--- a/ndb/src/kernel/error/ErrorHandlingMacros.hpp
+++ b/storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp
diff --git a/ndb/src/kernel/error/ErrorMessages.cpp b/storage/ndb/src/kernel/error/ErrorMessages.cpp
index 059aa4af61c..059aa4af61c 100644
--- a/ndb/src/kernel/error/ErrorMessages.cpp
+++ b/storage/ndb/src/kernel/error/ErrorMessages.cpp
diff --git a/ndb/src/kernel/error/ErrorMessages.hpp b/storage/ndb/src/kernel/error/ErrorMessages.hpp
index 38c8eec636b..38c8eec636b 100644
--- a/ndb/src/kernel/error/ErrorMessages.hpp
+++ b/storage/ndb/src/kernel/error/ErrorMessages.hpp
diff --git a/ndb/src/kernel/error/ErrorReporter.cpp b/storage/ndb/src/kernel/error/ErrorReporter.cpp
index e4ead4ce34d..e4ead4ce34d 100644
--- a/ndb/src/kernel/error/ErrorReporter.cpp
+++ b/storage/ndb/src/kernel/error/ErrorReporter.cpp
diff --git a/ndb/src/kernel/error/ErrorReporter.hpp b/storage/ndb/src/kernel/error/ErrorReporter.hpp
index 2c79f242eea..2c79f242eea 100644
--- a/ndb/src/kernel/error/ErrorReporter.hpp
+++ b/storage/ndb/src/kernel/error/ErrorReporter.hpp
diff --git a/storage/ndb/src/kernel/error/Makefile.am b/storage/ndb/src/kernel/error/Makefile.am
new file mode 100644
index 00000000000..b6e3b7962fa
--- /dev/null
+++ b/storage/ndb/src/kernel/error/Makefile.am
@@ -0,0 +1,25 @@
+noinst_LIBRARIES = liberror.a
+
+liberror_a_SOURCES = TimeModule.cpp \
+	ErrorReporter.cpp \
+	ErrorMessages.cpp
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: liberror.dsp
+
+liberror.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(liberror_a_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/error/TimeModule.cpp b/storage/ndb/src/kernel/error/TimeModule.cpp
index 4bd8e3daf99..4bd8e3daf99 100644
--- a/ndb/src/kernel/error/TimeModule.cpp
+++ b/storage/ndb/src/kernel/error/TimeModule.cpp
diff --git a/ndb/src/kernel/error/TimeModule.hpp b/storage/ndb/src/kernel/error/TimeModule.hpp
index f1414c77af3..f1414c77af3 100644
--- a/ndb/src/kernel/error/TimeModule.hpp
+++ b/storage/ndb/src/kernel/error/TimeModule.hpp
diff --git a/ndb/src/kernel/main.cpp b/storage/ndb/src/kernel/main.cpp
index f679646e14a..f679646e14a 100644
--- a/ndb/src/kernel/main.cpp
+++ b/storage/ndb/src/kernel/main.cpp
diff --git a/ndb/src/kernel/vm/Array.hpp b/storage/ndb/src/kernel/vm/Array.hpp
index 97b0a345cb4..97b0a345cb4 100644
--- a/ndb/src/kernel/vm/Array.hpp
+++ b/storage/ndb/src/kernel/vm/Array.hpp
diff --git a/ndb/src/kernel/vm/ArrayFifoList.hpp b/storage/ndb/src/kernel/vm/ArrayFifoList.hpp
index b21bf449734..b21bf449734 100644
--- a/ndb/src/kernel/vm/ArrayFifoList.hpp
+++ b/storage/ndb/src/kernel/vm/ArrayFifoList.hpp
diff --git a/ndb/src/kernel/vm/ArrayList.hpp b/storage/ndb/src/kernel/vm/ArrayList.hpp
index 4b46347a39b..4b46347a39b 100644
--- a/ndb/src/kernel/vm/ArrayList.hpp
+++ b/storage/ndb/src/kernel/vm/ArrayList.hpp
diff --git a/ndb/src/kernel/vm/ArrayPool.hpp b/storage/ndb/src/kernel/vm/ArrayPool.hpp
index 924ed51ee15..924ed51ee15 100644
--- a/ndb/src/kernel/vm/ArrayPool.hpp
+++ b/storage/ndb/src/kernel/vm/ArrayPool.hpp
diff --git a/ndb/src/kernel/vm/CArray.hpp b/storage/ndb/src/kernel/vm/CArray.hpp
index a6e84e2c041..a6e84e2c041 100644
--- a/ndb/src/kernel/vm/CArray.hpp
+++ b/storage/ndb/src/kernel/vm/CArray.hpp
diff --git a/ndb/src/kernel/vm/Callback.hpp b/storage/ndb/src/kernel/vm/Callback.hpp
index 6a619ba7859..6a619ba7859 100644
--- a/ndb/src/kernel/vm/Callback.hpp
+++ b/storage/ndb/src/kernel/vm/Callback.hpp
diff --git a/ndb/src/kernel/vm/ClusterConfiguration.cpp b/storage/ndb/src/kernel/vm/ClusterConfiguration.cpp
index d5bd03f69d5..d5bd03f69d5 100644
--- a/ndb/src/kernel/vm/ClusterConfiguration.cpp
+++ b/storage/ndb/src/kernel/vm/ClusterConfiguration.cpp
diff --git a/ndb/src/kernel/vm/ClusterConfiguration.hpp b/storage/ndb/src/kernel/vm/ClusterConfiguration.hpp
index cc7000a54ef..cc7000a54ef 100644
--- a/ndb/src/kernel/vm/ClusterConfiguration.hpp
+++ b/storage/ndb/src/kernel/vm/ClusterConfiguration.hpp
diff --git a/ndb/src/kernel/vm/Configuration.cpp b/storage/ndb/src/kernel/vm/Configuration.cpp
index 650d914035f..650d914035f 100644
--- a/ndb/src/kernel/vm/Configuration.cpp
+++ b/storage/ndb/src/kernel/vm/Configuration.cpp
diff --git a/ndb/src/kernel/vm/Configuration.hpp b/storage/ndb/src/kernel/vm/Configuration.hpp
index 6ca6d9a1f17..6ca6d9a1f17 100644
--- a/ndb/src/kernel/vm/Configuration.hpp
+++ b/storage/ndb/src/kernel/vm/Configuration.hpp
diff --git a/ndb/src/kernel/vm/DLFifoList.hpp b/storage/ndb/src/kernel/vm/DLFifoList.hpp
index b139ade831d..b139ade831d 100644
--- a/ndb/src/kernel/vm/DLFifoList.hpp
+++ b/storage/ndb/src/kernel/vm/DLFifoList.hpp
diff --git a/ndb/src/kernel/vm/DLHashTable.hpp b/storage/ndb/src/kernel/vm/DLHashTable.hpp
index 13a9632f8da..13a9632f8da 100644
--- a/ndb/src/kernel/vm/DLHashTable.hpp
+++ b/storage/ndb/src/kernel/vm/DLHashTable.hpp
diff --git a/ndb/src/kernel/vm/DLHashTable2.hpp b/storage/ndb/src/kernel/vm/DLHashTable2.hpp
index 6b166331631..6b166331631 100644
--- a/ndb/src/kernel/vm/DLHashTable2.hpp
+++ b/storage/ndb/src/kernel/vm/DLHashTable2.hpp
diff --git a/ndb/src/kernel/vm/DLList.hpp b/storage/ndb/src/kernel/vm/DLList.hpp
index b7820eb9229..b7820eb9229 100644
--- a/ndb/src/kernel/vm/DLList.hpp
+++ b/storage/ndb/src/kernel/vm/DLList.hpp
diff --git a/ndb/src/kernel/vm/DataBuffer.hpp b/storage/ndb/src/kernel/vm/DataBuffer.hpp
index 7f553898eb5..7f553898eb5 100644
--- a/ndb/src/kernel/vm/DataBuffer.hpp
+++ b/storage/ndb/src/kernel/vm/DataBuffer.hpp
diff --git a/ndb/src/kernel/vm/Emulator.cpp b/storage/ndb/src/kernel/vm/Emulator.cpp
index d6ed6c0dafd..d6ed6c0dafd 100644
--- a/ndb/src/kernel/vm/Emulator.cpp
+++ b/storage/ndb/src/kernel/vm/Emulator.cpp
diff --git a/ndb/src/kernel/vm/Emulator.hpp b/storage/ndb/src/kernel/vm/Emulator.hpp
index dba8cb3ab9b..dba8cb3ab9b 100644
--- a/ndb/src/kernel/vm/Emulator.hpp
+++ b/storage/ndb/src/kernel/vm/Emulator.hpp
diff --git a/ndb/src/kernel/vm/FastScheduler.cpp b/storage/ndb/src/kernel/vm/FastScheduler.cpp
index a2d806571fe..a2d806571fe 100644
--- a/ndb/src/kernel/vm/FastScheduler.cpp
+++ b/storage/ndb/src/kernel/vm/FastScheduler.cpp
diff --git a/ndb/src/kernel/vm/FastScheduler.hpp b/storage/ndb/src/kernel/vm/FastScheduler.hpp
index dc707e47eef..dc707e47eef 100644
--- a/ndb/src/kernel/vm/FastScheduler.hpp
+++ b/storage/ndb/src/kernel/vm/FastScheduler.hpp
diff --git a/ndb/src/kernel/vm/GlobalData.hpp b/storage/ndb/src/kernel/vm/GlobalData.hpp
index 99b65727374..99b65727374 100644
--- a/ndb/src/kernel/vm/GlobalData.hpp
+++ b/storage/ndb/src/kernel/vm/GlobalData.hpp
diff --git a/ndb/src/kernel/vm/KeyTable.hpp b/storage/ndb/src/kernel/vm/KeyTable.hpp
index e78837b5c8a..e78837b5c8a 100644
--- a/ndb/src/kernel/vm/KeyTable.hpp
+++ b/storage/ndb/src/kernel/vm/KeyTable.hpp
diff --git a/ndb/src/kernel/vm/KeyTable2.hpp b/storage/ndb/src/kernel/vm/KeyTable2.hpp
index 5c2b3096abe..5c2b3096abe 100644
--- a/ndb/src/kernel/vm/KeyTable2.hpp
+++ b/storage/ndb/src/kernel/vm/KeyTable2.hpp
diff --git a/ndb/src/kernel/vm/LongSignal.hpp b/storage/ndb/src/kernel/vm/LongSignal.hpp
index 9818358011f..9818358011f 100644
--- a/ndb/src/kernel/vm/LongSignal.hpp
+++ b/storage/ndb/src/kernel/vm/LongSignal.hpp
diff --git a/storage/ndb/src/kernel/vm/Makefile.am b/storage/ndb/src/kernel/vm/Makefile.am
new file mode 100644
index 00000000000..fc12a3371fd
--- /dev/null
+++ b/storage/ndb/src/kernel/vm/Makefile.am
@@ -0,0 +1,44 @@
+#SUBDIRS = testCopy testDataBuffer testSimplePropertiesSection
+#ifneq ($(USE_EDITLINE), N)
+#DIRS += testLongSig
+#endif
+
+noinst_LIBRARIES = libkernel.a
+
+libkernel_a_SOURCES = \
+	SimulatedBlock.cpp	\
+	FastScheduler.cpp		\
+	TimeQueue.cpp		\
+	VMSignal.cpp		\
+	ThreadConfig.cpp          \
+	TransporterCallback.cpp \
+	Emulator.cpp		\
+	Configuration.cpp		\
+	WatchDog.cpp \
+        SimplePropertiesSection.cpp \
+        SectionReader.cpp \
+	MetaData.cpp \
+        Mutex.cpp SafeCounter.cpp \
+	SuperPool.cpp
+
+INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/mgmapi
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: libkernel.dsp
+
+libkernel.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libkernel_a_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/kernel/vm/MetaData.cpp b/storage/ndb/src/kernel/vm/MetaData.cpp
index 51afbf21503..51afbf21503 100644
--- a/ndb/src/kernel/vm/MetaData.cpp
+++ b/storage/ndb/src/kernel/vm/MetaData.cpp
diff --git a/ndb/src/kernel/vm/MetaData.hpp b/storage/ndb/src/kernel/vm/MetaData.hpp
index 1000114a421..1000114a421 100644
--- a/ndb/src/kernel/vm/MetaData.hpp
+++ b/storage/ndb/src/kernel/vm/MetaData.hpp
diff --git a/ndb/src/kernel/vm/Mutex.cpp b/storage/ndb/src/kernel/vm/Mutex.cpp
index aab9e74312b..aab9e74312b 100644
--- a/ndb/src/kernel/vm/Mutex.cpp
+++ b/storage/ndb/src/kernel/vm/Mutex.cpp
diff --git a/ndb/src/kernel/vm/Mutex.hpp b/storage/ndb/src/kernel/vm/Mutex.hpp
index 7a16046188c..7a16046188c 100644
--- a/ndb/src/kernel/vm/Mutex.hpp
+++ b/storage/ndb/src/kernel/vm/Mutex.hpp
diff --git a/ndb/src/kernel/vm/Prio.hpp b/storage/ndb/src/kernel/vm/Prio.hpp
index 4c9c22b0afe..4c9c22b0afe 100644
--- a/ndb/src/kernel/vm/Prio.hpp
+++ b/storage/ndb/src/kernel/vm/Prio.hpp
diff --git a/ndb/src/kernel/vm/RequestTracker.hpp b/storage/ndb/src/kernel/vm/RequestTracker.hpp
index 5fd1ae7255a..5fd1ae7255a 100644
--- a/ndb/src/kernel/vm/RequestTracker.hpp
+++ b/storage/ndb/src/kernel/vm/RequestTracker.hpp
diff --git a/ndb/src/kernel/vm/SLList.hpp b/storage/ndb/src/kernel/vm/SLList.hpp
index 5fde41aa3e0..5fde41aa3e0 100644
--- a/ndb/src/kernel/vm/SLList.hpp
+++ b/storage/ndb/src/kernel/vm/SLList.hpp
diff --git a/ndb/src/kernel/vm/SafeCounter.cpp b/storage/ndb/src/kernel/vm/SafeCounter.cpp
index b09ad08b026..b09ad08b026 100644
--- a/ndb/src/kernel/vm/SafeCounter.cpp
+++ b/storage/ndb/src/kernel/vm/SafeCounter.cpp
diff --git a/ndb/src/kernel/vm/SafeCounter.hpp b/storage/ndb/src/kernel/vm/SafeCounter.hpp
index 1f3cc15c2d6..1f3cc15c2d6 100644
--- a/ndb/src/kernel/vm/SafeCounter.hpp
+++ b/storage/ndb/src/kernel/vm/SafeCounter.hpp
diff --git a/ndb/src/kernel/vm/SectionReader.cpp b/storage/ndb/src/kernel/vm/SectionReader.cpp
index dd474a49e50..dd474a49e50 100644
--- a/ndb/src/kernel/vm/SectionReader.cpp
+++ b/storage/ndb/src/kernel/vm/SectionReader.cpp
diff --git a/ndb/src/kernel/vm/SectionReader.hpp b/storage/ndb/src/kernel/vm/SectionReader.hpp
index b51006b6128..b51006b6128 100644
--- a/ndb/src/kernel/vm/SectionReader.hpp
+++ b/storage/ndb/src/kernel/vm/SectionReader.hpp
diff --git a/ndb/src/kernel/vm/SignalCounter.hpp b/storage/ndb/src/kernel/vm/SignalCounter.hpp
index 62242cb65bd..62242cb65bd 100644
--- a/ndb/src/kernel/vm/SignalCounter.hpp
+++ b/storage/ndb/src/kernel/vm/SignalCounter.hpp
diff --git a/ndb/src/kernel/vm/SimBlockList.hpp b/storage/ndb/src/kernel/vm/SimBlockList.hpp
index 40485a37425..40485a37425 100644
--- a/ndb/src/kernel/vm/SimBlockList.hpp
+++ b/storage/ndb/src/kernel/vm/SimBlockList.hpp
diff --git a/ndb/src/kernel/vm/SimplePropertiesSection.cpp b/storage/ndb/src/kernel/vm/SimplePropertiesSection.cpp
index 070563be36b..070563be36b 100644
--- a/ndb/src/kernel/vm/SimplePropertiesSection.cpp
+++ b/storage/ndb/src/kernel/vm/SimplePropertiesSection.cpp
diff --git a/ndb/src/kernel/vm/SimulatedBlock.cpp b/storage/ndb/src/kernel/vm/SimulatedBlock.cpp
index 35c0781a24d..35c0781a24d 100644
--- a/ndb/src/kernel/vm/SimulatedBlock.cpp
+++ b/storage/ndb/src/kernel/vm/SimulatedBlock.cpp
diff --git a/ndb/src/kernel/vm/SimulatedBlock.hpp b/storage/ndb/src/kernel/vm/SimulatedBlock.hpp
index 787d14ca5cb..787d14ca5cb 100644
--- a/ndb/src/kernel/vm/SimulatedBlock.hpp
+++ b/storage/ndb/src/kernel/vm/SimulatedBlock.hpp
diff --git a/ndb/src/kernel/vm/SuperPool.cpp b/storage/ndb/src/kernel/vm/SuperPool.cpp
index 65e5dd99629..65e5dd99629 100644
--- a/ndb/src/kernel/vm/SuperPool.cpp
+++ b/storage/ndb/src/kernel/vm/SuperPool.cpp
diff --git a/ndb/src/kernel/vm/SuperPool.hpp b/storage/ndb/src/kernel/vm/SuperPool.hpp
index 157c75aa0d5..157c75aa0d5 100644
--- a/ndb/src/kernel/vm/SuperPool.hpp
+++ b/storage/ndb/src/kernel/vm/SuperPool.hpp
diff --git a/ndb/src/kernel/vm/ThreadConfig.cpp b/storage/ndb/src/kernel/vm/ThreadConfig.cpp
index 76fcc4ba84f..76fcc4ba84f 100644
--- a/ndb/src/kernel/vm/ThreadConfig.cpp
+++ b/storage/ndb/src/kernel/vm/ThreadConfig.cpp
diff --git a/ndb/src/kernel/vm/ThreadConfig.hpp b/storage/ndb/src/kernel/vm/ThreadConfig.hpp
index 91c2cafe0e0..91c2cafe0e0 100644
--- a/ndb/src/kernel/vm/ThreadConfig.hpp
+++ b/storage/ndb/src/kernel/vm/ThreadConfig.hpp
diff --git a/ndb/src/kernel/vm/TimeQueue.cpp b/storage/ndb/src/kernel/vm/TimeQueue.cpp
index 56988c2e3da..56988c2e3da 100644
--- a/ndb/src/kernel/vm/TimeQueue.cpp
+++ b/storage/ndb/src/kernel/vm/TimeQueue.cpp
diff --git a/ndb/src/kernel/vm/TimeQueue.hpp b/storage/ndb/src/kernel/vm/TimeQueue.hpp
index 1203ace10f5..1203ace10f5 100644
--- a/ndb/src/kernel/vm/TimeQueue.hpp
+++ b/storage/ndb/src/kernel/vm/TimeQueue.hpp
diff --git a/ndb/src/kernel/vm/TransporterCallback.cpp b/storage/ndb/src/kernel/vm/TransporterCallback.cpp
index 0f292143c21..0f292143c21 100644
--- a/ndb/src/kernel/vm/TransporterCallback.cpp
+++ b/storage/ndb/src/kernel/vm/TransporterCallback.cpp
diff --git a/ndb/src/kernel/vm/VMSignal.cpp b/storage/ndb/src/kernel/vm/VMSignal.cpp
index e4eafb47ff7..e4eafb47ff7 100644
--- a/ndb/src/kernel/vm/VMSignal.cpp
+++ b/storage/ndb/src/kernel/vm/VMSignal.cpp
diff --git a/ndb/src/kernel/vm/VMSignal.hpp b/storage/ndb/src/kernel/vm/VMSignal.hpp
index 45543c5d174..45543c5d174 100644
--- a/ndb/src/kernel/vm/VMSignal.hpp
+++ b/storage/ndb/src/kernel/vm/VMSignal.hpp
diff --git a/ndb/src/kernel/vm/WaitQueue.hpp b/storage/ndb/src/kernel/vm/WaitQueue.hpp
index 4d7240b6866..4d7240b6866 100644
--- a/ndb/src/kernel/vm/WaitQueue.hpp
+++ b/storage/ndb/src/kernel/vm/WaitQueue.hpp
diff --git a/ndb/src/kernel/vm/WatchDog.cpp b/storage/ndb/src/kernel/vm/WatchDog.cpp
index 23475a478d3..23475a478d3 100644
--- a/ndb/src/kernel/vm/WatchDog.cpp
+++ b/storage/ndb/src/kernel/vm/WatchDog.cpp
diff --git a/ndb/src/kernel/vm/WatchDog.hpp b/storage/ndb/src/kernel/vm/WatchDog.hpp
index 4b44b1a96a2..4b44b1a96a2 100644
--- a/ndb/src/kernel/vm/WatchDog.hpp
+++ b/storage/ndb/src/kernel/vm/WatchDog.hpp
diff --git a/ndb/src/kernel/vm/al_test/Makefile b/storage/ndb/src/kernel/vm/al_test/Makefile
index a7287a341fd..a7287a341fd 100644
--- a/ndb/src/kernel/vm/al_test/Makefile
+++ b/storage/ndb/src/kernel/vm/al_test/Makefile
diff --git a/ndb/src/kernel/vm/al_test/arrayListTest.cpp b/storage/ndb/src/kernel/vm/al_test/arrayListTest.cpp
index bb320106653..bb320106653 100644
--- a/ndb/src/kernel/vm/al_test/arrayListTest.cpp
+++ b/storage/ndb/src/kernel/vm/al_test/arrayListTest.cpp
diff --git a/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp b/storage/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp
index e80905121e1..e80905121e1 100644
--- a/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp
+++ b/storage/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp
diff --git a/ndb/src/kernel/vm/al_test/main.cpp b/storage/ndb/src/kernel/vm/al_test/main.cpp
index 23193b50725..23193b50725 100644
--- a/ndb/src/kernel/vm/al_test/main.cpp
+++ b/storage/ndb/src/kernel/vm/al_test/main.cpp
diff --git a/ndb/src/kernel/vm/pc.hpp b/storage/ndb/src/kernel/vm/pc.hpp
index 2d745d26b1c..2d745d26b1c 100644
--- a/ndb/src/kernel/vm/pc.hpp
+++ b/storage/ndb/src/kernel/vm/pc.hpp
diff --git a/ndb/src/kernel/vm/testCopy/Makefile b/storage/ndb/src/kernel/vm/testCopy/Makefile
index 5abd93eb74f..5abd93eb74f 100644
--- a/ndb/src/kernel/vm/testCopy/Makefile
+++ b/storage/ndb/src/kernel/vm/testCopy/Makefile
diff --git a/ndb/src/kernel/vm/testCopy/rr.cpp b/storage/ndb/src/kernel/vm/testCopy/rr.cpp
index 1e8305dfe4c..1e8305dfe4c 100644
--- a/ndb/src/kernel/vm/testCopy/rr.cpp
+++ b/storage/ndb/src/kernel/vm/testCopy/rr.cpp
diff --git a/ndb/src/kernel/vm/testCopy/testCopy.cpp b/storage/ndb/src/kernel/vm/testCopy/testCopy.cpp
index 78a1dab2619..78a1dab2619 100644
--- a/ndb/src/kernel/vm/testCopy/testCopy.cpp
+++ b/storage/ndb/src/kernel/vm/testCopy/testCopy.cpp
diff --git a/ndb/src/kernel/vm/testDataBuffer/Makefile b/storage/ndb/src/kernel/vm/testDataBuffer/Makefile
index 693989dfe3c..693989dfe3c 100644
--- a/ndb/src/kernel/vm/testDataBuffer/Makefile
+++ b/storage/ndb/src/kernel/vm/testDataBuffer/Makefile
diff --git a/ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp b/storage/ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp
index 5ba59418223..5ba59418223 100644
--- a/ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp
+++ b/storage/ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp
diff --git a/ndb/src/kernel/vm/testLongSig/Makefile b/storage/ndb/src/kernel/vm/testLongSig/Makefile
index ecf33dca109..ecf33dca109 100644
--- a/ndb/src/kernel/vm/testLongSig/Makefile
+++ b/storage/ndb/src/kernel/vm/testLongSig/Makefile
diff --git a/ndb/src/kernel/vm/testLongSig/testLongSig.cpp b/storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp
index 1d1fb8ebc82..1d1fb8ebc82 100644
--- a/ndb/src/kernel/vm/testLongSig/testLongSig.cpp
+++ b/storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp
diff --git a/ndb/src/kernel/vm/testSimplePropertiesSection/Makefile b/storage/ndb/src/kernel/vm/testSimplePropertiesSection/Makefile
index fb3aea00507..fb3aea00507 100644
--- a/ndb/src/kernel/vm/testSimplePropertiesSection/Makefile
+++ b/storage/ndb/src/kernel/vm/testSimplePropertiesSection/Makefile
diff --git a/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp b/storage/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp
index e16870edf11..e16870edf11 100644
--- a/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp
+++ b/storage/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp
diff --git a/ndb/src/kernel/vm/testSuperPool.cpp b/storage/ndb/src/kernel/vm/testSuperPool.cpp
index 194b3a43fa0..194b3a43fa0 100644
--- a/ndb/src/kernel/vm/testSuperPool.cpp
+++ b/storage/ndb/src/kernel/vm/testSuperPool.cpp
diff --git a/ndb/src/mgmapi/LocalConfig.cpp b/storage/ndb/src/mgmapi/LocalConfig.cpp
index 75ad8b40a1f..75ad8b40a1f 100644
--- a/ndb/src/mgmapi/LocalConfig.cpp
+++ b/storage/ndb/src/mgmapi/LocalConfig.cpp
diff --git a/ndb/src/mgmapi/LocalConfig.hpp b/storage/ndb/src/mgmapi/LocalConfig.hpp
index c415ec1be91..c415ec1be91 100644
--- a/ndb/src/mgmapi/LocalConfig.hpp
+++ b/storage/ndb/src/mgmapi/LocalConfig.hpp
diff --git a/storage/ndb/src/mgmapi/Makefile.am b/storage/ndb/src/mgmapi/Makefile.am
new file mode 100644
index 00000000000..21966fd69de
--- /dev/null
+++ b/storage/ndb/src/mgmapi/Makefile.am
@@ -0,0 +1,30 @@
+
+noinst_LTLIBRARIES = libmgmapi.la
+
+libmgmapi_la_SOURCES = mgmapi.cpp ndb_logevent.cpp mgmapi_configuration.cpp LocalConfig.cpp
+
+INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/include/mgmapi
+
+DEFS_LOC = -DNO_DEBUG_MESSAGES -DNDB_PORT="\"@ndb_port@\""
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_util.mk.am
+
+#ndbtest_PROGRAMS = ndb_test_mgmapi
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: libmgmapi.dsp
+
+libmgmapi.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libmgmapi_la_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/mgmapi/mgmapi.cpp b/storage/ndb/src/mgmapi/mgmapi.cpp
index e5e00b78bfa..e5e00b78bfa 100644
--- a/ndb/src/mgmapi/mgmapi.cpp
+++ b/storage/ndb/src/mgmapi/mgmapi.cpp
diff --git a/ndb/src/mgmapi/mgmapi_configuration.cpp b/storage/ndb/src/mgmapi/mgmapi_configuration.cpp
index 80ab428c05a..80ab428c05a 100644
--- a/ndb/src/mgmapi/mgmapi_configuration.cpp
+++ b/storage/ndb/src/mgmapi/mgmapi_configuration.cpp
diff --git a/ndb/src/mgmapi/mgmapi_configuration.hpp b/storage/ndb/src/mgmapi/mgmapi_configuration.hpp
index 7d60a4842a1..7d60a4842a1 100644
--- a/ndb/src/mgmapi/mgmapi_configuration.hpp
+++ b/storage/ndb/src/mgmapi/mgmapi_configuration.hpp
diff --git a/ndb/src/mgmapi/mgmapi_internal.h b/storage/ndb/src/mgmapi/mgmapi_internal.h
index 90f93129f2a..90f93129f2a 100644
--- a/ndb/src/mgmapi/mgmapi_internal.h
+++ b/storage/ndb/src/mgmapi/mgmapi_internal.h
diff --git a/ndb/src/mgmapi/ndb_logevent.cpp b/storage/ndb/src/mgmapi/ndb_logevent.cpp
index 2817abcfdbb..2817abcfdbb 100644
--- a/ndb/src/mgmapi/ndb_logevent.cpp
+++ b/storage/ndb/src/mgmapi/ndb_logevent.cpp
diff --git a/ndb/src/mgmapi/ndb_logevent.hpp b/storage/ndb/src/mgmapi/ndb_logevent.hpp
index cb1a0e388e5..cb1a0e388e5 100644
--- a/ndb/src/mgmapi/ndb_logevent.hpp
+++ b/storage/ndb/src/mgmapi/ndb_logevent.hpp
diff --git a/ndb/src/mgmapi/test/Makefile b/storage/ndb/src/mgmapi/test/Makefile
index c6d3efa6fcc..c6d3efa6fcc 100644
--- a/ndb/src/mgmapi/test/Makefile
+++ b/storage/ndb/src/mgmapi/test/Makefile
diff --git a/ndb/src/mgmapi/test/keso.c b/storage/ndb/src/mgmapi/test/keso.c
index d2675b2ca8a..d2675b2ca8a 100644
--- a/ndb/src/mgmapi/test/keso.c
+++ b/storage/ndb/src/mgmapi/test/keso.c
diff --git a/ndb/src/mgmapi/test/mgmSrvApi.cpp b/storage/ndb/src/mgmapi/test/mgmSrvApi.cpp
index 4a8e38c9ba5..4a8e38c9ba5 100644
--- a/ndb/src/mgmapi/test/mgmSrvApi.cpp
+++ b/storage/ndb/src/mgmapi/test/mgmSrvApi.cpp
diff --git a/ndb/src/mgmclient/CommandInterpreter.cpp b/storage/ndb/src/mgmclient/CommandInterpreter.cpp
index 3b57e6d4860..3b57e6d4860 100644
--- a/ndb/src/mgmclient/CommandInterpreter.cpp
+++ b/storage/ndb/src/mgmclient/CommandInterpreter.cpp
diff --git a/storage/ndb/src/mgmclient/Makefile.am b/storage/ndb/src/mgmclient/Makefile.am
new file mode 100644
index 00000000000..217f3e993a7
--- /dev/null
+++ b/storage/ndb/src/mgmclient/Makefile.am
@@ -0,0 +1,58 @@
+
+noinst_LTLIBRARIES = libndbmgmclient.la
+ndbtools_PROGRAMS = ndb_mgm
+
+libndbmgmclient_la_SOURCES = CommandInterpreter.cpp
+libndbmgmclient_la_LIBADD = ../mgmapi/libmgmapi.la \
+			    ../common/logger/liblogger.la \
+			    ../common/portlib/libportlib.la \
+			    ../common/util/libgeneral.la \
+			    ../common/portlib/libportlib.la
+
+
+ndb_mgm_SOURCES = main.cpp
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
+
+INCLUDES += -I$(top_srcdir)/storage/ndb/include/mgmapi \
+            -I$(top_srcdir)/storage/ndb/src/common/mgmcommon
+
+LDADD_LOC = $(noinst_LTLIBRARIES) \
+	    ../common/portlib/libportlib.la \
+            @readline_link@ \
+            $(top_builddir)/dbug/libdbug.a \
+            $(top_builddir)/mysys/libmysys.a \
+            $(top_builddir)/strings/libmystrings.a \
+            @TERMCAP_LIB@ @NDB_SCI_LIBS@
+
+ndb_mgm_LDFLAGS = @ndb_bin_am_ldflags@
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: ndb_mgm.dsp libndbmgmclient.dsp
+
+ndb_mgm.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-prg.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(ndbtools_PROGRAMS)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_mgm_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
+
+libndbmgmclient.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libndbmgmclient_la_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB
diff --git a/ndb/src/mgmclient/main.cpp b/storage/ndb/src/mgmclient/main.cpp
index 19c84f6ec8d..19c84f6ec8d 100644
--- a/ndb/src/mgmclient/main.cpp
+++ b/storage/ndb/src/mgmclient/main.cpp
diff --git a/ndb/src/mgmclient/ndb_mgmclient.h b/storage/ndb/src/mgmclient/ndb_mgmclient.h
index b62a33999a3..b62a33999a3 100644
--- a/ndb/src/mgmclient/ndb_mgmclient.h
+++ b/storage/ndb/src/mgmclient/ndb_mgmclient.h
diff --git a/ndb/src/mgmclient/ndb_mgmclient.hpp b/storage/ndb/src/mgmclient/ndb_mgmclient.hpp
index bffdf69f920..bffdf69f920 100644
--- a/ndb/src/mgmclient/ndb_mgmclient.hpp
+++ b/storage/ndb/src/mgmclient/ndb_mgmclient.hpp
diff --git a/ndb/src/mgmclient/test_cpcd/Makefile b/storage/ndb/src/mgmclient/test_cpcd/Makefile
index 4ced10cfc59..4ced10cfc59 100644
--- a/ndb/src/mgmclient/test_cpcd/Makefile
+++ b/storage/ndb/src/mgmclient/test_cpcd/Makefile
diff --git a/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp b/storage/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp
index 32f0adbcf26..32f0adbcf26 100644
--- a/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp
+++ b/storage/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp
diff --git a/ndb/src/mgmsrv/Config.cpp b/storage/ndb/src/mgmsrv/Config.cpp
index 5ff9cbe04ad..5ff9cbe04ad 100644
--- a/ndb/src/mgmsrv/Config.cpp
+++ b/storage/ndb/src/mgmsrv/Config.cpp
diff --git a/ndb/src/mgmsrv/Config.hpp b/storage/ndb/src/mgmsrv/Config.hpp
index b5e1e17b027..b5e1e17b027 100644
--- a/ndb/src/mgmsrv/Config.hpp
+++ b/storage/ndb/src/mgmsrv/Config.hpp
diff --git a/ndb/src/mgmsrv/ConfigInfo.cpp b/storage/ndb/src/mgmsrv/ConfigInfo.cpp
index b1fe0735612..b1fe0735612 100644
--- a/ndb/src/mgmsrv/ConfigInfo.cpp
+++ b/storage/ndb/src/mgmsrv/ConfigInfo.cpp
diff --git a/ndb/src/mgmsrv/ConfigInfo.hpp b/storage/ndb/src/mgmsrv/ConfigInfo.hpp
index dff8b34bf4a..dff8b34bf4a 100644
--- a/ndb/src/mgmsrv/ConfigInfo.hpp
+++ b/storage/ndb/src/mgmsrv/ConfigInfo.hpp
diff --git a/ndb/src/mgmsrv/InitConfigFileParser.cpp b/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
index 822e10c89aa..822e10c89aa 100644
--- a/ndb/src/mgmsrv/InitConfigFileParser.cpp
+++ b/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
diff --git a/ndb/src/mgmsrv/InitConfigFileParser.hpp b/storage/ndb/src/mgmsrv/InitConfigFileParser.hpp
index 1ea0a094ccd..1ea0a094ccd 100644
--- a/ndb/src/mgmsrv/InitConfigFileParser.hpp
+++ b/storage/ndb/src/mgmsrv/InitConfigFileParser.hpp
diff --git a/storage/ndb/src/mgmsrv/Makefile.am b/storage/ndb/src/mgmsrv/Makefile.am
new file mode 100644
index 00000000000..3ee39767834
--- /dev/null
+++ b/storage/ndb/src/mgmsrv/Makefile.am
@@ -0,0 +1,60 @@
+MYSQLDATAdir =		$(localstatedir)
+MYSQLSHAREdir =		$(pkgdatadir)
+MYSQLBASEdir=		$(prefix)
+#MYSQLCLUSTERdir=        $(prefix)/mysql-cluster
+MYSQLCLUSTERdir=        .
+
+ndbbin_PROGRAMS = ndb_mgmd
+
+ndb_mgmd_SOURCES = \
+	MgmtSrvr.cpp \
+	MgmtSrvrGeneralSignalHandling.cpp \
+	main.cpp \
+	Services.cpp \
+	convertStrToInt.cpp \
+	SignalQueue.cpp \
+	MgmtSrvrConfig.cpp \
+	ConfigInfo.cpp \
+	InitConfigFileParser.cpp \
+	Config.cpp
+
+INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/ndbapi \
+               -I$(top_srcdir)/storage/ndb/src/mgmapi \
+               -I$(top_srcdir)/storage/ndb/src/common/mgmcommon \
+               -I$(top_srcdir)/storage/ndb/src/mgmclient
+
+LDADD_LOC = $(top_srcdir)/storage/ndb/src/mgmclient/CommandInterpreter.o \
+            $(top_builddir)/storage/ndb/src/libndbclient.la \
+            $(top_builddir)/dbug/libdbug.a \
+            $(top_builddir)/mysys/libmysys.a \
+            $(top_builddir)/strings/libmystrings.a \
+            @readline_link@ \
+            @NDB_SCI_LIBS@ \
+	    @TERMCAP_LIB@
+
+DEFS_LOC =		-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
+			-DDATADIR="\"$(MYSQLDATAdir)\"" \
+			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
+			-DMYSQLCLUSTERDIR="\"$(MYSQLCLUSTERdir)\""
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
+
+ndb_mgmd_LDFLAGS = @ndb_bin_am_ldflags@
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: ndb_mgmd.dsp
+
+ndb_mgmd.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-prg.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(ndbbin_PROGRAMS)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_mgmd_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
diff --git a/ndb/src/mgmsrv/MgmtSrvr.cpp b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp
index 6b9bf7a0978..6b9bf7a0978 100644
--- a/ndb/src/mgmsrv/MgmtSrvr.cpp
+++ b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp
diff --git a/ndb/src/mgmsrv/MgmtSrvr.hpp b/storage/ndb/src/mgmsrv/MgmtSrvr.hpp
index 7e13b41438f..7e13b41438f 100644
--- a/ndb/src/mgmsrv/MgmtSrvr.hpp
+++ b/storage/ndb/src/mgmsrv/MgmtSrvr.hpp
diff --git a/ndb/src/mgmsrv/MgmtSrvrConfig.cpp b/storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp
index 6c4b4e9ae3c..6c4b4e9ae3c 100644
--- a/ndb/src/mgmsrv/MgmtSrvrConfig.cpp
+++ b/storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp
diff --git a/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp b/storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp
index f93948abc75..f93948abc75 100644
--- a/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp
+++ b/storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp
diff --git a/ndb/src/mgmsrv/Services.cpp b/storage/ndb/src/mgmsrv/Services.cpp
index 1a5101702a0..1a5101702a0 100644
--- a/ndb/src/mgmsrv/Services.cpp
+++ b/storage/ndb/src/mgmsrv/Services.cpp
diff --git a/ndb/src/mgmsrv/Services.hpp b/storage/ndb/src/mgmsrv/Services.hpp
index ff9008b05a8..ff9008b05a8 100644
--- a/ndb/src/mgmsrv/Services.hpp
+++ b/storage/ndb/src/mgmsrv/Services.hpp
diff --git a/ndb/src/mgmsrv/SignalQueue.cpp b/storage/ndb/src/mgmsrv/SignalQueue.cpp
index 08ad5f363a6..08ad5f363a6 100644
--- a/ndb/src/mgmsrv/SignalQueue.cpp
+++ b/storage/ndb/src/mgmsrv/SignalQueue.cpp
diff --git a/ndb/src/mgmsrv/SignalQueue.hpp b/storage/ndb/src/mgmsrv/SignalQueue.hpp
index bacbad53415..bacbad53415 100644
--- a/ndb/src/mgmsrv/SignalQueue.hpp
+++ b/storage/ndb/src/mgmsrv/SignalQueue.hpp
diff --git a/ndb/src/mgmsrv/convertStrToInt.cpp b/storage/ndb/src/mgmsrv/convertStrToInt.cpp
index e5216047d10..e5216047d10 100644
--- a/ndb/src/mgmsrv/convertStrToInt.cpp
+++ b/storage/ndb/src/mgmsrv/convertStrToInt.cpp
diff --git a/ndb/src/mgmsrv/convertStrToInt.hpp b/storage/ndb/src/mgmsrv/convertStrToInt.hpp
index 0b2a96ed0bf..0b2a96ed0bf 100644
--- a/ndb/src/mgmsrv/convertStrToInt.hpp
+++ b/storage/ndb/src/mgmsrv/convertStrToInt.hpp
diff --git a/ndb/src/mgmsrv/main.cpp b/storage/ndb/src/mgmsrv/main.cpp
index c7315c61ba1..c7315c61ba1 100644
--- a/ndb/src/mgmsrv/main.cpp
+++ b/storage/ndb/src/mgmsrv/main.cpp
diff --git a/ndb/src/mgmsrv/mkconfig/Makefile b/storage/ndb/src/mgmsrv/mkconfig/Makefile
index 43574eefbd1..43574eefbd1 100644
--- a/ndb/src/mgmsrv/mkconfig/Makefile
+++ b/storage/ndb/src/mgmsrv/mkconfig/Makefile
diff --git a/ndb/src/mgmsrv/mkconfig/mkconfig.cpp b/storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp
index 28823aaa35e..28823aaa35e 100644
--- a/ndb/src/mgmsrv/mkconfig/mkconfig.cpp
+++ b/storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp
diff --git a/ndb/src/ndbapi/API.hpp b/storage/ndb/src/ndbapi/API.hpp
index 05e2d863cb6..05e2d863cb6 100644
--- a/ndb/src/ndbapi/API.hpp
+++ b/storage/ndb/src/ndbapi/API.hpp
diff --git a/ndb/src/ndbapi/ClusterMgr.cpp b/storage/ndb/src/ndbapi/ClusterMgr.cpp
index 42b3b01bca1..42b3b01bca1 100644
--- a/ndb/src/ndbapi/ClusterMgr.cpp
+++ b/storage/ndb/src/ndbapi/ClusterMgr.cpp
diff --git a/ndb/src/ndbapi/ClusterMgr.hpp b/storage/ndb/src/ndbapi/ClusterMgr.hpp
index d75b820e9cb..d75b820e9cb 100644
--- a/ndb/src/ndbapi/ClusterMgr.hpp
+++ b/storage/ndb/src/ndbapi/ClusterMgr.hpp
diff --git a/ndb/src/ndbapi/DictCache.cpp b/storage/ndb/src/ndbapi/DictCache.cpp
index 3d14df908a0..3d14df908a0 100644
--- a/ndb/src/ndbapi/DictCache.cpp
+++ b/storage/ndb/src/ndbapi/DictCache.cpp
diff --git a/ndb/src/ndbapi/DictCache.hpp b/storage/ndb/src/ndbapi/DictCache.hpp
index d9bf810a685..d9bf810a685 100644
--- a/ndb/src/ndbapi/DictCache.hpp
+++ b/storage/ndb/src/ndbapi/DictCache.hpp
diff --git a/storage/ndb/src/ndbapi/Makefile.am b/storage/ndb/src/ndbapi/Makefile.am
new file mode 100644
index 00000000000..0656aad7ed3
--- /dev/null
+++ b/storage/ndb/src/ndbapi/Makefile.am
@@ -0,0 +1,62 @@
+#SUBDIRS = signal-sender
+
+noinst_LTLIBRARIES = libndbapi.la
+
+libndbapi_la_SOURCES = \
+        TransporterFacade.cpp   \
+        ClusterMgr.cpp  \
+        Ndb.cpp \
+        NdbPoolImpl.cpp \
+        NdbPool.cpp \
+        Ndblist.cpp     \
+        Ndbif.cpp       \
+        Ndbinit.cpp     \
+        Ndberr.cpp    \
+        ndberror.c    \
+        NdbErrorOut.cpp    \
+        NdbTransaction.cpp       \
+        NdbTransactionScan.cpp \
+        NdbOperation.cpp        \
+        NdbOperationSearch.cpp  \
+        NdbOperationScan.cpp    \
+        NdbOperationInt.cpp     \
+        NdbOperationDefine.cpp  \
+        NdbOperationExec.cpp    \
+        NdbScanOperation.cpp    NdbScanFilter.cpp \
+        NdbIndexOperation.cpp   \
+        NdbEventOperation.cpp   \
+        NdbEventOperationImpl.cpp   \
+        NdbApiSignal.cpp        \
+        NdbRecAttr.cpp  \
+        NdbUtil.cpp \
+        NdbReceiver.cpp \
+        NdbDictionary.cpp \
+        NdbDictionaryImpl.cpp \
+        DictCache.cpp \
+        ndb_cluster_connection.cpp \
+	NdbBlob.cpp
+
+INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/mgmapi
+
+# Ndbapi cannot handle -O3
+NDB_CXXFLAGS_RELEASE_LOC = -O2
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: libndbapi.dsp
+
+libndbapi.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libndbapi_la_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
diff --git a/ndb/src/ndbapi/Ndb.cpp b/storage/ndb/src/ndbapi/Ndb.cpp
index 7893aaae15c..7893aaae15c 100644
--- a/ndb/src/ndbapi/Ndb.cpp
+++ b/storage/ndb/src/ndbapi/Ndb.cpp
diff --git a/ndb/src/ndbapi/NdbApiSignal.cpp b/storage/ndb/src/ndbapi/NdbApiSignal.cpp
index b1671e593e1..b1671e593e1 100644
--- a/ndb/src/ndbapi/NdbApiSignal.cpp
+++ b/storage/ndb/src/ndbapi/NdbApiSignal.cpp
diff --git a/ndb/src/ndbapi/NdbApiSignal.hpp b/storage/ndb/src/ndbapi/NdbApiSignal.hpp
index 353c575d420..353c575d420 100644
--- a/ndb/src/ndbapi/NdbApiSignal.hpp
+++ b/storage/ndb/src/ndbapi/NdbApiSignal.hpp
diff --git a/ndb/src/ndbapi/NdbBlob.cpp b/storage/ndb/src/ndbapi/NdbBlob.cpp
index d06d6b4ef4d..d06d6b4ef4d 100644
--- a/ndb/src/ndbapi/NdbBlob.cpp
+++ b/storage/ndb/src/ndbapi/NdbBlob.cpp
diff --git a/ndb/src/ndbapi/NdbBlobImpl.hpp b/storage/ndb/src/ndbapi/NdbBlobImpl.hpp
index 0030e910c52..0030e910c52 100644
--- a/ndb/src/ndbapi/NdbBlobImpl.hpp
+++ b/storage/ndb/src/ndbapi/NdbBlobImpl.hpp
diff --git a/ndb/src/ndbapi/NdbDictionary.cpp b/storage/ndb/src/ndbapi/NdbDictionary.cpp
index 79b6fb4c0e8..79b6fb4c0e8 100644
--- a/ndb/src/ndbapi/NdbDictionary.cpp
+++ b/storage/ndb/src/ndbapi/NdbDictionary.cpp
diff --git a/ndb/src/ndbapi/NdbDictionaryImpl.cpp b/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
index 34d1614d043..34d1614d043 100644
--- a/ndb/src/ndbapi/NdbDictionaryImpl.cpp
+++ b/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
diff --git a/ndb/src/ndbapi/NdbDictionaryImpl.hpp b/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
index 754d0000718..754d0000718 100644
--- a/ndb/src/ndbapi/NdbDictionaryImpl.hpp
+++ b/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
diff --git a/ndb/src/ndbapi/NdbErrorOut.cpp b/storage/ndb/src/ndbapi/NdbErrorOut.cpp
index 07e0b2fe6e8..07e0b2fe6e8 100644
--- a/ndb/src/ndbapi/NdbErrorOut.cpp
+++ b/storage/ndb/src/ndbapi/NdbErrorOut.cpp
diff --git a/ndb/src/ndbapi/NdbEventOperation.cpp b/storage/ndb/src/ndbapi/NdbEventOperation.cpp
index e99cad918c5..e99cad918c5 100644
--- a/ndb/src/ndbapi/NdbEventOperation.cpp
+++ b/storage/ndb/src/ndbapi/NdbEventOperation.cpp
diff --git a/ndb/src/ndbapi/NdbEventOperationImpl.cpp b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
index 208525bfc15..208525bfc15 100644
--- a/ndb/src/ndbapi/NdbEventOperationImpl.cpp
+++ b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
diff --git a/ndb/src/ndbapi/NdbEventOperationImpl.hpp b/storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
index 96958979c76..96958979c76 100644
--- a/ndb/src/ndbapi/NdbEventOperationImpl.hpp
+++ b/storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
diff --git a/ndb/src/ndbapi/NdbImpl.hpp b/storage/ndb/src/ndbapi/NdbImpl.hpp
index d73b8afe10c..d73b8afe10c 100644
--- a/ndb/src/ndbapi/NdbImpl.hpp
+++ b/storage/ndb/src/ndbapi/NdbImpl.hpp
diff --git a/ndb/src/ndbapi/NdbIndexOperation.cpp b/storage/ndb/src/ndbapi/NdbIndexOperation.cpp
index 4cedffed4a2..4cedffed4a2 100644
--- a/ndb/src/ndbapi/NdbIndexOperation.cpp
+++ b/storage/ndb/src/ndbapi/NdbIndexOperation.cpp
diff --git a/ndb/src/ndbapi/NdbLinHash.hpp b/storage/ndb/src/ndbapi/NdbLinHash.hpp
index 05670534c95..05670534c95 100644
--- a/ndb/src/ndbapi/NdbLinHash.hpp
+++ b/storage/ndb/src/ndbapi/NdbLinHash.hpp
diff --git a/ndb/src/ndbapi/NdbOperation.cpp b/storage/ndb/src/ndbapi/NdbOperation.cpp
index c9143444908..c9143444908 100644
--- a/ndb/src/ndbapi/NdbOperation.cpp
+++ b/storage/ndb/src/ndbapi/NdbOperation.cpp
diff --git a/ndb/src/ndbapi/NdbOperationDefine.cpp b/storage/ndb/src/ndbapi/NdbOperationDefine.cpp
index 835e33dfb40..835e33dfb40 100644
--- a/ndb/src/ndbapi/NdbOperationDefine.cpp
+++ b/storage/ndb/src/ndbapi/NdbOperationDefine.cpp
diff --git a/ndb/src/ndbapi/NdbOperationExec.cpp b/storage/ndb/src/ndbapi/NdbOperationExec.cpp
index 58a816e3c1a..58a816e3c1a 100644
--- a/ndb/src/ndbapi/NdbOperationExec.cpp
+++ b/storage/ndb/src/ndbapi/NdbOperationExec.cpp
diff --git a/ndb/src/ndbapi/NdbOperationInt.cpp b/storage/ndb/src/ndbapi/NdbOperationInt.cpp
index 41e0cb1d140..41e0cb1d140 100644
--- a/ndb/src/ndbapi/NdbOperationInt.cpp
+++ b/storage/ndb/src/ndbapi/NdbOperationInt.cpp
diff --git a/ndb/src/ndbapi/NdbOperationScan.cpp b/storage/ndb/src/ndbapi/NdbOperationScan.cpp
index 283eb591bdb..283eb591bdb 100644
--- a/ndb/src/ndbapi/NdbOperationScan.cpp
+++ b/storage/ndb/src/ndbapi/NdbOperationScan.cpp
diff --git a/ndb/src/ndbapi/NdbOperationSearch.cpp b/storage/ndb/src/ndbapi/NdbOperationSearch.cpp
index 06d8ddd412b..06d8ddd412b 100644
--- a/ndb/src/ndbapi/NdbOperationSearch.cpp
+++ b/storage/ndb/src/ndbapi/NdbOperationSearch.cpp
diff --git a/ndb/src/ndbapi/NdbPool.cpp b/storage/ndb/src/ndbapi/NdbPool.cpp
index a8263f564f1..a8263f564f1 100644
--- a/ndb/src/ndbapi/NdbPool.cpp
+++ b/storage/ndb/src/ndbapi/NdbPool.cpp
diff --git a/ndb/src/ndbapi/NdbPoolImpl.cpp b/storage/ndb/src/ndbapi/NdbPoolImpl.cpp
index 32e0a6f1410..32e0a6f1410 100644
--- a/ndb/src/ndbapi/NdbPoolImpl.cpp
+++ b/storage/ndb/src/ndbapi/NdbPoolImpl.cpp
diff --git a/ndb/src/ndbapi/NdbPoolImpl.hpp b/storage/ndb/src/ndbapi/NdbPoolImpl.hpp
index cd36f30e90b..cd36f30e90b 100644
--- a/ndb/src/ndbapi/NdbPoolImpl.hpp
+++ b/storage/ndb/src/ndbapi/NdbPoolImpl.hpp
diff --git a/ndb/src/ndbapi/NdbRecAttr.cpp b/storage/ndb/src/ndbapi/NdbRecAttr.cpp
index 5e5306fc33a..5e5306fc33a 100644
--- a/ndb/src/ndbapi/NdbRecAttr.cpp
+++ b/storage/ndb/src/ndbapi/NdbRecAttr.cpp
diff --git a/ndb/src/ndbapi/NdbReceiver.cpp b/storage/ndb/src/ndbapi/NdbReceiver.cpp
index df16ae66915..df16ae66915 100644
--- a/ndb/src/ndbapi/NdbReceiver.cpp
+++ b/storage/ndb/src/ndbapi/NdbReceiver.cpp
diff --git a/ndb/src/ndbapi/NdbScanFilter.cpp b/storage/ndb/src/ndbapi/NdbScanFilter.cpp
index b39fd10fe95..b39fd10fe95 100644
--- a/ndb/src/ndbapi/NdbScanFilter.cpp
+++ b/storage/ndb/src/ndbapi/NdbScanFilter.cpp
diff --git a/ndb/src/ndbapi/NdbScanOperation.cpp b/storage/ndb/src/ndbapi/NdbScanOperation.cpp
index e0a480e02f7..e0a480e02f7 100644
--- a/ndb/src/ndbapi/NdbScanOperation.cpp
+++ b/storage/ndb/src/ndbapi/NdbScanOperation.cpp
diff --git a/ndb/src/ndbapi/NdbTransaction.cpp b/storage/ndb/src/ndbapi/NdbTransaction.cpp
index 675c9383c6e..675c9383c6e 100644
--- a/ndb/src/ndbapi/NdbTransaction.cpp
+++ b/storage/ndb/src/ndbapi/NdbTransaction.cpp
diff --git a/ndb/src/ndbapi/NdbTransactionScan.cpp b/storage/ndb/src/ndbapi/NdbTransactionScan.cpp
index 4c507f6ab8c..4c507f6ab8c 100644
--- a/ndb/src/ndbapi/NdbTransactionScan.cpp
+++ b/storage/ndb/src/ndbapi/NdbTransactionScan.cpp
diff --git a/ndb/src/ndbapi/NdbUtil.cpp b/storage/ndb/src/ndbapi/NdbUtil.cpp
index 5c74d251ff9..5c74d251ff9 100644
--- a/ndb/src/ndbapi/NdbUtil.cpp
+++ b/storage/ndb/src/ndbapi/NdbUtil.cpp
diff --git a/ndb/src/ndbapi/NdbUtil.hpp b/storage/ndb/src/ndbapi/NdbUtil.hpp
index 80fc15ddd8c..80fc15ddd8c 100644
--- a/ndb/src/ndbapi/NdbUtil.hpp
+++ b/storage/ndb/src/ndbapi/NdbUtil.hpp
diff --git a/ndb/src/ndbapi/NdbWaiter.hpp b/storage/ndb/src/ndbapi/NdbWaiter.hpp
index 8b7b2a75879..8b7b2a75879 100644
--- a/ndb/src/ndbapi/NdbWaiter.hpp
+++ b/storage/ndb/src/ndbapi/NdbWaiter.hpp
diff --git a/ndb/src/ndbapi/Ndberr.cpp b/storage/ndb/src/ndbapi/Ndberr.cpp
index b05818de6f1..b05818de6f1 100644
--- a/ndb/src/ndbapi/Ndberr.cpp
+++ b/storage/ndb/src/ndbapi/Ndberr.cpp
diff --git a/ndb/src/ndbapi/Ndbif.cpp b/storage/ndb/src/ndbapi/Ndbif.cpp
index fee6f0930ad..fee6f0930ad 100644
--- a/ndb/src/ndbapi/Ndbif.cpp
+++ b/storage/ndb/src/ndbapi/Ndbif.cpp
diff --git a/ndb/src/ndbapi/Ndbinit.cpp b/storage/ndb/src/ndbapi/Ndbinit.cpp
index bbc1474f45d..bbc1474f45d 100644
--- a/ndb/src/ndbapi/Ndbinit.cpp
+++ b/storage/ndb/src/ndbapi/Ndbinit.cpp
diff --git a/ndb/src/ndbapi/Ndblist.cpp b/storage/ndb/src/ndbapi/Ndblist.cpp
index 96d0f4d7de5..96d0f4d7de5 100644
--- a/ndb/src/ndbapi/Ndblist.cpp
+++ b/storage/ndb/src/ndbapi/Ndblist.cpp
diff --git a/ndb/src/ndbapi/ObjectMap.hpp b/storage/ndb/src/ndbapi/ObjectMap.hpp
index 21407279f0b..21407279f0b 100644
--- a/ndb/src/ndbapi/ObjectMap.hpp
+++ b/storage/ndb/src/ndbapi/ObjectMap.hpp
diff --git a/ndb/src/ndbapi/ScanOperation.txt b/storage/ndb/src/ndbapi/ScanOperation.txt
index 27e4e8c1755..27e4e8c1755 100644
--- a/ndb/src/ndbapi/ScanOperation.txt
+++ b/storage/ndb/src/ndbapi/ScanOperation.txt
diff --git a/ndb/src/ndbapi/TransporterFacade.cpp b/storage/ndb/src/ndbapi/TransporterFacade.cpp
index e2aa6631841..e2aa6631841 100644
--- a/ndb/src/ndbapi/TransporterFacade.cpp
+++ b/storage/ndb/src/ndbapi/TransporterFacade.cpp
diff --git a/ndb/src/ndbapi/TransporterFacade.hpp b/storage/ndb/src/ndbapi/TransporterFacade.hpp
index e74f4b51e00..e74f4b51e00 100644
--- a/ndb/src/ndbapi/TransporterFacade.hpp
+++ b/storage/ndb/src/ndbapi/TransporterFacade.hpp
diff --git a/ndb/src/ndbapi/ndb_cluster_connection.cpp b/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp
index 7625da609b0..7625da609b0 100644
--- a/ndb/src/ndbapi/ndb_cluster_connection.cpp
+++ b/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp
diff --git a/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp b/storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp
index 05652f3316a..05652f3316a 100644
--- a/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp
+++ b/storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp
diff --git a/ndb/src/ndbapi/ndberror.c b/storage/ndb/src/ndbapi/ndberror.c
index 840d358f225..840d358f225 100644
--- a/ndb/src/ndbapi/ndberror.c
+++ b/storage/ndb/src/ndbapi/ndberror.c
diff --git a/ndb/src/ndbapi/signal-sender/Makefile b/storage/ndb/src/ndbapi/signal-sender/Makefile
index 56e6ce1eac0..56e6ce1eac0 100644
--- a/ndb/src/ndbapi/signal-sender/Makefile
+++ b/storage/ndb/src/ndbapi/signal-sender/Makefile
diff --git a/ndb/src/ndbapi/signal-sender/SignalSender.cpp b/storage/ndb/src/ndbapi/signal-sender/SignalSender.cpp
index 680d0c23b4a..680d0c23b4a 100644
--- a/ndb/src/ndbapi/signal-sender/SignalSender.cpp
+++ b/storage/ndb/src/ndbapi/signal-sender/SignalSender.cpp
diff --git a/ndb/src/ndbapi/signal-sender/SignalSender.hpp b/storage/ndb/src/ndbapi/signal-sender/SignalSender.hpp
index e4e6c1931d2..e4e6c1931d2 100644
--- a/ndb/src/ndbapi/signal-sender/SignalSender.hpp
+++ b/storage/ndb/src/ndbapi/signal-sender/SignalSender.hpp
diff --git a/ndb/src/old_files/client/Makefile b/storage/ndb/src/old_files/client/Makefile
index 1751a98bdfe..1751a98bdfe 100644
--- a/ndb/src/old_files/client/Makefile
+++ b/storage/ndb/src/old_files/client/Makefile
diff --git a/ndb/src/old_files/client/odbc/Extra.mk b/storage/ndb/src/old_files/client/odbc/Extra.mk
index 762fb0bedd0..762fb0bedd0 100644
--- a/ndb/src/old_files/client/odbc/Extra.mk
+++ b/storage/ndb/src/old_files/client/odbc/Extra.mk
diff --git a/ndb/src/old_files/client/odbc/Makefile b/storage/ndb/src/old_files/client/odbc/Makefile
index 2da683e7d86..2da683e7d86 100644
--- a/ndb/src/old_files/client/odbc/Makefile
+++ b/storage/ndb/src/old_files/client/odbc/Makefile
diff --git a/ndb/src/old_files/client/odbc/NdbOdbc.cpp b/storage/ndb/src/old_files/client/odbc/NdbOdbc.cpp
index 67c6b5e0004..67c6b5e0004 100755
--- a/ndb/src/old_files/client/odbc/NdbOdbc.cpp
+++ b/storage/ndb/src/old_files/client/odbc/NdbOdbc.cpp
diff --git a/ndb/src/old_files/client/odbc/NdbOdbc.def b/storage/ndb/src/old_files/client/odbc/NdbOdbc.def
index 85619b91915..85619b91915 100755
--- a/ndb/src/old_files/client/odbc/NdbOdbc.def
+++ b/storage/ndb/src/old_files/client/odbc/NdbOdbc.def
diff --git a/ndb/src/old_files/client/odbc/codegen/CodeGen.cpp b/storage/ndb/src/old_files/client/odbc/codegen/CodeGen.cpp
index 6be78b62bd9..6be78b62bd9 100644
--- a/ndb/src/old_files/client/odbc/codegen/CodeGen.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/CodeGen.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/CodeGen.hpp b/storage/ndb/src/old_files/client/odbc/codegen/CodeGen.hpp
index ae61dab0c2a..ae61dab0c2a 100644
--- a/ndb/src/old_files/client/odbc/codegen/CodeGen.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/CodeGen.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_base.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_base.cpp
index dc02e071156..dc02e071156 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_base.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_base.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_base.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_base.hpp
index c67c0ca7adb..c67c0ca7adb 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_base.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_base.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_column.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_column.cpp
index c4c0480a5e7..c4c0480a5e7 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_column.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_column.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_column.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_column.hpp
index af0dcea690d..af0dcea690d 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_column.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_column.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_comp_op.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_comp_op.cpp
index 7782ed1ea2a..7782ed1ea2a 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_comp_op.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_comp_op.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_comp_op.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_comp_op.hpp
index 0585ab1dabf..0585ab1dabf 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_comp_op.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_comp_op.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_create_index.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_create_index.cpp
index 84f319338a4..84f319338a4 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_create_index.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_create_index.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_create_index.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_create_index.hpp
index ebd757e1118..ebd757e1118 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_create_index.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_create_index.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_create_row.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_create_row.cpp
index 5b90b658ed7..5b90b658ed7 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_create_row.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_create_row.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_create_row.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_create_row.hpp
index f03455ff28e..f03455ff28e 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_create_row.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_create_row.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_create_table.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_create_table.cpp
index 14e4abbd7fe..14e4abbd7fe 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_create_table.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_create_table.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_create_table.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_create_table.hpp
index cbb2189d8ce..cbb2189d8ce 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_create_table.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_create_table.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_data_type.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_data_type.cpp
index 1ff0fcebcbe..1ff0fcebcbe 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_data_type.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_data_type.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_data_type.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_data_type.hpp
index 735dc05014f..735dc05014f 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_data_type.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_data_type.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_ddl.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_ddl.cpp
index 2ba4291a0e8..2ba4291a0e8 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_ddl.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_ddl.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_ddl.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_ddl.hpp
index 1ceca62d55d..1ceca62d55d 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_ddl.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_ddl.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_ddl_column.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_column.cpp
index ee037e54c1f..ee037e54c1f 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_ddl_column.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_column.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_ddl_column.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_column.hpp
index 7d089d37440..7d089d37440 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_ddl_column.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_column.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_ddl_constr.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_constr.cpp
index 78c23e38d97..78c23e38d97 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_ddl_constr.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_constr.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_ddl_constr.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_constr.hpp
index ea7808b37cb..ea7808b37cb 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_ddl_constr.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_constr.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_ddl_row.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_row.cpp
index 87589ebbaa0..87589ebbaa0 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_ddl_row.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_row.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_ddl_row.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_row.hpp
index ac3eded1b2e..ac3eded1b2e 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_ddl_row.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_row.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_delete.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_delete.cpp
index 35b3daa1aca..35b3daa1aca 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_delete.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_delete.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_delete.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_delete.hpp
index c7fa245497b..c7fa245497b 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_delete.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_delete.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_delete_index.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_delete_index.cpp
index 8f2c3be2848..8f2c3be2848 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_delete_index.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_delete_index.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_delete_index.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_delete_index.hpp
index 1aaaa18abcb..1aaaa18abcb 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_delete_index.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_delete_index.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_delete_lookup.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_delete_lookup.cpp
index 4a6dec64654..4a6dec64654 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_delete_lookup.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_delete_lookup.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_delete_lookup.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_delete_lookup.hpp
index 4138baefa4c..4138baefa4c 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_delete_lookup.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_delete_lookup.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_delete_scan.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_delete_scan.cpp
index fed7244a026..fed7244a026 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_delete_scan.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_delete_scan.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_delete_scan.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_delete_scan.hpp
index eb013a8257e..eb013a8257e 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_delete_scan.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_delete_scan.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_dml.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_dml.cpp
index 44fd4478646..44fd4478646 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_dml.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_dml.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_dml.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_dml.hpp
index 0618f583984..0618f583984 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_dml.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_dml.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_dml_column.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_dml_column.cpp
index 808e2ac8c4b..808e2ac8c4b 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_dml_column.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_dml_column.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_dml_column.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_dml_column.hpp
index 0fb33944a3a..0fb33944a3a 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_dml_column.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_dml_column.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_dml_row.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_dml_row.cpp
index ceb63a9f7b9..ceb63a9f7b9 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_dml_row.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_dml_row.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_dml_row.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_dml_row.hpp
index 6c7e46ba9af..6c7e46ba9af 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_dml_row.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_dml_row.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_drop_index.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_drop_index.cpp
index b6bae88e270..b6bae88e270 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_drop_index.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_drop_index.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_drop_index.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_drop_index.hpp
index 99891c9a52f..99891c9a52f 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_drop_index.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_drop_index.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_drop_table.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_drop_table.cpp
index f20bf9fdae0..f20bf9fdae0 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_drop_table.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_drop_table.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_drop_table.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_drop_table.hpp
index 849a472ed94..849a472ed94 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_drop_table.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_drop_table.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_expr.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr.cpp
index 4afa75986a0..4afa75986a0 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_expr.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_expr.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr.hpp
index b6f07471b4d..b6f07471b4d 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_expr.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_expr_column.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr_column.cpp
index 17a9a502d4c..17a9a502d4c 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_expr_column.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr_column.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_expr_column.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr_column.hpp
index 2ce7c441e45..2ce7c441e45 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_expr_column.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr_column.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_expr_const.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr_const.cpp
index 564d307a4f8..564d307a4f8 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_expr_const.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr_const.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_expr_const.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr_const.hpp
index 2e26c637a23..2e26c637a23 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_expr_const.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr_const.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_expr_conv.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr_conv.cpp
index bc89482fedc..bc89482fedc 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_expr_conv.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr_conv.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_expr_conv.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr_conv.hpp
index 3294960c7b3..3294960c7b3 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_expr_conv.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr_conv.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_expr_func.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr_func.cpp
index 96b461a72d9..96b461a72d9 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_expr_func.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr_func.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_expr_func.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr_func.hpp
index 856d7529875..856d7529875 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_expr_func.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr_func.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_expr_op.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr_op.cpp
index 7e8314c1741..7e8314c1741 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_expr_op.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr_op.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_expr_op.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr_op.hpp
index f9686cad151..f9686cad151 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_expr_op.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr_op.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_expr_param.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr_param.cpp
index 93892cae5e6..93892cae5e6 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_expr_param.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr_param.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_expr_param.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr_param.hpp
index 783e5c087b4..783e5c087b4 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_expr_param.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr_param.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_expr_row.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr_row.cpp
index da1751d41d1..da1751d41d1 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_expr_row.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr_row.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_expr_row.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr_row.hpp
index 94527931dba..94527931dba 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_expr_row.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_expr_row.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_idx_column.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_idx_column.cpp
index 584ffef3e01..584ffef3e01 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_idx_column.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_idx_column.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_idx_column.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_idx_column.hpp
index 209ed705b48..209ed705b48 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_idx_column.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_idx_column.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_insert.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_insert.cpp
index c442186c181..c442186c181 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_insert.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_insert.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_insert.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_insert.hpp
index 748b092e33a..748b092e33a 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_insert.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_insert.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_pred.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_pred.cpp
index fe7cac7606e..fe7cac7606e 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_pred.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_pred.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_pred.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_pred.hpp
index a77c1161fa1..a77c1161fa1 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_pred.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_pred.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_pred_op.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_pred_op.cpp
index 29736e45818..29736e45818 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_pred_op.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_pred_op.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_pred_op.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_pred_op.hpp
index 9130bc3cb81..9130bc3cb81 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_pred_op.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_pred_op.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_query.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_query.cpp
index 9e983942601..9e983942601 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_query.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_query.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_query.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_query.hpp
index 97f98f859ff..97f98f859ff 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_query.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_query.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_query_count.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_count.cpp
index f52c41df802..f52c41df802 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_query_count.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_count.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_query_count.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_count.hpp
index a094eba4519..a094eba4519 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_query_count.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_count.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_query_distinct.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_distinct.cpp
index 4cbfbfe812d..4cbfbfe812d 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_query_distinct.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_distinct.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_query_distinct.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_distinct.hpp
index 62c46bda901..62c46bda901 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_query_distinct.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_distinct.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_query_filter.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_filter.cpp
index 934a24d182d..934a24d182d 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_query_filter.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_filter.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_query_filter.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_filter.hpp
index 60cbf0f86a7..60cbf0f86a7 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_query_filter.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_filter.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_query_group.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_group.cpp
index c3019efaa85..c3019efaa85 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_query_group.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_group.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_query_group.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_group.hpp
index e79022c5284..e79022c5284 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_query_group.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_group.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_query_index.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_index.cpp
index ee19d6123cc..ee19d6123cc 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_query_index.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_index.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_query_index.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_index.hpp
index 87affd50580..87affd50580 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_query_index.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_index.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_query_join.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_join.cpp
index 89aafe13610..89aafe13610 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_query_join.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_join.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_query_join.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_join.hpp
index f6ac9205329..f6ac9205329 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_query_join.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_join.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_query_lookup.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_lookup.cpp
index bad4199190b..bad4199190b 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_query_lookup.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_lookup.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_query_lookup.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_lookup.hpp
index e66623d4030..e66623d4030 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_query_lookup.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_lookup.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_query_project.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_project.cpp
index 54043ce3d5d..54043ce3d5d 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_query_project.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_project.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_query_project.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_project.hpp
index 545685ab9df..545685ab9df 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_query_project.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_project.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_query_range.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_range.cpp
index 5d29c5af315..5d29c5af315 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_query_range.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_range.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_query_range.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_range.hpp
index 4438189522c..4438189522c 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_query_range.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_range.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_query_repeat.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_repeat.cpp
index 8b295a97916..8b295a97916 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_query_repeat.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_repeat.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_query_repeat.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_repeat.hpp
index 90d6ef55104..90d6ef55104 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_query_repeat.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_repeat.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_query_scan.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_scan.cpp
index 1c0f58980e5..1c0f58980e5 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_query_scan.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_scan.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_query_scan.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_scan.hpp
index d6d1630ddf8..d6d1630ddf8 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_query_scan.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_scan.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_query_sort.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_sort.cpp
index 4ea6db8c4e2..4ea6db8c4e2 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_query_sort.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_sort.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_query_sort.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_sort.hpp
index d1aa03d9aef..d1aa03d9aef 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_query_sort.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_sort.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_query_sys.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_sys.cpp
index affe3dc1264..affe3dc1264 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_query_sys.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_sys.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_query_sys.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_sys.hpp
index 8eb069d0413..8eb069d0413 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_query_sys.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_query_sys.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_root.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_root.cpp
index 4f45bdffdaf..4f45bdffdaf 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_root.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_root.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_root.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_root.hpp
index 4f0f96725e3..4f0f96725e3 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_root.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_root.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_select.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_select.cpp
index 611b491968d..611b491968d 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_select.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_select.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_select.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_select.hpp
index eaa9b801f29..eaa9b801f29 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_select.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_select.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_set_row.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_set_row.cpp
index dd13ba0c3f7..dd13ba0c3f7 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_set_row.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_set_row.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_set_row.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_set_row.hpp
index 10d62826ac7..10d62826ac7 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_set_row.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_set_row.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_stmt.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_stmt.cpp
index d790f667b84..d790f667b84 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_stmt.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_stmt.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_stmt.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_stmt.hpp
index 20b7fb965fb..20b7fb965fb 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_stmt.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_stmt.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_table.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_table.cpp
index ee3c2a2ed07..ee3c2a2ed07 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_table.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_table.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_table.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_table.hpp
index 8a95b8fa26c..8a95b8fa26c 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_table.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_table.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_table_list.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_table_list.cpp
index ea9f4fdc26e..ea9f4fdc26e 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_table_list.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_table_list.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_table_list.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_table_list.hpp
index 47989166cac..47989166cac 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_table_list.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_table_list.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_update.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_update.cpp
index 0b33cd628b4..0b33cd628b4 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_update.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_update.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_update.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_update.hpp
index 380b651518b..380b651518b 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_update.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_update.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_update_index.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_update_index.cpp
index 6f74db0d913..6f74db0d913 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_update_index.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_update_index.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_update_index.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_update_index.hpp
index bbad822650a..bbad822650a 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_update_index.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_update_index.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_update_lookup.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_update_lookup.cpp
index 7525fb72692..7525fb72692 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_update_lookup.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_update_lookup.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_update_lookup.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_update_lookup.hpp
index fc4341880dd..fc4341880dd 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_update_lookup.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_update_lookup.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_update_scan.cpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_update_scan.cpp
index 9fac1728469..9fac1728469 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_update_scan.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_update_scan.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Code_update_scan.hpp b/storage/ndb/src/old_files/client/odbc/codegen/Code_update_scan.hpp
index d742883e561..d742883e561 100644
--- a/ndb/src/old_files/client/odbc/codegen/Code_update_scan.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Code_update_scan.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/Makefile b/storage/ndb/src/old_files/client/odbc/codegen/Makefile
index 49e5439556d..49e5439556d 100644
--- a/ndb/src/old_files/client/odbc/codegen/Makefile
+++ b/storage/ndb/src/old_files/client/odbc/codegen/Makefile
diff --git a/ndb/src/old_files/client/odbc/codegen/SimpleGram.ypp b/storage/ndb/src/old_files/client/odbc/codegen/SimpleGram.ypp
index 07d8017e5ed..07d8017e5ed 100644
--- a/ndb/src/old_files/client/odbc/codegen/SimpleGram.ypp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/SimpleGram.ypp
diff --git a/ndb/src/old_files/client/odbc/codegen/SimpleParser.cpp b/storage/ndb/src/old_files/client/odbc/codegen/SimpleParser.cpp
index a2418f49e37..a2418f49e37 100644
--- a/ndb/src/old_files/client/odbc/codegen/SimpleParser.cpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/SimpleParser.cpp
diff --git a/ndb/src/old_files/client/odbc/codegen/SimpleParser.hpp b/storage/ndb/src/old_files/client/odbc/codegen/SimpleParser.hpp
index abadae8f905..abadae8f905 100644
--- a/ndb/src/old_files/client/odbc/codegen/SimpleParser.hpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/SimpleParser.hpp
diff --git a/ndb/src/old_files/client/odbc/codegen/SimpleScan.lpp b/storage/ndb/src/old_files/client/odbc/codegen/SimpleScan.lpp
index 29aa876f669..29aa876f669 100644
--- a/ndb/src/old_files/client/odbc/codegen/SimpleScan.lpp
+++ b/storage/ndb/src/old_files/client/odbc/codegen/SimpleScan.lpp
diff --git a/ndb/src/old_files/client/odbc/common/AttrArea.cpp b/storage/ndb/src/old_files/client/odbc/common/AttrArea.cpp
index ff9e085a7f6..ff9e085a7f6 100644
--- a/ndb/src/old_files/client/odbc/common/AttrArea.cpp
+++ b/storage/ndb/src/old_files/client/odbc/common/AttrArea.cpp
diff --git a/ndb/src/old_files/client/odbc/common/AttrArea.hpp b/storage/ndb/src/old_files/client/odbc/common/AttrArea.hpp
index 050cce719bf..050cce719bf 100644
--- a/ndb/src/old_files/client/odbc/common/AttrArea.hpp
+++ b/storage/ndb/src/old_files/client/odbc/common/AttrArea.hpp
diff --git a/ndb/src/old_files/client/odbc/common/CodeTree.cpp b/storage/ndb/src/old_files/client/odbc/common/CodeTree.cpp
index ebe4840c5f6..ebe4840c5f6 100644
--- a/ndb/src/old_files/client/odbc/common/CodeTree.cpp
+++ b/storage/ndb/src/old_files/client/odbc/common/CodeTree.cpp
diff --git a/ndb/src/old_files/client/odbc/common/CodeTree.hpp b/storage/ndb/src/old_files/client/odbc/common/CodeTree.hpp
index 1b0ae3199af..1b0ae3199af 100644
--- a/ndb/src/old_files/client/odbc/common/CodeTree.hpp
+++ b/storage/ndb/src/old_files/client/odbc/common/CodeTree.hpp
diff --git a/ndb/src/old_files/client/odbc/common/ConnArea.cpp b/storage/ndb/src/old_files/client/odbc/common/ConnArea.cpp
index d4d3be52a3c..d4d3be52a3c 100644
--- a/ndb/src/old_files/client/odbc/common/ConnArea.cpp
+++ b/storage/ndb/src/old_files/client/odbc/common/ConnArea.cpp
diff --git a/ndb/src/old_files/client/odbc/common/ConnArea.hpp b/storage/ndb/src/old_files/client/odbc/common/ConnArea.hpp
index 36367a39bae..36367a39bae 100644
--- a/ndb/src/old_files/client/odbc/common/ConnArea.hpp
+++ b/storage/ndb/src/old_files/client/odbc/common/ConnArea.hpp
diff --git a/ndb/src/old_files/client/odbc/common/Ctx.cpp b/storage/ndb/src/old_files/client/odbc/common/Ctx.cpp
index d6faa5cba77..d6faa5cba77 100644
--- a/ndb/src/old_files/client/odbc/common/Ctx.cpp
+++ b/storage/ndb/src/old_files/client/odbc/common/Ctx.cpp
diff --git a/ndb/src/old_files/client/odbc/common/Ctx.hpp b/storage/ndb/src/old_files/client/odbc/common/Ctx.hpp
index d25d45ff0c7..d25d45ff0c7 100644
--- a/ndb/src/old_files/client/odbc/common/Ctx.hpp
+++ b/storage/ndb/src/old_files/client/odbc/common/Ctx.hpp
diff --git a/ndb/src/old_files/client/odbc/common/DataField.cpp b/storage/ndb/src/old_files/client/odbc/common/DataField.cpp
index 11aae7d893b..11aae7d893b 100644
--- a/ndb/src/old_files/client/odbc/common/DataField.cpp
+++ b/storage/ndb/src/old_files/client/odbc/common/DataField.cpp
diff --git a/ndb/src/old_files/client/odbc/common/DataField.hpp b/storage/ndb/src/old_files/client/odbc/common/DataField.hpp
index 65138df25f1..65138df25f1 100644
--- a/ndb/src/old_files/client/odbc/common/DataField.hpp
+++ b/storage/ndb/src/old_files/client/odbc/common/DataField.hpp
diff --git a/ndb/src/old_files/client/odbc/common/DataRow.cpp b/storage/ndb/src/old_files/client/odbc/common/DataRow.cpp
index 509f2673e0d..509f2673e0d 100644
--- a/ndb/src/old_files/client/odbc/common/DataRow.cpp
+++ b/storage/ndb/src/old_files/client/odbc/common/DataRow.cpp
diff --git a/ndb/src/old_files/client/odbc/common/DataRow.hpp b/storage/ndb/src/old_files/client/odbc/common/DataRow.hpp
index 4a5a1e905b9..4a5a1e905b9 100644
--- a/ndb/src/old_files/client/odbc/common/DataRow.hpp
+++ b/storage/ndb/src/old_files/client/odbc/common/DataRow.hpp
diff --git a/ndb/src/old_files/client/odbc/common/DataType.cpp b/storage/ndb/src/old_files/client/odbc/common/DataType.cpp
index 96f6a6e0877..96f6a6e0877 100644
--- a/ndb/src/old_files/client/odbc/common/DataType.cpp
+++ b/storage/ndb/src/old_files/client/odbc/common/DataType.cpp
diff --git a/ndb/src/old_files/client/odbc/common/DataType.hpp b/storage/ndb/src/old_files/client/odbc/common/DataType.hpp
index e03e445cf05..e03e445cf05 100644
--- a/ndb/src/old_files/client/odbc/common/DataType.hpp
+++ b/storage/ndb/src/old_files/client/odbc/common/DataType.hpp
diff --git a/ndb/src/old_files/client/odbc/common/DescArea.cpp b/storage/ndb/src/old_files/client/odbc/common/DescArea.cpp
index bad9f23d3ef..bad9f23d3ef 100644
--- a/ndb/src/old_files/client/odbc/common/DescArea.cpp
+++ b/storage/ndb/src/old_files/client/odbc/common/DescArea.cpp
diff --git a/ndb/src/old_files/client/odbc/common/DescArea.hpp b/storage/ndb/src/old_files/client/odbc/common/DescArea.hpp
index e9f552d758d..e9f552d758d 100644
--- a/ndb/src/old_files/client/odbc/common/DescArea.hpp
+++ b/storage/ndb/src/old_files/client/odbc/common/DescArea.hpp
diff --git a/ndb/src/old_files/client/odbc/common/DiagArea.cpp b/storage/ndb/src/old_files/client/odbc/common/DiagArea.cpp
index 06e8da89495..06e8da89495 100644
--- a/ndb/src/old_files/client/odbc/common/DiagArea.cpp
+++ b/storage/ndb/src/old_files/client/odbc/common/DiagArea.cpp
diff --git a/ndb/src/old_files/client/odbc/common/DiagArea.hpp b/storage/ndb/src/old_files/client/odbc/common/DiagArea.hpp
index 79c03de6623..79c03de6623 100644
--- a/ndb/src/old_files/client/odbc/common/DiagArea.hpp
+++ b/storage/ndb/src/old_files/client/odbc/common/DiagArea.hpp
diff --git a/ndb/src/old_files/client/odbc/common/Makefile b/storage/ndb/src/old_files/client/odbc/common/Makefile
index 7ee29738d86..7ee29738d86 100644
--- a/ndb/src/old_files/client/odbc/common/Makefile
+++ b/storage/ndb/src/old_files/client/odbc/common/Makefile
diff --git a/ndb/src/old_files/client/odbc/common/OdbcData.cpp b/storage/ndb/src/old_files/client/odbc/common/OdbcData.cpp
index 32400e07c7a..32400e07c7a 100644
--- a/ndb/src/old_files/client/odbc/common/OdbcData.cpp
+++ b/storage/ndb/src/old_files/client/odbc/common/OdbcData.cpp
diff --git a/ndb/src/old_files/client/odbc/common/OdbcData.hpp b/storage/ndb/src/old_files/client/odbc/common/OdbcData.hpp
index c1884507cfe..c1884507cfe 100644
--- a/ndb/src/old_files/client/odbc/common/OdbcData.hpp
+++ b/storage/ndb/src/old_files/client/odbc/common/OdbcData.hpp
diff --git a/ndb/src/old_files/client/odbc/common/ResultArea.cpp b/storage/ndb/src/old_files/client/odbc/common/ResultArea.cpp
index 79d7fb0ccc4..79d7fb0ccc4 100644
--- a/ndb/src/old_files/client/odbc/common/ResultArea.cpp
+++ b/storage/ndb/src/old_files/client/odbc/common/ResultArea.cpp
diff --git a/ndb/src/old_files/client/odbc/common/ResultArea.hpp b/storage/ndb/src/old_files/client/odbc/common/ResultArea.hpp
index d4890c44d99..d4890c44d99 100644
--- a/ndb/src/old_files/client/odbc/common/ResultArea.hpp
+++ b/storage/ndb/src/old_files/client/odbc/common/ResultArea.hpp
diff --git a/ndb/src/old_files/client/odbc/common/Sqlstate.cpp b/storage/ndb/src/old_files/client/odbc/common/Sqlstate.cpp
index 2d625a7c159..2d625a7c159 100644
--- a/ndb/src/old_files/client/odbc/common/Sqlstate.cpp
+++ b/storage/ndb/src/old_files/client/odbc/common/Sqlstate.cpp
diff --git a/ndb/src/old_files/client/odbc/common/Sqlstate.hpp b/storage/ndb/src/old_files/client/odbc/common/Sqlstate.hpp
index 3b4665dc6ca..3b4665dc6ca 100644
--- a/ndb/src/old_files/client/odbc/common/Sqlstate.hpp
+++ b/storage/ndb/src/old_files/client/odbc/common/Sqlstate.hpp
diff --git a/ndb/src/old_files/client/odbc/common/StmtArea.cpp b/storage/ndb/src/old_files/client/odbc/common/StmtArea.cpp
index 5ce2d47d31a..5ce2d47d31a 100644
--- a/ndb/src/old_files/client/odbc/common/StmtArea.cpp
+++ b/storage/ndb/src/old_files/client/odbc/common/StmtArea.cpp
diff --git a/ndb/src/old_files/client/odbc/common/StmtArea.hpp b/storage/ndb/src/old_files/client/odbc/common/StmtArea.hpp
index a88c6d36e6d..a88c6d36e6d 100644
--- a/ndb/src/old_files/client/odbc/common/StmtArea.hpp
+++ b/storage/ndb/src/old_files/client/odbc/common/StmtArea.hpp
diff --git a/ndb/src/old_files/client/odbc/common/StmtInfo.cpp b/storage/ndb/src/old_files/client/odbc/common/StmtInfo.cpp
index 3467fb5023e..3467fb5023e 100644
--- a/ndb/src/old_files/client/odbc/common/StmtInfo.cpp
+++ b/storage/ndb/src/old_files/client/odbc/common/StmtInfo.cpp
diff --git a/ndb/src/old_files/client/odbc/common/StmtInfo.hpp b/storage/ndb/src/old_files/client/odbc/common/StmtInfo.hpp
index 9cd489be6da..9cd489be6da 100644
--- a/ndb/src/old_files/client/odbc/common/StmtInfo.hpp
+++ b/storage/ndb/src/old_files/client/odbc/common/StmtInfo.hpp
diff --git a/ndb/src/old_files/client/odbc/common/common.cpp b/storage/ndb/src/old_files/client/odbc/common/common.cpp
index 73d14c82efe..73d14c82efe 100644
--- a/ndb/src/old_files/client/odbc/common/common.cpp
+++ b/storage/ndb/src/old_files/client/odbc/common/common.cpp
diff --git a/ndb/src/old_files/client/odbc/common/common.hpp b/storage/ndb/src/old_files/client/odbc/common/common.hpp
index d2f243b6437..d2f243b6437 100644
--- a/ndb/src/old_files/client/odbc/common/common.hpp
+++ b/storage/ndb/src/old_files/client/odbc/common/common.hpp
diff --git a/ndb/src/old_files/client/odbc/dictionary/DictCatalog.cpp b/storage/ndb/src/old_files/client/odbc/dictionary/DictCatalog.cpp
index 433347c9a70..433347c9a70 100644
--- a/ndb/src/old_files/client/odbc/dictionary/DictCatalog.cpp
+++ b/storage/ndb/src/old_files/client/odbc/dictionary/DictCatalog.cpp
diff --git a/ndb/src/old_files/client/odbc/dictionary/DictCatalog.hpp b/storage/ndb/src/old_files/client/odbc/dictionary/DictCatalog.hpp
index 5452990a51b..5452990a51b 100644
--- a/ndb/src/old_files/client/odbc/dictionary/DictCatalog.hpp
+++ b/storage/ndb/src/old_files/client/odbc/dictionary/DictCatalog.hpp
diff --git a/ndb/src/old_files/client/odbc/dictionary/DictColumn.cpp b/storage/ndb/src/old_files/client/odbc/dictionary/DictColumn.cpp
index fa0128f1ddb..fa0128f1ddb 100644
--- a/ndb/src/old_files/client/odbc/dictionary/DictColumn.cpp
+++ b/storage/ndb/src/old_files/client/odbc/dictionary/DictColumn.cpp
diff --git a/ndb/src/old_files/client/odbc/dictionary/DictColumn.hpp b/storage/ndb/src/old_files/client/odbc/dictionary/DictColumn.hpp
index 945fb86367b..945fb86367b 100644
--- a/ndb/src/old_files/client/odbc/dictionary/DictColumn.hpp
+++ b/storage/ndb/src/old_files/client/odbc/dictionary/DictColumn.hpp
diff --git a/ndb/src/old_files/client/odbc/dictionary/DictIndex.cpp b/storage/ndb/src/old_files/client/odbc/dictionary/DictIndex.cpp
index 95d93318902..95d93318902 100644
--- a/ndb/src/old_files/client/odbc/dictionary/DictIndex.cpp
+++ b/storage/ndb/src/old_files/client/odbc/dictionary/DictIndex.cpp
diff --git a/ndb/src/old_files/client/odbc/dictionary/DictIndex.hpp b/storage/ndb/src/old_files/client/odbc/dictionary/DictIndex.hpp
index 7ba46daaae3..7ba46daaae3 100644
--- a/ndb/src/old_files/client/odbc/dictionary/DictIndex.hpp
+++ b/storage/ndb/src/old_files/client/odbc/dictionary/DictIndex.hpp
diff --git a/ndb/src/old_files/client/odbc/dictionary/DictSchema.cpp b/storage/ndb/src/old_files/client/odbc/dictionary/DictSchema.cpp
index 91939cb2f26..91939cb2f26 100644
--- a/ndb/src/old_files/client/odbc/dictionary/DictSchema.cpp
+++ b/storage/ndb/src/old_files/client/odbc/dictionary/DictSchema.cpp
diff --git a/ndb/src/old_files/client/odbc/dictionary/DictSchema.hpp b/storage/ndb/src/old_files/client/odbc/dictionary/DictSchema.hpp
index 099352edbb9..099352edbb9 100644
--- a/ndb/src/old_files/client/odbc/dictionary/DictSchema.hpp
+++ b/storage/ndb/src/old_files/client/odbc/dictionary/DictSchema.hpp
diff --git a/ndb/src/old_files/client/odbc/dictionary/DictSys.cpp b/storage/ndb/src/old_files/client/odbc/dictionary/DictSys.cpp
index 1ceef66ee57..1ceef66ee57 100644
--- a/ndb/src/old_files/client/odbc/dictionary/DictSys.cpp
+++ b/storage/ndb/src/old_files/client/odbc/dictionary/DictSys.cpp
diff --git a/ndb/src/old_files/client/odbc/dictionary/DictSys.hpp b/storage/ndb/src/old_files/client/odbc/dictionary/DictSys.hpp
index e6fa661fd59..e6fa661fd59 100644
--- a/ndb/src/old_files/client/odbc/dictionary/DictSys.hpp
+++ b/storage/ndb/src/old_files/client/odbc/dictionary/DictSys.hpp
diff --git a/ndb/src/old_files/client/odbc/dictionary/DictTable.cpp b/storage/ndb/src/old_files/client/odbc/dictionary/DictTable.cpp
index 4db7d3b3aec..4db7d3b3aec 100644
--- a/ndb/src/old_files/client/odbc/dictionary/DictTable.cpp
+++ b/storage/ndb/src/old_files/client/odbc/dictionary/DictTable.cpp
diff --git a/ndb/src/old_files/client/odbc/dictionary/DictTable.hpp b/storage/ndb/src/old_files/client/odbc/dictionary/DictTable.hpp
index 5cecfff9562..5cecfff9562 100644
--- a/ndb/src/old_files/client/odbc/dictionary/DictTable.hpp
+++ b/storage/ndb/src/old_files/client/odbc/dictionary/DictTable.hpp
diff --git a/ndb/src/old_files/client/odbc/dictionary/Makefile b/storage/ndb/src/old_files/client/odbc/dictionary/Makefile
index cdfd3b6ea0c..cdfd3b6ea0c 100644
--- a/ndb/src/old_files/client/odbc/dictionary/Makefile
+++ b/storage/ndb/src/old_files/client/odbc/dictionary/Makefile
diff --git a/ndb/src/old_files/client/odbc/docs/class.fig b/storage/ndb/src/old_files/client/odbc/docs/class.fig
index 38c24c1fba4..38c24c1fba4 100644
--- a/ndb/src/old_files/client/odbc/docs/class.fig
+++ b/storage/ndb/src/old_files/client/odbc/docs/class.fig
diff --git a/ndb/src/old_files/client/odbc/docs/descfield.pl b/storage/ndb/src/old_files/client/odbc/docs/descfield.pl
index 80fef22f303..80fef22f303 100644
--- a/ndb/src/old_files/client/odbc/docs/descfield.pl
+++ b/storage/ndb/src/old_files/client/odbc/docs/descfield.pl
diff --git a/ndb/src/old_files/client/odbc/docs/diag.txt b/storage/ndb/src/old_files/client/odbc/docs/diag.txt
index a9a0e0f42d0..a9a0e0f42d0 100644
--- a/ndb/src/old_files/client/odbc/docs/diag.txt
+++ b/storage/ndb/src/old_files/client/odbc/docs/diag.txt
diff --git a/ndb/src/old_files/client/odbc/docs/getinfo.pl b/storage/ndb/src/old_files/client/odbc/docs/getinfo.pl
index 34e26b47bab..34e26b47bab 100644
--- a/ndb/src/old_files/client/odbc/docs/getinfo.pl
+++ b/storage/ndb/src/old_files/client/odbc/docs/getinfo.pl
diff --git a/ndb/src/old_files/client/odbc/docs/gettypeinfo.pl b/storage/ndb/src/old_files/client/odbc/docs/gettypeinfo.pl
index 0a999fd7249..0a999fd7249 100644
--- a/ndb/src/old_files/client/odbc/docs/gettypeinfo.pl
+++ b/storage/ndb/src/old_files/client/odbc/docs/gettypeinfo.pl
diff --git a/ndb/src/old_files/client/odbc/docs/handleattr.pl b/storage/ndb/src/old_files/client/odbc/docs/handleattr.pl
index 892d34b105b..892d34b105b 100644
--- a/ndb/src/old_files/client/odbc/docs/handleattr.pl
+++ b/storage/ndb/src/old_files/client/odbc/docs/handleattr.pl
diff --git a/ndb/src/old_files/client/odbc/docs/main.hpp b/storage/ndb/src/old_files/client/odbc/docs/main.hpp
index ebb5b1f235a..ebb5b1f235a 100644
--- a/ndb/src/old_files/client/odbc/docs/main.hpp
+++ b/storage/ndb/src/old_files/client/odbc/docs/main.hpp
diff --git a/ndb/src/old_files/client/odbc/docs/ndbodbc.html b/storage/ndb/src/old_files/client/odbc/docs/ndbodbc.html
index 6be624dfa1b..6be624dfa1b 100644
--- a/ndb/src/old_files/client/odbc/docs/ndbodbc.html
+++ b/storage/ndb/src/old_files/client/odbc/docs/ndbodbc.html
diff --git a/ndb/src/old_files/client/odbc/docs/select.fig b/storage/ndb/src/old_files/client/odbc/docs/select.fig
index 4f51a2085b4..4f51a2085b4 100644
--- a/ndb/src/old_files/client/odbc/docs/select.fig
+++ b/storage/ndb/src/old_files/client/odbc/docs/select.fig
diff --git a/ndb/src/old_files/client/odbc/docs/systables.pl b/storage/ndb/src/old_files/client/odbc/docs/systables.pl
index 728d966a7a4..728d966a7a4 100644
--- a/ndb/src/old_files/client/odbc/docs/systables.pl
+++ b/storage/ndb/src/old_files/client/odbc/docs/systables.pl
diff --git a/ndb/src/old_files/client/odbc/docs/type.txt b/storage/ndb/src/old_files/client/odbc/docs/type.txt
index d7b391afc55..d7b391afc55 100644
--- a/ndb/src/old_files/client/odbc/docs/type.txt
+++ b/storage/ndb/src/old_files/client/odbc/docs/type.txt
diff --git a/ndb/src/old_files/client/odbc/driver/Func.data b/storage/ndb/src/old_files/client/odbc/driver/Func.data
index c32671e1135..c32671e1135 100644
--- a/ndb/src/old_files/client/odbc/driver/Func.data
+++ b/storage/ndb/src/old_files/client/odbc/driver/Func.data
diff --git a/ndb/src/old_files/client/odbc/driver/Func.pl b/storage/ndb/src/old_files/client/odbc/driver/Func.pl
index 1064a6a6c6e..1064a6a6c6e 100644
--- a/ndb/src/old_files/client/odbc/driver/Func.pl
+++ b/storage/ndb/src/old_files/client/odbc/driver/Func.pl
diff --git a/ndb/src/old_files/client/odbc/driver/Makefile b/storage/ndb/src/old_files/client/odbc/driver/Makefile
index 62f82371da4..62f82371da4 100644
--- a/ndb/src/old_files/client/odbc/driver/Makefile
+++ b/storage/ndb/src/old_files/client/odbc/driver/Makefile
diff --git a/ndb/src/old_files/client/odbc/driver/SQLAllocConnect.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLAllocConnect.cpp
index a7ffd8c89d1..a7ffd8c89d1 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLAllocConnect.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLAllocConnect.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLAllocEnv.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLAllocEnv.cpp
index a62dae61008..a62dae61008 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLAllocEnv.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLAllocEnv.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLAllocHandle.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLAllocHandle.cpp
index 9daf6ead946..9daf6ead946 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLAllocHandle.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLAllocHandle.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLAllocHandleStd.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLAllocHandleStd.cpp
index 61290e37b7b..61290e37b7b 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLAllocHandleStd.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLAllocHandleStd.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLAllocStmt.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLAllocStmt.cpp
index bf3f149f5de..bf3f149f5de 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLAllocStmt.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLAllocStmt.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLBindCol.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLBindCol.cpp
index 5562334e8cc..5562334e8cc 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLBindCol.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLBindCol.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLBindParam.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLBindParam.cpp
index 2fcc17b872f..2fcc17b872f 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLBindParam.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLBindParam.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLBindParameter.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLBindParameter.cpp
index e4ca5bbc731..e4ca5bbc731 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLBindParameter.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLBindParameter.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLBrowseConnect.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLBrowseConnect.cpp
index 7e629e199e5..7e629e199e5 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLBrowseConnect.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLBrowseConnect.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLBulkOperations.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLBulkOperations.cpp
index 7d256d66e3f..7d256d66e3f 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLBulkOperations.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLBulkOperations.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLCancel.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLCancel.cpp
index ac4e43c6e89..ac4e43c6e89 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLCancel.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLCancel.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLCloseCursor.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLCloseCursor.cpp
index 26d88c91e3b..26d88c91e3b 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLCloseCursor.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLCloseCursor.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLColAttribute.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLColAttribute.cpp
index 0e7e5446932..0e7e5446932 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLColAttribute.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLColAttribute.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLColAttributes.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLColAttributes.cpp
index 05a4c1d4d37..05a4c1d4d37 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLColAttributes.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLColAttributes.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLColumnPrivileges.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLColumnPrivileges.cpp
index cfbc9c2bc57..cfbc9c2bc57 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLColumnPrivileges.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLColumnPrivileges.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLColumns.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLColumns.cpp
index 4e0b646ee7d..4e0b646ee7d 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLColumns.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLColumns.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLConnect.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLConnect.cpp
index d8f30ed47e7..d8f30ed47e7 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLConnect.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLConnect.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLCopyDesc.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLCopyDesc.cpp
index b4d4b2e4122..b4d4b2e4122 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLCopyDesc.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLCopyDesc.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLDataSources.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLDataSources.cpp
index 6115e7175f9..6115e7175f9 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLDataSources.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLDataSources.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLDescribeCol.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLDescribeCol.cpp
index f15ce8962f1..f15ce8962f1 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLDescribeCol.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLDescribeCol.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLDescribeParam.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLDescribeParam.cpp
index beff41396fe..beff41396fe 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLDescribeParam.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLDescribeParam.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLDisconnect.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLDisconnect.cpp
index 75db5604da8..75db5604da8 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLDisconnect.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLDisconnect.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLDriverConnect.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLDriverConnect.cpp
index 340babd8523..340babd8523 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLDriverConnect.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLDriverConnect.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLDrivers.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLDrivers.cpp
index 9c52f900992..9c52f900992 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLDrivers.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLDrivers.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLEndTran.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLEndTran.cpp
index 20b0b2203f5..20b0b2203f5 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLEndTran.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLEndTran.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLError.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLError.cpp
index af78c931d37..af78c931d37 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLError.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLError.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLExecDirect.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLExecDirect.cpp
index 0ad99d29cd9..0ad99d29cd9 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLExecDirect.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLExecDirect.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLExecute.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLExecute.cpp
index 9c30d418f09..9c30d418f09 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLExecute.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLExecute.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLExtendedFetch.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLExtendedFetch.cpp
index e0dd078b5d0..e0dd078b5d0 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLExtendedFetch.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLExtendedFetch.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLFetch.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLFetch.cpp
index addba7b998c..addba7b998c 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLFetch.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLFetch.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLFetchScroll.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLFetchScroll.cpp
index cfbfc813fca..cfbfc813fca 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLFetchScroll.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLFetchScroll.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLForeignKeys.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLForeignKeys.cpp
index 886ac6bdaa5..886ac6bdaa5 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLForeignKeys.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLForeignKeys.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLFreeConnect.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLFreeConnect.cpp
index 9ac84710cce..9ac84710cce 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLFreeConnect.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLFreeConnect.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLFreeEnv.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLFreeEnv.cpp
index 7e35056feb5..7e35056feb5 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLFreeEnv.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLFreeEnv.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLFreeHandle.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLFreeHandle.cpp
index 284463cbb07..284463cbb07 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLFreeHandle.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLFreeHandle.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLFreeStmt.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLFreeStmt.cpp
index 7af6623a37a..7af6623a37a 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLFreeStmt.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLFreeStmt.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLGetConnectAttr.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLGetConnectAttr.cpp
index 66c1f3827e1..66c1f3827e1 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLGetConnectAttr.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLGetConnectAttr.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLGetConnectOption.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLGetConnectOption.cpp
index 514bedb12b9..514bedb12b9 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLGetConnectOption.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLGetConnectOption.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLGetCursorName.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLGetCursorName.cpp
index d54bdf42005..d54bdf42005 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLGetCursorName.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLGetCursorName.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLGetData.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLGetData.cpp
index 3b6987c515d..3b6987c515d 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLGetData.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLGetData.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLGetDescField.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLGetDescField.cpp
index 6cc390a58ed..6cc390a58ed 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLGetDescField.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLGetDescField.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLGetDescRec.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLGetDescRec.cpp
index c7e9631b075..c7e9631b075 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLGetDescRec.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLGetDescRec.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLGetDiagField.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLGetDiagField.cpp
index 3eb34f7ebf6..3eb34f7ebf6 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLGetDiagField.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLGetDiagField.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLGetDiagRec.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLGetDiagRec.cpp
index 448c5206d76..448c5206d76 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLGetDiagRec.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLGetDiagRec.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLGetEnvAttr.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLGetEnvAttr.cpp
index c93870326e4..c93870326e4 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLGetEnvAttr.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLGetEnvAttr.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLGetFunctions.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLGetFunctions.cpp
index 68416fab1a6..68416fab1a6 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLGetFunctions.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLGetFunctions.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLGetInfo.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLGetInfo.cpp
index 8f0a0d67cfa..8f0a0d67cfa 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLGetInfo.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLGetInfo.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLGetStmtAttr.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLGetStmtAttr.cpp
index 990ab68808a..990ab68808a 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLGetStmtAttr.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLGetStmtAttr.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLGetStmtOption.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLGetStmtOption.cpp
index 0b5758b1212..0b5758b1212 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLGetStmtOption.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLGetStmtOption.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLGetTypeInfo.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLGetTypeInfo.cpp
index e6a016cc400..e6a016cc400 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLGetTypeInfo.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLGetTypeInfo.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLMoreResults.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLMoreResults.cpp
index d23d653a319..d23d653a319 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLMoreResults.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLMoreResults.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLNativeSql.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLNativeSql.cpp
index fb8a9bbf3d9..fb8a9bbf3d9 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLNativeSql.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLNativeSql.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLNumParams.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLNumParams.cpp
index 7b1a6a07aec..7b1a6a07aec 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLNumParams.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLNumParams.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLNumResultCols.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLNumResultCols.cpp
index 2e70897a9a2..2e70897a9a2 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLNumResultCols.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLNumResultCols.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLParamData.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLParamData.cpp
index 4eb38a010f4..4eb38a010f4 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLParamData.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLParamData.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLParamOptions.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLParamOptions.cpp
index 59b7dcf7fa9..59b7dcf7fa9 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLParamOptions.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLParamOptions.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLPrepare.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLPrepare.cpp
index b1205fa6e3a..b1205fa6e3a 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLPrepare.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLPrepare.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLPrimaryKeys.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLPrimaryKeys.cpp
index 2d562ae3e19..2d562ae3e19 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLPrimaryKeys.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLPrimaryKeys.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLProcedureColumns.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLProcedureColumns.cpp
index 2e42e428b87..2e42e428b87 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLProcedureColumns.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLProcedureColumns.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLProcedures.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLProcedures.cpp
index 1f3a9f89073..1f3a9f89073 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLProcedures.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLProcedures.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLPutData.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLPutData.cpp
index a4715a836d2..a4715a836d2 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLPutData.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLPutData.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLRowCount.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLRowCount.cpp
index d03f954386a..d03f954386a 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLRowCount.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLRowCount.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLSetConnectAttr.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLSetConnectAttr.cpp
index 05bfce5e9cd..05bfce5e9cd 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLSetConnectAttr.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLSetConnectAttr.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLSetConnectOption.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLSetConnectOption.cpp
index a4794316971..a4794316971 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLSetConnectOption.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLSetConnectOption.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLSetCursorName.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLSetCursorName.cpp
index 291ad817d42..291ad817d42 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLSetCursorName.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLSetCursorName.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLSetDescField.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLSetDescField.cpp
index 19d34c2f46d..19d34c2f46d 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLSetDescField.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLSetDescField.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLSetDescRec.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLSetDescRec.cpp
index 80a00514a51..80a00514a51 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLSetDescRec.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLSetDescRec.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLSetEnvAttr.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLSetEnvAttr.cpp
index 86364eac5e8..86364eac5e8 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLSetEnvAttr.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLSetEnvAttr.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLSetParam.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLSetParam.cpp
index 03bde1076d8..03bde1076d8 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLSetParam.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLSetParam.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLSetPos.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLSetPos.cpp
index 653030f90bc..653030f90bc 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLSetPos.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLSetPos.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLSetScrollOptions.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLSetScrollOptions.cpp
index a5e89d8568b..a5e89d8568b 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLSetScrollOptions.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLSetScrollOptions.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLSetStmtAttr.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLSetStmtAttr.cpp
index 9ed6a83b563..9ed6a83b563 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLSetStmtAttr.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLSetStmtAttr.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLSetStmtOption.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLSetStmtOption.cpp
index b403fc8408c..b403fc8408c 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLSetStmtOption.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLSetStmtOption.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLSpecialColumns.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLSpecialColumns.cpp
index 5dd92c86053..5dd92c86053 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLSpecialColumns.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLSpecialColumns.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLStatistics.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLStatistics.cpp
index 941fb6249a5..941fb6249a5 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLStatistics.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLStatistics.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLTablePrivileges.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLTablePrivileges.cpp
index 23c6ad9fc4b..23c6ad9fc4b 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLTablePrivileges.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLTablePrivileges.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLTables.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLTables.cpp
index b2496bfba87..b2496bfba87 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLTables.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLTables.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/SQLTransact.cpp b/storage/ndb/src/old_files/client/odbc/driver/SQLTransact.cpp
index da8b46b1596..da8b46b1596 100644
--- a/ndb/src/old_files/client/odbc/driver/SQLTransact.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/SQLTransact.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/driver.cpp b/storage/ndb/src/old_files/client/odbc/driver/driver.cpp
index f992fa70878..f992fa70878 100644
--- a/ndb/src/old_files/client/odbc/driver/driver.cpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/driver.cpp
diff --git a/ndb/src/old_files/client/odbc/driver/driver.hpp b/storage/ndb/src/old_files/client/odbc/driver/driver.hpp
index 96d2e052c0d..96d2e052c0d 100644
--- a/ndb/src/old_files/client/odbc/driver/driver.hpp
+++ b/storage/ndb/src/old_files/client/odbc/driver/driver.hpp
diff --git a/ndb/src/old_files/client/odbc/executor/Exec_comp_op.cpp b/storage/ndb/src/old_files/client/odbc/executor/Exec_comp_op.cpp
index 40d3950a592..40d3950a592 100644
--- a/ndb/src/old_files/client/odbc/executor/Exec_comp_op.cpp
+++ b/storage/ndb/src/old_files/client/odbc/executor/Exec_comp_op.cpp
diff --git a/ndb/src/old_files/client/odbc/executor/Exec_create_index.cpp b/storage/ndb/src/old_files/client/odbc/executor/Exec_create_index.cpp
index 3966c6d5db2..3966c6d5db2 100644
--- a/ndb/src/old_files/client/odbc/executor/Exec_create_index.cpp
+++ b/storage/ndb/src/old_files/client/odbc/executor/Exec_create_index.cpp
diff --git a/ndb/src/old_files/client/odbc/executor/Exec_create_table.cpp b/storage/ndb/src/old_files/client/odbc/executor/Exec_create_table.cpp
index d6274119371..d6274119371 100644
--- a/ndb/src/old_files/client/odbc/executor/Exec_create_table.cpp
+++ b/storage/ndb/src/old_files/client/odbc/executor/Exec_create_table.cpp
diff --git a/ndb/src/old_files/client/odbc/executor/Exec_delete_index.cpp b/storage/ndb/src/old_files/client/odbc/executor/Exec_delete_index.cpp
index 10814654a58..10814654a58 100644
--- a/ndb/src/old_files/client/odbc/executor/Exec_delete_index.cpp
+++ b/storage/ndb/src/old_files/client/odbc/executor/Exec_delete_index.cpp
diff --git a/ndb/src/old_files/client/odbc/executor/Exec_delete_lookup.cpp b/storage/ndb/src/old_files/client/odbc/executor/Exec_delete_lookup.cpp
index d0795286122..d0795286122 100644
--- a/ndb/src/old_files/client/odbc/executor/Exec_delete_lookup.cpp
+++ b/storage/ndb/src/old_files/client/odbc/executor/Exec_delete_lookup.cpp
diff --git a/ndb/src/old_files/client/odbc/executor/Exec_delete_scan.cpp b/storage/ndb/src/old_files/client/odbc/executor/Exec_delete_scan.cpp
index a0b3b8314b8..a0b3b8314b8 100644
--- a/ndb/src/old_files/client/odbc/executor/Exec_delete_scan.cpp
+++ b/storage/ndb/src/old_files/client/odbc/executor/Exec_delete_scan.cpp
diff --git a/ndb/src/old_files/client/odbc/executor/Exec_drop_index.cpp b/storage/ndb/src/old_files/client/odbc/executor/Exec_drop_index.cpp
index 6bf451f6911..6bf451f6911 100644
--- a/ndb/src/old_files/client/odbc/executor/Exec_drop_index.cpp
+++ b/storage/ndb/src/old_files/client/odbc/executor/Exec_drop_index.cpp
diff --git a/ndb/src/old_files/client/odbc/executor/Exec_drop_table.cpp b/storage/ndb/src/old_files/client/odbc/executor/Exec_drop_table.cpp
index 40d1d42fc61..40d1d42fc61 100644
--- a/ndb/src/old_files/client/odbc/executor/Exec_drop_table.cpp
+++ b/storage/ndb/src/old_files/client/odbc/executor/Exec_drop_table.cpp
diff --git a/ndb/src/old_files/client/odbc/executor/Exec_expr_conv.cpp b/storage/ndb/src/old_files/client/odbc/executor/Exec_expr_conv.cpp
index 636bfda7d59..636bfda7d59 100644
--- a/ndb/src/old_files/client/odbc/executor/Exec_expr_conv.cpp
+++ b/storage/ndb/src/old_files/client/odbc/executor/Exec_expr_conv.cpp
diff --git a/ndb/src/old_files/client/odbc/executor/Exec_expr_func.cpp b/storage/ndb/src/old_files/client/odbc/executor/Exec_expr_func.cpp
index 093d15c6e2b..093d15c6e2b 100644
--- a/ndb/src/old_files/client/odbc/executor/Exec_expr_func.cpp
+++ b/storage/ndb/src/old_files/client/odbc/executor/Exec_expr_func.cpp
diff --git a/ndb/src/old_files/client/odbc/executor/Exec_expr_op.cpp b/storage/ndb/src/old_files/client/odbc/executor/Exec_expr_op.cpp
index fc8b6df9f5b..fc8b6df9f5b 100644
--- a/ndb/src/old_files/client/odbc/executor/Exec_expr_op.cpp
+++ b/storage/ndb/src/old_files/client/odbc/executor/Exec_expr_op.cpp
diff --git a/ndb/src/old_files/client/odbc/executor/Exec_insert.cpp b/storage/ndb/src/old_files/client/odbc/executor/Exec_insert.cpp
index c2612c6aaab..c2612c6aaab 100644
--- a/ndb/src/old_files/client/odbc/executor/Exec_insert.cpp
+++ b/storage/ndb/src/old_files/client/odbc/executor/Exec_insert.cpp
diff --git a/ndb/src/old_files/client/odbc/executor/Exec_pred_op.cpp b/storage/ndb/src/old_files/client/odbc/executor/Exec_pred_op.cpp
index 7caa4656473..7caa4656473 100644
--- a/ndb/src/old_files/client/odbc/executor/Exec_pred_op.cpp
+++ b/storage/ndb/src/old_files/client/odbc/executor/Exec_pred_op.cpp
diff --git a/ndb/src/old_files/client/odbc/executor/Exec_query_index.cpp b/storage/ndb/src/old_files/client/odbc/executor/Exec_query_index.cpp
index 919743beac2..919743beac2 100644
--- a/ndb/src/old_files/client/odbc/executor/Exec_query_index.cpp
+++ b/storage/ndb/src/old_files/client/odbc/executor/Exec_query_index.cpp
diff --git a/ndb/src/old_files/client/odbc/executor/Exec_query_lookup.cpp b/storage/ndb/src/old_files/client/odbc/executor/Exec_query_lookup.cpp
index 599e1a36461..599e1a36461 100644
--- a/ndb/src/old_files/client/odbc/executor/Exec_query_lookup.cpp
+++ b/storage/ndb/src/old_files/client/odbc/executor/Exec_query_lookup.cpp
diff --git a/ndb/src/old_files/client/odbc/executor/Exec_query_range.cpp b/storage/ndb/src/old_files/client/odbc/executor/Exec_query_range.cpp
index 0bc878d760d..0bc878d760d 100644
--- a/ndb/src/old_files/client/odbc/executor/Exec_query_range.cpp
+++ b/storage/ndb/src/old_files/client/odbc/executor/Exec_query_range.cpp
diff --git a/ndb/src/old_files/client/odbc/executor/Exec_query_scan.cpp b/storage/ndb/src/old_files/client/odbc/executor/Exec_query_scan.cpp
index 213dfdd616d..213dfdd616d 100644
--- a/ndb/src/old_files/client/odbc/executor/Exec_query_scan.cpp
+++ b/storage/ndb/src/old_files/client/odbc/executor/Exec_query_scan.cpp
diff --git a/ndb/src/old_files/client/odbc/executor/Exec_query_sys.cpp b/storage/ndb/src/old_files/client/odbc/executor/Exec_query_sys.cpp
index acdc120e609..acdc120e609 100644
--- a/ndb/src/old_files/client/odbc/executor/Exec_query_sys.cpp
+++ b/storage/ndb/src/old_files/client/odbc/executor/Exec_query_sys.cpp
diff --git a/ndb/src/old_files/client/odbc/executor/Exec_update_index.cpp b/storage/ndb/src/old_files/client/odbc/executor/Exec_update_index.cpp
index 35b6159d8ca..35b6159d8ca 100644
--- a/ndb/src/old_files/client/odbc/executor/Exec_update_index.cpp
+++ b/storage/ndb/src/old_files/client/odbc/executor/Exec_update_index.cpp
diff --git a/ndb/src/old_files/client/odbc/executor/Exec_update_lookup.cpp b/storage/ndb/src/old_files/client/odbc/executor/Exec_update_lookup.cpp
index 2c801372de3..2c801372de3 100644
--- a/ndb/src/old_files/client/odbc/executor/Exec_update_lookup.cpp
+++ b/storage/ndb/src/old_files/client/odbc/executor/Exec_update_lookup.cpp
diff --git a/ndb/src/old_files/client/odbc/executor/Exec_update_scan.cpp b/storage/ndb/src/old_files/client/odbc/executor/Exec_update_scan.cpp
index a36fdd27142..a36fdd27142 100644
--- a/ndb/src/old_files/client/odbc/executor/Exec_update_scan.cpp
+++ b/storage/ndb/src/old_files/client/odbc/executor/Exec_update_scan.cpp
diff --git a/ndb/src/old_files/client/odbc/executor/Executor.cpp b/storage/ndb/src/old_files/client/odbc/executor/Executor.cpp
index adabb28a4a5..adabb28a4a5 100644
--- a/ndb/src/old_files/client/odbc/executor/Executor.cpp
+++ b/storage/ndb/src/old_files/client/odbc/executor/Executor.cpp
diff --git a/ndb/src/old_files/client/odbc/executor/Executor.hpp b/storage/ndb/src/old_files/client/odbc/executor/Executor.hpp
index 5edb9d509ac..5edb9d509ac 100644
--- a/ndb/src/old_files/client/odbc/executor/Executor.hpp
+++ b/storage/ndb/src/old_files/client/odbc/executor/Executor.hpp
diff --git a/ndb/src/old_files/client/odbc/executor/Makefile b/storage/ndb/src/old_files/client/odbc/executor/Makefile
index d86781e212c..d86781e212c 100644
--- a/ndb/src/old_files/client/odbc/executor/Makefile
+++ b/storage/ndb/src/old_files/client/odbc/executor/Makefile
diff --git a/ndb/src/old_files/client/odbc/handles/AttrDbc.cpp b/storage/ndb/src/old_files/client/odbc/handles/AttrDbc.cpp
index 4768a8995a2..4768a8995a2 100644
--- a/ndb/src/old_files/client/odbc/handles/AttrDbc.cpp
+++ b/storage/ndb/src/old_files/client/odbc/handles/AttrDbc.cpp
diff --git a/ndb/src/old_files/client/odbc/handles/AttrEnv.cpp b/storage/ndb/src/old_files/client/odbc/handles/AttrEnv.cpp
index 3d57fddeb57..3d57fddeb57 100644
--- a/ndb/src/old_files/client/odbc/handles/AttrEnv.cpp
+++ b/storage/ndb/src/old_files/client/odbc/handles/AttrEnv.cpp
diff --git a/ndb/src/old_files/client/odbc/handles/AttrRoot.cpp b/storage/ndb/src/old_files/client/odbc/handles/AttrRoot.cpp
index d1b264835b6..d1b264835b6 100644
--- a/ndb/src/old_files/client/odbc/handles/AttrRoot.cpp
+++ b/storage/ndb/src/old_files/client/odbc/handles/AttrRoot.cpp
diff --git a/ndb/src/old_files/client/odbc/handles/AttrStmt.cpp b/storage/ndb/src/old_files/client/odbc/handles/AttrStmt.cpp
index ce9a9c03fd1..ce9a9c03fd1 100644
--- a/ndb/src/old_files/client/odbc/handles/AttrStmt.cpp
+++ b/storage/ndb/src/old_files/client/odbc/handles/AttrStmt.cpp
diff --git a/ndb/src/old_files/client/odbc/handles/DescSpec.cpp b/storage/ndb/src/old_files/client/odbc/handles/DescSpec.cpp
index 83905cf9822..83905cf9822 100644
--- a/ndb/src/old_files/client/odbc/handles/DescSpec.cpp
+++ b/storage/ndb/src/old_files/client/odbc/handles/DescSpec.cpp
diff --git a/ndb/src/old_files/client/odbc/handles/FuncTab.cpp b/storage/ndb/src/old_files/client/odbc/handles/FuncTab.cpp
index 6bd744d7a7f..6bd744d7a7f 100644
--- a/ndb/src/old_files/client/odbc/handles/FuncTab.cpp
+++ b/storage/ndb/src/old_files/client/odbc/handles/FuncTab.cpp
diff --git a/ndb/src/old_files/client/odbc/handles/HandleBase.cpp b/storage/ndb/src/old_files/client/odbc/handles/HandleBase.cpp
index 27379cdc3f8..27379cdc3f8 100644
--- a/ndb/src/old_files/client/odbc/handles/HandleBase.cpp
+++ b/storage/ndb/src/old_files/client/odbc/handles/HandleBase.cpp
diff --git a/ndb/src/old_files/client/odbc/handles/HandleBase.hpp b/storage/ndb/src/old_files/client/odbc/handles/HandleBase.hpp
index fc35c2b559b..fc35c2b559b 100644
--- a/ndb/src/old_files/client/odbc/handles/HandleBase.hpp
+++ b/storage/ndb/src/old_files/client/odbc/handles/HandleBase.hpp
diff --git a/ndb/src/old_files/client/odbc/handles/HandleDbc.cpp b/storage/ndb/src/old_files/client/odbc/handles/HandleDbc.cpp
index 2d5ded2cc21..2d5ded2cc21 100644
--- a/ndb/src/old_files/client/odbc/handles/HandleDbc.cpp
+++ b/storage/ndb/src/old_files/client/odbc/handles/HandleDbc.cpp
diff --git a/ndb/src/old_files/client/odbc/handles/HandleDbc.hpp b/storage/ndb/src/old_files/client/odbc/handles/HandleDbc.hpp
index 130df08d02c..130df08d02c 100644
--- a/ndb/src/old_files/client/odbc/handles/HandleDbc.hpp
+++ b/storage/ndb/src/old_files/client/odbc/handles/HandleDbc.hpp
diff --git a/ndb/src/old_files/client/odbc/handles/HandleDesc.cpp b/storage/ndb/src/old_files/client/odbc/handles/HandleDesc.cpp
index 4cff1bb8892..4cff1bb8892 100644
--- a/ndb/src/old_files/client/odbc/handles/HandleDesc.cpp
+++ b/storage/ndb/src/old_files/client/odbc/handles/HandleDesc.cpp
diff --git a/ndb/src/old_files/client/odbc/handles/HandleDesc.hpp b/storage/ndb/src/old_files/client/odbc/handles/HandleDesc.hpp
index 9419697f134..9419697f134 100644
--- a/ndb/src/old_files/client/odbc/handles/HandleDesc.hpp
+++ b/storage/ndb/src/old_files/client/odbc/handles/HandleDesc.hpp
diff --git a/ndb/src/old_files/client/odbc/handles/HandleEnv.cpp b/storage/ndb/src/old_files/client/odbc/handles/HandleEnv.cpp
index bc9d8b420a6..bc9d8b420a6 100644
--- a/ndb/src/old_files/client/odbc/handles/HandleEnv.cpp
+++ b/storage/ndb/src/old_files/client/odbc/handles/HandleEnv.cpp
diff --git a/ndb/src/old_files/client/odbc/handles/HandleEnv.hpp b/storage/ndb/src/old_files/client/odbc/handles/HandleEnv.hpp
index 2b13b0256bc..2b13b0256bc 100644
--- a/ndb/src/old_files/client/odbc/handles/HandleEnv.hpp
+++ b/storage/ndb/src/old_files/client/odbc/handles/HandleEnv.hpp
diff --git a/ndb/src/old_files/client/odbc/handles/HandleRoot.cpp b/storage/ndb/src/old_files/client/odbc/handles/HandleRoot.cpp
index 13560d55028..13560d55028 100644
--- a/ndb/src/old_files/client/odbc/handles/HandleRoot.cpp
+++ b/storage/ndb/src/old_files/client/odbc/handles/HandleRoot.cpp
diff --git a/ndb/src/old_files/client/odbc/handles/HandleRoot.hpp b/storage/ndb/src/old_files/client/odbc/handles/HandleRoot.hpp
index 08a22b3e400..08a22b3e400 100644
--- a/ndb/src/old_files/client/odbc/handles/HandleRoot.hpp
+++ b/storage/ndb/src/old_files/client/odbc/handles/HandleRoot.hpp
diff --git a/ndb/src/old_files/client/odbc/handles/HandleStmt.cpp b/storage/ndb/src/old_files/client/odbc/handles/HandleStmt.cpp
index d33d33dbd5b..d33d33dbd5b 100644
--- a/ndb/src/old_files/client/odbc/handles/HandleStmt.cpp
+++ b/storage/ndb/src/old_files/client/odbc/handles/HandleStmt.cpp
diff --git a/ndb/src/old_files/client/odbc/handles/HandleStmt.hpp b/storage/ndb/src/old_files/client/odbc/handles/HandleStmt.hpp
index 0bee138bfc6..0bee138bfc6 100644
--- a/ndb/src/old_files/client/odbc/handles/HandleStmt.hpp
+++ b/storage/ndb/src/old_files/client/odbc/handles/HandleStmt.hpp
diff --git a/ndb/src/old_files/client/odbc/handles/InfoTab.cpp b/storage/ndb/src/old_files/client/odbc/handles/InfoTab.cpp
index 1a93c4da264..1a93c4da264 100644
--- a/ndb/src/old_files/client/odbc/handles/InfoTab.cpp
+++ b/storage/ndb/src/old_files/client/odbc/handles/InfoTab.cpp
diff --git a/ndb/src/old_files/client/odbc/handles/Makefile b/storage/ndb/src/old_files/client/odbc/handles/Makefile
index d37e7d286ba..d37e7d286ba 100644
--- a/ndb/src/old_files/client/odbc/handles/Makefile
+++ b/storage/ndb/src/old_files/client/odbc/handles/Makefile
diff --git a/ndb/src/old_files/client/odbc/handles/PoolNdb.cpp b/storage/ndb/src/old_files/client/odbc/handles/PoolNdb.cpp
index 45d3c67ec77..45d3c67ec77 100644
--- a/ndb/src/old_files/client/odbc/handles/PoolNdb.cpp
+++ b/storage/ndb/src/old_files/client/odbc/handles/PoolNdb.cpp
diff --git a/ndb/src/old_files/client/odbc/handles/PoolNdb.hpp b/storage/ndb/src/old_files/client/odbc/handles/PoolNdb.hpp
index 35eac055c30..35eac055c30 100644
--- a/ndb/src/old_files/client/odbc/handles/PoolNdb.hpp
+++ b/storage/ndb/src/old_files/client/odbc/handles/PoolNdb.hpp
diff --git a/ndb/src/old_files/client/odbc/handles/handles.hpp b/storage/ndb/src/old_files/client/odbc/handles/handles.hpp
index a9f0fcae888..a9f0fcae888 100644
--- a/ndb/src/old_files/client/odbc/handles/handles.hpp
+++ b/storage/ndb/src/old_files/client/odbc/handles/handles.hpp
diff --git a/ndb/src/old_files/ndbbaseclient/Makefile b/storage/ndb/src/old_files/ndbbaseclient/Makefile
index f4c49a95ffa..f4c49a95ffa 100644
--- a/ndb/src/old_files/ndbbaseclient/Makefile
+++ b/storage/ndb/src/old_files/ndbbaseclient/Makefile
diff --git a/ndb/src/old_files/ndbbaseclient/ndbbaseclient_dummy.cpp b/storage/ndb/src/old_files/ndbbaseclient/ndbbaseclient_dummy.cpp
index e69de29bb2d..e69de29bb2d 100644
--- a/ndb/src/old_files/ndbbaseclient/ndbbaseclient_dummy.cpp
+++ b/storage/ndb/src/old_files/ndbbaseclient/ndbbaseclient_dummy.cpp
diff --git a/ndb/src/old_files/ndbclient/Makefile b/storage/ndb/src/old_files/ndbclient/Makefile
index 2c597eccfa1..2c597eccfa1 100644
--- a/ndb/src/old_files/ndbclient/Makefile
+++ b/storage/ndb/src/old_files/ndbclient/Makefile
diff --git a/ndb/src/old_files/ndbclient/ndbclient_dummy.cpp b/storage/ndb/src/old_files/ndbclient/ndbclient_dummy.cpp
index e69de29bb2d..e69de29bb2d 100644
--- a/ndb/src/old_files/ndbclient/ndbclient_dummy.cpp
+++ b/storage/ndb/src/old_files/ndbclient/ndbclient_dummy.cpp
diff --git a/ndb/src/old_files/newtonapi/Makefile b/storage/ndb/src/old_files/newtonapi/Makefile
index bed179046a5..bed179046a5 100644
--- a/ndb/src/old_files/newtonapi/Makefile
+++ b/storage/ndb/src/old_files/newtonapi/Makefile
diff --git a/ndb/src/old_files/newtonapi/dba_binding.cpp b/storage/ndb/src/old_files/newtonapi/dba_binding.cpp
index 63e48110b1d..63e48110b1d 100644
--- a/ndb/src/old_files/newtonapi/dba_binding.cpp
+++ b/storage/ndb/src/old_files/newtonapi/dba_binding.cpp
diff --git a/ndb/src/old_files/newtonapi/dba_bulkread.cpp b/storage/ndb/src/old_files/newtonapi/dba_bulkread.cpp
index 1f75037046b..1f75037046b 100644
--- a/ndb/src/old_files/newtonapi/dba_bulkread.cpp
+++ b/storage/ndb/src/old_files/newtonapi/dba_bulkread.cpp
diff --git a/ndb/src/old_files/newtonapi/dba_config.cpp b/storage/ndb/src/old_files/newtonapi/dba_config.cpp
index d84386a9438..d84386a9438 100644
--- a/ndb/src/old_files/newtonapi/dba_config.cpp
+++ b/storage/ndb/src/old_files/newtonapi/dba_config.cpp
diff --git a/ndb/src/old_files/newtonapi/dba_dac.cpp b/storage/ndb/src/old_files/newtonapi/dba_dac.cpp
index fcb4e676e46..fcb4e676e46 100644
--- a/ndb/src/old_files/newtonapi/dba_dac.cpp
+++ b/storage/ndb/src/old_files/newtonapi/dba_dac.cpp
diff --git a/ndb/src/old_files/newtonapi/dba_error.cpp b/storage/ndb/src/old_files/newtonapi/dba_error.cpp
index f05446522b0..f05446522b0 100644
--- a/ndb/src/old_files/newtonapi/dba_error.cpp
+++ b/storage/ndb/src/old_files/newtonapi/dba_error.cpp
diff --git a/ndb/src/old_files/newtonapi/dba_init.cpp b/storage/ndb/src/old_files/newtonapi/dba_init.cpp
index aa5fef1171c..aa5fef1171c 100644
--- a/ndb/src/old_files/newtonapi/dba_init.cpp
+++ b/storage/ndb/src/old_files/newtonapi/dba_init.cpp
diff --git a/ndb/src/old_files/newtonapi/dba_internal.hpp b/storage/ndb/src/old_files/newtonapi/dba_internal.hpp
index 84ae7ba222b..84ae7ba222b 100644
--- a/ndb/src/old_files/newtonapi/dba_internal.hpp
+++ b/storage/ndb/src/old_files/newtonapi/dba_internal.hpp
diff --git a/ndb/src/old_files/newtonapi/dba_process.cpp b/storage/ndb/src/old_files/newtonapi/dba_process.cpp
index ddb6e62f180..ddb6e62f180 100644
--- a/ndb/src/old_files/newtonapi/dba_process.cpp
+++ b/storage/ndb/src/old_files/newtonapi/dba_process.cpp
diff --git a/ndb/src/old_files/newtonapi/dba_process.hpp b/storage/ndb/src/old_files/newtonapi/dba_process.hpp
index ef24fbd9142..ef24fbd9142 100644
--- a/ndb/src/old_files/newtonapi/dba_process.hpp
+++ b/storage/ndb/src/old_files/newtonapi/dba_process.hpp
diff --git a/ndb/src/old_files/newtonapi/dba_schema.cpp b/storage/ndb/src/old_files/newtonapi/dba_schema.cpp
index 1bf21f1fe80..1bf21f1fe80 100644
--- a/ndb/src/old_files/newtonapi/dba_schema.cpp
+++ b/storage/ndb/src/old_files/newtonapi/dba_schema.cpp
diff --git a/ndb/src/old_files/rep/ExtSender.cpp b/storage/ndb/src/old_files/rep/ExtSender.cpp
index cf31001a85f..cf31001a85f 100644
--- a/ndb/src/old_files/rep/ExtSender.cpp
+++ b/storage/ndb/src/old_files/rep/ExtSender.cpp
diff --git a/ndb/src/old_files/rep/ExtSender.hpp b/storage/ndb/src/old_files/rep/ExtSender.hpp
index 0bdabd68f37..0bdabd68f37 100644
--- a/ndb/src/old_files/rep/ExtSender.hpp
+++ b/storage/ndb/src/old_files/rep/ExtSender.hpp
diff --git a/ndb/src/old_files/rep/Makefile b/storage/ndb/src/old_files/rep/Makefile
index 9688a68ec74..9688a68ec74 100644
--- a/ndb/src/old_files/rep/Makefile
+++ b/storage/ndb/src/old_files/rep/Makefile
diff --git a/ndb/src/old_files/rep/NodeConnectInfo.hpp b/storage/ndb/src/old_files/rep/NodeConnectInfo.hpp
index 403f92a5999..403f92a5999 100644
--- a/ndb/src/old_files/rep/NodeConnectInfo.hpp
+++ b/storage/ndb/src/old_files/rep/NodeConnectInfo.hpp
diff --git a/ndb/src/old_files/rep/README b/storage/ndb/src/old_files/rep/README
index 7be5e230eb3..7be5e230eb3 100644
--- a/ndb/src/old_files/rep/README
+++ b/storage/ndb/src/old_files/rep/README
diff --git a/ndb/src/old_files/rep/RepApiInterpreter.cpp b/storage/ndb/src/old_files/rep/RepApiInterpreter.cpp
index 6e6f150713a..6e6f150713a 100644
--- a/ndb/src/old_files/rep/RepApiInterpreter.cpp
+++ b/storage/ndb/src/old_files/rep/RepApiInterpreter.cpp
diff --git a/ndb/src/old_files/rep/RepApiInterpreter.hpp b/storage/ndb/src/old_files/rep/RepApiInterpreter.hpp
index 78f190156b3..78f190156b3 100644
--- a/ndb/src/old_files/rep/RepApiInterpreter.hpp
+++ b/storage/ndb/src/old_files/rep/RepApiInterpreter.hpp
diff --git a/ndb/src/old_files/rep/RepApiService.cpp b/storage/ndb/src/old_files/rep/RepApiService.cpp
index d07f7a59375..d07f7a59375 100644
--- a/ndb/src/old_files/rep/RepApiService.cpp
+++ b/storage/ndb/src/old_files/rep/RepApiService.cpp
diff --git a/ndb/src/old_files/rep/RepApiService.hpp b/storage/ndb/src/old_files/rep/RepApiService.hpp
index e1137e53258..e1137e53258 100644
--- a/ndb/src/old_files/rep/RepApiService.hpp
+++ b/storage/ndb/src/old_files/rep/RepApiService.hpp
diff --git a/ndb/src/old_files/rep/RepCommandInterpreter.cpp b/storage/ndb/src/old_files/rep/RepCommandInterpreter.cpp
index a0daf9529ab..a0daf9529ab 100644
--- a/ndb/src/old_files/rep/RepCommandInterpreter.cpp
+++ b/storage/ndb/src/old_files/rep/RepCommandInterpreter.cpp
diff --git a/ndb/src/old_files/rep/RepCommandInterpreter.hpp b/storage/ndb/src/old_files/rep/RepCommandInterpreter.hpp
index 398a7c0318c..398a7c0318c 100644
--- a/ndb/src/old_files/rep/RepCommandInterpreter.hpp
+++ b/storage/ndb/src/old_files/rep/RepCommandInterpreter.hpp
diff --git a/ndb/src/old_files/rep/RepComponents.cpp b/storage/ndb/src/old_files/rep/RepComponents.cpp
index 04b2e0e5fa5..04b2e0e5fa5 100644
--- a/ndb/src/old_files/rep/RepComponents.cpp
+++ b/storage/ndb/src/old_files/rep/RepComponents.cpp
diff --git a/ndb/src/old_files/rep/RepComponents.hpp b/storage/ndb/src/old_files/rep/RepComponents.hpp
index ff0f29e2128..ff0f29e2128 100644
--- a/ndb/src/old_files/rep/RepComponents.hpp
+++ b/storage/ndb/src/old_files/rep/RepComponents.hpp
diff --git a/ndb/src/old_files/rep/RepMain.cpp b/storage/ndb/src/old_files/rep/RepMain.cpp
index d9f057be9a1..d9f057be9a1 100644
--- a/ndb/src/old_files/rep/RepMain.cpp
+++ b/storage/ndb/src/old_files/rep/RepMain.cpp
diff --git a/ndb/src/old_files/rep/Requestor.cpp b/storage/ndb/src/old_files/rep/Requestor.cpp
index 3c93a6394a4..3c93a6394a4 100644
--- a/ndb/src/old_files/rep/Requestor.cpp
+++ b/storage/ndb/src/old_files/rep/Requestor.cpp
diff --git a/ndb/src/old_files/rep/Requestor.hpp b/storage/ndb/src/old_files/rep/Requestor.hpp
index 735d2094bde..735d2094bde 100644
--- a/ndb/src/old_files/rep/Requestor.hpp
+++ b/storage/ndb/src/old_files/rep/Requestor.hpp
diff --git a/ndb/src/old_files/rep/RequestorSubscriptions.cpp b/storage/ndb/src/old_files/rep/RequestorSubscriptions.cpp
index 75b41fae037..75b41fae037 100644
--- a/ndb/src/old_files/rep/RequestorSubscriptions.cpp
+++ b/storage/ndb/src/old_files/rep/RequestorSubscriptions.cpp
diff --git a/ndb/src/old_files/rep/SignalQueue.cpp b/storage/ndb/src/old_files/rep/SignalQueue.cpp
index 9b356a14b7d..9b356a14b7d 100644
--- a/ndb/src/old_files/rep/SignalQueue.cpp
+++ b/storage/ndb/src/old_files/rep/SignalQueue.cpp
diff --git a/ndb/src/old_files/rep/SignalQueue.hpp b/storage/ndb/src/old_files/rep/SignalQueue.hpp
index 697bca85893..697bca85893 100644
--- a/ndb/src/old_files/rep/SignalQueue.hpp
+++ b/storage/ndb/src/old_files/rep/SignalQueue.hpp
diff --git a/ndb/src/old_files/rep/TODO b/storage/ndb/src/old_files/rep/TODO
index a2462fae6cd..a2462fae6cd 100644
--- a/ndb/src/old_files/rep/TODO
+++ b/storage/ndb/src/old_files/rep/TODO
diff --git a/ndb/src/old_files/rep/adapters/AppNDB.cpp b/storage/ndb/src/old_files/rep/adapters/AppNDB.cpp
index 05f6d52807f..05f6d52807f 100644
--- a/ndb/src/old_files/rep/adapters/AppNDB.cpp
+++ b/storage/ndb/src/old_files/rep/adapters/AppNDB.cpp
diff --git a/ndb/src/old_files/rep/adapters/AppNDB.hpp b/storage/ndb/src/old_files/rep/adapters/AppNDB.hpp
index 9563a1e41ab..9563a1e41ab 100644
--- a/ndb/src/old_files/rep/adapters/AppNDB.hpp
+++ b/storage/ndb/src/old_files/rep/adapters/AppNDB.hpp
diff --git a/ndb/src/old_files/rep/adapters/ExtAPI.cpp b/storage/ndb/src/old_files/rep/adapters/ExtAPI.cpp
index 0dcd1e85465..0dcd1e85465 100644
--- a/ndb/src/old_files/rep/adapters/ExtAPI.cpp
+++ b/storage/ndb/src/old_files/rep/adapters/ExtAPI.cpp
diff --git a/ndb/src/old_files/rep/adapters/ExtAPI.hpp b/storage/ndb/src/old_files/rep/adapters/ExtAPI.hpp
index f10b6c7d682..f10b6c7d682 100644
--- a/ndb/src/old_files/rep/adapters/ExtAPI.hpp
+++ b/storage/ndb/src/old_files/rep/adapters/ExtAPI.hpp
diff --git a/ndb/src/old_files/rep/adapters/ExtNDB.cpp b/storage/ndb/src/old_files/rep/adapters/ExtNDB.cpp
index 6642b750b57..6642b750b57 100644
--- a/ndb/src/old_files/rep/adapters/ExtNDB.cpp
+++ b/storage/ndb/src/old_files/rep/adapters/ExtNDB.cpp
diff --git a/ndb/src/old_files/rep/adapters/ExtNDB.hpp b/storage/ndb/src/old_files/rep/adapters/ExtNDB.hpp
index 228c980fd06..228c980fd06 100644
--- a/ndb/src/old_files/rep/adapters/ExtNDB.hpp
+++ b/storage/ndb/src/old_files/rep/adapters/ExtNDB.hpp
diff --git a/ndb/src/old_files/rep/adapters/Makefile b/storage/ndb/src/old_files/rep/adapters/Makefile
index bdd711510c3..bdd711510c3 100644
--- a/ndb/src/old_files/rep/adapters/Makefile
+++ b/storage/ndb/src/old_files/rep/adapters/Makefile
diff --git a/ndb/src/old_files/rep/adapters/TableInfoPs.hpp b/storage/ndb/src/old_files/rep/adapters/TableInfoPs.hpp
index 3fa25979255..3fa25979255 100644
--- a/ndb/src/old_files/rep/adapters/TableInfoPs.hpp
+++ b/storage/ndb/src/old_files/rep/adapters/TableInfoPs.hpp
diff --git a/ndb/src/old_files/rep/dbug_hack.cpp b/storage/ndb/src/old_files/rep/dbug_hack.cpp
index 74e5f080777..74e5f080777 100644
--- a/ndb/src/old_files/rep/dbug_hack.cpp
+++ b/storage/ndb/src/old_files/rep/dbug_hack.cpp
diff --git a/ndb/src/old_files/rep/rep_version.hpp b/storage/ndb/src/old_files/rep/rep_version.hpp
index 3830f9c351c..3830f9c351c 100644
--- a/ndb/src/old_files/rep/rep_version.hpp
+++ b/storage/ndb/src/old_files/rep/rep_version.hpp
diff --git a/ndb/src/old_files/rep/repapi/Makefile b/storage/ndb/src/old_files/rep/repapi/Makefile
index fdd153f1060..fdd153f1060 100644
--- a/ndb/src/old_files/rep/repapi/Makefile
+++ b/storage/ndb/src/old_files/rep/repapi/Makefile
diff --git a/ndb/src/old_files/rep/repapi/repapi.cpp b/storage/ndb/src/old_files/rep/repapi/repapi.cpp
index d34ab098c9c..d34ab098c9c 100644
--- a/ndb/src/old_files/rep/repapi/repapi.cpp
+++ b/storage/ndb/src/old_files/rep/repapi/repapi.cpp
diff --git a/ndb/src/old_files/rep/repapi/repapi.h b/storage/ndb/src/old_files/rep/repapi/repapi.h
index 170e493cd86..170e493cd86 100644
--- a/ndb/src/old_files/rep/repapi/repapi.h
+++ b/storage/ndb/src/old_files/rep/repapi/repapi.h
diff --git a/ndb/src/old_files/rep/state/Channel.cpp b/storage/ndb/src/old_files/rep/state/Channel.cpp
index a7f7b90d3fe..a7f7b90d3fe 100644
--- a/ndb/src/old_files/rep/state/Channel.cpp
+++ b/storage/ndb/src/old_files/rep/state/Channel.cpp
diff --git a/ndb/src/old_files/rep/state/Channel.hpp b/storage/ndb/src/old_files/rep/state/Channel.hpp
index cdf4eecca63..cdf4eecca63 100644
--- a/ndb/src/old_files/rep/state/Channel.hpp
+++ b/storage/ndb/src/old_files/rep/state/Channel.hpp
diff --git a/ndb/src/old_files/rep/state/Interval.cpp b/storage/ndb/src/old_files/rep/state/Interval.cpp
index 8266f19c58d..8266f19c58d 100644
--- a/ndb/src/old_files/rep/state/Interval.cpp
+++ b/storage/ndb/src/old_files/rep/state/Interval.cpp
diff --git a/ndb/src/old_files/rep/state/Interval.hpp b/storage/ndb/src/old_files/rep/state/Interval.hpp
index 935adaf26b1..935adaf26b1 100644
--- a/ndb/src/old_files/rep/state/Interval.hpp
+++ b/storage/ndb/src/old_files/rep/state/Interval.hpp
diff --git a/ndb/src/old_files/rep/state/Makefile b/storage/ndb/src/old_files/rep/state/Makefile
index 3eed69a97dd..3eed69a97dd 100644
--- a/ndb/src/old_files/rep/state/Makefile
+++ b/storage/ndb/src/old_files/rep/state/Makefile
diff --git a/ndb/src/old_files/rep/state/RepState.cpp b/storage/ndb/src/old_files/rep/state/RepState.cpp
index d8a50961a3c..d8a50961a3c 100644
--- a/ndb/src/old_files/rep/state/RepState.cpp
+++ b/storage/ndb/src/old_files/rep/state/RepState.cpp
diff --git a/ndb/src/old_files/rep/state/RepState.hpp b/storage/ndb/src/old_files/rep/state/RepState.hpp
index 06bbca19f7e..06bbca19f7e 100644
--- a/ndb/src/old_files/rep/state/RepState.hpp
+++ b/storage/ndb/src/old_files/rep/state/RepState.hpp
diff --git a/ndb/src/old_files/rep/state/RepStateEvent.cpp b/storage/ndb/src/old_files/rep/state/RepStateEvent.cpp
index 9be304c8bfa..9be304c8bfa 100644
--- a/ndb/src/old_files/rep/state/RepStateEvent.cpp
+++ b/storage/ndb/src/old_files/rep/state/RepStateEvent.cpp
diff --git a/ndb/src/old_files/rep/state/RepStateRequests.cpp b/storage/ndb/src/old_files/rep/state/RepStateRequests.cpp
index 02677e141f6..02677e141f6 100644
--- a/ndb/src/old_files/rep/state/RepStateRequests.cpp
+++ b/storage/ndb/src/old_files/rep/state/RepStateRequests.cpp
diff --git a/ndb/src/old_files/rep/state/testInterval/Makefile b/storage/ndb/src/old_files/rep/state/testInterval/Makefile
index fbb0b48c280..fbb0b48c280 100644
--- a/ndb/src/old_files/rep/state/testInterval/Makefile
+++ b/storage/ndb/src/old_files/rep/state/testInterval/Makefile
diff --git a/ndb/src/old_files/rep/state/testInterval/testInterval.cpp b/storage/ndb/src/old_files/rep/state/testInterval/testInterval.cpp
index 463e4adffb7..463e4adffb7 100644
--- a/ndb/src/old_files/rep/state/testInterval/testInterval.cpp
+++ b/storage/ndb/src/old_files/rep/state/testInterval/testInterval.cpp
diff --git a/ndb/src/old_files/rep/state/testRepState/Makefile b/storage/ndb/src/old_files/rep/state/testRepState/Makefile
index 33c6076eff3..33c6076eff3 100644
--- a/ndb/src/old_files/rep/state/testRepState/Makefile
+++ b/storage/ndb/src/old_files/rep/state/testRepState/Makefile
diff --git a/ndb/src/old_files/rep/state/testRepState/testRequestor.cpp b/storage/ndb/src/old_files/rep/state/testRepState/testRequestor.cpp
index 8989f7098b8..8989f7098b8 100644
--- a/ndb/src/old_files/rep/state/testRepState/testRequestor.cpp
+++ b/storage/ndb/src/old_files/rep/state/testRepState/testRequestor.cpp
diff --git a/ndb/src/old_files/rep/state/testRepState/testRequestor.hpp b/storage/ndb/src/old_files/rep/state/testRepState/testRequestor.hpp
index 726b289114d..726b289114d 100644
--- a/ndb/src/old_files/rep/state/testRepState/testRequestor.hpp
+++ b/storage/ndb/src/old_files/rep/state/testRepState/testRequestor.hpp
diff --git a/ndb/src/old_files/rep/storage/GCIBuffer.cpp b/storage/ndb/src/old_files/rep/storage/GCIBuffer.cpp
index 013600b30a5..013600b30a5 100644
--- a/ndb/src/old_files/rep/storage/GCIBuffer.cpp
+++ b/storage/ndb/src/old_files/rep/storage/GCIBuffer.cpp
diff --git a/ndb/src/old_files/rep/storage/GCIBuffer.hpp b/storage/ndb/src/old_files/rep/storage/GCIBuffer.hpp
index 8a8473d1d49..8a8473d1d49 100644
--- a/ndb/src/old_files/rep/storage/GCIBuffer.hpp
+++ b/storage/ndb/src/old_files/rep/storage/GCIBuffer.hpp
diff --git a/ndb/src/old_files/rep/storage/GCIContainer.cpp b/storage/ndb/src/old_files/rep/storage/GCIContainer.cpp
index c161db0769b..c161db0769b 100644
--- a/ndb/src/old_files/rep/storage/GCIContainer.cpp
+++ b/storage/ndb/src/old_files/rep/storage/GCIContainer.cpp
diff --git a/ndb/src/old_files/rep/storage/GCIContainer.hpp b/storage/ndb/src/old_files/rep/storage/GCIContainer.hpp
index 48cbc66bfbd..48cbc66bfbd 100644
--- a/ndb/src/old_files/rep/storage/GCIContainer.hpp
+++ b/storage/ndb/src/old_files/rep/storage/GCIContainer.hpp
diff --git a/ndb/src/old_files/rep/storage/GCIContainerPS.cpp b/storage/ndb/src/old_files/rep/storage/GCIContainerPS.cpp
index 5adb53f965c..5adb53f965c 100644
--- a/ndb/src/old_files/rep/storage/GCIContainerPS.cpp
+++ b/storage/ndb/src/old_files/rep/storage/GCIContainerPS.cpp
diff --git a/ndb/src/old_files/rep/storage/GCIContainerPS.hpp b/storage/ndb/src/old_files/rep/storage/GCIContainerPS.hpp
index 7f5aaac4840..7f5aaac4840 100644
--- a/ndb/src/old_files/rep/storage/GCIContainerPS.hpp
+++ b/storage/ndb/src/old_files/rep/storage/GCIContainerPS.hpp
diff --git a/ndb/src/old_files/rep/storage/GCIPage.cpp b/storage/ndb/src/old_files/rep/storage/GCIPage.cpp
index 05ecde2fee1..05ecde2fee1 100644
--- a/ndb/src/old_files/rep/storage/GCIPage.cpp
+++ b/storage/ndb/src/old_files/rep/storage/GCIPage.cpp
diff --git a/ndb/src/old_files/rep/storage/GCIPage.hpp b/storage/ndb/src/old_files/rep/storage/GCIPage.hpp
index 50c5ab0cfba..50c5ab0cfba 100644
--- a/ndb/src/old_files/rep/storage/GCIPage.hpp
+++ b/storage/ndb/src/old_files/rep/storage/GCIPage.hpp
diff --git a/ndb/src/old_files/rep/storage/LogRecord.hpp b/storage/ndb/src/old_files/rep/storage/LogRecord.hpp
index a0bf3d52372..a0bf3d52372 100644
--- a/ndb/src/old_files/rep/storage/LogRecord.hpp
+++ b/storage/ndb/src/old_files/rep/storage/LogRecord.hpp
diff --git a/ndb/src/old_files/rep/storage/Makefile b/storage/ndb/src/old_files/rep/storage/Makefile
index 89b3af455e8..89b3af455e8 100644
--- a/ndb/src/old_files/rep/storage/Makefile
+++ b/storage/ndb/src/old_files/rep/storage/Makefile
diff --git a/ndb/src/old_files/rep/storage/NodeConnectInfo.hpp b/storage/ndb/src/old_files/rep/storage/NodeConnectInfo.hpp
index 403f92a5999..403f92a5999 100644
--- a/ndb/src/old_files/rep/storage/NodeConnectInfo.hpp
+++ b/storage/ndb/src/old_files/rep/storage/NodeConnectInfo.hpp
diff --git a/ndb/src/old_files/rep/storage/NodeGroup.cpp b/storage/ndb/src/old_files/rep/storage/NodeGroup.cpp
index 33451efb104..33451efb104 100644
--- a/ndb/src/old_files/rep/storage/NodeGroup.cpp
+++ b/storage/ndb/src/old_files/rep/storage/NodeGroup.cpp
diff --git a/ndb/src/old_files/rep/storage/NodeGroup.hpp b/storage/ndb/src/old_files/rep/storage/NodeGroup.hpp
index 1f515e02a23..1f515e02a23 100644
--- a/ndb/src/old_files/rep/storage/NodeGroup.hpp
+++ b/storage/ndb/src/old_files/rep/storage/NodeGroup.hpp
diff --git a/ndb/src/old_files/rep/storage/NodeGroupInfo.cpp b/storage/ndb/src/old_files/rep/storage/NodeGroupInfo.cpp
index 8c250268997..8c250268997 100644
--- a/ndb/src/old_files/rep/storage/NodeGroupInfo.cpp
+++ b/storage/ndb/src/old_files/rep/storage/NodeGroupInfo.cpp
diff --git a/ndb/src/old_files/rep/storage/NodeGroupInfo.hpp b/storage/ndb/src/old_files/rep/storage/NodeGroupInfo.hpp
index 3d0499d4425..3d0499d4425 100644
--- a/ndb/src/old_files/rep/storage/NodeGroupInfo.hpp
+++ b/storage/ndb/src/old_files/rep/storage/NodeGroupInfo.hpp
diff --git a/ndb/src/old_files/rep/transfer/Makefile b/storage/ndb/src/old_files/rep/transfer/Makefile
index 0d8851e287a..0d8851e287a 100644
--- a/ndb/src/old_files/rep/transfer/Makefile
+++ b/storage/ndb/src/old_files/rep/transfer/Makefile
diff --git a/ndb/src/old_files/rep/transfer/TransPS.cpp b/storage/ndb/src/old_files/rep/transfer/TransPS.cpp
index 11fb0203cbc..11fb0203cbc 100644
--- a/ndb/src/old_files/rep/transfer/TransPS.cpp
+++ b/storage/ndb/src/old_files/rep/transfer/TransPS.cpp
diff --git a/ndb/src/old_files/rep/transfer/TransPS.hpp b/storage/ndb/src/old_files/rep/transfer/TransPS.hpp
index 0464b9e47c0..0464b9e47c0 100644
--- a/ndb/src/old_files/rep/transfer/TransPS.hpp
+++ b/storage/ndb/src/old_files/rep/transfer/TransPS.hpp
diff --git a/ndb/src/old_files/rep/transfer/TransSS.cpp b/storage/ndb/src/old_files/rep/transfer/TransSS.cpp
index 376c6375bc4..376c6375bc4 100644
--- a/ndb/src/old_files/rep/transfer/TransSS.cpp
+++ b/storage/ndb/src/old_files/rep/transfer/TransSS.cpp
diff --git a/ndb/src/old_files/rep/transfer/TransSS.hpp b/storage/ndb/src/old_files/rep/transfer/TransSS.hpp
index 3340038c8d1..3340038c8d1 100644
--- a/ndb/src/old_files/rep/transfer/TransSS.hpp
+++ b/storage/ndb/src/old_files/rep/transfer/TransSS.hpp
diff --git a/ndb/src/old_files/rep/transfer/TransSSSubscriptions.cpp b/storage/ndb/src/old_files/rep/transfer/TransSSSubscriptions.cpp
index 582ba8040a6..582ba8040a6 100644
--- a/ndb/src/old_files/rep/transfer/TransSSSubscriptions.cpp
+++ b/storage/ndb/src/old_files/rep/transfer/TransSSSubscriptions.cpp
diff --git a/ndb/test/Makefile.am b/storage/ndb/test/Makefile.am
index b8753668c60..b8753668c60 100644
--- a/ndb/test/Makefile.am
+++ b/storage/ndb/test/Makefile.am
diff --git a/ndb/test/include/CpcClient.hpp b/storage/ndb/test/include/CpcClient.hpp
index 8d8e079d219..8d8e079d219 100644
--- a/ndb/test/include/CpcClient.hpp
+++ b/storage/ndb/test/include/CpcClient.hpp
diff --git a/ndb/test/include/HugoAsynchTransactions.hpp b/storage/ndb/test/include/HugoAsynchTransactions.hpp
index d7e6e8fc187..d7e6e8fc187 100644
--- a/ndb/test/include/HugoAsynchTransactions.hpp
+++ b/storage/ndb/test/include/HugoAsynchTransactions.hpp
diff --git a/ndb/test/include/HugoCalculator.hpp b/storage/ndb/test/include/HugoCalculator.hpp
index 03de46cd7ea..03de46cd7ea 100644
--- a/ndb/test/include/HugoCalculator.hpp
+++ b/storage/ndb/test/include/HugoCalculator.hpp
diff --git a/ndb/test/include/HugoOperations.hpp b/storage/ndb/test/include/HugoOperations.hpp
index 05137710609..05137710609 100644
--- a/ndb/test/include/HugoOperations.hpp
+++ b/storage/ndb/test/include/HugoOperations.hpp
diff --git a/ndb/test/include/HugoTransactions.hpp b/storage/ndb/test/include/HugoTransactions.hpp
index 5795bbc94c9..5795bbc94c9 100644
--- a/ndb/test/include/HugoTransactions.hpp
+++ b/storage/ndb/test/include/HugoTransactions.hpp
diff --git a/ndb/test/include/NDBT.hpp b/storage/ndb/test/include/NDBT.hpp
index 657a9cb03b6..657a9cb03b6 100644
--- a/ndb/test/include/NDBT.hpp
+++ b/storage/ndb/test/include/NDBT.hpp
diff --git a/ndb/test/include/NDBT_DataSet.hpp b/storage/ndb/test/include/NDBT_DataSet.hpp
index 1a0122f617c..1a0122f617c 100644
--- a/ndb/test/include/NDBT_DataSet.hpp
+++ b/storage/ndb/test/include/NDBT_DataSet.hpp
diff --git a/ndb/test/include/NDBT_DataSetTransaction.hpp b/storage/ndb/test/include/NDBT_DataSetTransaction.hpp
index 9f250c566dd..9f250c566dd 100644
--- a/ndb/test/include/NDBT_DataSetTransaction.hpp
+++ b/storage/ndb/test/include/NDBT_DataSetTransaction.hpp
diff --git a/ndb/test/include/NDBT_Error.hpp b/storage/ndb/test/include/NDBT_Error.hpp
index 6775a107196..6775a107196 100644
--- a/ndb/test/include/NDBT_Error.hpp
+++ b/storage/ndb/test/include/NDBT_Error.hpp
diff --git a/ndb/test/include/NDBT_Output.hpp b/storage/ndb/test/include/NDBT_Output.hpp
index aaa619ac479..aaa619ac479 100644
--- a/ndb/test/include/NDBT_Output.hpp
+++ b/storage/ndb/test/include/NDBT_Output.hpp
diff --git a/ndb/test/include/NDBT_ResultRow.hpp b/storage/ndb/test/include/NDBT_ResultRow.hpp
index cbb5d7f6c6a..cbb5d7f6c6a 100644
--- a/ndb/test/include/NDBT_ResultRow.hpp
+++ b/storage/ndb/test/include/NDBT_ResultRow.hpp
diff --git a/ndb/test/include/NDBT_ReturnCodes.h b/storage/ndb/test/include/NDBT_ReturnCodes.h
index 0bc71ad8ceb..0bc71ad8ceb 100644
--- a/ndb/test/include/NDBT_ReturnCodes.h
+++ b/storage/ndb/test/include/NDBT_ReturnCodes.h
diff --git a/ndb/test/include/NDBT_Stats.hpp b/storage/ndb/test/include/NDBT_Stats.hpp
index 28212bdba17..28212bdba17 100644
--- a/ndb/test/include/NDBT_Stats.hpp
+++ b/storage/ndb/test/include/NDBT_Stats.hpp
diff --git a/ndb/test/include/NDBT_Table.hpp b/storage/ndb/test/include/NDBT_Table.hpp
index d2f99b85187..d2f99b85187 100644
--- a/ndb/test/include/NDBT_Table.hpp
+++ b/storage/ndb/test/include/NDBT_Table.hpp
diff --git a/ndb/test/include/NDBT_Tables.hpp b/storage/ndb/test/include/NDBT_Tables.hpp
index fb0df8aa35b..fb0df8aa35b 100644
--- a/ndb/test/include/NDBT_Tables.hpp
+++ b/storage/ndb/test/include/NDBT_Tables.hpp
diff --git a/ndb/test/include/NDBT_Test.hpp b/storage/ndb/test/include/NDBT_Test.hpp
index 1b9c2751f64..1b9c2751f64 100644
--- a/ndb/test/include/NDBT_Test.hpp
+++ b/storage/ndb/test/include/NDBT_Test.hpp
diff --git a/ndb/test/include/NdbBackup.hpp b/storage/ndb/test/include/NdbBackup.hpp
index e2e672b8a72..e2e672b8a72 100644
--- a/ndb/test/include/NdbBackup.hpp
+++ b/storage/ndb/test/include/NdbBackup.hpp
diff --git a/ndb/test/include/NdbConfig.hpp b/storage/ndb/test/include/NdbConfig.hpp
index 19439fafbb2..19439fafbb2 100644
--- a/ndb/test/include/NdbConfig.hpp
+++ b/storage/ndb/test/include/NdbConfig.hpp
diff --git a/ndb/test/include/NdbGrep.hpp b/storage/ndb/test/include/NdbGrep.hpp
index 31c49d1e4da..31c49d1e4da 100644
--- a/ndb/test/include/NdbGrep.hpp
+++ b/storage/ndb/test/include/NdbGrep.hpp
diff --git a/ndb/test/include/NdbRestarter.hpp b/storage/ndb/test/include/NdbRestarter.hpp
index 19a88b4f8ad..19a88b4f8ad 100644
--- a/ndb/test/include/NdbRestarter.hpp
+++ b/storage/ndb/test/include/NdbRestarter.hpp
diff --git a/ndb/test/include/NdbRestarts.hpp b/storage/ndb/test/include/NdbRestarts.hpp
index aabcd7b9975..aabcd7b9975 100644
--- a/ndb/test/include/NdbRestarts.hpp
+++ b/storage/ndb/test/include/NdbRestarts.hpp
diff --git a/ndb/test/include/NdbSchemaCon.hpp b/storage/ndb/test/include/NdbSchemaCon.hpp
index 313daf0094b..313daf0094b 100644
--- a/ndb/test/include/NdbSchemaCon.hpp
+++ b/storage/ndb/test/include/NdbSchemaCon.hpp
diff --git a/ndb/test/include/NdbSchemaOp.hpp b/storage/ndb/test/include/NdbSchemaOp.hpp
index 1edbc155643..1edbc155643 100644
--- a/ndb/test/include/NdbSchemaOp.hpp
+++ b/storage/ndb/test/include/NdbSchemaOp.hpp
diff --git a/ndb/test/include/NdbTest.hpp b/storage/ndb/test/include/NdbTest.hpp
index a2e612b7ffa..a2e612b7ffa 100644
--- a/ndb/test/include/NdbTest.hpp
+++ b/storage/ndb/test/include/NdbTest.hpp
diff --git a/ndb/test/include/NdbTimer.hpp b/storage/ndb/test/include/NdbTimer.hpp
index b0d500b5c2c..b0d500b5c2c 100644
--- a/ndb/test/include/NdbTimer.hpp
+++ b/storage/ndb/test/include/NdbTimer.hpp
diff --git a/ndb/test/include/TestNdbEventOperation.hpp b/storage/ndb/test/include/TestNdbEventOperation.hpp
index 307b0e0089b..307b0e0089b 100644
--- a/ndb/test/include/TestNdbEventOperation.hpp
+++ b/storage/ndb/test/include/TestNdbEventOperation.hpp
diff --git a/ndb/test/include/UtilTransactions.hpp b/storage/ndb/test/include/UtilTransactions.hpp
index afdbc5c3445..afdbc5c3445 100644
--- a/ndb/test/include/UtilTransactions.hpp
+++ b/storage/ndb/test/include/UtilTransactions.hpp
diff --git a/ndb/test/include/getarg.h b/storage/ndb/test/include/getarg.h
index 03ed25f6828..03ed25f6828 100644
--- a/ndb/test/include/getarg.h
+++ b/storage/ndb/test/include/getarg.h
diff --git a/ndb/test/ndbapi/InsertRecs.cpp b/storage/ndb/test/ndbapi/InsertRecs.cpp
index f42786d666d..f42786d666d 100644
--- a/ndb/test/ndbapi/InsertRecs.cpp
+++ b/storage/ndb/test/ndbapi/InsertRecs.cpp
diff --git a/storage/ndb/test/ndbapi/Makefile.am b/storage/ndb/test/ndbapi/Makefile.am
new file mode 100644
index 00000000000..f096a7c74e9
--- /dev/null
+++ b/storage/ndb/test/ndbapi/Makefile.am
@@ -0,0 +1,159 @@
+
+SUBDIRS = bank
+
+ndbtest_PROGRAMS = \
+flexBench \
+drop_all_tabs \
+create_all_tabs \
+create_tab \
+flexAsynch \
+flexBench \
+flexHammer \
+flexTT \
+testBackup \
+testBasic \
+testBasicAsynch \
+testBlobs \
+testDataBuffers \
+testDict \
+testIndex \
+testMgm \
+testNdbApi \
+testNodeRestart \
+testOIBasic \
+testOperations \
+testRestartGci \
+testScan \
+testScanInterpreter \
+testScanPerf \
+testSystemRestart \
+testTimeout \
+testTransactions \
+testDeadlock \
+test_event ndbapi_slow_select testReadPerf testLcp \
+testPartitioning \
+testBitfield \
+DbCreate DbAsyncGenerator \
+test_event_multi_table
+
+#flexTimedAsynch
+#testBlobs
+#flex_bench_mysql
+
+create_all_tabs_SOURCES = create_all_tabs.cpp
+create_tab_SOURCES = create_tab.cpp
+drop_all_tabs_SOURCES = drop_all_tabs.cpp
+flexAsynch_SOURCES = flexAsynch.cpp
+flexBench_SOURCES = flexBench.cpp
+flexHammer_SOURCES = flexHammer.cpp
+flexTT_SOURCES = flexTT.cpp
+#flexTimedAsynch_SOURCES = flexTimedAsynch.cpp
+#flex_bench_mysql_SOURCES = flex_bench_mysql.cpp
+testBackup_SOURCES = testBackup.cpp
+testBasic_SOURCES = testBasic.cpp
+testBasicAsynch_SOURCES = testBasicAsynch.cpp
+testBlobs_SOURCES = testBlobs.cpp
+testDataBuffers_SOURCES = testDataBuffers.cpp
+testDict_SOURCES = testDict.cpp
+testIndex_SOURCES = testIndex.cpp
+testMgm_SOURCES = testMgm.cpp
+testNdbApi_SOURCES = testNdbApi.cpp
+testNodeRestart_SOURCES = testNodeRestart.cpp
+testOIBasic_SOURCES = testOIBasic.cpp
+testOperations_SOURCES = testOperations.cpp
+testRestartGci_SOURCES = testRestartGci.cpp
+testScan_SOURCES = testScan.cpp ScanFunctions.hpp
+testScanInterpreter_SOURCES = testScanInterpreter.cpp ScanFilter.hpp ScanInterpretTest.hpp 
+testScanPerf_SOURCES = testScanPerf.cpp
+testSystemRestart_SOURCES = testSystemRestart.cpp
+testTimeout_SOURCES = testTimeout.cpp
+testTransactions_SOURCES = testTransactions.cpp
+testDeadlock_SOURCES = testDeadlock.cpp
+test_event_SOURCES = test_event.cpp
+ndbapi_slow_select_SOURCES = slow_select.cpp
+testReadPerf_SOURCES = testReadPerf.cpp
+testLcp_SOURCES = testLcp.cpp
+testPartitioning_SOURCES = testPartitioning.cpp
+testBitfield_SOURCES = testBitfield.cpp
+DbCreate_SOURCES = bench/mainPopulate.cpp bench/dbPopulate.cpp bench/userInterface.cpp bench/dbPopulate.h bench/userInterface.h bench/testData.h bench/testDefinitions.h bench/ndb_schema.hpp bench/ndb_error.hpp
+DbAsyncGenerator_SOURCES = bench/mainAsyncGenerator.cpp bench/asyncGenerator.cpp bench/ndb_async2.cpp bench/dbGenerator.h bench/macros.h bench/userInterface.h bench/testData.h bench/testDefinitions.h bench/ndb_schema.hpp bench/ndb_error.hpp
+test_event_multi_table_SOURCES = test_event_multi_table.cpp
+
+INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/include/kernel
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am
+
+##testDict_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
+##testIndex_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
+##testSystemRestart_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
+##testTransactions_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
+testBackup_LDADD = $(LDADD) bank/libbank.a
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+
+
+windoze-dsp: flexBench.dsp testBasic.dsp testBlobs.dsp \
+             testScan.dsp
+
+flexBench.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-prg.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ flexBench
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(flexBench_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
+
+testBasic.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-prg.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ testBasic
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(testBasic_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
+
+testOIBasic.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-prg.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ testOIBasic
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(testOIBasic_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
+
+testBlobs.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-prg.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ testBlobs
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(testBlobs_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
+
+testScan.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-prg.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ testScan
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(testScan_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
diff --git a/ndb/test/ndbapi/ScanFilter.hpp b/storage/ndb/test/ndbapi/ScanFilter.hpp
index 09786756798..09786756798 100644
--- a/ndb/test/ndbapi/ScanFilter.hpp
+++ b/storage/ndb/test/ndbapi/ScanFilter.hpp
diff --git a/ndb/test/ndbapi/ScanFunctions.hpp b/storage/ndb/test/ndbapi/ScanFunctions.hpp
index 37389d9b7de..37389d9b7de 100644
--- a/ndb/test/ndbapi/ScanFunctions.hpp
+++ b/storage/ndb/test/ndbapi/ScanFunctions.hpp
diff --git a/ndb/test/ndbapi/ScanInterpretTest.hpp b/storage/ndb/test/ndbapi/ScanInterpretTest.hpp
index d4e9bbecc81..d4e9bbecc81 100644
--- a/ndb/test/ndbapi/ScanInterpretTest.hpp
+++ b/storage/ndb/test/ndbapi/ScanInterpretTest.hpp
diff --git a/ndb/test/ndbapi/TraceNdbApi.cpp b/storage/ndb/test/ndbapi/TraceNdbApi.cpp
index bd43b15f2e6..bd43b15f2e6 100644
--- a/ndb/test/ndbapi/TraceNdbApi.cpp
+++ b/storage/ndb/test/ndbapi/TraceNdbApi.cpp
diff --git a/ndb/test/ndbapi/VerifyNdbApi.cpp b/storage/ndb/test/ndbapi/VerifyNdbApi.cpp
index 79645827e2c..79645827e2c 100644
--- a/ndb/test/ndbapi/VerifyNdbApi.cpp
+++ b/storage/ndb/test/ndbapi/VerifyNdbApi.cpp
diff --git a/ndb/test/ndbapi/acid.cpp b/storage/ndb/test/ndbapi/acid.cpp
index 3eb1625be26..3eb1625be26 100644
--- a/ndb/test/ndbapi/acid.cpp
+++ b/storage/ndb/test/ndbapi/acid.cpp
diff --git a/ndb/test/ndbapi/acid2.cpp b/storage/ndb/test/ndbapi/acid2.cpp
index 7bd7ec00ac5..7bd7ec00ac5 100644
--- a/ndb/test/ndbapi/acid2.cpp
+++ b/storage/ndb/test/ndbapi/acid2.cpp
diff --git a/ndb/test/ndbapi/adoInsertRecs.cpp b/storage/ndb/test/ndbapi/adoInsertRecs.cpp
index 0bc67ef641b..0bc67ef641b 100644
--- a/ndb/test/ndbapi/adoInsertRecs.cpp
+++ b/storage/ndb/test/ndbapi/adoInsertRecs.cpp
diff --git a/ndb/test/ndbapi/asyncGenerator.cpp b/storage/ndb/test/ndbapi/asyncGenerator.cpp
index d91e38dff1a..d91e38dff1a 100644
--- a/ndb/test/ndbapi/asyncGenerator.cpp
+++ b/storage/ndb/test/ndbapi/asyncGenerator.cpp
diff --git a/ndb/test/ndbapi/bank/Bank.cpp b/storage/ndb/test/ndbapi/bank/Bank.cpp
index 40819ecc849..40819ecc849 100644
--- a/ndb/test/ndbapi/bank/Bank.cpp
+++ b/storage/ndb/test/ndbapi/bank/Bank.cpp
diff --git a/ndb/test/ndbapi/bank/Bank.hpp b/storage/ndb/test/ndbapi/bank/Bank.hpp
index d9dd7b25944..d9dd7b25944 100644
--- a/ndb/test/ndbapi/bank/Bank.hpp
+++ b/storage/ndb/test/ndbapi/bank/Bank.hpp
diff --git a/ndb/test/ndbapi/bank/BankLoad.cpp b/storage/ndb/test/ndbapi/bank/BankLoad.cpp
index 34947019a51..34947019a51 100644
--- a/ndb/test/ndbapi/bank/BankLoad.cpp
+++ b/storage/ndb/test/ndbapi/bank/BankLoad.cpp
diff --git a/storage/ndb/test/ndbapi/bank/Makefile.am b/storage/ndb/test/ndbapi/bank/Makefile.am
new file mode 100644
index 00000000000..d269ddc047a
--- /dev/null
+++ b/storage/ndb/test/ndbapi/bank/Makefile.am
@@ -0,0 +1,24 @@
+
+ndbtest_PROGRAMS = testBank bankSumAccounts bankValidateAllGLs bankMakeGL bankTransactionMaker bankCreator bankTimer
+
+noinst_LIBRARIES = libbank.a
+
+libbank_a_SOURCES = Bank.cpp BankLoad.cpp Bank.hpp
+
+testBank_SOURCES = testBank.cpp
+bankSumAccounts_SOURCES = bankSumAccounts.cpp
+bankValidateAllGLs_SOURCES = bankValidateAllGLs.cpp 
+bankMakeGL_SOURCES = bankMakeGL.cpp 
+bankTransactionMaker_SOURCES = bankTransactionMaker.cpp 
+bankCreator_SOURCES = bankCreator.cpp  
+bankTimer_SOURCES = bankTimer.cpp
+
+LDADD_LOC = $(noinst_LIBRARIES)
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp:
diff --git a/ndb/test/ndbapi/bank/bankCreator.cpp b/storage/ndb/test/ndbapi/bank/bankCreator.cpp
index 257255babc8..257255babc8 100644
--- a/ndb/test/ndbapi/bank/bankCreator.cpp
+++ b/storage/ndb/test/ndbapi/bank/bankCreator.cpp
diff --git a/ndb/test/ndbapi/bank/bankMakeGL.cpp b/storage/ndb/test/ndbapi/bank/bankMakeGL.cpp
index cf373481e3e..cf373481e3e 100644
--- a/ndb/test/ndbapi/bank/bankMakeGL.cpp
+++ b/storage/ndb/test/ndbapi/bank/bankMakeGL.cpp
diff --git a/ndb/test/ndbapi/bank/bankSumAccounts.cpp b/storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp
index 034f70f8f95..034f70f8f95 100644
--- a/ndb/test/ndbapi/bank/bankSumAccounts.cpp
+++ b/storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp
diff --git a/ndb/test/ndbapi/bank/bankTimer.cpp b/storage/ndb/test/ndbapi/bank/bankTimer.cpp
index 298f85e1e43..298f85e1e43 100644
--- a/ndb/test/ndbapi/bank/bankTimer.cpp
+++ b/storage/ndb/test/ndbapi/bank/bankTimer.cpp
diff --git a/ndb/test/ndbapi/bank/bankTransactionMaker.cpp b/storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp
index f8e646b6553..f8e646b6553 100644
--- a/ndb/test/ndbapi/bank/bankTransactionMaker.cpp
+++ b/storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp
diff --git a/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp b/storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp
index 0c268121d8a..0c268121d8a 100644
--- a/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp
+++ b/storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp
diff --git a/ndb/test/ndbapi/bank/testBank.cpp b/storage/ndb/test/ndbapi/bank/testBank.cpp
index 6be66d528b1..6be66d528b1 100644
--- a/ndb/test/ndbapi/bank/testBank.cpp
+++ b/storage/ndb/test/ndbapi/bank/testBank.cpp
diff --git a/ndb/test/ndbapi/bench/asyncGenerator.cpp b/storage/ndb/test/ndbapi/bench/asyncGenerator.cpp
index d91e38dff1a..d91e38dff1a 100644
--- a/ndb/test/ndbapi/bench/asyncGenerator.cpp
+++ b/storage/ndb/test/ndbapi/bench/asyncGenerator.cpp
diff --git a/ndb/test/ndbapi/bench/dbGenerator.h b/storage/ndb/test/ndbapi/bench/dbGenerator.h
index 2256498e151..2256498e151 100644
--- a/ndb/test/ndbapi/bench/dbGenerator.h
+++ b/storage/ndb/test/ndbapi/bench/dbGenerator.h
diff --git a/ndb/test/ndbapi/bench/dbPopulate.cpp b/storage/ndb/test/ndbapi/bench/dbPopulate.cpp
index 42fbb52f3b2..42fbb52f3b2 100644
--- a/ndb/test/ndbapi/bench/dbPopulate.cpp
+++ b/storage/ndb/test/ndbapi/bench/dbPopulate.cpp
diff --git a/ndb/test/ndbapi/bench/dbPopulate.h b/storage/ndb/test/ndbapi/bench/dbPopulate.h
index 1916720e141..1916720e141 100644
--- a/ndb/test/ndbapi/bench/dbPopulate.h
+++ b/storage/ndb/test/ndbapi/bench/dbPopulate.h
diff --git a/ndb/test/ndbapi/bench/macros.h b/storage/ndb/test/ndbapi/bench/macros.h
index 22b7f564490..22b7f564490 100644
--- a/ndb/test/ndbapi/bench/macros.h
+++ b/storage/ndb/test/ndbapi/bench/macros.h
diff --git a/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp b/storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp
index 828b924582f..828b924582f 100644
--- a/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp
+++ b/storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp
diff --git a/ndb/test/ndbapi/bench/mainPopulate.cpp b/storage/ndb/test/ndbapi/bench/mainPopulate.cpp
index 5ab1a5b015d..5ab1a5b015d 100644
--- a/ndb/test/ndbapi/bench/mainPopulate.cpp
+++ b/storage/ndb/test/ndbapi/bench/mainPopulate.cpp
diff --git a/ndb/test/ndbapi/bench/ndb_async1.cpp b/storage/ndb/test/ndbapi/bench/ndb_async1.cpp
index 2a84f6b2aca..2a84f6b2aca 100644
--- a/ndb/test/ndbapi/bench/ndb_async1.cpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_async1.cpp
diff --git a/ndb/test/ndbapi/bench/ndb_async2.cpp b/storage/ndb/test/ndbapi/bench/ndb_async2.cpp
index 31cf1d8310a..31cf1d8310a 100644
--- a/ndb/test/ndbapi/bench/ndb_async2.cpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_async2.cpp
diff --git a/ndb/test/ndbapi/bench/ndb_error.hpp b/storage/ndb/test/ndbapi/bench/ndb_error.hpp
index d90f5506813..d90f5506813 100644
--- a/ndb/test/ndbapi/bench/ndb_error.hpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_error.hpp
diff --git a/ndb/test/ndbapi/bench/ndb_schema.hpp b/storage/ndb/test/ndbapi/bench/ndb_schema.hpp
index af08bc2eecd..af08bc2eecd 100644
--- a/ndb/test/ndbapi/bench/ndb_schema.hpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_schema.hpp
diff --git a/ndb/test/ndbapi/bench/ndb_user_transaction.cpp b/storage/ndb/test/ndbapi/bench/ndb_user_transaction.cpp
index 182f1f99586..182f1f99586 100644
--- a/ndb/test/ndbapi/bench/ndb_user_transaction.cpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_user_transaction.cpp
diff --git a/ndb/test/ndbapi/bench/ndb_user_transaction2.cpp b/storage/ndb/test/ndbapi/bench/ndb_user_transaction2.cpp
index df3c7a7989e..df3c7a7989e 100644
--- a/ndb/test/ndbapi/bench/ndb_user_transaction2.cpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_user_transaction2.cpp
diff --git a/ndb/test/ndbapi/bench/ndb_user_transaction3.cpp b/storage/ndb/test/ndbapi/bench/ndb_user_transaction3.cpp
index d2c92ecd424..d2c92ecd424 100644
--- a/ndb/test/ndbapi/bench/ndb_user_transaction3.cpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_user_transaction3.cpp
diff --git a/ndb/test/ndbapi/bench/ndb_user_transaction4.cpp b/storage/ndb/test/ndbapi/bench/ndb_user_transaction4.cpp
index e652c7bfed8..e652c7bfed8 100644
--- a/ndb/test/ndbapi/bench/ndb_user_transaction4.cpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_user_transaction4.cpp
diff --git a/ndb/test/ndbapi/bench/ndb_user_transaction5.cpp b/storage/ndb/test/ndbapi/bench/ndb_user_transaction5.cpp
index 86580008d10..86580008d10 100644
--- a/ndb/test/ndbapi/bench/ndb_user_transaction5.cpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_user_transaction5.cpp
diff --git a/ndb/test/ndbapi/bench/ndb_user_transaction6.cpp b/storage/ndb/test/ndbapi/bench/ndb_user_transaction6.cpp
index 262f38e9ffb..262f38e9ffb 100644
--- a/ndb/test/ndbapi/bench/ndb_user_transaction6.cpp
+++ b/storage/ndb/test/ndbapi/bench/ndb_user_transaction6.cpp
diff --git a/ndb/test/ndbapi/bench/testData.h b/storage/ndb/test/ndbapi/bench/testData.h
index 3db85e7342e..3db85e7342e 100644
--- a/ndb/test/ndbapi/bench/testData.h
+++ b/storage/ndb/test/ndbapi/bench/testData.h
diff --git a/ndb/test/ndbapi/bench/testDefinitions.h b/storage/ndb/test/ndbapi/bench/testDefinitions.h
index 2f4aeb30975..2f4aeb30975 100644
--- a/ndb/test/ndbapi/bench/testDefinitions.h
+++ b/storage/ndb/test/ndbapi/bench/testDefinitions.h
diff --git a/ndb/test/ndbapi/bench/userInterface.cpp b/storage/ndb/test/ndbapi/bench/userInterface.cpp
index 35e88183230..35e88183230 100644
--- a/ndb/test/ndbapi/bench/userInterface.cpp
+++ b/storage/ndb/test/ndbapi/bench/userInterface.cpp
diff --git a/ndb/test/ndbapi/bench/userInterface.h b/storage/ndb/test/ndbapi/bench/userInterface.h
index bad61fcf171..bad61fcf171 100644
--- a/ndb/test/ndbapi/bench/userInterface.h
+++ b/storage/ndb/test/ndbapi/bench/userInterface.h
diff --git a/ndb/test/ndbapi/benchronja.cpp b/storage/ndb/test/ndbapi/benchronja.cpp
index a7523e8e416..a7523e8e416 100644
--- a/ndb/test/ndbapi/benchronja.cpp
+++ b/storage/ndb/test/ndbapi/benchronja.cpp
diff --git a/ndb/test/ndbapi/bulk_copy.cpp b/storage/ndb/test/ndbapi/bulk_copy.cpp
index b53654ce0fb..b53654ce0fb 100644
--- a/ndb/test/ndbapi/bulk_copy.cpp
+++ b/storage/ndb/test/ndbapi/bulk_copy.cpp
diff --git a/ndb/test/ndbapi/cdrserver.cpp b/storage/ndb/test/ndbapi/cdrserver.cpp
index 976319034bf..976319034bf 100644
--- a/ndb/test/ndbapi/cdrserver.cpp
+++ b/storage/ndb/test/ndbapi/cdrserver.cpp
diff --git a/ndb/test/ndbapi/celloDb.cpp b/storage/ndb/test/ndbapi/celloDb.cpp
index 2d6401c355a..2d6401c355a 100644
--- a/ndb/test/ndbapi/celloDb.cpp
+++ b/storage/ndb/test/ndbapi/celloDb.cpp
diff --git a/ndb/test/ndbapi/create_all_tabs.cpp b/storage/ndb/test/ndbapi/create_all_tabs.cpp
index f06078d67a2..f06078d67a2 100644
--- a/ndb/test/ndbapi/create_all_tabs.cpp
+++ b/storage/ndb/test/ndbapi/create_all_tabs.cpp
diff --git a/ndb/test/ndbapi/create_tab.cpp b/storage/ndb/test/ndbapi/create_tab.cpp
index b35c8655236..b35c8655236 100644
--- a/ndb/test/ndbapi/create_tab.cpp
+++ b/storage/ndb/test/ndbapi/create_tab.cpp
diff --git a/ndb/test/ndbapi/drop_all_tabs.cpp b/storage/ndb/test/ndbapi/drop_all_tabs.cpp
index f12d750916e..f12d750916e 100644
--- a/ndb/test/ndbapi/drop_all_tabs.cpp
+++ b/storage/ndb/test/ndbapi/drop_all_tabs.cpp
diff --git a/ndb/test/ndbapi/flexAsynch.cpp b/storage/ndb/test/ndbapi/flexAsynch.cpp
index 8a7dbec1561..8a7dbec1561 100644
--- a/ndb/test/ndbapi/flexAsynch.cpp
+++ b/storage/ndb/test/ndbapi/flexAsynch.cpp
diff --git a/ndb/test/ndbapi/flexBench.cpp b/storage/ndb/test/ndbapi/flexBench.cpp
index abddecfdc40..abddecfdc40 100644
--- a/ndb/test/ndbapi/flexBench.cpp
+++ b/storage/ndb/test/ndbapi/flexBench.cpp
diff --git a/ndb/test/ndbapi/flexHammer.cpp b/storage/ndb/test/ndbapi/flexHammer.cpp
index f254b1e5ccf..f254b1e5ccf 100644
--- a/ndb/test/ndbapi/flexHammer.cpp
+++ b/storage/ndb/test/ndbapi/flexHammer.cpp
diff --git a/ndb/test/ndbapi/flexScan.cpp b/storage/ndb/test/ndbapi/flexScan.cpp
index 4d2c85d6955..4d2c85d6955 100644
--- a/ndb/test/ndbapi/flexScan.cpp
+++ b/storage/ndb/test/ndbapi/flexScan.cpp
diff --git a/ndb/test/ndbapi/flexTT.cpp b/storage/ndb/test/ndbapi/flexTT.cpp
index 7cd5ac8e3b4..7cd5ac8e3b4 100644
--- a/ndb/test/ndbapi/flexTT.cpp
+++ b/storage/ndb/test/ndbapi/flexTT.cpp
diff --git a/ndb/test/ndbapi/flexTimedAsynch.cpp b/storage/ndb/test/ndbapi/flexTimedAsynch.cpp
index 2b8c0bdd5f8..2b8c0bdd5f8 100644
--- a/ndb/test/ndbapi/flexTimedAsynch.cpp
+++ b/storage/ndb/test/ndbapi/flexTimedAsynch.cpp
diff --git a/ndb/test/ndbapi/flex_bench_mysql.cpp b/storage/ndb/test/ndbapi/flex_bench_mysql.cpp
index 3efb7ee2094..3efb7ee2094 100644
--- a/ndb/test/ndbapi/flex_bench_mysql.cpp
+++ b/storage/ndb/test/ndbapi/flex_bench_mysql.cpp
diff --git a/ndb/test/ndbapi/index.cpp b/storage/ndb/test/ndbapi/index.cpp
index c22da594164..c22da594164 100644
--- a/ndb/test/ndbapi/index.cpp
+++ b/storage/ndb/test/ndbapi/index.cpp
diff --git a/ndb/test/ndbapi/index2.cpp b/storage/ndb/test/ndbapi/index2.cpp
index f739468d7df..f739468d7df 100644
--- a/ndb/test/ndbapi/index2.cpp
+++ b/storage/ndb/test/ndbapi/index2.cpp
diff --git a/ndb/test/ndbapi/initronja.cpp b/storage/ndb/test/ndbapi/initronja.cpp
index 3ce274e4319..3ce274e4319 100644
--- a/ndb/test/ndbapi/initronja.cpp
+++ b/storage/ndb/test/ndbapi/initronja.cpp
diff --git a/ndb/test/ndbapi/interpreterInTup.cpp b/storage/ndb/test/ndbapi/interpreterInTup.cpp
index a07d5898213..a07d5898213 100644
--- a/ndb/test/ndbapi/interpreterInTup.cpp
+++ b/storage/ndb/test/ndbapi/interpreterInTup.cpp
diff --git a/ndb/test/ndbapi/mainAsyncGenerator.cpp b/storage/ndb/test/ndbapi/mainAsyncGenerator.cpp
index 73a8b98ab57..73a8b98ab57 100644
--- a/ndb/test/ndbapi/mainAsyncGenerator.cpp
+++ b/storage/ndb/test/ndbapi/mainAsyncGenerator.cpp
diff --git a/ndb/test/ndbapi/msa.cpp b/storage/ndb/test/ndbapi/msa.cpp
index e39f7a8c64a..e39f7a8c64a 100644
--- a/ndb/test/ndbapi/msa.cpp
+++ b/storage/ndb/test/ndbapi/msa.cpp
diff --git a/ndb/test/ndbapi/ndb_async1.cpp b/storage/ndb/test/ndbapi/ndb_async1.cpp
index 2a84f6b2aca..2a84f6b2aca 100644
--- a/ndb/test/ndbapi/ndb_async1.cpp
+++ b/storage/ndb/test/ndbapi/ndb_async1.cpp
diff --git a/ndb/test/ndbapi/ndb_async2.cpp b/storage/ndb/test/ndbapi/ndb_async2.cpp
index 0c1d138defb..0c1d138defb 100644
--- a/ndb/test/ndbapi/ndb_async2.cpp
+++ b/storage/ndb/test/ndbapi/ndb_async2.cpp
diff --git a/ndb/test/ndbapi/ndb_user_populate.cpp b/storage/ndb/test/ndbapi/ndb_user_populate.cpp
index ce3a76cdd59..ce3a76cdd59 100644
--- a/ndb/test/ndbapi/ndb_user_populate.cpp
+++ b/storage/ndb/test/ndbapi/ndb_user_populate.cpp
diff --git a/ndb/test/ndbapi/ndb_user_transaction.cpp b/storage/ndb/test/ndbapi/ndb_user_transaction.cpp
index 182f1f99586..182f1f99586 100644
--- a/ndb/test/ndbapi/ndb_user_transaction.cpp
+++ b/storage/ndb/test/ndbapi/ndb_user_transaction.cpp
diff --git a/ndb/test/ndbapi/ndb_user_transaction2.cpp b/storage/ndb/test/ndbapi/ndb_user_transaction2.cpp
index df3c7a7989e..df3c7a7989e 100644
--- a/ndb/test/ndbapi/ndb_user_transaction2.cpp
+++ b/storage/ndb/test/ndbapi/ndb_user_transaction2.cpp
diff --git a/ndb/test/ndbapi/ndb_user_transaction3.cpp b/storage/ndb/test/ndbapi/ndb_user_transaction3.cpp
index d2c92ecd424..d2c92ecd424 100644
--- a/ndb/test/ndbapi/ndb_user_transaction3.cpp
+++ b/storage/ndb/test/ndbapi/ndb_user_transaction3.cpp
diff --git a/ndb/test/ndbapi/ndb_user_transaction4.cpp b/storage/ndb/test/ndbapi/ndb_user_transaction4.cpp
index e652c7bfed8..e652c7bfed8 100644
--- a/ndb/test/ndbapi/ndb_user_transaction4.cpp
+++ b/storage/ndb/test/ndbapi/ndb_user_transaction4.cpp
diff --git a/ndb/test/ndbapi/ndb_user_transaction5.cpp b/storage/ndb/test/ndbapi/ndb_user_transaction5.cpp
index 86580008d10..86580008d10 100644
--- a/ndb/test/ndbapi/ndb_user_transaction5.cpp
+++ b/storage/ndb/test/ndbapi/ndb_user_transaction5.cpp
diff --git a/ndb/test/ndbapi/ndb_user_transaction6.cpp b/storage/ndb/test/ndbapi/ndb_user_transaction6.cpp
index 262f38e9ffb..262f38e9ffb 100644
--- a/ndb/test/ndbapi/ndb_user_transaction6.cpp
+++ b/storage/ndb/test/ndbapi/ndb_user_transaction6.cpp
diff --git a/ndb/test/ndbapi/old_dirs/acid/Makefile b/storage/ndb/test/ndbapi/old_dirs/acid/Makefile
index 33dc49fcdea..33dc49fcdea 100644
--- a/ndb/test/ndbapi/old_dirs/acid/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/acid/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/acid2/Makefile b/storage/ndb/test/ndbapi/old_dirs/acid2/Makefile
index 69c9d409b9e..69c9d409b9e 100644
--- a/ndb/test/ndbapi/old_dirs/acid2/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/acid2/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/acid2/TraceNdbApi.hpp b/storage/ndb/test/ndbapi/old_dirs/acid2/TraceNdbApi.hpp
index 2bd4eab6b70..2bd4eab6b70 100644
--- a/ndb/test/ndbapi/old_dirs/acid2/TraceNdbApi.hpp
+++ b/storage/ndb/test/ndbapi/old_dirs/acid2/TraceNdbApi.hpp
diff --git a/ndb/test/ndbapi/old_dirs/acid2/VerifyNdbApi.hpp b/storage/ndb/test/ndbapi/old_dirs/acid2/VerifyNdbApi.hpp
index 4a5b8cc8111..4a5b8cc8111 100644
--- a/ndb/test/ndbapi/old_dirs/acid2/VerifyNdbApi.hpp
+++ b/storage/ndb/test/ndbapi/old_dirs/acid2/VerifyNdbApi.hpp
diff --git a/ndb/test/ndbapi/old_dirs/basicAsynch/Makefile b/storage/ndb/test/ndbapi/old_dirs/basicAsynch/Makefile
index 802c5e5a2bd..802c5e5a2bd 100755
--- a/ndb/test/ndbapi/old_dirs/basicAsynch/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/basicAsynch/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/bulk_copy/Makefile b/storage/ndb/test/ndbapi/old_dirs/bulk_copy/Makefile
index 22c05b138b7..22c05b138b7 100644
--- a/ndb/test/ndbapi/old_dirs/bulk_copy/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/bulk_copy/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/create_all_tabs/Makefile b/storage/ndb/test/ndbapi/old_dirs/create_all_tabs/Makefile
index 58309807682..58309807682 100644
--- a/ndb/test/ndbapi/old_dirs/create_all_tabs/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/create_all_tabs/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/create_tab/Makefile b/storage/ndb/test/ndbapi/old_dirs/create_tab/Makefile
index c2ea0b52b15..c2ea0b52b15 100644
--- a/ndb/test/ndbapi/old_dirs/create_tab/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/create_tab/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/drop_all_tabs/Makefile b/storage/ndb/test/ndbapi/old_dirs/drop_all_tabs/Makefile
index 96db0781417..96db0781417 100644
--- a/ndb/test/ndbapi/old_dirs/drop_all_tabs/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/drop_all_tabs/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/flexAsynch/Makefile b/storage/ndb/test/ndbapi/old_dirs/flexAsynch/Makefile
index 2c77c8e21df..2c77c8e21df 100644
--- a/ndb/test/ndbapi/old_dirs/flexAsynch/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/flexAsynch/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/flexBench/Makefile.am b/storage/ndb/test/ndbapi/old_dirs/flexBench/Makefile.am
index d4de4b92b60..d4de4b92b60 100644
--- a/ndb/test/ndbapi/old_dirs/flexBench/Makefile.am
+++ b/storage/ndb/test/ndbapi/old_dirs/flexBench/Makefile.am
diff --git a/ndb/test/ndbapi/old_dirs/flexBench/ndbplot.pl b/storage/ndb/test/ndbapi/old_dirs/flexBench/ndbplot.pl
index b16f6d5897d..b16f6d5897d 100755
--- a/ndb/test/ndbapi/old_dirs/flexBench/ndbplot.pl
+++ b/storage/ndb/test/ndbapi/old_dirs/flexBench/ndbplot.pl
diff --git a/ndb/test/ndbapi/old_dirs/flexHammer/Makefile b/storage/ndb/test/ndbapi/old_dirs/flexHammer/Makefile
index c8e436fb7f5..c8e436fb7f5 100644
--- a/ndb/test/ndbapi/old_dirs/flexHammer/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/flexHammer/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/flexHammer/README b/storage/ndb/test/ndbapi/old_dirs/flexHammer/README
index 556582aab96..556582aab96 100644
--- a/ndb/test/ndbapi/old_dirs/flexHammer/README
+++ b/storage/ndb/test/ndbapi/old_dirs/flexHammer/README
diff --git a/ndb/test/ndbapi/old_dirs/flexScan/Makefile b/storage/ndb/test/ndbapi/old_dirs/flexScan/Makefile
index 78f9d481063..78f9d481063 100644
--- a/ndb/test/ndbapi/old_dirs/flexScan/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/flexScan/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/flexScan/README b/storage/ndb/test/ndbapi/old_dirs/flexScan/README
index cddbdea5336..cddbdea5336 100644
--- a/ndb/test/ndbapi/old_dirs/flexScan/README
+++ b/storage/ndb/test/ndbapi/old_dirs/flexScan/README
diff --git a/ndb/test/ndbapi/old_dirs/flexTT/Makefile b/storage/ndb/test/ndbapi/old_dirs/flexTT/Makefile
index a63bd803d95..a63bd803d95 100644
--- a/ndb/test/ndbapi/old_dirs/flexTT/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/flexTT/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/flexTimedAsynch/Makefile b/storage/ndb/test/ndbapi/old_dirs/flexTimedAsynch/Makefile
index e9995dbd16f..e9995dbd16f 100644
--- a/ndb/test/ndbapi/old_dirs/flexTimedAsynch/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/flexTimedAsynch/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/flex_bench_mysql/Makefile b/storage/ndb/test/ndbapi/old_dirs/flex_bench_mysql/Makefile
index d2608526cae..d2608526cae 100644
--- a/ndb/test/ndbapi/old_dirs/flex_bench_mysql/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/flex_bench_mysql/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/indexTest/Makefile b/storage/ndb/test/ndbapi/old_dirs/indexTest/Makefile
index d842e487ee5..d842e487ee5 100644
--- a/ndb/test/ndbapi/old_dirs/indexTest/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/indexTest/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/indexTest2/Makefile b/storage/ndb/test/ndbapi/old_dirs/indexTest2/Makefile
index ad78fd51986..ad78fd51986 100644
--- a/ndb/test/ndbapi/old_dirs/indexTest2/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/indexTest2/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/interpreterInTup/Makefile b/storage/ndb/test/ndbapi/old_dirs/interpreterInTup/Makefile
index 074adbf674a..074adbf674a 100644
--- a/ndb/test/ndbapi/old_dirs/interpreterInTup/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/interpreterInTup/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/Makefile b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/Makefile
index af472b1589f..af472b1589f 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/Makefile b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/Makefile
index 744d6171139..744d6171139 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/generator/Makefile b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/generator/Makefile
index c1f84a3ef70..c1f84a3ef70 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/generator/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/generator/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/dbGenerator.h b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/dbGenerator.h
index 2256498e151..2256498e151 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/dbGenerator.h
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/dbGenerator.h
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/testData.h b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/testData.h
index 3db85e7342e..3db85e7342e 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/testData.h
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/testData.h
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/userInterface.h b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/userInterface.h
index 94bd1e80ab3..94bd1e80ab3 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/userInterface.h
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/userInterface.h
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/Makefile b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/Makefile
index c0b532a8359..c0b532a8359 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/macros.h b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/macros.h
index 22b7f564490..22b7f564490 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/macros.h
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/macros.h
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/ndb_error.hpp b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/ndb_error.hpp
index 9e6c5e55e73..9e6c5e55e73 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/ndb_error.hpp
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/ndb_error.hpp
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/bin/.empty b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/bin/.empty
index e69de29bb2d..e69de29bb2d 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/bin/.empty
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/bin/.empty
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/include/ndb_schema.hpp b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/include/ndb_schema.hpp
index af08bc2eecd..af08bc2eecd 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/include/ndb_schema.hpp
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/include/ndb_schema.hpp
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/include/testDefinitions.h b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/include/testDefinitions.h
index 2f4aeb30975..2f4aeb30975 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/include/testDefinitions.h
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/include/testDefinitions.h
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/lib/.empty b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/lib/.empty
index e69de29bb2d..e69de29bb2d 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/lib/.empty
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/lib/.empty
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/script/Makefile b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/script/Makefile
index 240b5957573..240b5957573 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/script/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/script/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-l-p10.sh b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-l-p10.sh
index 1ce3969f9fb..1ce3969f9fb 100755
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-l-p10.sh
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-l-p10.sh
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-l.sh b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-l.sh
index a5de71395c4..a5de71395c4 100755
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-l.sh
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-l.sh
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-p10.sh b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-p10.sh
index 92c853cdd86..92c853cdd86 100755
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-p10.sh
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-p10.sh
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench.sh b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench.sh
index da8e9d9bf42..da8e9d9bf42 100755
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench.sh
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench.sh
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/src/Makefile b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/Makefile
index ae7fac9c49b..ae7fac9c49b 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/src/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/src/README b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/README
index e81c8ba0051..e81c8ba0051 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/src/README
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/README
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/Makefile b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/Makefile
index 143d9ba655e..143d9ba655e 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/dbGenerator.c b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/dbGenerator.c
index 7484c7647f5..7484c7647f5 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/dbGenerator.c
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/dbGenerator.c
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/dbGenerator.h b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/dbGenerator.h
index 824688b6cf9..824688b6cf9 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/dbGenerator.h
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/dbGenerator.h
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/mainGenerator.c b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/mainGenerator.c
index 4a31db0b4e9..4a31db0b4e9 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/mainGenerator.c
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/mainGenerator.c
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/src/include/testData.h b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/include/testData.h
index 863c230502b..863c230502b 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/src/include/testData.h
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/include/testData.h
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/src/include/userInterface.h b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/include/userInterface.h
index b70ded87756..b70ded87756 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/src/include/userInterface.h
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/include/userInterface.h
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/src/makevars.linux b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/makevars.linux
index a933669cfe7..a933669cfe7 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/src/makevars.linux
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/makevars.linux
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/src/makevars.sparc b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/makevars.sparc
index 57ab8bf982f..57ab8bf982f 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/src/makevars.sparc
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/makevars.sparc
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/Makefile b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/Makefile
index 2107c948843..2107c948843 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/dbPopulate.c b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/dbPopulate.c
index 42fbb52f3b2..42fbb52f3b2 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/dbPopulate.c
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/dbPopulate.c
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/dbPopulate.h b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/dbPopulate.h
index 1916720e141..1916720e141 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/dbPopulate.h
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/dbPopulate.h
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/mainPopulate.c b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/mainPopulate.c
index 838ac8a7196..838ac8a7196 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/mainPopulate.c
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/mainPopulate.c
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/Makefile b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/Makefile
index 9bf229ac84c..9bf229ac84c 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/localDbPrepare.c b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/localDbPrepare.c
index dd100507016..dd100507016 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/localDbPrepare.c
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/localDbPrepare.c
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/macros.h b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/macros.h
index 363f247b93f..363f247b93f 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/macros.h
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/macros.h
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/ndb_error.hpp b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/ndb_error.hpp
index b3aaeac822e..b3aaeac822e 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/ndb_error.hpp
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/ndb_error.hpp
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/Makefile b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/Makefile
index 9b1247d44af..9b1247d44af 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userHandle.h b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userHandle.h
index 1de468d4dad..1de468d4dad 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userHandle.h
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userHandle.h
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userInterface.c b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userInterface.c
index bacf1861dde..bacf1861dde 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userInterface.c
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userInterface.c
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userTransaction.c b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userTransaction.c
index a2f4787bb0c..a2f4787bb0c 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userTransaction.c
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userTransaction.c
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userHandle.h b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userHandle.h
index 6da76fc2bff..6da76fc2bff 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userHandle.h
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userHandle.h
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userInterface.cpp b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userInterface.cpp
index fe3c17acbf5..fe3c17acbf5 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userInterface.cpp
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userInterface.cpp
diff --git a/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userTransaction.c b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userTransaction.c
index a2f4787bb0c..a2f4787bb0c 100644
--- a/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userTransaction.c
+++ b/storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userTransaction.c
diff --git a/ndb/test/ndbapi/old_dirs/restarter/Makefile b/storage/ndb/test/ndbapi/old_dirs/restarter/Makefile
index 041fbfd82ba..041fbfd82ba 100644
--- a/ndb/test/ndbapi/old_dirs/restarter/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/restarter/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/restarter2/Makefile b/storage/ndb/test/ndbapi/old_dirs/restarter2/Makefile
index ba33a2e21dc..ba33a2e21dc 100644
--- a/ndb/test/ndbapi/old_dirs/restarter2/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/restarter2/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/restarts/Makefile b/storage/ndb/test/ndbapi/old_dirs/restarts/Makefile
index 9f14b81fae5..9f14b81fae5 100644
--- a/ndb/test/ndbapi/old_dirs/restarts/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/restarts/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/ronja/Makefile b/storage/ndb/test/ndbapi/old_dirs/ronja/Makefile
index a11a27c5fd7..a11a27c5fd7 100644
--- a/ndb/test/ndbapi/old_dirs/ronja/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/ronja/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/ronja/benchronja/Makefile b/storage/ndb/test/ndbapi/old_dirs/ronja/benchronja/Makefile
index f0521c3ba77..f0521c3ba77 100644
--- a/ndb/test/ndbapi/old_dirs/ronja/benchronja/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/ronja/benchronja/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/ronja/initronja/Makefile b/storage/ndb/test/ndbapi/old_dirs/ronja/initronja/Makefile
index dd66dd813d1..dd66dd813d1 100644
--- a/ndb/test/ndbapi/old_dirs/ronja/initronja/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/ronja/initronja/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/telco/Makefile b/storage/ndb/test/ndbapi/old_dirs/telco/Makefile
index 8f82c714119..8f82c714119 100644
--- a/ndb/test/ndbapi/old_dirs/telco/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/telco/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/telco/readme b/storage/ndb/test/ndbapi/old_dirs/telco/readme
index 627b4256eef..627b4256eef 100644
--- a/ndb/test/ndbapi/old_dirs/telco/readme
+++ b/storage/ndb/test/ndbapi/old_dirs/telco/readme
diff --git a/ndb/test/ndbapi/old_dirs/testBackup/Makefile b/storage/ndb/test/ndbapi/old_dirs/testBackup/Makefile
index abf47dcfb2d..abf47dcfb2d 100644
--- a/ndb/test/ndbapi/old_dirs/testBackup/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/testBackup/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/testBasic/Makefile b/storage/ndb/test/ndbapi/old_dirs/testBasic/Makefile
index 755b19939cb..755b19939cb 100644
--- a/ndb/test/ndbapi/old_dirs/testBasic/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/testBasic/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/testBlobs/Makefile b/storage/ndb/test/ndbapi/old_dirs/testBlobs/Makefile
index cc5bb629c17..cc5bb629c17 100644
--- a/ndb/test/ndbapi/old_dirs/testBlobs/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/testBlobs/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/testDataBuffers/Makefile b/storage/ndb/test/ndbapi/old_dirs/testDataBuffers/Makefile
index 181fbc829d4..181fbc829d4 100644
--- a/ndb/test/ndbapi/old_dirs/testDataBuffers/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/testDataBuffers/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/testDict/Makefile b/storage/ndb/test/ndbapi/old_dirs/testDict/Makefile
index 75d493c3424..75d493c3424 100644
--- a/ndb/test/ndbapi/old_dirs/testDict/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/testDict/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/testGrep/Makefile b/storage/ndb/test/ndbapi/old_dirs/testGrep/Makefile
index 6bad3d56a00..6bad3d56a00 100644
--- a/ndb/test/ndbapi/old_dirs/testGrep/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/testGrep/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/testGrep/verify/Makefile b/storage/ndb/test/ndbapi/old_dirs/testGrep/verify/Makefile
index 256e3c98f36..256e3c98f36 100644
--- a/ndb/test/ndbapi/old_dirs/testGrep/verify/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/testGrep/verify/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/testIndex/Makefile b/storage/ndb/test/ndbapi/old_dirs/testIndex/Makefile
index e5cd4542c9c..e5cd4542c9c 100644
--- a/ndb/test/ndbapi/old_dirs/testIndex/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/testIndex/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/testInterpreter/Makefile b/storage/ndb/test/ndbapi/old_dirs/testInterpreter/Makefile
index e84287a1b16..e84287a1b16 100644
--- a/ndb/test/ndbapi/old_dirs/testInterpreter/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/testInterpreter/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/testMgm/Makefile b/storage/ndb/test/ndbapi/old_dirs/testMgm/Makefile
index be50d3dae7e..be50d3dae7e 100644
--- a/ndb/test/ndbapi/old_dirs/testMgm/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/testMgm/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/testNdbApi/Makefile b/storage/ndb/test/ndbapi/old_dirs/testNdbApi/Makefile
index 3bb3cba427e..3bb3cba427e 100644
--- a/ndb/test/ndbapi/old_dirs/testNdbApi/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/testNdbApi/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/testNodeRestart/Makefile b/storage/ndb/test/ndbapi/old_dirs/testNodeRestart/Makefile
index 8c13ab3beb4..8c13ab3beb4 100644
--- a/ndb/test/ndbapi/old_dirs/testNodeRestart/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/testNodeRestart/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/testOIBasic/Makefile b/storage/ndb/test/ndbapi/old_dirs/testOIBasic/Makefile
index 1bbbcf1d17e..1bbbcf1d17e 100644
--- a/ndb/test/ndbapi/old_dirs/testOIBasic/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/testOIBasic/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/testOIBasic/times.txt b/storage/ndb/test/ndbapi/old_dirs/testOIBasic/times.txt
index 641e9ddb4bf..641e9ddb4bf 100644
--- a/ndb/test/ndbapi/old_dirs/testOIBasic/times.txt
+++ b/storage/ndb/test/ndbapi/old_dirs/testOIBasic/times.txt
diff --git a/ndb/test/ndbapi/old_dirs/testOperations/Makefile b/storage/ndb/test/ndbapi/old_dirs/testOperations/Makefile
index 25546ade639..25546ade639 100644
--- a/ndb/test/ndbapi/old_dirs/testOperations/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/testOperations/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/testOrderedIndex/Makefile b/storage/ndb/test/ndbapi/old_dirs/testOrderedIndex/Makefile
index d8899a37895..d8899a37895 100644
--- a/ndb/test/ndbapi/old_dirs/testOrderedIndex/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/testOrderedIndex/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/testRestartGci/Makefile b/storage/ndb/test/ndbapi/old_dirs/testRestartGci/Makefile
index 24f449b747d..24f449b747d 100644
--- a/ndb/test/ndbapi/old_dirs/testRestartGci/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/testRestartGci/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/testScan/Makefile b/storage/ndb/test/ndbapi/old_dirs/testScan/Makefile
index fe48f5bc926..fe48f5bc926 100644
--- a/ndb/test/ndbapi/old_dirs/testScan/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/testScan/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/testScanInterpreter/Makefile b/storage/ndb/test/ndbapi/old_dirs/testScanInterpreter/Makefile
index c7d96494148..c7d96494148 100644
--- a/ndb/test/ndbapi/old_dirs/testScanInterpreter/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/testScanInterpreter/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/testSystemRestart/Makefile b/storage/ndb/test/ndbapi/old_dirs/testSystemRestart/Makefile
index 7a306eb313d..7a306eb313d 100644
--- a/ndb/test/ndbapi/old_dirs/testSystemRestart/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/testSystemRestart/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/testTimeout/Makefile b/storage/ndb/test/ndbapi/old_dirs/testTimeout/Makefile
index 01a9df9887f..01a9df9887f 100644
--- a/ndb/test/ndbapi/old_dirs/testTimeout/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/testTimeout/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/testTransactions/Makefile b/storage/ndb/test/ndbapi/old_dirs/testTransactions/Makefile
index 0279a526923..0279a526923 100644
--- a/ndb/test/ndbapi/old_dirs/testTransactions/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/testTransactions/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/test_event/Makefile b/storage/ndb/test/ndbapi/old_dirs/test_event/Makefile
index 6299fa47845..6299fa47845 100644
--- a/ndb/test/ndbapi/old_dirs/test_event/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/test_event/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/vw_test/Makefile b/storage/ndb/test/ndbapi/old_dirs/vw_test/Makefile
index 144873dcc69..144873dcc69 100644
--- a/ndb/test/ndbapi/old_dirs/vw_test/Makefile
+++ b/storage/ndb/test/ndbapi/old_dirs/vw_test/Makefile
diff --git a/ndb/test/ndbapi/old_dirs/vw_test/bcd.h b/storage/ndb/test/ndbapi/old_dirs/vw_test/bcd.h
index d0aaffbd8b7..d0aaffbd8b7 100644
--- a/ndb/test/ndbapi/old_dirs/vw_test/bcd.h
+++ b/storage/ndb/test/ndbapi/old_dirs/vw_test/bcd.h
diff --git a/ndb/test/ndbapi/old_dirs/vw_test/script/client_start b/storage/ndb/test/ndbapi/old_dirs/vw_test/script/client_start
index 2965be6fbb5..2965be6fbb5 100644
--- a/ndb/test/ndbapi/old_dirs/vw_test/script/client_start
+++ b/storage/ndb/test/ndbapi/old_dirs/vw_test/script/client_start
diff --git a/ndb/test/ndbapi/old_dirs/vw_test/utv.h b/storage/ndb/test/ndbapi/old_dirs/vw_test/utv.h
index 6f378e5595b..6f378e5595b 100644
--- a/ndb/test/ndbapi/old_dirs/vw_test/utv.h
+++ b/storage/ndb/test/ndbapi/old_dirs/vw_test/utv.h
diff --git a/ndb/test/ndbapi/old_dirs/vw_test/vcdrfunc.h b/storage/ndb/test/ndbapi/old_dirs/vw_test/vcdrfunc.h
index 3c5444d733b..3c5444d733b 100644
--- a/ndb/test/ndbapi/old_dirs/vw_test/vcdrfunc.h
+++ b/storage/ndb/test/ndbapi/old_dirs/vw_test/vcdrfunc.h
diff --git a/ndb/test/ndbapi/restarter.cpp b/storage/ndb/test/ndbapi/restarter.cpp
index d6831494b48..d6831494b48 100644
--- a/ndb/test/ndbapi/restarter.cpp
+++ b/storage/ndb/test/ndbapi/restarter.cpp
diff --git a/ndb/test/ndbapi/restarter2.cpp b/storage/ndb/test/ndbapi/restarter2.cpp
index 846748a7bba..846748a7bba 100644
--- a/ndb/test/ndbapi/restarter2.cpp
+++ b/storage/ndb/test/ndbapi/restarter2.cpp
diff --git a/ndb/test/ndbapi/restarts.cpp b/storage/ndb/test/ndbapi/restarts.cpp
index 184e754de4a..184e754de4a 100644
--- a/ndb/test/ndbapi/restarts.cpp
+++ b/storage/ndb/test/ndbapi/restarts.cpp
diff --git a/ndb/test/ndbapi/size.cpp b/storage/ndb/test/ndbapi/size.cpp
index ff178b11d68..ff178b11d68 100644
--- a/ndb/test/ndbapi/size.cpp
+++ b/storage/ndb/test/ndbapi/size.cpp
diff --git a/ndb/test/ndbapi/slow_select.cpp b/storage/ndb/test/ndbapi/slow_select.cpp
index 8d615fa5771..8d615fa5771 100644
--- a/ndb/test/ndbapi/slow_select.cpp
+++ b/storage/ndb/test/ndbapi/slow_select.cpp
diff --git a/ndb/test/ndbapi/testBackup.cpp b/storage/ndb/test/ndbapi/testBackup.cpp
index 7a6f11a6bb9..7a6f11a6bb9 100644
--- a/ndb/test/ndbapi/testBackup.cpp
+++ b/storage/ndb/test/ndbapi/testBackup.cpp
diff --git a/ndb/test/ndbapi/testBasic.cpp b/storage/ndb/test/ndbapi/testBasic.cpp
index 4d64b15ecfa..4d64b15ecfa 100644
--- a/ndb/test/ndbapi/testBasic.cpp
+++ b/storage/ndb/test/ndbapi/testBasic.cpp
diff --git a/ndb/test/ndbapi/testBasicAsynch.cpp b/storage/ndb/test/ndbapi/testBasicAsynch.cpp
index 6daa22fdc6a..6daa22fdc6a 100644
--- a/ndb/test/ndbapi/testBasicAsynch.cpp
+++ b/storage/ndb/test/ndbapi/testBasicAsynch.cpp
diff --git a/ndb/test/ndbapi/testBitfield.cpp b/storage/ndb/test/ndbapi/testBitfield.cpp
index e26f495f5a4..e26f495f5a4 100644
--- a/ndb/test/ndbapi/testBitfield.cpp
+++ b/storage/ndb/test/ndbapi/testBitfield.cpp
diff --git a/ndb/test/ndbapi/testBlobs.cpp b/storage/ndb/test/ndbapi/testBlobs.cpp
index a88d7d21820..a88d7d21820 100644
--- a/ndb/test/ndbapi/testBlobs.cpp
+++ b/storage/ndb/test/ndbapi/testBlobs.cpp
diff --git a/ndb/test/ndbapi/testDataBuffers.cpp b/storage/ndb/test/ndbapi/testDataBuffers.cpp
index aaecb6ee61e..aaecb6ee61e 100644
--- a/ndb/test/ndbapi/testDataBuffers.cpp
+++ b/storage/ndb/test/ndbapi/testDataBuffers.cpp
diff --git a/ndb/test/ndbapi/testDeadlock.cpp b/storage/ndb/test/ndbapi/testDeadlock.cpp
index 0070a7ecc83..0070a7ecc83 100644
--- a/ndb/test/ndbapi/testDeadlock.cpp
+++ b/storage/ndb/test/ndbapi/testDeadlock.cpp
diff --git a/ndb/test/ndbapi/testDict.cpp b/storage/ndb/test/ndbapi/testDict.cpp
index dd5846f0d62..dd5846f0d62 100644
--- a/ndb/test/ndbapi/testDict.cpp
+++ b/storage/ndb/test/ndbapi/testDict.cpp
diff --git a/ndb/test/ndbapi/testGrep.cpp b/storage/ndb/test/ndbapi/testGrep.cpp
index 713aefbeafa..713aefbeafa 100644
--- a/ndb/test/ndbapi/testGrep.cpp
+++ b/storage/ndb/test/ndbapi/testGrep.cpp
diff --git a/ndb/test/ndbapi/testGrepVerify.cpp b/storage/ndb/test/ndbapi/testGrepVerify.cpp
index 52dcda9a162..52dcda9a162 100644
--- a/ndb/test/ndbapi/testGrepVerify.cpp
+++ b/storage/ndb/test/ndbapi/testGrepVerify.cpp
diff --git a/ndb/test/ndbapi/testIndex.cpp b/storage/ndb/test/ndbapi/testIndex.cpp
index 5785db232c4..5785db232c4 100644
--- a/ndb/test/ndbapi/testIndex.cpp
+++ b/storage/ndb/test/ndbapi/testIndex.cpp
diff --git a/ndb/test/ndbapi/testInterpreter.cpp b/storage/ndb/test/ndbapi/testInterpreter.cpp
index 0baba33d2b2..0baba33d2b2 100644
--- a/ndb/test/ndbapi/testInterpreter.cpp
+++ b/storage/ndb/test/ndbapi/testInterpreter.cpp
diff --git a/ndb/test/ndbapi/testLcp.cpp b/storage/ndb/test/ndbapi/testLcp.cpp
index 8bfc7ccf9b9..8bfc7ccf9b9 100644
--- a/ndb/test/ndbapi/testLcp.cpp
+++ b/storage/ndb/test/ndbapi/testLcp.cpp
diff --git a/ndb/test/ndbapi/testMgm.cpp b/storage/ndb/test/ndbapi/testMgm.cpp
index ef653d3f972..ef653d3f972 100644
--- a/ndb/test/ndbapi/testMgm.cpp
+++ b/storage/ndb/test/ndbapi/testMgm.cpp
diff --git a/ndb/test/ndbapi/testNdbApi.cpp b/storage/ndb/test/ndbapi/testNdbApi.cpp
index 137a1d51d82..137a1d51d82 100644
--- a/ndb/test/ndbapi/testNdbApi.cpp
+++ b/storage/ndb/test/ndbapi/testNdbApi.cpp
diff --git a/ndb/test/ndbapi/testNodeRestart.cpp b/storage/ndb/test/ndbapi/testNodeRestart.cpp
index 6ef3da2d760..6ef3da2d760 100644
--- a/ndb/test/ndbapi/testNodeRestart.cpp
+++ b/storage/ndb/test/ndbapi/testNodeRestart.cpp
diff --git a/ndb/test/ndbapi/testOIBasic.cpp b/storage/ndb/test/ndbapi/testOIBasic.cpp
index 942ee2ec966..942ee2ec966 100644
--- a/ndb/test/ndbapi/testOIBasic.cpp
+++ b/storage/ndb/test/ndbapi/testOIBasic.cpp
diff --git a/ndb/test/ndbapi/testOperations.cpp b/storage/ndb/test/ndbapi/testOperations.cpp
index 726f35b01fb..726f35b01fb 100644
--- a/ndb/test/ndbapi/testOperations.cpp
+++ b/storage/ndb/test/ndbapi/testOperations.cpp
diff --git a/ndb/test/ndbapi/testOrderedIndex.cpp b/storage/ndb/test/ndbapi/testOrderedIndex.cpp
index b3a75410646..b3a75410646 100644
--- a/ndb/test/ndbapi/testOrderedIndex.cpp
+++ b/storage/ndb/test/ndbapi/testOrderedIndex.cpp
diff --git a/ndb/test/ndbapi/testPartitioning.cpp b/storage/ndb/test/ndbapi/testPartitioning.cpp
index 9d67c27354b..9d67c27354b 100644
--- a/ndb/test/ndbapi/testPartitioning.cpp
+++ b/storage/ndb/test/ndbapi/testPartitioning.cpp
diff --git a/ndb/test/ndbapi/testReadPerf.cpp b/storage/ndb/test/ndbapi/testReadPerf.cpp
index ba5f3c4232d..ba5f3c4232d 100644
--- a/ndb/test/ndbapi/testReadPerf.cpp
+++ b/storage/ndb/test/ndbapi/testReadPerf.cpp
diff --git a/ndb/test/ndbapi/testRestartGci.cpp b/storage/ndb/test/ndbapi/testRestartGci.cpp
index 4e541d1f38f..4e541d1f38f 100644
--- a/ndb/test/ndbapi/testRestartGci.cpp
+++ b/storage/ndb/test/ndbapi/testRestartGci.cpp
diff --git a/ndb/test/ndbapi/testScan.cpp b/storage/ndb/test/ndbapi/testScan.cpp
index 2802f1c950e..2802f1c950e 100644
--- a/ndb/test/ndbapi/testScan.cpp
+++ b/storage/ndb/test/ndbapi/testScan.cpp
diff --git a/ndb/test/ndbapi/testScanInterpreter.cpp b/storage/ndb/test/ndbapi/testScanInterpreter.cpp
index 5a7ca30cd2a..5a7ca30cd2a 100644
--- a/ndb/test/ndbapi/testScanInterpreter.cpp
+++ b/storage/ndb/test/ndbapi/testScanInterpreter.cpp
diff --git a/ndb/test/ndbapi/testScanPerf.cpp b/storage/ndb/test/ndbapi/testScanPerf.cpp
index a730136c3af..a730136c3af 100644
--- a/ndb/test/ndbapi/testScanPerf.cpp
+++ b/storage/ndb/test/ndbapi/testScanPerf.cpp
diff --git a/ndb/test/ndbapi/testSystemRestart.cpp b/storage/ndb/test/ndbapi/testSystemRestart.cpp
index 35016896495..35016896495 100644
--- a/ndb/test/ndbapi/testSystemRestart.cpp
+++ b/storage/ndb/test/ndbapi/testSystemRestart.cpp
diff --git a/ndb/test/ndbapi/testTimeout.cpp b/storage/ndb/test/ndbapi/testTimeout.cpp
index b02751ec819..b02751ec819 100644
--- a/ndb/test/ndbapi/testTimeout.cpp
+++ b/storage/ndb/test/ndbapi/testTimeout.cpp
diff --git a/ndb/test/ndbapi/testTransactions.cpp b/storage/ndb/test/ndbapi/testTransactions.cpp
index 46be808d8a5..46be808d8a5 100644
--- a/ndb/test/ndbapi/testTransactions.cpp
+++ b/storage/ndb/test/ndbapi/testTransactions.cpp
diff --git a/ndb/test/ndbapi/test_event.cpp b/storage/ndb/test/ndbapi/test_event.cpp
index 2df50f21e43..2df50f21e43 100644
--- a/ndb/test/ndbapi/test_event.cpp
+++ b/storage/ndb/test/ndbapi/test_event.cpp
diff --git a/ndb/test/ndbapi/test_event_multi_table.cpp b/storage/ndb/test/ndbapi/test_event_multi_table.cpp
index f16504029fa..f16504029fa 100644
--- a/ndb/test/ndbapi/test_event_multi_table.cpp
+++ b/storage/ndb/test/ndbapi/test_event_multi_table.cpp
diff --git a/ndb/test/ndbapi/userInterface.cpp b/storage/ndb/test/ndbapi/userInterface.cpp
index 2f77c0f4857..2f77c0f4857 100644
--- a/ndb/test/ndbapi/userInterface.cpp
+++ b/storage/ndb/test/ndbapi/userInterface.cpp
diff --git a/ndb/test/ndbnet/test.run b/storage/ndb/test/ndbnet/test.run
index 30042488c92..30042488c92 100644
--- a/ndb/test/ndbnet/test.run
+++ b/storage/ndb/test/ndbnet/test.run
diff --git a/ndb/test/ndbnet/testError.run b/storage/ndb/test/ndbnet/testError.run
index 3cce489a3da..3cce489a3da 100644
--- a/ndb/test/ndbnet/testError.run
+++ b/storage/ndb/test/ndbnet/testError.run
diff --git a/ndb/test/ndbnet/testMNF.run b/storage/ndb/test/ndbnet/testMNF.run
index df226cd3359..df226cd3359 100644
--- a/ndb/test/ndbnet/testMNF.run
+++ b/storage/ndb/test/ndbnet/testMNF.run
diff --git a/ndb/test/ndbnet/testNR.run b/storage/ndb/test/ndbnet/testNR.run
index 01a3d76266d..01a3d76266d 100644
--- a/ndb/test/ndbnet/testNR.run
+++ b/storage/ndb/test/ndbnet/testNR.run
diff --git a/ndb/test/ndbnet/testNR1.run b/storage/ndb/test/ndbnet/testNR1.run
index 8819a92c8ca..8819a92c8ca 100644
--- a/ndb/test/ndbnet/testNR1.run
+++ b/storage/ndb/test/ndbnet/testNR1.run
diff --git a/ndb/test/ndbnet/testNR4.run b/storage/ndb/test/ndbnet/testNR4.run
index f7a5eef3494..f7a5eef3494 100644
--- a/ndb/test/ndbnet/testNR4.run
+++ b/storage/ndb/test/ndbnet/testNR4.run
diff --git a/ndb/test/ndbnet/testSRhang.run b/storage/ndb/test/ndbnet/testSRhang.run
index 8cb65a75ded..8cb65a75ded 100644
--- a/ndb/test/ndbnet/testSRhang.run
+++ b/storage/ndb/test/ndbnet/testSRhang.run
diff --git a/ndb/test/ndbnet/testTR295.run b/storage/ndb/test/ndbnet/testTR295.run
index ce4250b60ae..ce4250b60ae 100644
--- a/ndb/test/ndbnet/testTR295.run
+++ b/storage/ndb/test/ndbnet/testTR295.run
diff --git a/ndb/test/newtonapi/basic_test/Makefile b/storage/ndb/test/newtonapi/basic_test/Makefile
index d7eaf984b12..d7eaf984b12 100644
--- a/ndb/test/newtonapi/basic_test/Makefile
+++ b/storage/ndb/test/newtonapi/basic_test/Makefile
diff --git a/ndb/test/newtonapi/basic_test/basic/Makefile b/storage/ndb/test/newtonapi/basic_test/basic/Makefile
index 7e2945d2e5f..7e2945d2e5f 100644
--- a/ndb/test/newtonapi/basic_test/basic/Makefile
+++ b/storage/ndb/test/newtonapi/basic_test/basic/Makefile
diff --git a/ndb/test/newtonapi/basic_test/basic/basic.cpp b/storage/ndb/test/newtonapi/basic_test/basic/basic.cpp
index bc33400078d..bc33400078d 100644
--- a/ndb/test/newtonapi/basic_test/basic/basic.cpp
+++ b/storage/ndb/test/newtonapi/basic_test/basic/basic.cpp
diff --git a/ndb/test/newtonapi/basic_test/bulk_read/Makefile b/storage/ndb/test/newtonapi/basic_test/bulk_read/Makefile
index c45bbad7957..c45bbad7957 100644
--- a/ndb/test/newtonapi/basic_test/bulk_read/Makefile
+++ b/storage/ndb/test/newtonapi/basic_test/bulk_read/Makefile
diff --git a/ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp b/storage/ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp
index 4120cfba864..4120cfba864 100644
--- a/ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp
+++ b/storage/ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp
diff --git a/ndb/test/newtonapi/basic_test/common.cpp b/storage/ndb/test/newtonapi/basic_test/common.cpp
index d4c4e6a74a7..d4c4e6a74a7 100644
--- a/ndb/test/newtonapi/basic_test/common.cpp
+++ b/storage/ndb/test/newtonapi/basic_test/common.cpp
diff --git a/ndb/test/newtonapi/basic_test/common.hpp b/storage/ndb/test/newtonapi/basic_test/common.hpp
index 0df8f7e078d..0df8f7e078d 100644
--- a/ndb/test/newtonapi/basic_test/common.hpp
+++ b/storage/ndb/test/newtonapi/basic_test/common.hpp
diff --git a/ndb/test/newtonapi/basic_test/ptr_binding/Makefile b/storage/ndb/test/newtonapi/basic_test/ptr_binding/Makefile
index 95e87d47e62..95e87d47e62 100644
--- a/ndb/test/newtonapi/basic_test/ptr_binding/Makefile
+++ b/storage/ndb/test/newtonapi/basic_test/ptr_binding/Makefile
diff --git a/ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp b/storage/ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp
index 2c9cee5be87..2c9cee5be87 100644
--- a/ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp
+++ b/storage/ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp
diff --git a/ndb/test/newtonapi/basic_test/too_basic.cpp b/storage/ndb/test/newtonapi/basic_test/too_basic.cpp
index 883aacf8841..883aacf8841 100644
--- a/ndb/test/newtonapi/basic_test/too_basic.cpp
+++ b/storage/ndb/test/newtonapi/basic_test/too_basic.cpp
diff --git a/ndb/test/newtonapi/perf_test/Makefile b/storage/ndb/test/newtonapi/perf_test/Makefile
index 2be004d4277..2be004d4277 100644
--- a/ndb/test/newtonapi/perf_test/Makefile
+++ b/storage/ndb/test/newtonapi/perf_test/Makefile
diff --git a/ndb/test/newtonapi/perf_test/perf.cpp b/storage/ndb/test/newtonapi/perf_test/perf.cpp
index 7b818e93a2a..7b818e93a2a 100644
--- a/ndb/test/newtonapi/perf_test/perf.cpp
+++ b/storage/ndb/test/newtonapi/perf_test/perf.cpp
diff --git a/ndb/test/odbc/SQL99_test/Makefile b/storage/ndb/test/odbc/SQL99_test/Makefile
index 3ac06016670..3ac06016670 100644
--- a/ndb/test/odbc/SQL99_test/Makefile
+++ b/storage/ndb/test/odbc/SQL99_test/Makefile
diff --git a/ndb/test/odbc/SQL99_test/SQL99_test.cpp b/storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp
index eda9ff33834..eda9ff33834 100644
--- a/ndb/test/odbc/SQL99_test/SQL99_test.cpp
+++ b/storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp
diff --git a/ndb/test/odbc/SQL99_test/SQL99_test.h b/storage/ndb/test/odbc/SQL99_test/SQL99_test.h
index 1c49f4a9a51..1c49f4a9a51 100644
--- a/ndb/test/odbc/SQL99_test/SQL99_test.h
+++ b/storage/ndb/test/odbc/SQL99_test/SQL99_test.h
diff --git a/ndb/test/odbc/client/Makefile b/storage/ndb/test/odbc/client/Makefile
index 4b962f5b65a..4b962f5b65a 100644
--- a/ndb/test/odbc/client/Makefile
+++ b/storage/ndb/test/odbc/client/Makefile
diff --git a/ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp b/storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp
index 336f4a46554..336f4a46554 100644
--- a/ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp
+++ b/storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp
diff --git a/ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp b/storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp
index 8477a71edbf..8477a71edbf 100644
--- a/ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp
+++ b/storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp
diff --git a/ndb/test/odbc/client/NDBT_SQLConnect.cpp b/storage/ndb/test/odbc/client/NDBT_SQLConnect.cpp
index da97ffebea4..da97ffebea4 100644
--- a/ndb/test/odbc/client/NDBT_SQLConnect.cpp
+++ b/storage/ndb/test/odbc/client/NDBT_SQLConnect.cpp
diff --git a/ndb/test/odbc/client/NDBT_SQLPrepare.cpp b/storage/ndb/test/odbc/client/NDBT_SQLPrepare.cpp
index 4aaff6a7df9..4aaff6a7df9 100644
--- a/ndb/test/odbc/client/NDBT_SQLPrepare.cpp
+++ b/storage/ndb/test/odbc/client/NDBT_SQLPrepare.cpp
diff --git a/ndb/test/odbc/client/SQLAllocEnvTest.cpp b/storage/ndb/test/odbc/client/SQLAllocEnvTest.cpp
index ce50c4b7ccd..ce50c4b7ccd 100644
--- a/ndb/test/odbc/client/SQLAllocEnvTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLAllocEnvTest.cpp
diff --git a/ndb/test/odbc/client/SQLAllocHandleTest.cpp b/storage/ndb/test/odbc/client/SQLAllocHandleTest.cpp
index 0c51e2e46b7..0c51e2e46b7 100644
--- a/ndb/test/odbc/client/SQLAllocHandleTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLAllocHandleTest.cpp
diff --git a/ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp b/storage/ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp
index 7786675243a..7786675243a 100644
--- a/ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp
+++ b/storage/ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp
diff --git a/ndb/test/odbc/client/SQLBindColTest.cpp b/storage/ndb/test/odbc/client/SQLBindColTest.cpp
index e2cd4ce73d1..e2cd4ce73d1 100644
--- a/ndb/test/odbc/client/SQLBindColTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLBindColTest.cpp
diff --git a/ndb/test/odbc/client/SQLBindParameterTest.cpp b/storage/ndb/test/odbc/client/SQLBindParameterTest.cpp
index 2ffd2892064..2ffd2892064 100644
--- a/ndb/test/odbc/client/SQLBindParameterTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLBindParameterTest.cpp
diff --git a/ndb/test/odbc/client/SQLCancelTest.cpp b/storage/ndb/test/odbc/client/SQLCancelTest.cpp
index 904ffab6979..904ffab6979 100644
--- a/ndb/test/odbc/client/SQLCancelTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLCancelTest.cpp
diff --git a/ndb/test/odbc/client/SQLCloseCursorTest.cpp b/storage/ndb/test/odbc/client/SQLCloseCursorTest.cpp
index 35f125df59d..35f125df59d 100644
--- a/ndb/test/odbc/client/SQLCloseCursorTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLCloseCursorTest.cpp
diff --git a/ndb/test/odbc/client/SQLColAttributeTest.cpp b/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp
index 4c067c21d7d..4c067c21d7d 100644
--- a/ndb/test/odbc/client/SQLColAttributeTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp
diff --git a/ndb/test/odbc/client/SQLColAttributeTest1.cpp b/storage/ndb/test/odbc/client/SQLColAttributeTest1.cpp
index 322a21eefc1..322a21eefc1 100644
--- a/ndb/test/odbc/client/SQLColAttributeTest1.cpp
+++ b/storage/ndb/test/odbc/client/SQLColAttributeTest1.cpp
diff --git a/ndb/test/odbc/client/SQLColAttributeTest2.cpp b/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp
index 18cffae76c1..18cffae76c1 100644
--- a/ndb/test/odbc/client/SQLColAttributeTest2.cpp
+++ b/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp
diff --git a/ndb/test/odbc/client/SQLColAttributeTest3.cpp b/storage/ndb/test/odbc/client/SQLColAttributeTest3.cpp
index f8817565711..f8817565711 100644
--- a/ndb/test/odbc/client/SQLColAttributeTest3.cpp
+++ b/storage/ndb/test/odbc/client/SQLColAttributeTest3.cpp
diff --git a/ndb/test/odbc/client/SQLConnectTest.cpp b/storage/ndb/test/odbc/client/SQLConnectTest.cpp
index 552fc8640fe..552fc8640fe 100644
--- a/ndb/test/odbc/client/SQLConnectTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLConnectTest.cpp
diff --git a/ndb/test/odbc/client/SQLCopyDescTest.cpp b/storage/ndb/test/odbc/client/SQLCopyDescTest.cpp
index 4a3742f97ae..4a3742f97ae 100644
--- a/ndb/test/odbc/client/SQLCopyDescTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLCopyDescTest.cpp
diff --git a/ndb/test/odbc/client/SQLDescribeColTest.cpp b/storage/ndb/test/odbc/client/SQLDescribeColTest.cpp
index 9f55c6a1cfe..9f55c6a1cfe 100644
--- a/ndb/test/odbc/client/SQLDescribeColTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLDescribeColTest.cpp
diff --git a/ndb/test/odbc/client/SQLDisconnectTest.cpp b/storage/ndb/test/odbc/client/SQLDisconnectTest.cpp
index 823b446ab84..823b446ab84 100644
--- a/ndb/test/odbc/client/SQLDisconnectTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLDisconnectTest.cpp
diff --git a/ndb/test/odbc/client/SQLDriverConnectTest.cpp b/storage/ndb/test/odbc/client/SQLDriverConnectTest.cpp
index fc3b1d10f91..fc3b1d10f91 100644
--- a/ndb/test/odbc/client/SQLDriverConnectTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLDriverConnectTest.cpp
diff --git a/ndb/test/odbc/client/SQLEndTranTest.cpp b/storage/ndb/test/odbc/client/SQLEndTranTest.cpp
index 06c497954fd..06c497954fd 100644
--- a/ndb/test/odbc/client/SQLEndTranTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLEndTranTest.cpp
diff --git a/ndb/test/odbc/client/SQLErrorTest.cpp b/storage/ndb/test/odbc/client/SQLErrorTest.cpp
index 5220e7b5eed..5220e7b5eed 100644
--- a/ndb/test/odbc/client/SQLErrorTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLErrorTest.cpp
diff --git a/ndb/test/odbc/client/SQLExecDirectTest.cpp b/storage/ndb/test/odbc/client/SQLExecDirectTest.cpp
index b9b4e770412..b9b4e770412 100644
--- a/ndb/test/odbc/client/SQLExecDirectTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLExecDirectTest.cpp
diff --git a/ndb/test/odbc/client/SQLExecuteTest.cpp b/storage/ndb/test/odbc/client/SQLExecuteTest.cpp
index 5f6bdb5d4bf..5f6bdb5d4bf 100644
--- a/ndb/test/odbc/client/SQLExecuteTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLExecuteTest.cpp
diff --git a/ndb/test/odbc/client/SQLFetchScrollTest.cpp b/storage/ndb/test/odbc/client/SQLFetchScrollTest.cpp
index 4a11ccd143e..4a11ccd143e 100644
--- a/ndb/test/odbc/client/SQLFetchScrollTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLFetchScrollTest.cpp
diff --git a/ndb/test/odbc/client/SQLFetchTest.cpp b/storage/ndb/test/odbc/client/SQLFetchTest.cpp
index bd62fcb2f04..bd62fcb2f04 100644
--- a/ndb/test/odbc/client/SQLFetchTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLFetchTest.cpp
diff --git a/ndb/test/odbc/client/SQLFreeHandleTest.cpp b/storage/ndb/test/odbc/client/SQLFreeHandleTest.cpp
index 3a7241dbe68..3a7241dbe68 100644
--- a/ndb/test/odbc/client/SQLFreeHandleTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLFreeHandleTest.cpp
diff --git a/ndb/test/odbc/client/SQLFreeStmtTest.cpp b/storage/ndb/test/odbc/client/SQLFreeStmtTest.cpp
index e636b3063de..e636b3063de 100644
--- a/ndb/test/odbc/client/SQLFreeStmtTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLFreeStmtTest.cpp
diff --git a/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp b/storage/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp
index 8d5a5c0dbbb..8d5a5c0dbbb 100644
--- a/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp
diff --git a/ndb/test/odbc/client/SQLGetCursorNameTest.cpp b/storage/ndb/test/odbc/client/SQLGetCursorNameTest.cpp
index 1e3ed9f557e..1e3ed9f557e 100644
--- a/ndb/test/odbc/client/SQLGetCursorNameTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLGetCursorNameTest.cpp
diff --git a/ndb/test/odbc/client/SQLGetDataTest.cpp b/storage/ndb/test/odbc/client/SQLGetDataTest.cpp
index 9d958c6c953..9d958c6c953 100644
--- a/ndb/test/odbc/client/SQLGetDataTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLGetDataTest.cpp
diff --git a/ndb/test/odbc/client/SQLGetDescFieldTest.cpp b/storage/ndb/test/odbc/client/SQLGetDescFieldTest.cpp
index b789ed75378..b789ed75378 100644
--- a/ndb/test/odbc/client/SQLGetDescFieldTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLGetDescFieldTest.cpp
diff --git a/ndb/test/odbc/client/SQLGetDescRecTest.cpp b/storage/ndb/test/odbc/client/SQLGetDescRecTest.cpp
index 5944f393a71..5944f393a71 100644
--- a/ndb/test/odbc/client/SQLGetDescRecTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLGetDescRecTest.cpp
diff --git a/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp b/storage/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp
index ef9bc3eb3fc..ef9bc3eb3fc 100644
--- a/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp
diff --git a/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp b/storage/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp
index 8fa4a2b3dbb..8fa4a2b3dbb 100644
--- a/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp
diff --git a/ndb/test/odbc/client/SQLGetDiagRecTest.cpp b/storage/ndb/test/odbc/client/SQLGetDiagRecTest.cpp
index 27c78edaa4d..27c78edaa4d 100644
--- a/ndb/test/odbc/client/SQLGetDiagRecTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLGetDiagRecTest.cpp
diff --git a/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp b/storage/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp
index efc8117d6d2..efc8117d6d2 100644
--- a/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp
diff --git a/ndb/test/odbc/client/SQLGetFunctionsTest.cpp b/storage/ndb/test/odbc/client/SQLGetFunctionsTest.cpp
index c6feb8ec033..c6feb8ec033 100644
--- a/ndb/test/odbc/client/SQLGetFunctionsTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLGetFunctionsTest.cpp
diff --git a/ndb/test/odbc/client/SQLGetInfoTest.cpp b/storage/ndb/test/odbc/client/SQLGetInfoTest.cpp
index 95f7562dafe..95f7562dafe 100644
--- a/ndb/test/odbc/client/SQLGetInfoTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLGetInfoTest.cpp
diff --git a/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp b/storage/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp
index 2052af60ee0..2052af60ee0 100644
--- a/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp
diff --git a/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp b/storage/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp
index 5925d1cc1ae..5925d1cc1ae 100644
--- a/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp
diff --git a/ndb/test/odbc/client/SQLMoreResultsTest.cpp b/storage/ndb/test/odbc/client/SQLMoreResultsTest.cpp
index cba8b0dc53e..cba8b0dc53e 100644
--- a/ndb/test/odbc/client/SQLMoreResultsTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLMoreResultsTest.cpp
diff --git a/ndb/test/odbc/client/SQLNumResultColsTest.cpp b/storage/ndb/test/odbc/client/SQLNumResultColsTest.cpp
index 8f0c1dba94c..8f0c1dba94c 100644
--- a/ndb/test/odbc/client/SQLNumResultColsTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLNumResultColsTest.cpp
diff --git a/ndb/test/odbc/client/SQLParamDataTest.cpp b/storage/ndb/test/odbc/client/SQLParamDataTest.cpp
index 92d491dfaf5..92d491dfaf5 100644
--- a/ndb/test/odbc/client/SQLParamDataTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLParamDataTest.cpp
diff --git a/ndb/test/odbc/client/SQLPrepareTest.cpp b/storage/ndb/test/odbc/client/SQLPrepareTest.cpp
index 2ebbc224b85..2ebbc224b85 100644
--- a/ndb/test/odbc/client/SQLPrepareTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLPrepareTest.cpp
diff --git a/ndb/test/odbc/client/SQLPutDataTest.cpp b/storage/ndb/test/odbc/client/SQLPutDataTest.cpp
index 38a8458fec4..38a8458fec4 100644
--- a/ndb/test/odbc/client/SQLPutDataTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLPutDataTest.cpp
diff --git a/ndb/test/odbc/client/SQLRowCountTest.cpp b/storage/ndb/test/odbc/client/SQLRowCountTest.cpp
index f298017c519..f298017c519 100644
--- a/ndb/test/odbc/client/SQLRowCountTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLRowCountTest.cpp
diff --git a/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp b/storage/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp
index c41ef885521..c41ef885521 100644
--- a/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp
diff --git a/ndb/test/odbc/client/SQLSetCursorNameTest.cpp b/storage/ndb/test/odbc/client/SQLSetCursorNameTest.cpp
index b35cf9fefc2..b35cf9fefc2 100644
--- a/ndb/test/odbc/client/SQLSetCursorNameTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLSetCursorNameTest.cpp
diff --git a/ndb/test/odbc/client/SQLSetDescFieldTest.cpp b/storage/ndb/test/odbc/client/SQLSetDescFieldTest.cpp
index 798622e0f75..798622e0f75 100644
--- a/ndb/test/odbc/client/SQLSetDescFieldTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLSetDescFieldTest.cpp
diff --git a/ndb/test/odbc/client/SQLSetDescRecTest.cpp b/storage/ndb/test/odbc/client/SQLSetDescRecTest.cpp
index d97af576cb0..d97af576cb0 100644
--- a/ndb/test/odbc/client/SQLSetDescRecTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLSetDescRecTest.cpp
diff --git a/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp b/storage/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp
index 16ae5671ca3..16ae5671ca3 100644
--- a/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp
diff --git a/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp b/storage/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp
index 646f82cd306..646f82cd306 100644
--- a/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp
diff --git a/ndb/test/odbc/client/SQLTablesTest.cpp b/storage/ndb/test/odbc/client/SQLTablesTest.cpp
index 735efd81e9c..735efd81e9c 100644
--- a/ndb/test/odbc/client/SQLTablesTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLTablesTest.cpp
diff --git a/ndb/test/odbc/client/SQLTransactTest.cpp b/storage/ndb/test/odbc/client/SQLTransactTest.cpp
index e9abe42129d..e9abe42129d 100644
--- a/ndb/test/odbc/client/SQLTransactTest.cpp
+++ b/storage/ndb/test/odbc/client/SQLTransactTest.cpp
diff --git a/ndb/test/odbc/client/common.hpp b/storage/ndb/test/odbc/client/common.hpp
index 236decf1b95..236decf1b95 100644
--- a/ndb/test/odbc/client/common.hpp
+++ b/storage/ndb/test/odbc/client/common.hpp
diff --git a/ndb/test/odbc/client/main.cpp b/storage/ndb/test/odbc/client/main.cpp
index b202b6de111..b202b6de111 100644
--- a/ndb/test/odbc/client/main.cpp
+++ b/storage/ndb/test/odbc/client/main.cpp
diff --git a/ndb/test/odbc/dm-iodbc/Makefile b/storage/ndb/test/odbc/dm-iodbc/Makefile
index ad0f0d39f5f..ad0f0d39f5f 100644
--- a/ndb/test/odbc/dm-iodbc/Makefile
+++ b/storage/ndb/test/odbc/dm-iodbc/Makefile
diff --git a/ndb/test/odbc/dm-unixodbc/Makefile b/storage/ndb/test/odbc/dm-unixodbc/Makefile
index 50d8e3b5e05..50d8e3b5e05 100644
--- a/ndb/test/odbc/dm-unixodbc/Makefile
+++ b/storage/ndb/test/odbc/dm-unixodbc/Makefile
diff --git a/ndb/test/odbc/driver/Makefile b/storage/ndb/test/odbc/driver/Makefile
index 5cf83d73106..5cf83d73106 100644
--- a/ndb/test/odbc/driver/Makefile
+++ b/storage/ndb/test/odbc/driver/Makefile
diff --git a/ndb/test/odbc/driver/testOdbcDriver.cpp b/storage/ndb/test/odbc/driver/testOdbcDriver.cpp
index d3b3802ebe1..d3b3802ebe1 100644
--- a/ndb/test/odbc/driver/testOdbcDriver.cpp
+++ b/storage/ndb/test/odbc/driver/testOdbcDriver.cpp
diff --git a/ndb/test/odbc/test_compiler/Makefile b/storage/ndb/test/odbc/test_compiler/Makefile
index 34819f21171..34819f21171 100644
--- a/ndb/test/odbc/test_compiler/Makefile
+++ b/storage/ndb/test/odbc/test_compiler/Makefile
diff --git a/ndb/test/odbc/test_compiler/test_compiler.cpp b/storage/ndb/test/odbc/test_compiler/test_compiler.cpp
index 042e9e6d4bf..042e9e6d4bf 100644
--- a/ndb/test/odbc/test_compiler/test_compiler.cpp
+++ b/storage/ndb/test/odbc/test_compiler/test_compiler.cpp
diff --git a/ndb/test/run-test/16node-tests.txt b/storage/ndb/test/run-test/16node-tests.txt
index 11ade56c28c..11ade56c28c 100644
--- a/ndb/test/run-test/16node-tests.txt
+++ b/storage/ndb/test/run-test/16node-tests.txt
diff --git a/storage/ndb/test/run-test/Makefile.am b/storage/ndb/test/run-test/Makefile.am
new file mode 100644
index 00000000000..903e3ab824e
--- /dev/null
+++ b/storage/ndb/test/run-test/Makefile.am
@@ -0,0 +1,34 @@
+
+testdir=$(prefix)/mysql-test/ndb
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_util.mk.am
+include $(top_srcdir)/storage/ndb/config/type_mgmapiclient.mk.am
+
+test_PROGRAMS = atrt
+test_DATA=daily-basic-tests.txt daily-devel-tests.txt 16node-tests.txt \
+          conf-daily-basic-ndbmaster.txt \
+          conf-daily-basic-shark.txt \
+          conf-daily-devel-ndbmaster.txt \
+          conf-daily-sql-ndbmaster.txt \
+          conf-daily-basic-dl145a.txt
+test_SCRIPTS=atrt-analyze-result.sh atrt-gather-result.sh atrt-setup.sh \
+          atrt-clear-result.sh make-config.sh make-index.sh make-html-reports.sh
+
+atrt_SOURCES = main.cpp run-test.hpp
+INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/test/include
+LDADD_LOC = $(top_builddir)/storage/ndb/test/src/libNDBT.a \
+	    $(top_builddir)/storage/ndb/src/libndbclient.la \
+            $(top_builddir)/dbug/libdbug.a \
+            $(top_builddir)/mysys/libmysys.a \
+            $(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
+
+wrappersdir=$(prefix)/bin
+wrappers_SCRIPTS=atrt-testBackup atrt-mysql-test-run
+
+EXTRA_DIST = $(test_DATA) $(test_SCRIPTS) $(wrappers_SCRIPTS) README.ATRT
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp:
diff --git a/ndb/test/run-test/README b/storage/ndb/test/run-test/README
index d5da8f05c17..d5da8f05c17 100644
--- a/ndb/test/run-test/README
+++ b/storage/ndb/test/run-test/README
diff --git a/ndb/test/run-test/README.ATRT b/storage/ndb/test/run-test/README.ATRT
index 7fe04ccdac4..7fe04ccdac4 100644
--- a/ndb/test/run-test/README.ATRT
+++ b/storage/ndb/test/run-test/README.ATRT
diff --git a/ndb/test/run-test/atrt-analyze-result.sh b/storage/ndb/test/run-test/atrt-analyze-result.sh
index 0fa46e918ef..0fa46e918ef 100755
--- a/ndb/test/run-test/atrt-analyze-result.sh
+++ b/storage/ndb/test/run-test/atrt-analyze-result.sh
diff --git a/ndb/test/run-test/atrt-clear-result.sh b/storage/ndb/test/run-test/atrt-clear-result.sh
index 57d3d43d247..57d3d43d247 100755
--- a/ndb/test/run-test/atrt-clear-result.sh
+++ b/storage/ndb/test/run-test/atrt-clear-result.sh
diff --git a/ndb/test/run-test/atrt-example.tgz b/storage/ndb/test/run-test/atrt-example.tgz
index 8455b2eb00d..8455b2eb00d 100644
--- a/ndb/test/run-test/atrt-example.tgz
+++ b/storage/ndb/test/run-test/atrt-example.tgz
diff --git a/ndb/test/run-test/atrt-gather-result.sh b/storage/ndb/test/run-test/atrt-gather-result.sh
index 93d4ae428d0..93d4ae428d0 100755
--- a/ndb/test/run-test/atrt-gather-result.sh
+++ b/storage/ndb/test/run-test/atrt-gather-result.sh
diff --git a/ndb/test/run-test/atrt-mysql-test-run b/storage/ndb/test/run-test/atrt-mysql-test-run
index 2ebc11b0070..2ebc11b0070 100755
--- a/ndb/test/run-test/atrt-mysql-test-run
+++ b/storage/ndb/test/run-test/atrt-mysql-test-run
diff --git a/ndb/test/run-test/atrt-setup.sh b/storage/ndb/test/run-test/atrt-setup.sh
index aff5d4119dc..aff5d4119dc 100755
--- a/ndb/test/run-test/atrt-setup.sh
+++ b/storage/ndb/test/run-test/atrt-setup.sh
diff --git a/ndb/test/run-test/atrt-testBackup b/storage/ndb/test/run-test/atrt-testBackup
index 3ed7641a42e..3ed7641a42e 100755
--- a/ndb/test/run-test/atrt-testBackup
+++ b/storage/ndb/test/run-test/atrt-testBackup
diff --git a/ndb/test/run-test/basic.txt b/storage/ndb/test/run-test/basic.txt
index ec9e21359e5..ec9e21359e5 100644
--- a/ndb/test/run-test/basic.txt
+++ b/storage/ndb/test/run-test/basic.txt
diff --git a/ndb/test/run-test/conf-daily-basic-dl145a.txt b/storage/ndb/test/run-test/conf-daily-basic-dl145a.txt
index d8cf8d34d82..d8cf8d34d82 100644
--- a/ndb/test/run-test/conf-daily-basic-dl145a.txt
+++ b/storage/ndb/test/run-test/conf-daily-basic-dl145a.txt
diff --git a/ndb/test/run-test/conf-daily-basic-ndbmaster.txt b/storage/ndb/test/run-test/conf-daily-basic-ndbmaster.txt
index bcd809593f3..bcd809593f3 100644
--- a/ndb/test/run-test/conf-daily-basic-ndbmaster.txt
+++ b/storage/ndb/test/run-test/conf-daily-basic-ndbmaster.txt
diff --git a/ndb/test/run-test/conf-daily-basic-shark.txt b/storage/ndb/test/run-test/conf-daily-basic-shark.txt
index 6d1f8b64f44..6d1f8b64f44 100644
--- a/ndb/test/run-test/conf-daily-basic-shark.txt
+++ b/storage/ndb/test/run-test/conf-daily-basic-shark.txt
diff --git a/ndb/test/run-test/conf-daily-devel-ndbmaster.txt b/storage/ndb/test/run-test/conf-daily-devel-ndbmaster.txt
index 8b340e6a39d..8b340e6a39d 100644
--- a/ndb/test/run-test/conf-daily-devel-ndbmaster.txt
+++ b/storage/ndb/test/run-test/conf-daily-devel-ndbmaster.txt
diff --git a/ndb/test/run-test/conf-daily-sql-ndbmaster.txt b/storage/ndb/test/run-test/conf-daily-sql-ndbmaster.txt
index 0d6a99f8d48..0d6a99f8d48 100644
--- a/ndb/test/run-test/conf-daily-sql-ndbmaster.txt
+++ b/storage/ndb/test/run-test/conf-daily-sql-ndbmaster.txt
diff --git a/ndb/test/run-test/daily-basic-tests.txt b/storage/ndb/test/run-test/daily-basic-tests.txt
index 5d7d7f58f89..5d7d7f58f89 100644
--- a/ndb/test/run-test/daily-basic-tests.txt
+++ b/storage/ndb/test/run-test/daily-basic-tests.txt
diff --git a/ndb/test/run-test/daily-devel-tests.txt b/storage/ndb/test/run-test/daily-devel-tests.txt
index 20f54e031e5..20f54e031e5 100644
--- a/ndb/test/run-test/daily-devel-tests.txt
+++ b/storage/ndb/test/run-test/daily-devel-tests.txt
diff --git a/ndb/test/run-test/example.conf b/storage/ndb/test/run-test/example.conf
index 1e152da332d..1e152da332d 100644
--- a/ndb/test/run-test/example.conf
+++ b/storage/ndb/test/run-test/example.conf
diff --git a/ndb/test/run-test/main.cpp b/storage/ndb/test/run-test/main.cpp
index 0b0b7472a19..0b0b7472a19 100644
--- a/ndb/test/run-test/main.cpp
+++ b/storage/ndb/test/run-test/main.cpp
diff --git a/ndb/test/run-test/make-config.sh b/storage/ndb/test/run-test/make-config.sh
index e82acb8a7dd..e82acb8a7dd 100755
--- a/ndb/test/run-test/make-config.sh
+++ b/storage/ndb/test/run-test/make-config.sh
diff --git a/ndb/test/run-test/make-html-reports.sh b/storage/ndb/test/run-test/make-html-reports.sh
index 67395ceba47..67395ceba47 100755
--- a/ndb/test/run-test/make-html-reports.sh
+++ b/storage/ndb/test/run-test/make-html-reports.sh
diff --git a/ndb/test/run-test/make-index.sh b/storage/ndb/test/run-test/make-index.sh
index 944f0df790b..944f0df790b 100755
--- a/ndb/test/run-test/make-index.sh
+++ b/storage/ndb/test/run-test/make-index.sh
diff --git a/ndb/test/run-test/ndb-autotest.sh b/storage/ndb/test/run-test/ndb-autotest.sh
index 573a9953924..573a9953924 100755
--- a/ndb/test/run-test/ndb-autotest.sh
+++ b/storage/ndb/test/run-test/ndb-autotest.sh
diff --git a/ndb/test/run-test/run-test.hpp b/storage/ndb/test/run-test/run-test.hpp
index 7011aec33d3..7011aec33d3 100644
--- a/ndb/test/run-test/run-test.hpp
+++ b/storage/ndb/test/run-test/run-test.hpp
diff --git a/ndb/test/src/CpcClient.cpp b/storage/ndb/test/src/CpcClient.cpp
index 4d06b4a7ff5..4d06b4a7ff5 100644
--- a/ndb/test/src/CpcClient.cpp
+++ b/storage/ndb/test/src/CpcClient.cpp
diff --git a/ndb/test/src/HugoAsynchTransactions.cpp b/storage/ndb/test/src/HugoAsynchTransactions.cpp
index 5d2eb451c0b..5d2eb451c0b 100644
--- a/ndb/test/src/HugoAsynchTransactions.cpp
+++ b/storage/ndb/test/src/HugoAsynchTransactions.cpp
diff --git a/ndb/test/src/HugoCalculator.cpp b/storage/ndb/test/src/HugoCalculator.cpp
index 8e01f6442bb..8e01f6442bb 100644
--- a/ndb/test/src/HugoCalculator.cpp
+++ b/storage/ndb/test/src/HugoCalculator.cpp
diff --git a/ndb/test/src/HugoOperations.cpp b/storage/ndb/test/src/HugoOperations.cpp
index f9a09eddd1f..f9a09eddd1f 100644
--- a/ndb/test/src/HugoOperations.cpp
+++ b/storage/ndb/test/src/HugoOperations.cpp
diff --git a/ndb/test/src/HugoTransactions.cpp b/storage/ndb/test/src/HugoTransactions.cpp
index 3260b921985..3260b921985 100644
--- a/ndb/test/src/HugoTransactions.cpp
+++ b/storage/ndb/test/src/HugoTransactions.cpp
diff --git a/storage/ndb/test/src/Makefile.am b/storage/ndb/test/src/Makefile.am
new file mode 100644
index 00000000000..d141a356ac0
--- /dev/null
+++ b/storage/ndb/test/src/Makefile.am
@@ -0,0 +1,35 @@
+
+noinst_LIBRARIES = libNDBT.a
+
+libNDBT_a_SOURCES = \
+	NDBT_ReturnCodes.cpp \
+	NDBT_Error.cpp NDBT_Tables.cpp NDBT_ResultRow.cpp \
+	NDBT_Test.cpp HugoCalculator.cpp \
+	HugoOperations.cpp HugoTransactions.cpp \
+	HugoAsynchTransactions.cpp UtilTransactions.cpp \
+	NdbRestarter.cpp NdbRestarts.cpp NDBT_Output.cpp \
+	NdbBackup.cpp  NdbConfig.cpp NdbGrep.cpp NDBT_Table.cpp \
+	NdbSchemaCon.cpp NdbSchemaOp.cpp getarg.c \
+	CpcClient.cpp
+
+INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/common/mgmcommon -I$(top_srcdir)/storage/ndb/include/mgmcommon -I$(top_srcdir)/storage/ndb/include/kernel -I$(top_srcdir)/storage/ndb/src/mgmapi
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: libNDBT.dsp
+
+libNDBT.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-lib.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(libNDBT_a_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB
diff --git a/ndb/test/src/NDBT_Error.cpp b/storage/ndb/test/src/NDBT_Error.cpp
index ffacb3eb928..ffacb3eb928 100644
--- a/ndb/test/src/NDBT_Error.cpp
+++ b/storage/ndb/test/src/NDBT_Error.cpp
diff --git a/ndb/test/src/NDBT_Output.cpp b/storage/ndb/test/src/NDBT_Output.cpp
index 633d71991d0..633d71991d0 100644
--- a/ndb/test/src/NDBT_Output.cpp
+++ b/storage/ndb/test/src/NDBT_Output.cpp
diff --git a/ndb/test/src/NDBT_ResultRow.cpp b/storage/ndb/test/src/NDBT_ResultRow.cpp
index ab8d7b07ea1..ab8d7b07ea1 100644
--- a/ndb/test/src/NDBT_ResultRow.cpp
+++ b/storage/ndb/test/src/NDBT_ResultRow.cpp
diff --git a/ndb/test/src/NDBT_ReturnCodes.cpp b/storage/ndb/test/src/NDBT_ReturnCodes.cpp
index 5bffc00177f..5bffc00177f 100644
--- a/ndb/test/src/NDBT_ReturnCodes.cpp
+++ b/storage/ndb/test/src/NDBT_ReturnCodes.cpp
diff --git a/ndb/test/src/NDBT_Table.cpp b/storage/ndb/test/src/NDBT_Table.cpp
index 8d398b75d81..8d398b75d81 100644
--- a/ndb/test/src/NDBT_Table.cpp
+++ b/storage/ndb/test/src/NDBT_Table.cpp
diff --git a/ndb/test/src/NDBT_Tables.cpp b/storage/ndb/test/src/NDBT_Tables.cpp
index 5a5fecd85c1..5a5fecd85c1 100644
--- a/ndb/test/src/NDBT_Tables.cpp
+++ b/storage/ndb/test/src/NDBT_Tables.cpp
diff --git a/ndb/test/src/NDBT_Test.cpp b/storage/ndb/test/src/NDBT_Test.cpp
index 7fd92db533e..7fd92db533e 100644
--- a/ndb/test/src/NDBT_Test.cpp
+++ b/storage/ndb/test/src/NDBT_Test.cpp
diff --git a/ndb/test/src/NdbBackup.cpp b/storage/ndb/test/src/NdbBackup.cpp
index fe101b9c80b..fe101b9c80b 100644
--- a/ndb/test/src/NdbBackup.cpp
+++ b/storage/ndb/test/src/NdbBackup.cpp
diff --git a/ndb/test/src/NdbConfig.cpp b/storage/ndb/test/src/NdbConfig.cpp
index 2fb466d1b8f..2fb466d1b8f 100644
--- a/ndb/test/src/NdbConfig.cpp
+++ b/storage/ndb/test/src/NdbConfig.cpp
diff --git a/ndb/test/src/NdbGrep.cpp b/storage/ndb/test/src/NdbGrep.cpp
index 6c0c9cabfcb..6c0c9cabfcb 100644
--- a/ndb/test/src/NdbGrep.cpp
+++ b/storage/ndb/test/src/NdbGrep.cpp
diff --git a/ndb/test/src/NdbRestarter.cpp b/storage/ndb/test/src/NdbRestarter.cpp
index 91c0963feae..91c0963feae 100644
--- a/ndb/test/src/NdbRestarter.cpp
+++ b/storage/ndb/test/src/NdbRestarter.cpp
diff --git a/ndb/test/src/NdbRestarts.cpp b/storage/ndb/test/src/NdbRestarts.cpp
index c0f31af84ce..c0f31af84ce 100644
--- a/ndb/test/src/NdbRestarts.cpp
+++ b/storage/ndb/test/src/NdbRestarts.cpp
diff --git a/ndb/test/src/NdbSchemaCon.cpp b/storage/ndb/test/src/NdbSchemaCon.cpp
index 0de49ff983f..0de49ff983f 100644
--- a/ndb/test/src/NdbSchemaCon.cpp
+++ b/storage/ndb/test/src/NdbSchemaCon.cpp
diff --git a/ndb/test/src/NdbSchemaOp.cpp b/storage/ndb/test/src/NdbSchemaOp.cpp
index 4281ceb02c8..4281ceb02c8 100644
--- a/ndb/test/src/NdbSchemaOp.cpp
+++ b/storage/ndb/test/src/NdbSchemaOp.cpp
diff --git a/ndb/test/src/UtilTransactions.cpp b/storage/ndb/test/src/UtilTransactions.cpp
index 65c1a7ded31..65c1a7ded31 100644
--- a/ndb/test/src/UtilTransactions.cpp
+++ b/storage/ndb/test/src/UtilTransactions.cpp
diff --git a/ndb/test/src/getarg.c b/storage/ndb/test/src/getarg.c
index 5b67eb6343d..5b67eb6343d 100644
--- a/ndb/test/src/getarg.c
+++ b/storage/ndb/test/src/getarg.c
diff --git a/storage/ndb/test/tools/Makefile.am b/storage/ndb/test/tools/Makefile.am
new file mode 100644
index 00000000000..a7ab7669052
--- /dev/null
+++ b/storage/ndb/test/tools/Makefile.am
@@ -0,0 +1,30 @@
+
+ndbtest_PROGRAMS = hugoLoad hugoFill hugoLockRecords hugoPkDelete hugoPkRead hugoPkReadRecord  hugoPkUpdate hugoScanRead hugoScanUpdate restart verify_index copy_tab create_index  ndb_cpcc
+
+# transproxy 
+
+hugoFill_SOURCES = hugoFill.cpp
+hugoLoad_SOURCES = hugoLoad.cpp
+hugoLockRecords_SOURCES = hugoLockRecords.cpp
+hugoPkDelete_SOURCES = hugoPkDelete.cpp
+hugoPkRead_SOURCES = hugoPkRead.cpp
+hugoPkReadRecord_SOURCES = hugoPkReadRecord.cpp
+hugoPkUpdate_SOURCES = hugoPkUpdate.cpp
+hugoScanRead_SOURCES = hugoScanRead.cpp
+hugoScanUpdate_SOURCES = hugoScanUpdate.cpp
+restart_SOURCES = restart.cpp
+# transproxy_SOURCES = transproxy.cpp
+verify_index_SOURCES = verify_index.cpp
+copy_tab_SOURCES = copy_tab.cpp
+create_index_SOURCES = create_index.cpp
+ndb_cpcc_SOURCES = cpcc.cpp
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am
+
+ndb_cpcc_LDADD = $(LDADD)
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp:
diff --git a/ndb/test/tools/copy_tab.cpp b/storage/ndb/test/tools/copy_tab.cpp
index 97370b170ef..97370b170ef 100644
--- a/ndb/test/tools/copy_tab.cpp
+++ b/storage/ndb/test/tools/copy_tab.cpp
diff --git a/ndb/test/tools/cpcc.cpp b/storage/ndb/test/tools/cpcc.cpp
index dd59e577f2c..dd59e577f2c 100644
--- a/ndb/test/tools/cpcc.cpp
+++ b/storage/ndb/test/tools/cpcc.cpp
diff --git a/ndb/test/tools/create_index.cpp b/storage/ndb/test/tools/create_index.cpp
index 9f9c26aa0da..9f9c26aa0da 100644
--- a/ndb/test/tools/create_index.cpp
+++ b/storage/ndb/test/tools/create_index.cpp
diff --git a/ndb/test/tools/hugoCalculator.cpp b/storage/ndb/test/tools/hugoCalculator.cpp
index 82c4bbff1a4..82c4bbff1a4 100644
--- a/ndb/test/tools/hugoCalculator.cpp
+++ b/storage/ndb/test/tools/hugoCalculator.cpp
diff --git a/ndb/test/tools/hugoFill.cpp b/storage/ndb/test/tools/hugoFill.cpp
index 6408b2987f9..6408b2987f9 100644
--- a/ndb/test/tools/hugoFill.cpp
+++ b/storage/ndb/test/tools/hugoFill.cpp
diff --git a/ndb/test/tools/hugoLoad.cpp b/storage/ndb/test/tools/hugoLoad.cpp
index 1a229169650..1a229169650 100644
--- a/ndb/test/tools/hugoLoad.cpp
+++ b/storage/ndb/test/tools/hugoLoad.cpp
diff --git a/ndb/test/tools/hugoLockRecords.cpp b/storage/ndb/test/tools/hugoLockRecords.cpp
index c0d0b9f9c5a..c0d0b9f9c5a 100644
--- a/ndb/test/tools/hugoLockRecords.cpp
+++ b/storage/ndb/test/tools/hugoLockRecords.cpp
diff --git a/ndb/test/tools/hugoPkDelete.cpp b/storage/ndb/test/tools/hugoPkDelete.cpp
index 84e7ded0add..84e7ded0add 100644
--- a/ndb/test/tools/hugoPkDelete.cpp
+++ b/storage/ndb/test/tools/hugoPkDelete.cpp
diff --git a/ndb/test/tools/hugoPkRead.cpp b/storage/ndb/test/tools/hugoPkRead.cpp
index e3702dc5ca1..e3702dc5ca1 100644
--- a/ndb/test/tools/hugoPkRead.cpp
+++ b/storage/ndb/test/tools/hugoPkRead.cpp
diff --git a/ndb/test/tools/hugoPkReadRecord.cpp b/storage/ndb/test/tools/hugoPkReadRecord.cpp
index c60a994c7d4..c60a994c7d4 100644
--- a/ndb/test/tools/hugoPkReadRecord.cpp
+++ b/storage/ndb/test/tools/hugoPkReadRecord.cpp
diff --git a/ndb/test/tools/hugoPkUpdate.cpp b/storage/ndb/test/tools/hugoPkUpdate.cpp
index 7d46ae95c29..7d46ae95c29 100644
--- a/ndb/test/tools/hugoPkUpdate.cpp
+++ b/storage/ndb/test/tools/hugoPkUpdate.cpp
diff --git a/ndb/test/tools/hugoScanRead.cpp b/storage/ndb/test/tools/hugoScanRead.cpp
index a345bb88d0e..a345bb88d0e 100644
--- a/ndb/test/tools/hugoScanRead.cpp
+++ b/storage/ndb/test/tools/hugoScanRead.cpp
diff --git a/ndb/test/tools/hugoScanUpdate.cpp b/storage/ndb/test/tools/hugoScanUpdate.cpp
index 6960fa44b96..6960fa44b96 100644
--- a/ndb/test/tools/hugoScanUpdate.cpp
+++ b/storage/ndb/test/tools/hugoScanUpdate.cpp
diff --git a/ndb/test/tools/old_dirs/hugoCalculator/Makefile b/storage/ndb/test/tools/old_dirs/hugoCalculator/Makefile
index a29deeaacd3..a29deeaacd3 100644
--- a/ndb/test/tools/old_dirs/hugoCalculator/Makefile
+++ b/storage/ndb/test/tools/old_dirs/hugoCalculator/Makefile
diff --git a/ndb/test/tools/old_dirs/hugoFill/Makefile b/storage/ndb/test/tools/old_dirs/hugoFill/Makefile
index 3da745810b6..3da745810b6 100644
--- a/ndb/test/tools/old_dirs/hugoFill/Makefile
+++ b/storage/ndb/test/tools/old_dirs/hugoFill/Makefile
diff --git a/ndb/test/tools/old_dirs/hugoLoad/Makefile b/storage/ndb/test/tools/old_dirs/hugoLoad/Makefile
index 7c5756d0d41..7c5756d0d41 100644
--- a/ndb/test/tools/old_dirs/hugoLoad/Makefile
+++ b/storage/ndb/test/tools/old_dirs/hugoLoad/Makefile
diff --git a/ndb/test/tools/old_dirs/hugoLockRecords/Makefile b/storage/ndb/test/tools/old_dirs/hugoLockRecords/Makefile
index 3235750cbf8..3235750cbf8 100644
--- a/ndb/test/tools/old_dirs/hugoLockRecords/Makefile
+++ b/storage/ndb/test/tools/old_dirs/hugoLockRecords/Makefile
diff --git a/ndb/test/tools/old_dirs/hugoPkDelete/Makefile b/storage/ndb/test/tools/old_dirs/hugoPkDelete/Makefile
index e6d53611c54..e6d53611c54 100644
--- a/ndb/test/tools/old_dirs/hugoPkDelete/Makefile
+++ b/storage/ndb/test/tools/old_dirs/hugoPkDelete/Makefile
diff --git a/ndb/test/tools/old_dirs/hugoPkRead/Makefile b/storage/ndb/test/tools/old_dirs/hugoPkRead/Makefile
index 03580dc0d18..03580dc0d18 100644
--- a/ndb/test/tools/old_dirs/hugoPkRead/Makefile
+++ b/storage/ndb/test/tools/old_dirs/hugoPkRead/Makefile
diff --git a/ndb/test/tools/old_dirs/hugoPkReadRecord/Makefile b/storage/ndb/test/tools/old_dirs/hugoPkReadRecord/Makefile
index 158a79a5666..158a79a5666 100644
--- a/ndb/test/tools/old_dirs/hugoPkReadRecord/Makefile
+++ b/storage/ndb/test/tools/old_dirs/hugoPkReadRecord/Makefile
diff --git a/ndb/test/tools/old_dirs/hugoPkUpdate/Makefile b/storage/ndb/test/tools/old_dirs/hugoPkUpdate/Makefile
index 48795b62206..48795b62206 100644
--- a/ndb/test/tools/old_dirs/hugoPkUpdate/Makefile
+++ b/storage/ndb/test/tools/old_dirs/hugoPkUpdate/Makefile
diff --git a/ndb/test/tools/old_dirs/hugoScanRead/Makefile b/storage/ndb/test/tools/old_dirs/hugoScanRead/Makefile
index b88377c299e..b88377c299e 100644
--- a/ndb/test/tools/old_dirs/hugoScanRead/Makefile
+++ b/storage/ndb/test/tools/old_dirs/hugoScanRead/Makefile
diff --git a/ndb/test/tools/old_dirs/hugoScanUpdate/Makefile b/storage/ndb/test/tools/old_dirs/hugoScanUpdate/Makefile
index ec0e07bfd84..ec0e07bfd84 100644
--- a/ndb/test/tools/old_dirs/hugoScanUpdate/Makefile
+++ b/storage/ndb/test/tools/old_dirs/hugoScanUpdate/Makefile
diff --git a/ndb/test/tools/old_dirs/restart/Makefile b/storage/ndb/test/tools/old_dirs/restart/Makefile
index 05d9e98c5bc..05d9e98c5bc 100644
--- a/ndb/test/tools/old_dirs/restart/Makefile
+++ b/storage/ndb/test/tools/old_dirs/restart/Makefile
diff --git a/ndb/test/tools/old_dirs/transproxy/Makefile b/storage/ndb/test/tools/old_dirs/transproxy/Makefile
index d6a76ed2e3d..d6a76ed2e3d 100644
--- a/ndb/test/tools/old_dirs/transproxy/Makefile
+++ b/storage/ndb/test/tools/old_dirs/transproxy/Makefile
diff --git a/ndb/test/tools/old_dirs/verify_index/Makefile b/storage/ndb/test/tools/old_dirs/verify_index/Makefile
index f6b31e4dc8e..f6b31e4dc8e 100644
--- a/ndb/test/tools/old_dirs/verify_index/Makefile
+++ b/storage/ndb/test/tools/old_dirs/verify_index/Makefile
diff --git a/ndb/test/tools/old_dirs/waiter/waiter.cpp b/storage/ndb/test/tools/old_dirs/waiter/waiter.cpp
index d57daff3aea..d57daff3aea 100644
--- a/ndb/test/tools/old_dirs/waiter/waiter.cpp
+++ b/storage/ndb/test/tools/old_dirs/waiter/waiter.cpp
diff --git a/ndb/test/tools/restart.cpp b/storage/ndb/test/tools/restart.cpp
index 9ad20801fd7..9ad20801fd7 100644
--- a/ndb/test/tools/restart.cpp
+++ b/storage/ndb/test/tools/restart.cpp
diff --git a/ndb/test/tools/transproxy.cpp b/storage/ndb/test/tools/transproxy.cpp
index 28a621fa584..28a621fa584 100644
--- a/ndb/test/tools/transproxy.cpp
+++ b/storage/ndb/test/tools/transproxy.cpp
diff --git a/ndb/test/tools/verify_index.cpp b/storage/ndb/test/tools/verify_index.cpp
index acc97af883b..acc97af883b 100644
--- a/ndb/test/tools/verify_index.cpp
+++ b/storage/ndb/test/tools/verify_index.cpp
diff --git a/storage/ndb/tools/Makefile.am b/storage/ndb/tools/Makefile.am
new file mode 100644
index 00000000000..db6037df037
--- /dev/null
+++ b/storage/ndb/tools/Makefile.am
@@ -0,0 +1,157 @@
+
+ndbtools_PROGRAMS = \
+  ndb_test_platform \
+  ndb_waiter \
+  ndb_drop_table \
+  ndb_delete_all \
+  ndb_desc \
+  ndb_drop_index \
+  ndb_show_tables \
+  ndb_select_all \
+  ndb_select_count \
+  ndb_restore
+
+tools_common_sources = ../test/src/NDBT_ReturnCodes.cpp \
+                       ../test/src/NDBT_Table.cpp \
+                       ../test/src/NDBT_Output.cpp
+
+ndb_test_platform_SOURCES = ndb_test_platform.cpp
+ndb_waiter_SOURCES = waiter.cpp $(tools_common_sources)
+ndb_delete_all_SOURCES = delete_all.cpp $(tools_common_sources)
+ndb_desc_SOURCES = desc.cpp $(tools_common_sources)
+ndb_drop_index_SOURCES = drop_index.cpp $(tools_common_sources)
+ndb_drop_table_SOURCES = drop_tab.cpp $(tools_common_sources)
+ndb_show_tables_SOURCES = listTables.cpp $(tools_common_sources)
+ndb_select_all_SOURCES = select_all.cpp \
+                         ../test/src/NDBT_ResultRow.cpp \
+                         $(tools_common_sources)
+ndb_select_count_SOURCES = select_count.cpp $(tools_common_sources)
+ndb_restore_SOURCES = restore/restore_main.cpp \
+                      restore/consumer.cpp \
+                      restore/consumer_restore.cpp \
+                      restore/consumer_printer.cpp \
+                      restore/Restore.cpp \
+                      ../test/src/NDBT_ResultRow.cpp $(tools_common_sources)
+
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_ndbapitools.mk.am
+
+ndb_test_platform_LDFLAGS = @ndb_bin_am_ldflags@
+ndb_waiter_LDFLAGS = @ndb_bin_am_ldflags@
+ndb_drop_table_LDFLAGS = @ndb_bin_am_ldflags@
+ndb_delete_all_LDFLAGS = @ndb_bin_am_ldflags@
+ndb_desc_LDFLAGS = @ndb_bin_am_ldflags@
+ndb_drop_index_LDFLAGS = @ndb_bin_am_ldflags@
+ndb_show_tables_LDFLAGS = @ndb_bin_am_ldflags@
+ndb_select_all_LDFLAGS = @ndb_bin_am_ldflags@
+ndb_select_count_LDFLAGS = @ndb_bin_am_ldflags@
+ndb_restore_LDFLAGS = @ndb_bin_am_ldflags@
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
+
+windoze-dsp: \
+  ndb_waiter.dsp \
+  ndb_drop_table.dsp \
+  ndb_delete_all.dsp \
+  ndb_desc.dsp \
+  ndb_drop_index.dsp \
+  ndb_show_tables.dsp \
+  ndb_select_all.dsp \
+  ndb_select_count.dsp
+
+ndb_waiter.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-prg.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ ndb_waiter
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_waiter_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
+
+ndb_drop_table.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-prg.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ ndb_drop_table
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_drop_table_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
+
+ndb_delete_all.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-prg.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ ndb_delete_all
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_delete_all_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
+
+ndb_desc.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-prg.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ ndb_desc
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_desc_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
+
+ndb_drop_index.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-prg.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ ndb_drop_index
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_drop_index_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
+
+ndb_show_tables.dsp: Makefile \
+               $(top_srcdir)/ndb/config/win-prg.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ ndb_show_tables
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_show_tables_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
+
+ndb_select_all.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-prg.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ ndb_select_all
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_select_all_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
+
+ndb_select_count.dsp: Makefile \
+               $(top_srcdir)/storage/ndb/config/win-prg.am \
+               $(top_srcdir)/storage/ndb/config/win-name \
+               $(top_srcdir)/storage/ndb/config/win-includes \
+               $(top_srcdir)/storage/ndb/config/win-sources \
+               $(top_srcdir)/storage/ndb/config/win-libraries
+	cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+	@$(top_srcdir)/storage/ndb/config/win-name $@ ndb_select_count
+	@$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+	@$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndb_select_count_SOURCES)
+	@$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
diff --git a/ndb/tools/clean-links.sh b/storage/ndb/tools/clean-links.sh
index 01820f30616..01820f30616 100755
--- a/ndb/tools/clean-links.sh
+++ b/storage/ndb/tools/clean-links.sh
diff --git a/ndb/tools/delete_all.cpp b/storage/ndb/tools/delete_all.cpp
index 2c395a67900..2c395a67900 100644
--- a/ndb/tools/delete_all.cpp
+++ b/storage/ndb/tools/delete_all.cpp
diff --git a/ndb/tools/desc.cpp b/storage/ndb/tools/desc.cpp
index be0f6942db5..be0f6942db5 100644
--- a/ndb/tools/desc.cpp
+++ b/storage/ndb/tools/desc.cpp
diff --git a/ndb/tools/drop_index.cpp b/storage/ndb/tools/drop_index.cpp
index e2bf7f0bfae..e2bf7f0bfae 100644
--- a/ndb/tools/drop_index.cpp
+++ b/storage/ndb/tools/drop_index.cpp
diff --git a/ndb/tools/drop_tab.cpp b/storage/ndb/tools/drop_tab.cpp
index 991e1505486..991e1505486 100644
--- a/ndb/tools/drop_tab.cpp
+++ b/storage/ndb/tools/drop_tab.cpp
diff --git a/ndb/tools/listTables.cpp b/storage/ndb/tools/listTables.cpp
index b4a2235f73b..b4a2235f73b 100644
--- a/ndb/tools/listTables.cpp
+++ b/storage/ndb/tools/listTables.cpp
diff --git a/ndb/tools/make-errors.pl b/storage/ndb/tools/make-errors.pl
index 65819209a89..65819209a89 100644
--- a/ndb/tools/make-errors.pl
+++ b/storage/ndb/tools/make-errors.pl
diff --git a/ndb/tools/make-links.sh b/storage/ndb/tools/make-links.sh
index e0c4f55986e..e0c4f55986e 100755
--- a/ndb/tools/make-links.sh
+++ b/storage/ndb/tools/make-links.sh
diff --git a/ndb/tools/ndb_test_platform.cpp b/storage/ndb/tools/ndb_test_platform.cpp
index 88f21b31d58..88f21b31d58 100644
--- a/ndb/tools/ndb_test_platform.cpp
+++ b/storage/ndb/tools/ndb_test_platform.cpp
diff --git a/ndb/tools/ndbsql.cpp b/storage/ndb/tools/ndbsql.cpp
index 1997e4abebd..1997e4abebd 100644
--- a/ndb/tools/ndbsql.cpp
+++ b/storage/ndb/tools/ndbsql.cpp
diff --git a/ndb/tools/old_dirs/copy_tab/Makefile b/storage/ndb/tools/old_dirs/copy_tab/Makefile
index 4ad33a26652..4ad33a26652 100644
--- a/ndb/tools/old_dirs/copy_tab/Makefile
+++ b/storage/ndb/tools/old_dirs/copy_tab/Makefile
diff --git a/ndb/tools/old_dirs/cpcc/Makefile b/storage/ndb/tools/old_dirs/cpcc/Makefile
index 78f8c61e464..78f8c61e464 100644
--- a/ndb/tools/old_dirs/cpcc/Makefile
+++ b/storage/ndb/tools/old_dirs/cpcc/Makefile
diff --git a/ndb/tools/old_dirs/create_index/Makefile b/storage/ndb/tools/old_dirs/create_index/Makefile
index 38f2df970c4..38f2df970c4 100644
--- a/ndb/tools/old_dirs/create_index/Makefile
+++ b/storage/ndb/tools/old_dirs/create_index/Makefile
diff --git a/ndb/tools/old_dirs/delete_all/Makefile b/storage/ndb/tools/old_dirs/delete_all/Makefile
index 1cae240eb8f..1cae240eb8f 100644
--- a/ndb/tools/old_dirs/delete_all/Makefile
+++ b/storage/ndb/tools/old_dirs/delete_all/Makefile
diff --git a/ndb/tools/old_dirs/desc/Makefile b/storage/ndb/tools/old_dirs/desc/Makefile
index 614984cfd35..614984cfd35 100644
--- a/ndb/tools/old_dirs/desc/Makefile
+++ b/storage/ndb/tools/old_dirs/desc/Makefile
diff --git a/ndb/tools/old_dirs/drop_index/Makefile b/storage/ndb/tools/old_dirs/drop_index/Makefile
index 969bee51064..969bee51064 100644
--- a/ndb/tools/old_dirs/drop_index/Makefile
+++ b/storage/ndb/tools/old_dirs/drop_index/Makefile
diff --git a/ndb/tools/old_dirs/drop_tab/Makefile b/storage/ndb/tools/old_dirs/drop_tab/Makefile
index d7b21fe982c..d7b21fe982c 100644
--- a/ndb/tools/old_dirs/drop_tab/Makefile
+++ b/storage/ndb/tools/old_dirs/drop_tab/Makefile
diff --git a/ndb/tools/old_dirs/list_tables/Makefile b/storage/ndb/tools/old_dirs/list_tables/Makefile
index b60f161ee68..b60f161ee68 100644
--- a/ndb/tools/old_dirs/list_tables/Makefile
+++ b/storage/ndb/tools/old_dirs/list_tables/Makefile
diff --git a/ndb/tools/old_dirs/ndbnet/Makefile.PL b/storage/ndb/tools/old_dirs/ndbnet/Makefile.PL
index 4b27a17de15..4b27a17de15 100644
--- a/ndb/tools/old_dirs/ndbnet/Makefile.PL
+++ b/storage/ndb/tools/old_dirs/ndbnet/Makefile.PL
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Net.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net.pm
index 3b7b16bb3cf..3b7b16bb3cf 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Net.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Base.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Base.pm
index 900446138e8..900446138e8 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Base.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Base.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Client.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Client.pm
index d34a18d63af..d34a18d63af 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Client.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Client.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Command.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Command.pm
index 30145d09fa9..30145d09fa9 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Command.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Command.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Config.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Config.pm
index 4c5db3cd3f5..4c5db3cd3f5 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Config.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Config.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Database.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Database.pm
index 7ea15be0650..7ea15be0650 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Database.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Database.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Env.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Env.pm
index d79e72f2bb3..d79e72f2bb3 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Env.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Env.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Node.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Node.pm
index f41bf51168d..f41bf51168d 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Node.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Node.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeApi.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeApi.pm
index 08f5f85577d..08f5f85577d 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeApi.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeApi.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeDb.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeDb.pm
index 88a35ba4f8d..88a35ba4f8d 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeDb.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeDb.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeMgmt.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeMgmt.pm
index 1056e3df623..1056e3df623 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeMgmt.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeMgmt.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Server.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Server.pm
index 5d2118f0ffe..5d2118f0ffe 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Server.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Server.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/ServerINET.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/ServerINET.pm
index a065c186855..a065c186855 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/ServerINET.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/ServerINET.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/ServerUNIX.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/ServerUNIX.pm
index b3fa245d5ee..b3fa245d5ee 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/ServerUNIX.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/ServerUNIX.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Run.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Run.pm
index a8cabde544c..a8cabde544c 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Run.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Run.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Base.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Base.pm
index 4769f2c4441..4769f2c4441 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Base.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Base.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Database.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Database.pm
index 9a12ddb20b3..9a12ddb20b3 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Database.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Database.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Env.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Env.pm
index e851a82636b..e851a82636b 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Env.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Env.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Node.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Node.pm
index e657021b229..e657021b229 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Node.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Node.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Util.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util.pm
index d5db35cbf13..d5db35cbf13 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Util.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Base.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Base.pm
index 20df78a3b9b..20df78a3b9b 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Base.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Base.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Dir.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Dir.pm
index 90609b971c7..90609b971c7 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Dir.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Dir.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Event.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Event.pm
index a3ad32cd7fb..a3ad32cd7fb 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Event.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Event.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/File.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/File.pm
index 4b3cb38191c..4b3cb38191c 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/File.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/File.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/IO.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/IO.pm
index 34f4d0a150d..34f4d0a150d 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/IO.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/IO.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Lock.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Lock.pm
index b515e633059..b515e633059 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Lock.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Lock.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Log.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Log.pm
index 44b39df84e6..44b39df84e6 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Log.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Log.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Socket.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Socket.pm
index 00e8b6eca51..00e8b6eca51 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Socket.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Socket.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/SocketINET.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/SocketINET.pm
index faaa568a08e..faaa568a08e 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/SocketINET.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/SocketINET.pm
diff --git a/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/SocketUNIX.pm b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/SocketUNIX.pm
index 9c6b3115f6a..9c6b3115f6a 100644
--- a/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/SocketUNIX.pm
+++ b/storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/SocketUNIX.pm
diff --git a/ndb/tools/old_dirs/ndbnet/ndbnet.pl b/storage/ndb/tools/old_dirs/ndbnet/ndbnet.pl
index 5f6648da46d..5f6648da46d 100644
--- a/ndb/tools/old_dirs/ndbnet/ndbnet.pl
+++ b/storage/ndb/tools/old_dirs/ndbnet/ndbnet.pl
diff --git a/ndb/tools/old_dirs/ndbnet/ndbnetd.pl b/storage/ndb/tools/old_dirs/ndbnet/ndbnetd.pl
index 95fa5322abc..95fa5322abc 100644
--- a/ndb/tools/old_dirs/ndbnet/ndbnetd.pl
+++ b/storage/ndb/tools/old_dirs/ndbnet/ndbnetd.pl
diff --git a/ndb/tools/old_dirs/ndbnet/ndbrun b/storage/ndb/tools/old_dirs/ndbnet/ndbrun
index 99121276d99..99121276d99 100644
--- a/ndb/tools/old_dirs/ndbnet/ndbrun
+++ b/storage/ndb/tools/old_dirs/ndbnet/ndbrun
diff --git a/ndb/tools/old_dirs/ndbsql/Makefile b/storage/ndb/tools/old_dirs/ndbsql/Makefile
index 81ca87b0414..81ca87b0414 100644
--- a/ndb/tools/old_dirs/ndbsql/Makefile
+++ b/storage/ndb/tools/old_dirs/ndbsql/Makefile
diff --git a/ndb/tools/old_dirs/select_all/Makefile b/storage/ndb/tools/old_dirs/select_all/Makefile
index e14e411b3a5..e14e411b3a5 100644
--- a/ndb/tools/old_dirs/select_all/Makefile
+++ b/storage/ndb/tools/old_dirs/select_all/Makefile
diff --git a/ndb/tools/old_dirs/select_count/Makefile b/storage/ndb/tools/old_dirs/select_count/Makefile
index 35a53c6b046..35a53c6b046 100644
--- a/ndb/tools/old_dirs/select_count/Makefile
+++ b/storage/ndb/tools/old_dirs/select_count/Makefile
diff --git a/ndb/tools/old_dirs/src/counterviewer/CounterViewer.java b/storage/ndb/tools/old_dirs/src/counterviewer/CounterViewer.java
index 317c1c75e28..317c1c75e28 100644
--- a/ndb/tools/old_dirs/src/counterviewer/CounterViewer.java
+++ b/storage/ndb/tools/old_dirs/src/counterviewer/CounterViewer.java
diff --git a/ndb/tools/restore/Restore.cpp b/storage/ndb/tools/restore/Restore.cpp
index b53255820db..b53255820db 100644
--- a/ndb/tools/restore/Restore.cpp
+++ b/storage/ndb/tools/restore/Restore.cpp
diff --git a/ndb/tools/restore/Restore.hpp b/storage/ndb/tools/restore/Restore.hpp
index 85793baf9df..85793baf9df 100644
--- a/ndb/tools/restore/Restore.hpp
+++ b/storage/ndb/tools/restore/Restore.hpp
diff --git a/ndb/tools/restore/consumer.cpp b/storage/ndb/tools/restore/consumer.cpp
index b130c4998d5..b130c4998d5 100644
--- a/ndb/tools/restore/consumer.cpp
+++ b/storage/ndb/tools/restore/consumer.cpp
diff --git a/ndb/tools/restore/consumer.hpp b/storage/ndb/tools/restore/consumer.hpp
index 692c814159f..692c814159f 100644
--- a/ndb/tools/restore/consumer.hpp
+++ b/storage/ndb/tools/restore/consumer.hpp
diff --git a/ndb/tools/restore/consumer_printer.cpp b/storage/ndb/tools/restore/consumer_printer.cpp
index 0aa5b521d29..0aa5b521d29 100644
--- a/ndb/tools/restore/consumer_printer.cpp
+++ b/storage/ndb/tools/restore/consumer_printer.cpp
diff --git a/ndb/tools/restore/consumer_printer.hpp b/storage/ndb/tools/restore/consumer_printer.hpp
index 7cbc924e364..7cbc924e364 100644
--- a/ndb/tools/restore/consumer_printer.hpp
+++ b/storage/ndb/tools/restore/consumer_printer.hpp
diff --git a/ndb/tools/restore/consumer_restore.cpp b/storage/ndb/tools/restore/consumer_restore.cpp
index 9dd8c4bf92d..9dd8c4bf92d 100644
--- a/ndb/tools/restore/consumer_restore.cpp
+++ b/storage/ndb/tools/restore/consumer_restore.cpp
diff --git a/ndb/tools/restore/consumer_restore.hpp b/storage/ndb/tools/restore/consumer_restore.hpp
index 1bf6d89a912..1bf6d89a912 100644
--- a/ndb/tools/restore/consumer_restore.hpp
+++ b/storage/ndb/tools/restore/consumer_restore.hpp
diff --git a/ndb/tools/restore/consumer_restorem.cpp b/storage/ndb/tools/restore/consumer_restorem.cpp
index 56179a60ab0..56179a60ab0 100644
--- a/ndb/tools/restore/consumer_restorem.cpp
+++ b/storage/ndb/tools/restore/consumer_restorem.cpp
diff --git a/ndb/tools/restore/restore_main.cpp b/storage/ndb/tools/restore/restore_main.cpp
index 93c40d31adb..93c40d31adb 100644
--- a/ndb/tools/restore/restore_main.cpp
+++ b/storage/ndb/tools/restore/restore_main.cpp
diff --git a/ndb/tools/rgrep b/storage/ndb/tools/rgrep
index 212b068639d..212b068639d 100755
--- a/ndb/tools/rgrep
+++ b/storage/ndb/tools/rgrep
diff --git a/ndb/tools/select_all.cpp b/storage/ndb/tools/select_all.cpp
index baa18db1ebd..baa18db1ebd 100644
--- a/ndb/tools/select_all.cpp
+++ b/storage/ndb/tools/select_all.cpp
diff --git a/ndb/tools/select_count.cpp b/storage/ndb/tools/select_count.cpp
index 6fa3c77f15a..6fa3c77f15a 100644
--- a/ndb/tools/select_count.cpp
+++ b/storage/ndb/tools/select_count.cpp
diff --git a/ndb/tools/waiter.cpp b/storage/ndb/tools/waiter.cpp
index db90bd8bd90..db90bd8bd90 100644
--- a/ndb/tools/waiter.cpp
+++ b/storage/ndb/tools/waiter.cpp
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 7c3366f996f..0fa668b29ac 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -566,7 +566,6 @@ fi
 %attr(755, root, root) %{_bindir}/msql2mysql
 %attr(755, root, root) %{_bindir}/mysql
 %attr(755, root, root) %{_bindir}/mysql_find_rows
-%attr(755, root, root) %{_bindir}/mysql_tableinfo
 %attr(755, root, root) %{_bindir}/mysql_waitpid
 %attr(755, root, root) %{_bindir}/mysqlaccess
 %attr(755, root, root) %{_bindir}/mysqladmin
@@ -690,6 +689,10 @@ fi
 
 - Added a "make clean" between separate calls to "BuildMySQL".
 
+* Thu May 12 2005 Guilhem Bichot <guilhem@mysql.com>
+
+- Removed the mysql_tableinfo script made obsolete by the information schema
+
 * Wed Apr 20 2005 Lenz Grimmer <lenz@mysql.com>
 
 - Enabled the "blackhole" storage engine for the Max RPM