From ee9ffa779f4de8c940d610229a17786f00ae7db2 Mon Sep 17 00:00:00 2001 From: "bell@sanja.is.com.ua" <> Date: Wed, 3 Mar 2004 17:12:13 +0200 Subject: [PATCH 01/51] basic reservations for VIEWs preveleges --- mysql-test/r/grant.result | 6 ++--- scripts/mysql_create_system_tables.sh | 22 +++++++++++------- scripts/mysql_fix_privilege_tables.sql | 15 ++++++++++++ sql/sql_acl.cc | 32 ++++++++++++++++---------- sql/sql_acl.h | 20 ++++++++++++---- 5 files changed, 67 insertions(+), 28 deletions(-) diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result index 89426edb000..f32b0736512 100644 --- a/mysql-test/r/grant.result +++ b/mysql-test/r/grant.result @@ -9,8 +9,8 @@ GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' REQUIRE CIPHER 'EDH-RSA-DES-CBC3 GRANT SELECT ON `mysqltest`.* TO 'mysqltest_1'@'localhost' grant delete on mysqltest.* to mysqltest_1@localhost; select * from mysql.user where user="mysqltest_1"; -Host User Password Select_priv Insert_priv Update_priv Delete_priv Create_priv Drop_priv Reload_priv Shutdown_priv Process_priv File_priv Grant_priv References_priv Index_priv Alter_priv Show_db_priv Super_priv Create_tmp_table_priv Lock_tables_priv Execute_priv Repl_slave_priv Repl_client_priv ssl_type ssl_cipher x509_issuer x509_subject max_questions max_updates max_connections -localhost mysqltest_1 N N N N N N N N N N N N N N N N N N N N N SPECIFIED EDH-RSA-DES-CBC3-SHA 0 0 0 +Host User Password Select_priv Insert_priv Update_priv Delete_priv Create_priv Drop_priv Reload_priv Shutdown_priv Process_priv File_priv Grant_priv References_priv Index_priv Alter_priv Show_db_priv Super_priv Create_tmp_table_priv Lock_tables_priv Execute_priv Repl_slave_priv Repl_client_priv Create_view_priv Show_view_priv ssl_type ssl_cipher x509_issuer x509_subject max_questions max_updates max_connections +localhost mysqltest_1 N N N N N N N N N N N N N N N N N N N N N 0 0 0 show grants for mysqltest_1@localhost; Grants for mysqltest_1@localhost GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' REQUIRE CIPHER 'EDH-RSA-DES-CBC3-SHA' @@ -61,7 +61,7 @@ revoke LOCK TABLES, ALTER on mysqltest.* from mysqltest_1@localhost; show grants for mysqltest_1@localhost; Grants for mysqltest_1@localhost GRANT USAGE ON *.* TO 'mysqltest_1'@'localhost' -GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, CREATE TEMPORARY TABLES ON `mysqltest`.* TO 'mysqltest_1'@'localhost' WITH GRANT OPTION +GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, CREATE TEMPORARY TABLES, CREATE VIEW, SHOW VIEW ON `mysqltest`.* TO 'mysqltest_1'@'localhost' WITH GRANT OPTION revoke all privileges on mysqltest.* from mysqltest_1@localhost; delete from mysql.user where user='mysqltest_1'; flush privileges; diff --git a/scripts/mysql_create_system_tables.sh b/scripts/mysql_create_system_tables.sh index d20d745d514..d7224b6eae0 100644 --- a/scripts/mysql_create_system_tables.sh +++ b/scripts/mysql_create_system_tables.sh @@ -65,13 +65,15 @@ then c_d="$c_d Alter_priv enum('N','Y') DEFAULT 'N' NOT NULL," c_d="$c_d Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL," c_d="$c_d Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_d="$c_d Create_view_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_d="$c_d Show_view_priv enum('N','Y') DEFAULT 'N' NOT NULL," c_d="$c_d PRIMARY KEY Host (Host,Db,User)," c_d="$c_d KEY User (User)" c_d="$c_d )" c_d="$c_d comment='Database privileges';" - i_d="INSERT INTO db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y'); - INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y');" + i_d="INSERT INTO db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y'); + INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y');" fi if test ! -f $mdata/host.frm @@ -95,6 +97,8 @@ then c_h="$c_h Alter_priv enum('N','Y') DEFAULT 'N' NOT NULL," c_h="$c_h Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL," c_h="$c_h Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_h="$c_h Create_view_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_h="$c_h Show_view_priv enum('N','Y') DEFAULT 'N' NOT NULL," c_h="$c_h PRIMARY KEY Host (Host,Db)" c_h="$c_h )" c_h="$c_h comment='Host privileges; Merged with database privileges';" @@ -131,6 +135,8 @@ then c_u="$c_u Execute_priv enum('N','Y') DEFAULT 'N' NOT NULL," c_u="$c_u Repl_slave_priv enum('N','Y') DEFAULT 'N' NOT NULL," c_u="$c_u Repl_client_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_u="$c_u Create_view_priv enum('N','Y') DEFAULT 'N' NOT NULL," + c_u="$c_u Show_view_priv enum('N','Y') DEFAULT 'N' NOT NULL," c_u="$c_u ssl_type enum('','ANY','X509', 'SPECIFIED') DEFAULT '' NOT NULL," c_u="$c_u ssl_cipher BLOB NOT NULL," c_u="$c_u x509_issuer BLOB NOT NULL," @@ -144,21 +150,21 @@ then if test "$1" = "test" then - i_u="INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0); - INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0); - REPLACE INTO user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0); + i_u="INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0); + INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0); + REPLACE INTO user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0); INSERT INTO user (host,user) values ('localhost',''); INSERT INTO user (host,user) values ('$hostname','');" else - i_u="INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);" + i_u="INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);" if test "$windows" = "0" then i_u="$i_u - INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0); + INSERT INTO user VALUES ('$hostname','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0); INSERT INTO user (host,user) values ('$hostname',''); INSERT INTO user (host,user) values ('localhost','');" else - i_u="INSERT INTO user VALUES ('localhost','','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);" + i_u="INSERT INTO user VALUES ('localhost','','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0);" fi fi fi diff --git a/scripts/mysql_fix_privilege_tables.sql b/scripts/mysql_fix_privilege_tables.sql index 115236948c9..8c7fbabc375 100644 --- a/scripts/mysql_fix_privilege_tables.sql +++ b/scripts/mysql_fix_privilege_tables.sql @@ -86,6 +86,7 @@ ADD Execute_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Lock_tables_priv, ADD Repl_slave_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Execute_priv, ADD Repl_client_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Repl_slave_priv; + UPDATE user SET show_db_priv= select_priv, super_priv=process_priv, execute_priv=process_priv, create_tmp_table_priv='Y', Lock_tables_priv='Y', Repl_slave_priv=file_priv, Repl_client_priv=file_priv where user<>"" AND @hadShowDbPriv = 0; ALTER TABLE user @@ -100,6 +101,20 @@ ALTER TABLE host ADD Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL, ADD Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL; +# +# Create VIEWs privrlages (v5.1) +# +ALTER TABLE db ADD Create_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Lock_tables_priv; +ALTER TABLE host ADD Create_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Lock_tables_priv; +ALTER TABLE user ADD Create_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Repl_client_priv; + +# +# Show VIEWs privrlages (v5.1) +# +ALTER TABLE db ADD Show_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Create_view_priv; +ALTER TABLE host ADD Show_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Create_view_priv; +ALTER TABLE user ADD Show_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Create_view_priv; + # # Create some possible missing tables # diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 5febb49e110..b0f7672e172 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -36,6 +36,8 @@ #ifndef NO_EMBEDDED_ACCESS_CHECKS +#define FIRST_NON_YN_FIELD 26 + class acl_entry :public hash_filo_element { public: @@ -303,9 +305,14 @@ my_bool acl_init(THD *org_thd, bool dont_read_acl_tables) user.sort= get_sort(2,user.host.hostname,user.user); user.hostname_length= (user.host.hostname ? (uint) strlen(user.host.hostname) : 0); + if (table->fields >= 31) /* Starting from 4.0.2 we have more fields */ { - char *ssl_type=get_field(&mem, table->field[24]); + uint base_field= 24; + if (table->fields > 31) /* Starting from 5.1 we have more privileges */ + base_field= 26; + + char *ssl_type=get_field(&mem, table->field[base_field]); if (!ssl_type) user.ssl_type=SSL_TYPE_NONE; else if (!strcmp(ssl_type, "ANY")) @@ -315,15 +322,15 @@ my_bool acl_init(THD *org_thd, bool dont_read_acl_tables) else /* !strcmp(ssl_type, "SPECIFIED") */ user.ssl_type=SSL_TYPE_SPECIFIED; - user.ssl_cipher= get_field(&mem, table->field[25]); - user.x509_issuer= get_field(&mem, table->field[26]); - user.x509_subject= get_field(&mem, table->field[27]); + user.ssl_cipher= get_field(&mem, table->field[base_field+1]); + user.x509_issuer= get_field(&mem, table->field[base_field+2]); + user.x509_subject= get_field(&mem, table->field[base_field+3]); - char *ptr = get_field(&mem, table->field[28]); + char *ptr = get_field(&mem, table->field[base_field+4]); user.user_resource.questions=atoi(ptr); - ptr = get_field(&mem, table->field[29]); + ptr = get_field(&mem, table->field[base_field+5]); user.user_resource.updates=atoi(ptr); - ptr = get_field(&mem, table->field[30]); + ptr = get_field(&mem, table->field[base_field+6]); user.user_resource.connections=atoi(ptr); if (user.user_resource.questions || user.user_resource.updates || user.user_resource.connections) @@ -3016,15 +3023,16 @@ static void add_user_option(String *grant, ulong value, const char *name) static const char *command_array[]= { - "SELECT", "INSERT","UPDATE","DELETE","CREATE", "DROP", "RELOAD","SHUTDOWN", - "PROCESS","FILE","GRANT","REFERENCES","INDEX", "ALTER", "SHOW DATABASES", - "SUPER", "CREATE TEMPORARY TABLES", "LOCK TABLES", "EXECUTE", - "REPLICATION SLAVE", "REPLICATION CLIENT", + "SELECT", "INSERT", "UPDATE", "DELETE", "CREATE", "DROP", "RELOAD", + "SHUTDOWN", "PROCESS","FILE", "GRANT", "REFERENCES", "INDEX", + "ALTER", "SHOW DATABASES", "SUPER", "CREATE TEMPORARY TABLES", + "LOCK TABLES", "EXECUTE", "REPLICATION SLAVE", "REPLICATION CLIENT", + "CREATE VIEW", "SHOW VIEW" }; static uint command_lengths[]= { - 6,6,6,6,6,4,6,8,7,4,5,10,5,5,14,5,23,11,7,17,18 + 6, 6, 6, 6, 6, 4, 6, 8, 7, 4, 5, 10, 5, 5, 14, 5, 23, 11, 7, 17, 18, 11, 9 }; diff --git a/sql/sql_acl.h b/sql/sql_acl.h index f17c9781e8c..354c637860f 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -35,11 +35,13 @@ #define EXECUTE_ACL (1L << 18) #define REPL_SLAVE_ACL (1L << 19) #define REPL_CLIENT_ACL (1L << 20) - +#define CREATE_VIEW_ACL (1L << 21) +#define SHOW_VIEW_ACL (1L << 22) #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 | LOCK_TABLES_ACL) + GRANT_ACL | REFERENCES_ACL | INDEX_ACL | ALTER_ACL | CREATE_TMP_ACL | \ + LOCK_TABLES_ACL | CREATE_VIEW_ACL | SHOW_VIEW_ACL) #define TABLE_ACLS \ (SELECT_ACL | INSERT_ACL | UPDATE_ACL | DELETE_ACL | CREATE_ACL | DROP_ACL | \ @@ -53,7 +55,7 @@ RELOAD_ACL | SHUTDOWN_ACL | PROCESS_ACL | FILE_ACL | GRANT_ACL | \ REFERENCES_ACL | INDEX_ACL | ALTER_ACL | SHOW_DB_ACL | SUPER_ACL | \ CREATE_TMP_ACL | LOCK_TABLES_ACL | REPL_SLAVE_ACL | REPL_CLIENT_ACL | \ - EXECUTE_ACL) + EXECUTE_ACL | CREATE_VIEW_ACL | SHOW_VIEW_ACL) #define EXTRA_ACL (1L << 29) #define NO_ACCESS (1L << 30) @@ -66,13 +68,21 @@ /* Continius bit-segments that needs to be shifted */ #define DB_REL1 (RELOAD_ACL | SHUTDOWN_ACL | PROCESS_ACL | FILE_ACL) #define DB_REL2 (GRANT_ACL | REFERENCES_ACL) +#define DB_REL3 (INDEX_ACL | ALTER_ACL) /* Privileges that needs to be reallocated (in continous chunks) */ #define DB_CHUNK1 (GRANT_ACL | REFERENCES_ACL | INDEX_ACL | ALTER_ACL) #define DB_CHUNK2 (CREATE_TMP_ACL | LOCK_TABLES_ACL) +#define DB_CHUNK3 (CREATE_VIEW_ACL | SHOW_VIEW_ACL) -#define fix_rights_for_db(A) (((A) & 63) | (((A) & DB_REL1) << 4) | (((A) & DB_REL2) << 6)) -#define get_rights_for_db(A) (((A) & 63) | (((A) & DB_CHUNK1) >> 4) | (((A) & DB_CHUNK2) >> 6)) +#define fix_rights_for_db(A) (((A) & 63) | \ + (((A) & DB_REL1) << 4) | \ + (((A) & DB_REL2) << 6) | \ + (((A) & DB_REL3) << 9)) +#define get_rights_for_db(A) (((A) & 63) | \ + (((A) & DB_CHUNK1) >> 4) | \ + (((A) & DB_CHUNK2) >> 6) | \ + (((A) & DB_CHUNK3) >> 9)) #define fix_rights_for_table(A) (((A) & 63) | (((A) & ~63) << 4)) #define get_rights_for_table(A) (((A) & 63) | (((A) & ~63) >> 4)) #define fix_rights_for_column(A) (((A) & 7) | (((A) & ~7) << 8)) From 6d259cbfcb18487d1d6de0b0caacf1ebd1a9ae05 Mon Sep 17 00:00:00 2001 From: "bell@sanja.is.com.ua" <> Date: Wed, 3 Mar 2004 22:15:26 +0200 Subject: [PATCH 02/51] version fixed --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index b07f970a651..b65784ba5c6 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM # The Docs Makefile.am parses this line! -AM_INIT_AUTOMAKE(mysql, 5.0.1-alpha) +AM_INIT_AUTOMAKE(mysql, 5.1.0-alpha) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 From ad05bbf48c1db36c35bcf29903b64fab6bd03ca7 Mon Sep 17 00:00:00 2001 From: "bell@sanja.is.com.ua" <> Date: Wed, 3 Mar 2004 22:18:18 +0200 Subject: [PATCH 03/51] version fixed --- BitKeeper/triggers/post-commit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit index 873c9665faf..6070b8e8e84 100755 --- a/BitKeeper/triggers/post-commit +++ b/BitKeeper/triggers/post-commit @@ -6,7 +6,7 @@ FROM=$USER@mysql.com INTERNALS=internals@lists.mysql.com DOCS=docs-commit@mysql.com LIMIT=10000 -REPOV=5.0 +REPOV=5.1 if [ "$REAL_EMAIL" = "" ] then From 35f236068ba43d2aa114aeba06ff9a33ccbf0e65 Mon Sep 17 00:00:00 2001 From: "lars@mysql.com" <> Date: Tue, 18 Jan 2005 18:55:34 +0100 Subject: [PATCH 04/51] Since the #ifdef check is too late in the code, it was not possible to compile without InnoDB. --- sql/mysqld.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index a3f10d5c045..442e35fc3bc 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4418,13 +4418,13 @@ Disable with --skip-large-pages.", Disable with --skip-innodb (will save memory).", (gptr*) &opt_innodb, (gptr*) &opt_innodb, 0, GET_BOOL, NO_ARG, OPT_INNODB_DEFAULT, 0, 0, 0, 0, 0}, +#ifdef HAVE_INNOBASE_DB {"innodb_checksums", OPT_INNODB_CHECKSUMS, "Enable InnoDB checksums validation (enabled by default). \ Disable with --skip-innodb-checksums.", (gptr*) &innobase_use_checksums, (gptr*) &innobase_use_checksums, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, {"innodb_data_file_path", OPT_INNODB_DATA_FILE_PATH, "Path to individual files and their sizes.", 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, -#ifdef HAVE_INNOBASE_DB {"innodb_data_home_dir", OPT_INNODB_DATA_HOME_DIR, "The common part for InnoDB table spaces.", (gptr*) &innobase_data_home_dir, (gptr*) &innobase_data_home_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, From b6a2b5f734952ec2e6fc77679dcb437f6f38a16e Mon Sep 17 00:00:00 2001 From: "pekka@mysql.com" <> Date: Mon, 7 Feb 2005 12:06:55 +0100 Subject: [PATCH 05/51] mysqld.cc - remove extra #endif --- sql/mysqld.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 430739388f4..e77dc7ba793 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4453,7 +4453,6 @@ Disable with --skip-innodb (will save memory).", {"innodb_checksums", OPT_INNODB_CHECKSUMS, "Enable InnoDB checksums validation (enabled by default). \ Disable with --skip-innodb-checksums.", (gptr*) &innobase_use_checksums, (gptr*) &innobase_use_checksums, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, -#endif {"innodb_data_file_path", OPT_INNODB_DATA_FILE_PATH, "Path to individual files and their sizes.", 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, From 26787260b73696a110c06679709c2871be5dedf1 Mon Sep 17 00:00:00 2001 From: "lars@mysql.com" <> Date: Tue, 8 Mar 2005 21:12:35 +0100 Subject: [PATCH 06/51] WL#2472: Refactoring of replication and binlog filtering. Needed to be able to have multiple masters connected to same slave server with different filters. --- sql/Makefile.am | 4 +- sql/log.cc | 8 +- sql/log_event.cc | 12 +- sql/mysql_priv.h | 1 - sql/mysqld.cc | 69 ++---- sql/repl_failsafe.cc | 11 +- sql/slave.cc | 392 ++----------------------------- sql/slave.h | 35 +-- sql/sql_acl.cc | 23 +- sql/sql_class.h | 11 +- sql/sql_parse.cc | 25 +- sql/sql_repl.cc | 7 +- sql/sql_repl.h | 1 - sql/table_filter.cc | 539 +++++++++++++++++++++++++++++++++++++++++++ sql/table_filter.h | 108 +++++++++ 15 files changed, 744 insertions(+), 502 deletions(-) create mode 100644 sql/table_filter.cc create mode 100644 sql/table_filter.h diff --git a/sql/Makefile.am b/sql/Makefile.am index 8ff55898ba4..152957da1e4 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -58,7 +58,7 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ log_event.h sql_repl.h slave.h \ stacktrace.h sql_sort.h sql_cache.h set_var.h \ spatial.h gstream.h client_settings.h tzfile.h \ - tztime.h \ + table_filter.h tztime.h \ sp_head.h sp_pcontext.h sp_rcontext.h sp.h sp_cache.h \ parse_file.h sql_view.h sql_trigger.h \ examples/ha_example.h examples/ha_archive.h \ @@ -95,7 +95,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc \ stacktrace.c repl_failsafe.h repl_failsafe.cc \ sql_olap.cc sql_view.cc \ gstream.cc spatial.cc sql_help.cc protocol_cursor.cc \ - tztime.cc my_time.c \ + table_filter.cc tztime.cc my_time.c \ sp_head.cc sp_pcontext.cc sp_rcontext.cc sp.cc \ sp_cache.cc parse_file.cc sql_trigger.cc \ examples/ha_example.cc examples/ha_archive.cc \ diff --git a/sql/log.cc b/sql/log.cc index d57a6b49762..2216561c852 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -24,6 +24,7 @@ #include "mysql_priv.h" #include "sql_repl.h" +#include "table_filter.h" #include "ha_innodb.h" // necessary to cut the binlog when crash recovery #include @@ -34,6 +35,8 @@ #include "message.h" #endif +extern Table_filter *binlog_filter; + MYSQL_LOG mysql_log, mysql_slow_log, mysql_bin_log; ulong sync_binlog_counter= 0; @@ -1325,10 +1328,11 @@ bool MYSQL_LOG::write(Log_event* event_info) binlog_[wild_]{do|ignore}_table?" (WL#1049)" */ if ((thd && !(thd->options & OPTION_BIN_LOG)) || - (local_db && !db_ok(local_db, binlog_do_db, binlog_ignore_db))) + (local_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 5ee034d785e..206a02164e0 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -21,7 +21,9 @@ #endif #include "mysql_priv.h" #include "slave.h" +#include "table_filter.h" #include +extern Table_filter *rpl_filter; #endif /* MYSQL_CLIENT */ #define log_cs &my_charset_latin1 @@ -1370,7 +1372,7 @@ int Query_log_event::exec_event(struct st_relay_log_info* rli) */ thd->catalog= (char*) catalog; 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; @@ -1389,7 +1391,7 @@ int Query_log_event::exec_event(struct st_relay_log_info* rli) 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; @@ -2449,7 +2451,7 @@ int Load_log_event::exec_event(NET* net, struct st_relay_log_info* rli, { char *load_data_query= 0; 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; @@ -2478,7 +2480,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)); @@ -2500,7 +2502,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 322b38abe13..8c907401fdb 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1072,7 +1072,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 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 e77dc7ba793..942fce711d4 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -19,6 +19,7 @@ #include #include "slave.h" #include "sql_repl.h" +#include "table_filter.h" #include "repl_failsafe.h" #include "stacktrace.h" #include "mysqld_suffix.h" @@ -382,12 +383,10 @@ Le_creator le_creator; FILE *bootstrap_file; -I_List replicate_rewrite_db; -I_List replicate_do_db, replicate_ignore_db; -// allow the user to tell us which db to replicate and which to ignore -I_List binlog_do_db, binlog_ignore_db; I_List threads,thread_cache; I_List key_caches; +Table_filter* rpl_filter; +Table_filter* binlog_filter; struct system_variables global_system_variables; struct system_variables max_system_variables; @@ -994,11 +993,6 @@ 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 #ifdef HAVE_OPENSSL if (ssl_acceptor_fd) @@ -2967,9 +2961,16 @@ int win_main(int argc, char **argv) int main(int argc, char **argv) #endif { - DEBUGGER_OFF; + rpl_filter= new Table_filter; + binlog_filter= new Table_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_ @@ -3214,6 +3215,9 @@ we force server id to 2, but this MySQL server will not act as a slave."); clean_up_mutexes(); my_end(opt_endinfo ? MY_CHECK_ERROR | MY_GIVE_INFO : 0); + delete rpl_filter; + delete binlog_filter; + exit(0); return(0); /* purecov: deadcode */ } @@ -3309,7 +3313,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 application PID e.g.: MySQLShutdown1890; MySQLShutdown2342 @@ -5875,13 +5878,6 @@ static void mysql_init_variables(void) default_key_cache_base.length))) exit(1); - /* 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), @@ -6136,14 +6132,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: @@ -6176,71 +6170,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/repl_failsafe.cc b/sql/repl_failsafe.cc index de4ad83fdbb..0909d87d74b 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -20,9 +20,12 @@ #include "repl_failsafe.h" #include "sql_repl.h" #include "slave.h" +#include "table_filter.h" #include "log_event.h" #include +extern Table_filter *rpl_filter; + #define SLAVE_LIST_CHUNK 128 #define SLAVE_ERRMSG_SIZE (FN_REFLEN+64) @@ -735,14 +738,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 +863,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/slave.cc b/sql/slave.cc index 5332dbf9c5b..fdac2aa5dcc 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -22,11 +22,14 @@ #include #include "slave.h" #include "sql_repl.h" +#include "table_filter.h" #include "repl_failsafe.h" #include #include #include +extern Table_filter *rpl_filter; + bool use_slave_mask = 0; MY_BITMAP slave_error_mask; @@ -35,11 +38,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; /* @@ -193,20 +192,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 @@ -806,228 +791,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) - 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"); - - 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*/) { @@ -1063,14 +826,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; } @@ -1150,24 +905,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 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 @@ -1180,60 +917,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 &do_list, - I_List &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 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 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) @@ -2235,48 +1918,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 @@ -2371,23 +2012,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); @@ -3765,10 +3401,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 e0816fd45a7..de28643a0f1 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -443,15 +443,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 :\ @@ -505,27 +496,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 &do_list, - I_List &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); @@ -559,11 +532,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 ; @@ -577,8 +546,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 replicate_do_db, replicate_ignore_db; -extern I_List replicate_rewrite_db; extern I_List threads; #endif diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index e8915239c5e..d7be45ed59c 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -28,7 +28,8 @@ #include "mysql_priv.h" #include "hash_filo.h" #ifdef HAVE_REPLICATION -#include "sql_repl.h" //for tables_ok() +#include "table_filter.h" //for tables_ok() +extern Table_filter *rpl_filter; #endif #include #include @@ -1475,7 +1476,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 @@ -1483,7 +1484,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(0, &tables)) + if (!rpl_filter->tables_ok(0, &tables)) DBUG_RETURN(0); } #endif @@ -2669,14 +2670,14 @@ 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()) { /* 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(0, tables)) + if (!rpl_filter->tables_ok(0, tables)) DBUG_RETURN(FALSE); } #endif @@ -2872,14 +2873,14 @@ bool mysql_procedure_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()) { /* 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(0, tables)) + if (!rpl_filter->tables_ok(0, tables)) DBUG_RETURN(FALSE); } #endif @@ -3001,14 +3002,14 @@ bool mysql_grant(THD *thd, const char *db, List &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(0, tables)) + if (!rpl_filter->tables_ok(0, tables)) DBUG_RETURN(FALSE); } #endif @@ -4192,7 +4193,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 @@ -4200,7 +4201,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(0, tables)) + if (!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_class.h b/sql/sql_class.h index ca65f011b9d..c8351a3f32a 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -327,19 +327,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) {} }; diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index b7a75a0bdd6..bc08a5886d0 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -16,11 +16,14 @@ #include "mysql_priv.h" #include "sql_repl.h" +#include "table_filter.h" #include "repl_failsafe.h" #include #include #include +extern Table_filter *rpl_filter; + #ifdef HAVE_INNOBASE_DB #include "ha_innodb.h" #endif @@ -137,10 +140,12 @@ static bool end_active_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 && + !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))); + !rpl_filter->tables_ok(thd->db, + (TABLE_LIST *) + thd->lex->auxilliary_table_list.first))); } #endif @@ -3283,9 +3288,9 @@ unsent_create_error: 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; @@ -3314,8 +3319,8 @@ unsent_create_error: */ #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; @@ -3355,8 +3360,8 @@ unsent_create_error: */ #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 8ba92015535..84590d5ed4d 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -19,8 +19,11 @@ #include "sql_repl.h" #include "log_event.h" +#include "table_filter.h" #include +extern Table_filter *binlog_filter; + int max_binlog_dump_events = 0; // unlimited my_bool opt_sporadic_binlog_dump_fail = 0; static int binlog_dump_count = 0; @@ -1442,8 +1445,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 e8497fee343..a13c1076b2c 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 binlog_do_db, binlog_ignore_db; extern int max_binlog_dump_events; extern my_bool opt_sporadic_binlog_dump_fail; diff --git a/sql/table_filter.cc b/sql/table_filter.cc new file mode 100644 index 00000000000..ba4531fe19c --- /dev/null +++ b/sql/table_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 "table_filter.h" + +#define TABLE_RULE_HASH_SIZE 16 +#define TABLE_RULE_ARR_SIZE 16 + +Table_filter::Table_filter() +{ + 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(); + + table_rules_on= 0; +} + + +Table_filter::~Table_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 +Table_filter::tables_ok(const char* db, TABLE_LIST* tables) +{ + bool some_tables_updating= 0; + DBUG_ENTER("Table_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 +Table_filter::db_ok(const char* db) +{ + DBUG_ENTER("Table_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 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 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 +Table_filter::db_ok_with_wild_table(const char *db) +{ + DBUG_ENTER("Table_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 +Table_filter::is_on() +{ + return table_rules_on; +} + + +int +Table_filter::add_do_table(const char* table_spec) +{ + DBUG_ENTER("Table_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 +Table_filter::add_ignore_table(const char* table_spec) +{ + DBUG_ENTER("Table_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 +Table_filter::add_wild_do_table(const char* table_spec) +{ + DBUG_ENTER("Table_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 +Table_filter::add_wild_ignore_table(const char* table_spec) +{ + DBUG_ENTER("Table_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 +Table_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 +Table_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); + (void)my_hash_insert(h, (byte*)e); + return 0; +} + + +/* + Add table expression with wildcards to dynamic array +*/ + +int +Table_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 +Table_filter::add_do_db(const char* table_spec) +{ + i_string *db = new i_string(table_spec); + do_db.push_back(db); +} + + +void +Table_filter::add_ignore_db(const char* table_spec) +{ + i_string *db = new i_string(table_spec); + ignore_db.push_back(db); +} + + +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; +} + + +static void free_table_ent(TABLE_RULE_ENT* e) +{ + my_free((gptr) e, MYF(0)); +} + + +void +Table_filter::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 +Table_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* +Table_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 +Table_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 +Table_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 +Table_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 +Table_filter::get_do_table(String* str) +{ + table_rule_ent_hash_to_str(str, &do_table); +} + + +void +Table_filter::get_ignore_table(String* str) +{ + table_rule_ent_hash_to_str(str, &ignore_table); +} + + +void +Table_filter::get_wild_do_table(String* str) +{ + table_rule_ent_dynamic_array_to_str(str, &wild_do_table); +} + + +void +Table_filter::get_wild_ignore_table(String* str) +{ + table_rule_ent_dynamic_array_to_str(str, &wild_ignore_table); +} + + +const char* +Table_filter::get_rewrite_db(const char* db, uint32 *new_len) +{ + if (rewrite_db.is_empty() || !db) + return db; + I_List_iterator it(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; +} + + +I_List* +Table_filter::get_do_db() +{ + return &do_db; +} + + +I_List* +Table_filter::get_ignore_db() +{ + return &ignore_db; +} diff --git a/sql/table_filter.h b/sql/table_filter.h new file mode 100644 index 00000000000..684cf38fbd7 --- /dev/null +++ b/sql/table_filter.h @@ -0,0 +1,108 @@ +/* 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 __TABLE_FILTER_H__ +#define __TABLE_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; + +/* + Table_filter + + Inclusion and exclusion rules of tables and databases. + Also handles rewrites of db. + Used for replication and binlogging. + */ +class Table_filter +{ +public: + Table_filter(); + ~Table_filter(); + + /* 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* get_do_db(); + I_List* 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 do_db; + I_List ignore_db; + + I_List rewrite_db; +}; + +#endif // __TABLE_FILTER_H__ From 6a46a75a20452640b9d6d655b92f4111090388cf Mon Sep 17 00:00:00 2001 From: "tomas@poseidon.ndb.mysql.com" <> Date: Wed, 9 Mar 2005 01:30:12 +0100 Subject: [PATCH 07/51] configure.in: corrected ndb version --- configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 6c49585b2ed..279af3c719b 100644 --- a/configure.in +++ b/configure.in @@ -17,8 +17,8 @@ SHARED_LIB_VERSION=14:0:0 # ndb version NDB_VERSION_MAJOR=5 -NDB_VERSION_MINOR=0 -NDB_VERSION_BUILD=3 +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 ? From 7ed7fc7f58cc4ef29883d538ce3e50f94ddce746 Mon Sep 17 00:00:00 2001 From: "lars@mysql.com" <> Date: Thu, 10 Mar 2005 14:36:48 +0100 Subject: [PATCH 08/51] WL#2472: Addendum: Fixes after Mats review --- sql/log.cc | 2 -- sql/log_event.cc | 1 - sql/repl_failsafe.cc | 2 -- sql/slave.cc | 2 -- sql/slave.h | 4 ++++ sql/sql_acl.cc | 4 ---- sql/sql_acl.h | 3 +++ sql/sql_parse.cc | 2 -- sql/sql_repl.cc | 2 -- sql/sql_repl.h | 3 +++ sql/table_filter.cc | 30 ++++++++++++++---------------- sql/table_filter.h | 4 +++- 12 files changed, 27 insertions(+), 32 deletions(-) diff --git a/sql/log.cc b/sql/log.cc index 2216561c852..c0f508adfe7 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -35,8 +35,6 @@ #include "message.h" #endif -extern Table_filter *binlog_filter; - MYSQL_LOG mysql_log, mysql_slow_log, mysql_bin_log; ulong sync_binlog_counter= 0; diff --git a/sql/log_event.cc b/sql/log_event.cc index 206a02164e0..bc9501a8292 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -23,7 +23,6 @@ #include "slave.h" #include "table_filter.h" #include -extern Table_filter *rpl_filter; #endif /* MYSQL_CLIENT */ #define log_cs &my_charset_latin1 diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index 0909d87d74b..f9eb0bde1e7 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -24,8 +24,6 @@ #include "log_event.h" #include -extern Table_filter *rpl_filter; - #define SLAVE_LIST_CHUNK 128 #define SLAVE_ERRMSG_SIZE (FN_REFLEN+64) diff --git a/sql/slave.cc b/sql/slave.cc index fdac2aa5dcc..618dcfeb5af 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -28,8 +28,6 @@ #include #include -extern Table_filter *rpl_filter; - bool use_slave_mask = 0; MY_BITMAP slave_error_mask; diff --git a/sql/slave.h b/sql/slave.h index de28643a0f1..12a90355237 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -21,10 +21,14 @@ #include "mysql.h" #include "my_list.h" +#include "table_filter.h" + #define SLAVE_NET_TIMEOUT 3600 #define MAX_SLAVE_ERRMSG 1024 #define MAX_SLAVE_ERROR 2000 +extern Table_filter *rpl_filter; + /***************************************************************************** MySQL Replication diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index d7be45ed59c..4a7642b0304 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -27,10 +27,6 @@ #include "mysql_priv.h" #include "hash_filo.h" -#ifdef HAVE_REPLICATION -#include "table_filter.h" //for tables_ok() -extern Table_filter *rpl_filter; -#endif #include #include #include "sp_head.h" diff --git a/sql/sql_acl.h b/sql/sql_acl.h index 57f8009dc3e..465f88ca760 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -14,6 +14,9 @@ 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 +extern Table_filter *rpl_filter; + #define SELECT_ACL (1L << 0) #define INSERT_ACL (1L << 1) #define UPDATE_ACL (1L << 2) diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index bc08a5886d0..de156521193 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -22,8 +22,6 @@ #include #include -extern Table_filter *rpl_filter; - #ifdef HAVE_INNOBASE_DB #include "ha_innodb.h" #endif diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 84590d5ed4d..ca1c50f95d7 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -22,8 +22,6 @@ #include "table_filter.h" #include -extern Table_filter *binlog_filter; - int max_binlog_dump_events = 0; // unlimited my_bool opt_sporadic_binlog_dump_fail = 0; static int binlog_dump_count = 0; diff --git a/sql/sql_repl.h b/sql/sql_repl.h index a13c1076b2c..363e36c55a4 100644 --- a/sql/sql_repl.h +++ b/sql/sql_repl.h @@ -17,6 +17,9 @@ #ifdef HAVE_REPLICATION #include "slave.h" +extern Table_filter *binlog_filter; +extern Table_filter *rpl_filter; + typedef struct st_slave_info { uint32 server_id; diff --git a/sql/table_filter.cc b/sql/table_filter.cc index ba4531fe19c..51b10f13cfc 100644 --- a/sql/table_filter.cc +++ b/sql/table_filter.cc @@ -20,18 +20,13 @@ #define TABLE_RULE_HASH_SIZE 16 #define TABLE_RULE_ARR_SIZE 16 -Table_filter::Table_filter() +Table_filter::Table_filter() : + table_rules_on(0), do_table_inited(0), ignore_table_inited(0), + wild_do_table_inited(0), wild_ignore_table_inited(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(); - - table_rules_on= 0; } @@ -324,8 +319,8 @@ Table_filter::add_table_rule(HASH* h, const char* table_spec) 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; + + return my_hash_insert(h, (byte*)e); } @@ -367,16 +362,20 @@ Table_filter::add_ignore_db(const char* table_spec) } -static byte* get_table_key(TABLE_RULE_ENT* e, uint* len, - my_bool not_used __attribute__((unused))) +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(TABLE_RULE_ENT* e) +static void free_table_ent(void* a) { + TABLE_RULE_ENT *e= (TABLE_RULE_ENT *) a; + my_free((gptr) e, MYF(0)); } @@ -385,8 +384,7 @@ void Table_filter::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); + get_table_key, free_table_ent, 0); *h_inited = 1; } @@ -517,7 +515,7 @@ Table_filter::get_rewrite_db(const char* db, uint32 *new_len) { if (!strcmp(tmp->key, db)) { - *new_len= (uint32)strlen(tmp->val); + *new_len= strlen(tmp->val); return tmp->val; } } diff --git a/sql/table_filter.h b/sql/table_filter.h index 684cf38fbd7..471ab8c366e 100644 --- a/sql/table_filter.h +++ b/sql/table_filter.h @@ -39,7 +39,9 @@ class Table_filter public: Table_filter(); ~Table_filter(); - + Table_filter(Table_filter const&); + Table_filter& operator=(Table_filter const&); + /* Checks - returns true if ok to replicate/log */ bool tables_ok(const char* db, TABLE_LIST* tables); From 39eceb9a1bdb022103f4edddeb1de99dc7a7a6a7 Mon Sep 17 00:00:00 2001 From: "tomas@poseidon.ndb.mysql.com" <> Date: Thu, 17 Mar 2005 16:52:53 +0100 Subject: [PATCH 09/51] mysqld.cc: changed mysqld.cc to the same as in 5.0 --- sql/mysqld.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 2f18b7c99fe..6747b79703b 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4463,9 +4463,11 @@ Disable with --skip-innodb (will save memory).", {"innodb_checksums", OPT_INNODB_CHECKSUMS, "Enable InnoDB checksums validation (enabled by default). \ Disable with --skip-innodb-checksums.", (gptr*) &innobase_use_checksums, (gptr*) &innobase_use_checksums, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, +#endif {"innodb_data_file_path", OPT_INNODB_DATA_FILE_PATH, "Path to individual files and their sizes.", 0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, +#ifdef HAVE_INNOBASE_DB {"innodb_data_home_dir", OPT_INNODB_DATA_HOME_DIR, "The common part for InnoDB table spaces.", (gptr*) &innobase_data_home_dir, (gptr*) &innobase_data_home_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, From f1ce374acca75941632d5ae8e9c95a2a627776a5 Mon Sep 17 00:00:00 2001 From: "lars@mysql.com" <> Date: Mon, 21 Mar 2005 17:53:48 +0100 Subject: [PATCH 10/51] Correction of a bad manual merge --- scripts/mysql_fix_privilege_tables.sql | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/scripts/mysql_fix_privilege_tables.sql b/scripts/mysql_fix_privilege_tables.sql index 0f914d91713..ecf437ebdc6 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. @@ -131,26 +131,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 -<<<<<<< gca scripts/mysql_fix_privilege_tables.sql 1.9.1.14 ADD Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL, ADD Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL; -<<<<<<< local scripts/mysql_fix_privilege_tables.sql 1.12 -ADD Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL, -ADD Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL; - -# -# Create VIEWs privrlages (v5.1) -# -ALTER TABLE db ADD Create_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Lock_tables_priv; -ALTER TABLE host ADD Create_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Lock_tables_priv; -ALTER TABLE user ADD Create_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Repl_client_priv; - -# -# Show VIEWs privrlages (v5.1) -# -ALTER TABLE db ADD Show_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Create_view_priv; -ALTER TABLE host ADD Show_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Create_view_priv; -ALTER TABLE user ADD Show_view_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Create_view_priv; alter table user change max_questions max_questions int(11) unsigned DEFAULT 0 NOT NULL; alter table tables_priv add KEY Grantor (Grantor); From c6d85289abd9589d6400cfa22b0ecf3ffce0b1db Mon Sep 17 00:00:00 2001 From: "lars@mysql.com" <> Date: Mon, 21 Mar 2005 22:09:42 +0100 Subject: [PATCH 11/51] WL#2472: Renamed Table_filter to Rpl_filter Eliminated very annoying memory leak --- sql/Makefile.am | 11 ++-- sql/log.cc | 2 +- sql/log_event.cc | 2 +- sql/mysqld.cc | 15 +++--- sql/repl_failsafe.cc | 2 +- sql/{table_filter.cc => rpl_filter.cc} | 74 +++++++++++++------------- sql/{table_filter.h => rpl_filter.h} | 16 +++--- sql/slave.cc | 2 +- sql/slave.h | 4 +- sql/sql_acl.h | 2 +- sql/sql_parse.cc | 2 +- sql/sql_repl.cc | 2 +- sql/sql_repl.h | 4 +- 13 files changed, 70 insertions(+), 68 deletions(-) rename sql/{table_filter.cc => rpl_filter.cc} (86%) rename sql/{table_filter.h => rpl_filter.h} (93%) diff --git a/sql/Makefile.am b/sql/Makefile.am index 152957da1e4..802006e7462 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -55,10 +55,10 @@ 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 \ - table_filter.h tztime.h \ + spatial.h gstream.h client_settings.h tzfile.h + tztime.h \ sp_head.h sp_pcontext.h sp_rcontext.h sp.h sp_cache.h \ parse_file.h sql_view.h sql_trigger.h \ examples/ha_example.h examples/ha_archive.h \ @@ -90,12 +90,13 @@ 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 \ gstream.cc spatial.cc sql_help.cc protocol_cursor.cc \ - table_filter.cc tztime.cc my_time.c \ + tztime.cc my_time.c \ sp_head.cc sp_pcontext.cc sp_rcontext.cc sp.cc \ sp_cache.cc parse_file.cc sql_trigger.cc \ examples/ha_example.cc examples/ha_archive.cc \ diff --git a/sql/log.cc b/sql/log.cc index c0f508adfe7..55307ea8523 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -24,7 +24,7 @@ #include "mysql_priv.h" #include "sql_repl.h" -#include "table_filter.h" +#include "rpl_filter.h" #include "ha_innodb.h" // necessary to cut the binlog when crash recovery #include diff --git a/sql/log_event.cc b/sql/log_event.cc index bc9501a8292..9dd7e1e2f58 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -21,7 +21,7 @@ #endif #include "mysql_priv.h" #include "slave.h" -#include "table_filter.h" +#include "rpl_filter.h" #include #endif /* MYSQL_CLIENT */ diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 942fce711d4..5ec529f82fc 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -19,7 +19,7 @@ #include #include "slave.h" #include "sql_repl.h" -#include "table_filter.h" +#include "rpl_filter.h" #include "repl_failsafe.h" #include "stacktrace.h" #include "mysqld_suffix.h" @@ -385,8 +385,8 @@ FILE *bootstrap_file; I_List threads,thread_cache; I_List key_caches; -Table_filter* rpl_filter; -Table_filter* binlog_filter; +Rpl_filter* rpl_filter; +Rpl_filter* binlog_filter; struct system_variables global_system_variables; struct system_variables max_system_variables; @@ -994,6 +994,8 @@ void clean_up(bool print_message) #ifdef HAVE_REPLICATION end_slave_list(); #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)); @@ -2963,8 +2965,8 @@ int main(int argc, char **argv) { DEBUGGER_OFF; - rpl_filter= new Table_filter; - binlog_filter= new Table_filter; + rpl_filter= new Rpl_filter; + binlog_filter= new Rpl_filter; if (!rpl_filter || !binlog_filter) { sql_perror("Could not allocate replication and binlog filters"); @@ -3215,9 +3217,6 @@ we force server id to 2, but this MySQL server will not act as a slave."); clean_up_mutexes(); my_end(opt_endinfo ? MY_CHECK_ERROR | MY_GIVE_INFO : 0); - delete rpl_filter; - delete binlog_filter; - exit(0); return(0); /* purecov: deadcode */ } diff --git a/sql/repl_failsafe.cc b/sql/repl_failsafe.cc index f9eb0bde1e7..ec4682e37b5 100644 --- a/sql/repl_failsafe.cc +++ b/sql/repl_failsafe.cc @@ -20,7 +20,7 @@ #include "repl_failsafe.h" #include "sql_repl.h" #include "slave.h" -#include "table_filter.h" +#include "rpl_filter.h" #include "log_event.h" #include diff --git a/sql/table_filter.cc b/sql/rpl_filter.cc similarity index 86% rename from sql/table_filter.cc rename to sql/rpl_filter.cc index 51b10f13cfc..f9f8a3e98a7 100644 --- a/sql/table_filter.cc +++ b/sql/rpl_filter.cc @@ -15,12 +15,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "mysql_priv.h" -#include "table_filter.h" +#include "rpl_filter.h" #define TABLE_RULE_HASH_SIZE 16 #define TABLE_RULE_ARR_SIZE 16 -Table_filter::Table_filter() : +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) { @@ -30,7 +30,7 @@ Table_filter::Table_filter() : } -Table_filter::~Table_filter() +Rpl_filter::~Rpl_filter() { if (do_table_inited) hash_free(&do_table); @@ -85,10 +85,10 @@ Table_filter::~Table_filter() */ bool -Table_filter::tables_ok(const char* db, TABLE_LIST* tables) +Rpl_filter::tables_ok(const char* db, TABLE_LIST* tables) { bool some_tables_updating= 0; - DBUG_ENTER("Table_filter::tables_ok"); + DBUG_ENTER("Rpl_filter::tables_ok"); for (; tables; tables= tables->next_global) { @@ -144,9 +144,9 @@ Table_filter::tables_ok(const char* db, TABLE_LIST* tables) */ bool -Table_filter::db_ok(const char* db) +Rpl_filter::db_ok(const char* db) { - DBUG_ENTER("Table_filter::db_ok"); + 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 @@ -216,9 +216,9 @@ Table_filter::db_ok(const char* db) */ bool -Table_filter::db_ok_with_wild_table(const char *db) +Rpl_filter::db_ok_with_wild_table(const char *db) { - DBUG_ENTER("Table_filter::db_ok_with_wild_table"); + DBUG_ENTER("Rpl_filter::db_ok_with_wild_table"); char hash_key[NAME_LEN+2]; char *end; @@ -247,16 +247,16 @@ Table_filter::db_ok_with_wild_table(const char *db) bool -Table_filter::is_on() +Rpl_filter::is_on() { return table_rules_on; } int -Table_filter::add_do_table(const char* table_spec) +Rpl_filter::add_do_table(const char* table_spec) { - DBUG_ENTER("Table_filter::add_do_table"); + DBUG_ENTER("Rpl_filter::add_do_table"); if (!do_table_inited) init_table_rule_hash(&do_table, &do_table_inited); table_rules_on= 1; @@ -265,9 +265,9 @@ Table_filter::add_do_table(const char* table_spec) int -Table_filter::add_ignore_table(const char* table_spec) +Rpl_filter::add_ignore_table(const char* table_spec) { - DBUG_ENTER("Table_filter::add_ignore_table"); + DBUG_ENTER("Rpl_filter::add_ignore_table"); if (!ignore_table_inited) init_table_rule_hash(&ignore_table, &ignore_table_inited); table_rules_on= 1; @@ -276,9 +276,9 @@ Table_filter::add_ignore_table(const char* table_spec) int -Table_filter::add_wild_do_table(const char* table_spec) +Rpl_filter::add_wild_do_table(const char* table_spec) { - DBUG_ENTER("Table_filter::add_wild_do_table"); + 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; @@ -287,9 +287,9 @@ Table_filter::add_wild_do_table(const char* table_spec) int -Table_filter::add_wild_ignore_table(const char* table_spec) +Rpl_filter::add_wild_ignore_table(const char* table_spec) { - DBUG_ENTER("Table_filter::add_wild_ignore_table"); + 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; @@ -298,7 +298,7 @@ Table_filter::add_wild_ignore_table(const char* table_spec) void -Table_filter::add_db_rewrite(const char* from_db, const char* to_db) +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); @@ -306,7 +306,7 @@ Table_filter::add_db_rewrite(const char* from_db, const char* to_db) int -Table_filter::add_table_rule(HASH* h, const char* table_spec) +Rpl_filter::add_table_rule(HASH* h, const char* table_spec) { const char* dot = strchr(table_spec, '.'); if (!dot) return 1; @@ -329,7 +329,7 @@ Table_filter::add_table_rule(HASH* h, const char* table_spec) */ int -Table_filter::add_wild_table_rule(DYNAMIC_ARRAY* a, const char* table_spec) +Rpl_filter::add_wild_table_rule(DYNAMIC_ARRAY* a, const char* table_spec) { const char* dot = strchr(table_spec, '.'); if (!dot) return 1; @@ -347,16 +347,18 @@ Table_filter::add_wild_table_rule(DYNAMIC_ARRAY* a, const char* table_spec) void -Table_filter::add_do_db(const char* table_spec) +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 -Table_filter::add_ignore_db(const char* table_spec) +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); } @@ -381,7 +383,7 @@ static void free_table_ent(void* a) void -Table_filter::init_table_rule_hash(HASH* h, bool* h_inited) +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); @@ -390,7 +392,7 @@ Table_filter::init_table_rule_hash(HASH* h, bool* h_inited) void -Table_filter::init_table_rule_array(DYNAMIC_ARRAY* a, bool* a_inited) +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); @@ -399,7 +401,7 @@ Table_filter::init_table_rule_array(DYNAMIC_ARRAY* a, bool* a_inited) TABLE_RULE_ENT* -Table_filter::find_wild(DYNAMIC_ARRAY *a, const char* key, int len) +Rpl_filter::find_wild(DYNAMIC_ARRAY *a, const char* key, int len) { uint i; const char* key_end= key + len; @@ -420,7 +422,7 @@ Table_filter::find_wild(DYNAMIC_ARRAY *a, const char* key, int len) void -Table_filter::free_string_array(DYNAMIC_ARRAY *a) +Rpl_filter::free_string_array(DYNAMIC_ARRAY *a) { uint i; for (i= 0; i < a->elements; i++) @@ -447,7 +449,7 @@ Table_filter::free_string_array(DYNAMIC_ARRAY *a) */ void -Table_filter::table_rule_ent_hash_to_str(String* s, HASH* h) +Rpl_filter::table_rule_ent_hash_to_str(String* s, HASH* h) { s->length(0); for (uint i= 0; i < h->records; i++) @@ -461,7 +463,7 @@ Table_filter::table_rule_ent_hash_to_str(String* s, HASH* h) void -Table_filter::table_rule_ent_dynamic_array_to_str(String* s, DYNAMIC_ARRAY* a) +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++) @@ -476,35 +478,35 @@ Table_filter::table_rule_ent_dynamic_array_to_str(String* s, DYNAMIC_ARRAY* a) void -Table_filter::get_do_table(String* str) +Rpl_filter::get_do_table(String* str) { table_rule_ent_hash_to_str(str, &do_table); } void -Table_filter::get_ignore_table(String* str) +Rpl_filter::get_ignore_table(String* str) { table_rule_ent_hash_to_str(str, &ignore_table); } void -Table_filter::get_wild_do_table(String* str) +Rpl_filter::get_wild_do_table(String* str) { table_rule_ent_dynamic_array_to_str(str, &wild_do_table); } void -Table_filter::get_wild_ignore_table(String* str) +Rpl_filter::get_wild_ignore_table(String* str) { table_rule_ent_dynamic_array_to_str(str, &wild_ignore_table); } const char* -Table_filter::get_rewrite_db(const char* db, uint32 *new_len) +Rpl_filter::get_rewrite_db(const char* db, uint32 *new_len) { if (rewrite_db.is_empty() || !db) return db; @@ -524,14 +526,14 @@ Table_filter::get_rewrite_db(const char* db, uint32 *new_len) I_List* -Table_filter::get_do_db() +Rpl_filter::get_do_db() { return &do_db; } I_List* -Table_filter::get_ignore_db() +Rpl_filter::get_ignore_db() { return &ignore_db; } diff --git a/sql/table_filter.h b/sql/rpl_filter.h similarity index 93% rename from sql/table_filter.h rename to sql/rpl_filter.h index 471ab8c366e..70bb137790e 100644 --- a/sql/table_filter.h +++ b/sql/rpl_filter.h @@ -14,8 +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 */ -#ifndef __TABLE_FILTER_H__ -#define __TABLE_FILTER_H__ +#ifndef __RPL_FILTER_H__ +#define __RPL_FILTER_H__ #include "mysql.h" #include "my_list.h" @@ -28,19 +28,19 @@ typedef struct st_table_rule_ent } TABLE_RULE_ENT; /* - Table_filter + Rpl_filter Inclusion and exclusion rules of tables and databases. Also handles rewrites of db. Used for replication and binlogging. */ -class Table_filter +class Rpl_filter { public: - Table_filter(); - ~Table_filter(); - Table_filter(Table_filter const&); - Table_filter& operator=(Table_filter const&); + Rpl_filter(); + ~Rpl_filter(); + Rpl_filter(Rpl_filter const&); + Rpl_filter& operator=(Rpl_filter const&); /* Checks - returns true if ok to replicate/log */ diff --git a/sql/slave.cc b/sql/slave.cc index 618dcfeb5af..4f9533108af 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -22,7 +22,7 @@ #include #include "slave.h" #include "sql_repl.h" -#include "table_filter.h" +#include "rpl_filter.h" #include "repl_failsafe.h" #include #include diff --git a/sql/slave.h b/sql/slave.h index 12a90355237..9be5a1144f6 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -21,13 +21,13 @@ #include "mysql.h" #include "my_list.h" -#include "table_filter.h" +#include "rpl_filter.h" #define SLAVE_NET_TIMEOUT 3600 #define MAX_SLAVE_ERRMSG 1024 #define MAX_SLAVE_ERROR 2000 -extern Table_filter *rpl_filter; +extern Rpl_filter *rpl_filter; /***************************************************************************** diff --git a/sql/sql_acl.h b/sql/sql_acl.h index 465f88ca760..c0fc1c333a1 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -15,7 +15,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "slave.h" // for tables_ok(), rpl_filter -extern Table_filter *rpl_filter; +extern Rpl_filter *rpl_filter; #define SELECT_ACL (1L << 0) #define INSERT_ACL (1L << 1) diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index de156521193..509bf130fcb 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -16,7 +16,7 @@ #include "mysql_priv.h" #include "sql_repl.h" -#include "table_filter.h" +#include "rpl_filter.h" #include "repl_failsafe.h" #include #include diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index ca1c50f95d7..4fda18284da 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -19,7 +19,7 @@ #include "sql_repl.h" #include "log_event.h" -#include "table_filter.h" +#include "rpl_filter.h" #include int max_binlog_dump_events = 0; // unlimited diff --git a/sql/sql_repl.h b/sql/sql_repl.h index 363e36c55a4..447e470ff1c 100644 --- a/sql/sql_repl.h +++ b/sql/sql_repl.h @@ -17,8 +17,8 @@ #ifdef HAVE_REPLICATION #include "slave.h" -extern Table_filter *binlog_filter; -extern Table_filter *rpl_filter; +extern Rpl_filter *binlog_filter; +extern Rpl_filter *rpl_filter; typedef struct st_slave_info { From 7428dde19a2fc4facb5dc1e2b644a5d9915518c3 Mon Sep 17 00:00:00 2001 From: "lars@mysql.com" <> Date: Tue, 22 Mar 2005 10:19:24 +0100 Subject: [PATCH 12/51] WL#2472: Fixes according to review --- sql/rpl_filter.h | 9 ++++++--- sql/slave.h | 2 -- sql/sql_acl.h | 1 - sql/sql_repl.h | 3 --- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/sql/rpl_filter.h b/sql/rpl_filter.h index 70bb137790e..cfcb3b43607 100644 --- a/sql/rpl_filter.h +++ b/sql/rpl_filter.h @@ -14,8 +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 */ -#ifndef __RPL_FILTER_H__ -#define __RPL_FILTER_H__ +#ifndef RPL_FILTER_H +#define RPL_FILTER_H #include "mysql.h" #include "my_list.h" @@ -107,4 +107,7 @@ private: I_List rewrite_db; }; -#endif // __TABLE_FILTER_H__ +extern Rpl_filter *rpl_filter; +extern Rpl_filter *binlog_filter; + +#endif // RPL_FILTER_H diff --git a/sql/slave.h b/sql/slave.h index a29315f7ae4..61cd5490b90 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -27,8 +27,6 @@ #define MAX_SLAVE_ERRMSG 1024 #define MAX_SLAVE_ERROR 2000 -extern Rpl_filter *rpl_filter; - /***************************************************************************** MySQL Replication diff --git a/sql/sql_acl.h b/sql/sql_acl.h index 21f14fc3045..7833e9ea9bb 100644 --- a/sql/sql_acl.h +++ b/sql/sql_acl.h @@ -15,7 +15,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "slave.h" // for tables_ok(), rpl_filter -extern Rpl_filter *rpl_filter; #define SELECT_ACL (1L << 0) #define INSERT_ACL (1L << 1) diff --git a/sql/sql_repl.h b/sql/sql_repl.h index eec85826da4..ba64e626adc 100644 --- a/sql/sql_repl.h +++ b/sql/sql_repl.h @@ -17,9 +17,6 @@ #ifdef HAVE_REPLICATION #include "slave.h" -extern Rpl_filter *binlog_filter; -extern Rpl_filter *rpl_filter; - typedef struct st_slave_info { uint32 server_id; From 439a604efa720f5d1aafd36f05ad915730c85f9e Mon Sep 17 00:00:00 2001 From: "lars@mysql.com" <> Date: Fri, 1 Apr 2005 01:33:04 +0200 Subject: [PATCH 13/51] Fix of build failure of library --- libmysqld/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 57a235730be..c77d9459ff3 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 libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) $(sqlexamplessources) libmysqld_a_SOURCES= From 6483a71e82a06f857e702d9593aa9ad13cc94b85 Mon Sep 17 00:00:00 2001 From: "monty@mysql.com" <> Date: Wed, 6 Apr 2005 15:52:32 +0300 Subject: [PATCH 14/51] Fixed that create_time is set properly for cached threads --- sql/mysqld.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/sql/mysqld.cc b/sql/mysqld.cc index d75efbd0b00..c76ccf5daf7 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1488,6 +1488,7 @@ void end_thread(THD *thd, bool put_in_cache) thd=thread_cache.get(); thd->real_id=pthread_self(); (void) thd->store_globals(); + thd->thr_create_time= time(NULL); threads.append(thd); pthread_mutex_unlock(&LOCK_thread_count); DBUG_VOID_RETURN; From 174c15aee1576113c2f778d6119ce9b2e4dcdc41 Mon Sep 17 00:00:00 2001 From: "monty@mysql.com" <> Date: Wed, 6 Apr 2005 16:52:41 +0300 Subject: [PATCH 15/51] Small fixes done while reviewing pushed code --- mysql-test/r/innodb-replace.result | 1 + mysql-test/t/innodb-replace.test | 4 ++++ sql/share/english/errmsg.txt | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/innodb-replace.result b/mysql-test/r/innodb-replace.result index a27806640ad..b7edcc49e56 100644 --- a/mysql-test/r/innodb-replace.result +++ b/mysql-test/r/innodb-replace.result @@ -1,3 +1,4 @@ +drop table if exists t1; create table t1 (c1 char(5) unique not null, c2 int, stamp timestamp) engine=innodb; select * from t1; c1 c2 stamp diff --git a/mysql-test/t/innodb-replace.test b/mysql-test/t/innodb-replace.test index e7e96da1443..516f058a68e 100644 --- a/mysql-test/t/innodb-replace.test +++ b/mysql-test/t/innodb-replace.test @@ -2,6 +2,10 @@ # embedded server ignores 'delayed', so skip this -- source include/not_embedded.inc +--disable_warnings +drop table if exists t1; +--enable_warnings + # # Bug #1078 # diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt index 3bfc83a4b41..1ae4e79bf01 100644 --- a/sql/share/english/errmsg.txt +++ b/sql/share/english/errmsg.txt @@ -67,7 +67,7 @@ character-set=latin1 "Column '%-.64s' cannot be null", "Unknown database '%-.64s'", "Table '%-.64s' already exists", -"Unknown table '%-.180s'", +"Unknown table '%-.100s'", "Column '%-.64s' in %-.64s is ambiguous", "Server shutdown in progress", "Unknown column '%-.64s' in '%-.64s'", From 9fbdd4e03fe36da1a9948d5961b8d8d9f42f80a8 Mon Sep 17 00:00:00 2001 From: "sergefp@mysql.com" <> Date: Mon, 18 Apr 2005 07:26:23 +0400 Subject: [PATCH 16/51] Fix for BUG#9298: Make int->string conversion sign-aware in Protocol_simple::store_long --- mysql-test/r/group_by.result | 9 +++++++++ mysql-test/t/group_by.test | 7 +++++++ sql/protocol.cc | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result index a8766907fa5..b0c00a51722 100644 --- a/mysql-test/r/group_by.result +++ b/mysql-test/r/group_by.result @@ -702,3 +702,12 @@ c val-74 val-98 drop table t1,t2; +create table t1 (b int4 unsigned not null); +insert into t1 values(3000000000); +select * from t1; +b +3000000000 +select min(b) from t1; +min(b) +3000000000 +drop table t1; diff --git a/mysql-test/t/group_by.test b/mysql-test/t/group_by.test index 46e58cd00fd..fbd39019e6d 100644 --- a/mysql-test/t/group_by.test +++ b/mysql-test/t/group_by.test @@ -515,3 +515,10 @@ explain select c from t2 where a = 2 and b = 'val-2' group by c; select c from t2 where a = 2 and b = 'val-2' group by c; drop table t1,t2; +# Test for BUG#9298 "Wrong handling of int4 unsigned columns in GROUP functions" +# (the actual problem was with protocol code, not GROUP BY) +create table t1 (b int4 unsigned not null); +insert into t1 values(3000000000); +select * from t1; +select min(b) from t1; +drop table t1; diff --git a/sql/protocol.cc b/sql/protocol.cc index 773bbe697a3..485605ce8cd 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -810,7 +810,7 @@ bool Protocol_simple::store_long(longlong from) #endif char buff[20]; return net_store_data((char*) buff, - (uint) (int10_to_str((int) from,buff, -10)-buff)); + (uint) (int10_to_str((int)from,buff, (from <0)?-10:10)-buff)); } From ea347e5b0610a812f259e555ae10293090a0f4bc Mon Sep 17 00:00:00 2001 From: "sergefp@mysql.com" <> Date: Mon, 25 Apr 2005 04:00:35 +0400 Subject: [PATCH 17/51] Fix for BUG#8921: Make SHOW CREATE VIEW ignore temporary tables. --- mysql-test/r/temp_table.result | 26 ++++++++++++++++++++++++++ mysql-test/t/temp_table.test | 15 +++++++++++++++ sql/sql_parse.cc | 4 ++++ 3 files changed, 45 insertions(+) diff --git a/mysql-test/r/temp_table.result b/mysql-test/r/temp_table.result index 2dd58f54327..f43fd09982a 100644 --- a/mysql-test/r/temp_table.result +++ b/mysql-test/r/temp_table.result @@ -97,3 +97,29 @@ Variable_name Value Created_tmp_disk_tables 0 Created_tmp_tables 2 drop table t1; +create temporary table t1 as select 'This is temp. table' A; +create view t1 as select 'This is view' A; +select * from t1; +A +This is temp. table +show create table t1; +Table Create Table +t1 CREATE TEMPORARY TABLE `t1` ( + `A` varchar(19) NOT NULL default '' +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +show create view t1; +View Create View +t1 CREATE ALGORITHM=UNDEFINED VIEW `test`.`t1` AS select _latin1'This is view' AS `A` +drop view t1; +select * from t1; +A +This is temp. table +create view t1 as select 'This is view again' A; +select * from t1; +A +This is temp. table +drop table t1; +select * from t1; +A +This is view again +drop view t1; diff --git a/mysql-test/t/temp_table.test b/mysql-test/t/temp_table.test index 74276c7668c..eeb33515570 100644 --- a/mysql-test/t/temp_table.test +++ b/mysql-test/t/temp_table.test @@ -89,3 +89,18 @@ flush status; select * from t1 group by d; show status like "created_tmp%tables"; drop table t1; + +# Fix for BUG#8921: Check that temporary table is ingored by view commands. +create temporary table t1 as select 'This is temp. table' A; +create view t1 as select 'This is view' A; +select * from t1; +show create table t1; +show create view t1; +drop view t1; +select * from t1; +create view t1 as select 'This is view again' A; +select * from t1; +drop table t1; +select * from t1; +drop view t1; + diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index c5ef9f4e713..6453c726ee0 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3010,6 +3010,10 @@ unsent_create_error: goto error; #else { + /* Ignore temporary tables if this is "SHOW CREATE VIEW" */ + if (lex->only_view) + first_table->skip_temporary= 1; + if (check_db_used(thd, all_tables) || check_access(thd, SELECT_ACL | EXTRA_ACL, first_table->db, &first_table->grant.privilege, 0, 0)) From 2ac4cf518703b35ac06da5698e90556a534fd9d8 Mon Sep 17 00:00:00 2001 From: "tulin@mysql.com" <> Date: Tue, 26 Apr 2005 12:20:21 +0200 Subject: [PATCH 18/51] bitvector.h: new file --- sql/bitvector.h | 254 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 254 insertions(+) create mode 100644 sql/bitvector.h diff --git a/sql/bitvector.h b/sql/bitvector.h new file mode 100644 index 00000000000..9c3229df482 --- /dev/null +++ b/sql/bitvector.h @@ -0,0 +1,254 @@ +/* -*- Mode: C++ -*- + + 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 BITVECTOR_H +#define BITVECTOR_H + +#include +#include +#include +#include + +/* Some compile-time checks to ensure the integrity of the implementation. */ +#if CHAR_BIT != 8 +# error "This implementation is designed for 8-bit bytes!" +#endif + +#ifndef __cplusplus +# error "This is not a C header file, it's a C++ header file" +#endif + +namespace +{ + /* Defining my own swap, since we cannot use std::swap() */ + template + inline void my_swap(T& x, T& y) + { + T t(x); x= y; y= t; + } +} + +/* + A run-time sized bitvector for storing bits. + + + CAVEAT + + This class is not designed to be inherited from, please don't do that. + + Right now, the vector cannot change size. It's only used as a replacement + for using an array of bytes and a counter. If you want to change the size + of the vector, construct a new bitvector and assign it to the vector, + e.g.: + + bitvector new_bv(new_size); + old_bv= new_bv; + + An alternative is to use the swap member function to replace the instance: + + bitvector new_bv(new_size); + old_bv.swap(new_bv); + + The latter may be more efficient on compilers that are not so good at + inlining code. +*/ + +class bitvector +{ +private: + /* Helper classes */ + struct flip_bit_op + { + void operator()(byte* p, byte m) { *p^= m; } + }; + + struct set_bit_op + { + void operator()(byte* p, byte m) { *p|= m; } + }; + + struct clear_bit_op + { + void operator()(byte* p, byte m) { *p&= ~m; } + }; + + struct test_bit_op + { + bool operator()(byte* p, byte m) { return *p & m; } + }; + + /* Compute the number of bytes required to store 'bits' bits in an array. */ + static inline size_t byte_size(size_t bits) + { + int const byte_bits = sizeof(byte) * CHAR_BIT; + return (bits + (byte_bits-1)) / byte_bits; + } + + /* Tidy the last byte (by clearing the unused bits) of the bitvector to make + * comparison easy. This code is assuming that we're working with 8-bit + * bytes. + */ + void tidy_last_byte() + { + byte* const last_byte= m_data + bytes() - 1; + + /* Get the number of used bits (1..8) in the last byte */ + unsigned int const used= 1U + ((size()-1U) & 0x7U); + + /* Create a mask with the upper 'unused' bits clear and the lower 'used' + * bits set. The bits within each byte is stored in big-endian order. + */ + unsigned int const mask= ((1 << used) - 1); + + /* Mask the last byte */ + *last_byte&= mask; + } + + template + inline ReturnType apply_to_byte(size_t const pos, Func op) const + { + /* Here I'm assuming that we're working with 8-bit bytes. */ + ptrdiff_t const byte_pos= pos >> 3; + byte const mask= (1 << (pos & 0x7U)); + return op(&m_data[byte_pos], mask); + } + +public: + bitvector() + : m_size(0), m_data(0) + { + } + + explicit bitvector(size_t size, bool value= false) + : m_size(size), m_data(my_malloc(byte_size(size), MYF(0))) + { + if (value) + set_all(); + else + clear_all(); + } + + /* Constructor to create a bitvector from data. Observe that 'size' is the + * number of *bits* in the bitvector. + */ + explicit bitvector(byte const* data, size_t size) + : m_size(size), m_data(my_malloc(byte_size(size), MYF(0))) + { + /* std::copy(data, data + byte_size(size), m_data); */ + memcpy(m_data, data, byte_size(size)); + tidy_last_byte(); + } + + bitvector(bitvector const& other) + : m_size(other.size()), m_data(my_malloc(other.bytes(), MYF(0))) + { + /* std::copy(other.m_data, other.m_data + other.bytes(), m_data); */ + memcpy(m_data, other.data(), other.bytes()); + tidy_last_byte(); /* Just a precaution */ + } + + /* Assignment operator */ + bitvector& operator=(bitvector other) + { + swap(other); + return *this; + } + + ~bitvector() + { + if (m_data) + my_free(m_data, MYF(0)); + } + + /* Swap the guts of this instance with another instance. */ + void swap(bitvector& other) + { + my_swap(m_size, other.m_size); + my_swap(m_data, other.m_data); + } + + /* A pointer to the bytes representing the bits */ + byte const *data() const { return m_data; } + + /* The size of the data in *bytes* */ + size_t bytes() const { return byte_size(m_size); } + + /* The number of bits in the bit vector */ + size_t size() const { return m_size; } + + /* Set all bits in the vector */ + void set_all() + { + /* std::fill_n(m_data, bytes(), 255); */ + memset(m_data, 255, bytes()); + tidy_last_byte(); + } + + /* Set a bit to a value */ + void set_bit(size_t pos) + { + apply_to_byte(pos, set_bit_op()); + } + + /* Reset (clear) all bits in the vector */ + void clear_all() + { + /* std::fill_n(m_data, bytes(), 0); */ + memset(m_data, 0, bytes()); + tidy_last_byte(); + } + + /* Reset one bit in the vector */ + void clear_bit(size_t pos) + { + apply_to_byte(pos, clear_bit_op()); + } + + void flip_bit(size_t pos) + { + apply_to_byte(pos, flip_bit_op()); + } + + bool get_bit(size_t pos) const + { + return apply_to_byte(pos, test_bit_op()); + }; + + bool operator==(bitvector const& rhs) const + { + if (size() != rhs.size()) + return false; + /* This works since I have ensured that the last byte of the array contain + * sensible data. + */ + if (memcmp(data(), rhs.data(), bytes()) != 0) + return false; + return true; + } + + bool operator!=(bitvector const& rhs) const + { + return !(*this == rhs); + } + +private: + size_t m_size; + byte *m_data; +}; + +#endif /* BITVECTOR_H */ From 972f86f1ee36c391a3de90a03513d7b65b8b4b42 Mon Sep 17 00:00:00 2001 From: "monty@mysql.com" <> Date: Tue, 26 Apr 2005 23:24:59 +0300 Subject: [PATCH 19/51] Cleanups during review --- mysys/default.c | 62 ++++++++++++++++++++++++++--------------------- sql/sql_insert.cc | 4 +-- sql/sql_select.cc | 12 +++++---- 3 files changed, 44 insertions(+), 34 deletions(-) diff --git a/mysys/default.c b/mysys/default.c index 63323f15fd5..4ee2041bc39 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -402,33 +402,48 @@ static int search_default_file_with_ext(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, continue; /* Configuration File Directives */ - if ((*ptr == '!') && (recursion_level < max_recursion_level)) + if ((*ptr == '!')) { + if (recursion_level >= max_recursion_level) + { + for (end= ptr + strlen(ptr) - 1; + my_isspace(&my_charset_latin1, *(end - 1)); + end--) + {} + end[0]= 0; + fprintf(stderr, + "Warning: skipping '%s' directive as maximum include" + "recursion level was reached in file %s at line %d\n", + ptr, name, line); + continue; + } + /* skip over `!' and following whitespace */ for (++ptr; my_isspace(&my_charset_latin1, ptr[0]); ptr++) {} - if ((!strncmp(ptr, includedir_keyword, sizeof(includedir_keyword) - 1)) - && my_isspace(&my_charset_latin1, ptr[sizeof(includedir_keyword) - 1])) + if ((!strncmp(ptr, includedir_keyword, + sizeof(includedir_keyword) - 1)) && + my_isspace(&my_charset_latin1, ptr[sizeof(includedir_keyword) - 1])) { /* skip over "includedir" and following whitespace */ for (ptr+= sizeof(includedir_keyword) - 1; my_isspace(&my_charset_latin1, ptr[0]); ptr++) {} - /* trim trailing whitespace from directory name */ - end= ptr + strlen(ptr) - 1; - /* fgets() stores the newline character in the buffer */ - if ((end[0] == '\n') || (end[0] == '\r') || - my_isspace(&my_charset_latin1, end[0])) - { - for (; my_isspace(&my_charset_latin1, *(end - 1)); end--) - {} - end[0]= 0; - } + /* + trim trailing whitespace from directory name + The -1 below is for the newline added by fgets() + Note that my_isspace() is true for \r and \n + */ + for (end= ptr + strlen(ptr) - 1; + my_isspace(&my_charset_latin1, *(end - 1)); + end--) + {} + end[0]= 0; /* print error msg if there is nothing after !includedir directive */ - if (end == ptr) + if (end <= ptr) { fprintf(stderr, "error: Wrong !includedir directive in config " @@ -468,8 +483,8 @@ static int search_default_file_with_ext(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, my_dirend(search_dir); } - else if ((!strncmp(ptr, include_keyword, sizeof(include_keyword) - 1)) - && my_isspace(&my_charset_latin1, ptr[sizeof(include_keyword) - 1])) + else if ((!strncmp(ptr, include_keyword, sizeof(include_keyword) - 1)) && + my_isspace(&my_charset_latin1, ptr[sizeof(include_keyword)-1])) { /* skip over `include' and following whitespace */ for (ptr+= sizeof(include_keyword) - 1; @@ -477,12 +492,13 @@ static int search_default_file_with_ext(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, {} /* trim trailing whitespace from filename */ - end= ptr + strlen(ptr) - 1; - for (; my_isspace(&my_charset_latin1, *(end - 1)) ; end--) + for (end= ptr + strlen(ptr) - 1; + my_isspace(&my_charset_latin1, *(end - 1)); + end--) {} end[0]= 0; - if (end == ptr) + if (end <= ptr) { fprintf(stderr, "error: Wrong !include directive in config " @@ -497,14 +513,6 @@ static int search_default_file_with_ext(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, continue; } - else - if (recursion_level >= max_recursion_level) - { - fprintf(stderr, - "warning: skipping !include directive as maximum include" - "recursion level was reached in file %s at line %d\n", - name, line); - } if (*ptr == '[') /* Group name */ { diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 7f890a583c6..f46c40f686a 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -72,7 +72,7 @@ static int check_insert_fields(THD *thd, TABLE *table, List &fields, { my_printf_error(ER_WRONG_VALUE_COUNT_ON_ROW, ER(ER_WRONG_VALUE_COUNT_ON_ROW), - MYF(0), 1); + MYF(0), 1L); return -1; } #ifndef NO_EMBEDDED_ACCESS_CHECKS @@ -89,7 +89,7 @@ static int check_insert_fields(THD *thd, TABLE *table, List &fields, { my_printf_error(ER_WRONG_VALUE_COUNT_ON_ROW, ER(ER_WRONG_VALUE_COUNT_ON_ROW), - MYF(0), 1); + MYF(0), 1L); return -1; } TABLE_LIST table_list; diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 36efe26dff9..e7f968df396 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -2055,8 +2055,8 @@ merge_key_fields(KEY_FIELD *start,KEY_FIELD *new_fields,KEY_FIELD *end, KEY_OPTIMIZE_EXISTS) | ((old->optimize | new_fields->optimize) & KEY_OPTIMIZE_REF_OR_NULL)); - old->null_rejecting= old->null_rejecting && - new_fields->null_rejecting; + old->null_rejecting= (old->null_rejecting && + new_fields->null_rejecting); } } else if (old->eq_func && new_fields->eq_func && @@ -2068,8 +2068,8 @@ merge_key_fields(KEY_FIELD *start,KEY_FIELD *new_fields,KEY_FIELD *end, KEY_OPTIMIZE_EXISTS) | ((old->optimize | new_fields->optimize) & KEY_OPTIMIZE_REF_OR_NULL)); - old->null_rejecting= old->null_rejecting && - new_fields->null_rejecting; + old->null_rejecting= (old->null_rejecting && + new_fields->null_rejecting); } else if (old->eq_func && new_fields->eq_func && (old->val->is_null() || new_fields->val->is_null())) @@ -2081,7 +2081,7 @@ merge_key_fields(KEY_FIELD *start,KEY_FIELD *new_fields,KEY_FIELD *end, if (old->val->is_null()) old->val= new_fields->val; /* The referred expression can be NULL: */ - old->null_rejecting= false; + old->null_rejecting= 0; } else { @@ -2242,6 +2242,8 @@ add_key_field(KEY_FIELD **key_fields,uint and_level, Item_func *cond, If the condition has form "tbl.keypart = othertbl.field" and othertbl.field can be NULL, there will be no matches if othertbl.field has NULL value. + We use null_rejecting in add_not_null_conds() to add + 'othertbl.field IS NOT NULL' to tab->select_cond. */ (*key_fields)->null_rejecting= (cond->functype() == Item_func::EQ_FUNC) && ((*value)->type() == Item::FIELD_ITEM) && From 2a7c71e309337588b3815ea7ff1fe20d734d50d9 Mon Sep 17 00:00:00 2001 From: "brian@zim.(none)" <> Date: Tue, 26 Apr 2005 18:19:54 -0700 Subject: [PATCH 20/51] Changes to create storage directory for storage engines. --- {bdb => storage/bdb}/LICENSE | 0 {bdb => storage/bdb}/Makefile.in | 0 {bdb => storage/bdb}/btree/bt_compare.c | 0 {bdb => storage/bdb}/btree/bt_conv.c | 0 {bdb => storage/bdb}/btree/bt_curadj.c | 0 {bdb => storage/bdb}/btree/bt_cursor.c | 0 {bdb => storage/bdb}/btree/bt_delete.c | 0 {bdb => storage/bdb}/btree/bt_method.c | 0 {bdb => storage/bdb}/btree/bt_open.c | 0 {bdb => storage/bdb}/btree/bt_put.c | 0 {bdb => storage/bdb}/btree/bt_rec.c | 0 {bdb => storage/bdb}/btree/bt_reclaim.c | 0 {bdb => storage/bdb}/btree/bt_recno.c | 0 {bdb => storage/bdb}/btree/bt_rsearch.c | 0 {bdb => storage/bdb}/btree/bt_search.c | 0 {bdb => storage/bdb}/btree/bt_split.c | 0 {bdb => storage/bdb}/btree/bt_stat.c | 0 {bdb => storage/bdb}/btree/bt_upgrade.c | 0 {bdb => storage/bdb}/btree/bt_verify.c | 0 {bdb => storage/bdb}/btree/btree.src | 0 {bdb => storage/bdb}/build_unix/.IGNORE_ME | 0 {bdb => storage/bdb}/build_vxworks/BerkeleyDB.wsp | 0 {bdb => storage/bdb}/build_vxworks/dbdemo/README | 0 {bdb => storage/bdb}/build_win32/Berkeley_DB.dsw | 0 {bdb => storage/bdb}/build_win32/app_dsp.src | 0 {bdb => storage/bdb}/build_win32/build_all.dsp | 0 {bdb => storage/bdb}/build_win32/db_java_xa.dsp | 0 {bdb => storage/bdb}/build_win32/db_java_xaj.mak | 0 {bdb => storage/bdb}/build_win32/db_lib.dsp | 0 {bdb => storage/bdb}/build_win32/db_test.src | 0 {bdb => storage/bdb}/build_win32/dbkill.cpp | 0 {bdb => storage/bdb}/build_win32/dllmain.c | 0 {bdb => storage/bdb}/build_win32/dynamic_dsp.src | 0 {bdb => storage/bdb}/build_win32/java_dsp.src | 0 {bdb => storage/bdb}/build_win32/libdb_tcl.def | 0 {bdb => storage/bdb}/build_win32/libdbrc.src | 0 {bdb => storage/bdb}/build_win32/srcfile_dsp.src | 0 {bdb => storage/bdb}/build_win32/static_dsp.src | 0 {bdb => storage/bdb}/build_win32/tcl_dsp.src | 0 {bdb => storage/bdb}/clib/getcwd.c | 0 {bdb => storage/bdb}/clib/getopt.c | 0 {bdb => storage/bdb}/clib/memcmp.c | 0 {bdb => storage/bdb}/clib/memmove.c | 0 {bdb => storage/bdb}/clib/raise.c | 0 {bdb => storage/bdb}/clib/snprintf.c | 0 {bdb => storage/bdb}/clib/strcasecmp.c | 0 {bdb => storage/bdb}/clib/strdup.c | 0 {bdb => storage/bdb}/clib/strerror.c | 0 {bdb => storage/bdb}/clib/vsnprintf.c | 0 {bdb => storage/bdb}/common/db_byteorder.c | 0 {bdb => storage/bdb}/common/db_err.c | 0 {bdb => storage/bdb}/common/db_getlong.c | 0 {bdb => storage/bdb}/common/db_idspace.c | 0 {bdb => storage/bdb}/common/db_log2.c | 0 {bdb => storage/bdb}/common/util_arg.c | 0 {bdb => storage/bdb}/common/util_cache.c | 0 {bdb => storage/bdb}/common/util_log.c | 0 {bdb => storage/bdb}/common/util_sig.c | 0 {bdb => storage/bdb}/cxx/cxx_db.cpp | 0 {bdb => storage/bdb}/cxx/cxx_dbc.cpp | 0 {bdb => storage/bdb}/cxx/cxx_dbt.cpp | 0 {bdb => storage/bdb}/cxx/cxx_env.cpp | 0 {bdb => storage/bdb}/cxx/cxx_except.cpp | 0 {bdb => storage/bdb}/cxx/cxx_lock.cpp | 0 {bdb => storage/bdb}/cxx/cxx_logc.cpp | 0 {bdb => storage/bdb}/cxx/cxx_mpool.cpp | 0 {bdb => storage/bdb}/cxx/cxx_txn.cpp | 0 {bdb => storage/bdb}/db/crdel.src | 0 {bdb => storage/bdb}/db/crdel_rec.c | 0 {bdb => storage/bdb}/db/db.c | 0 {bdb => storage/bdb}/db/db.src | 0 {bdb => storage/bdb}/db/db_am.c | 0 {bdb => storage/bdb}/db/db_cam.c | 0 {bdb => storage/bdb}/db/db_conv.c | 0 {bdb => storage/bdb}/db/db_dispatch.c | 0 {bdb => storage/bdb}/db/db_dup.c | 0 {bdb => storage/bdb}/db/db_iface.c | 0 {bdb => storage/bdb}/db/db_join.c | 0 {bdb => storage/bdb}/db/db_meta.c | 0 {bdb => storage/bdb}/db/db_method.c | 0 {bdb => storage/bdb}/db/db_open.c | 0 {bdb => storage/bdb}/db/db_overflow.c | 0 {bdb => storage/bdb}/db/db_pr.c | 0 {bdb => storage/bdb}/db/db_rec.c | 0 {bdb => storage/bdb}/db/db_reclaim.c | 0 {bdb => storage/bdb}/db/db_remove.c | 0 {bdb => storage/bdb}/db/db_rename.c | 0 {bdb => storage/bdb}/db/db_ret.c | 0 {bdb => storage/bdb}/db/db_truncate.c | 0 {bdb => storage/bdb}/db/db_upg.c | 0 {bdb => storage/bdb}/db/db_upg_opd.c | 0 {bdb => storage/bdb}/db/db_vrfy.c | 0 {bdb => storage/bdb}/db/db_vrfyutil.c | 0 {bdb => storage/bdb}/db185/db185.c | 0 {bdb => storage/bdb}/db185/db185_int.in | 0 {bdb => storage/bdb}/db_archive/db_archive.c | 0 {bdb => storage/bdb}/db_checkpoint/db_checkpoint.c | 0 {bdb => storage/bdb}/db_deadlock/db_deadlock.c | 0 {bdb => storage/bdb}/db_dump/db_dump.c | 0 {bdb => storage/bdb}/db_dump185/db_dump185.c | 0 {bdb => storage/bdb}/db_load/db_load.c | 0 {bdb => storage/bdb}/db_printlog/README | 0 {bdb => storage/bdb}/db_printlog/commit.awk | 0 {bdb => storage/bdb}/db_printlog/count.awk | 0 {bdb => storage/bdb}/db_printlog/db_printlog.c | 0 {bdb => storage/bdb}/db_printlog/dbname.awk | 0 {bdb => storage/bdb}/db_printlog/fileid.awk | 0 {bdb => storage/bdb}/db_printlog/logstat.awk | 0 {bdb => storage/bdb}/db_printlog/pgno.awk | 0 {bdb => storage/bdb}/db_printlog/range.awk | 0 {bdb => storage/bdb}/db_printlog/rectype.awk | 0 {bdb => storage/bdb}/db_printlog/status.awk | 0 {bdb => storage/bdb}/db_printlog/txn.awk | 0 {bdb => storage/bdb}/db_recover/db_recover.c | 0 {bdb => storage/bdb}/db_stat/db_stat.c | 0 {bdb => storage/bdb}/db_upgrade/db_upgrade.c | 0 {bdb => storage/bdb}/db_verify/db_verify.c | 0 {bdb => storage/bdb}/dbinc/btree.h | 0 {bdb => storage/bdb}/dbinc/crypto.h | 0 {bdb => storage/bdb}/dbinc/cxx_common.h | 0 {bdb => storage/bdb}/dbinc/cxx_except.h | 0 {bdb => storage/bdb}/dbinc/cxx_int.h | 0 {bdb => storage/bdb}/dbinc/db.in | 0 {bdb => storage/bdb}/dbinc/db_185.in | 0 {bdb => storage/bdb}/dbinc/db_am.h | 0 {bdb => storage/bdb}/dbinc/db_cxx.in | 0 {bdb => storage/bdb}/dbinc/db_dispatch.h | 0 {bdb => storage/bdb}/dbinc/db_int.in | 0 {bdb => storage/bdb}/dbinc/db_join.h | 0 {bdb => storage/bdb}/dbinc/db_page.h | 0 {bdb => storage/bdb}/dbinc/db_server_int.h | 0 {bdb => storage/bdb}/dbinc/db_shash.h | 0 {bdb => storage/bdb}/dbinc/db_swap.h | 0 {bdb => storage/bdb}/dbinc/db_upgrade.h | 0 {bdb => storage/bdb}/dbinc/db_verify.h | 0 {bdb => storage/bdb}/dbinc/debug.h | 0 {bdb => storage/bdb}/dbinc/fop.h | 0 {bdb => storage/bdb}/dbinc/globals.h | 0 {bdb => storage/bdb}/dbinc/hash.h | 0 {bdb => storage/bdb}/dbinc/hmac.h | 0 {bdb => storage/bdb}/dbinc/lock.h | 0 {bdb => storage/bdb}/dbinc/log.h | 0 {bdb => storage/bdb}/dbinc/mp.h | 0 {bdb => storage/bdb}/dbinc/mutex.h | 0 {bdb => storage/bdb}/dbinc/os.h | 0 {bdb => storage/bdb}/dbinc/qam.h | 0 {bdb => storage/bdb}/dbinc/queue.h | 0 {bdb => storage/bdb}/dbinc/region.h | 0 {bdb => storage/bdb}/dbinc/rep.h | 0 {bdb => storage/bdb}/dbinc/shqueue.h | 0 {bdb => storage/bdb}/dbinc/tcl_db.h | 0 {bdb => storage/bdb}/dbinc/txn.h | 0 {bdb => storage/bdb}/dbinc/xa.h | 0 {bdb => storage/bdb}/dbm/dbm.c | 0 {bdb => storage/bdb}/dbreg/dbreg.c | 0 {bdb => storage/bdb}/dbreg/dbreg.src | 0 {bdb => storage/bdb}/dbreg/dbreg_rec.c | 0 {bdb => storage/bdb}/dbreg/dbreg_util.c | 0 {bdb => storage/bdb}/dist/Makefile.in | 0 {bdb => storage/bdb}/dist/RELEASE | 0 {bdb => storage/bdb}/dist/aclocal/config.ac | 0 {bdb => storage/bdb}/dist/aclocal/cxx.ac | 0 {bdb => storage/bdb}/dist/aclocal/gcc.ac | 0 {bdb => storage/bdb}/dist/aclocal/libtool.ac | 0 {bdb => storage/bdb}/dist/aclocal/mutex.ac | 0 {bdb => storage/bdb}/dist/aclocal/options.ac | 0 {bdb => storage/bdb}/dist/aclocal/programs.ac | 0 {bdb => storage/bdb}/dist/aclocal/sosuffix.ac | 0 {bdb => storage/bdb}/dist/aclocal/tcl.ac | 0 {bdb => storage/bdb}/dist/aclocal/types.ac | 0 .../bdb}/dist/aclocal_java/ac_check_class.ac | 0 .../bdb}/dist/aclocal_java/ac_check_classpath.ac | 0 .../bdb}/dist/aclocal_java/ac_check_junit.ac | 0 .../bdb}/dist/aclocal_java/ac_check_rqrd_class.ac | 0 .../bdb}/dist/aclocal_java/ac_java_options.ac | 0 .../bdb}/dist/aclocal_java/ac_jni_include_dirs.ac | 0 .../bdb}/dist/aclocal_java/ac_prog_jar.ac | 0 .../bdb}/dist/aclocal_java/ac_prog_java.ac | 0 .../bdb}/dist/aclocal_java/ac_prog_java_works.ac | 0 .../bdb}/dist/aclocal_java/ac_prog_javac.ac | 0 .../bdb}/dist/aclocal_java/ac_prog_javac_works.ac | 0 .../bdb}/dist/aclocal_java/ac_prog_javadoc.ac | 0 .../bdb}/dist/aclocal_java/ac_prog_javah.ac | 0 .../bdb}/dist/aclocal_java/ac_try_compile_java.ac | 0 .../bdb}/dist/aclocal_java/ac_try_run_javac.ac | 0 {bdb => storage/bdb}/dist/buildrel | 0 {bdb => storage/bdb}/dist/config.guess | 0 {bdb => storage/bdb}/dist/config.sub | 0 {bdb => storage/bdb}/dist/configure.ac | 0 {bdb => storage/bdb}/dist/db.ecd.in | 0 {bdb => storage/bdb}/dist/db.spec.in | 0 {bdb => storage/bdb}/dist/gen_inc.awk | 0 {bdb => storage/bdb}/dist/gen_rec.awk | 0 {bdb => storage/bdb}/dist/gen_rpc.awk | 0 {bdb => storage/bdb}/dist/install-sh | 0 {bdb => storage/bdb}/dist/ltmain.sh | 0 {bdb => storage/bdb}/dist/pubdef.in | 0 {bdb => storage/bdb}/dist/s_all | 0 {bdb => storage/bdb}/dist/s_config | 0 {bdb => storage/bdb}/dist/s_crypto | 0 {bdb => storage/bdb}/dist/s_dir | 0 {bdb => storage/bdb}/dist/s_include | 0 {bdb => storage/bdb}/dist/s_java | 0 {bdb => storage/bdb}/dist/s_javah | 0 {bdb => storage/bdb}/dist/s_perm | 0 {bdb => storage/bdb}/dist/s_readme | 0 {bdb => storage/bdb}/dist/s_recover | 0 {bdb => storage/bdb}/dist/s_rpc | 0 {bdb => storage/bdb}/dist/s_symlink | 0 {bdb => storage/bdb}/dist/s_tags | 0 {bdb => storage/bdb}/dist/s_test | 0 {bdb => storage/bdb}/dist/s_vxworks | 0 {bdb => storage/bdb}/dist/s_win32 | 0 {bdb => storage/bdb}/dist/s_win32_dsp | 0 {bdb => storage/bdb}/dist/srcfiles.in | 0 {bdb => storage/bdb}/dist/template/rec_ctemp | 0 {bdb => storage/bdb}/dist/vx_2.0/BerkeleyDB.wpj | 0 {bdb => storage/bdb}/dist/vx_2.0/wpj.in | 0 {bdb => storage/bdb}/dist/vx_3.1/Makefile.custom | 0 {bdb => storage/bdb}/dist/vx_3.1/cdf.1 | 0 {bdb => storage/bdb}/dist/vx_3.1/cdf.2 | 0 {bdb => storage/bdb}/dist/vx_3.1/cdf.3 | 0 {bdb => storage/bdb}/dist/vx_3.1/component.cdf | 0 {bdb => storage/bdb}/dist/vx_3.1/component.wpj | 0 {bdb => storage/bdb}/dist/vx_3.1/wpj.1 | 0 {bdb => storage/bdb}/dist/vx_3.1/wpj.2 | 0 {bdb => storage/bdb}/dist/vx_3.1/wpj.3 | 0 {bdb => storage/bdb}/dist/vx_3.1/wpj.4 | 0 {bdb => storage/bdb}/dist/vx_3.1/wpj.5 | 0 {bdb => storage/bdb}/dist/vx_buildcd | 0 {bdb => storage/bdb}/dist/vx_config.in | 0 {bdb => storage/bdb}/dist/vx_setup/CONFIG.in | 0 {bdb => storage/bdb}/dist/vx_setup/LICENSE.TXT | 0 {bdb => storage/bdb}/dist/vx_setup/MESSAGES.TCL | 0 {bdb => storage/bdb}/dist/vx_setup/README.in | 0 {bdb => storage/bdb}/dist/vx_setup/SETUP.BMP | Bin {bdb => storage/bdb}/dist/vx_setup/vx_allfile.in | 0 {bdb => storage/bdb}/dist/vx_setup/vx_demofile.in | 0 {bdb => storage/bdb}/dist/vx_setup/vx_setup.in | 0 {bdb => storage/bdb}/dist/win_config.in | 0 {bdb => storage/bdb}/dist/win_exports.in | 0 {bdb => storage/bdb}/env/db_salloc.c | 0 {bdb => storage/bdb}/env/db_shash.c | 0 {bdb => storage/bdb}/env/env_file.c | 0 {bdb => storage/bdb}/env/env_method.c | 0 {bdb => storage/bdb}/env/env_method.c.b | 0 {bdb => storage/bdb}/env/env_open.c | 0 {bdb => storage/bdb}/env/env_recover.c | 0 {bdb => storage/bdb}/env/env_region.c | 0 {bdb => storage/bdb}/fileops/fileops.src | 0 {bdb => storage/bdb}/fileops/fop_basic.c | 0 {bdb => storage/bdb}/fileops/fop_rec.c | 0 {bdb => storage/bdb}/fileops/fop_util.c | 0 {bdb => storage/bdb}/hash/hash.c | 0 {bdb => storage/bdb}/hash/hash.src | 0 {bdb => storage/bdb}/hash/hash_conv.c | 0 {bdb => storage/bdb}/hash/hash_dup.c | 0 {bdb => storage/bdb}/hash/hash_func.c | 0 {bdb => storage/bdb}/hash/hash_meta.c | 0 {bdb => storage/bdb}/hash/hash_method.c | 0 {bdb => storage/bdb}/hash/hash_open.c | 0 {bdb => storage/bdb}/hash/hash_page.c | 0 {bdb => storage/bdb}/hash/hash_rec.c | 0 {bdb => storage/bdb}/hash/hash_reclaim.c | 0 {bdb => storage/bdb}/hash/hash_stat.c | 0 {bdb => storage/bdb}/hash/hash_upgrade.c | 0 {bdb => storage/bdb}/hash/hash_verify.c | 0 {bdb => storage/bdb}/hmac/hmac.c | 0 {bdb => storage/bdb}/hmac/sha1.c | 0 {bdb => storage/bdb}/hsearch/hsearch.c | 0 {bdb => storage/bdb}/libdb_java/checkapi.prl | 0 .../bdb}/libdb_java/com_sleepycat_db_Db.h | 0 .../bdb}/libdb_java/com_sleepycat_db_DbEnv.h | 0 .../bdb}/libdb_java/com_sleepycat_db_DbLock.h | 0 .../bdb}/libdb_java/com_sleepycat_db_DbLogc.h | 0 .../bdb}/libdb_java/com_sleepycat_db_DbLsn.h | 0 .../bdb}/libdb_java/com_sleepycat_db_DbTxn.h | 0 .../bdb}/libdb_java/com_sleepycat_db_DbUtil.h | 0 .../bdb}/libdb_java/com_sleepycat_db_Dbc.h | 0 .../bdb}/libdb_java/com_sleepycat_db_Dbt.h | 0 .../libdb_java/com_sleepycat_db_xa_DbXAResource.h | 0 {bdb => storage/bdb}/libdb_java/java_Db.c | 0 {bdb => storage/bdb}/libdb_java/java_DbEnv.c | 0 {bdb => storage/bdb}/libdb_java/java_DbLock.c | 0 {bdb => storage/bdb}/libdb_java/java_DbLogc.c | 0 {bdb => storage/bdb}/libdb_java/java_DbLsn.c | 0 {bdb => storage/bdb}/libdb_java/java_DbTxn.c | 0 {bdb => storage/bdb}/libdb_java/java_DbUtil.c | 0 {bdb => storage/bdb}/libdb_java/java_DbXAResource.c | 0 {bdb => storage/bdb}/libdb_java/java_Dbc.c | 0 {bdb => storage/bdb}/libdb_java/java_Dbt.c | 0 {bdb => storage/bdb}/libdb_java/java_info.c | 0 {bdb => storage/bdb}/libdb_java/java_info.h | 0 {bdb => storage/bdb}/libdb_java/java_locked.c | 0 {bdb => storage/bdb}/libdb_java/java_locked.h | 0 {bdb => storage/bdb}/libdb_java/java_util.c | 0 {bdb => storage/bdb}/libdb_java/java_util.h | 0 {bdb => storage/bdb}/lock/Design | 0 {bdb => storage/bdb}/lock/lock.c | 0 {bdb => storage/bdb}/lock/lock_deadlock.c | 0 {bdb => storage/bdb}/lock/lock_method.c | 0 {bdb => storage/bdb}/lock/lock_region.c | 0 {bdb => storage/bdb}/lock/lock_stat.c | 0 {bdb => storage/bdb}/lock/lock_util.c | 0 {bdb => storage/bdb}/log/log.c | 0 {bdb => storage/bdb}/log/log_archive.c | 0 {bdb => storage/bdb}/log/log_compare.c | 0 {bdb => storage/bdb}/log/log_get.c | 0 {bdb => storage/bdb}/log/log_method.c | 0 {bdb => storage/bdb}/log/log_put.c | 0 {bdb => storage/bdb}/mp/mp_alloc.c | 0 {bdb => storage/bdb}/mp/mp_bh.c | 0 {bdb => storage/bdb}/mp/mp_fget.c | 0 {bdb => storage/bdb}/mp/mp_fopen.c | 0 {bdb => storage/bdb}/mp/mp_fput.c | 0 {bdb => storage/bdb}/mp/mp_fset.c | 0 {bdb => storage/bdb}/mp/mp_method.c | 0 {bdb => storage/bdb}/mp/mp_region.c | 0 {bdb => storage/bdb}/mp/mp_register.c | 0 {bdb => storage/bdb}/mp/mp_stat.c | 0 {bdb => storage/bdb}/mp/mp_sync.c | 0 {bdb => storage/bdb}/mp/mp_trickle.c | 0 {bdb => storage/bdb}/mutex/README | 0 {bdb => storage/bdb}/mutex/mut_fcntl.c | 0 {bdb => storage/bdb}/mutex/mut_pthread.c | 0 {bdb => storage/bdb}/mutex/mut_tas.c | 0 {bdb => storage/bdb}/mutex/mut_win32.c | 0 {bdb => storage/bdb}/mutex/mutex.c | 0 {bdb => storage/bdb}/mutex/tm.c | 0 {bdb => storage/bdb}/mutex/uts4_cc.s | 0 {bdb => storage/bdb}/os/os_abs.c | 0 {bdb => storage/bdb}/os/os_alloc.c | 0 {bdb => storage/bdb}/os/os_clock.c | 0 {bdb => storage/bdb}/os/os_config.c | 0 {bdb => storage/bdb}/os/os_dir.c | 0 {bdb => storage/bdb}/os/os_errno.c | 0 {bdb => storage/bdb}/os/os_fid.c | 0 {bdb => storage/bdb}/os/os_fsync.c | 0 {bdb => storage/bdb}/os/os_handle.c | 0 {bdb => storage/bdb}/os/os_id.c | 0 {bdb => storage/bdb}/os/os_map.c | 0 {bdb => storage/bdb}/os/os_method.c | 0 {bdb => storage/bdb}/os/os_oflags.c | 0 {bdb => storage/bdb}/os/os_open.c | 0 {bdb => storage/bdb}/os/os_region.c | 0 {bdb => storage/bdb}/os/os_rename.c | 0 {bdb => storage/bdb}/os/os_root.c | 0 {bdb => storage/bdb}/os/os_rpath.c | 0 {bdb => storage/bdb}/os/os_rw.c | 0 {bdb => storage/bdb}/os/os_seek.c | 0 {bdb => storage/bdb}/os/os_sleep.c | 0 {bdb => storage/bdb}/os/os_spin.c | 0 {bdb => storage/bdb}/os/os_stat.c | 0 {bdb => storage/bdb}/os/os_tmpdir.c | 0 {bdb => storage/bdb}/os/os_unlink.c | 0 {bdb => storage/bdb}/os_vxworks/os_vx_abs.c | 0 {bdb => storage/bdb}/os_vxworks/os_vx_config.c | 0 {bdb => storage/bdb}/os_vxworks/os_vx_map.c | 0 {bdb => storage/bdb}/os_win32/os_abs.c | 0 {bdb => storage/bdb}/os_win32/os_clock.c | 0 {bdb => storage/bdb}/os_win32/os_config.c | 0 {bdb => storage/bdb}/os_win32/os_dir.c | 0 {bdb => storage/bdb}/os_win32/os_errno.c | 0 {bdb => storage/bdb}/os_win32/os_fid.c | 0 {bdb => storage/bdb}/os_win32/os_fsync.c | 0 {bdb => storage/bdb}/os_win32/os_handle.c | 0 {bdb => storage/bdb}/os_win32/os_map.c | 0 {bdb => storage/bdb}/os_win32/os_open.c | 0 {bdb => storage/bdb}/os_win32/os_rename.c | 0 {bdb => storage/bdb}/os_win32/os_rw.c | 0 {bdb => storage/bdb}/os_win32/os_seek.c | 0 {bdb => storage/bdb}/os_win32/os_sleep.c | 0 {bdb => storage/bdb}/os_win32/os_spin.c | 0 {bdb => storage/bdb}/os_win32/os_stat.c | 0 {bdb => storage/bdb}/os_win32/os_type.c | 0 {bdb => storage/bdb}/perl/BerkeleyDB/BerkeleyDB.pm | 0 {bdb => storage/bdb}/perl/BerkeleyDB/BerkeleyDB.pod | 0 .../bdb}/perl/BerkeleyDB/BerkeleyDB.pod.P | 0 {bdb => storage/bdb}/perl/BerkeleyDB/BerkeleyDB.xs | 0 .../bdb}/perl/BerkeleyDB/BerkeleyDB/Btree.pm | 0 .../bdb}/perl/BerkeleyDB/BerkeleyDB/Hash.pm | 0 {bdb => storage/bdb}/perl/BerkeleyDB/Changes | 0 {bdb => storage/bdb}/perl/BerkeleyDB/MANIFEST | 0 {bdb => storage/bdb}/perl/BerkeleyDB/Makefile.PL | 0 {bdb => storage/bdb}/perl/BerkeleyDB/README | 0 {bdb => storage/bdb}/perl/BerkeleyDB/Todo | 0 {bdb => storage/bdb}/perl/BerkeleyDB/config.in | 0 {bdb => storage/bdb}/perl/BerkeleyDB/constants.h | 0 {bdb => storage/bdb}/perl/BerkeleyDB/constants.xs | 0 {bdb => storage/bdb}/perl/BerkeleyDB/dbinfo | 0 .../bdb}/perl/BerkeleyDB/hints/dec_osf.pl | 0 .../bdb}/perl/BerkeleyDB/hints/irix_6_5.pl | 0 .../bdb}/perl/BerkeleyDB/hints/solaris.pl | 0 {bdb => storage/bdb}/perl/BerkeleyDB/mkconsts | 0 {bdb => storage/bdb}/perl/BerkeleyDB/mkpod | 0 {bdb => storage/bdb}/perl/BerkeleyDB/patches/5.004 | 0 .../bdb}/perl/BerkeleyDB/patches/5.004_01 | 0 .../bdb}/perl/BerkeleyDB/patches/5.004_02 | 0 .../bdb}/perl/BerkeleyDB/patches/5.004_03 | 0 .../bdb}/perl/BerkeleyDB/patches/5.004_04 | 0 .../bdb}/perl/BerkeleyDB/patches/5.004_05 | 0 {bdb => storage/bdb}/perl/BerkeleyDB/patches/5.005 | 0 .../bdb}/perl/BerkeleyDB/patches/5.005_01 | 0 .../bdb}/perl/BerkeleyDB/patches/5.005_02 | 0 .../bdb}/perl/BerkeleyDB/patches/5.005_03 | 0 {bdb => storage/bdb}/perl/BerkeleyDB/patches/5.6.0 | 0 {bdb => storage/bdb}/perl/BerkeleyDB/ppport.h | 0 {bdb => storage/bdb}/perl/BerkeleyDB/scan | 0 {bdb => storage/bdb}/perl/BerkeleyDB/t/btree.t | 0 {bdb => storage/bdb}/perl/BerkeleyDB/t/destroy.t | 0 {bdb => storage/bdb}/perl/BerkeleyDB/t/env.t | 0 {bdb => storage/bdb}/perl/BerkeleyDB/t/examples.t | 0 {bdb => storage/bdb}/perl/BerkeleyDB/t/examples.t.T | 0 {bdb => storage/bdb}/perl/BerkeleyDB/t/examples3.t | 0 .../bdb}/perl/BerkeleyDB/t/examples3.t.T | 0 {bdb => storage/bdb}/perl/BerkeleyDB/t/filter.t | 0 {bdb => storage/bdb}/perl/BerkeleyDB/t/hash.t | 0 {bdb => storage/bdb}/perl/BerkeleyDB/t/join.t | 0 {bdb => storage/bdb}/perl/BerkeleyDB/t/mldbm.t | 0 {bdb => storage/bdb}/perl/BerkeleyDB/t/queue.t | 0 {bdb => storage/bdb}/perl/BerkeleyDB/t/recno.t | 0 {bdb => storage/bdb}/perl/BerkeleyDB/t/strict.t | 0 {bdb => storage/bdb}/perl/BerkeleyDB/t/subdb.t | 0 {bdb => storage/bdb}/perl/BerkeleyDB/t/txn.t | 0 {bdb => storage/bdb}/perl/BerkeleyDB/t/unknown.t | 0 {bdb => storage/bdb}/perl/BerkeleyDB/t/util.pm | 0 {bdb => storage/bdb}/perl/BerkeleyDB/typemap | 0 {bdb => storage/bdb}/perl/DB_File/Changes | 0 {bdb => storage/bdb}/perl/DB_File/DB_File.pm | 0 {bdb => storage/bdb}/perl/DB_File/DB_File.xs | 0 {bdb => storage/bdb}/perl/DB_File/DB_File_BS | 0 {bdb => storage/bdb}/perl/DB_File/MANIFEST | 0 {bdb => storage/bdb}/perl/DB_File/Makefile.PL | 0 {bdb => storage/bdb}/perl/DB_File/README | 0 {bdb => storage/bdb}/perl/DB_File/config.in | 0 {bdb => storage/bdb}/perl/DB_File/dbinfo | 0 {bdb => storage/bdb}/perl/DB_File/fallback.h | 0 {bdb => storage/bdb}/perl/DB_File/fallback.xs | 0 {bdb => storage/bdb}/perl/DB_File/hints/dynixptx.pl | 0 {bdb => storage/bdb}/perl/DB_File/hints/sco.pl | 0 {bdb => storage/bdb}/perl/DB_File/patches/5.004 | 0 {bdb => storage/bdb}/perl/DB_File/patches/5.004_01 | 0 {bdb => storage/bdb}/perl/DB_File/patches/5.004_02 | 0 {bdb => storage/bdb}/perl/DB_File/patches/5.004_03 | 0 {bdb => storage/bdb}/perl/DB_File/patches/5.004_04 | 0 {bdb => storage/bdb}/perl/DB_File/patches/5.004_05 | 0 {bdb => storage/bdb}/perl/DB_File/patches/5.005 | 0 {bdb => storage/bdb}/perl/DB_File/patches/5.005_01 | 0 {bdb => storage/bdb}/perl/DB_File/patches/5.005_02 | 0 {bdb => storage/bdb}/perl/DB_File/patches/5.005_03 | 0 {bdb => storage/bdb}/perl/DB_File/patches/5.6.0 | 0 {bdb => storage/bdb}/perl/DB_File/ppport.h | 0 {bdb => storage/bdb}/perl/DB_File/t/db-btree.t | 0 {bdb => storage/bdb}/perl/DB_File/t/db-hash.t | 0 {bdb => storage/bdb}/perl/DB_File/t/db-recno.t | 0 {bdb => storage/bdb}/perl/DB_File/typemap | 0 {bdb => storage/bdb}/perl/DB_File/version.c | 0 {bdb => storage/bdb}/qam/qam.c | 0 {bdb => storage/bdb}/qam/qam.src | 0 {bdb => storage/bdb}/qam/qam_conv.c | 0 {bdb => storage/bdb}/qam/qam_files.c | 0 {bdb => storage/bdb}/qam/qam_method.c | 0 {bdb => storage/bdb}/qam/qam_open.c | 0 {bdb => storage/bdb}/qam/qam_rec.c | 0 {bdb => storage/bdb}/qam/qam_stat.c | 0 {bdb => storage/bdb}/qam/qam_upgrade.c | 0 {bdb => storage/bdb}/qam/qam_verify.c | 0 {bdb => storage/bdb}/rep/rep_method.c | 0 {bdb => storage/bdb}/rep/rep_record.c | 0 {bdb => storage/bdb}/rep/rep_region.c | 0 {bdb => storage/bdb}/rep/rep_util.c | 0 {bdb => storage/bdb}/rpc_client/client.c | 0 {bdb => storage/bdb}/rpc_client/gen_client_ret.c | 0 .../bdb}/rpc_server/c/db_server_proc.c.in | 0 {bdb => storage/bdb}/rpc_server/c/db_server_util.c | 0 {bdb => storage/bdb}/rpc_server/clsrv.html | 0 .../bdb}/rpc_server/cxx/db_server_cxxproc.cpp | 0 .../bdb}/rpc_server/cxx/db_server_cxxutil.cpp | 0 .../bdb}/rpc_server/java/DbDispatcher.java | 0 {bdb => storage/bdb}/rpc_server/java/DbServer.java | 0 {bdb => storage/bdb}/rpc_server/java/FreeList.java | 0 .../bdb}/rpc_server/java/LocalIterator.java | 0 {bdb => storage/bdb}/rpc_server/java/README | 0 {bdb => storage/bdb}/rpc_server/java/RpcDb.java | 0 {bdb => storage/bdb}/rpc_server/java/RpcDbEnv.java | 0 {bdb => storage/bdb}/rpc_server/java/RpcDbTxn.java | 0 {bdb => storage/bdb}/rpc_server/java/RpcDbc.java | 0 {bdb => storage/bdb}/rpc_server/java/Timer.java | 0 .../bdb}/rpc_server/java/gen/DbServerStub.java | 0 .../rpc_server/java/gen/__db_associate_msg.java | 0 .../rpc_server/java/gen/__db_associate_reply.java | 0 .../rpc_server/java/gen/__db_bt_maxkey_msg.java | 0 .../rpc_server/java/gen/__db_bt_maxkey_reply.java | 0 .../rpc_server/java/gen/__db_bt_minkey_msg.java | 0 .../rpc_server/java/gen/__db_bt_minkey_reply.java | 0 .../bdb}/rpc_server/java/gen/__db_close_msg.java | 0 .../bdb}/rpc_server/java/gen/__db_close_reply.java | 0 .../bdb}/rpc_server/java/gen/__db_create_msg.java | 0 .../bdb}/rpc_server/java/gen/__db_create_reply.java | 0 .../bdb}/rpc_server/java/gen/__db_cursor_msg.java | 0 .../bdb}/rpc_server/java/gen/__db_cursor_reply.java | 0 .../bdb}/rpc_server/java/gen/__db_del_msg.java | 0 .../bdb}/rpc_server/java/gen/__db_del_reply.java | 0 .../bdb}/rpc_server/java/gen/__db_encrypt_msg.java | 0 .../rpc_server/java/gen/__db_encrypt_reply.java | 0 .../rpc_server/java/gen/__db_extentsize_msg.java | 0 .../rpc_server/java/gen/__db_extentsize_reply.java | 0 .../bdb}/rpc_server/java/gen/__db_flags_msg.java | 0 .../bdb}/rpc_server/java/gen/__db_flags_reply.java | 0 .../bdb}/rpc_server/java/gen/__db_get_msg.java | 0 .../bdb}/rpc_server/java/gen/__db_get_reply.java | 0 .../rpc_server/java/gen/__db_h_ffactor_msg.java | 0 .../rpc_server/java/gen/__db_h_ffactor_reply.java | 0 .../bdb}/rpc_server/java/gen/__db_h_nelem_msg.java | 0 .../rpc_server/java/gen/__db_h_nelem_reply.java | 0 .../bdb}/rpc_server/java/gen/__db_join_msg.java | 0 .../bdb}/rpc_server/java/gen/__db_join_reply.java | 0 .../rpc_server/java/gen/__db_key_range_msg.java | 0 .../rpc_server/java/gen/__db_key_range_reply.java | 0 .../bdb}/rpc_server/java/gen/__db_lorder_msg.java | 0 .../bdb}/rpc_server/java/gen/__db_lorder_reply.java | 0 .../bdb}/rpc_server/java/gen/__db_open_msg.java | 0 .../bdb}/rpc_server/java/gen/__db_open_reply.java | 0 .../bdb}/rpc_server/java/gen/__db_pagesize_msg.java | 0 .../rpc_server/java/gen/__db_pagesize_reply.java | 0 .../bdb}/rpc_server/java/gen/__db_pget_msg.java | 0 .../bdb}/rpc_server/java/gen/__db_pget_reply.java | 0 .../bdb}/rpc_server/java/gen/__db_put_msg.java | 0 .../bdb}/rpc_server/java/gen/__db_put_reply.java | 0 .../bdb}/rpc_server/java/gen/__db_re_delim_msg.java | 0 .../rpc_server/java/gen/__db_re_delim_reply.java | 0 .../bdb}/rpc_server/java/gen/__db_re_len_msg.java | 0 .../bdb}/rpc_server/java/gen/__db_re_len_reply.java | 0 .../bdb}/rpc_server/java/gen/__db_re_pad_msg.java | 0 .../bdb}/rpc_server/java/gen/__db_re_pad_reply.java | 0 .../bdb}/rpc_server/java/gen/__db_remove_msg.java | 0 .../bdb}/rpc_server/java/gen/__db_remove_reply.java | 0 .../bdb}/rpc_server/java/gen/__db_rename_msg.java | 0 .../bdb}/rpc_server/java/gen/__db_rename_reply.java | 0 .../bdb}/rpc_server/java/gen/__db_stat_msg.java | 0 .../bdb}/rpc_server/java/gen/__db_stat_reply.java | 0 .../bdb}/rpc_server/java/gen/__db_sync_msg.java | 0 .../bdb}/rpc_server/java/gen/__db_sync_reply.java | 0 .../bdb}/rpc_server/java/gen/__db_truncate_msg.java | 0 .../rpc_server/java/gen/__db_truncate_reply.java | 0 .../bdb}/rpc_server/java/gen/__dbc_close_msg.java | 0 .../bdb}/rpc_server/java/gen/__dbc_close_reply.java | 0 .../bdb}/rpc_server/java/gen/__dbc_count_msg.java | 0 .../bdb}/rpc_server/java/gen/__dbc_count_reply.java | 0 .../bdb}/rpc_server/java/gen/__dbc_del_msg.java | 0 .../bdb}/rpc_server/java/gen/__dbc_del_reply.java | 0 .../bdb}/rpc_server/java/gen/__dbc_dup_msg.java | 0 .../bdb}/rpc_server/java/gen/__dbc_dup_reply.java | 0 .../bdb}/rpc_server/java/gen/__dbc_get_msg.java | 0 .../bdb}/rpc_server/java/gen/__dbc_get_reply.java | 0 .../bdb}/rpc_server/java/gen/__dbc_pget_msg.java | 0 .../bdb}/rpc_server/java/gen/__dbc_pget_reply.java | 0 .../bdb}/rpc_server/java/gen/__dbc_put_msg.java | 0 .../bdb}/rpc_server/java/gen/__dbc_put_reply.java | 0 .../rpc_server/java/gen/__env_cachesize_msg.java | 0 .../rpc_server/java/gen/__env_cachesize_reply.java | 0 .../bdb}/rpc_server/java/gen/__env_close_msg.java | 0 .../bdb}/rpc_server/java/gen/__env_close_reply.java | 0 .../bdb}/rpc_server/java/gen/__env_create_msg.java | 0 .../rpc_server/java/gen/__env_create_reply.java | 0 .../rpc_server/java/gen/__env_dbremove_msg.java | 0 .../rpc_server/java/gen/__env_dbremove_reply.java | 0 .../rpc_server/java/gen/__env_dbrename_msg.java | 0 .../rpc_server/java/gen/__env_dbrename_reply.java | 0 .../bdb}/rpc_server/java/gen/__env_encrypt_msg.java | 0 .../rpc_server/java/gen/__env_encrypt_reply.java | 0 .../bdb}/rpc_server/java/gen/__env_flags_msg.java | 0 .../bdb}/rpc_server/java/gen/__env_flags_reply.java | 0 .../bdb}/rpc_server/java/gen/__env_open_msg.java | 0 .../bdb}/rpc_server/java/gen/__env_open_reply.java | 0 .../bdb}/rpc_server/java/gen/__env_remove_msg.java | 0 .../rpc_server/java/gen/__env_remove_reply.java | 0 .../bdb}/rpc_server/java/gen/__txn_abort_msg.java | 0 .../bdb}/rpc_server/java/gen/__txn_abort_reply.java | 0 .../bdb}/rpc_server/java/gen/__txn_begin_msg.java | 0 .../bdb}/rpc_server/java/gen/__txn_begin_reply.java | 0 .../bdb}/rpc_server/java/gen/__txn_commit_msg.java | 0 .../rpc_server/java/gen/__txn_commit_reply.java | 0 .../bdb}/rpc_server/java/gen/__txn_discard_msg.java | 0 .../rpc_server/java/gen/__txn_discard_reply.java | 0 .../bdb}/rpc_server/java/gen/__txn_prepare_msg.java | 0 .../rpc_server/java/gen/__txn_prepare_reply.java | 0 .../bdb}/rpc_server/java/gen/__txn_recover_msg.java | 0 .../rpc_server/java/gen/__txn_recover_reply.java | 0 .../bdb}/rpc_server/java/gen/db_server.java | 0 {bdb => storage/bdb}/rpc_server/java/jrpcgen.jar | Bin {bdb => storage/bdb}/rpc_server/java/oncrpc.jar | Bin {bdb => storage/bdb}/rpc_server/java/s_jrpcgen | 0 {bdb => storage/bdb}/rpc_server/rpc.src | 0 {bdb => storage/bdb}/tcl/docs/db.html | 0 {bdb => storage/bdb}/tcl/docs/env.html | 0 {bdb => storage/bdb}/tcl/docs/historic.html | 0 {bdb => storage/bdb}/tcl/docs/index.html | 0 {bdb => storage/bdb}/tcl/docs/library.html | 0 {bdb => storage/bdb}/tcl/docs/lock.html | 0 {bdb => storage/bdb}/tcl/docs/log.html | 0 {bdb => storage/bdb}/tcl/docs/mpool.html | 0 {bdb => storage/bdb}/tcl/docs/rep.html | 0 {bdb => storage/bdb}/tcl/docs/test.html | 0 {bdb => storage/bdb}/tcl/docs/txn.html | 0 {bdb => storage/bdb}/tcl/tcl_compat.c | 0 {bdb => storage/bdb}/tcl/tcl_db.c | 0 {bdb => storage/bdb}/tcl/tcl_db_pkg.c | 0 {bdb => storage/bdb}/tcl/tcl_dbcursor.c | 0 {bdb => storage/bdb}/tcl/tcl_env.c | 0 {bdb => storage/bdb}/tcl/tcl_internal.c | 0 {bdb => storage/bdb}/tcl/tcl_lock.c | 0 {bdb => storage/bdb}/tcl/tcl_log.c | 0 {bdb => storage/bdb}/tcl/tcl_mp.c | 0 {bdb => storage/bdb}/tcl/tcl_rep.c | 0 {bdb => storage/bdb}/tcl/tcl_txn.c | 0 {bdb => storage/bdb}/tcl/tcl_util.c | 0 {bdb => storage/bdb}/test/archive.tcl | 0 {bdb => storage/bdb}/test/bigfile001.tcl | 0 {bdb => storage/bdb}/test/bigfile002.tcl | 0 {bdb => storage/bdb}/test/byteorder.tcl | 0 {bdb => storage/bdb}/test/conscript.tcl | 0 {bdb => storage/bdb}/test/dbm.tcl | 0 {bdb => storage/bdb}/test/dbscript.tcl | 0 {bdb => storage/bdb}/test/ddoyscript.tcl | 0 {bdb => storage/bdb}/test/ddscript.tcl | 0 {bdb => storage/bdb}/test/dead001.tcl | 0 {bdb => storage/bdb}/test/dead002.tcl | 0 {bdb => storage/bdb}/test/dead003.tcl | 0 {bdb => storage/bdb}/test/dead004.tcl | 0 {bdb => storage/bdb}/test/dead005.tcl | 0 {bdb => storage/bdb}/test/dead006.tcl | 0 {bdb => storage/bdb}/test/dead007.tcl | 0 {bdb => storage/bdb}/test/env001.tcl | 0 {bdb => storage/bdb}/test/env002.tcl | 0 {bdb => storage/bdb}/test/env003.tcl | 0 {bdb => storage/bdb}/test/env004.tcl | 0 {bdb => storage/bdb}/test/env005.tcl | 0 {bdb => storage/bdb}/test/env006.tcl | 0 {bdb => storage/bdb}/test/env007.tcl | 0 {bdb => storage/bdb}/test/env008.tcl | 0 {bdb => storage/bdb}/test/env009.tcl | 0 {bdb => storage/bdb}/test/env010.tcl | 0 {bdb => storage/bdb}/test/env011.tcl | 0 {bdb => storage/bdb}/test/hsearch.tcl | 0 {bdb => storage/bdb}/test/join.tcl | 0 {bdb => storage/bdb}/test/lock001.tcl | 0 {bdb => storage/bdb}/test/lock002.tcl | 0 {bdb => storage/bdb}/test/lock003.tcl | 0 {bdb => storage/bdb}/test/lock004.tcl | 0 {bdb => storage/bdb}/test/lock005.tcl | 0 {bdb => storage/bdb}/test/lockscript.tcl | 0 {bdb => storage/bdb}/test/log001.tcl | 0 {bdb => storage/bdb}/test/log002.tcl | 0 {bdb => storage/bdb}/test/log003.tcl | 0 {bdb => storage/bdb}/test/log004.tcl | 0 {bdb => storage/bdb}/test/log005.tcl | 0 {bdb => storage/bdb}/test/logtrack.tcl | 0 {bdb => storage/bdb}/test/mdbscript.tcl | 0 {bdb => storage/bdb}/test/memp001.tcl | 0 {bdb => storage/bdb}/test/memp002.tcl | 0 {bdb => storage/bdb}/test/memp003.tcl | 0 {bdb => storage/bdb}/test/mpoolscript.tcl | 0 {bdb => storage/bdb}/test/mutex001.tcl | 0 {bdb => storage/bdb}/test/mutex002.tcl | 0 {bdb => storage/bdb}/test/mutex003.tcl | 0 {bdb => storage/bdb}/test/mutexscript.tcl | 0 {bdb => storage/bdb}/test/ndbm.tcl | 0 {bdb => storage/bdb}/test/parallel.tcl | 0 {bdb => storage/bdb}/test/recd001.tcl | 0 {bdb => storage/bdb}/test/recd002.tcl | 0 {bdb => storage/bdb}/test/recd003.tcl | 0 {bdb => storage/bdb}/test/recd004.tcl | 0 {bdb => storage/bdb}/test/recd005.tcl | 0 {bdb => storage/bdb}/test/recd006.tcl | 0 {bdb => storage/bdb}/test/recd007.tcl | 0 {bdb => storage/bdb}/test/recd008.tcl | 0 {bdb => storage/bdb}/test/recd009.tcl | 0 {bdb => storage/bdb}/test/recd010.tcl | 0 {bdb => storage/bdb}/test/recd011.tcl | 0 {bdb => storage/bdb}/test/recd012.tcl | 0 {bdb => storage/bdb}/test/recd013.tcl | 0 {bdb => storage/bdb}/test/recd014.tcl | 0 {bdb => storage/bdb}/test/recd015.tcl | 0 {bdb => storage/bdb}/test/recd016.tcl | 0 {bdb => storage/bdb}/test/recd017.tcl | 0 {bdb => storage/bdb}/test/recd018.tcl | 0 {bdb => storage/bdb}/test/recd019.tcl | 0 {bdb => storage/bdb}/test/recd020.tcl | 0 {bdb => storage/bdb}/test/recd15scr.tcl | 0 {bdb => storage/bdb}/test/recdscript.tcl | 0 {bdb => storage/bdb}/test/rep001.tcl | 0 {bdb => storage/bdb}/test/rep002.tcl | 0 {bdb => storage/bdb}/test/rep003.tcl | 0 {bdb => storage/bdb}/test/rep004.tcl | 0 {bdb => storage/bdb}/test/rep005.tcl | 0 {bdb => storage/bdb}/test/reputils.tcl | 0 {bdb => storage/bdb}/test/rpc001.tcl | 0 {bdb => storage/bdb}/test/rpc002.tcl | 0 {bdb => storage/bdb}/test/rpc003.tcl | 0 {bdb => storage/bdb}/test/rpc004.tcl | 0 {bdb => storage/bdb}/test/rpc005.tcl | 0 {bdb => storage/bdb}/test/rsrc001.tcl | 0 {bdb => storage/bdb}/test/rsrc002.tcl | 0 {bdb => storage/bdb}/test/rsrc003.tcl | 0 {bdb => storage/bdb}/test/rsrc004.tcl | 0 {bdb => storage/bdb}/test/scr001/chk.code | 0 {bdb => storage/bdb}/test/scr002/chk.def | 0 {bdb => storage/bdb}/test/scr003/chk.define | 0 {bdb => storage/bdb}/test/scr004/chk.javafiles | 0 {bdb => storage/bdb}/test/scr005/chk.nl | 0 {bdb => storage/bdb}/test/scr006/chk.offt | 0 {bdb => storage/bdb}/test/scr007/chk.proto | 0 {bdb => storage/bdb}/test/scr008/chk.pubdef | 0 {bdb => storage/bdb}/test/scr009/chk.srcfiles | 0 {bdb => storage/bdb}/test/scr010/chk.str | 0 {bdb => storage/bdb}/test/scr010/spell.ok | 0 {bdb => storage/bdb}/test/scr011/chk.tags | 0 {bdb => storage/bdb}/test/scr012/chk.vx_code | 0 {bdb => storage/bdb}/test/scr013/chk.stats | 0 {bdb => storage/bdb}/test/scr014/chk.err | 0 {bdb => storage/bdb}/test/scr015/README | 0 .../bdb}/test/scr015/TestConstruct01.cpp | 0 .../bdb}/test/scr015/TestConstruct01.testerr | 0 .../bdb}/test/scr015/TestConstruct01.testout | 0 .../bdb}/test/scr015/TestExceptInclude.cpp | 0 .../bdb}/test/scr015/TestGetSetMethods.cpp | 0 {bdb => storage/bdb}/test/scr015/TestKeyRange.cpp | 0 .../bdb}/test/scr015/TestKeyRange.testin | 0 .../bdb}/test/scr015/TestKeyRange.testout | 0 {bdb => storage/bdb}/test/scr015/TestLogc.cpp | 0 {bdb => storage/bdb}/test/scr015/TestLogc.testout | 0 .../bdb}/test/scr015/TestSimpleAccess.cpp | 0 .../bdb}/test/scr015/TestSimpleAccess.testout | 0 {bdb => storage/bdb}/test/scr015/TestTruncate.cpp | 0 .../bdb}/test/scr015/TestTruncate.testout | 0 {bdb => storage/bdb}/test/scr015/chk.cxxtests | 0 {bdb => storage/bdb}/test/scr015/ignore | 0 {bdb => storage/bdb}/test/scr015/testall | 0 {bdb => storage/bdb}/test/scr015/testone | 0 {bdb => storage/bdb}/test/scr016/CallbackTest.java | 0 .../bdb}/test/scr016/CallbackTest.testout | 0 {bdb => storage/bdb}/test/scr016/README | 0 .../bdb}/test/scr016/TestAppendRecno.java | 0 .../bdb}/test/scr016/TestAppendRecno.testout | 0 {bdb => storage/bdb}/test/scr016/TestAssociate.java | 0 .../bdb}/test/scr016/TestAssociate.testout | 0 {bdb => storage/bdb}/test/scr016/TestClosedDb.java | 0 .../bdb}/test/scr016/TestClosedDb.testout | 0 .../bdb}/test/scr016/TestConstruct01.java | 0 .../bdb}/test/scr016/TestConstruct01.testerr | 0 .../bdb}/test/scr016/TestConstruct01.testout | 0 .../bdb}/test/scr016/TestConstruct02.java | 0 .../bdb}/test/scr016/TestConstruct02.testout | 0 {bdb => storage/bdb}/test/scr016/TestDbtFlags.java | 0 .../bdb}/test/scr016/TestDbtFlags.testerr | 0 .../bdb}/test/scr016/TestDbtFlags.testout | 0 .../bdb}/test/scr016/TestGetSetMethods.java | 0 {bdb => storage/bdb}/test/scr016/TestKeyRange.java | 0 .../bdb}/test/scr016/TestKeyRange.testout | 0 {bdb => storage/bdb}/test/scr016/TestLockVec.java | 0 .../bdb}/test/scr016/TestLockVec.testout | 0 {bdb => storage/bdb}/test/scr016/TestLogc.java | 0 {bdb => storage/bdb}/test/scr016/TestLogc.testout | 0 {bdb => storage/bdb}/test/scr016/TestOpenEmpty.java | 0 .../bdb}/test/scr016/TestOpenEmpty.testerr | 0 .../bdb}/test/scr016/TestReplication.java | 0 {bdb => storage/bdb}/test/scr016/TestRpcServer.java | 0 {bdb => storage/bdb}/test/scr016/TestSameDbt.java | 0 .../bdb}/test/scr016/TestSameDbt.testout | 0 .../bdb}/test/scr016/TestSimpleAccess.java | 0 .../bdb}/test/scr016/TestSimpleAccess.testout | 0 {bdb => storage/bdb}/test/scr016/TestStat.java | 0 {bdb => storage/bdb}/test/scr016/TestStat.testout | 0 {bdb => storage/bdb}/test/scr016/TestTruncate.java | 0 .../bdb}/test/scr016/TestTruncate.testout | 0 {bdb => storage/bdb}/test/scr016/TestUtil.java | 0 {bdb => storage/bdb}/test/scr016/TestXAServlet.java | 0 {bdb => storage/bdb}/test/scr016/chk.javatests | 0 {bdb => storage/bdb}/test/scr016/ignore | 0 {bdb => storage/bdb}/test/scr016/testall | 0 {bdb => storage/bdb}/test/scr016/testone | 0 {bdb => storage/bdb}/test/scr017/O.BH | 0 {bdb => storage/bdb}/test/scr017/O.R | 0 {bdb => storage/bdb}/test/scr017/chk.db185 | 0 {bdb => storage/bdb}/test/scr017/t.c | 0 {bdb => storage/bdb}/test/scr018/chk.comma | 0 {bdb => storage/bdb}/test/scr018/t.c | 0 {bdb => storage/bdb}/test/scr019/chk.include | 0 {bdb => storage/bdb}/test/scr020/chk.inc | 0 {bdb => storage/bdb}/test/scr021/chk.flags | 0 {bdb => storage/bdb}/test/scr022/chk.rr | 0 {bdb => storage/bdb}/test/sdb001.tcl | 0 {bdb => storage/bdb}/test/sdb002.tcl | 0 {bdb => storage/bdb}/test/sdb003.tcl | 0 {bdb => storage/bdb}/test/sdb004.tcl | 0 {bdb => storage/bdb}/test/sdb005.tcl | 0 {bdb => storage/bdb}/test/sdb006.tcl | 0 {bdb => storage/bdb}/test/sdb007.tcl | 0 {bdb => storage/bdb}/test/sdb008.tcl | 0 {bdb => storage/bdb}/test/sdb009.tcl | 0 {bdb => storage/bdb}/test/sdb010.tcl | 0 {bdb => storage/bdb}/test/sdb011.tcl | 0 {bdb => storage/bdb}/test/sdb012.tcl | 0 {bdb => storage/bdb}/test/sdbscript.tcl | 0 {bdb => storage/bdb}/test/sdbtest001.tcl | 0 {bdb => storage/bdb}/test/sdbtest002.tcl | 0 {bdb => storage/bdb}/test/sdbutils.tcl | 0 {bdb => storage/bdb}/test/sec001.tcl | 0 {bdb => storage/bdb}/test/sec002.tcl | 0 {bdb => storage/bdb}/test/shelltest.tcl | 0 {bdb => storage/bdb}/test/si001.tcl | 0 {bdb => storage/bdb}/test/si002.tcl | 0 {bdb => storage/bdb}/test/si003.tcl | 0 {bdb => storage/bdb}/test/si004.tcl | 0 {bdb => storage/bdb}/test/si005.tcl | 0 {bdb => storage/bdb}/test/si006.tcl | 0 {bdb => storage/bdb}/test/sindex.tcl | 0 {bdb => storage/bdb}/test/sysscript.tcl | 0 {bdb => storage/bdb}/test/test.tcl | 0 {bdb => storage/bdb}/test/test001.tcl | 0 {bdb => storage/bdb}/test/test002.tcl | 0 {bdb => storage/bdb}/test/test003.tcl | 0 {bdb => storage/bdb}/test/test004.tcl | 0 {bdb => storage/bdb}/test/test005.tcl | 0 {bdb => storage/bdb}/test/test006.tcl | 0 {bdb => storage/bdb}/test/test007.tcl | 0 {bdb => storage/bdb}/test/test008.tcl | 0 {bdb => storage/bdb}/test/test009.tcl | 0 {bdb => storage/bdb}/test/test010.tcl | 0 {bdb => storage/bdb}/test/test011.tcl | 0 {bdb => storage/bdb}/test/test012.tcl | 0 {bdb => storage/bdb}/test/test013.tcl | 0 {bdb => storage/bdb}/test/test014.tcl | 0 {bdb => storage/bdb}/test/test015.tcl | 0 {bdb => storage/bdb}/test/test016.tcl | 0 {bdb => storage/bdb}/test/test017.tcl | 0 {bdb => storage/bdb}/test/test018.tcl | 0 {bdb => storage/bdb}/test/test019.tcl | 0 {bdb => storage/bdb}/test/test020.tcl | 0 {bdb => storage/bdb}/test/test021.tcl | 0 {bdb => storage/bdb}/test/test022.tcl | 0 {bdb => storage/bdb}/test/test023.tcl | 0 {bdb => storage/bdb}/test/test024.tcl | 0 {bdb => storage/bdb}/test/test025.tcl | 0 {bdb => storage/bdb}/test/test026.tcl | 0 {bdb => storage/bdb}/test/test027.tcl | 0 {bdb => storage/bdb}/test/test028.tcl | 0 {bdb => storage/bdb}/test/test029.tcl | 0 {bdb => storage/bdb}/test/test030.tcl | 0 {bdb => storage/bdb}/test/test031.tcl | 0 {bdb => storage/bdb}/test/test032.tcl | 0 {bdb => storage/bdb}/test/test033.tcl | 0 {bdb => storage/bdb}/test/test034.tcl | 0 {bdb => storage/bdb}/test/test035.tcl | 0 {bdb => storage/bdb}/test/test036.tcl | 0 {bdb => storage/bdb}/test/test037.tcl | 0 {bdb => storage/bdb}/test/test038.tcl | 0 {bdb => storage/bdb}/test/test039.tcl | 0 {bdb => storage/bdb}/test/test040.tcl | 0 {bdb => storage/bdb}/test/test041.tcl | 0 {bdb => storage/bdb}/test/test042.tcl | 0 {bdb => storage/bdb}/test/test043.tcl | 0 {bdb => storage/bdb}/test/test044.tcl | 0 {bdb => storage/bdb}/test/test045.tcl | 0 {bdb => storage/bdb}/test/test046.tcl | 0 {bdb => storage/bdb}/test/test047.tcl | 0 {bdb => storage/bdb}/test/test048.tcl | 0 {bdb => storage/bdb}/test/test049.tcl | 0 {bdb => storage/bdb}/test/test050.tcl | 0 {bdb => storage/bdb}/test/test051.tcl | 0 {bdb => storage/bdb}/test/test052.tcl | 0 {bdb => storage/bdb}/test/test053.tcl | 0 {bdb => storage/bdb}/test/test054.tcl | 0 {bdb => storage/bdb}/test/test055.tcl | 0 {bdb => storage/bdb}/test/test056.tcl | 0 {bdb => storage/bdb}/test/test057.tcl | 0 {bdb => storage/bdb}/test/test058.tcl | 0 {bdb => storage/bdb}/test/test059.tcl | 0 {bdb => storage/bdb}/test/test060.tcl | 0 {bdb => storage/bdb}/test/test061.tcl | 0 {bdb => storage/bdb}/test/test062.tcl | 0 {bdb => storage/bdb}/test/test063.tcl | 0 {bdb => storage/bdb}/test/test064.tcl | 0 {bdb => storage/bdb}/test/test065.tcl | 0 {bdb => storage/bdb}/test/test066.tcl | 0 {bdb => storage/bdb}/test/test067.tcl | 0 {bdb => storage/bdb}/test/test068.tcl | 0 {bdb => storage/bdb}/test/test069.tcl | 0 {bdb => storage/bdb}/test/test070.tcl | 0 {bdb => storage/bdb}/test/test071.tcl | 0 {bdb => storage/bdb}/test/test072.tcl | 0 {bdb => storage/bdb}/test/test073.tcl | 0 {bdb => storage/bdb}/test/test074.tcl | 0 {bdb => storage/bdb}/test/test075.tcl | 0 {bdb => storage/bdb}/test/test076.tcl | 0 {bdb => storage/bdb}/test/test077.tcl | 0 {bdb => storage/bdb}/test/test078.tcl | 0 {bdb => storage/bdb}/test/test079.tcl | 0 {bdb => storage/bdb}/test/test080.tcl | 0 {bdb => storage/bdb}/test/test081.tcl | 0 {bdb => storage/bdb}/test/test082.tcl | 0 {bdb => storage/bdb}/test/test083.tcl | 0 {bdb => storage/bdb}/test/test084.tcl | 0 {bdb => storage/bdb}/test/test085.tcl | 0 {bdb => storage/bdb}/test/test086.tcl | 0 {bdb => storage/bdb}/test/test087.tcl | 0 {bdb => storage/bdb}/test/test088.tcl | 0 {bdb => storage/bdb}/test/test089.tcl | 0 {bdb => storage/bdb}/test/test090.tcl | 0 {bdb => storage/bdb}/test/test091.tcl | 0 {bdb => storage/bdb}/test/test092.tcl | 0 {bdb => storage/bdb}/test/test093.tcl | 0 {bdb => storage/bdb}/test/test094.tcl | 0 {bdb => storage/bdb}/test/test095.tcl | 0 {bdb => storage/bdb}/test/test096.tcl | 0 {bdb => storage/bdb}/test/test097.tcl | 0 {bdb => storage/bdb}/test/test098.tcl | 0 {bdb => storage/bdb}/test/test099.tcl | 0 {bdb => storage/bdb}/test/test100.tcl | 0 {bdb => storage/bdb}/test/test101.tcl | 0 {bdb => storage/bdb}/test/testparams.tcl | 0 {bdb => storage/bdb}/test/testutils.tcl | 0 {bdb => storage/bdb}/test/txn001.tcl | 0 {bdb => storage/bdb}/test/txn002.tcl | 0 {bdb => storage/bdb}/test/txn003.tcl | 0 {bdb => storage/bdb}/test/txn004.tcl | 0 {bdb => storage/bdb}/test/txn005.tcl | 0 {bdb => storage/bdb}/test/txn006.tcl | 0 {bdb => storage/bdb}/test/txn007.tcl | 0 {bdb => storage/bdb}/test/txn008.tcl | 0 {bdb => storage/bdb}/test/txn009.tcl | 0 {bdb => storage/bdb}/test/txnscript.tcl | 0 {bdb => storage/bdb}/test/update.tcl | 0 {bdb => storage/bdb}/test/upgrade.tcl | 0 {bdb => storage/bdb}/test/wordlist | 0 {bdb => storage/bdb}/test/wrap.tcl | 0 {bdb => storage/bdb}/txn/txn.c | 0 {bdb => storage/bdb}/txn/txn.src | 0 {bdb => storage/bdb}/txn/txn_method.c | 0 {bdb => storage/bdb}/txn/txn_rec.c | 0 {bdb => storage/bdb}/txn/txn_recover.c | 0 {bdb => storage/bdb}/txn/txn_region.c | 0 {bdb => storage/bdb}/txn/txn_stat.c | 0 {bdb => storage/bdb}/txn/txn_util.c | 0 {bdb => storage/bdb}/xa/xa.c | 0 {bdb => storage/bdb}/xa/xa_db.c | 0 {bdb => storage/bdb}/xa/xa_map.c | 0 {heap => storage/heap}/.cvsignore | 0 {heap => storage/heap}/ChangeLog | 0 {heap => storage/heap}/Makefile.am | 0 {heap => storage/heap}/_check.c | 0 {heap => storage/heap}/_rectest.c | 0 {heap => storage/heap}/heapdef.h | 0 {heap => storage/heap}/hp_block.c | 0 {heap => storage/heap}/hp_clear.c | 0 {heap => storage/heap}/hp_close.c | 0 {heap => storage/heap}/hp_create.c | 0 {heap => storage/heap}/hp_delete.c | 0 {heap => storage/heap}/hp_extra.c | 0 {heap => storage/heap}/hp_hash.c | 0 {heap => storage/heap}/hp_info.c | 0 {heap => storage/heap}/hp_open.c | 0 {heap => storage/heap}/hp_panic.c | 0 {heap => storage/heap}/hp_rename.c | 0 {heap => storage/heap}/hp_rfirst.c | 0 {heap => storage/heap}/hp_rkey.c | 0 {heap => storage/heap}/hp_rlast.c | 0 {heap => storage/heap}/hp_rnext.c | 0 {heap => storage/heap}/hp_rprev.c | 0 {heap => storage/heap}/hp_rrnd.c | 0 {heap => storage/heap}/hp_rsame.c | 0 {heap => storage/heap}/hp_scan.c | 0 {heap => storage/heap}/hp_static.c | 0 {heap => storage/heap}/hp_test1.c | 0 {heap => storage/heap}/hp_test2.c | 0 {heap => storage/heap}/hp_update.c | 0 {heap => storage/heap}/hp_write.c | 0 {heap => storage/heap}/make-ccc | 0 {innobase => storage/innobase}/Makefile.am | 0 {innobase => storage/innobase}/btr/Makefile.am | 0 {innobase => storage/innobase}/btr/btr0btr.c | 0 {innobase => storage/innobase}/btr/btr0cur.c | 0 {innobase => storage/innobase}/btr/btr0pcur.c | 0 {innobase => storage/innobase}/btr/btr0sea.c | 0 {innobase => storage/innobase}/btr/makefilewin | 0 {innobase => storage/innobase}/buf/Makefile.am | 0 {innobase => storage/innobase}/buf/buf0buf.c | 0 {innobase => storage/innobase}/buf/buf0flu.c | 0 {innobase => storage/innobase}/buf/buf0lru.c | 0 {innobase => storage/innobase}/buf/buf0rea.c | 0 {innobase => storage/innobase}/buf/makefilewin | 0 {innobase => storage/innobase}/configure.in | 0 {innobase => storage/innobase}/data/Makefile.am | 0 {innobase => storage/innobase}/data/data0data.c | 0 {innobase => storage/innobase}/data/data0type.c | 0 {innobase => storage/innobase}/data/makefilewin | 0 {innobase => storage/innobase}/db/db0err.h | 0 {innobase => storage/innobase}/dict/Makefile.am | 0 {innobase => storage/innobase}/dict/dict0boot.c | 0 {innobase => storage/innobase}/dict/dict0crea.c | 0 {innobase => storage/innobase}/dict/dict0dict.c | 0 {innobase => storage/innobase}/dict/dict0load.c | 0 {innobase => storage/innobase}/dict/dict0mem.c | 0 {innobase => storage/innobase}/dict/makefilewin | 0 {innobase => storage/innobase}/dyn/Makefile.am | 0 {innobase => storage/innobase}/dyn/dyn0dyn.c | 0 {innobase => storage/innobase}/dyn/makefilewin | 0 {innobase => storage/innobase}/eval/Makefile.am | 0 {innobase => storage/innobase}/eval/eval0eval.c | 0 {innobase => storage/innobase}/eval/eval0proc.c | 0 {innobase => storage/innobase}/eval/makefilewin | 0 {innobase => storage/innobase}/fil/Makefile.am | 0 {innobase => storage/innobase}/fil/fil0fil.c | 0 {innobase => storage/innobase}/fil/makefilewin | 0 {innobase => storage/innobase}/fsp/Makefile.am | 0 {innobase => storage/innobase}/fsp/fsp0fsp.c | 0 {innobase => storage/innobase}/fsp/makefilewin | 0 {innobase => storage/innobase}/fut/Makefile.am | 0 {innobase => storage/innobase}/fut/fut0fut.c | 0 {innobase => storage/innobase}/fut/fut0lst.c | 0 {innobase => storage/innobase}/fut/makefilewin | 0 {innobase => storage/innobase}/ha/Makefile.am | 0 {innobase => storage/innobase}/ha/ha0ha.c | 0 {innobase => storage/innobase}/ha/hash0hash.c | 0 {innobase => storage/innobase}/ha/makefilewin | 0 {innobase => storage/innobase}/ibuf/Makefile.am | 0 {innobase => storage/innobase}/ibuf/ibuf0ibuf.c | 0 {innobase => storage/innobase}/ibuf/makefilewin | 0 {innobase => storage/innobase}/include/Makefile.am | 0 {innobase => storage/innobase}/include/Makefile.i | 0 {innobase => storage/innobase}/include/btr0btr.h | 0 {innobase => storage/innobase}/include/btr0btr.ic | 0 {innobase => storage/innobase}/include/btr0cur.h | 0 {innobase => storage/innobase}/include/btr0cur.ic | 0 {innobase => storage/innobase}/include/btr0pcur.h | 0 {innobase => storage/innobase}/include/btr0pcur.ic | 0 {innobase => storage/innobase}/include/btr0sea.h | 0 {innobase => storage/innobase}/include/btr0sea.ic | 0 {innobase => storage/innobase}/include/btr0types.h | 0 {innobase => storage/innobase}/include/buf0buf.h | 0 {innobase => storage/innobase}/include/buf0buf.ic | 0 {innobase => storage/innobase}/include/buf0flu.h | 0 {innobase => storage/innobase}/include/buf0flu.ic | 0 {innobase => storage/innobase}/include/buf0lru.h | 0 {innobase => storage/innobase}/include/buf0lru.ic | 0 {innobase => storage/innobase}/include/buf0rea.h | 0 {innobase => storage/innobase}/include/buf0types.h | 0 {innobase => storage/innobase}/include/data0data.h | 0 {innobase => storage/innobase}/include/data0data.ic | 0 {innobase => storage/innobase}/include/data0type.h | 0 {innobase => storage/innobase}/include/data0type.ic | 0 {innobase => storage/innobase}/include/data0types.h | 0 {innobase => storage/innobase}/include/db0err.h | 0 {innobase => storage/innobase}/include/dict0boot.h | 0 {innobase => storage/innobase}/include/dict0boot.ic | 0 {innobase => storage/innobase}/include/dict0crea.h | 0 {innobase => storage/innobase}/include/dict0crea.ic | 0 {innobase => storage/innobase}/include/dict0dict.h | 0 {innobase => storage/innobase}/include/dict0dict.ic | 0 {innobase => storage/innobase}/include/dict0load.h | 0 {innobase => storage/innobase}/include/dict0load.ic | 0 {innobase => storage/innobase}/include/dict0mem.h | 0 {innobase => storage/innobase}/include/dict0mem.ic | 0 {innobase => storage/innobase}/include/dict0types.h | 0 {innobase => storage/innobase}/include/dyn0dyn.h | 0 {innobase => storage/innobase}/include/dyn0dyn.ic | 0 {innobase => storage/innobase}/include/eval0eval.h | 0 {innobase => storage/innobase}/include/eval0eval.ic | 0 {innobase => storage/innobase}/include/eval0proc.h | 0 {innobase => storage/innobase}/include/eval0proc.ic | 0 {innobase => storage/innobase}/include/fil0fil.h | 0 {innobase => storage/innobase}/include/fsp0fsp.h | 0 {innobase => storage/innobase}/include/fsp0fsp.ic | 0 {innobase => storage/innobase}/include/fut0fut.h | 0 {innobase => storage/innobase}/include/fut0fut.ic | 0 {innobase => storage/innobase}/include/fut0lst.h | 0 {innobase => storage/innobase}/include/fut0lst.ic | 0 {innobase => storage/innobase}/include/ha0ha.h | 0 {innobase => storage/innobase}/include/ha0ha.ic | 0 {innobase => storage/innobase}/include/hash0hash.h | 0 {innobase => storage/innobase}/include/hash0hash.ic | 0 {innobase => storage/innobase}/include/ibuf0ibuf.h | 0 {innobase => storage/innobase}/include/ibuf0ibuf.ic | 0 {innobase => storage/innobase}/include/ibuf0types.h | 0 {innobase => storage/innobase}/include/lock0lock.h | 0 {innobase => storage/innobase}/include/lock0lock.ic | 0 {innobase => storage/innobase}/include/lock0types.h | 0 {innobase => storage/innobase}/include/log0log.h | 0 {innobase => storage/innobase}/include/log0log.ic | 0 {innobase => storage/innobase}/include/log0recv.h | 0 {innobase => storage/innobase}/include/log0recv.ic | 0 {innobase => storage/innobase}/include/mach0data.h | 0 {innobase => storage/innobase}/include/mach0data.ic | 0 .../innobase}/include/makefilewin.i | 0 {innobase => storage/innobase}/include/mem0dbg.h | 0 {innobase => storage/innobase}/include/mem0dbg.ic | 0 {innobase => storage/innobase}/include/mem0mem.h | 0 {innobase => storage/innobase}/include/mem0mem.ic | 0 {innobase => storage/innobase}/include/mem0pool.h | 0 {innobase => storage/innobase}/include/mem0pool.ic | 0 {innobase => storage/innobase}/include/mtr0log.h | 0 {innobase => storage/innobase}/include/mtr0log.ic | 0 {innobase => storage/innobase}/include/mtr0mtr.h | 0 {innobase => storage/innobase}/include/mtr0mtr.ic | 0 {innobase => storage/innobase}/include/mtr0types.h | 0 {innobase => storage/innobase}/include/os0file.h | 0 {innobase => storage/innobase}/include/os0proc.h | 0 {innobase => storage/innobase}/include/os0proc.ic | 0 {innobase => storage/innobase}/include/os0sync.h | 0 {innobase => storage/innobase}/include/os0sync.ic | 0 {innobase => storage/innobase}/include/os0thread.h | 0 {innobase => storage/innobase}/include/os0thread.ic | 0 {innobase => storage/innobase}/include/page0cur.h | 0 {innobase => storage/innobase}/include/page0cur.ic | 0 {innobase => storage/innobase}/include/page0page.h | 0 {innobase => storage/innobase}/include/page0page.ic | 0 {innobase => storage/innobase}/include/page0types.h | 0 {innobase => storage/innobase}/include/pars0grm.h | 0 {innobase => storage/innobase}/include/pars0opt.h | 0 {innobase => storage/innobase}/include/pars0opt.ic | 0 {innobase => storage/innobase}/include/pars0pars.h | 0 {innobase => storage/innobase}/include/pars0pars.ic | 0 {innobase => storage/innobase}/include/pars0sym.h | 0 {innobase => storage/innobase}/include/pars0sym.ic | 0 {innobase => storage/innobase}/include/pars0types.h | 0 {innobase => storage/innobase}/include/que0que.h | 0 {innobase => storage/innobase}/include/que0que.ic | 0 {innobase => storage/innobase}/include/que0types.h | 0 {innobase => storage/innobase}/include/read0read.h | 0 {innobase => storage/innobase}/include/read0read.ic | 0 {innobase => storage/innobase}/include/read0types.h | 0 {innobase => storage/innobase}/include/rem0cmp.h | 0 {innobase => storage/innobase}/include/rem0cmp.ic | 0 {innobase => storage/innobase}/include/rem0rec.h | 0 {innobase => storage/innobase}/include/rem0rec.ic | 0 {innobase => storage/innobase}/include/rem0types.h | 0 {innobase => storage/innobase}/include/row0ins.h | 0 {innobase => storage/innobase}/include/row0ins.ic | 0 {innobase => storage/innobase}/include/row0mysql.h | 0 {innobase => storage/innobase}/include/row0mysql.ic | 0 {innobase => storage/innobase}/include/row0purge.h | 0 {innobase => storage/innobase}/include/row0purge.ic | 0 {innobase => storage/innobase}/include/row0row.h | 0 {innobase => storage/innobase}/include/row0row.ic | 0 {innobase => storage/innobase}/include/row0sel.h | 0 {innobase => storage/innobase}/include/row0sel.ic | 0 {innobase => storage/innobase}/include/row0types.h | 0 {innobase => storage/innobase}/include/row0uins.h | 0 {innobase => storage/innobase}/include/row0uins.ic | 0 {innobase => storage/innobase}/include/row0umod.h | 0 {innobase => storage/innobase}/include/row0umod.ic | 0 {innobase => storage/innobase}/include/row0undo.h | 0 {innobase => storage/innobase}/include/row0undo.ic | 0 {innobase => storage/innobase}/include/row0upd.h | 0 {innobase => storage/innobase}/include/row0upd.ic | 0 {innobase => storage/innobase}/include/row0vers.h | 0 {innobase => storage/innobase}/include/row0vers.ic | 0 {innobase => storage/innobase}/include/srv0que.h | 0 {innobase => storage/innobase}/include/srv0srv.h | 0 {innobase => storage/innobase}/include/srv0srv.ic | 0 {innobase => storage/innobase}/include/srv0start.h | 0 {innobase => storage/innobase}/include/sync0arr.h | 0 {innobase => storage/innobase}/include/sync0arr.ic | 0 {innobase => storage/innobase}/include/sync0rw.h | 0 {innobase => storage/innobase}/include/sync0rw.ic | 0 {innobase => storage/innobase}/include/sync0sync.h | 0 {innobase => storage/innobase}/include/sync0sync.ic | 0 {innobase => storage/innobase}/include/sync0types.h | 0 {innobase => storage/innobase}/include/thr0loc.h | 0 {innobase => storage/innobase}/include/thr0loc.ic | 0 {innobase => storage/innobase}/include/trx0purge.h | 0 {innobase => storage/innobase}/include/trx0purge.ic | 0 {innobase => storage/innobase}/include/trx0rec.h | 0 {innobase => storage/innobase}/include/trx0rec.ic | 0 {innobase => storage/innobase}/include/trx0roll.h | 0 {innobase => storage/innobase}/include/trx0roll.ic | 0 {innobase => storage/innobase}/include/trx0rseg.h | 0 {innobase => storage/innobase}/include/trx0rseg.ic | 0 {innobase => storage/innobase}/include/trx0sys.h | 0 {innobase => storage/innobase}/include/trx0sys.ic | 0 {innobase => storage/innobase}/include/trx0trx.h | 0 {innobase => storage/innobase}/include/trx0trx.ic | 0 {innobase => storage/innobase}/include/trx0types.h | 0 {innobase => storage/innobase}/include/trx0undo.h | 0 {innobase => storage/innobase}/include/trx0undo.ic | 0 {innobase => storage/innobase}/include/trx0xa.h | 0 {innobase => storage/innobase}/include/univ.i | 0 {innobase => storage/innobase}/include/usr0sess.h | 0 {innobase => storage/innobase}/include/usr0sess.ic | 0 {innobase => storage/innobase}/include/usr0types.h | 0 {innobase => storage/innobase}/include/ut0byte.h | 0 {innobase => storage/innobase}/include/ut0byte.ic | 0 {innobase => storage/innobase}/include/ut0dbg.h | 0 {innobase => storage/innobase}/include/ut0lst.h | 0 {innobase => storage/innobase}/include/ut0mem.h | 0 {innobase => storage/innobase}/include/ut0mem.ic | 0 {innobase => storage/innobase}/include/ut0rnd.h | 0 {innobase => storage/innobase}/include/ut0rnd.ic | 0 {innobase => storage/innobase}/include/ut0sort.h | 0 {innobase => storage/innobase}/include/ut0ut.h | 0 {innobase => storage/innobase}/include/ut0ut.ic | 0 {innobase => storage/innobase}/lock/Makefile.am | 0 {innobase => storage/innobase}/lock/lock0lock.c | 0 {innobase => storage/innobase}/lock/makefilewin | 0 {innobase => storage/innobase}/log/Makefile.am | 0 {innobase => storage/innobase}/log/log0log.c | 0 {innobase => storage/innobase}/log/log0recv.c | 0 {innobase => storage/innobase}/log/makefilewin | 0 {innobase => storage/innobase}/mach/Makefile.am | 0 {innobase => storage/innobase}/mach/mach0data.c | 0 {innobase => storage/innobase}/mach/makefilewin | 0 {innobase => storage/innobase}/makefilewin | 0 {innobase => storage/innobase}/mem/Makefile.am | 0 {innobase => storage/innobase}/mem/makefilewin | 0 {innobase => storage/innobase}/mem/mem0dbg.c | 0 {innobase => storage/innobase}/mem/mem0mem.c | 0 {innobase => storage/innobase}/mem/mem0pool.c | 0 {innobase => storage/innobase}/mtr/Makefile.am | 0 {innobase => storage/innobase}/mtr/makefilewin | 0 {innobase => storage/innobase}/mtr/mtr0log.c | 0 {innobase => storage/innobase}/mtr/mtr0mtr.c | 0 {innobase => storage/innobase}/my_cnf | 0 {innobase => storage/innobase}/os/Makefile.am | 0 {innobase => storage/innobase}/os/makefilewin | 0 {innobase => storage/innobase}/os/os0file.c | 0 {innobase => storage/innobase}/os/os0proc.c | 0 {innobase => storage/innobase}/os/os0sync.c | 0 {innobase => storage/innobase}/os/os0thread.c | 0 {innobase => storage/innobase}/page/Makefile.am | 0 {innobase => storage/innobase}/page/makefilewin | 0 {innobase => storage/innobase}/page/page0cur.c | 0 {innobase => storage/innobase}/page/page0page.c | 0 {innobase => storage/innobase}/pars/Makefile.am | 0 {innobase => storage/innobase}/pars/lexyy.c | 0 {innobase => storage/innobase}/pars/makefilewin | 0 {innobase => storage/innobase}/pars/pars0grm.c | 0 {innobase => storage/innobase}/pars/pars0grm.h | 0 {innobase => storage/innobase}/pars/pars0grm.y | 0 {innobase => storage/innobase}/pars/pars0lex.l | 0 {innobase => storage/innobase}/pars/pars0opt.c | 0 {innobase => storage/innobase}/pars/pars0pars.c | 0 {innobase => storage/innobase}/pars/pars0sym.c | 0 {innobase => storage/innobase}/que/Makefile.am | 0 {innobase => storage/innobase}/que/makefilewin | 0 {innobase => storage/innobase}/que/que0que.c | 0 {innobase => storage/innobase}/read/Makefile.am | 0 {innobase => storage/innobase}/read/makefilewin | 0 {innobase => storage/innobase}/read/read0read.c | 0 {innobase => storage/innobase}/rem/Makefile.am | 0 {innobase => storage/innobase}/rem/makefilewin | 0 {innobase => storage/innobase}/rem/rem0cmp.c | 0 {innobase => storage/innobase}/rem/rem0rec.c | 0 {innobase => storage/innobase}/row/Makefile.am | 0 {innobase => storage/innobase}/row/makefilewin | 0 {innobase => storage/innobase}/row/row0ins.c | 0 {innobase => storage/innobase}/row/row0mysql.c | 0 {innobase => storage/innobase}/row/row0purge.c | 0 {innobase => storage/innobase}/row/row0row.c | 0 {innobase => storage/innobase}/row/row0sel.c | 0 {innobase => storage/innobase}/row/row0uins.c | 0 {innobase => storage/innobase}/row/row0umod.c | 0 {innobase => storage/innobase}/row/row0undo.c | 0 {innobase => storage/innobase}/row/row0upd.c | 0 {innobase => storage/innobase}/row/row0vers.c | 0 {innobase => storage/innobase}/srv/Makefile.am | 0 {innobase => storage/innobase}/srv/makefilewin | 0 {innobase => storage/innobase}/srv/srv0que.c | 0 {innobase => storage/innobase}/srv/srv0srv.c | 0 {innobase => storage/innobase}/srv/srv0start.c | 0 {innobase => storage/innobase}/sync/Makefile.am | 0 {innobase => storage/innobase}/sync/makefilewin | 0 {innobase => storage/innobase}/sync/sync0arr.c | 0 {innobase => storage/innobase}/sync/sync0rw.c | 0 {innobase => storage/innobase}/sync/sync0sync.c | 0 {innobase => storage/innobase}/thr/Makefile.am | 0 {innobase => storage/innobase}/thr/makefilewin | 0 {innobase => storage/innobase}/thr/thr0loc.c | 0 {innobase => storage/innobase}/trx/Makefile.am | 0 {innobase => storage/innobase}/trx/makefilewin | 0 {innobase => storage/innobase}/trx/trx0purge.c | 0 {innobase => storage/innobase}/trx/trx0rec.c | 0 {innobase => storage/innobase}/trx/trx0roll.c | 0 {innobase => storage/innobase}/trx/trx0rseg.c | 0 {innobase => storage/innobase}/trx/trx0sys.c | 0 {innobase => storage/innobase}/trx/trx0trx.c | 0 {innobase => storage/innobase}/trx/trx0undo.c | 0 {innobase => storage/innobase}/usr/Makefile.am | 0 {innobase => storage/innobase}/usr/makefilewin | 0 {innobase => storage/innobase}/usr/usr0sess.c | 0 {innobase => storage/innobase}/ut/Makefile.am | 0 {innobase => storage/innobase}/ut/makefilewin | 0 {innobase => storage/innobase}/ut/ut0byte.c | 0 {innobase => storage/innobase}/ut/ut0dbg.c | 0 {innobase => storage/innobase}/ut/ut0mem.c | 0 {innobase => storage/innobase}/ut/ut0rnd.c | 0 {innobase => storage/innobase}/ut/ut0ut.c | 0 {myisam => storage/myisam}/.cvsignore | 0 {myisam => storage/myisam}/ChangeLog | 0 {myisam => storage/myisam}/Makefile.am | 0 {myisam => storage/myisam}/NEWS | 0 {myisam => storage/myisam}/TODO | 0 {myisam => storage/myisam}/ft_boolean_search.c | 0 {myisam => storage/myisam}/ft_eval.c | 0 {myisam => storage/myisam}/ft_eval.h | 0 {myisam => storage/myisam}/ft_nlq_search.c | 0 {myisam => storage/myisam}/ft_parser.c | 0 {myisam => storage/myisam}/ft_static.c | 0 {myisam => storage/myisam}/ft_stem.c | 0 {myisam => storage/myisam}/ft_stopwords.c | 0 {myisam => storage/myisam}/ft_test1.c | 0 {myisam => storage/myisam}/ft_test1.h | 0 {myisam => storage/myisam}/ft_update.c | 0 {myisam => storage/myisam}/ftbench/Ecompare.pl | 0 {myisam => storage/myisam}/ftbench/Ecreate.pl | 0 {myisam => storage/myisam}/ftbench/Ereport.pl | 0 {myisam => storage/myisam}/ftbench/README | 0 {myisam => storage/myisam}/ftbench/ft-test-run.sh | 0 {myisam => storage/myisam}/ftdefs.h | 0 {myisam => storage/myisam}/fulltext.h | 0 {myisam => storage/myisam}/make-ccc | 0 {myisam => storage/myisam}/mi_cache.c | 0 {myisam => storage/myisam}/mi_changed.c | 0 {myisam => storage/myisam}/mi_check.c | 0 {myisam => storage/myisam}/mi_checksum.c | 0 {myisam => storage/myisam}/mi_close.c | 0 {myisam => storage/myisam}/mi_create.c | 0 {myisam => storage/myisam}/mi_dbug.c | 0 {myisam => storage/myisam}/mi_delete.c | 0 {myisam => storage/myisam}/mi_delete_all.c | 0 {myisam => storage/myisam}/mi_delete_table.c | 0 {myisam => storage/myisam}/mi_dynrec.c | 0 {myisam => storage/myisam}/mi_extra.c | 0 {myisam => storage/myisam}/mi_info.c | 0 {myisam => storage/myisam}/mi_key.c | 0 {myisam => storage/myisam}/mi_keycache.c | 0 {myisam => storage/myisam}/mi_locking.c | 0 {myisam => storage/myisam}/mi_log.c | 0 {myisam => storage/myisam}/mi_open.c | 0 {myisam => storage/myisam}/mi_packrec.c | 0 {myisam => storage/myisam}/mi_page.c | 0 {myisam => storage/myisam}/mi_panic.c | 0 {myisam => storage/myisam}/mi_preload.c | 0 {myisam => storage/myisam}/mi_range.c | 0 {myisam => storage/myisam}/mi_rename.c | 0 {myisam => storage/myisam}/mi_rfirst.c | 0 {myisam => storage/myisam}/mi_rkey.c | 0 {myisam => storage/myisam}/mi_rlast.c | 0 {myisam => storage/myisam}/mi_rnext.c | 0 {myisam => storage/myisam}/mi_rnext_same.c | 0 {myisam => storage/myisam}/mi_rprev.c | 0 {myisam => storage/myisam}/mi_rrnd.c | 0 {myisam => storage/myisam}/mi_rsame.c | 0 {myisam => storage/myisam}/mi_rsamepos.c | 0 {myisam => storage/myisam}/mi_scan.c | 0 {myisam => storage/myisam}/mi_search.c | 0 {myisam => storage/myisam}/mi_static.c | 0 {myisam => storage/myisam}/mi_statrec.c | 0 {myisam => storage/myisam}/mi_test1.c | 0 {myisam => storage/myisam}/mi_test2.c | 0 {myisam => storage/myisam}/mi_test3.c | 0 {myisam => storage/myisam}/mi_test_all.res | 0 {myisam => storage/myisam}/mi_test_all.sh | 0 {myisam => storage/myisam}/mi_unique.c | 0 {myisam => storage/myisam}/mi_update.c | 0 {myisam => storage/myisam}/mi_write.c | 0 {myisam => storage/myisam}/myisam_ftdump.c | 0 {myisam => storage/myisam}/myisamchk.c | 0 {myisam => storage/myisam}/myisamdef.h | 0 {myisam => storage/myisam}/myisamlog.c | 0 {myisam => storage/myisam}/myisampack.c | 0 {myisam => storage/myisam}/rt_index.c | 0 {myisam => storage/myisam}/rt_index.h | 0 {myisam => storage/myisam}/rt_key.c | 0 {myisam => storage/myisam}/rt_key.h | 0 {myisam => storage/myisam}/rt_mbr.c | 0 {myisam => storage/myisam}/rt_mbr.h | 0 {myisam => storage/myisam}/rt_split.c | 0 {myisam => storage/myisam}/rt_test.c | 0 {myisam => storage/myisam}/sort.c | 0 {myisam => storage/myisam}/sp_defs.h | 0 {myisam => storage/myisam}/sp_key.c | 0 {myisam => storage/myisam}/sp_test.c | 0 {myisam => storage/myisam}/test_pack | 0 {myisammrg => storage/myisammrg}/.cvsignore | 0 {myisammrg => storage/myisammrg}/Makefile.am | 0 {myisammrg => storage/myisammrg}/make-ccc | 0 {myisammrg => storage/myisammrg}/myrg_close.c | 0 {myisammrg => storage/myisammrg}/myrg_create.c | 0 {myisammrg => storage/myisammrg}/myrg_def.h | 2 +- {myisammrg => storage/myisammrg}/myrg_delete.c | 0 {myisammrg => storage/myisammrg}/myrg_extra.c | 0 {myisammrg => storage/myisammrg}/myrg_info.c | 0 {myisammrg => storage/myisammrg}/myrg_locking.c | 0 {myisammrg => storage/myisammrg}/myrg_open.c | 0 {myisammrg => storage/myisammrg}/myrg_panic.c | 0 {myisammrg => storage/myisammrg}/myrg_queue.c | 0 {myisammrg => storage/myisammrg}/myrg_range.c | 0 {myisammrg => storage/myisammrg}/myrg_rfirst.c | 0 {myisammrg => storage/myisammrg}/myrg_rkey.c | 0 {myisammrg => storage/myisammrg}/myrg_rlast.c | 0 {myisammrg => storage/myisammrg}/myrg_rnext.c | 0 {myisammrg => storage/myisammrg}/myrg_rnext_same.c | 0 {myisammrg => storage/myisammrg}/myrg_rprev.c | 0 {myisammrg => storage/myisammrg}/myrg_rrnd.c | 0 {myisammrg => storage/myisammrg}/myrg_rsame.c | 0 {myisammrg => storage/myisammrg}/myrg_static.c | 0 {myisammrg => storage/myisammrg}/myrg_update.c | 0 {myisammrg => storage/myisammrg}/myrg_write.c | 0 {ndb => storage/ndb}/Makefile.am | 0 {ndb => storage/ndb}/bin/.empty | 0 {ndb => storage/ndb}/bin/check-regression.sh | 0 {ndb => storage/ndb}/bin/makeTestPrograms_html.sh | 0 {ndb => storage/ndb}/config/common.mk.am | 0 {ndb => storage/ndb}/config/make-win-dsw.sh | 0 {ndb => storage/ndb}/config/type_kernel.mk.am | 0 {ndb => storage/ndb}/config/type_mgmapiclient.mk.am | 0 {ndb => storage/ndb}/config/type_ndbapi.mk.am | 0 {ndb => storage/ndb}/config/type_ndbapiclient.mk.am | 0 {ndb => storage/ndb}/config/type_ndbapitest.mk.am | 0 {ndb => storage/ndb}/config/type_ndbapitools.mk.am | 0 {ndb => storage/ndb}/config/type_util.mk.am | 0 {ndb => storage/ndb}/config/win-includes | 0 {ndb => storage/ndb}/config/win-lib.am | 0 {ndb => storage/ndb}/config/win-libraries | 0 {ndb => storage/ndb}/config/win-name | 0 {ndb => storage/ndb}/config/win-prg.am | 0 {ndb => storage/ndb}/config/win-sources | 0 {ndb => storage/ndb}/demos/1-node/1-api-3/Ndb.cfg | 0 {ndb => storage/ndb}/demos/1-node/1-db-2/Ndb.cfg | 0 {ndb => storage/ndb}/demos/1-node/1-mgm-1/Ndb.cfg | 0 .../ndb}/demos/1-node/1-mgm-1/template_config.ini | 0 {ndb => storage/ndb}/demos/2-node/2-api-4/Ndb.cfg | 0 {ndb => storage/ndb}/demos/2-node/2-api-5/Ndb.cfg | 0 {ndb => storage/ndb}/demos/2-node/2-api-6/Ndb.cfg | 0 {ndb => storage/ndb}/demos/2-node/2-api-7/Ndb.cfg | 0 {ndb => storage/ndb}/demos/2-node/2-db-2/Ndb.cfg | 0 {ndb => storage/ndb}/demos/2-node/2-db-3/Ndb.cfg | 0 {ndb => storage/ndb}/demos/2-node/2-mgm-1/Ndb.cfg | 0 .../ndb}/demos/2-node/2-mgm-1/template_config.ini | 0 .../config-templates/config_template-1-REP.ini | 0 .../demos/config-templates/config_template-4.ini | 0 .../config-templates/config_template-install.ini | 0 .../ndb}/demos/run_demo1-PS-SS_common.sh | 0 {ndb => storage/ndb}/demos/run_demo1-PS.sh | 0 {ndb => storage/ndb}/demos/run_demo1-SS.sh | 0 {ndb => storage/ndb}/demos/run_demo1.sh | 0 {ndb => storage/ndb}/demos/run_demo2.sh | 0 {ndb => storage/ndb}/docs/Makefile.am | 0 {ndb => storage/ndb}/docs/README | 0 {ndb => storage/ndb}/docs/doxygen/Doxyfile.mgmapi | 0 {ndb => storage/ndb}/docs/doxygen/Doxyfile.ndb | 0 {ndb => storage/ndb}/docs/doxygen/Doxyfile.ndbapi | 0 {ndb => storage/ndb}/docs/doxygen/Doxyfile.odbc | 0 {ndb => storage/ndb}/docs/doxygen/Doxyfile.test | 0 {ndb => storage/ndb}/docs/doxygen/header.mgmapi.tex | 0 {ndb => storage/ndb}/docs/doxygen/header.ndbapi.tex | 0 {ndb => storage/ndb}/docs/doxygen/postdoxy.pl | 0 {ndb => storage/ndb}/docs/doxygen/predoxy.pl | 0 {ndb => storage/ndb}/docs/wl2077.txt | 0 {ndb => storage/ndb}/home/bin/Linuxmkisofs | Bin {ndb => storage/ndb}/home/bin/Solarismkisofs | Bin {ndb => storage/ndb}/home/bin/cvs2cl.pl | 0 {ndb => storage/ndb}/home/bin/fix-cvs-root | 0 {ndb => storage/ndb}/home/bin/import-from-bk.sh | 0 {ndb => storage/ndb}/home/bin/ndb_deploy | 0 {ndb => storage/ndb}/home/bin/ndbdoxy.pl | 0 {ndb => storage/ndb}/home/bin/ngcalc | 0 {ndb => storage/ndb}/home/bin/parseConfigFile.awk | 0 {ndb => storage/ndb}/home/bin/setup-test.sh | 0 .../home/bin/signallog2html.lib/signallog2list.awk | 0 .../home/bin/signallog2html.lib/uniq_blocks.awk | 0 {ndb => storage/ndb}/home/bin/signallog2html.sh | 0 {ndb => storage/ndb}/home/bin/stripcr | 0 {ndb => storage/ndb}/home/lib/funcs.sh | 0 {ndb => storage/ndb}/include/Makefile.am | 0 .../ndb}/include/debugger/DebuggerNames.hpp | 0 .../ndb}/include/debugger/EventLogger.hpp | 0 {ndb => storage/ndb}/include/debugger/GrepError.hpp | 0 .../ndb}/include/debugger/SignalLoggerManager.hpp | 0 {ndb => storage/ndb}/include/editline/editline.h | 0 .../ndb}/include/kernel/AttributeDescriptor.hpp | 0 .../ndb}/include/kernel/AttributeHeader.hpp | 0 .../ndb}/include/kernel/AttributeList.hpp | 0 {ndb => storage/ndb}/include/kernel/BlockNumbers.h | 0 .../ndb}/include/kernel/GlobalSignalNumbers.h | 0 {ndb => storage/ndb}/include/kernel/GrepEvent.hpp | 0 {ndb => storage/ndb}/include/kernel/Interpreter.hpp | 0 {ndb => storage/ndb}/include/kernel/LogLevel.hpp | 0 {ndb => storage/ndb}/include/kernel/NodeBitmask.hpp | 0 {ndb => storage/ndb}/include/kernel/NodeInfo.hpp | 0 {ndb => storage/ndb}/include/kernel/NodeState.hpp | 0 {ndb => storage/ndb}/include/kernel/RefConvert.hpp | 0 .../ndb}/include/kernel/kernel_config_parameters.h | 0 {ndb => storage/ndb}/include/kernel/kernel_types.h | 0 {ndb => storage/ndb}/include/kernel/ndb_limits.h | 0 .../ndb}/include/kernel/signaldata/AbortAll.hpp | 0 .../ndb}/include/kernel/signaldata/AccFrag.hpp | 0 .../ndb}/include/kernel/signaldata/AccLock.hpp | 0 .../ndb}/include/kernel/signaldata/AccScan.hpp | 0 .../include/kernel/signaldata/AccSizeAltReq.hpp | 0 .../ndb}/include/kernel/signaldata/AlterIndx.hpp | 0 .../ndb}/include/kernel/signaldata/AlterTab.hpp | 0 .../ndb}/include/kernel/signaldata/AlterTable.hpp | 0 .../ndb}/include/kernel/signaldata/AlterTrig.hpp | 0 .../include/kernel/signaldata/ApiRegSignalData.hpp | 0 .../ndb}/include/kernel/signaldata/ApiVersion.hpp | 0 .../include/kernel/signaldata/ArbitSignalData.hpp | 0 .../ndb}/include/kernel/signaldata/AttrInfo.hpp | 0 .../include/kernel/signaldata/BackupContinueB.hpp | 0 .../ndb}/include/kernel/signaldata/BackupImpl.hpp | 0 .../include/kernel/signaldata/BackupSignalData.hpp | 0 .../include/kernel/signaldata/BlockCommitOrd.hpp | 0 .../ndb}/include/kernel/signaldata/BuildIndx.hpp | 0 .../include/kernel/signaldata/CheckNodeGroups.hpp | 0 .../include/kernel/signaldata/CloseComReqConf.hpp | 0 .../ndb}/include/kernel/signaldata/CmInit.hpp | 0 .../include/kernel/signaldata/CmRegSignalData.hpp | 0 .../ndb}/include/kernel/signaldata/CmvmiCfgConf.hpp | 0 .../include/kernel/signaldata/CntrMasterConf.hpp | 0 .../include/kernel/signaldata/CntrMasterReq.hpp | 0 .../ndb}/include/kernel/signaldata/CntrStart.hpp | 0 .../include/kernel/signaldata/ConfigParamId.hpp | 0 .../kernel/signaldata/ContinueFragmented.hpp | 0 .../ndb}/include/kernel/signaldata/CopyActive.hpp | 0 .../ndb}/include/kernel/signaldata/CopyFrag.hpp | 0 .../ndb}/include/kernel/signaldata/CopyGCIReq.hpp | 0 .../ndb}/include/kernel/signaldata/CreateEvnt.hpp | 0 .../ndb}/include/kernel/signaldata/CreateFrag.hpp | 0 .../kernel/signaldata/CreateFragmentation.hpp | 0 .../ndb}/include/kernel/signaldata/CreateIndx.hpp | 0 .../ndb}/include/kernel/signaldata/CreateTab.hpp | 0 .../ndb}/include/kernel/signaldata/CreateTable.hpp | 0 .../ndb}/include/kernel/signaldata/CreateTrig.hpp | 0 .../ndb}/include/kernel/signaldata/DiAddTab.hpp | 0 .../ndb}/include/kernel/signaldata/DiGetNodes.hpp | 0 .../include/kernel/signaldata/DictSchemaInfo.hpp | 0 .../include/kernel/signaldata/DictSizeAltReq.hpp | 0 .../ndb}/include/kernel/signaldata/DictStart.hpp | 0 .../ndb}/include/kernel/signaldata/DictTabInfo.hpp | 0 .../ndb}/include/kernel/signaldata/DihAddFrag.hpp | 0 .../ndb}/include/kernel/signaldata/DihContinueB.hpp | 0 .../include/kernel/signaldata/DihSizeAltReq.hpp | 0 .../ndb}/include/kernel/signaldata/DihStartTab.hpp | 0 .../include/kernel/signaldata/DihSwitchReplica.hpp | 0 .../include/kernel/signaldata/DisconnectRep.hpp | 0 .../ndb}/include/kernel/signaldata/DropIndx.hpp | 0 .../ndb}/include/kernel/signaldata/DropTab.hpp | 0 .../ndb}/include/kernel/signaldata/DropTabFile.hpp | 0 .../ndb}/include/kernel/signaldata/DropTable.hpp | 0 .../ndb}/include/kernel/signaldata/DropTrig.hpp | 0 .../ndb}/include/kernel/signaldata/DumpStateOrd.hpp | 0 .../ndb}/include/kernel/signaldata/EmptyLcp.hpp | 0 .../ndb}/include/kernel/signaldata/EndTo.hpp | 0 .../ndb}/include/kernel/signaldata/EventReport.hpp | 0 .../include/kernel/signaldata/EventSubscribeReq.hpp | 0 .../ndb}/include/kernel/signaldata/ExecFragReq.hpp | 0 .../ndb}/include/kernel/signaldata/FailRep.hpp | 0 .../ndb}/include/kernel/signaldata/FireTrigOrd.hpp | 0 .../ndb}/include/kernel/signaldata/FsAppendReq.hpp | 0 .../ndb}/include/kernel/signaldata/FsCloseReq.hpp | 0 .../ndb}/include/kernel/signaldata/FsConf.hpp | 0 .../ndb}/include/kernel/signaldata/FsOpenReq.hpp | 0 .../include/kernel/signaldata/FsReadWriteReq.hpp | 0 .../ndb}/include/kernel/signaldata/FsRef.hpp | 0 .../ndb}/include/kernel/signaldata/FsRemoveReq.hpp | 0 .../ndb}/include/kernel/signaldata/GCPSave.hpp | 0 .../ndb}/include/kernel/signaldata/GetTabInfo.hpp | 0 .../ndb}/include/kernel/signaldata/GetTableId.hpp | 0 .../ndb}/include/kernel/signaldata/GrepImpl.hpp | 0 .../ndb}/include/kernel/signaldata/HotSpareRep.hpp | 0 .../ndb}/include/kernel/signaldata/IndxAttrInfo.hpp | 0 .../ndb}/include/kernel/signaldata/IndxKeyInfo.hpp | 0 .../kernel/signaldata/InvalidateNodeLCPConf.hpp | 0 .../kernel/signaldata/InvalidateNodeLCPReq.hpp | 0 .../ndb}/include/kernel/signaldata/KeyInfo.hpp | 0 .../ndb}/include/kernel/signaldata/LCP.hpp | 0 .../ndb}/include/kernel/signaldata/ListTables.hpp | 0 .../ndb}/include/kernel/signaldata/LqhFrag.hpp | 0 .../ndb}/include/kernel/signaldata/LqhKey.hpp | 0 .../include/kernel/signaldata/LqhSizeAltReq.hpp | 0 .../ndb}/include/kernel/signaldata/LqhTransConf.hpp | 0 .../include/kernel/signaldata/ManagementServer.hpp | 0 .../ndb}/include/kernel/signaldata/MasterGCP.hpp | 0 .../ndb}/include/kernel/signaldata/MasterLCP.hpp | 0 .../include/kernel/signaldata/NFCompleteRep.hpp | 0 .../ndb}/include/kernel/signaldata/NdbSttor.hpp | 0 .../include/kernel/signaldata/NdbfsContinueB.hpp | 0 .../ndb}/include/kernel/signaldata/NextScan.hpp | 0 .../ndb}/include/kernel/signaldata/NodeFailRep.hpp | 0 .../kernel/signaldata/NodeStateSignalData.hpp | 0 .../ndb}/include/kernel/signaldata/PackedSignal.hpp | 0 .../ndb}/include/kernel/signaldata/PrepDropTab.hpp | 0 .../include/kernel/signaldata/PrepFailReqRef.hpp | 0 .../ndb}/include/kernel/signaldata/ReadConfig.hpp | 0 .../include/kernel/signaldata/ReadNodesConf.hpp | 0 .../ndb}/include/kernel/signaldata/RelTabMem.hpp | 0 .../ndb}/include/kernel/signaldata/RepImpl.hpp | 0 .../ndb}/include/kernel/signaldata/ResumeReq.hpp | 0 .../ndb}/include/kernel/signaldata/ScanFrag.hpp | 0 .../ndb}/include/kernel/signaldata/ScanTab.hpp | 0 .../include/kernel/signaldata/SetLogLevelOrd.hpp | 0 .../ndb}/include/kernel/signaldata/SetVarReq.hpp | 0 .../ndb}/include/kernel/signaldata/SignalData.hpp | 0 .../include/kernel/signaldata/SignalDataPrint.hpp | 0 .../include/kernel/signaldata/SignalDroppedRep.hpp | 0 .../ndb}/include/kernel/signaldata/SrFragidConf.hpp | 0 .../ndb}/include/kernel/signaldata/StartFragReq.hpp | 0 .../ndb}/include/kernel/signaldata/StartInfo.hpp | 0 .../ndb}/include/kernel/signaldata/StartMe.hpp | 0 .../ndb}/include/kernel/signaldata/StartOrd.hpp | 0 .../ndb}/include/kernel/signaldata/StartPerm.hpp | 0 .../ndb}/include/kernel/signaldata/StartRec.hpp | 0 .../ndb}/include/kernel/signaldata/StartTo.hpp | 0 .../ndb}/include/kernel/signaldata/StopMe.hpp | 0 .../ndb}/include/kernel/signaldata/StopPerm.hpp | 0 .../ndb}/include/kernel/signaldata/StopReq.hpp | 0 .../ndb}/include/kernel/signaldata/SumaImpl.hpp | 0 .../ndb}/include/kernel/signaldata/SystemError.hpp | 0 .../ndb}/include/kernel/signaldata/TamperOrd.hpp | 0 .../ndb}/include/kernel/signaldata/TcCommit.hpp | 0 .../ndb}/include/kernel/signaldata/TcContinueB.hpp | 0 .../ndb}/include/kernel/signaldata/TcHbRep.hpp | 0 .../ndb}/include/kernel/signaldata/TcIndx.hpp | 0 .../ndb}/include/kernel/signaldata/TcKeyConf.hpp | 0 .../include/kernel/signaldata/TcKeyFailConf.hpp | 0 .../ndb}/include/kernel/signaldata/TcKeyRef.hpp | 0 .../ndb}/include/kernel/signaldata/TcKeyReq.hpp | 0 .../include/kernel/signaldata/TcRollbackRep.hpp | 0 .../ndb}/include/kernel/signaldata/TcSizeAltReq.hpp | 0 .../ndb}/include/kernel/signaldata/TestOrd.hpp | 0 .../ndb}/include/kernel/signaldata/TransIdAI.hpp | 0 .../ndb}/include/kernel/signaldata/TrigAttrInfo.hpp | 0 .../ndb}/include/kernel/signaldata/TupCommit.hpp | 0 .../ndb}/include/kernel/signaldata/TupFrag.hpp | 0 .../ndb}/include/kernel/signaldata/TupKey.hpp | 0 .../include/kernel/signaldata/TupSizeAltReq.hpp | 0 .../ndb}/include/kernel/signaldata/TuxBound.hpp | 0 .../ndb}/include/kernel/signaldata/TuxContinueB.hpp | 0 .../ndb}/include/kernel/signaldata/TuxMaint.hpp | 0 .../include/kernel/signaldata/TuxSizeAltReq.hpp | 0 .../ndb}/include/kernel/signaldata/UpdateTo.hpp | 0 .../include/kernel/signaldata/UpgradeStartup.hpp | 0 .../ndb}/include/kernel/signaldata/UtilDelete.hpp | 0 .../ndb}/include/kernel/signaldata/UtilExecute.hpp | 0 .../ndb}/include/kernel/signaldata/UtilLock.hpp | 0 .../ndb}/include/kernel/signaldata/UtilPrepare.hpp | 0 .../ndb}/include/kernel/signaldata/UtilRelease.hpp | 0 .../ndb}/include/kernel/signaldata/UtilSequence.hpp | 0 .../ndb}/include/kernel/signaldata/WaitGCP.hpp | 0 .../ndb}/include/kernel/trigger_definitions.h | 0 .../ndb}/include/logger/ConsoleLogHandler.hpp | 0 .../ndb}/include/logger/FileLogHandler.hpp | 0 {ndb => storage/ndb}/include/logger/LogHandler.hpp | 0 {ndb => storage/ndb}/include/logger/Logger.hpp | 0 .../ndb}/include/logger/SysLogHandler.hpp | 0 {ndb => storage/ndb}/include/mgmapi/mgmapi.h | 0 .../ndb}/include/mgmapi/mgmapi_config_parameters.h | 0 .../include/mgmapi/mgmapi_config_parameters_debug.h | 0 {ndb => storage/ndb}/include/mgmapi/mgmapi_debug.h | 0 {ndb => storage/ndb}/include/mgmapi/ndb_logevent.h | 0 .../ndb}/include/mgmcommon/ConfigRetriever.hpp | 0 .../ndb}/include/mgmcommon/IPCConfig.hpp | 0 .../ndb}/include/mgmcommon/MgmtErrorReporter.hpp | 0 {ndb => storage/ndb}/include/ndb_constants.h | 0 {ndb => storage/ndb}/include/ndb_global.h.in | 0 {ndb => storage/ndb}/include/ndb_init.h | 0 {ndb => storage/ndb}/include/ndb_net.h | 0 {ndb => storage/ndb}/include/ndb_types.h.in | 0 {ndb => storage/ndb}/include/ndb_version.h.in | 0 {ndb => storage/ndb}/include/ndbapi/Ndb.hpp | 0 {ndb => storage/ndb}/include/ndbapi/NdbApi.hpp | 0 {ndb => storage/ndb}/include/ndbapi/NdbBlob.hpp | 0 .../ndb}/include/ndbapi/NdbDictionary.hpp | 0 {ndb => storage/ndb}/include/ndbapi/NdbError.hpp | 0 .../ndb}/include/ndbapi/NdbEventOperation.hpp | 0 .../ndb}/include/ndbapi/NdbIndexOperation.hpp | 0 .../ndb}/include/ndbapi/NdbIndexScanOperation.hpp | 0 .../ndb}/include/ndbapi/NdbOperation.hpp | 0 {ndb => storage/ndb}/include/ndbapi/NdbPool.hpp | 0 {ndb => storage/ndb}/include/ndbapi/NdbRecAttr.hpp | 0 {ndb => storage/ndb}/include/ndbapi/NdbReceiver.hpp | 0 .../ndb}/include/ndbapi/NdbScanFilter.hpp | 0 .../ndb}/include/ndbapi/NdbScanOperation.hpp | 0 .../ndb}/include/ndbapi/NdbTransaction.hpp | 0 .../ndb}/include/ndbapi/ndb_cluster_connection.hpp | 0 .../ndb}/include/ndbapi/ndb_opt_defaults.h | 0 {ndb => storage/ndb}/include/ndbapi/ndbapi_limits.h | 0 {ndb => storage/ndb}/include/ndbapi/ndberror.h | 0 {ndb => storage/ndb}/include/newtonapi/dba.h | 0 .../ndb}/include/newtonapi/defs/pcn_types.h | 0 {ndb => storage/ndb}/include/portlib/NdbCondition.h | 0 {ndb => storage/ndb}/include/portlib/NdbConfig.h | 0 {ndb => storage/ndb}/include/portlib/NdbDaemon.h | 0 {ndb => storage/ndb}/include/portlib/NdbEnv.h | 0 {ndb => storage/ndb}/include/portlib/NdbHost.h | 0 {ndb => storage/ndb}/include/portlib/NdbMain.h | 0 {ndb => storage/ndb}/include/portlib/NdbMem.h | 0 {ndb => storage/ndb}/include/portlib/NdbMutex.h | 0 {ndb => storage/ndb}/include/portlib/NdbSleep.h | 0 {ndb => storage/ndb}/include/portlib/NdbTCP.h | 0 {ndb => storage/ndb}/include/portlib/NdbThread.h | 0 {ndb => storage/ndb}/include/portlib/NdbTick.h | 0 {ndb => storage/ndb}/include/portlib/PortDefs.h | 0 {ndb => storage/ndb}/include/portlib/prefetch.h | 0 .../include/transporter/TransporterCallback.hpp | 0 .../include/transporter/TransporterDefinitions.hpp | 0 .../include/transporter/TransporterRegistry.hpp | 0 {ndb => storage/ndb}/include/util/Base64.hpp | 0 {ndb => storage/ndb}/include/util/BaseString.hpp | 0 {ndb => storage/ndb}/include/util/Bitmask.hpp | 0 {ndb => storage/ndb}/include/util/ConfigValues.hpp | 0 {ndb => storage/ndb}/include/util/File.hpp | 0 {ndb => storage/ndb}/include/util/InputStream.hpp | 0 {ndb => storage/ndb}/include/util/NdbAutoPtr.hpp | 0 {ndb => storage/ndb}/include/util/NdbOut.hpp | 0 {ndb => storage/ndb}/include/util/NdbSqlUtil.hpp | 0 {ndb => storage/ndb}/include/util/OutputStream.hpp | 0 {ndb => storage/ndb}/include/util/Parser.hpp | 0 {ndb => storage/ndb}/include/util/Properties.hpp | 0 .../ndb}/include/util/SimpleProperties.hpp | 0 .../ndb}/include/util/SocketAuthenticator.hpp | 0 {ndb => storage/ndb}/include/util/SocketClient.hpp | 0 {ndb => storage/ndb}/include/util/SocketServer.hpp | 0 {ndb => storage/ndb}/include/util/UtilBuffer.hpp | 0 {ndb => storage/ndb}/include/util/Vector.hpp | 0 .../ndb}/include/util/basestring_vsnprintf.h | 0 {ndb => storage/ndb}/include/util/md5_hash.hpp | 0 {ndb => storage/ndb}/include/util/ndb_opts.h | 0 {ndb => storage/ndb}/include/util/random.h | 0 {ndb => storage/ndb}/include/util/socket_io.h | 0 {ndb => storage/ndb}/include/util/uucode.h | 0 {ndb => storage/ndb}/include/util/version.h | 0 {ndb => storage/ndb}/lib/.empty | 0 {ndb => storage/ndb}/ndbapi-examples/Makefile | 0 .../mgmapi_logevent_example/Makefile | 0 .../mgmapi_logevent_example/mgmapi_logevent.cpp | 0 .../ndbapi-examples/ndbapi_async_example/Makefile | 0 .../ndbapi_async_example/ndbapi_async.cpp | 0 .../ndbapi-examples/ndbapi_async_example/readme.txt | 0 .../ndbapi-examples/ndbapi_async_example1/Makefile | 0 .../ndbapi_async_example1/ndbapi_async1.cpp | 0 .../ndbapi-examples/ndbapi_event_example/Makefile | 0 .../ndbapi_event_example/ndbapi_event.cpp | 0 .../ndbapi-examples/ndbapi_retries_example/Makefile | 0 .../ndbapi_retries_example/ndbapi_retries.cpp | 0 .../ndbapi-examples/ndbapi_scan_example/Makefile | 0 .../ndbapi_scan_example/ndbapi_scan.cpp | 0 .../ndbapi-examples/ndbapi_scan_example/readme.txt | 0 .../ndbapi-examples/ndbapi_simple_example/Makefile | 0 .../ndbapi_simple_example/ndbapi_simple.cpp | 0 .../ndbapi_simple_index_example/Makefile | 0 .../ndbapi_simple_index.cpp | 0 {ndb => storage/ndb}/src/Makefile.am | 0 {ndb => storage/ndb}/src/common/Makefile.am | 0 .../ndb}/src/common/debugger/BlockNames.cpp | 0 .../ndb}/src/common/debugger/DebuggerNames.cpp | 0 .../ndb}/src/common/debugger/EventLogger.cpp | 0 .../ndb}/src/common/debugger/GrepError.cpp | 0 .../ndb}/src/common/debugger/Makefile.am | 0 .../src/common/debugger/SignalLoggerManager.cpp | 0 .../ndb}/src/common/debugger/signaldata/AccLock.cpp | 0 .../src/common/debugger/signaldata/AlterIndx.cpp | 0 .../src/common/debugger/signaldata/AlterTab.cpp | 0 .../src/common/debugger/signaldata/AlterTable.cpp | 0 .../src/common/debugger/signaldata/AlterTrig.cpp | 0 .../src/common/debugger/signaldata/BackupImpl.cpp | 0 .../common/debugger/signaldata/BackupSignalData.cpp | 0 .../common/debugger/signaldata/CloseComReqConf.cpp | 0 .../src/common/debugger/signaldata/CntrStart.cpp | 0 .../src/common/debugger/signaldata/ContinueB.cpp | 0 .../ndb}/src/common/debugger/signaldata/CopyGCI.cpp | 0 .../src/common/debugger/signaldata/CreateEvnt.cpp | 0 .../debugger/signaldata/CreateFragmentation.cpp | 0 .../src/common/debugger/signaldata/CreateIndx.cpp | 0 .../src/common/debugger/signaldata/CreateTrig.cpp | 0 .../src/common/debugger/signaldata/DictTabInfo.cpp | 0 .../src/common/debugger/signaldata/DihContinueB.cpp | 0 .../debugger/signaldata/DihSwitchReplicaReq.cpp | 0 .../common/debugger/signaldata/DisconnectRep.cpp | 0 .../src/common/debugger/signaldata/DropIndx.cpp | 0 .../ndb}/src/common/debugger/signaldata/DropTab.cpp | 0 .../src/common/debugger/signaldata/DropTrig.cpp | 0 .../ndb}/src/common/debugger/signaldata/FailRep.cpp | 0 .../src/common/debugger/signaldata/FireTrigOrd.cpp | 0 .../src/common/debugger/signaldata/FsAppendReq.cpp | 0 .../src/common/debugger/signaldata/FsCloseReq.cpp | 0 .../ndb}/src/common/debugger/signaldata/FsConf.cpp | 0 .../src/common/debugger/signaldata/FsOpenReq.cpp | 0 .../common/debugger/signaldata/FsReadWriteReq.cpp | 0 .../ndb}/src/common/debugger/signaldata/FsRef.cpp | 0 .../ndb}/src/common/debugger/signaldata/GCPSave.cpp | 0 .../src/common/debugger/signaldata/IndxAttrInfo.cpp | 0 .../src/common/debugger/signaldata/IndxKeyInfo.cpp | 0 .../ndb}/src/common/debugger/signaldata/LCP.cpp | 0 .../ndb}/src/common/debugger/signaldata/LqhFrag.cpp | 0 .../ndb}/src/common/debugger/signaldata/LqhKey.cpp | 0 .../src/common/debugger/signaldata/LqhTrans.cpp | 0 .../ndb}/src/common/debugger/signaldata/Makefile.am | 0 .../src/common/debugger/signaldata/MasterLCP.cpp | 0 .../common/debugger/signaldata/NFCompleteRep.cpp | 0 .../src/common/debugger/signaldata/NdbSttor.cpp | 0 .../common/debugger/signaldata/NdbfsContinueB.cpp | 0 .../src/common/debugger/signaldata/PackedSignal.cpp | 0 .../src/common/debugger/signaldata/PrepDropTab.cpp | 0 .../common/debugger/signaldata/PrepFailReqRef.cpp | 0 .../common/debugger/signaldata/ReadNodesConf.cpp | 0 .../src/common/debugger/signaldata/ScanFrag.cpp | 0 .../ndb}/src/common/debugger/signaldata/ScanTab.cpp | 0 .../common/debugger/signaldata/SignalDataPrint.cpp | 0 .../common/debugger/signaldata/SignalDroppedRep.cpp | 0 .../src/common/debugger/signaldata/SignalNames.cpp | 0 .../src/common/debugger/signaldata/StartRec.cpp | 0 .../src/common/debugger/signaldata/SumaImpl.cpp | 0 .../src/common/debugger/signaldata/SystemError.cpp | 0 .../ndb}/src/common/debugger/signaldata/TcIndx.cpp | 0 .../src/common/debugger/signaldata/TcKeyConf.cpp | 0 .../src/common/debugger/signaldata/TcKeyRef.cpp | 0 .../src/common/debugger/signaldata/TcKeyReq.cpp | 0 .../common/debugger/signaldata/TcRollbackRep.cpp | 0 .../src/common/debugger/signaldata/TrigAttrInfo.cpp | 0 .../src/common/debugger/signaldata/TupCommit.cpp | 0 .../ndb}/src/common/debugger/signaldata/TupKey.cpp | 0 .../src/common/debugger/signaldata/TuxMaint.cpp | 0 .../src/common/debugger/signaldata/UtilDelete.cpp | 0 .../src/common/debugger/signaldata/UtilExecute.cpp | 0 .../src/common/debugger/signaldata/UtilLock.cpp | 0 .../src/common/debugger/signaldata/UtilPrepare.cpp | 0 .../src/common/debugger/signaldata/UtilSequence.cpp | 0 .../ndb}/src/common/debugger/signaldata/print.awk | 0 .../ndb}/src/common/logger/ConsoleLogHandler.cpp | 0 .../ndb}/src/common/logger/FileLogHandler.cpp | 0 .../ndb}/src/common/logger/LogHandler.cpp | 0 .../ndb}/src/common/logger/LogHandlerList.cpp | 0 .../ndb}/src/common/logger/LogHandlerList.hpp | 0 {ndb => storage/ndb}/src/common/logger/Logger.cpp | 0 {ndb => storage/ndb}/src/common/logger/Makefile.am | 0 .../ndb}/src/common/logger/SysLogHandler.cpp | 0 .../logger/listtest/LogHandlerListUnitTest.cpp | 0 .../logger/listtest/LogHandlerListUnitTest.hpp | 0 .../ndb}/src/common/logger/listtest/Makefile | 0 .../src/common/logger/loggertest/LoggerUnitTest.cpp | 0 .../src/common/logger/loggertest/LoggerUnitTest.hpp | 0 .../ndb}/src/common/logger/loggertest/Makefile | 0 .../ndb}/src/common/mgmcommon/ConfigRetriever.cpp | 0 .../ndb}/src/common/mgmcommon/IPCConfig.cpp | 0 .../ndb}/src/common/mgmcommon/Makefile.am | 0 .../ndb}/src/common/mgmcommon/printConfig/Makefile | 0 .../common/mgmcommon/printConfig/printConfig.cpp | 0 {ndb => storage/ndb}/src/common/portlib/Makefile.am | 0 .../ndb}/src/common/portlib/NdbCondition.c | 0 {ndb => storage/ndb}/src/common/portlib/NdbConfig.c | 0 {ndb => storage/ndb}/src/common/portlib/NdbDaemon.c | 0 {ndb => storage/ndb}/src/common/portlib/NdbEnv.c | 0 {ndb => storage/ndb}/src/common/portlib/NdbHost.c | 0 {ndb => storage/ndb}/src/common/portlib/NdbMem.c | 0 {ndb => storage/ndb}/src/common/portlib/NdbMutex.c | 0 .../ndb}/src/common/portlib/NdbPortLibTest.cpp | 0 {ndb => storage/ndb}/src/common/portlib/NdbSleep.c | 0 {ndb => storage/ndb}/src/common/portlib/NdbTCP.cpp | 0 {ndb => storage/ndb}/src/common/portlib/NdbThread.c | 0 {ndb => storage/ndb}/src/common/portlib/NdbTick.c | 0 {ndb => storage/ndb}/src/common/portlib/gcc.cpp | 0 {ndb => storage/ndb}/src/common/portlib/memtest.c | 0 {ndb => storage/ndb}/src/common/portlib/mmslist.cpp | 0 {ndb => storage/ndb}/src/common/portlib/mmstest.cpp | 0 .../ndb}/src/common/portlib/munmaptest.cpp | 0 .../src/common/portlib/old_dirs/memtest/Makefile | 0 .../portlib/old_dirs/memtest/munmaptest/Makefile | 0 .../ndb}/src/common/portlib/old_dirs/ose/Makefile | 0 .../src/common/portlib/old_dirs/ose/NdbCondition.c | 0 .../common/portlib/old_dirs/ose/NdbConditionOSE.h | 0 .../ndb}/src/common/portlib/old_dirs/ose/NdbEnv.c | 0 .../ndb}/src/common/portlib/old_dirs/ose/NdbHost.c | 0 .../ndb}/src/common/portlib/old_dirs/ose/NdbMem.c | 0 .../common/portlib/old_dirs/ose/NdbMem_SoftOse.cpp | 0 .../ndb}/src/common/portlib/old_dirs/ose/NdbMutex.c | 0 .../ndb}/src/common/portlib/old_dirs/ose/NdbOut.cpp | 0 .../ndb}/src/common/portlib/old_dirs/ose/NdbSleep.c | 0 .../ndb}/src/common/portlib/old_dirs/ose/NdbTCP.c | 0 .../src/common/portlib/old_dirs/ose/NdbThread.c | 0 .../ndb}/src/common/portlib/old_dirs/ose/NdbTick.c | 0 .../ndb}/src/common/portlib/old_dirs/test/Makefile | 0 .../ndb}/src/common/portlib/old_dirs/win32/Makefile | 0 .../common/portlib/old_dirs/win32/NdbCondition.c | 0 .../src/common/portlib/old_dirs/win32/NdbDaemon.c | 0 .../ndb}/src/common/portlib/old_dirs/win32/NdbEnv.c | 0 .../src/common/portlib/old_dirs/win32/NdbHost.c | 0 .../ndb}/src/common/portlib/old_dirs/win32/NdbMem.c | 0 .../src/common/portlib/old_dirs/win32/NdbMutex.c | 0 .../src/common/portlib/old_dirs/win32/NdbSleep.c | 0 .../ndb}/src/common/portlib/old_dirs/win32/NdbTCP.c | 0 .../src/common/portlib/old_dirs/win32/NdbThread.c | 0 .../src/common/portlib/old_dirs/win32/NdbTick.c | 0 .../ndb}/src/common/portlib/win32/NdbCondition.c | 0 .../ndb}/src/common/portlib/win32/NdbDaemon.c | 0 .../ndb}/src/common/portlib/win32/NdbEnv.c | 0 .../ndb}/src/common/portlib/win32/NdbHost.c | 0 .../ndb}/src/common/portlib/win32/NdbMem.c | 0 .../ndb}/src/common/portlib/win32/NdbMutex.c | 0 .../ndb}/src/common/portlib/win32/NdbSleep.c | 0 .../ndb}/src/common/portlib/win32/NdbTCP.c | 0 .../ndb}/src/common/portlib/win32/NdbThread.c | 0 .../ndb}/src/common/portlib/win32/NdbTick.c | 0 .../ndb}/src/common/transporter/Makefile.am | 0 .../ndb}/src/common/transporter/OSE_Receiver.cpp | 0 .../ndb}/src/common/transporter/OSE_Receiver.hpp | 0 .../ndb}/src/common/transporter/OSE_Signals.hpp | 0 .../ndb}/src/common/transporter/OSE_Transporter.cpp | 0 .../ndb}/src/common/transporter/OSE_Transporter.hpp | 0 .../ndb}/src/common/transporter/Packer.cpp | 0 .../ndb}/src/common/transporter/Packer.hpp | 0 .../ndb}/src/common/transporter/SCI_Transporter.cpp | 0 .../ndb}/src/common/transporter/SCI_Transporter.hpp | 0 .../ndb}/src/common/transporter/SHM_Buffer.hpp | 0 .../ndb}/src/common/transporter/SHM_Transporter.cpp | 0 .../ndb}/src/common/transporter/SHM_Transporter.hpp | 0 .../src/common/transporter/SHM_Transporter.unix.cpp | 0 .../common/transporter/SHM_Transporter.win32.cpp | 0 .../ndb}/src/common/transporter/SendBuffer.cpp | 0 .../ndb}/src/common/transporter/SendBuffer.hpp | 0 .../ndb}/src/common/transporter/TCP_Transporter.cpp | 0 .../ndb}/src/common/transporter/TCP_Transporter.hpp | 0 .../ndb}/src/common/transporter/Transporter.cpp | 0 .../ndb}/src/common/transporter/Transporter.hpp | 0 .../transporter/TransporterInternalDefinitions.hpp | 0 .../src/common/transporter/TransporterRegistry.cpp | 0 .../ndb}/src/common/transporter/basictest/Makefile | 0 .../transporter/basictest/basicTransporterTest.cpp | 0 .../ndb}/src/common/transporter/buddy.cpp | 0 .../ndb}/src/common/transporter/buddy.hpp | 0 .../src/common/transporter/failoverSCI/Makefile | 0 .../common/transporter/failoverSCI/failoverSCI.cpp | 0 .../ndb}/src/common/transporter/perftest/Makefile | 0 .../transporter/perftest/perfTransporterTest.cpp | 0 .../ndb}/src/common/transporter/priotest/Makefile | 0 .../common/transporter/priotest/prioOSE/Makefile | 0 .../common/transporter/priotest/prioSCI/Makefile | 0 .../common/transporter/priotest/prioSCI/prioSCI.cpp | 0 .../common/transporter/priotest/prioSHM/Makefile | 0 .../common/transporter/priotest/prioSHM/prioSHM.cpp | 0 .../common/transporter/priotest/prioTCP/Makefile | 0 .../common/transporter/priotest/prioTCP/prioTCP.cpp | 0 .../transporter/priotest/prioTransporterTest.cpp | 0 .../transporter/priotest/prioTransporterTest.hpp | 0 {ndb => storage/ndb}/src/common/util/Base64.cpp | 0 {ndb => storage/ndb}/src/common/util/BaseString.cpp | 0 {ndb => storage/ndb}/src/common/util/Bitmask.cpp | 0 .../ndb}/src/common/util/ConfigValues.cpp | 0 {ndb => storage/ndb}/src/common/util/File.cpp | 0 .../ndb}/src/common/util/InputStream.cpp | 0 {ndb => storage/ndb}/src/common/util/Makefile.am | 0 {ndb => storage/ndb}/src/common/util/NdbErrHnd.cpp | 0 {ndb => storage/ndb}/src/common/util/NdbOut.cpp | 0 {ndb => storage/ndb}/src/common/util/NdbSqlUtil.cpp | 0 .../ndb}/src/common/util/OutputStream.cpp | 0 {ndb => storage/ndb}/src/common/util/Parser.cpp | 0 {ndb => storage/ndb}/src/common/util/Properties.cpp | 0 .../ndb}/src/common/util/SimpleProperties.cpp | 0 .../ndb}/src/common/util/SocketAuthenticator.cpp | 0 .../ndb}/src/common/util/SocketClient.cpp | 0 .../ndb}/src/common/util/SocketServer.cpp | 0 .../ndb}/src/common/util/basestring_vsnprintf.c | 0 .../ndb}/src/common/util/filetest/FileUnitTest.cpp | 0 .../ndb}/src/common/util/filetest/FileUnitTest.hpp | 0 .../ndb}/src/common/util/filetest/Makefile | 0 {ndb => storage/ndb}/src/common/util/getarg.cat3 | 0 {ndb => storage/ndb}/src/common/util/md5_hash.cpp | 0 {ndb => storage/ndb}/src/common/util/ndb_init.c | 0 {ndb => storage/ndb}/src/common/util/new.cpp | 0 {ndb => storage/ndb}/src/common/util/random.c | 0 {ndb => storage/ndb}/src/common/util/socket_io.cpp | 0 {ndb => storage/ndb}/src/common/util/strdup.c | 0 .../ndb}/src/common/util/testConfigValues/Makefile | 0 .../util/testConfigValues/testConfigValues.cpp | 0 .../ndb}/src/common/util/testProperties/Makefile | 0 .../common/util/testProperties/testProperties.cpp | 0 .../src/common/util/testSimpleProperties/Makefile | 0 .../common/util/testSimpleProperties/sp_test.cpp | 0 {ndb => storage/ndb}/src/common/util/uucode.c | 0 {ndb => storage/ndb}/src/common/util/version.c | 0 {ndb => storage/ndb}/src/cw/Makefile.am | 0 .../ndb}/src/cw/cpcc-win32/C++/CPC_GUI.cpp | 0 .../ndb}/src/cw/cpcc-win32/C++/CPC_GUI.dsp | 0 .../ndb}/src/cw/cpcc-win32/C++/CPC_GUI.dsw | 0 .../ndb}/src/cw/cpcc-win32/C++/CPC_GUI.h | 0 .../ndb}/src/cw/cpcc-win32/C++/CPC_GUI.ico | Bin .../ndb}/src/cw/cpcc-win32/C++/CPC_GUI.rc | 0 .../ndb}/src/cw/cpcc-win32/C++/CPC_GUI.sln | 0 .../ndb}/src/cw/cpcc-win32/C++/CPC_GUI.suo | Bin .../ndb}/src/cw/cpcc-win32/C++/CPC_GUI.vcproj | 0 .../ndb}/src/cw/cpcc-win32/C++/Closed.ICO | Bin .../ndb}/src/cw/cpcc-win32/C++/NdbControls.cpp | 0 {ndb => storage/ndb}/src/cw/cpcc-win32/C++/Open.ICO | Bin .../ndb}/src/cw/cpcc-win32/C++/StdAfx.cpp | 0 {ndb => storage/ndb}/src/cw/cpcc-win32/C++/StdAfx.h | 0 .../ndb}/src/cw/cpcc-win32/C++/TreeView.cpp | 0 .../ndb}/src/cw/cpcc-win32/C++/TreeView.h | 0 .../ndb}/src/cw/cpcc-win32/C++/bmp00001.bmp | Bin .../ndb}/src/cw/cpcc-win32/C++/resource.h | 0 .../ndb}/src/cw/cpcc-win32/C++/small.ico | Bin .../ndb}/src/cw/cpcc-win32/C++/toolbar.bmp | Bin .../ndb}/src/cw/cpcc-win32/csharp/App.ico | Bin .../ndb}/src/cw/cpcc-win32/csharp/CPC_Form.cs | 0 .../ndb}/src/cw/cpcc-win32/csharp/Computer.cs | 0 .../src/cw/cpcc-win32/csharp/ComputerAddDialog.cs | 0 .../cw/cpcc-win32/csharp/ComputerRemoveDialog.cs | 0 .../ndb}/src/cw/cpcc-win32/csharp/DATABASE.ICO | Bin .../ndb}/src/cw/cpcc-win32/csharp/Database.cs | 0 .../ndb}/src/cw/cpcc-win32/csharp/NDB_CPC.csproj | 0 .../src/cw/cpcc-win32/csharp/NDB_CPC.csproj.user | 0 .../ndb}/src/cw/cpcc-win32/csharp/NDB_CPC.ncb | Bin .../ndb}/src/cw/cpcc-win32/csharp/NDB_CPC.sln | 0 .../ndb}/src/cw/cpcc-win32/csharp/PanelWizard.cs | 0 .../ndb}/src/cw/cpcc-win32/csharp/Process.cs | 0 .../src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs | 0 .../src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs | 0 .../csharp/simpleparser/SimpleCPCParser.cs | 0 .../cw/cpcc-win32/csharp/socketcomm/SocketComm.cs | 0 .../cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs | 0 .../src/cw/cpcc-win32/csharp/startDatabaseDlg.cs | 0 .../cpcc-win32/csharp/telnetclient/telnetClient.cs | 0 .../ndb}/src/cw/cpcc-win32/vb6/Computer.cls | 0 .../ndb}/src/cw/cpcc-win32/vb6/Database.cls | 0 .../ndb}/src/cw/cpcc-win32/vb6/Icon 110.ico | Bin .../ndb}/src/cw/cpcc-win32/vb6/Icon 231.ico | Bin .../ndb}/src/cw/cpcc-win32/vb6/Icon 237.ico | Bin .../ndb}/src/cw/cpcc-win32/vb6/Icon 241.ico | Bin .../ndb}/src/cw/cpcc-win32/vb6/Icon 242.ico | Bin .../ndb}/src/cw/cpcc-win32/vb6/Icon 270.ico | Bin .../ndb}/src/cw/cpcc-win32/vb6/Icon 271.ico | Bin .../ndb}/src/cw/cpcc-win32/vb6/Icon 273.ico | Bin .../ndb}/src/cw/cpcc-win32/vb6/Icon 31.ico | Bin .../ndb}/src/cw/cpcc-win32/vb6/Icon 337.ico | Bin .../ndb}/src/cw/cpcc-win32/vb6/Icon 338.ico | Bin .../ndb}/src/cw/cpcc-win32/vb6/Icon 339.ico | Bin .../ndb}/src/cw/cpcc-win32/vb6/MSSCCPRJ.SCC | 0 .../ndb}/src/cw/cpcc-win32/vb6/Module1.bas | 0 .../ndb}/src/cw/cpcc-win32/vb6/NdbCPC.vbp | 0 .../ndb}/src/cw/cpcc-win32/vb6/NdbCPC.vbw | 0 .../ndb}/src/cw/cpcc-win32/vb6/Process.cls | 0 .../ndb}/src/cw/cpcc-win32/vb6/closed folder.ico | Bin .../ndb}/src/cw/cpcc-win32/vb6/computer.ico | Bin .../ndb}/src/cw/cpcc-win32/vb6/frmAbout.frm | 0 .../ndb}/src/cw/cpcc-win32/vb6/frmLogin.frm | 0 .../ndb}/src/cw/cpcc-win32/vb6/frmMain.frm | 0 .../ndb}/src/cw/cpcc-win32/vb6/frmNewComputer.frm | 0 .../ndb}/src/cw/cpcc-win32/vb6/frmNewComputer.frx | Bin .../ndb}/src/cw/cpcc-win32/vb6/frmNewDatabase.frx | Bin .../ndb}/src/cw/cpcc-win32/vb6/frmNewDatabase1.frm | 0 .../ndb}/src/cw/cpcc-win32/vb6/frmNewDatabase2.frm | 0 .../ndb}/src/cw/cpcc-win32/vb6/frmNewDatabase2.log | 0 .../ndb}/src/cw/cpcc-win32/vb6/frmNewDatabase3.frm | 0 .../ndb}/src/cw/cpcc-win32/vb6/frmOptions.frm | 0 .../ndb}/src/cw/cpcc-win32/vb6/frmSplash.frx | Bin .../ndb}/src/cw/cpcc-win32/vb6/networking.ico | Bin .../ndb}/src/cw/cpcc-win32/vb6/open folder.ico | Bin {ndb => storage/ndb}/src/cw/cpcd/APIService.cpp | 0 {ndb => storage/ndb}/src/cw/cpcd/APIService.hpp | 0 {ndb => storage/ndb}/src/cw/cpcd/CPCD.cpp | 0 {ndb => storage/ndb}/src/cw/cpcd/CPCD.hpp | 0 {ndb => storage/ndb}/src/cw/cpcd/Makefile.am | 0 {ndb => storage/ndb}/src/cw/cpcd/Monitor.cpp | 0 {ndb => storage/ndb}/src/cw/cpcd/Process.cpp | 0 {ndb => storage/ndb}/src/cw/cpcd/common.cpp | 0 {ndb => storage/ndb}/src/cw/cpcd/common.hpp | 0 {ndb => storage/ndb}/src/cw/cpcd/main.cpp | 0 .../ndb}/src/cw/test/socketclient/Makefile | 0 .../src/cw/test/socketclient/socketClientTest.cpp | 0 .../ndb}/src/cw/util/ClientInterface.cpp | 0 .../ndb}/src/cw/util/ClientInterface.hpp | 0 {ndb => storage/ndb}/src/cw/util/Makefile | 0 {ndb => storage/ndb}/src/cw/util/SocketRegistry.cpp | 0 {ndb => storage/ndb}/src/cw/util/SocketRegistry.hpp | 0 {ndb => storage/ndb}/src/cw/util/SocketService.cpp | 0 {ndb => storage/ndb}/src/cw/util/SocketService.hpp | 0 .../WIN32.x86/sci/lib/SISCI_LIBRARY_WIN32.TXT | 0 .../ndb}/src/external/WIN32.x86/sci/lib/scilib.lib | Bin .../src/external/WIN32.x86/sci/lib/scilib_md.lib | Bin .../src/external/WIN32.x86/sci/lib/scilib_mt.lib | Bin .../src/external/WIN32.x86/sci/lib/sisci_api.lib | Bin .../src/external/WIN32.x86/sci/lib/sisci_api_md.lib | Bin .../src/external/WIN32.x86/sci/lib/sisci_api_mt.lib | Bin {ndb => storage/ndb}/src/kernel/Makefile.am | 0 {ndb => storage/ndb}/src/kernel/SimBlockList.cpp | 0 .../ndb}/src/kernel/blocks/ERROR_codes.txt | 0 {ndb => storage/ndb}/src/kernel/blocks/Makefile.am | 0 .../ndb}/src/kernel/blocks/NodeRestart.new.txt | 0 .../ndb}/src/kernel/blocks/NodeRestart.txt | 0 {ndb => storage/ndb}/src/kernel/blocks/Start.txt | 0 .../ndb}/src/kernel/blocks/SystemRestart.new.txt | 0 .../ndb}/src/kernel/blocks/SystemRestart.txt | 0 .../ndb}/src/kernel/blocks/backup/Backup.cpp | 0 .../ndb}/src/kernel/blocks/backup/Backup.hpp | 0 .../ndb}/src/kernel/blocks/backup/Backup.txt | 0 .../ndb}/src/kernel/blocks/backup/BackupFormat.hpp | 0 .../ndb}/src/kernel/blocks/backup/BackupInit.cpp | 0 .../ndb}/src/kernel/blocks/backup/FsBuffer.hpp | 0 .../ndb}/src/kernel/blocks/backup/Makefile.am | 0 .../ndb}/src/kernel/blocks/backup/read.cpp | 0 .../ndb}/src/kernel/blocks/cmvmi/Cmvmi.cpp | 0 .../ndb}/src/kernel/blocks/cmvmi/Cmvmi.hpp | 0 .../ndb}/src/kernel/blocks/cmvmi/Makefile.am | 0 .../ndb}/src/kernel/blocks/dbacc/Dbacc.hpp | 0 .../ndb}/src/kernel/blocks/dbacc/DbaccInit.cpp | 0 .../ndb}/src/kernel/blocks/dbacc/DbaccMain.cpp | 0 .../ndb}/src/kernel/blocks/dbacc/Makefile.am | 0 .../ndb}/src/kernel/blocks/dbdict/CreateIndex.txt | 0 .../src/kernel/blocks/dbdict/CreateTable.new.txt | 0 .../ndb}/src/kernel/blocks/dbdict/CreateTable.txt | 0 .../ndb}/src/kernel/blocks/dbdict/Dbdict.cpp | 0 .../ndb}/src/kernel/blocks/dbdict/Dbdict.hpp | 0 .../ndb}/src/kernel/blocks/dbdict/Dbdict.txt | 0 .../ndb}/src/kernel/blocks/dbdict/DropTable.txt | 0 .../ndb}/src/kernel/blocks/dbdict/Event.txt | 0 .../ndb}/src/kernel/blocks/dbdict/Makefile.am | 0 .../src/kernel/blocks/dbdict/Master_AddTable.sfl | 0 .../ndb}/src/kernel/blocks/dbdict/SchemaFile.hpp | 0 .../src/kernel/blocks/dbdict/Slave_AddTable.sfl | 0 .../src/kernel/blocks/dbdict/printSchemaFile.cpp | 0 .../ndb}/src/kernel/blocks/dbdih/Dbdih.hpp | 0 .../ndb}/src/kernel/blocks/dbdih/DbdihInit.cpp | 0 .../ndb}/src/kernel/blocks/dbdih/DbdihMain.cpp | 0 .../ndb}/src/kernel/blocks/dbdih/LCP.txt | 0 .../ndb}/src/kernel/blocks/dbdih/Makefile.am | 0 .../ndb}/src/kernel/blocks/dbdih/Sysfile.hpp | 0 .../src/kernel/blocks/dbdih/printSysfile/Makefile | 0 .../blocks/dbdih/printSysfile/printSysfile.cpp | 0 .../ndb}/src/kernel/blocks/dblqh/Dblqh.hpp | 0 .../ndb}/src/kernel/blocks/dblqh/DblqhInit.cpp | 0 .../ndb}/src/kernel/blocks/dblqh/DblqhMain.cpp | 0 .../ndb}/src/kernel/blocks/dblqh/Makefile.am | 0 .../src/kernel/blocks/dblqh/redoLogReader/Makefile | 0 .../kernel/blocks/dblqh/redoLogReader/records.cpp | 0 .../kernel/blocks/dblqh/redoLogReader/records.hpp | 0 .../dblqh/redoLogReader/redoLogFileReader.cpp | 0 .../ndb}/src/kernel/blocks/dbtc/Dbtc.hpp | 0 .../ndb}/src/kernel/blocks/dbtc/DbtcInit.cpp | 0 .../ndb}/src/kernel/blocks/dbtc/DbtcMain.cpp | 0 .../ndb}/src/kernel/blocks/dbtc/Makefile.am | 0 .../src/kernel/blocks/dbtup/AttributeOffset.hpp | 0 .../ndb}/src/kernel/blocks/dbtup/Dbtup.hpp | 0 .../ndb}/src/kernel/blocks/dbtup/DbtupAbort.cpp | 0 .../ndb}/src/kernel/blocks/dbtup/DbtupBuffer.cpp | 0 .../ndb}/src/kernel/blocks/dbtup/DbtupCommit.cpp | 0 .../ndb}/src/kernel/blocks/dbtup/DbtupDebug.cpp | 0 .../ndb}/src/kernel/blocks/dbtup/DbtupExecQuery.cpp | 0 .../ndb}/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp | 0 .../ndb}/src/kernel/blocks/dbtup/DbtupGen.cpp | 0 .../ndb}/src/kernel/blocks/dbtup/DbtupIndex.cpp | 0 .../ndb}/src/kernel/blocks/dbtup/DbtupLCP.cpp | 0 .../ndb}/src/kernel/blocks/dbtup/DbtupMeta.cpp | 0 .../ndb}/src/kernel/blocks/dbtup/DbtupPagMan.cpp | 0 .../ndb}/src/kernel/blocks/dbtup/DbtupPageMap.cpp | 0 .../ndb}/src/kernel/blocks/dbtup/DbtupRoutines.cpp | 0 .../src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp | 0 .../src/kernel/blocks/dbtup/DbtupSystemRestart.cpp | 0 .../ndb}/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp | 0 .../ndb}/src/kernel/blocks/dbtup/DbtupTrigger.cpp | 0 .../ndb}/src/kernel/blocks/dbtup/DbtupUndoLog.cpp | 0 .../ndb}/src/kernel/blocks/dbtup/Makefile.am | 0 .../ndb}/src/kernel/blocks/dbtup/Notes.txt | 0 .../ndb}/src/kernel/blocks/dbtux/Dbtux.hpp | 0 .../ndb}/src/kernel/blocks/dbtux/DbtuxCmp.cpp | 0 .../ndb}/src/kernel/blocks/dbtux/DbtuxDebug.cpp | 0 .../ndb}/src/kernel/blocks/dbtux/DbtuxGen.cpp | 0 .../ndb}/src/kernel/blocks/dbtux/DbtuxMaint.cpp | 0 .../ndb}/src/kernel/blocks/dbtux/DbtuxMeta.cpp | 0 .../ndb}/src/kernel/blocks/dbtux/DbtuxNode.cpp | 0 .../ndb}/src/kernel/blocks/dbtux/DbtuxScan.cpp | 0 .../ndb}/src/kernel/blocks/dbtux/DbtuxSearch.cpp | 0 .../ndb}/src/kernel/blocks/dbtux/DbtuxTree.cpp | 0 .../ndb}/src/kernel/blocks/dbtux/Makefile.am | 0 .../ndb}/src/kernel/blocks/dbtux/Times.txt | 0 .../ndb}/src/kernel/blocks/dbtux/tuxstatus.html | 0 .../ndb}/src/kernel/blocks/dbutil/DbUtil.cpp | 0 .../ndb}/src/kernel/blocks/dbutil/DbUtil.hpp | 0 .../ndb}/src/kernel/blocks/dbutil/DbUtil.txt | 0 .../ndb}/src/kernel/blocks/dbutil/Makefile.am | 0 .../ndb}/src/kernel/blocks/grep/Grep.cpp | 0 .../ndb}/src/kernel/blocks/grep/Grep.hpp | 0 .../ndb}/src/kernel/blocks/grep/GrepInit.cpp | 0 .../ndb}/src/kernel/blocks/grep/Makefile.am | 0 .../src/kernel/blocks/grep/systab_test/Makefile | 0 .../blocks/grep/systab_test/grep_systab_test.cpp | 0 {ndb => storage/ndb}/src/kernel/blocks/mutexes.hpp | 0 .../ndb}/src/kernel/blocks/ndbcntr/Makefile.am | 0 .../ndb}/src/kernel/blocks/ndbcntr/Ndbcntr.hpp | 0 .../ndb}/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp | 0 .../ndb}/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp | 0 .../src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp | 0 .../ndb}/src/kernel/blocks/ndbfs/AsyncFile.cpp | 0 .../ndb}/src/kernel/blocks/ndbfs/AsyncFile.hpp | 0 .../blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp | 0 .../src/kernel/blocks/ndbfs/AsyncFileTest/Makefile | 0 .../ndb}/src/kernel/blocks/ndbfs/CircularIndex.cpp | 0 .../ndb}/src/kernel/blocks/ndbfs/CircularIndex.hpp | 0 .../ndb}/src/kernel/blocks/ndbfs/Filename.cpp | 0 .../ndb}/src/kernel/blocks/ndbfs/Filename.hpp | 0 .../ndb}/src/kernel/blocks/ndbfs/Makefile.am | 0 .../ndb}/src/kernel/blocks/ndbfs/MemoryChannel.cpp | 0 .../ndb}/src/kernel/blocks/ndbfs/MemoryChannel.hpp | 0 .../src/kernel/blocks/ndbfs/MemoryChannelOSE.hpp | 0 .../kernel/blocks/ndbfs/MemoryChannelTest/Makefile | 0 .../ndbfs/MemoryChannelTest/MemoryChannelTest.cpp | 0 .../ndb}/src/kernel/blocks/ndbfs/Ndbfs.cpp | 0 .../ndb}/src/kernel/blocks/ndbfs/Ndbfs.hpp | 0 .../ndb}/src/kernel/blocks/ndbfs/OpenFiles.hpp | 0 .../ndb}/src/kernel/blocks/ndbfs/Pool.hpp | 0 .../ndb}/src/kernel/blocks/ndbfs/VoidFs.cpp | 0 .../ndb}/src/kernel/blocks/new-block.tar.gz | Bin .../ndb}/src/kernel/blocks/qmgr/Makefile.am | 0 .../ndb}/src/kernel/blocks/qmgr/Qmgr.hpp | 0 .../ndb}/src/kernel/blocks/qmgr/QmgrInit.cpp | 0 .../ndb}/src/kernel/blocks/qmgr/QmgrMain.cpp | 0 .../ndb}/src/kernel/blocks/qmgr/timer.hpp | 0 .../ndb}/src/kernel/blocks/suma/Makefile.am | 0 .../ndb}/src/kernel/blocks/suma/Suma.cpp | 0 .../ndb}/src/kernel/blocks/suma/Suma.hpp | 0 .../ndb}/src/kernel/blocks/suma/Suma.txt | 0 .../ndb}/src/kernel/blocks/suma/SumaInit.cpp | 0 .../ndb}/src/kernel/blocks/trix/Makefile.am | 0 .../ndb}/src/kernel/blocks/trix/Trix.cpp | 0 .../ndb}/src/kernel/blocks/trix/Trix.hpp | 0 {ndb => storage/ndb}/src/kernel/error/Error.hpp | 0 .../ndb}/src/kernel/error/ErrorHandlingMacros.hpp | 0 .../ndb}/src/kernel/error/ErrorMessages.cpp | 0 .../ndb}/src/kernel/error/ErrorMessages.hpp | 0 .../ndb}/src/kernel/error/ErrorReporter.cpp | 0 .../ndb}/src/kernel/error/ErrorReporter.hpp | 0 {ndb => storage/ndb}/src/kernel/error/Makefile.am | 0 .../ndb}/src/kernel/error/TimeModule.cpp | 0 .../ndb}/src/kernel/error/TimeModule.hpp | 0 {ndb => storage/ndb}/src/kernel/main.cpp | 0 {ndb => storage/ndb}/src/kernel/vm/Array.hpp | 0 .../ndb}/src/kernel/vm/ArrayFifoList.hpp | 0 {ndb => storage/ndb}/src/kernel/vm/ArrayList.hpp | 0 {ndb => storage/ndb}/src/kernel/vm/ArrayPool.hpp | 0 {ndb => storage/ndb}/src/kernel/vm/CArray.hpp | 0 {ndb => storage/ndb}/src/kernel/vm/Callback.hpp | 0 .../ndb}/src/kernel/vm/ClusterConfiguration.cpp | 0 .../ndb}/src/kernel/vm/ClusterConfiguration.hpp | 0 .../ndb}/src/kernel/vm/Configuration.cpp | 0 .../ndb}/src/kernel/vm/Configuration.hpp | 0 {ndb => storage/ndb}/src/kernel/vm/DLFifoList.hpp | 0 {ndb => storage/ndb}/src/kernel/vm/DLHashTable.hpp | 0 {ndb => storage/ndb}/src/kernel/vm/DLHashTable2.hpp | 0 {ndb => storage/ndb}/src/kernel/vm/DLList.hpp | 0 {ndb => storage/ndb}/src/kernel/vm/DataBuffer.hpp | 0 {ndb => storage/ndb}/src/kernel/vm/Emulator.cpp | 0 {ndb => storage/ndb}/src/kernel/vm/Emulator.hpp | 0 .../ndb}/src/kernel/vm/FastScheduler.cpp | 0 .../ndb}/src/kernel/vm/FastScheduler.hpp | 0 {ndb => storage/ndb}/src/kernel/vm/GlobalData.hpp | 0 {ndb => storage/ndb}/src/kernel/vm/KeyTable.hpp | 0 {ndb => storage/ndb}/src/kernel/vm/KeyTable2.hpp | 0 {ndb => storage/ndb}/src/kernel/vm/LongSignal.hpp | 0 {ndb => storage/ndb}/src/kernel/vm/Makefile.am | 0 {ndb => storage/ndb}/src/kernel/vm/MetaData.cpp | 0 {ndb => storage/ndb}/src/kernel/vm/MetaData.hpp | 0 {ndb => storage/ndb}/src/kernel/vm/Mutex.cpp | 0 {ndb => storage/ndb}/src/kernel/vm/Mutex.hpp | 0 {ndb => storage/ndb}/src/kernel/vm/Prio.hpp | 0 .../ndb}/src/kernel/vm/RequestTracker.hpp | 0 {ndb => storage/ndb}/src/kernel/vm/SLList.hpp | 0 {ndb => storage/ndb}/src/kernel/vm/SafeCounter.cpp | 0 {ndb => storage/ndb}/src/kernel/vm/SafeCounter.hpp | 0 .../ndb}/src/kernel/vm/SectionReader.cpp | 0 .../ndb}/src/kernel/vm/SectionReader.hpp | 0 .../ndb}/src/kernel/vm/SignalCounter.hpp | 0 {ndb => storage/ndb}/src/kernel/vm/SimBlockList.hpp | 0 .../ndb}/src/kernel/vm/SimplePropertiesSection.cpp | 0 .../ndb}/src/kernel/vm/SimulatedBlock.cpp | 0 .../ndb}/src/kernel/vm/SimulatedBlock.hpp | 0 {ndb => storage/ndb}/src/kernel/vm/ThreadConfig.cpp | 0 {ndb => storage/ndb}/src/kernel/vm/ThreadConfig.hpp | 0 {ndb => storage/ndb}/src/kernel/vm/TimeQueue.cpp | 0 {ndb => storage/ndb}/src/kernel/vm/TimeQueue.hpp | 0 .../ndb}/src/kernel/vm/TransporterCallback.cpp | 0 {ndb => storage/ndb}/src/kernel/vm/VMSignal.cpp | 0 {ndb => storage/ndb}/src/kernel/vm/VMSignal.hpp | 0 {ndb => storage/ndb}/src/kernel/vm/WaitQueue.hpp | 0 {ndb => storage/ndb}/src/kernel/vm/WatchDog.cpp | 0 {ndb => storage/ndb}/src/kernel/vm/WatchDog.hpp | 0 {ndb => storage/ndb}/src/kernel/vm/al_test/Makefile | 0 .../ndb}/src/kernel/vm/al_test/arrayListTest.cpp | 0 .../ndb}/src/kernel/vm/al_test/arrayPoolTest.cpp | 0 {ndb => storage/ndb}/src/kernel/vm/al_test/main.cpp | 0 {ndb => storage/ndb}/src/kernel/vm/pc.hpp | 0 .../ndb}/src/kernel/vm/testCopy/Makefile | 0 {ndb => storage/ndb}/src/kernel/vm/testCopy/rr.cpp | 0 .../ndb}/src/kernel/vm/testCopy/testCopy.cpp | 0 .../ndb}/src/kernel/vm/testDataBuffer/Makefile | 0 .../src/kernel/vm/testDataBuffer/testDataBuffer.cpp | 0 .../ndb}/src/kernel/vm/testLongSig/Makefile | 0 .../ndb}/src/kernel/vm/testLongSig/testLongSig.cpp | 0 .../kernel/vm/testSimplePropertiesSection/Makefile | 0 .../kernel/vm/testSimplePropertiesSection/test.cpp | 0 {ndb => storage/ndb}/src/mgmapi/LocalConfig.cpp | 0 {ndb => storage/ndb}/src/mgmapi/LocalConfig.hpp | 0 {ndb => storage/ndb}/src/mgmapi/Makefile.am | 0 {ndb => storage/ndb}/src/mgmapi/mgmapi.cpp | 0 .../ndb}/src/mgmapi/mgmapi_configuration.cpp | 0 .../ndb}/src/mgmapi/mgmapi_configuration.hpp | 0 {ndb => storage/ndb}/src/mgmapi/mgmapi_internal.h | 0 {ndb => storage/ndb}/src/mgmapi/ndb_logevent.cpp | 0 {ndb => storage/ndb}/src/mgmapi/ndb_logevent.hpp | 0 {ndb => storage/ndb}/src/mgmapi/test/Makefile | 0 {ndb => storage/ndb}/src/mgmapi/test/keso.c | 0 {ndb => storage/ndb}/src/mgmapi/test/mgmSrvApi.cpp | 0 .../ndb}/src/mgmclient/CommandInterpreter.cpp | 0 {ndb => storage/ndb}/src/mgmclient/Makefile.am | 0 {ndb => storage/ndb}/src/mgmclient/main.cpp | 0 {ndb => storage/ndb}/src/mgmclient/ndb_mgmclient.h | 0 .../ndb}/src/mgmclient/ndb_mgmclient.hpp | 0 .../ndb}/src/mgmclient/test_cpcd/Makefile | 0 .../ndb}/src/mgmclient/test_cpcd/test_cpcd.cpp | 0 {ndb => storage/ndb}/src/mgmsrv/Config.cpp | 0 {ndb => storage/ndb}/src/mgmsrv/Config.hpp | 0 {ndb => storage/ndb}/src/mgmsrv/ConfigInfo.cpp | 0 {ndb => storage/ndb}/src/mgmsrv/ConfigInfo.hpp | 0 .../ndb}/src/mgmsrv/InitConfigFileParser.cpp | 0 .../ndb}/src/mgmsrv/InitConfigFileParser.hpp | 0 {ndb => storage/ndb}/src/mgmsrv/Makefile.am | 0 {ndb => storage/ndb}/src/mgmsrv/MgmtSrvr.cpp | 0 {ndb => storage/ndb}/src/mgmsrv/MgmtSrvr.hpp | 0 {ndb => storage/ndb}/src/mgmsrv/MgmtSrvrConfig.cpp | 0 .../src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp | 0 {ndb => storage/ndb}/src/mgmsrv/Services.cpp | 0 {ndb => storage/ndb}/src/mgmsrv/Services.hpp | 0 {ndb => storage/ndb}/src/mgmsrv/SignalQueue.cpp | 0 {ndb => storage/ndb}/src/mgmsrv/SignalQueue.hpp | 0 {ndb => storage/ndb}/src/mgmsrv/convertStrToInt.cpp | 0 {ndb => storage/ndb}/src/mgmsrv/convertStrToInt.hpp | 0 {ndb => storage/ndb}/src/mgmsrv/main.cpp | 0 {ndb => storage/ndb}/src/mgmsrv/mkconfig/Makefile | 0 .../ndb}/src/mgmsrv/mkconfig/mkconfig.cpp | 0 {ndb => storage/ndb}/src/ndbapi/API.hpp | 0 {ndb => storage/ndb}/src/ndbapi/ClusterMgr.cpp | 0 {ndb => storage/ndb}/src/ndbapi/ClusterMgr.hpp | 0 {ndb => storage/ndb}/src/ndbapi/DictCache.cpp | 0 {ndb => storage/ndb}/src/ndbapi/DictCache.hpp | 0 {ndb => storage/ndb}/src/ndbapi/Makefile.am | 0 {ndb => storage/ndb}/src/ndbapi/Ndb.cpp | 0 {ndb => storage/ndb}/src/ndbapi/NdbApiSignal.cpp | 0 {ndb => storage/ndb}/src/ndbapi/NdbApiSignal.hpp | 0 {ndb => storage/ndb}/src/ndbapi/NdbBlob.cpp | 0 {ndb => storage/ndb}/src/ndbapi/NdbBlobImpl.hpp | 0 {ndb => storage/ndb}/src/ndbapi/NdbDictionary.cpp | 0 .../ndb}/src/ndbapi/NdbDictionaryImpl.cpp | 0 .../ndb}/src/ndbapi/NdbDictionaryImpl.hpp | 0 {ndb => storage/ndb}/src/ndbapi/NdbErrorOut.cpp | 0 .../ndb}/src/ndbapi/NdbEventOperation.cpp | 0 .../ndb}/src/ndbapi/NdbEventOperationImpl.cpp | 0 .../ndb}/src/ndbapi/NdbEventOperationImpl.hpp | 0 {ndb => storage/ndb}/src/ndbapi/NdbImpl.hpp | 0 .../ndb}/src/ndbapi/NdbIndexOperation.cpp | 0 {ndb => storage/ndb}/src/ndbapi/NdbLinHash.hpp | 0 {ndb => storage/ndb}/src/ndbapi/NdbOperation.cpp | 0 .../ndb}/src/ndbapi/NdbOperationDefine.cpp | 0 .../ndb}/src/ndbapi/NdbOperationExec.cpp | 0 {ndb => storage/ndb}/src/ndbapi/NdbOperationInt.cpp | 0 .../ndb}/src/ndbapi/NdbOperationScan.cpp | 0 .../ndb}/src/ndbapi/NdbOperationSearch.cpp | 0 {ndb => storage/ndb}/src/ndbapi/NdbPool.cpp | 0 {ndb => storage/ndb}/src/ndbapi/NdbPoolImpl.cpp | 0 {ndb => storage/ndb}/src/ndbapi/NdbPoolImpl.hpp | 0 {ndb => storage/ndb}/src/ndbapi/NdbRecAttr.cpp | 0 {ndb => storage/ndb}/src/ndbapi/NdbReceiver.cpp | 0 {ndb => storage/ndb}/src/ndbapi/NdbScanFilter.cpp | 0 .../ndb}/src/ndbapi/NdbScanOperation.cpp | 0 {ndb => storage/ndb}/src/ndbapi/NdbTransaction.cpp | 0 .../ndb}/src/ndbapi/NdbTransactionScan.cpp | 0 {ndb => storage/ndb}/src/ndbapi/NdbUtil.cpp | 0 {ndb => storage/ndb}/src/ndbapi/NdbUtil.hpp | 0 {ndb => storage/ndb}/src/ndbapi/NdbWaiter.hpp | 0 {ndb => storage/ndb}/src/ndbapi/Ndberr.cpp | 0 {ndb => storage/ndb}/src/ndbapi/Ndbif.cpp | 0 {ndb => storage/ndb}/src/ndbapi/Ndbinit.cpp | 0 {ndb => storage/ndb}/src/ndbapi/Ndblist.cpp | 0 {ndb => storage/ndb}/src/ndbapi/ObjectMap.hpp | 0 {ndb => storage/ndb}/src/ndbapi/ScanOperation.txt | 0 .../ndb}/src/ndbapi/TransporterFacade.cpp | 0 .../ndb}/src/ndbapi/TransporterFacade.hpp | 0 .../ndb}/src/ndbapi/ndb_cluster_connection.cpp | 0 .../ndb}/src/ndbapi/ndb_cluster_connection_impl.hpp | 0 {ndb => storage/ndb}/src/ndbapi/ndberror.c | 0 .../ndb}/src/ndbapi/signal-sender/Makefile | 0 .../ndb}/src/ndbapi/signal-sender/SignalSender.cpp | 0 .../ndb}/src/ndbapi/signal-sender/SignalSender.hpp | 0 {ndb => storage/ndb}/src/old_files/client/Makefile | 0 .../ndb}/src/old_files/client/odbc/Extra.mk | 0 .../ndb}/src/old_files/client/odbc/Makefile | 0 .../ndb}/src/old_files/client/odbc/NdbOdbc.cpp | 0 .../ndb}/src/old_files/client/odbc/NdbOdbc.def | 0 .../src/old_files/client/odbc/codegen/CodeGen.cpp | 0 .../src/old_files/client/odbc/codegen/CodeGen.hpp | 0 .../src/old_files/client/odbc/codegen/Code_base.cpp | 0 .../src/old_files/client/odbc/codegen/Code_base.hpp | 0 .../old_files/client/odbc/codegen/Code_column.cpp | 0 .../old_files/client/odbc/codegen/Code_column.hpp | 0 .../old_files/client/odbc/codegen/Code_comp_op.cpp | 0 .../old_files/client/odbc/codegen/Code_comp_op.hpp | 0 .../client/odbc/codegen/Code_create_index.cpp | 0 .../client/odbc/codegen/Code_create_index.hpp | 0 .../client/odbc/codegen/Code_create_row.cpp | 0 .../client/odbc/codegen/Code_create_row.hpp | 0 .../client/odbc/codegen/Code_create_table.cpp | 0 .../client/odbc/codegen/Code_create_table.hpp | 0 .../client/odbc/codegen/Code_data_type.cpp | 0 .../client/odbc/codegen/Code_data_type.hpp | 0 .../src/old_files/client/odbc/codegen/Code_ddl.cpp | 0 .../src/old_files/client/odbc/codegen/Code_ddl.hpp | 0 .../client/odbc/codegen/Code_ddl_column.cpp | 0 .../client/odbc/codegen/Code_ddl_column.hpp | 0 .../client/odbc/codegen/Code_ddl_constr.cpp | 0 .../client/odbc/codegen/Code_ddl_constr.hpp | 0 .../old_files/client/odbc/codegen/Code_ddl_row.cpp | 0 .../old_files/client/odbc/codegen/Code_ddl_row.hpp | 0 .../old_files/client/odbc/codegen/Code_delete.cpp | 0 .../old_files/client/odbc/codegen/Code_delete.hpp | 0 .../client/odbc/codegen/Code_delete_index.cpp | 0 .../client/odbc/codegen/Code_delete_index.hpp | 0 .../client/odbc/codegen/Code_delete_lookup.cpp | 0 .../client/odbc/codegen/Code_delete_lookup.hpp | 0 .../client/odbc/codegen/Code_delete_scan.cpp | 0 .../client/odbc/codegen/Code_delete_scan.hpp | 0 .../src/old_files/client/odbc/codegen/Code_dml.cpp | 0 .../src/old_files/client/odbc/codegen/Code_dml.hpp | 0 .../client/odbc/codegen/Code_dml_column.cpp | 0 .../client/odbc/codegen/Code_dml_column.hpp | 0 .../old_files/client/odbc/codegen/Code_dml_row.cpp | 0 .../old_files/client/odbc/codegen/Code_dml_row.hpp | 0 .../client/odbc/codegen/Code_drop_index.cpp | 0 .../client/odbc/codegen/Code_drop_index.hpp | 0 .../client/odbc/codegen/Code_drop_table.cpp | 0 .../client/odbc/codegen/Code_drop_table.hpp | 0 .../src/old_files/client/odbc/codegen/Code_expr.cpp | 0 .../src/old_files/client/odbc/codegen/Code_expr.hpp | 0 .../client/odbc/codegen/Code_expr_column.cpp | 0 .../client/odbc/codegen/Code_expr_column.hpp | 0 .../client/odbc/codegen/Code_expr_const.cpp | 0 .../client/odbc/codegen/Code_expr_const.hpp | 0 .../client/odbc/codegen/Code_expr_conv.cpp | 0 .../client/odbc/codegen/Code_expr_conv.hpp | 0 .../client/odbc/codegen/Code_expr_func.cpp | 0 .../client/odbc/codegen/Code_expr_func.hpp | 0 .../old_files/client/odbc/codegen/Code_expr_op.cpp | 0 .../old_files/client/odbc/codegen/Code_expr_op.hpp | 0 .../client/odbc/codegen/Code_expr_param.cpp | 0 .../client/odbc/codegen/Code_expr_param.hpp | 0 .../old_files/client/odbc/codegen/Code_expr_row.cpp | 0 .../old_files/client/odbc/codegen/Code_expr_row.hpp | 0 .../client/odbc/codegen/Code_idx_column.cpp | 0 .../client/odbc/codegen/Code_idx_column.hpp | 0 .../old_files/client/odbc/codegen/Code_insert.cpp | 0 .../old_files/client/odbc/codegen/Code_insert.hpp | 0 .../src/old_files/client/odbc/codegen/Code_pred.cpp | 0 .../src/old_files/client/odbc/codegen/Code_pred.hpp | 0 .../old_files/client/odbc/codegen/Code_pred_op.cpp | 0 .../old_files/client/odbc/codegen/Code_pred_op.hpp | 0 .../old_files/client/odbc/codegen/Code_query.cpp | 0 .../old_files/client/odbc/codegen/Code_query.hpp | 0 .../client/odbc/codegen/Code_query_count.cpp | 0 .../client/odbc/codegen/Code_query_count.hpp | 0 .../client/odbc/codegen/Code_query_distinct.cpp | 0 .../client/odbc/codegen/Code_query_distinct.hpp | 0 .../client/odbc/codegen/Code_query_filter.cpp | 0 .../client/odbc/codegen/Code_query_filter.hpp | 0 .../client/odbc/codegen/Code_query_group.cpp | 0 .../client/odbc/codegen/Code_query_group.hpp | 0 .../client/odbc/codegen/Code_query_index.cpp | 0 .../client/odbc/codegen/Code_query_index.hpp | 0 .../client/odbc/codegen/Code_query_join.cpp | 0 .../client/odbc/codegen/Code_query_join.hpp | 0 .../client/odbc/codegen/Code_query_lookup.cpp | 0 .../client/odbc/codegen/Code_query_lookup.hpp | 0 .../client/odbc/codegen/Code_query_project.cpp | 0 .../client/odbc/codegen/Code_query_project.hpp | 0 .../client/odbc/codegen/Code_query_range.cpp | 0 .../client/odbc/codegen/Code_query_range.hpp | 0 .../client/odbc/codegen/Code_query_repeat.cpp | 0 .../client/odbc/codegen/Code_query_repeat.hpp | 0 .../client/odbc/codegen/Code_query_scan.cpp | 0 .../client/odbc/codegen/Code_query_scan.hpp | 0 .../client/odbc/codegen/Code_query_sort.cpp | 0 .../client/odbc/codegen/Code_query_sort.hpp | 0 .../client/odbc/codegen/Code_query_sys.cpp | 0 .../client/odbc/codegen/Code_query_sys.hpp | 0 .../src/old_files/client/odbc/codegen/Code_root.cpp | 0 .../src/old_files/client/odbc/codegen/Code_root.hpp | 0 .../old_files/client/odbc/codegen/Code_select.cpp | 0 .../old_files/client/odbc/codegen/Code_select.hpp | 0 .../old_files/client/odbc/codegen/Code_set_row.cpp | 0 .../old_files/client/odbc/codegen/Code_set_row.hpp | 0 .../src/old_files/client/odbc/codegen/Code_stmt.cpp | 0 .../src/old_files/client/odbc/codegen/Code_stmt.hpp | 0 .../old_files/client/odbc/codegen/Code_table.cpp | 0 .../old_files/client/odbc/codegen/Code_table.hpp | 0 .../client/odbc/codegen/Code_table_list.cpp | 0 .../client/odbc/codegen/Code_table_list.hpp | 0 .../old_files/client/odbc/codegen/Code_update.cpp | 0 .../old_files/client/odbc/codegen/Code_update.hpp | 0 .../client/odbc/codegen/Code_update_index.cpp | 0 .../client/odbc/codegen/Code_update_index.hpp | 0 .../client/odbc/codegen/Code_update_lookup.cpp | 0 .../client/odbc/codegen/Code_update_lookup.hpp | 0 .../client/odbc/codegen/Code_update_scan.cpp | 0 .../client/odbc/codegen/Code_update_scan.hpp | 0 .../ndb}/src/old_files/client/odbc/codegen/Makefile | 0 .../old_files/client/odbc/codegen/SimpleGram.ypp | 0 .../old_files/client/odbc/codegen/SimpleParser.cpp | 0 .../old_files/client/odbc/codegen/SimpleParser.hpp | 0 .../old_files/client/odbc/codegen/SimpleScan.lpp | 0 .../src/old_files/client/odbc/common/AttrArea.cpp | 0 .../src/old_files/client/odbc/common/AttrArea.hpp | 0 .../src/old_files/client/odbc/common/CodeTree.cpp | 0 .../src/old_files/client/odbc/common/CodeTree.hpp | 0 .../src/old_files/client/odbc/common/ConnArea.cpp | 0 .../src/old_files/client/odbc/common/ConnArea.hpp | 0 .../ndb}/src/old_files/client/odbc/common/Ctx.cpp | 0 .../ndb}/src/old_files/client/odbc/common/Ctx.hpp | 0 .../src/old_files/client/odbc/common/DataField.cpp | 0 .../src/old_files/client/odbc/common/DataField.hpp | 0 .../src/old_files/client/odbc/common/DataRow.cpp | 0 .../src/old_files/client/odbc/common/DataRow.hpp | 0 .../src/old_files/client/odbc/common/DataType.cpp | 0 .../src/old_files/client/odbc/common/DataType.hpp | 0 .../src/old_files/client/odbc/common/DescArea.cpp | 0 .../src/old_files/client/odbc/common/DescArea.hpp | 0 .../src/old_files/client/odbc/common/DiagArea.cpp | 0 .../src/old_files/client/odbc/common/DiagArea.hpp | 0 .../ndb}/src/old_files/client/odbc/common/Makefile | 0 .../src/old_files/client/odbc/common/OdbcData.cpp | 0 .../src/old_files/client/odbc/common/OdbcData.hpp | 0 .../src/old_files/client/odbc/common/ResultArea.cpp | 0 .../src/old_files/client/odbc/common/ResultArea.hpp | 0 .../src/old_files/client/odbc/common/Sqlstate.cpp | 0 .../src/old_files/client/odbc/common/Sqlstate.hpp | 0 .../src/old_files/client/odbc/common/StmtArea.cpp | 0 .../src/old_files/client/odbc/common/StmtArea.hpp | 0 .../src/old_files/client/odbc/common/StmtInfo.cpp | 0 .../src/old_files/client/odbc/common/StmtInfo.hpp | 0 .../src/old_files/client/odbc/common/common.cpp | 0 .../src/old_files/client/odbc/common/common.hpp | 0 .../client/odbc/dictionary/DictCatalog.cpp | 0 .../client/odbc/dictionary/DictCatalog.hpp | 0 .../old_files/client/odbc/dictionary/DictColumn.cpp | 0 .../old_files/client/odbc/dictionary/DictColumn.hpp | 0 .../old_files/client/odbc/dictionary/DictIndex.cpp | 0 .../old_files/client/odbc/dictionary/DictIndex.hpp | 0 .../old_files/client/odbc/dictionary/DictSchema.cpp | 0 .../old_files/client/odbc/dictionary/DictSchema.hpp | 0 .../old_files/client/odbc/dictionary/DictSys.cpp | 0 .../old_files/client/odbc/dictionary/DictSys.hpp | 0 .../old_files/client/odbc/dictionary/DictTable.cpp | 0 .../old_files/client/odbc/dictionary/DictTable.hpp | 0 .../src/old_files/client/odbc/dictionary/Makefile | 0 .../ndb}/src/old_files/client/odbc/docs/class.fig | 0 .../src/old_files/client/odbc/docs/descfield.pl | 0 .../ndb}/src/old_files/client/odbc/docs/diag.txt | 0 .../ndb}/src/old_files/client/odbc/docs/getinfo.pl | 0 .../src/old_files/client/odbc/docs/gettypeinfo.pl | 0 .../src/old_files/client/odbc/docs/handleattr.pl | 0 .../ndb}/src/old_files/client/odbc/docs/main.hpp | 0 .../src/old_files/client/odbc/docs/ndbodbc.html | 0 .../ndb}/src/old_files/client/odbc/docs/select.fig | 0 .../src/old_files/client/odbc/docs/systables.pl | 0 .../ndb}/src/old_files/client/odbc/docs/type.txt | 0 .../ndb}/src/old_files/client/odbc/driver/Func.data | 0 .../ndb}/src/old_files/client/odbc/driver/Func.pl | 0 .../ndb}/src/old_files/client/odbc/driver/Makefile | 0 .../client/odbc/driver/SQLAllocConnect.cpp | 0 .../old_files/client/odbc/driver/SQLAllocEnv.cpp | 0 .../old_files/client/odbc/driver/SQLAllocHandle.cpp | 0 .../client/odbc/driver/SQLAllocHandleStd.cpp | 0 .../old_files/client/odbc/driver/SQLAllocStmt.cpp | 0 .../src/old_files/client/odbc/driver/SQLBindCol.cpp | 0 .../old_files/client/odbc/driver/SQLBindParam.cpp | 0 .../client/odbc/driver/SQLBindParameter.cpp | 0 .../client/odbc/driver/SQLBrowseConnect.cpp | 0 .../client/odbc/driver/SQLBulkOperations.cpp | 0 .../src/old_files/client/odbc/driver/SQLCancel.cpp | 0 .../old_files/client/odbc/driver/SQLCloseCursor.cpp | 0 .../client/odbc/driver/SQLColAttribute.cpp | 0 .../client/odbc/driver/SQLColAttributes.cpp | 0 .../client/odbc/driver/SQLColumnPrivileges.cpp | 0 .../src/old_files/client/odbc/driver/SQLColumns.cpp | 0 .../src/old_files/client/odbc/driver/SQLConnect.cpp | 0 .../old_files/client/odbc/driver/SQLCopyDesc.cpp | 0 .../old_files/client/odbc/driver/SQLDataSources.cpp | 0 .../old_files/client/odbc/driver/SQLDescribeCol.cpp | 0 .../client/odbc/driver/SQLDescribeParam.cpp | 0 .../old_files/client/odbc/driver/SQLDisconnect.cpp | 0 .../client/odbc/driver/SQLDriverConnect.cpp | 0 .../src/old_files/client/odbc/driver/SQLDrivers.cpp | 0 .../src/old_files/client/odbc/driver/SQLEndTran.cpp | 0 .../src/old_files/client/odbc/driver/SQLError.cpp | 0 .../old_files/client/odbc/driver/SQLExecDirect.cpp | 0 .../src/old_files/client/odbc/driver/SQLExecute.cpp | 0 .../client/odbc/driver/SQLExtendedFetch.cpp | 0 .../src/old_files/client/odbc/driver/SQLFetch.cpp | 0 .../old_files/client/odbc/driver/SQLFetchScroll.cpp | 0 .../old_files/client/odbc/driver/SQLForeignKeys.cpp | 0 .../old_files/client/odbc/driver/SQLFreeConnect.cpp | 0 .../src/old_files/client/odbc/driver/SQLFreeEnv.cpp | 0 .../old_files/client/odbc/driver/SQLFreeHandle.cpp | 0 .../old_files/client/odbc/driver/SQLFreeStmt.cpp | 0 .../client/odbc/driver/SQLGetConnectAttr.cpp | 0 .../client/odbc/driver/SQLGetConnectOption.cpp | 0 .../client/odbc/driver/SQLGetCursorName.cpp | 0 .../src/old_files/client/odbc/driver/SQLGetData.cpp | 0 .../client/odbc/driver/SQLGetDescField.cpp | 0 .../old_files/client/odbc/driver/SQLGetDescRec.cpp | 0 .../client/odbc/driver/SQLGetDiagField.cpp | 0 .../old_files/client/odbc/driver/SQLGetDiagRec.cpp | 0 .../old_files/client/odbc/driver/SQLGetEnvAttr.cpp | 0 .../client/odbc/driver/SQLGetFunctions.cpp | 0 .../src/old_files/client/odbc/driver/SQLGetInfo.cpp | 0 .../old_files/client/odbc/driver/SQLGetStmtAttr.cpp | 0 .../client/odbc/driver/SQLGetStmtOption.cpp | 0 .../old_files/client/odbc/driver/SQLGetTypeInfo.cpp | 0 .../old_files/client/odbc/driver/SQLMoreResults.cpp | 0 .../old_files/client/odbc/driver/SQLNativeSql.cpp | 0 .../old_files/client/odbc/driver/SQLNumParams.cpp | 0 .../client/odbc/driver/SQLNumResultCols.cpp | 0 .../old_files/client/odbc/driver/SQLParamData.cpp | 0 .../client/odbc/driver/SQLParamOptions.cpp | 0 .../src/old_files/client/odbc/driver/SQLPrepare.cpp | 0 .../old_files/client/odbc/driver/SQLPrimaryKeys.cpp | 0 .../client/odbc/driver/SQLProcedureColumns.cpp | 0 .../old_files/client/odbc/driver/SQLProcedures.cpp | 0 .../src/old_files/client/odbc/driver/SQLPutData.cpp | 0 .../old_files/client/odbc/driver/SQLRowCount.cpp | 0 .../client/odbc/driver/SQLSetConnectAttr.cpp | 0 .../client/odbc/driver/SQLSetConnectOption.cpp | 0 .../client/odbc/driver/SQLSetCursorName.cpp | 0 .../client/odbc/driver/SQLSetDescField.cpp | 0 .../old_files/client/odbc/driver/SQLSetDescRec.cpp | 0 .../old_files/client/odbc/driver/SQLSetEnvAttr.cpp | 0 .../old_files/client/odbc/driver/SQLSetParam.cpp | 0 .../src/old_files/client/odbc/driver/SQLSetPos.cpp | 0 .../client/odbc/driver/SQLSetScrollOptions.cpp | 0 .../old_files/client/odbc/driver/SQLSetStmtAttr.cpp | 0 .../client/odbc/driver/SQLSetStmtOption.cpp | 0 .../client/odbc/driver/SQLSpecialColumns.cpp | 0 .../old_files/client/odbc/driver/SQLStatistics.cpp | 0 .../client/odbc/driver/SQLTablePrivileges.cpp | 0 .../src/old_files/client/odbc/driver/SQLTables.cpp | 0 .../old_files/client/odbc/driver/SQLTransact.cpp | 0 .../src/old_files/client/odbc/driver/driver.cpp | 0 .../src/old_files/client/odbc/driver/driver.hpp | 0 .../old_files/client/odbc/executor/Exec_comp_op.cpp | 0 .../client/odbc/executor/Exec_create_index.cpp | 0 .../client/odbc/executor/Exec_create_table.cpp | 0 .../client/odbc/executor/Exec_delete_index.cpp | 0 .../client/odbc/executor/Exec_delete_lookup.cpp | 0 .../client/odbc/executor/Exec_delete_scan.cpp | 0 .../client/odbc/executor/Exec_drop_index.cpp | 0 .../client/odbc/executor/Exec_drop_table.cpp | 0 .../client/odbc/executor/Exec_expr_conv.cpp | 0 .../client/odbc/executor/Exec_expr_func.cpp | 0 .../old_files/client/odbc/executor/Exec_expr_op.cpp | 0 .../old_files/client/odbc/executor/Exec_insert.cpp | 0 .../old_files/client/odbc/executor/Exec_pred_op.cpp | 0 .../client/odbc/executor/Exec_query_index.cpp | 0 .../client/odbc/executor/Exec_query_lookup.cpp | 0 .../client/odbc/executor/Exec_query_range.cpp | 0 .../client/odbc/executor/Exec_query_scan.cpp | 0 .../client/odbc/executor/Exec_query_sys.cpp | 0 .../client/odbc/executor/Exec_update_index.cpp | 0 .../client/odbc/executor/Exec_update_lookup.cpp | 0 .../client/odbc/executor/Exec_update_scan.cpp | 0 .../src/old_files/client/odbc/executor/Executor.cpp | 0 .../src/old_files/client/odbc/executor/Executor.hpp | 0 .../src/old_files/client/odbc/executor/Makefile | 0 .../src/old_files/client/odbc/handles/AttrDbc.cpp | 0 .../src/old_files/client/odbc/handles/AttrEnv.cpp | 0 .../src/old_files/client/odbc/handles/AttrRoot.cpp | 0 .../src/old_files/client/odbc/handles/AttrStmt.cpp | 0 .../src/old_files/client/odbc/handles/DescSpec.cpp | 0 .../src/old_files/client/odbc/handles/FuncTab.cpp | 0 .../old_files/client/odbc/handles/HandleBase.cpp | 0 .../old_files/client/odbc/handles/HandleBase.hpp | 0 .../src/old_files/client/odbc/handles/HandleDbc.cpp | 0 .../src/old_files/client/odbc/handles/HandleDbc.hpp | 0 .../old_files/client/odbc/handles/HandleDesc.cpp | 0 .../old_files/client/odbc/handles/HandleDesc.hpp | 0 .../src/old_files/client/odbc/handles/HandleEnv.cpp | 0 .../src/old_files/client/odbc/handles/HandleEnv.hpp | 0 .../old_files/client/odbc/handles/HandleRoot.cpp | 0 .../old_files/client/odbc/handles/HandleRoot.hpp | 0 .../old_files/client/odbc/handles/HandleStmt.cpp | 0 .../old_files/client/odbc/handles/HandleStmt.hpp | 0 .../src/old_files/client/odbc/handles/InfoTab.cpp | 0 .../ndb}/src/old_files/client/odbc/handles/Makefile | 0 .../src/old_files/client/odbc/handles/PoolNdb.cpp | 0 .../src/old_files/client/odbc/handles/PoolNdb.hpp | 0 .../src/old_files/client/odbc/handles/handles.hpp | 0 .../ndb}/src/old_files/ndbbaseclient/Makefile | 0 .../old_files/ndbbaseclient/ndbbaseclient_dummy.cpp | 0 .../ndb}/src/old_files/ndbclient/Makefile | 0 .../src/old_files/ndbclient/ndbclient_dummy.cpp | 0 .../ndb}/src/old_files/newtonapi/Makefile | 0 .../ndb}/src/old_files/newtonapi/dba_binding.cpp | 0 .../ndb}/src/old_files/newtonapi/dba_bulkread.cpp | 0 .../ndb}/src/old_files/newtonapi/dba_config.cpp | 0 .../ndb}/src/old_files/newtonapi/dba_dac.cpp | 0 .../ndb}/src/old_files/newtonapi/dba_error.cpp | 0 .../ndb}/src/old_files/newtonapi/dba_init.cpp | 0 .../ndb}/src/old_files/newtonapi/dba_internal.hpp | 0 .../ndb}/src/old_files/newtonapi/dba_process.cpp | 0 .../ndb}/src/old_files/newtonapi/dba_process.hpp | 0 .../ndb}/src/old_files/newtonapi/dba_schema.cpp | 0 .../ndb}/src/old_files/rep/ExtSender.cpp | 0 .../ndb}/src/old_files/rep/ExtSender.hpp | 0 {ndb => storage/ndb}/src/old_files/rep/Makefile | 0 .../ndb}/src/old_files/rep/NodeConnectInfo.hpp | 0 {ndb => storage/ndb}/src/old_files/rep/README | 0 .../ndb}/src/old_files/rep/RepApiInterpreter.cpp | 0 .../ndb}/src/old_files/rep/RepApiInterpreter.hpp | 0 .../ndb}/src/old_files/rep/RepApiService.cpp | 0 .../ndb}/src/old_files/rep/RepApiService.hpp | 0 .../src/old_files/rep/RepCommandInterpreter.cpp | 0 .../src/old_files/rep/RepCommandInterpreter.hpp | 0 .../ndb}/src/old_files/rep/RepComponents.cpp | 0 .../ndb}/src/old_files/rep/RepComponents.hpp | 0 {ndb => storage/ndb}/src/old_files/rep/RepMain.cpp | 0 .../ndb}/src/old_files/rep/Requestor.cpp | 0 .../ndb}/src/old_files/rep/Requestor.hpp | 0 .../src/old_files/rep/RequestorSubscriptions.cpp | 0 .../ndb}/src/old_files/rep/SignalQueue.cpp | 0 .../ndb}/src/old_files/rep/SignalQueue.hpp | 0 {ndb => storage/ndb}/src/old_files/rep/TODO | 0 .../ndb}/src/old_files/rep/adapters/AppNDB.cpp | 0 .../ndb}/src/old_files/rep/adapters/AppNDB.hpp | 0 .../ndb}/src/old_files/rep/adapters/ExtAPI.cpp | 0 .../ndb}/src/old_files/rep/adapters/ExtAPI.hpp | 0 .../ndb}/src/old_files/rep/adapters/ExtNDB.cpp | 0 .../ndb}/src/old_files/rep/adapters/ExtNDB.hpp | 0 .../ndb}/src/old_files/rep/adapters/Makefile | 0 .../ndb}/src/old_files/rep/adapters/TableInfoPs.hpp | 0 .../ndb}/src/old_files/rep/dbug_hack.cpp | 0 .../ndb}/src/old_files/rep/rep_version.hpp | 0 .../ndb}/src/old_files/rep/repapi/Makefile | 0 .../ndb}/src/old_files/rep/repapi/repapi.cpp | 0 .../ndb}/src/old_files/rep/repapi/repapi.h | 0 .../ndb}/src/old_files/rep/state/Channel.cpp | 0 .../ndb}/src/old_files/rep/state/Channel.hpp | 0 .../ndb}/src/old_files/rep/state/Interval.cpp | 0 .../ndb}/src/old_files/rep/state/Interval.hpp | 0 .../ndb}/src/old_files/rep/state/Makefile | 0 .../ndb}/src/old_files/rep/state/RepState.cpp | 0 .../ndb}/src/old_files/rep/state/RepState.hpp | 0 .../ndb}/src/old_files/rep/state/RepStateEvent.cpp | 0 .../src/old_files/rep/state/RepStateRequests.cpp | 0 .../src/old_files/rep/state/testInterval/Makefile | 0 .../rep/state/testInterval/testInterval.cpp | 0 .../src/old_files/rep/state/testRepState/Makefile | 0 .../rep/state/testRepState/testRequestor.cpp | 0 .../rep/state/testRepState/testRequestor.hpp | 0 .../ndb}/src/old_files/rep/storage/GCIBuffer.cpp | 0 .../ndb}/src/old_files/rep/storage/GCIBuffer.hpp | 0 .../ndb}/src/old_files/rep/storage/GCIContainer.cpp | 0 .../ndb}/src/old_files/rep/storage/GCIContainer.hpp | 0 .../src/old_files/rep/storage/GCIContainerPS.cpp | 0 .../src/old_files/rep/storage/GCIContainerPS.hpp | 0 .../ndb}/src/old_files/rep/storage/GCIPage.cpp | 0 .../ndb}/src/old_files/rep/storage/GCIPage.hpp | 0 .../ndb}/src/old_files/rep/storage/LogRecord.hpp | 0 .../ndb}/src/old_files/rep/storage/Makefile | 0 .../src/old_files/rep/storage/NodeConnectInfo.hpp | 0 .../ndb}/src/old_files/rep/storage/NodeGroup.cpp | 0 .../ndb}/src/old_files/rep/storage/NodeGroup.hpp | 0 .../src/old_files/rep/storage/NodeGroupInfo.cpp | 0 .../src/old_files/rep/storage/NodeGroupInfo.hpp | 0 .../ndb}/src/old_files/rep/transfer/Makefile | 0 .../ndb}/src/old_files/rep/transfer/TransPS.cpp | 0 .../ndb}/src/old_files/rep/transfer/TransPS.hpp | 0 .../ndb}/src/old_files/rep/transfer/TransSS.cpp | 0 .../ndb}/src/old_files/rep/transfer/TransSS.hpp | 0 .../old_files/rep/transfer/TransSSSubscriptions.cpp | 0 {ndb => storage/ndb}/test/Makefile.am | 0 {ndb => storage/ndb}/test/include/CpcClient.hpp | 0 .../ndb}/test/include/HugoAsynchTransactions.hpp | 0 .../ndb}/test/include/HugoCalculator.hpp | 0 .../ndb}/test/include/HugoOperations.hpp | 0 .../ndb}/test/include/HugoTransactions.hpp | 0 {ndb => storage/ndb}/test/include/NDBT.hpp | 0 {ndb => storage/ndb}/test/include/NDBT_DataSet.hpp | 0 .../ndb}/test/include/NDBT_DataSetTransaction.hpp | 0 {ndb => storage/ndb}/test/include/NDBT_Error.hpp | 0 {ndb => storage/ndb}/test/include/NDBT_Output.hpp | 0 .../ndb}/test/include/NDBT_ResultRow.hpp | 0 .../ndb}/test/include/NDBT_ReturnCodes.h | 0 {ndb => storage/ndb}/test/include/NDBT_Stats.hpp | 0 {ndb => storage/ndb}/test/include/NDBT_Table.hpp | 0 {ndb => storage/ndb}/test/include/NDBT_Tables.hpp | 0 {ndb => storage/ndb}/test/include/NDBT_Test.hpp | 0 {ndb => storage/ndb}/test/include/NdbBackup.hpp | 0 {ndb => storage/ndb}/test/include/NdbConfig.hpp | 0 {ndb => storage/ndb}/test/include/NdbGrep.hpp | 0 {ndb => storage/ndb}/test/include/NdbRestarter.hpp | 0 {ndb => storage/ndb}/test/include/NdbRestarts.hpp | 0 {ndb => storage/ndb}/test/include/NdbSchemaCon.hpp | 0 {ndb => storage/ndb}/test/include/NdbSchemaOp.hpp | 0 {ndb => storage/ndb}/test/include/NdbTest.hpp | 0 {ndb => storage/ndb}/test/include/NdbTimer.hpp | 0 .../ndb}/test/include/TestNdbEventOperation.hpp | 0 .../ndb}/test/include/UtilTransactions.hpp | 0 {ndb => storage/ndb}/test/include/getarg.h | 0 {ndb => storage/ndb}/test/ndbapi/InsertRecs.cpp | 0 {ndb => storage/ndb}/test/ndbapi/Makefile.am | 0 {ndb => storage/ndb}/test/ndbapi/ScanFilter.hpp | 0 {ndb => storage/ndb}/test/ndbapi/ScanFunctions.hpp | 0 .../ndb}/test/ndbapi/ScanInterpretTest.hpp | 0 {ndb => storage/ndb}/test/ndbapi/TraceNdbApi.cpp | 0 {ndb => storage/ndb}/test/ndbapi/VerifyNdbApi.cpp | 0 {ndb => storage/ndb}/test/ndbapi/acid.cpp | 0 {ndb => storage/ndb}/test/ndbapi/acid2.cpp | 0 {ndb => storage/ndb}/test/ndbapi/adoInsertRecs.cpp | 0 {ndb => storage/ndb}/test/ndbapi/asyncGenerator.cpp | 0 {ndb => storage/ndb}/test/ndbapi/bank/Bank.cpp | 0 {ndb => storage/ndb}/test/ndbapi/bank/Bank.hpp | 0 {ndb => storage/ndb}/test/ndbapi/bank/BankLoad.cpp | 0 {ndb => storage/ndb}/test/ndbapi/bank/Makefile.am | 0 .../ndb}/test/ndbapi/bank/bankCreator.cpp | 0 .../ndb}/test/ndbapi/bank/bankMakeGL.cpp | 0 .../ndb}/test/ndbapi/bank/bankSumAccounts.cpp | 0 {ndb => storage/ndb}/test/ndbapi/bank/bankTimer.cpp | 0 .../ndb}/test/ndbapi/bank/bankTransactionMaker.cpp | 0 .../ndb}/test/ndbapi/bank/bankValidateAllGLs.cpp | 0 {ndb => storage/ndb}/test/ndbapi/bank/testBank.cpp | 0 .../ndb}/test/ndbapi/bench/asyncGenerator.cpp | 0 .../ndb}/test/ndbapi/bench/dbGenerator.h | 0 .../ndb}/test/ndbapi/bench/dbPopulate.cpp | 0 {ndb => storage/ndb}/test/ndbapi/bench/dbPopulate.h | 0 {ndb => storage/ndb}/test/ndbapi/bench/macros.h | 0 .../ndb}/test/ndbapi/bench/mainAsyncGenerator.cpp | 0 .../ndb}/test/ndbapi/bench/mainPopulate.cpp | 0 .../ndb}/test/ndbapi/bench/ndb_async1.cpp | 0 .../ndb}/test/ndbapi/bench/ndb_async2.cpp | 0 .../ndb}/test/ndbapi/bench/ndb_error.hpp | 0 .../ndb}/test/ndbapi/bench/ndb_schema.hpp | 0 .../ndb}/test/ndbapi/bench/ndb_user_transaction.cpp | 0 .../test/ndbapi/bench/ndb_user_transaction2.cpp | 0 .../test/ndbapi/bench/ndb_user_transaction3.cpp | 0 .../test/ndbapi/bench/ndb_user_transaction4.cpp | 0 .../test/ndbapi/bench/ndb_user_transaction5.cpp | 0 .../test/ndbapi/bench/ndb_user_transaction6.cpp | 0 {ndb => storage/ndb}/test/ndbapi/bench/testData.h | 0 .../ndb}/test/ndbapi/bench/testDefinitions.h | 0 .../ndb}/test/ndbapi/bench/userInterface.cpp | 0 .../ndb}/test/ndbapi/bench/userInterface.h | 0 {ndb => storage/ndb}/test/ndbapi/benchronja.cpp | 0 {ndb => storage/ndb}/test/ndbapi/bulk_copy.cpp | 0 {ndb => storage/ndb}/test/ndbapi/cdrserver.cpp | 0 {ndb => storage/ndb}/test/ndbapi/celloDb.cpp | 0 .../ndb}/test/ndbapi/create_all_tabs.cpp | 0 {ndb => storage/ndb}/test/ndbapi/create_tab.cpp | 0 {ndb => storage/ndb}/test/ndbapi/drop_all_tabs.cpp | 0 {ndb => storage/ndb}/test/ndbapi/flexAsynch.cpp | 0 {ndb => storage/ndb}/test/ndbapi/flexBench.cpp | 0 {ndb => storage/ndb}/test/ndbapi/flexHammer.cpp | 0 {ndb => storage/ndb}/test/ndbapi/flexScan.cpp | 0 {ndb => storage/ndb}/test/ndbapi/flexTT.cpp | 0 .../ndb}/test/ndbapi/flexTimedAsynch.cpp | 0 .../ndb}/test/ndbapi/flex_bench_mysql.cpp | 0 {ndb => storage/ndb}/test/ndbapi/index.cpp | 0 {ndb => storage/ndb}/test/ndbapi/index2.cpp | 0 {ndb => storage/ndb}/test/ndbapi/initronja.cpp | 0 .../ndb}/test/ndbapi/interpreterInTup.cpp | 0 .../ndb}/test/ndbapi/mainAsyncGenerator.cpp | 0 {ndb => storage/ndb}/test/ndbapi/msa.cpp | 0 {ndb => storage/ndb}/test/ndbapi/ndb_async1.cpp | 0 {ndb => storage/ndb}/test/ndbapi/ndb_async2.cpp | 0 .../ndb}/test/ndbapi/ndb_user_populate.cpp | 0 .../ndb}/test/ndbapi/ndb_user_transaction.cpp | 0 .../ndb}/test/ndbapi/ndb_user_transaction2.cpp | 0 .../ndb}/test/ndbapi/ndb_user_transaction3.cpp | 0 .../ndb}/test/ndbapi/ndb_user_transaction4.cpp | 0 .../ndb}/test/ndbapi/ndb_user_transaction5.cpp | 0 .../ndb}/test/ndbapi/ndb_user_transaction6.cpp | 0 .../ndb}/test/ndbapi/old_dirs/acid/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/acid2/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/acid2/TraceNdbApi.hpp | 0 .../test/ndbapi/old_dirs/acid2/VerifyNdbApi.hpp | 0 .../ndb}/test/ndbapi/old_dirs/basicAsynch/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/bulk_copy/Makefile | 0 .../test/ndbapi/old_dirs/create_all_tabs/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/create_tab/Makefile | 0 .../test/ndbapi/old_dirs/drop_all_tabs/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/flexAsynch/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/flexBench/Makefile.am | 0 .../ndb}/test/ndbapi/old_dirs/flexBench/ndbplot.pl | 0 .../ndb}/test/ndbapi/old_dirs/flexHammer/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/flexHammer/README | 0 .../ndb}/test/ndbapi/old_dirs/flexScan/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/flexScan/README | 0 .../ndb}/test/ndbapi/old_dirs/flexTT/Makefile | 0 .../test/ndbapi/old_dirs/flexTimedAsynch/Makefile | 0 .../test/ndbapi/old_dirs/flex_bench_mysql/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/indexTest/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/indexTest2/Makefile | 0 .../test/ndbapi/old_dirs/interpreterInTup/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/lmc-bench/Makefile | 0 .../ndbapi/old_dirs/lmc-bench/async-src/Makefile | 0 .../old_dirs/lmc-bench/async-src/generator/Makefile | 0 .../lmc-bench/async-src/include/dbGenerator.h | 0 .../old_dirs/lmc-bench/async-src/include/testData.h | 0 .../lmc-bench/async-src/include/userInterface.h | 0 .../old_dirs/lmc-bench/async-src/user/Makefile | 0 .../old_dirs/lmc-bench/async-src/user/macros.h | 0 .../old_dirs/lmc-bench/async-src/user/ndb_error.hpp | 0 .../ndb}/test/ndbapi/old_dirs/lmc-bench/bin/.empty | 0 .../old_dirs/lmc-bench/include/ndb_schema.hpp | 0 .../old_dirs/lmc-bench/include/testDefinitions.h | 0 .../ndb}/test/ndbapi/old_dirs/lmc-bench/lib/.empty | 0 .../test/ndbapi/old_dirs/lmc-bench/script/Makefile | 0 .../lmc-bench/script/async-lmc-bench-l-p10.sh | 0 .../old_dirs/lmc-bench/script/async-lmc-bench-l.sh | 0 .../lmc-bench/script/async-lmc-bench-p10.sh | 0 .../old_dirs/lmc-bench/script/async-lmc-bench.sh | 0 .../test/ndbapi/old_dirs/lmc-bench/src/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/lmc-bench/src/README | 0 .../old_dirs/lmc-bench/src/generator/Makefile | 0 .../old_dirs/lmc-bench/src/generator/dbGenerator.c | 0 .../old_dirs/lmc-bench/src/generator/dbGenerator.h | 0 .../lmc-bench/src/generator/mainGenerator.c | 0 .../old_dirs/lmc-bench/src/include/testData.h | 0 .../old_dirs/lmc-bench/src/include/userInterface.h | 0 .../ndbapi/old_dirs/lmc-bench/src/makevars.linux | 0 .../ndbapi/old_dirs/lmc-bench/src/makevars.sparc | 0 .../old_dirs/lmc-bench/src/populator/Makefile | 0 .../old_dirs/lmc-bench/src/populator/dbPopulate.c | 0 .../old_dirs/lmc-bench/src/populator/dbPopulate.h | 0 .../old_dirs/lmc-bench/src/populator/mainPopulate.c | 0 .../ndbapi/old_dirs/lmc-bench/src/user/Makefile | 0 .../old_dirs/lmc-bench/src/user/localDbPrepare.c | 0 .../ndbapi/old_dirs/lmc-bench/src/user/macros.h | 0 .../old_dirs/lmc-bench/src/user/ndb_error.hpp | 0 .../ndbapi/old_dirs/lmc-bench/src/user/old/Makefile | 0 .../old_dirs/lmc-bench/src/user/old/userHandle.h | 0 .../old_dirs/lmc-bench/src/user/old/userInterface.c | 0 .../lmc-bench/src/user/old/userTransaction.c | 0 .../ndbapi/old_dirs/lmc-bench/src/user/userHandle.h | 0 .../old_dirs/lmc-bench/src/user/userInterface.cpp | 0 .../old_dirs/lmc-bench/src/user/userTransaction.c | 0 .../ndb}/test/ndbapi/old_dirs/restarter/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/restarter2/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/restarts/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/ronja/Makefile | 0 .../test/ndbapi/old_dirs/ronja/benchronja/Makefile | 0 .../test/ndbapi/old_dirs/ronja/initronja/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/telco/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/telco/readme | 0 .../ndb}/test/ndbapi/old_dirs/testBackup/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/testBasic/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/testBlobs/Makefile | 0 .../test/ndbapi/old_dirs/testDataBuffers/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/testDict/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/testGrep/Makefile | 0 .../test/ndbapi/old_dirs/testGrep/verify/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/testIndex/Makefile | 0 .../test/ndbapi/old_dirs/testInterpreter/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/testMgm/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/testNdbApi/Makefile | 0 .../test/ndbapi/old_dirs/testNodeRestart/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/testOIBasic/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/testOIBasic/times.txt | 0 .../test/ndbapi/old_dirs/testOperations/Makefile | 0 .../test/ndbapi/old_dirs/testOrderedIndex/Makefile | 0 .../test/ndbapi/old_dirs/testRestartGci/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/testScan/Makefile | 0 .../ndbapi/old_dirs/testScanInterpreter/Makefile | 0 .../test/ndbapi/old_dirs/testSystemRestart/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/testTimeout/Makefile | 0 .../test/ndbapi/old_dirs/testTransactions/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/test_event/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/vw_test/Makefile | 0 .../ndb}/test/ndbapi/old_dirs/vw_test/bcd.h | 0 .../ndbapi/old_dirs/vw_test/script/client_start | 0 .../ndb}/test/ndbapi/old_dirs/vw_test/utv.h | 0 .../ndb}/test/ndbapi/old_dirs/vw_test/vcdrfunc.h | 0 {ndb => storage/ndb}/test/ndbapi/restarter.cpp | 0 {ndb => storage/ndb}/test/ndbapi/restarter2.cpp | 0 {ndb => storage/ndb}/test/ndbapi/restarts.cpp | 0 {ndb => storage/ndb}/test/ndbapi/size.cpp | 0 {ndb => storage/ndb}/test/ndbapi/slow_select.cpp | 0 {ndb => storage/ndb}/test/ndbapi/testBackup.cpp | 0 {ndb => storage/ndb}/test/ndbapi/testBasic.cpp | 0 .../ndb}/test/ndbapi/testBasicAsynch.cpp | 0 {ndb => storage/ndb}/test/ndbapi/testBitfield.cpp | 0 {ndb => storage/ndb}/test/ndbapi/testBlobs.cpp | 0 .../ndb}/test/ndbapi/testDataBuffers.cpp | 0 {ndb => storage/ndb}/test/ndbapi/testDeadlock.cpp | 0 {ndb => storage/ndb}/test/ndbapi/testDict.cpp | 0 {ndb => storage/ndb}/test/ndbapi/testGrep.cpp | 0 {ndb => storage/ndb}/test/ndbapi/testGrepVerify.cpp | 0 {ndb => storage/ndb}/test/ndbapi/testIndex.cpp | 0 .../ndb}/test/ndbapi/testInterpreter.cpp | 0 {ndb => storage/ndb}/test/ndbapi/testLcp.cpp | 0 {ndb => storage/ndb}/test/ndbapi/testMgm.cpp | 0 {ndb => storage/ndb}/test/ndbapi/testNdbApi.cpp | 0 .../ndb}/test/ndbapi/testNodeRestart.cpp | 0 {ndb => storage/ndb}/test/ndbapi/testOIBasic.cpp | 0 {ndb => storage/ndb}/test/ndbapi/testOperations.cpp | 0 .../ndb}/test/ndbapi/testOrderedIndex.cpp | 0 .../ndb}/test/ndbapi/testPartitioning.cpp | 0 {ndb => storage/ndb}/test/ndbapi/testReadPerf.cpp | 0 {ndb => storage/ndb}/test/ndbapi/testRestartGci.cpp | 0 {ndb => storage/ndb}/test/ndbapi/testScan.cpp | 0 .../ndb}/test/ndbapi/testScanInterpreter.cpp | 0 {ndb => storage/ndb}/test/ndbapi/testScanPerf.cpp | 0 .../ndb}/test/ndbapi/testSystemRestart.cpp | 0 {ndb => storage/ndb}/test/ndbapi/testTimeout.cpp | 0 .../ndb}/test/ndbapi/testTransactions.cpp | 0 {ndb => storage/ndb}/test/ndbapi/test_event.cpp | 0 .../ndb}/test/ndbapi/test_event_multi_table.cpp | 0 {ndb => storage/ndb}/test/ndbapi/userInterface.cpp | 0 {ndb => storage/ndb}/test/ndbnet/test.run | 0 {ndb => storage/ndb}/test/ndbnet/testError.run | 0 {ndb => storage/ndb}/test/ndbnet/testMNF.run | 0 {ndb => storage/ndb}/test/ndbnet/testNR.run | 0 {ndb => storage/ndb}/test/ndbnet/testNR1.run | 0 {ndb => storage/ndb}/test/ndbnet/testNR4.run | 0 {ndb => storage/ndb}/test/ndbnet/testSRhang.run | 0 {ndb => storage/ndb}/test/ndbnet/testTR295.run | 0 .../ndb}/test/newtonapi/basic_test/Makefile | 0 .../ndb}/test/newtonapi/basic_test/basic/Makefile | 0 .../ndb}/test/newtonapi/basic_test/basic/basic.cpp | 0 .../test/newtonapi/basic_test/bulk_read/Makefile | 0 .../test/newtonapi/basic_test/bulk_read/br_test.cpp | 0 .../ndb}/test/newtonapi/basic_test/common.cpp | 0 .../ndb}/test/newtonapi/basic_test/common.hpp | 0 .../test/newtonapi/basic_test/ptr_binding/Makefile | 0 .../basic_test/ptr_binding/ptr_binding_test.cpp | 0 .../ndb}/test/newtonapi/basic_test/too_basic.cpp | 0 .../ndb}/test/newtonapi/perf_test/Makefile | 0 .../ndb}/test/newtonapi/perf_test/perf.cpp | 0 {ndb => storage/ndb}/test/odbc/SQL99_test/Makefile | 0 .../ndb}/test/odbc/SQL99_test/SQL99_test.cpp | 0 .../ndb}/test/odbc/SQL99_test/SQL99_test.h | 0 {ndb => storage/ndb}/test/odbc/client/Makefile | 0 .../ndb}/test/odbc/client/NDBT_ALLOCHANDLE.cpp | 0 .../ndb}/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp | 0 .../ndb}/test/odbc/client/NDBT_SQLConnect.cpp | 0 .../ndb}/test/odbc/client/NDBT_SQLPrepare.cpp | 0 .../ndb}/test/odbc/client/SQLAllocEnvTest.cpp | 0 .../ndb}/test/odbc/client/SQLAllocHandleTest.cpp | 0 .../ndb}/test/odbc/client/SQLAllocHandleTest_bf.cpp | 0 .../ndb}/test/odbc/client/SQLBindColTest.cpp | 0 .../ndb}/test/odbc/client/SQLBindParameterTest.cpp | 0 .../ndb}/test/odbc/client/SQLCancelTest.cpp | 0 .../ndb}/test/odbc/client/SQLCloseCursorTest.cpp | 0 .../ndb}/test/odbc/client/SQLColAttributeTest.cpp | 0 .../ndb}/test/odbc/client/SQLColAttributeTest1.cpp | 0 .../ndb}/test/odbc/client/SQLColAttributeTest2.cpp | 0 .../ndb}/test/odbc/client/SQLColAttributeTest3.cpp | 0 .../ndb}/test/odbc/client/SQLConnectTest.cpp | 0 .../ndb}/test/odbc/client/SQLCopyDescTest.cpp | 0 .../ndb}/test/odbc/client/SQLDescribeColTest.cpp | 0 .../ndb}/test/odbc/client/SQLDisconnectTest.cpp | 0 .../ndb}/test/odbc/client/SQLDriverConnectTest.cpp | 0 .../ndb}/test/odbc/client/SQLEndTranTest.cpp | 0 .../ndb}/test/odbc/client/SQLErrorTest.cpp | 0 .../ndb}/test/odbc/client/SQLExecDirectTest.cpp | 0 .../ndb}/test/odbc/client/SQLExecuteTest.cpp | 0 .../ndb}/test/odbc/client/SQLFetchScrollTest.cpp | 0 .../ndb}/test/odbc/client/SQLFetchTest.cpp | 0 .../ndb}/test/odbc/client/SQLFreeHandleTest.cpp | 0 .../ndb}/test/odbc/client/SQLFreeStmtTest.cpp | 0 .../ndb}/test/odbc/client/SQLGetConnectAttrTest.cpp | 0 .../ndb}/test/odbc/client/SQLGetCursorNameTest.cpp | 0 .../ndb}/test/odbc/client/SQLGetDataTest.cpp | 0 .../ndb}/test/odbc/client/SQLGetDescFieldTest.cpp | 0 .../ndb}/test/odbc/client/SQLGetDescRecTest.cpp | 0 .../ndb}/test/odbc/client/SQLGetDiagFieldTest.cpp | 0 .../test/odbc/client/SQLGetDiagRecSimpleTest.cpp | 0 .../ndb}/test/odbc/client/SQLGetDiagRecTest.cpp | 0 .../ndb}/test/odbc/client/SQLGetEnvAttrTest.cpp | 0 .../ndb}/test/odbc/client/SQLGetFunctionsTest.cpp | 0 .../ndb}/test/odbc/client/SQLGetInfoTest.cpp | 0 .../ndb}/test/odbc/client/SQLGetStmtAttrTest.cpp | 0 .../ndb}/test/odbc/client/SQLGetTypeInfoTest.cpp | 0 .../ndb}/test/odbc/client/SQLMoreResultsTest.cpp | 0 .../ndb}/test/odbc/client/SQLNumResultColsTest.cpp | 0 .../ndb}/test/odbc/client/SQLParamDataTest.cpp | 0 .../ndb}/test/odbc/client/SQLPrepareTest.cpp | 0 .../ndb}/test/odbc/client/SQLPutDataTest.cpp | 0 .../ndb}/test/odbc/client/SQLRowCountTest.cpp | 0 .../ndb}/test/odbc/client/SQLSetConnectAttrTest.cpp | 0 .../ndb}/test/odbc/client/SQLSetCursorNameTest.cpp | 0 .../ndb}/test/odbc/client/SQLSetDescFieldTest.cpp | 0 .../ndb}/test/odbc/client/SQLSetDescRecTest.cpp | 0 .../ndb}/test/odbc/client/SQLSetEnvAttrTest.cpp | 0 .../ndb}/test/odbc/client/SQLSetStmtAttrTest.cpp | 0 .../ndb}/test/odbc/client/SQLTablesTest.cpp | 0 .../ndb}/test/odbc/client/SQLTransactTest.cpp | 0 {ndb => storage/ndb}/test/odbc/client/common.hpp | 0 {ndb => storage/ndb}/test/odbc/client/main.cpp | 0 {ndb => storage/ndb}/test/odbc/dm-iodbc/Makefile | 0 {ndb => storage/ndb}/test/odbc/dm-unixodbc/Makefile | 0 {ndb => storage/ndb}/test/odbc/driver/Makefile | 0 .../ndb}/test/odbc/driver/testOdbcDriver.cpp | 0 .../ndb}/test/odbc/test_compiler/Makefile | 0 .../ndb}/test/odbc/test_compiler/test_compiler.cpp | 0 {ndb => storage/ndb}/test/run-test/16node-tests.txt | 0 {ndb => storage/ndb}/test/run-test/Makefile.am | 0 {ndb => storage/ndb}/test/run-test/README | 0 {ndb => storage/ndb}/test/run-test/README.ATRT | 0 .../ndb}/test/run-test/atrt-analyze-result.sh | 0 .../ndb}/test/run-test/atrt-clear-result.sh | 0 {ndb => storage/ndb}/test/run-test/atrt-example.tgz | Bin .../ndb}/test/run-test/atrt-gather-result.sh | 0 .../ndb}/test/run-test/atrt-mysql-test-run | 0 {ndb => storage/ndb}/test/run-test/atrt-setup.sh | 0 {ndb => storage/ndb}/test/run-test/atrt-testBackup | 0 {ndb => storage/ndb}/test/run-test/basic.txt | 0 .../ndb}/test/run-test/daily-basic-tests.txt | 0 .../ndb}/test/run-test/daily-devel-tests.txt | 0 {ndb => storage/ndb}/test/run-test/example.conf | 0 {ndb => storage/ndb}/test/run-test/main.cpp | 0 {ndb => storage/ndb}/test/run-test/make-config.sh | 0 .../ndb}/test/run-test/make-html-reports.sh | 0 {ndb => storage/ndb}/test/run-test/make-index.sh | 0 {ndb => storage/ndb}/test/run-test/ndb-autotest.sh | 0 {ndb => storage/ndb}/test/run-test/run-test.hpp | 0 {ndb => storage/ndb}/test/src/CpcClient.cpp | 0 .../ndb}/test/src/HugoAsynchTransactions.cpp | 0 {ndb => storage/ndb}/test/src/HugoCalculator.cpp | 0 {ndb => storage/ndb}/test/src/HugoOperations.cpp | 0 {ndb => storage/ndb}/test/src/HugoTransactions.cpp | 0 {ndb => storage/ndb}/test/src/Makefile.am | 0 {ndb => storage/ndb}/test/src/NDBT_Error.cpp | 0 {ndb => storage/ndb}/test/src/NDBT_Output.cpp | 0 {ndb => storage/ndb}/test/src/NDBT_ResultRow.cpp | 0 {ndb => storage/ndb}/test/src/NDBT_ReturnCodes.cpp | 0 {ndb => storage/ndb}/test/src/NDBT_Table.cpp | 0 {ndb => storage/ndb}/test/src/NDBT_Tables.cpp | 0 {ndb => storage/ndb}/test/src/NDBT_Test.cpp | 0 {ndb => storage/ndb}/test/src/NdbBackup.cpp | 0 {ndb => storage/ndb}/test/src/NdbConfig.cpp | 0 {ndb => storage/ndb}/test/src/NdbGrep.cpp | 0 {ndb => storage/ndb}/test/src/NdbRestarter.cpp | 0 {ndb => storage/ndb}/test/src/NdbRestarts.cpp | 0 {ndb => storage/ndb}/test/src/NdbSchemaCon.cpp | 0 {ndb => storage/ndb}/test/src/NdbSchemaOp.cpp | 0 {ndb => storage/ndb}/test/src/UtilTransactions.cpp | 0 {ndb => storage/ndb}/test/src/getarg.c | 0 {ndb => storage/ndb}/test/tools/Makefile.am | 0 {ndb => storage/ndb}/test/tools/copy_tab.cpp | 0 {ndb => storage/ndb}/test/tools/cpcc.cpp | 0 {ndb => storage/ndb}/test/tools/create_index.cpp | 0 {ndb => storage/ndb}/test/tools/hugoCalculator.cpp | 0 {ndb => storage/ndb}/test/tools/hugoFill.cpp | 0 {ndb => storage/ndb}/test/tools/hugoLoad.cpp | 0 {ndb => storage/ndb}/test/tools/hugoLockRecords.cpp | 0 {ndb => storage/ndb}/test/tools/hugoPkDelete.cpp | 0 {ndb => storage/ndb}/test/tools/hugoPkRead.cpp | 0 .../ndb}/test/tools/hugoPkReadRecord.cpp | 0 {ndb => storage/ndb}/test/tools/hugoPkUpdate.cpp | 0 {ndb => storage/ndb}/test/tools/hugoScanRead.cpp | 0 {ndb => storage/ndb}/test/tools/hugoScanUpdate.cpp | 0 .../test/tools/old_dirs/hugoCalculator/Makefile | 0 .../ndb}/test/tools/old_dirs/hugoFill/Makefile | 0 .../ndb}/test/tools/old_dirs/hugoLoad/Makefile | 0 .../test/tools/old_dirs/hugoLockRecords/Makefile | 0 .../ndb}/test/tools/old_dirs/hugoPkDelete/Makefile | 0 .../ndb}/test/tools/old_dirs/hugoPkRead/Makefile | 0 .../test/tools/old_dirs/hugoPkReadRecord/Makefile | 0 .../ndb}/test/tools/old_dirs/hugoPkUpdate/Makefile | 0 .../ndb}/test/tools/old_dirs/hugoScanRead/Makefile | 0 .../test/tools/old_dirs/hugoScanUpdate/Makefile | 0 .../ndb}/test/tools/old_dirs/restart/Makefile | 0 .../ndb}/test/tools/old_dirs/transproxy/Makefile | 0 .../ndb}/test/tools/old_dirs/verify_index/Makefile | 0 .../ndb}/test/tools/old_dirs/waiter/waiter.cpp | 0 {ndb => storage/ndb}/test/tools/restart.cpp | 0 {ndb => storage/ndb}/test/tools/transproxy.cpp | 0 {ndb => storage/ndb}/test/tools/verify_index.cpp | 0 {ndb => storage/ndb}/tools/Makefile.am | 0 {ndb => storage/ndb}/tools/clean-links.sh | 0 {ndb => storage/ndb}/tools/delete_all.cpp | 0 {ndb => storage/ndb}/tools/desc.cpp | 0 {ndb => storage/ndb}/tools/drop_index.cpp | 0 {ndb => storage/ndb}/tools/drop_tab.cpp | 0 {ndb => storage/ndb}/tools/listTables.cpp | 0 {ndb => storage/ndb}/tools/make-errors.pl | 0 {ndb => storage/ndb}/tools/make-links.sh | 0 {ndb => storage/ndb}/tools/ndb_test_platform.cpp | 0 {ndb => storage/ndb}/tools/ndbsql.cpp | 0 .../ndb}/tools/old_dirs/copy_tab/Makefile | 0 {ndb => storage/ndb}/tools/old_dirs/cpcc/Makefile | 0 .../ndb}/tools/old_dirs/create_index/Makefile | 0 .../ndb}/tools/old_dirs/delete_all/Makefile | 0 {ndb => storage/ndb}/tools/old_dirs/desc/Makefile | 0 .../ndb}/tools/old_dirs/drop_index/Makefile | 0 .../ndb}/tools/old_dirs/drop_tab/Makefile | 0 .../ndb}/tools/old_dirs/list_tables/Makefile | 0 .../ndb}/tools/old_dirs/ndbnet/Makefile.PL | 0 .../ndb}/tools/old_dirs/ndbnet/lib/NDB/Net.pm | 0 .../ndb}/tools/old_dirs/ndbnet/lib/NDB/Net/Base.pm | 0 .../tools/old_dirs/ndbnet/lib/NDB/Net/Client.pm | 0 .../tools/old_dirs/ndbnet/lib/NDB/Net/Command.pm | 0 .../tools/old_dirs/ndbnet/lib/NDB/Net/Config.pm | 0 .../tools/old_dirs/ndbnet/lib/NDB/Net/Database.pm | 0 .../ndb}/tools/old_dirs/ndbnet/lib/NDB/Net/Env.pm | 0 .../ndb}/tools/old_dirs/ndbnet/lib/NDB/Net/Node.pm | 0 .../tools/old_dirs/ndbnet/lib/NDB/Net/NodeApi.pm | 0 .../tools/old_dirs/ndbnet/lib/NDB/Net/NodeDb.pm | 0 .../tools/old_dirs/ndbnet/lib/NDB/Net/NodeMgmt.pm | 0 .../tools/old_dirs/ndbnet/lib/NDB/Net/Server.pm | 0 .../tools/old_dirs/ndbnet/lib/NDB/Net/ServerINET.pm | 0 .../tools/old_dirs/ndbnet/lib/NDB/Net/ServerUNIX.pm | 0 .../ndb}/tools/old_dirs/ndbnet/lib/NDB/Run.pm | 0 .../ndb}/tools/old_dirs/ndbnet/lib/NDB/Run/Base.pm | 0 .../tools/old_dirs/ndbnet/lib/NDB/Run/Database.pm | 0 .../ndb}/tools/old_dirs/ndbnet/lib/NDB/Run/Env.pm | 0 .../ndb}/tools/old_dirs/ndbnet/lib/NDB/Run/Node.pm | 0 .../ndb}/tools/old_dirs/ndbnet/lib/NDB/Util.pm | 0 .../ndb}/tools/old_dirs/ndbnet/lib/NDB/Util/Base.pm | 0 .../ndb}/tools/old_dirs/ndbnet/lib/NDB/Util/Dir.pm | 0 .../tools/old_dirs/ndbnet/lib/NDB/Util/Event.pm | 0 .../ndb}/tools/old_dirs/ndbnet/lib/NDB/Util/File.pm | 0 .../ndb}/tools/old_dirs/ndbnet/lib/NDB/Util/IO.pm | 0 .../ndb}/tools/old_dirs/ndbnet/lib/NDB/Util/Lock.pm | 0 .../ndb}/tools/old_dirs/ndbnet/lib/NDB/Util/Log.pm | 0 .../tools/old_dirs/ndbnet/lib/NDB/Util/Socket.pm | 0 .../old_dirs/ndbnet/lib/NDB/Util/SocketINET.pm | 0 .../old_dirs/ndbnet/lib/NDB/Util/SocketUNIX.pm | 0 .../ndb}/tools/old_dirs/ndbnet/ndbnet.pl | 0 .../ndb}/tools/old_dirs/ndbnet/ndbnetd.pl | 0 {ndb => storage/ndb}/tools/old_dirs/ndbnet/ndbrun | 0 {ndb => storage/ndb}/tools/old_dirs/ndbsql/Makefile | 0 .../ndb}/tools/old_dirs/select_all/Makefile | 0 .../ndb}/tools/old_dirs/select_count/Makefile | 0 .../old_dirs/src/counterviewer/CounterViewer.java | 0 {ndb => storage/ndb}/tools/restore/Restore.cpp | 0 {ndb => storage/ndb}/tools/restore/Restore.hpp | 0 {ndb => storage/ndb}/tools/restore/consumer.cpp | 0 {ndb => storage/ndb}/tools/restore/consumer.hpp | 0 .../ndb}/tools/restore/consumer_printer.cpp | 0 .../ndb}/tools/restore/consumer_printer.hpp | 0 .../ndb}/tools/restore/consumer_restore.cpp | 0 .../ndb}/tools/restore/consumer_restore.hpp | 0 .../ndb}/tools/restore/consumer_restorem.cpp | 0 {ndb => storage/ndb}/tools/restore/restore_main.cpp | 0 {ndb => storage/ndb}/tools/rgrep | 0 {ndb => storage/ndb}/tools/select_all.cpp | 0 {ndb => storage/ndb}/tools/select_count.cpp | 0 {ndb => storage/ndb}/tools/waiter.cpp | 0 3252 files changed, 1 insertion(+), 1 deletion(-) rename {bdb => storage/bdb}/LICENSE (100%) rename {bdb => storage/bdb}/Makefile.in (100%) rename {bdb => storage/bdb}/btree/bt_compare.c (100%) rename {bdb => storage/bdb}/btree/bt_conv.c (100%) rename {bdb => storage/bdb}/btree/bt_curadj.c (100%) rename {bdb => storage/bdb}/btree/bt_cursor.c (100%) rename {bdb => storage/bdb}/btree/bt_delete.c (100%) rename {bdb => storage/bdb}/btree/bt_method.c (100%) rename {bdb => storage/bdb}/btree/bt_open.c (100%) rename {bdb => storage/bdb}/btree/bt_put.c (100%) rename {bdb => storage/bdb}/btree/bt_rec.c (100%) rename {bdb => storage/bdb}/btree/bt_reclaim.c (100%) rename {bdb => storage/bdb}/btree/bt_recno.c (100%) rename {bdb => storage/bdb}/btree/bt_rsearch.c (100%) rename {bdb => storage/bdb}/btree/bt_search.c (100%) rename {bdb => storage/bdb}/btree/bt_split.c (100%) rename {bdb => storage/bdb}/btree/bt_stat.c (100%) rename {bdb => storage/bdb}/btree/bt_upgrade.c (100%) rename {bdb => storage/bdb}/btree/bt_verify.c (100%) rename {bdb => storage/bdb}/btree/btree.src (100%) rename {bdb => storage/bdb}/build_unix/.IGNORE_ME (100%) rename {bdb => storage/bdb}/build_vxworks/BerkeleyDB.wsp (100%) rename {bdb => storage/bdb}/build_vxworks/dbdemo/README (100%) rename {bdb => storage/bdb}/build_win32/Berkeley_DB.dsw (100%) rename {bdb => storage/bdb}/build_win32/app_dsp.src (100%) rename {bdb => storage/bdb}/build_win32/build_all.dsp (100%) rename {bdb => storage/bdb}/build_win32/db_java_xa.dsp (100%) rename {bdb => storage/bdb}/build_win32/db_java_xaj.mak (100%) rename {bdb => storage/bdb}/build_win32/db_lib.dsp (100%) rename {bdb => storage/bdb}/build_win32/db_test.src (100%) rename {bdb => storage/bdb}/build_win32/dbkill.cpp (100%) rename {bdb => storage/bdb}/build_win32/dllmain.c (100%) rename {bdb => storage/bdb}/build_win32/dynamic_dsp.src (100%) rename {bdb => storage/bdb}/build_win32/java_dsp.src (100%) rename {bdb => storage/bdb}/build_win32/libdb_tcl.def (100%) rename {bdb => storage/bdb}/build_win32/libdbrc.src (100%) rename {bdb => storage/bdb}/build_win32/srcfile_dsp.src (100%) rename {bdb => storage/bdb}/build_win32/static_dsp.src (100%) rename {bdb => storage/bdb}/build_win32/tcl_dsp.src (100%) rename {bdb => storage/bdb}/clib/getcwd.c (100%) rename {bdb => storage/bdb}/clib/getopt.c (100%) rename {bdb => storage/bdb}/clib/memcmp.c (100%) rename {bdb => storage/bdb}/clib/memmove.c (100%) rename {bdb => storage/bdb}/clib/raise.c (100%) rename {bdb => storage/bdb}/clib/snprintf.c (100%) rename {bdb => storage/bdb}/clib/strcasecmp.c (100%) rename {bdb => storage/bdb}/clib/strdup.c (100%) rename {bdb => storage/bdb}/clib/strerror.c (100%) rename {bdb => storage/bdb}/clib/vsnprintf.c (100%) rename {bdb => storage/bdb}/common/db_byteorder.c (100%) rename {bdb => storage/bdb}/common/db_err.c (100%) rename {bdb => storage/bdb}/common/db_getlong.c (100%) rename {bdb => storage/bdb}/common/db_idspace.c (100%) rename {bdb => storage/bdb}/common/db_log2.c (100%) rename {bdb => storage/bdb}/common/util_arg.c (100%) rename {bdb => storage/bdb}/common/util_cache.c (100%) rename {bdb => storage/bdb}/common/util_log.c (100%) rename {bdb => storage/bdb}/common/util_sig.c (100%) rename {bdb => storage/bdb}/cxx/cxx_db.cpp (100%) rename {bdb => storage/bdb}/cxx/cxx_dbc.cpp (100%) rename {bdb => storage/bdb}/cxx/cxx_dbt.cpp (100%) rename {bdb => storage/bdb}/cxx/cxx_env.cpp (100%) rename {bdb => storage/bdb}/cxx/cxx_except.cpp (100%) rename {bdb => storage/bdb}/cxx/cxx_lock.cpp (100%) rename {bdb => storage/bdb}/cxx/cxx_logc.cpp (100%) rename {bdb => storage/bdb}/cxx/cxx_mpool.cpp (100%) rename {bdb => storage/bdb}/cxx/cxx_txn.cpp (100%) rename {bdb => storage/bdb}/db/crdel.src (100%) rename {bdb => storage/bdb}/db/crdel_rec.c (100%) rename {bdb => storage/bdb}/db/db.c (100%) rename {bdb => storage/bdb}/db/db.src (100%) rename {bdb => storage/bdb}/db/db_am.c (100%) rename {bdb => storage/bdb}/db/db_cam.c (100%) rename {bdb => storage/bdb}/db/db_conv.c (100%) rename {bdb => storage/bdb}/db/db_dispatch.c (100%) rename {bdb => storage/bdb}/db/db_dup.c (100%) rename {bdb => storage/bdb}/db/db_iface.c (100%) rename {bdb => storage/bdb}/db/db_join.c (100%) rename {bdb => storage/bdb}/db/db_meta.c (100%) rename {bdb => storage/bdb}/db/db_method.c (100%) rename {bdb => storage/bdb}/db/db_open.c (100%) rename {bdb => storage/bdb}/db/db_overflow.c (100%) rename {bdb => storage/bdb}/db/db_pr.c (100%) rename {bdb => storage/bdb}/db/db_rec.c (100%) rename {bdb => storage/bdb}/db/db_reclaim.c (100%) rename {bdb => storage/bdb}/db/db_remove.c (100%) rename {bdb => storage/bdb}/db/db_rename.c (100%) rename {bdb => storage/bdb}/db/db_ret.c (100%) rename {bdb => storage/bdb}/db/db_truncate.c (100%) rename {bdb => storage/bdb}/db/db_upg.c (100%) rename {bdb => storage/bdb}/db/db_upg_opd.c (100%) rename {bdb => storage/bdb}/db/db_vrfy.c (100%) rename {bdb => storage/bdb}/db/db_vrfyutil.c (100%) rename {bdb => storage/bdb}/db185/db185.c (100%) rename {bdb => storage/bdb}/db185/db185_int.in (100%) rename {bdb => storage/bdb}/db_archive/db_archive.c (100%) rename {bdb => storage/bdb}/db_checkpoint/db_checkpoint.c (100%) rename {bdb => storage/bdb}/db_deadlock/db_deadlock.c (100%) rename {bdb => storage/bdb}/db_dump/db_dump.c (100%) rename {bdb => storage/bdb}/db_dump185/db_dump185.c (100%) rename {bdb => storage/bdb}/db_load/db_load.c (100%) rename {bdb => storage/bdb}/db_printlog/README (100%) rename {bdb => storage/bdb}/db_printlog/commit.awk (100%) rename {bdb => storage/bdb}/db_printlog/count.awk (100%) rename {bdb => storage/bdb}/db_printlog/db_printlog.c (100%) rename {bdb => storage/bdb}/db_printlog/dbname.awk (100%) rename {bdb => storage/bdb}/db_printlog/fileid.awk (100%) rename {bdb => storage/bdb}/db_printlog/logstat.awk (100%) rename {bdb => storage/bdb}/db_printlog/pgno.awk (100%) rename {bdb => storage/bdb}/db_printlog/range.awk (100%) rename {bdb => storage/bdb}/db_printlog/rectype.awk (100%) rename {bdb => storage/bdb}/db_printlog/status.awk (100%) rename {bdb => storage/bdb}/db_printlog/txn.awk (100%) rename {bdb => storage/bdb}/db_recover/db_recover.c (100%) rename {bdb => storage/bdb}/db_stat/db_stat.c (100%) rename {bdb => storage/bdb}/db_upgrade/db_upgrade.c (100%) rename {bdb => storage/bdb}/db_verify/db_verify.c (100%) rename {bdb => storage/bdb}/dbinc/btree.h (100%) rename {bdb => storage/bdb}/dbinc/crypto.h (100%) rename {bdb => storage/bdb}/dbinc/cxx_common.h (100%) rename {bdb => storage/bdb}/dbinc/cxx_except.h (100%) rename {bdb => storage/bdb}/dbinc/cxx_int.h (100%) rename {bdb => storage/bdb}/dbinc/db.in (100%) rename {bdb => storage/bdb}/dbinc/db_185.in (100%) rename {bdb => storage/bdb}/dbinc/db_am.h (100%) rename {bdb => storage/bdb}/dbinc/db_cxx.in (100%) rename {bdb => storage/bdb}/dbinc/db_dispatch.h (100%) rename {bdb => storage/bdb}/dbinc/db_int.in (100%) rename {bdb => storage/bdb}/dbinc/db_join.h (100%) rename {bdb => storage/bdb}/dbinc/db_page.h (100%) rename {bdb => storage/bdb}/dbinc/db_server_int.h (100%) rename {bdb => storage/bdb}/dbinc/db_shash.h (100%) rename {bdb => storage/bdb}/dbinc/db_swap.h (100%) rename {bdb => storage/bdb}/dbinc/db_upgrade.h (100%) rename {bdb => storage/bdb}/dbinc/db_verify.h (100%) rename {bdb => storage/bdb}/dbinc/debug.h (100%) rename {bdb => storage/bdb}/dbinc/fop.h (100%) rename {bdb => storage/bdb}/dbinc/globals.h (100%) rename {bdb => storage/bdb}/dbinc/hash.h (100%) rename {bdb => storage/bdb}/dbinc/hmac.h (100%) rename {bdb => storage/bdb}/dbinc/lock.h (100%) rename {bdb => storage/bdb}/dbinc/log.h (100%) rename {bdb => storage/bdb}/dbinc/mp.h (100%) rename {bdb => storage/bdb}/dbinc/mutex.h (100%) rename {bdb => storage/bdb}/dbinc/os.h (100%) rename {bdb => storage/bdb}/dbinc/qam.h (100%) rename {bdb => storage/bdb}/dbinc/queue.h (100%) rename {bdb => storage/bdb}/dbinc/region.h (100%) rename {bdb => storage/bdb}/dbinc/rep.h (100%) rename {bdb => storage/bdb}/dbinc/shqueue.h (100%) rename {bdb => storage/bdb}/dbinc/tcl_db.h (100%) rename {bdb => storage/bdb}/dbinc/txn.h (100%) rename {bdb => storage/bdb}/dbinc/xa.h (100%) rename {bdb => storage/bdb}/dbm/dbm.c (100%) rename {bdb => storage/bdb}/dbreg/dbreg.c (100%) rename {bdb => storage/bdb}/dbreg/dbreg.src (100%) rename {bdb => storage/bdb}/dbreg/dbreg_rec.c (100%) rename {bdb => storage/bdb}/dbreg/dbreg_util.c (100%) rename {bdb => storage/bdb}/dist/Makefile.in (100%) rename {bdb => storage/bdb}/dist/RELEASE (100%) rename {bdb => storage/bdb}/dist/aclocal/config.ac (100%) rename {bdb => storage/bdb}/dist/aclocal/cxx.ac (100%) rename {bdb => storage/bdb}/dist/aclocal/gcc.ac (100%) rename {bdb => storage/bdb}/dist/aclocal/libtool.ac (100%) rename {bdb => storage/bdb}/dist/aclocal/mutex.ac (100%) rename {bdb => storage/bdb}/dist/aclocal/options.ac (100%) rename {bdb => storage/bdb}/dist/aclocal/programs.ac (100%) rename {bdb => storage/bdb}/dist/aclocal/sosuffix.ac (100%) rename {bdb => storage/bdb}/dist/aclocal/tcl.ac (100%) rename {bdb => storage/bdb}/dist/aclocal/types.ac (100%) rename {bdb => storage/bdb}/dist/aclocal_java/ac_check_class.ac (100%) rename {bdb => storage/bdb}/dist/aclocal_java/ac_check_classpath.ac (100%) rename {bdb => storage/bdb}/dist/aclocal_java/ac_check_junit.ac (100%) rename {bdb => storage/bdb}/dist/aclocal_java/ac_check_rqrd_class.ac (100%) rename {bdb => storage/bdb}/dist/aclocal_java/ac_java_options.ac (100%) rename {bdb => storage/bdb}/dist/aclocal_java/ac_jni_include_dirs.ac (100%) rename {bdb => storage/bdb}/dist/aclocal_java/ac_prog_jar.ac (100%) rename {bdb => storage/bdb}/dist/aclocal_java/ac_prog_java.ac (100%) rename {bdb => storage/bdb}/dist/aclocal_java/ac_prog_java_works.ac (100%) rename {bdb => storage/bdb}/dist/aclocal_java/ac_prog_javac.ac (100%) rename {bdb => storage/bdb}/dist/aclocal_java/ac_prog_javac_works.ac (100%) rename {bdb => storage/bdb}/dist/aclocal_java/ac_prog_javadoc.ac (100%) rename {bdb => storage/bdb}/dist/aclocal_java/ac_prog_javah.ac (100%) rename {bdb => storage/bdb}/dist/aclocal_java/ac_try_compile_java.ac (100%) rename {bdb => storage/bdb}/dist/aclocal_java/ac_try_run_javac.ac (100%) rename {bdb => storage/bdb}/dist/buildrel (100%) rename {bdb => storage/bdb}/dist/config.guess (100%) rename {bdb => storage/bdb}/dist/config.sub (100%) rename {bdb => storage/bdb}/dist/configure.ac (100%) rename {bdb => storage/bdb}/dist/db.ecd.in (100%) rename {bdb => storage/bdb}/dist/db.spec.in (100%) rename {bdb => storage/bdb}/dist/gen_inc.awk (100%) rename {bdb => storage/bdb}/dist/gen_rec.awk (100%) rename {bdb => storage/bdb}/dist/gen_rpc.awk (100%) rename {bdb => storage/bdb}/dist/install-sh (100%) rename {bdb => storage/bdb}/dist/ltmain.sh (100%) rename {bdb => storage/bdb}/dist/pubdef.in (100%) rename {bdb => storage/bdb}/dist/s_all (100%) rename {bdb => storage/bdb}/dist/s_config (100%) rename {bdb => storage/bdb}/dist/s_crypto (100%) rename {bdb => storage/bdb}/dist/s_dir (100%) rename {bdb => storage/bdb}/dist/s_include (100%) rename {bdb => storage/bdb}/dist/s_java (100%) rename {bdb => storage/bdb}/dist/s_javah (100%) rename {bdb => storage/bdb}/dist/s_perm (100%) rename {bdb => storage/bdb}/dist/s_readme (100%) rename {bdb => storage/bdb}/dist/s_recover (100%) rename {bdb => storage/bdb}/dist/s_rpc (100%) rename {bdb => storage/bdb}/dist/s_symlink (100%) rename {bdb => storage/bdb}/dist/s_tags (100%) rename {bdb => storage/bdb}/dist/s_test (100%) rename {bdb => storage/bdb}/dist/s_vxworks (100%) rename {bdb => storage/bdb}/dist/s_win32 (100%) rename {bdb => storage/bdb}/dist/s_win32_dsp (100%) rename {bdb => storage/bdb}/dist/srcfiles.in (100%) rename {bdb => storage/bdb}/dist/template/rec_ctemp (100%) rename {bdb => storage/bdb}/dist/vx_2.0/BerkeleyDB.wpj (100%) rename {bdb => storage/bdb}/dist/vx_2.0/wpj.in (100%) rename {bdb => storage/bdb}/dist/vx_3.1/Makefile.custom (100%) rename {bdb => storage/bdb}/dist/vx_3.1/cdf.1 (100%) rename {bdb => storage/bdb}/dist/vx_3.1/cdf.2 (100%) rename {bdb => storage/bdb}/dist/vx_3.1/cdf.3 (100%) rename {bdb => storage/bdb}/dist/vx_3.1/component.cdf (100%) rename {bdb => storage/bdb}/dist/vx_3.1/component.wpj (100%) rename {bdb => storage/bdb}/dist/vx_3.1/wpj.1 (100%) rename {bdb => storage/bdb}/dist/vx_3.1/wpj.2 (100%) rename {bdb => storage/bdb}/dist/vx_3.1/wpj.3 (100%) rename {bdb => storage/bdb}/dist/vx_3.1/wpj.4 (100%) rename {bdb => storage/bdb}/dist/vx_3.1/wpj.5 (100%) rename {bdb => storage/bdb}/dist/vx_buildcd (100%) rename {bdb => storage/bdb}/dist/vx_config.in (100%) rename {bdb => storage/bdb}/dist/vx_setup/CONFIG.in (100%) rename {bdb => storage/bdb}/dist/vx_setup/LICENSE.TXT (100%) rename {bdb => storage/bdb}/dist/vx_setup/MESSAGES.TCL (100%) rename {bdb => storage/bdb}/dist/vx_setup/README.in (100%) rename {bdb => storage/bdb}/dist/vx_setup/SETUP.BMP (100%) rename {bdb => storage/bdb}/dist/vx_setup/vx_allfile.in (100%) rename {bdb => storage/bdb}/dist/vx_setup/vx_demofile.in (100%) rename {bdb => storage/bdb}/dist/vx_setup/vx_setup.in (100%) rename {bdb => storage/bdb}/dist/win_config.in (100%) rename {bdb => storage/bdb}/dist/win_exports.in (100%) rename {bdb => storage/bdb}/env/db_salloc.c (100%) rename {bdb => storage/bdb}/env/db_shash.c (100%) rename {bdb => storage/bdb}/env/env_file.c (100%) rename {bdb => storage/bdb}/env/env_method.c (100%) rename {bdb => storage/bdb}/env/env_method.c.b (100%) rename {bdb => storage/bdb}/env/env_open.c (100%) rename {bdb => storage/bdb}/env/env_recover.c (100%) rename {bdb => storage/bdb}/env/env_region.c (100%) rename {bdb => storage/bdb}/fileops/fileops.src (100%) rename {bdb => storage/bdb}/fileops/fop_basic.c (100%) rename {bdb => storage/bdb}/fileops/fop_rec.c (100%) rename {bdb => storage/bdb}/fileops/fop_util.c (100%) rename {bdb => storage/bdb}/hash/hash.c (100%) rename {bdb => storage/bdb}/hash/hash.src (100%) rename {bdb => storage/bdb}/hash/hash_conv.c (100%) rename {bdb => storage/bdb}/hash/hash_dup.c (100%) rename {bdb => storage/bdb}/hash/hash_func.c (100%) rename {bdb => storage/bdb}/hash/hash_meta.c (100%) rename {bdb => storage/bdb}/hash/hash_method.c (100%) rename {bdb => storage/bdb}/hash/hash_open.c (100%) rename {bdb => storage/bdb}/hash/hash_page.c (100%) rename {bdb => storage/bdb}/hash/hash_rec.c (100%) rename {bdb => storage/bdb}/hash/hash_reclaim.c (100%) rename {bdb => storage/bdb}/hash/hash_stat.c (100%) rename {bdb => storage/bdb}/hash/hash_upgrade.c (100%) rename {bdb => storage/bdb}/hash/hash_verify.c (100%) rename {bdb => storage/bdb}/hmac/hmac.c (100%) rename {bdb => storage/bdb}/hmac/sha1.c (100%) rename {bdb => storage/bdb}/hsearch/hsearch.c (100%) rename {bdb => storage/bdb}/libdb_java/checkapi.prl (100%) rename {bdb => storage/bdb}/libdb_java/com_sleepycat_db_Db.h (100%) rename {bdb => storage/bdb}/libdb_java/com_sleepycat_db_DbEnv.h (100%) rename {bdb => storage/bdb}/libdb_java/com_sleepycat_db_DbLock.h (100%) rename {bdb => storage/bdb}/libdb_java/com_sleepycat_db_DbLogc.h (100%) rename {bdb => storage/bdb}/libdb_java/com_sleepycat_db_DbLsn.h (100%) rename {bdb => storage/bdb}/libdb_java/com_sleepycat_db_DbTxn.h (100%) rename {bdb => storage/bdb}/libdb_java/com_sleepycat_db_DbUtil.h (100%) rename {bdb => storage/bdb}/libdb_java/com_sleepycat_db_Dbc.h (100%) rename {bdb => storage/bdb}/libdb_java/com_sleepycat_db_Dbt.h (100%) rename {bdb => storage/bdb}/libdb_java/com_sleepycat_db_xa_DbXAResource.h (100%) rename {bdb => storage/bdb}/libdb_java/java_Db.c (100%) rename {bdb => storage/bdb}/libdb_java/java_DbEnv.c (100%) rename {bdb => storage/bdb}/libdb_java/java_DbLock.c (100%) rename {bdb => storage/bdb}/libdb_java/java_DbLogc.c (100%) rename {bdb => storage/bdb}/libdb_java/java_DbLsn.c (100%) rename {bdb => storage/bdb}/libdb_java/java_DbTxn.c (100%) rename {bdb => storage/bdb}/libdb_java/java_DbUtil.c (100%) rename {bdb => storage/bdb}/libdb_java/java_DbXAResource.c (100%) rename {bdb => storage/bdb}/libdb_java/java_Dbc.c (100%) rename {bdb => storage/bdb}/libdb_java/java_Dbt.c (100%) rename {bdb => storage/bdb}/libdb_java/java_info.c (100%) rename {bdb => storage/bdb}/libdb_java/java_info.h (100%) rename {bdb => storage/bdb}/libdb_java/java_locked.c (100%) rename {bdb => storage/bdb}/libdb_java/java_locked.h (100%) rename {bdb => storage/bdb}/libdb_java/java_util.c (100%) rename {bdb => storage/bdb}/libdb_java/java_util.h (100%) rename {bdb => storage/bdb}/lock/Design (100%) rename {bdb => storage/bdb}/lock/lock.c (100%) rename {bdb => storage/bdb}/lock/lock_deadlock.c (100%) rename {bdb => storage/bdb}/lock/lock_method.c (100%) rename {bdb => storage/bdb}/lock/lock_region.c (100%) rename {bdb => storage/bdb}/lock/lock_stat.c (100%) rename {bdb => storage/bdb}/lock/lock_util.c (100%) rename {bdb => storage/bdb}/log/log.c (100%) rename {bdb => storage/bdb}/log/log_archive.c (100%) rename {bdb => storage/bdb}/log/log_compare.c (100%) rename {bdb => storage/bdb}/log/log_get.c (100%) rename {bdb => storage/bdb}/log/log_method.c (100%) rename {bdb => storage/bdb}/log/log_put.c (100%) rename {bdb => storage/bdb}/mp/mp_alloc.c (100%) rename {bdb => storage/bdb}/mp/mp_bh.c (100%) rename {bdb => storage/bdb}/mp/mp_fget.c (100%) rename {bdb => storage/bdb}/mp/mp_fopen.c (100%) rename {bdb => storage/bdb}/mp/mp_fput.c (100%) rename {bdb => storage/bdb}/mp/mp_fset.c (100%) rename {bdb => storage/bdb}/mp/mp_method.c (100%) rename {bdb => storage/bdb}/mp/mp_region.c (100%) rename {bdb => storage/bdb}/mp/mp_register.c (100%) rename {bdb => storage/bdb}/mp/mp_stat.c (100%) rename {bdb => storage/bdb}/mp/mp_sync.c (100%) rename {bdb => storage/bdb}/mp/mp_trickle.c (100%) rename {bdb => storage/bdb}/mutex/README (100%) rename {bdb => storage/bdb}/mutex/mut_fcntl.c (100%) rename {bdb => storage/bdb}/mutex/mut_pthread.c (100%) rename {bdb => storage/bdb}/mutex/mut_tas.c (100%) rename {bdb => storage/bdb}/mutex/mut_win32.c (100%) rename {bdb => storage/bdb}/mutex/mutex.c (100%) rename {bdb => storage/bdb}/mutex/tm.c (100%) rename {bdb => storage/bdb}/mutex/uts4_cc.s (100%) rename {bdb => storage/bdb}/os/os_abs.c (100%) rename {bdb => storage/bdb}/os/os_alloc.c (100%) rename {bdb => storage/bdb}/os/os_clock.c (100%) rename {bdb => storage/bdb}/os/os_config.c (100%) rename {bdb => storage/bdb}/os/os_dir.c (100%) rename {bdb => storage/bdb}/os/os_errno.c (100%) rename {bdb => storage/bdb}/os/os_fid.c (100%) rename {bdb => storage/bdb}/os/os_fsync.c (100%) rename {bdb => storage/bdb}/os/os_handle.c (100%) rename {bdb => storage/bdb}/os/os_id.c (100%) rename {bdb => storage/bdb}/os/os_map.c (100%) rename {bdb => storage/bdb}/os/os_method.c (100%) rename {bdb => storage/bdb}/os/os_oflags.c (100%) rename {bdb => storage/bdb}/os/os_open.c (100%) rename {bdb => storage/bdb}/os/os_region.c (100%) rename {bdb => storage/bdb}/os/os_rename.c (100%) rename {bdb => storage/bdb}/os/os_root.c (100%) rename {bdb => storage/bdb}/os/os_rpath.c (100%) rename {bdb => storage/bdb}/os/os_rw.c (100%) rename {bdb => storage/bdb}/os/os_seek.c (100%) rename {bdb => storage/bdb}/os/os_sleep.c (100%) rename {bdb => storage/bdb}/os/os_spin.c (100%) rename {bdb => storage/bdb}/os/os_stat.c (100%) rename {bdb => storage/bdb}/os/os_tmpdir.c (100%) rename {bdb => storage/bdb}/os/os_unlink.c (100%) rename {bdb => storage/bdb}/os_vxworks/os_vx_abs.c (100%) rename {bdb => storage/bdb}/os_vxworks/os_vx_config.c (100%) rename {bdb => storage/bdb}/os_vxworks/os_vx_map.c (100%) rename {bdb => storage/bdb}/os_win32/os_abs.c (100%) rename {bdb => storage/bdb}/os_win32/os_clock.c (100%) rename {bdb => storage/bdb}/os_win32/os_config.c (100%) rename {bdb => storage/bdb}/os_win32/os_dir.c (100%) rename {bdb => storage/bdb}/os_win32/os_errno.c (100%) rename {bdb => storage/bdb}/os_win32/os_fid.c (100%) rename {bdb => storage/bdb}/os_win32/os_fsync.c (100%) rename {bdb => storage/bdb}/os_win32/os_handle.c (100%) rename {bdb => storage/bdb}/os_win32/os_map.c (100%) rename {bdb => storage/bdb}/os_win32/os_open.c (100%) rename {bdb => storage/bdb}/os_win32/os_rename.c (100%) rename {bdb => storage/bdb}/os_win32/os_rw.c (100%) rename {bdb => storage/bdb}/os_win32/os_seek.c (100%) rename {bdb => storage/bdb}/os_win32/os_sleep.c (100%) rename {bdb => storage/bdb}/os_win32/os_spin.c (100%) rename {bdb => storage/bdb}/os_win32/os_stat.c (100%) rename {bdb => storage/bdb}/os_win32/os_type.c (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/BerkeleyDB.pm (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/BerkeleyDB.pod (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/BerkeleyDB.pod.P (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/BerkeleyDB.xs (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/BerkeleyDB/Btree.pm (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/BerkeleyDB/Hash.pm (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/Changes (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/MANIFEST (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/Makefile.PL (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/README (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/Todo (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/config.in (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/constants.h (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/constants.xs (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/dbinfo (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/hints/dec_osf.pl (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/hints/irix_6_5.pl (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/hints/solaris.pl (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/mkconsts (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/mkpod (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/patches/5.004 (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/patches/5.004_01 (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/patches/5.004_02 (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/patches/5.004_03 (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/patches/5.004_04 (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/patches/5.004_05 (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/patches/5.005 (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/patches/5.005_01 (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/patches/5.005_02 (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/patches/5.005_03 (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/patches/5.6.0 (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/ppport.h (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/scan (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/t/btree.t (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/t/destroy.t (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/t/env.t (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/t/examples.t (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/t/examples.t.T (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/t/examples3.t (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/t/examples3.t.T (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/t/filter.t (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/t/hash.t (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/t/join.t (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/t/mldbm.t (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/t/queue.t (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/t/recno.t (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/t/strict.t (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/t/subdb.t (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/t/txn.t (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/t/unknown.t (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/t/util.pm (100%) rename {bdb => storage/bdb}/perl/BerkeleyDB/typemap (100%) rename {bdb => storage/bdb}/perl/DB_File/Changes (100%) rename {bdb => storage/bdb}/perl/DB_File/DB_File.pm (100%) rename {bdb => storage/bdb}/perl/DB_File/DB_File.xs (100%) rename {bdb => storage/bdb}/perl/DB_File/DB_File_BS (100%) rename {bdb => storage/bdb}/perl/DB_File/MANIFEST (100%) rename {bdb => storage/bdb}/perl/DB_File/Makefile.PL (100%) rename {bdb => storage/bdb}/perl/DB_File/README (100%) rename {bdb => storage/bdb}/perl/DB_File/config.in (100%) rename {bdb => storage/bdb}/perl/DB_File/dbinfo (100%) rename {bdb => storage/bdb}/perl/DB_File/fallback.h (100%) rename {bdb => storage/bdb}/perl/DB_File/fallback.xs (100%) rename {bdb => storage/bdb}/perl/DB_File/hints/dynixptx.pl (100%) rename {bdb => storage/bdb}/perl/DB_File/hints/sco.pl (100%) rename {bdb => storage/bdb}/perl/DB_File/patches/5.004 (100%) rename {bdb => storage/bdb}/perl/DB_File/patches/5.004_01 (100%) rename {bdb => storage/bdb}/perl/DB_File/patches/5.004_02 (100%) rename {bdb => storage/bdb}/perl/DB_File/patches/5.004_03 (100%) rename {bdb => storage/bdb}/perl/DB_File/patches/5.004_04 (100%) rename {bdb => storage/bdb}/perl/DB_File/patches/5.004_05 (100%) rename {bdb => storage/bdb}/perl/DB_File/patches/5.005 (100%) rename {bdb => storage/bdb}/perl/DB_File/patches/5.005_01 (100%) rename {bdb => storage/bdb}/perl/DB_File/patches/5.005_02 (100%) rename {bdb => storage/bdb}/perl/DB_File/patches/5.005_03 (100%) rename {bdb => storage/bdb}/perl/DB_File/patches/5.6.0 (100%) rename {bdb => storage/bdb}/perl/DB_File/ppport.h (100%) rename {bdb => storage/bdb}/perl/DB_File/t/db-btree.t (100%) rename {bdb => storage/bdb}/perl/DB_File/t/db-hash.t (100%) rename {bdb => storage/bdb}/perl/DB_File/t/db-recno.t (100%) rename {bdb => storage/bdb}/perl/DB_File/typemap (100%) rename {bdb => storage/bdb}/perl/DB_File/version.c (100%) rename {bdb => storage/bdb}/qam/qam.c (100%) rename {bdb => storage/bdb}/qam/qam.src (100%) rename {bdb => storage/bdb}/qam/qam_conv.c (100%) rename {bdb => storage/bdb}/qam/qam_files.c (100%) rename {bdb => storage/bdb}/qam/qam_method.c (100%) rename {bdb => storage/bdb}/qam/qam_open.c (100%) rename {bdb => storage/bdb}/qam/qam_rec.c (100%) rename {bdb => storage/bdb}/qam/qam_stat.c (100%) rename {bdb => storage/bdb}/qam/qam_upgrade.c (100%) rename {bdb => storage/bdb}/qam/qam_verify.c (100%) rename {bdb => storage/bdb}/rep/rep_method.c (100%) rename {bdb => storage/bdb}/rep/rep_record.c (100%) rename {bdb => storage/bdb}/rep/rep_region.c (100%) rename {bdb => storage/bdb}/rep/rep_util.c (100%) rename {bdb => storage/bdb}/rpc_client/client.c (100%) rename {bdb => storage/bdb}/rpc_client/gen_client_ret.c (100%) rename {bdb => storage/bdb}/rpc_server/c/db_server_proc.c.in (100%) rename {bdb => storage/bdb}/rpc_server/c/db_server_util.c (100%) rename {bdb => storage/bdb}/rpc_server/clsrv.html (100%) rename {bdb => storage/bdb}/rpc_server/cxx/db_server_cxxproc.cpp (100%) rename {bdb => storage/bdb}/rpc_server/cxx/db_server_cxxutil.cpp (100%) rename {bdb => storage/bdb}/rpc_server/java/DbDispatcher.java (100%) rename {bdb => storage/bdb}/rpc_server/java/DbServer.java (100%) rename {bdb => storage/bdb}/rpc_server/java/FreeList.java (100%) rename {bdb => storage/bdb}/rpc_server/java/LocalIterator.java (100%) rename {bdb => storage/bdb}/rpc_server/java/README (100%) rename {bdb => storage/bdb}/rpc_server/java/RpcDb.java (100%) rename {bdb => storage/bdb}/rpc_server/java/RpcDbEnv.java (100%) rename {bdb => storage/bdb}/rpc_server/java/RpcDbTxn.java (100%) rename {bdb => storage/bdb}/rpc_server/java/RpcDbc.java (100%) rename {bdb => storage/bdb}/rpc_server/java/Timer.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/DbServerStub.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_associate_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_associate_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_bt_maxkey_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_bt_maxkey_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_bt_minkey_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_bt_minkey_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_close_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_close_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_create_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_create_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_cursor_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_cursor_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_del_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_del_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_encrypt_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_encrypt_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_extentsize_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_extentsize_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_flags_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_flags_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_get_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_get_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_h_ffactor_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_h_ffactor_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_h_nelem_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_h_nelem_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_join_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_join_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_key_range_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_key_range_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_lorder_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_lorder_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_open_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_open_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_pagesize_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_pagesize_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_pget_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_pget_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_put_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_put_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_re_delim_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_re_delim_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_re_len_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_re_len_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_re_pad_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_re_pad_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_remove_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_remove_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_rename_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_rename_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_stat_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_stat_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_sync_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_sync_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_truncate_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__db_truncate_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__dbc_close_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__dbc_close_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__dbc_count_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__dbc_count_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__dbc_del_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__dbc_del_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__dbc_dup_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__dbc_dup_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__dbc_get_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__dbc_get_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__dbc_pget_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__dbc_pget_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__dbc_put_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__dbc_put_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__env_cachesize_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__env_cachesize_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__env_close_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__env_close_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__env_create_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__env_create_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__env_dbremove_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__env_dbremove_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__env_dbrename_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__env_dbrename_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__env_encrypt_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__env_encrypt_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__env_flags_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__env_flags_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__env_open_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__env_open_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__env_remove_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__env_remove_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__txn_abort_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__txn_abort_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__txn_begin_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__txn_begin_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__txn_commit_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__txn_commit_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__txn_discard_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__txn_discard_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__txn_prepare_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__txn_prepare_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__txn_recover_msg.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/__txn_recover_reply.java (100%) rename {bdb => storage/bdb}/rpc_server/java/gen/db_server.java (100%) rename {bdb => storage/bdb}/rpc_server/java/jrpcgen.jar (100%) rename {bdb => storage/bdb}/rpc_server/java/oncrpc.jar (100%) rename {bdb => storage/bdb}/rpc_server/java/s_jrpcgen (100%) rename {bdb => storage/bdb}/rpc_server/rpc.src (100%) rename {bdb => storage/bdb}/tcl/docs/db.html (100%) rename {bdb => storage/bdb}/tcl/docs/env.html (100%) rename {bdb => storage/bdb}/tcl/docs/historic.html (100%) rename {bdb => storage/bdb}/tcl/docs/index.html (100%) rename {bdb => storage/bdb}/tcl/docs/library.html (100%) rename {bdb => storage/bdb}/tcl/docs/lock.html (100%) rename {bdb => storage/bdb}/tcl/docs/log.html (100%) rename {bdb => storage/bdb}/tcl/docs/mpool.html (100%) rename {bdb => storage/bdb}/tcl/docs/rep.html (100%) rename {bdb => storage/bdb}/tcl/docs/test.html (100%) rename {bdb => storage/bdb}/tcl/docs/txn.html (100%) rename {bdb => storage/bdb}/tcl/tcl_compat.c (100%) rename {bdb => storage/bdb}/tcl/tcl_db.c (100%) rename {bdb => storage/bdb}/tcl/tcl_db_pkg.c (100%) rename {bdb => storage/bdb}/tcl/tcl_dbcursor.c (100%) rename {bdb => storage/bdb}/tcl/tcl_env.c (100%) rename {bdb => storage/bdb}/tcl/tcl_internal.c (100%) rename {bdb => storage/bdb}/tcl/tcl_lock.c (100%) rename {bdb => storage/bdb}/tcl/tcl_log.c (100%) rename {bdb => storage/bdb}/tcl/tcl_mp.c (100%) rename {bdb => storage/bdb}/tcl/tcl_rep.c (100%) rename {bdb => storage/bdb}/tcl/tcl_txn.c (100%) rename {bdb => storage/bdb}/tcl/tcl_util.c (100%) rename {bdb => storage/bdb}/test/archive.tcl (100%) rename {bdb => storage/bdb}/test/bigfile001.tcl (100%) rename {bdb => storage/bdb}/test/bigfile002.tcl (100%) rename {bdb => storage/bdb}/test/byteorder.tcl (100%) rename {bdb => storage/bdb}/test/conscript.tcl (100%) rename {bdb => storage/bdb}/test/dbm.tcl (100%) rename {bdb => storage/bdb}/test/dbscript.tcl (100%) rename {bdb => storage/bdb}/test/ddoyscript.tcl (100%) rename {bdb => storage/bdb}/test/ddscript.tcl (100%) rename {bdb => storage/bdb}/test/dead001.tcl (100%) rename {bdb => storage/bdb}/test/dead002.tcl (100%) rename {bdb => storage/bdb}/test/dead003.tcl (100%) rename {bdb => storage/bdb}/test/dead004.tcl (100%) rename {bdb => storage/bdb}/test/dead005.tcl (100%) rename {bdb => storage/bdb}/test/dead006.tcl (100%) rename {bdb => storage/bdb}/test/dead007.tcl (100%) rename {bdb => storage/bdb}/test/env001.tcl (100%) rename {bdb => storage/bdb}/test/env002.tcl (100%) rename {bdb => storage/bdb}/test/env003.tcl (100%) rename {bdb => storage/bdb}/test/env004.tcl (100%) rename {bdb => storage/bdb}/test/env005.tcl (100%) rename {bdb => storage/bdb}/test/env006.tcl (100%) rename {bdb => storage/bdb}/test/env007.tcl (100%) rename {bdb => storage/bdb}/test/env008.tcl (100%) rename {bdb => storage/bdb}/test/env009.tcl (100%) rename {bdb => storage/bdb}/test/env010.tcl (100%) rename {bdb => storage/bdb}/test/env011.tcl (100%) rename {bdb => storage/bdb}/test/hsearch.tcl (100%) rename {bdb => storage/bdb}/test/join.tcl (100%) rename {bdb => storage/bdb}/test/lock001.tcl (100%) rename {bdb => storage/bdb}/test/lock002.tcl (100%) rename {bdb => storage/bdb}/test/lock003.tcl (100%) rename {bdb => storage/bdb}/test/lock004.tcl (100%) rename {bdb => storage/bdb}/test/lock005.tcl (100%) rename {bdb => storage/bdb}/test/lockscript.tcl (100%) rename {bdb => storage/bdb}/test/log001.tcl (100%) rename {bdb => storage/bdb}/test/log002.tcl (100%) rename {bdb => storage/bdb}/test/log003.tcl (100%) rename {bdb => storage/bdb}/test/log004.tcl (100%) rename {bdb => storage/bdb}/test/log005.tcl (100%) rename {bdb => storage/bdb}/test/logtrack.tcl (100%) rename {bdb => storage/bdb}/test/mdbscript.tcl (100%) rename {bdb => storage/bdb}/test/memp001.tcl (100%) rename {bdb => storage/bdb}/test/memp002.tcl (100%) rename {bdb => storage/bdb}/test/memp003.tcl (100%) rename {bdb => storage/bdb}/test/mpoolscript.tcl (100%) rename {bdb => storage/bdb}/test/mutex001.tcl (100%) rename {bdb => storage/bdb}/test/mutex002.tcl (100%) rename {bdb => storage/bdb}/test/mutex003.tcl (100%) rename {bdb => storage/bdb}/test/mutexscript.tcl (100%) rename {bdb => storage/bdb}/test/ndbm.tcl (100%) rename {bdb => storage/bdb}/test/parallel.tcl (100%) rename {bdb => storage/bdb}/test/recd001.tcl (100%) rename {bdb => storage/bdb}/test/recd002.tcl (100%) rename {bdb => storage/bdb}/test/recd003.tcl (100%) rename {bdb => storage/bdb}/test/recd004.tcl (100%) rename {bdb => storage/bdb}/test/recd005.tcl (100%) rename {bdb => storage/bdb}/test/recd006.tcl (100%) rename {bdb => storage/bdb}/test/recd007.tcl (100%) rename {bdb => storage/bdb}/test/recd008.tcl (100%) rename {bdb => storage/bdb}/test/recd009.tcl (100%) rename {bdb => storage/bdb}/test/recd010.tcl (100%) rename {bdb => storage/bdb}/test/recd011.tcl (100%) rename {bdb => storage/bdb}/test/recd012.tcl (100%) rename {bdb => storage/bdb}/test/recd013.tcl (100%) rename {bdb => storage/bdb}/test/recd014.tcl (100%) rename {bdb => storage/bdb}/test/recd015.tcl (100%) rename {bdb => storage/bdb}/test/recd016.tcl (100%) rename {bdb => storage/bdb}/test/recd017.tcl (100%) rename {bdb => storage/bdb}/test/recd018.tcl (100%) rename {bdb => storage/bdb}/test/recd019.tcl (100%) rename {bdb => storage/bdb}/test/recd020.tcl (100%) rename {bdb => storage/bdb}/test/recd15scr.tcl (100%) rename {bdb => storage/bdb}/test/recdscript.tcl (100%) rename {bdb => storage/bdb}/test/rep001.tcl (100%) rename {bdb => storage/bdb}/test/rep002.tcl (100%) rename {bdb => storage/bdb}/test/rep003.tcl (100%) rename {bdb => storage/bdb}/test/rep004.tcl (100%) rename {bdb => storage/bdb}/test/rep005.tcl (100%) rename {bdb => storage/bdb}/test/reputils.tcl (100%) rename {bdb => storage/bdb}/test/rpc001.tcl (100%) rename {bdb => storage/bdb}/test/rpc002.tcl (100%) rename {bdb => storage/bdb}/test/rpc003.tcl (100%) rename {bdb => storage/bdb}/test/rpc004.tcl (100%) rename {bdb => storage/bdb}/test/rpc005.tcl (100%) rename {bdb => storage/bdb}/test/rsrc001.tcl (100%) rename {bdb => storage/bdb}/test/rsrc002.tcl (100%) rename {bdb => storage/bdb}/test/rsrc003.tcl (100%) rename {bdb => storage/bdb}/test/rsrc004.tcl (100%) rename {bdb => storage/bdb}/test/scr001/chk.code (100%) rename {bdb => storage/bdb}/test/scr002/chk.def (100%) rename {bdb => storage/bdb}/test/scr003/chk.define (100%) rename {bdb => storage/bdb}/test/scr004/chk.javafiles (100%) rename {bdb => storage/bdb}/test/scr005/chk.nl (100%) rename {bdb => storage/bdb}/test/scr006/chk.offt (100%) rename {bdb => storage/bdb}/test/scr007/chk.proto (100%) rename {bdb => storage/bdb}/test/scr008/chk.pubdef (100%) rename {bdb => storage/bdb}/test/scr009/chk.srcfiles (100%) rename {bdb => storage/bdb}/test/scr010/chk.str (100%) rename {bdb => storage/bdb}/test/scr010/spell.ok (100%) rename {bdb => storage/bdb}/test/scr011/chk.tags (100%) rename {bdb => storage/bdb}/test/scr012/chk.vx_code (100%) rename {bdb => storage/bdb}/test/scr013/chk.stats (100%) rename {bdb => storage/bdb}/test/scr014/chk.err (100%) rename {bdb => storage/bdb}/test/scr015/README (100%) rename {bdb => storage/bdb}/test/scr015/TestConstruct01.cpp (100%) rename {bdb => storage/bdb}/test/scr015/TestConstruct01.testerr (100%) rename {bdb => storage/bdb}/test/scr015/TestConstruct01.testout (100%) rename {bdb => storage/bdb}/test/scr015/TestExceptInclude.cpp (100%) rename {bdb => storage/bdb}/test/scr015/TestGetSetMethods.cpp (100%) rename {bdb => storage/bdb}/test/scr015/TestKeyRange.cpp (100%) rename {bdb => storage/bdb}/test/scr015/TestKeyRange.testin (100%) rename {bdb => storage/bdb}/test/scr015/TestKeyRange.testout (100%) rename {bdb => storage/bdb}/test/scr015/TestLogc.cpp (100%) rename {bdb => storage/bdb}/test/scr015/TestLogc.testout (100%) rename {bdb => storage/bdb}/test/scr015/TestSimpleAccess.cpp (100%) rename {bdb => storage/bdb}/test/scr015/TestSimpleAccess.testout (100%) rename {bdb => storage/bdb}/test/scr015/TestTruncate.cpp (100%) rename {bdb => storage/bdb}/test/scr015/TestTruncate.testout (100%) rename {bdb => storage/bdb}/test/scr015/chk.cxxtests (100%) rename {bdb => storage/bdb}/test/scr015/ignore (100%) rename {bdb => storage/bdb}/test/scr015/testall (100%) rename {bdb => storage/bdb}/test/scr015/testone (100%) rename {bdb => storage/bdb}/test/scr016/CallbackTest.java (100%) rename {bdb => storage/bdb}/test/scr016/CallbackTest.testout (100%) rename {bdb => storage/bdb}/test/scr016/README (100%) rename {bdb => storage/bdb}/test/scr016/TestAppendRecno.java (100%) rename {bdb => storage/bdb}/test/scr016/TestAppendRecno.testout (100%) rename {bdb => storage/bdb}/test/scr016/TestAssociate.java (100%) rename {bdb => storage/bdb}/test/scr016/TestAssociate.testout (100%) rename {bdb => storage/bdb}/test/scr016/TestClosedDb.java (100%) rename {bdb => storage/bdb}/test/scr016/TestClosedDb.testout (100%) rename {bdb => storage/bdb}/test/scr016/TestConstruct01.java (100%) rename {bdb => storage/bdb}/test/scr016/TestConstruct01.testerr (100%) rename {bdb => storage/bdb}/test/scr016/TestConstruct01.testout (100%) rename {bdb => storage/bdb}/test/scr016/TestConstruct02.java (100%) rename {bdb => storage/bdb}/test/scr016/TestConstruct02.testout (100%) rename {bdb => storage/bdb}/test/scr016/TestDbtFlags.java (100%) rename {bdb => storage/bdb}/test/scr016/TestDbtFlags.testerr (100%) rename {bdb => storage/bdb}/test/scr016/TestDbtFlags.testout (100%) rename {bdb => storage/bdb}/test/scr016/TestGetSetMethods.java (100%) rename {bdb => storage/bdb}/test/scr016/TestKeyRange.java (100%) rename {bdb => storage/bdb}/test/scr016/TestKeyRange.testout (100%) rename {bdb => storage/bdb}/test/scr016/TestLockVec.java (100%) rename {bdb => storage/bdb}/test/scr016/TestLockVec.testout (100%) rename {bdb => storage/bdb}/test/scr016/TestLogc.java (100%) rename {bdb => storage/bdb}/test/scr016/TestLogc.testout (100%) rename {bdb => storage/bdb}/test/scr016/TestOpenEmpty.java (100%) rename {bdb => storage/bdb}/test/scr016/TestOpenEmpty.testerr (100%) rename {bdb => storage/bdb}/test/scr016/TestReplication.java (100%) rename {bdb => storage/bdb}/test/scr016/TestRpcServer.java (100%) rename {bdb => storage/bdb}/test/scr016/TestSameDbt.java (100%) rename {bdb => storage/bdb}/test/scr016/TestSameDbt.testout (100%) rename {bdb => storage/bdb}/test/scr016/TestSimpleAccess.java (100%) rename {bdb => storage/bdb}/test/scr016/TestSimpleAccess.testout (100%) rename {bdb => storage/bdb}/test/scr016/TestStat.java (100%) rename {bdb => storage/bdb}/test/scr016/TestStat.testout (100%) rename {bdb => storage/bdb}/test/scr016/TestTruncate.java (100%) rename {bdb => storage/bdb}/test/scr016/TestTruncate.testout (100%) rename {bdb => storage/bdb}/test/scr016/TestUtil.java (100%) rename {bdb => storage/bdb}/test/scr016/TestXAServlet.java (100%) rename {bdb => storage/bdb}/test/scr016/chk.javatests (100%) rename {bdb => storage/bdb}/test/scr016/ignore (100%) rename {bdb => storage/bdb}/test/scr016/testall (100%) rename {bdb => storage/bdb}/test/scr016/testone (100%) rename {bdb => storage/bdb}/test/scr017/O.BH (100%) rename {bdb => storage/bdb}/test/scr017/O.R (100%) rename {bdb => storage/bdb}/test/scr017/chk.db185 (100%) rename {bdb => storage/bdb}/test/scr017/t.c (100%) rename {bdb => storage/bdb}/test/scr018/chk.comma (100%) rename {bdb => storage/bdb}/test/scr018/t.c (100%) rename {bdb => storage/bdb}/test/scr019/chk.include (100%) rename {bdb => storage/bdb}/test/scr020/chk.inc (100%) rename {bdb => storage/bdb}/test/scr021/chk.flags (100%) rename {bdb => storage/bdb}/test/scr022/chk.rr (100%) rename {bdb => storage/bdb}/test/sdb001.tcl (100%) rename {bdb => storage/bdb}/test/sdb002.tcl (100%) rename {bdb => storage/bdb}/test/sdb003.tcl (100%) rename {bdb => storage/bdb}/test/sdb004.tcl (100%) rename {bdb => storage/bdb}/test/sdb005.tcl (100%) rename {bdb => storage/bdb}/test/sdb006.tcl (100%) rename {bdb => storage/bdb}/test/sdb007.tcl (100%) rename {bdb => storage/bdb}/test/sdb008.tcl (100%) rename {bdb => storage/bdb}/test/sdb009.tcl (100%) rename {bdb => storage/bdb}/test/sdb010.tcl (100%) rename {bdb => storage/bdb}/test/sdb011.tcl (100%) rename {bdb => storage/bdb}/test/sdb012.tcl (100%) rename {bdb => storage/bdb}/test/sdbscript.tcl (100%) rename {bdb => storage/bdb}/test/sdbtest001.tcl (100%) rename {bdb => storage/bdb}/test/sdbtest002.tcl (100%) rename {bdb => storage/bdb}/test/sdbutils.tcl (100%) rename {bdb => storage/bdb}/test/sec001.tcl (100%) rename {bdb => storage/bdb}/test/sec002.tcl (100%) rename {bdb => storage/bdb}/test/shelltest.tcl (100%) rename {bdb => storage/bdb}/test/si001.tcl (100%) rename {bdb => storage/bdb}/test/si002.tcl (100%) rename {bdb => storage/bdb}/test/si003.tcl (100%) rename {bdb => storage/bdb}/test/si004.tcl (100%) rename {bdb => storage/bdb}/test/si005.tcl (100%) rename {bdb => storage/bdb}/test/si006.tcl (100%) rename {bdb => storage/bdb}/test/sindex.tcl (100%) rename {bdb => storage/bdb}/test/sysscript.tcl (100%) rename {bdb => storage/bdb}/test/test.tcl (100%) rename {bdb => storage/bdb}/test/test001.tcl (100%) rename {bdb => storage/bdb}/test/test002.tcl (100%) rename {bdb => storage/bdb}/test/test003.tcl (100%) rename {bdb => storage/bdb}/test/test004.tcl (100%) rename {bdb => storage/bdb}/test/test005.tcl (100%) rename {bdb => storage/bdb}/test/test006.tcl (100%) rename {bdb => storage/bdb}/test/test007.tcl (100%) rename {bdb => storage/bdb}/test/test008.tcl (100%) rename {bdb => storage/bdb}/test/test009.tcl (100%) rename {bdb => storage/bdb}/test/test010.tcl (100%) rename {bdb => storage/bdb}/test/test011.tcl (100%) rename {bdb => storage/bdb}/test/test012.tcl (100%) rename {bdb => storage/bdb}/test/test013.tcl (100%) rename {bdb => storage/bdb}/test/test014.tcl (100%) rename {bdb => storage/bdb}/test/test015.tcl (100%) rename {bdb => storage/bdb}/test/test016.tcl (100%) rename {bdb => storage/bdb}/test/test017.tcl (100%) rename {bdb => storage/bdb}/test/test018.tcl (100%) rename {bdb => storage/bdb}/test/test019.tcl (100%) rename {bdb => storage/bdb}/test/test020.tcl (100%) rename {bdb => storage/bdb}/test/test021.tcl (100%) rename {bdb => storage/bdb}/test/test022.tcl (100%) rename {bdb => storage/bdb}/test/test023.tcl (100%) rename {bdb => storage/bdb}/test/test024.tcl (100%) rename {bdb => storage/bdb}/test/test025.tcl (100%) rename {bdb => storage/bdb}/test/test026.tcl (100%) rename {bdb => storage/bdb}/test/test027.tcl (100%) rename {bdb => storage/bdb}/test/test028.tcl (100%) rename {bdb => storage/bdb}/test/test029.tcl (100%) rename {bdb => storage/bdb}/test/test030.tcl (100%) rename {bdb => storage/bdb}/test/test031.tcl (100%) rename {bdb => storage/bdb}/test/test032.tcl (100%) rename {bdb => storage/bdb}/test/test033.tcl (100%) rename {bdb => storage/bdb}/test/test034.tcl (100%) rename {bdb => storage/bdb}/test/test035.tcl (100%) rename {bdb => storage/bdb}/test/test036.tcl (100%) rename {bdb => storage/bdb}/test/test037.tcl (100%) rename {bdb => storage/bdb}/test/test038.tcl (100%) rename {bdb => storage/bdb}/test/test039.tcl (100%) rename {bdb => storage/bdb}/test/test040.tcl (100%) rename {bdb => storage/bdb}/test/test041.tcl (100%) rename {bdb => storage/bdb}/test/test042.tcl (100%) rename {bdb => storage/bdb}/test/test043.tcl (100%) rename {bdb => storage/bdb}/test/test044.tcl (100%) rename {bdb => storage/bdb}/test/test045.tcl (100%) rename {bdb => storage/bdb}/test/test046.tcl (100%) rename {bdb => storage/bdb}/test/test047.tcl (100%) rename {bdb => storage/bdb}/test/test048.tcl (100%) rename {bdb => storage/bdb}/test/test049.tcl (100%) rename {bdb => storage/bdb}/test/test050.tcl (100%) rename {bdb => storage/bdb}/test/test051.tcl (100%) rename {bdb => storage/bdb}/test/test052.tcl (100%) rename {bdb => storage/bdb}/test/test053.tcl (100%) rename {bdb => storage/bdb}/test/test054.tcl (100%) rename {bdb => storage/bdb}/test/test055.tcl (100%) rename {bdb => storage/bdb}/test/test056.tcl (100%) rename {bdb => storage/bdb}/test/test057.tcl (100%) rename {bdb => storage/bdb}/test/test058.tcl (100%) rename {bdb => storage/bdb}/test/test059.tcl (100%) rename {bdb => storage/bdb}/test/test060.tcl (100%) rename {bdb => storage/bdb}/test/test061.tcl (100%) rename {bdb => storage/bdb}/test/test062.tcl (100%) rename {bdb => storage/bdb}/test/test063.tcl (100%) rename {bdb => storage/bdb}/test/test064.tcl (100%) rename {bdb => storage/bdb}/test/test065.tcl (100%) rename {bdb => storage/bdb}/test/test066.tcl (100%) rename {bdb => storage/bdb}/test/test067.tcl (100%) rename {bdb => storage/bdb}/test/test068.tcl (100%) rename {bdb => storage/bdb}/test/test069.tcl (100%) rename {bdb => storage/bdb}/test/test070.tcl (100%) rename {bdb => storage/bdb}/test/test071.tcl (100%) rename {bdb => storage/bdb}/test/test072.tcl (100%) rename {bdb => storage/bdb}/test/test073.tcl (100%) rename {bdb => storage/bdb}/test/test074.tcl (100%) rename {bdb => storage/bdb}/test/test075.tcl (100%) rename {bdb => storage/bdb}/test/test076.tcl (100%) rename {bdb => storage/bdb}/test/test077.tcl (100%) rename {bdb => storage/bdb}/test/test078.tcl (100%) rename {bdb => storage/bdb}/test/test079.tcl (100%) rename {bdb => storage/bdb}/test/test080.tcl (100%) rename {bdb => storage/bdb}/test/test081.tcl (100%) rename {bdb => storage/bdb}/test/test082.tcl (100%) rename {bdb => storage/bdb}/test/test083.tcl (100%) rename {bdb => storage/bdb}/test/test084.tcl (100%) rename {bdb => storage/bdb}/test/test085.tcl (100%) rename {bdb => storage/bdb}/test/test086.tcl (100%) rename {bdb => storage/bdb}/test/test087.tcl (100%) rename {bdb => storage/bdb}/test/test088.tcl (100%) rename {bdb => storage/bdb}/test/test089.tcl (100%) rename {bdb => storage/bdb}/test/test090.tcl (100%) rename {bdb => storage/bdb}/test/test091.tcl (100%) rename {bdb => storage/bdb}/test/test092.tcl (100%) rename {bdb => storage/bdb}/test/test093.tcl (100%) rename {bdb => storage/bdb}/test/test094.tcl (100%) rename {bdb => storage/bdb}/test/test095.tcl (100%) rename {bdb => storage/bdb}/test/test096.tcl (100%) rename {bdb => storage/bdb}/test/test097.tcl (100%) rename {bdb => storage/bdb}/test/test098.tcl (100%) rename {bdb => storage/bdb}/test/test099.tcl (100%) rename {bdb => storage/bdb}/test/test100.tcl (100%) rename {bdb => storage/bdb}/test/test101.tcl (100%) rename {bdb => storage/bdb}/test/testparams.tcl (100%) rename {bdb => storage/bdb}/test/testutils.tcl (100%) rename {bdb => storage/bdb}/test/txn001.tcl (100%) rename {bdb => storage/bdb}/test/txn002.tcl (100%) rename {bdb => storage/bdb}/test/txn003.tcl (100%) rename {bdb => storage/bdb}/test/txn004.tcl (100%) rename {bdb => storage/bdb}/test/txn005.tcl (100%) rename {bdb => storage/bdb}/test/txn006.tcl (100%) rename {bdb => storage/bdb}/test/txn007.tcl (100%) rename {bdb => storage/bdb}/test/txn008.tcl (100%) rename {bdb => storage/bdb}/test/txn009.tcl (100%) rename {bdb => storage/bdb}/test/txnscript.tcl (100%) rename {bdb => storage/bdb}/test/update.tcl (100%) rename {bdb => storage/bdb}/test/upgrade.tcl (100%) rename {bdb => storage/bdb}/test/wordlist (100%) rename {bdb => storage/bdb}/test/wrap.tcl (100%) rename {bdb => storage/bdb}/txn/txn.c (100%) rename {bdb => storage/bdb}/txn/txn.src (100%) rename {bdb => storage/bdb}/txn/txn_method.c (100%) rename {bdb => storage/bdb}/txn/txn_rec.c (100%) rename {bdb => storage/bdb}/txn/txn_recover.c (100%) rename {bdb => storage/bdb}/txn/txn_region.c (100%) rename {bdb => storage/bdb}/txn/txn_stat.c (100%) rename {bdb => storage/bdb}/txn/txn_util.c (100%) rename {bdb => storage/bdb}/xa/xa.c (100%) rename {bdb => storage/bdb}/xa/xa_db.c (100%) rename {bdb => storage/bdb}/xa/xa_map.c (100%) rename {heap => storage/heap}/.cvsignore (100%) rename {heap => storage/heap}/ChangeLog (100%) rename {heap => storage/heap}/Makefile.am (100%) rename {heap => storage/heap}/_check.c (100%) rename {heap => storage/heap}/_rectest.c (100%) rename {heap => storage/heap}/heapdef.h (100%) rename {heap => storage/heap}/hp_block.c (100%) rename {heap => storage/heap}/hp_clear.c (100%) rename {heap => storage/heap}/hp_close.c (100%) rename {heap => storage/heap}/hp_create.c (100%) rename {heap => storage/heap}/hp_delete.c (100%) rename {heap => storage/heap}/hp_extra.c (100%) rename {heap => storage/heap}/hp_hash.c (100%) rename {heap => storage/heap}/hp_info.c (100%) rename {heap => storage/heap}/hp_open.c (100%) rename {heap => storage/heap}/hp_panic.c (100%) rename {heap => storage/heap}/hp_rename.c (100%) rename {heap => storage/heap}/hp_rfirst.c (100%) rename {heap => storage/heap}/hp_rkey.c (100%) rename {heap => storage/heap}/hp_rlast.c (100%) rename {heap => storage/heap}/hp_rnext.c (100%) rename {heap => storage/heap}/hp_rprev.c (100%) rename {heap => storage/heap}/hp_rrnd.c (100%) rename {heap => storage/heap}/hp_rsame.c (100%) rename {heap => storage/heap}/hp_scan.c (100%) rename {heap => storage/heap}/hp_static.c (100%) rename {heap => storage/heap}/hp_test1.c (100%) rename {heap => storage/heap}/hp_test2.c (100%) rename {heap => storage/heap}/hp_update.c (100%) rename {heap => storage/heap}/hp_write.c (100%) rename {heap => storage/heap}/make-ccc (100%) rename {innobase => storage/innobase}/Makefile.am (100%) rename {innobase => storage/innobase}/btr/Makefile.am (100%) rename {innobase => storage/innobase}/btr/btr0btr.c (100%) rename {innobase => storage/innobase}/btr/btr0cur.c (100%) rename {innobase => storage/innobase}/btr/btr0pcur.c (100%) rename {innobase => storage/innobase}/btr/btr0sea.c (100%) rename {innobase => storage/innobase}/btr/makefilewin (100%) rename {innobase => storage/innobase}/buf/Makefile.am (100%) rename {innobase => storage/innobase}/buf/buf0buf.c (100%) rename {innobase => storage/innobase}/buf/buf0flu.c (100%) rename {innobase => storage/innobase}/buf/buf0lru.c (100%) rename {innobase => storage/innobase}/buf/buf0rea.c (100%) rename {innobase => storage/innobase}/buf/makefilewin (100%) rename {innobase => storage/innobase}/configure.in (100%) rename {innobase => storage/innobase}/data/Makefile.am (100%) rename {innobase => storage/innobase}/data/data0data.c (100%) rename {innobase => storage/innobase}/data/data0type.c (100%) rename {innobase => storage/innobase}/data/makefilewin (100%) rename {innobase => storage/innobase}/db/db0err.h (100%) rename {innobase => storage/innobase}/dict/Makefile.am (100%) rename {innobase => storage/innobase}/dict/dict0boot.c (100%) rename {innobase => storage/innobase}/dict/dict0crea.c (100%) rename {innobase => storage/innobase}/dict/dict0dict.c (100%) rename {innobase => storage/innobase}/dict/dict0load.c (100%) rename {innobase => storage/innobase}/dict/dict0mem.c (100%) rename {innobase => storage/innobase}/dict/makefilewin (100%) rename {innobase => storage/innobase}/dyn/Makefile.am (100%) rename {innobase => storage/innobase}/dyn/dyn0dyn.c (100%) rename {innobase => storage/innobase}/dyn/makefilewin (100%) rename {innobase => storage/innobase}/eval/Makefile.am (100%) rename {innobase => storage/innobase}/eval/eval0eval.c (100%) rename {innobase => storage/innobase}/eval/eval0proc.c (100%) rename {innobase => storage/innobase}/eval/makefilewin (100%) rename {innobase => storage/innobase}/fil/Makefile.am (100%) rename {innobase => storage/innobase}/fil/fil0fil.c (100%) rename {innobase => storage/innobase}/fil/makefilewin (100%) rename {innobase => storage/innobase}/fsp/Makefile.am (100%) rename {innobase => storage/innobase}/fsp/fsp0fsp.c (100%) rename {innobase => storage/innobase}/fsp/makefilewin (100%) rename {innobase => storage/innobase}/fut/Makefile.am (100%) rename {innobase => storage/innobase}/fut/fut0fut.c (100%) rename {innobase => storage/innobase}/fut/fut0lst.c (100%) rename {innobase => storage/innobase}/fut/makefilewin (100%) rename {innobase => storage/innobase}/ha/Makefile.am (100%) rename {innobase => storage/innobase}/ha/ha0ha.c (100%) rename {innobase => storage/innobase}/ha/hash0hash.c (100%) rename {innobase => storage/innobase}/ha/makefilewin (100%) rename {innobase => storage/innobase}/ibuf/Makefile.am (100%) rename {innobase => storage/innobase}/ibuf/ibuf0ibuf.c (100%) rename {innobase => storage/innobase}/ibuf/makefilewin (100%) rename {innobase => storage/innobase}/include/Makefile.am (100%) rename {innobase => storage/innobase}/include/Makefile.i (100%) rename {innobase => storage/innobase}/include/btr0btr.h (100%) rename {innobase => storage/innobase}/include/btr0btr.ic (100%) rename {innobase => storage/innobase}/include/btr0cur.h (100%) rename {innobase => storage/innobase}/include/btr0cur.ic (100%) rename {innobase => storage/innobase}/include/btr0pcur.h (100%) rename {innobase => storage/innobase}/include/btr0pcur.ic (100%) rename {innobase => storage/innobase}/include/btr0sea.h (100%) rename {innobase => storage/innobase}/include/btr0sea.ic (100%) rename {innobase => storage/innobase}/include/btr0types.h (100%) rename {innobase => storage/innobase}/include/buf0buf.h (100%) rename {innobase => storage/innobase}/include/buf0buf.ic (100%) rename {innobase => storage/innobase}/include/buf0flu.h (100%) rename {innobase => storage/innobase}/include/buf0flu.ic (100%) rename {innobase => storage/innobase}/include/buf0lru.h (100%) rename {innobase => storage/innobase}/include/buf0lru.ic (100%) rename {innobase => storage/innobase}/include/buf0rea.h (100%) rename {innobase => storage/innobase}/include/buf0types.h (100%) rename {innobase => storage/innobase}/include/data0data.h (100%) rename {innobase => storage/innobase}/include/data0data.ic (100%) rename {innobase => storage/innobase}/include/data0type.h (100%) rename {innobase => storage/innobase}/include/data0type.ic (100%) rename {innobase => storage/innobase}/include/data0types.h (100%) rename {innobase => storage/innobase}/include/db0err.h (100%) rename {innobase => storage/innobase}/include/dict0boot.h (100%) rename {innobase => storage/innobase}/include/dict0boot.ic (100%) rename {innobase => storage/innobase}/include/dict0crea.h (100%) rename {innobase => storage/innobase}/include/dict0crea.ic (100%) rename {innobase => storage/innobase}/include/dict0dict.h (100%) rename {innobase => storage/innobase}/include/dict0dict.ic (100%) rename {innobase => storage/innobase}/include/dict0load.h (100%) rename {innobase => storage/innobase}/include/dict0load.ic (100%) rename {innobase => storage/innobase}/include/dict0mem.h (100%) rename {innobase => storage/innobase}/include/dict0mem.ic (100%) rename {innobase => storage/innobase}/include/dict0types.h (100%) rename {innobase => storage/innobase}/include/dyn0dyn.h (100%) rename {innobase => storage/innobase}/include/dyn0dyn.ic (100%) rename {innobase => storage/innobase}/include/eval0eval.h (100%) rename {innobase => storage/innobase}/include/eval0eval.ic (100%) rename {innobase => storage/innobase}/include/eval0proc.h (100%) rename {innobase => storage/innobase}/include/eval0proc.ic (100%) rename {innobase => storage/innobase}/include/fil0fil.h (100%) rename {innobase => storage/innobase}/include/fsp0fsp.h (100%) rename {innobase => storage/innobase}/include/fsp0fsp.ic (100%) rename {innobase => storage/innobase}/include/fut0fut.h (100%) rename {innobase => storage/innobase}/include/fut0fut.ic (100%) rename {innobase => storage/innobase}/include/fut0lst.h (100%) rename {innobase => storage/innobase}/include/fut0lst.ic (100%) rename {innobase => storage/innobase}/include/ha0ha.h (100%) rename {innobase => storage/innobase}/include/ha0ha.ic (100%) rename {innobase => storage/innobase}/include/hash0hash.h (100%) rename {innobase => storage/innobase}/include/hash0hash.ic (100%) rename {innobase => storage/innobase}/include/ibuf0ibuf.h (100%) rename {innobase => storage/innobase}/include/ibuf0ibuf.ic (100%) rename {innobase => storage/innobase}/include/ibuf0types.h (100%) rename {innobase => storage/innobase}/include/lock0lock.h (100%) rename {innobase => storage/innobase}/include/lock0lock.ic (100%) rename {innobase => storage/innobase}/include/lock0types.h (100%) rename {innobase => storage/innobase}/include/log0log.h (100%) rename {innobase => storage/innobase}/include/log0log.ic (100%) rename {innobase => storage/innobase}/include/log0recv.h (100%) rename {innobase => storage/innobase}/include/log0recv.ic (100%) rename {innobase => storage/innobase}/include/mach0data.h (100%) rename {innobase => storage/innobase}/include/mach0data.ic (100%) rename {innobase => storage/innobase}/include/makefilewin.i (100%) rename {innobase => storage/innobase}/include/mem0dbg.h (100%) rename {innobase => storage/innobase}/include/mem0dbg.ic (100%) rename {innobase => storage/innobase}/include/mem0mem.h (100%) rename {innobase => storage/innobase}/include/mem0mem.ic (100%) rename {innobase => storage/innobase}/include/mem0pool.h (100%) rename {innobase => storage/innobase}/include/mem0pool.ic (100%) rename {innobase => storage/innobase}/include/mtr0log.h (100%) rename {innobase => storage/innobase}/include/mtr0log.ic (100%) rename {innobase => storage/innobase}/include/mtr0mtr.h (100%) rename {innobase => storage/innobase}/include/mtr0mtr.ic (100%) rename {innobase => storage/innobase}/include/mtr0types.h (100%) rename {innobase => storage/innobase}/include/os0file.h (100%) rename {innobase => storage/innobase}/include/os0proc.h (100%) rename {innobase => storage/innobase}/include/os0proc.ic (100%) rename {innobase => storage/innobase}/include/os0sync.h (100%) rename {innobase => storage/innobase}/include/os0sync.ic (100%) rename {innobase => storage/innobase}/include/os0thread.h (100%) rename {innobase => storage/innobase}/include/os0thread.ic (100%) rename {innobase => storage/innobase}/include/page0cur.h (100%) rename {innobase => storage/innobase}/include/page0cur.ic (100%) rename {innobase => storage/innobase}/include/page0page.h (100%) rename {innobase => storage/innobase}/include/page0page.ic (100%) rename {innobase => storage/innobase}/include/page0types.h (100%) rename {innobase => storage/innobase}/include/pars0grm.h (100%) rename {innobase => storage/innobase}/include/pars0opt.h (100%) rename {innobase => storage/innobase}/include/pars0opt.ic (100%) rename {innobase => storage/innobase}/include/pars0pars.h (100%) rename {innobase => storage/innobase}/include/pars0pars.ic (100%) rename {innobase => storage/innobase}/include/pars0sym.h (100%) rename {innobase => storage/innobase}/include/pars0sym.ic (100%) rename {innobase => storage/innobase}/include/pars0types.h (100%) rename {innobase => storage/innobase}/include/que0que.h (100%) rename {innobase => storage/innobase}/include/que0que.ic (100%) rename {innobase => storage/innobase}/include/que0types.h (100%) rename {innobase => storage/innobase}/include/read0read.h (100%) rename {innobase => storage/innobase}/include/read0read.ic (100%) rename {innobase => storage/innobase}/include/read0types.h (100%) rename {innobase => storage/innobase}/include/rem0cmp.h (100%) rename {innobase => storage/innobase}/include/rem0cmp.ic (100%) rename {innobase => storage/innobase}/include/rem0rec.h (100%) rename {innobase => storage/innobase}/include/rem0rec.ic (100%) rename {innobase => storage/innobase}/include/rem0types.h (100%) rename {innobase => storage/innobase}/include/row0ins.h (100%) rename {innobase => storage/innobase}/include/row0ins.ic (100%) rename {innobase => storage/innobase}/include/row0mysql.h (100%) rename {innobase => storage/innobase}/include/row0mysql.ic (100%) rename {innobase => storage/innobase}/include/row0purge.h (100%) rename {innobase => storage/innobase}/include/row0purge.ic (100%) rename {innobase => storage/innobase}/include/row0row.h (100%) rename {innobase => storage/innobase}/include/row0row.ic (100%) rename {innobase => storage/innobase}/include/row0sel.h (100%) rename {innobase => storage/innobase}/include/row0sel.ic (100%) rename {innobase => storage/innobase}/include/row0types.h (100%) rename {innobase => storage/innobase}/include/row0uins.h (100%) rename {innobase => storage/innobase}/include/row0uins.ic (100%) rename {innobase => storage/innobase}/include/row0umod.h (100%) rename {innobase => storage/innobase}/include/row0umod.ic (100%) rename {innobase => storage/innobase}/include/row0undo.h (100%) rename {innobase => storage/innobase}/include/row0undo.ic (100%) rename {innobase => storage/innobase}/include/row0upd.h (100%) rename {innobase => storage/innobase}/include/row0upd.ic (100%) rename {innobase => storage/innobase}/include/row0vers.h (100%) rename {innobase => storage/innobase}/include/row0vers.ic (100%) rename {innobase => storage/innobase}/include/srv0que.h (100%) rename {innobase => storage/innobase}/include/srv0srv.h (100%) rename {innobase => storage/innobase}/include/srv0srv.ic (100%) rename {innobase => storage/innobase}/include/srv0start.h (100%) rename {innobase => storage/innobase}/include/sync0arr.h (100%) rename {innobase => storage/innobase}/include/sync0arr.ic (100%) rename {innobase => storage/innobase}/include/sync0rw.h (100%) rename {innobase => storage/innobase}/include/sync0rw.ic (100%) rename {innobase => storage/innobase}/include/sync0sync.h (100%) rename {innobase => storage/innobase}/include/sync0sync.ic (100%) rename {innobase => storage/innobase}/include/sync0types.h (100%) rename {innobase => storage/innobase}/include/thr0loc.h (100%) rename {innobase => storage/innobase}/include/thr0loc.ic (100%) rename {innobase => storage/innobase}/include/trx0purge.h (100%) rename {innobase => storage/innobase}/include/trx0purge.ic (100%) rename {innobase => storage/innobase}/include/trx0rec.h (100%) rename {innobase => storage/innobase}/include/trx0rec.ic (100%) rename {innobase => storage/innobase}/include/trx0roll.h (100%) rename {innobase => storage/innobase}/include/trx0roll.ic (100%) rename {innobase => storage/innobase}/include/trx0rseg.h (100%) rename {innobase => storage/innobase}/include/trx0rseg.ic (100%) rename {innobase => storage/innobase}/include/trx0sys.h (100%) rename {innobase => storage/innobase}/include/trx0sys.ic (100%) rename {innobase => storage/innobase}/include/trx0trx.h (100%) rename {innobase => storage/innobase}/include/trx0trx.ic (100%) rename {innobase => storage/innobase}/include/trx0types.h (100%) rename {innobase => storage/innobase}/include/trx0undo.h (100%) rename {innobase => storage/innobase}/include/trx0undo.ic (100%) rename {innobase => storage/innobase}/include/trx0xa.h (100%) rename {innobase => storage/innobase}/include/univ.i (100%) rename {innobase => storage/innobase}/include/usr0sess.h (100%) rename {innobase => storage/innobase}/include/usr0sess.ic (100%) rename {innobase => storage/innobase}/include/usr0types.h (100%) rename {innobase => storage/innobase}/include/ut0byte.h (100%) rename {innobase => storage/innobase}/include/ut0byte.ic (100%) rename {innobase => storage/innobase}/include/ut0dbg.h (100%) rename {innobase => storage/innobase}/include/ut0lst.h (100%) rename {innobase => storage/innobase}/include/ut0mem.h (100%) rename {innobase => storage/innobase}/include/ut0mem.ic (100%) rename {innobase => storage/innobase}/include/ut0rnd.h (100%) rename {innobase => storage/innobase}/include/ut0rnd.ic (100%) rename {innobase => storage/innobase}/include/ut0sort.h (100%) rename {innobase => storage/innobase}/include/ut0ut.h (100%) rename {innobase => storage/innobase}/include/ut0ut.ic (100%) rename {innobase => storage/innobase}/lock/Makefile.am (100%) rename {innobase => storage/innobase}/lock/lock0lock.c (100%) rename {innobase => storage/innobase}/lock/makefilewin (100%) rename {innobase => storage/innobase}/log/Makefile.am (100%) rename {innobase => storage/innobase}/log/log0log.c (100%) rename {innobase => storage/innobase}/log/log0recv.c (100%) rename {innobase => storage/innobase}/log/makefilewin (100%) rename {innobase => storage/innobase}/mach/Makefile.am (100%) rename {innobase => storage/innobase}/mach/mach0data.c (100%) rename {innobase => storage/innobase}/mach/makefilewin (100%) rename {innobase => storage/innobase}/makefilewin (100%) rename {innobase => storage/innobase}/mem/Makefile.am (100%) rename {innobase => storage/innobase}/mem/makefilewin (100%) rename {innobase => storage/innobase}/mem/mem0dbg.c (100%) rename {innobase => storage/innobase}/mem/mem0mem.c (100%) rename {innobase => storage/innobase}/mem/mem0pool.c (100%) rename {innobase => storage/innobase}/mtr/Makefile.am (100%) rename {innobase => storage/innobase}/mtr/makefilewin (100%) rename {innobase => storage/innobase}/mtr/mtr0log.c (100%) rename {innobase => storage/innobase}/mtr/mtr0mtr.c (100%) rename {innobase => storage/innobase}/my_cnf (100%) rename {innobase => storage/innobase}/os/Makefile.am (100%) rename {innobase => storage/innobase}/os/makefilewin (100%) rename {innobase => storage/innobase}/os/os0file.c (100%) rename {innobase => storage/innobase}/os/os0proc.c (100%) rename {innobase => storage/innobase}/os/os0sync.c (100%) rename {innobase => storage/innobase}/os/os0thread.c (100%) rename {innobase => storage/innobase}/page/Makefile.am (100%) rename {innobase => storage/innobase}/page/makefilewin (100%) rename {innobase => storage/innobase}/page/page0cur.c (100%) rename {innobase => storage/innobase}/page/page0page.c (100%) rename {innobase => storage/innobase}/pars/Makefile.am (100%) rename {innobase => storage/innobase}/pars/lexyy.c (100%) rename {innobase => storage/innobase}/pars/makefilewin (100%) rename {innobase => storage/innobase}/pars/pars0grm.c (100%) rename {innobase => storage/innobase}/pars/pars0grm.h (100%) rename {innobase => storage/innobase}/pars/pars0grm.y (100%) rename {innobase => storage/innobase}/pars/pars0lex.l (100%) rename {innobase => storage/innobase}/pars/pars0opt.c (100%) rename {innobase => storage/innobase}/pars/pars0pars.c (100%) rename {innobase => storage/innobase}/pars/pars0sym.c (100%) rename {innobase => storage/innobase}/que/Makefile.am (100%) rename {innobase => storage/innobase}/que/makefilewin (100%) rename {innobase => storage/innobase}/que/que0que.c (100%) rename {innobase => storage/innobase}/read/Makefile.am (100%) rename {innobase => storage/innobase}/read/makefilewin (100%) rename {innobase => storage/innobase}/read/read0read.c (100%) rename {innobase => storage/innobase}/rem/Makefile.am (100%) rename {innobase => storage/innobase}/rem/makefilewin (100%) rename {innobase => storage/innobase}/rem/rem0cmp.c (100%) rename {innobase => storage/innobase}/rem/rem0rec.c (100%) rename {innobase => storage/innobase}/row/Makefile.am (100%) rename {innobase => storage/innobase}/row/makefilewin (100%) rename {innobase => storage/innobase}/row/row0ins.c (100%) rename {innobase => storage/innobase}/row/row0mysql.c (100%) rename {innobase => storage/innobase}/row/row0purge.c (100%) rename {innobase => storage/innobase}/row/row0row.c (100%) rename {innobase => storage/innobase}/row/row0sel.c (100%) rename {innobase => storage/innobase}/row/row0uins.c (100%) rename {innobase => storage/innobase}/row/row0umod.c (100%) rename {innobase => storage/innobase}/row/row0undo.c (100%) rename {innobase => storage/innobase}/row/row0upd.c (100%) rename {innobase => storage/innobase}/row/row0vers.c (100%) rename {innobase => storage/innobase}/srv/Makefile.am (100%) rename {innobase => storage/innobase}/srv/makefilewin (100%) rename {innobase => storage/innobase}/srv/srv0que.c (100%) rename {innobase => storage/innobase}/srv/srv0srv.c (100%) rename {innobase => storage/innobase}/srv/srv0start.c (100%) rename {innobase => storage/innobase}/sync/Makefile.am (100%) rename {innobase => storage/innobase}/sync/makefilewin (100%) rename {innobase => storage/innobase}/sync/sync0arr.c (100%) rename {innobase => storage/innobase}/sync/sync0rw.c (100%) rename {innobase => storage/innobase}/sync/sync0sync.c (100%) rename {innobase => storage/innobase}/thr/Makefile.am (100%) rename {innobase => storage/innobase}/thr/makefilewin (100%) rename {innobase => storage/innobase}/thr/thr0loc.c (100%) rename {innobase => storage/innobase}/trx/Makefile.am (100%) rename {innobase => storage/innobase}/trx/makefilewin (100%) rename {innobase => storage/innobase}/trx/trx0purge.c (100%) rename {innobase => storage/innobase}/trx/trx0rec.c (100%) rename {innobase => storage/innobase}/trx/trx0roll.c (100%) rename {innobase => storage/innobase}/trx/trx0rseg.c (100%) rename {innobase => storage/innobase}/trx/trx0sys.c (100%) rename {innobase => storage/innobase}/trx/trx0trx.c (100%) rename {innobase => storage/innobase}/trx/trx0undo.c (100%) rename {innobase => storage/innobase}/usr/Makefile.am (100%) rename {innobase => storage/innobase}/usr/makefilewin (100%) rename {innobase => storage/innobase}/usr/usr0sess.c (100%) rename {innobase => storage/innobase}/ut/Makefile.am (100%) rename {innobase => storage/innobase}/ut/makefilewin (100%) rename {innobase => storage/innobase}/ut/ut0byte.c (100%) rename {innobase => storage/innobase}/ut/ut0dbg.c (100%) rename {innobase => storage/innobase}/ut/ut0mem.c (100%) rename {innobase => storage/innobase}/ut/ut0rnd.c (100%) rename {innobase => storage/innobase}/ut/ut0ut.c (100%) rename {myisam => storage/myisam}/.cvsignore (100%) rename {myisam => storage/myisam}/ChangeLog (100%) rename {myisam => storage/myisam}/Makefile.am (100%) rename {myisam => storage/myisam}/NEWS (100%) rename {myisam => storage/myisam}/TODO (100%) rename {myisam => storage/myisam}/ft_boolean_search.c (100%) rename {myisam => storage/myisam}/ft_eval.c (100%) rename {myisam => storage/myisam}/ft_eval.h (100%) rename {myisam => storage/myisam}/ft_nlq_search.c (100%) rename {myisam => storage/myisam}/ft_parser.c (100%) rename {myisam => storage/myisam}/ft_static.c (100%) rename {myisam => storage/myisam}/ft_stem.c (100%) rename {myisam => storage/myisam}/ft_stopwords.c (100%) rename {myisam => storage/myisam}/ft_test1.c (100%) rename {myisam => storage/myisam}/ft_test1.h (100%) rename {myisam => storage/myisam}/ft_update.c (100%) rename {myisam => storage/myisam}/ftbench/Ecompare.pl (100%) rename {myisam => storage/myisam}/ftbench/Ecreate.pl (100%) rename {myisam => storage/myisam}/ftbench/Ereport.pl (100%) rename {myisam => storage/myisam}/ftbench/README (100%) rename {myisam => storage/myisam}/ftbench/ft-test-run.sh (100%) rename {myisam => storage/myisam}/ftdefs.h (100%) rename {myisam => storage/myisam}/fulltext.h (100%) rename {myisam => storage/myisam}/make-ccc (100%) rename {myisam => storage/myisam}/mi_cache.c (100%) rename {myisam => storage/myisam}/mi_changed.c (100%) rename {myisam => storage/myisam}/mi_check.c (100%) rename {myisam => storage/myisam}/mi_checksum.c (100%) rename {myisam => storage/myisam}/mi_close.c (100%) rename {myisam => storage/myisam}/mi_create.c (100%) rename {myisam => storage/myisam}/mi_dbug.c (100%) rename {myisam => storage/myisam}/mi_delete.c (100%) rename {myisam => storage/myisam}/mi_delete_all.c (100%) rename {myisam => storage/myisam}/mi_delete_table.c (100%) rename {myisam => storage/myisam}/mi_dynrec.c (100%) rename {myisam => storage/myisam}/mi_extra.c (100%) rename {myisam => storage/myisam}/mi_info.c (100%) rename {myisam => storage/myisam}/mi_key.c (100%) rename {myisam => storage/myisam}/mi_keycache.c (100%) rename {myisam => storage/myisam}/mi_locking.c (100%) rename {myisam => storage/myisam}/mi_log.c (100%) rename {myisam => storage/myisam}/mi_open.c (100%) rename {myisam => storage/myisam}/mi_packrec.c (100%) rename {myisam => storage/myisam}/mi_page.c (100%) rename {myisam => storage/myisam}/mi_panic.c (100%) rename {myisam => storage/myisam}/mi_preload.c (100%) rename {myisam => storage/myisam}/mi_range.c (100%) rename {myisam => storage/myisam}/mi_rename.c (100%) rename {myisam => storage/myisam}/mi_rfirst.c (100%) rename {myisam => storage/myisam}/mi_rkey.c (100%) rename {myisam => storage/myisam}/mi_rlast.c (100%) rename {myisam => storage/myisam}/mi_rnext.c (100%) rename {myisam => storage/myisam}/mi_rnext_same.c (100%) rename {myisam => storage/myisam}/mi_rprev.c (100%) rename {myisam => storage/myisam}/mi_rrnd.c (100%) rename {myisam => storage/myisam}/mi_rsame.c (100%) rename {myisam => storage/myisam}/mi_rsamepos.c (100%) rename {myisam => storage/myisam}/mi_scan.c (100%) rename {myisam => storage/myisam}/mi_search.c (100%) rename {myisam => storage/myisam}/mi_static.c (100%) rename {myisam => storage/myisam}/mi_statrec.c (100%) rename {myisam => storage/myisam}/mi_test1.c (100%) rename {myisam => storage/myisam}/mi_test2.c (100%) rename {myisam => storage/myisam}/mi_test3.c (100%) rename {myisam => storage/myisam}/mi_test_all.res (100%) rename {myisam => storage/myisam}/mi_test_all.sh (100%) rename {myisam => storage/myisam}/mi_unique.c (100%) rename {myisam => storage/myisam}/mi_update.c (100%) rename {myisam => storage/myisam}/mi_write.c (100%) rename {myisam => storage/myisam}/myisam_ftdump.c (100%) rename {myisam => storage/myisam}/myisamchk.c (100%) rename {myisam => storage/myisam}/myisamdef.h (100%) rename {myisam => storage/myisam}/myisamlog.c (100%) rename {myisam => storage/myisam}/myisampack.c (100%) rename {myisam => storage/myisam}/rt_index.c (100%) rename {myisam => storage/myisam}/rt_index.h (100%) rename {myisam => storage/myisam}/rt_key.c (100%) rename {myisam => storage/myisam}/rt_key.h (100%) rename {myisam => storage/myisam}/rt_mbr.c (100%) rename {myisam => storage/myisam}/rt_mbr.h (100%) rename {myisam => storage/myisam}/rt_split.c (100%) rename {myisam => storage/myisam}/rt_test.c (100%) rename {myisam => storage/myisam}/sort.c (100%) rename {myisam => storage/myisam}/sp_defs.h (100%) rename {myisam => storage/myisam}/sp_key.c (100%) rename {myisam => storage/myisam}/sp_test.c (100%) rename {myisam => storage/myisam}/test_pack (100%) rename {myisammrg => storage/myisammrg}/.cvsignore (100%) rename {myisammrg => storage/myisammrg}/Makefile.am (100%) rename {myisammrg => storage/myisammrg}/make-ccc (100%) rename {myisammrg => storage/myisammrg}/myrg_close.c (100%) rename {myisammrg => storage/myisammrg}/myrg_create.c (100%) rename {myisammrg => storage/myisammrg}/myrg_def.h (96%) rename {myisammrg => storage/myisammrg}/myrg_delete.c (100%) rename {myisammrg => storage/myisammrg}/myrg_extra.c (100%) rename {myisammrg => storage/myisammrg}/myrg_info.c (100%) rename {myisammrg => storage/myisammrg}/myrg_locking.c (100%) rename {myisammrg => storage/myisammrg}/myrg_open.c (100%) rename {myisammrg => storage/myisammrg}/myrg_panic.c (100%) rename {myisammrg => storage/myisammrg}/myrg_queue.c (100%) rename {myisammrg => storage/myisammrg}/myrg_range.c (100%) rename {myisammrg => storage/myisammrg}/myrg_rfirst.c (100%) rename {myisammrg => storage/myisammrg}/myrg_rkey.c (100%) rename {myisammrg => storage/myisammrg}/myrg_rlast.c (100%) rename {myisammrg => storage/myisammrg}/myrg_rnext.c (100%) rename {myisammrg => storage/myisammrg}/myrg_rnext_same.c (100%) rename {myisammrg => storage/myisammrg}/myrg_rprev.c (100%) rename {myisammrg => storage/myisammrg}/myrg_rrnd.c (100%) rename {myisammrg => storage/myisammrg}/myrg_rsame.c (100%) rename {myisammrg => storage/myisammrg}/myrg_static.c (100%) rename {myisammrg => storage/myisammrg}/myrg_update.c (100%) rename {myisammrg => storage/myisammrg}/myrg_write.c (100%) rename {ndb => storage/ndb}/Makefile.am (100%) rename {ndb => storage/ndb}/bin/.empty (100%) rename {ndb => storage/ndb}/bin/check-regression.sh (100%) rename {ndb => storage/ndb}/bin/makeTestPrograms_html.sh (100%) rename {ndb => storage/ndb}/config/common.mk.am (100%) rename {ndb => storage/ndb}/config/make-win-dsw.sh (100%) rename {ndb => storage/ndb}/config/type_kernel.mk.am (100%) rename {ndb => storage/ndb}/config/type_mgmapiclient.mk.am (100%) rename {ndb => storage/ndb}/config/type_ndbapi.mk.am (100%) rename {ndb => storage/ndb}/config/type_ndbapiclient.mk.am (100%) rename {ndb => storage/ndb}/config/type_ndbapitest.mk.am (100%) rename {ndb => storage/ndb}/config/type_ndbapitools.mk.am (100%) rename {ndb => storage/ndb}/config/type_util.mk.am (100%) rename {ndb => storage/ndb}/config/win-includes (100%) rename {ndb => storage/ndb}/config/win-lib.am (100%) rename {ndb => storage/ndb}/config/win-libraries (100%) rename {ndb => storage/ndb}/config/win-name (100%) rename {ndb => storage/ndb}/config/win-prg.am (100%) rename {ndb => storage/ndb}/config/win-sources (100%) rename {ndb => storage/ndb}/demos/1-node/1-api-3/Ndb.cfg (100%) rename {ndb => storage/ndb}/demos/1-node/1-db-2/Ndb.cfg (100%) rename {ndb => storage/ndb}/demos/1-node/1-mgm-1/Ndb.cfg (100%) rename {ndb => storage/ndb}/demos/1-node/1-mgm-1/template_config.ini (100%) rename {ndb => storage/ndb}/demos/2-node/2-api-4/Ndb.cfg (100%) rename {ndb => storage/ndb}/demos/2-node/2-api-5/Ndb.cfg (100%) rename {ndb => storage/ndb}/demos/2-node/2-api-6/Ndb.cfg (100%) rename {ndb => storage/ndb}/demos/2-node/2-api-7/Ndb.cfg (100%) rename {ndb => storage/ndb}/demos/2-node/2-db-2/Ndb.cfg (100%) rename {ndb => storage/ndb}/demos/2-node/2-db-3/Ndb.cfg (100%) rename {ndb => storage/ndb}/demos/2-node/2-mgm-1/Ndb.cfg (100%) rename {ndb => storage/ndb}/demos/2-node/2-mgm-1/template_config.ini (100%) rename {ndb => storage/ndb}/demos/config-templates/config_template-1-REP.ini (100%) rename {ndb => storage/ndb}/demos/config-templates/config_template-4.ini (100%) rename {ndb => storage/ndb}/demos/config-templates/config_template-install.ini (100%) rename {ndb => storage/ndb}/demos/run_demo1-PS-SS_common.sh (100%) rename {ndb => storage/ndb}/demos/run_demo1-PS.sh (100%) rename {ndb => storage/ndb}/demos/run_demo1-SS.sh (100%) rename {ndb => storage/ndb}/demos/run_demo1.sh (100%) rename {ndb => storage/ndb}/demos/run_demo2.sh (100%) rename {ndb => storage/ndb}/docs/Makefile.am (100%) rename {ndb => storage/ndb}/docs/README (100%) rename {ndb => storage/ndb}/docs/doxygen/Doxyfile.mgmapi (100%) rename {ndb => storage/ndb}/docs/doxygen/Doxyfile.ndb (100%) rename {ndb => storage/ndb}/docs/doxygen/Doxyfile.ndbapi (100%) rename {ndb => storage/ndb}/docs/doxygen/Doxyfile.odbc (100%) rename {ndb => storage/ndb}/docs/doxygen/Doxyfile.test (100%) rename {ndb => storage/ndb}/docs/doxygen/header.mgmapi.tex (100%) rename {ndb => storage/ndb}/docs/doxygen/header.ndbapi.tex (100%) rename {ndb => storage/ndb}/docs/doxygen/postdoxy.pl (100%) rename {ndb => storage/ndb}/docs/doxygen/predoxy.pl (100%) rename {ndb => storage/ndb}/docs/wl2077.txt (100%) rename {ndb => storage/ndb}/home/bin/Linuxmkisofs (100%) rename {ndb => storage/ndb}/home/bin/Solarismkisofs (100%) rename {ndb => storage/ndb}/home/bin/cvs2cl.pl (100%) rename {ndb => storage/ndb}/home/bin/fix-cvs-root (100%) rename {ndb => storage/ndb}/home/bin/import-from-bk.sh (100%) rename {ndb => storage/ndb}/home/bin/ndb_deploy (100%) rename {ndb => storage/ndb}/home/bin/ndbdoxy.pl (100%) rename {ndb => storage/ndb}/home/bin/ngcalc (100%) rename {ndb => storage/ndb}/home/bin/parseConfigFile.awk (100%) rename {ndb => storage/ndb}/home/bin/setup-test.sh (100%) rename {ndb => storage/ndb}/home/bin/signallog2html.lib/signallog2list.awk (100%) rename {ndb => storage/ndb}/home/bin/signallog2html.lib/uniq_blocks.awk (100%) rename {ndb => storage/ndb}/home/bin/signallog2html.sh (100%) rename {ndb => storage/ndb}/home/bin/stripcr (100%) rename {ndb => storage/ndb}/home/lib/funcs.sh (100%) rename {ndb => storage/ndb}/include/Makefile.am (100%) rename {ndb => storage/ndb}/include/debugger/DebuggerNames.hpp (100%) rename {ndb => storage/ndb}/include/debugger/EventLogger.hpp (100%) rename {ndb => storage/ndb}/include/debugger/GrepError.hpp (100%) rename {ndb => storage/ndb}/include/debugger/SignalLoggerManager.hpp (100%) rename {ndb => storage/ndb}/include/editline/editline.h (100%) rename {ndb => storage/ndb}/include/kernel/AttributeDescriptor.hpp (100%) rename {ndb => storage/ndb}/include/kernel/AttributeHeader.hpp (100%) rename {ndb => storage/ndb}/include/kernel/AttributeList.hpp (100%) rename {ndb => storage/ndb}/include/kernel/BlockNumbers.h (100%) rename {ndb => storage/ndb}/include/kernel/GlobalSignalNumbers.h (100%) rename {ndb => storage/ndb}/include/kernel/GrepEvent.hpp (100%) rename {ndb => storage/ndb}/include/kernel/Interpreter.hpp (100%) rename {ndb => storage/ndb}/include/kernel/LogLevel.hpp (100%) rename {ndb => storage/ndb}/include/kernel/NodeBitmask.hpp (100%) rename {ndb => storage/ndb}/include/kernel/NodeInfo.hpp (100%) rename {ndb => storage/ndb}/include/kernel/NodeState.hpp (100%) rename {ndb => storage/ndb}/include/kernel/RefConvert.hpp (100%) rename {ndb => storage/ndb}/include/kernel/kernel_config_parameters.h (100%) rename {ndb => storage/ndb}/include/kernel/kernel_types.h (100%) rename {ndb => storage/ndb}/include/kernel/ndb_limits.h (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/AbortAll.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/AccFrag.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/AccLock.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/AccScan.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/AccSizeAltReq.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/AlterIndx.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/AlterTab.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/AlterTable.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/AlterTrig.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/ApiRegSignalData.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/ApiVersion.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/ArbitSignalData.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/AttrInfo.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/BackupContinueB.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/BackupImpl.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/BackupSignalData.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/BlockCommitOrd.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/BuildIndx.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/CheckNodeGroups.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/CloseComReqConf.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/CmInit.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/CmRegSignalData.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/CmvmiCfgConf.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/CntrMasterConf.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/CntrMasterReq.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/CntrStart.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/ConfigParamId.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/ContinueFragmented.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/CopyActive.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/CopyFrag.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/CopyGCIReq.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/CreateEvnt.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/CreateFrag.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/CreateFragmentation.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/CreateIndx.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/CreateTab.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/CreateTable.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/CreateTrig.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/DiAddTab.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/DiGetNodes.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/DictSchemaInfo.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/DictSizeAltReq.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/DictStart.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/DictTabInfo.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/DihAddFrag.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/DihContinueB.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/DihSizeAltReq.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/DihStartTab.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/DihSwitchReplica.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/DisconnectRep.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/DropIndx.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/DropTab.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/DropTabFile.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/DropTable.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/DropTrig.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/DumpStateOrd.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/EmptyLcp.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/EndTo.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/EventReport.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/EventSubscribeReq.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/ExecFragReq.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/FailRep.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/FireTrigOrd.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/FsAppendReq.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/FsCloseReq.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/FsConf.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/FsOpenReq.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/FsReadWriteReq.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/FsRef.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/FsRemoveReq.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/GCPSave.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/GetTabInfo.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/GetTableId.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/GrepImpl.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/HotSpareRep.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/IndxAttrInfo.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/IndxKeyInfo.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/InvalidateNodeLCPConf.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/InvalidateNodeLCPReq.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/KeyInfo.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/LCP.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/ListTables.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/LqhFrag.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/LqhKey.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/LqhSizeAltReq.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/LqhTransConf.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/ManagementServer.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/MasterGCP.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/MasterLCP.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/NFCompleteRep.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/NdbSttor.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/NdbfsContinueB.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/NextScan.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/NodeFailRep.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/NodeStateSignalData.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/PackedSignal.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/PrepDropTab.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/PrepFailReqRef.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/ReadConfig.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/ReadNodesConf.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/RelTabMem.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/RepImpl.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/ResumeReq.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/ScanFrag.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/ScanTab.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/SetLogLevelOrd.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/SetVarReq.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/SignalData.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/SignalDataPrint.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/SignalDroppedRep.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/SrFragidConf.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/StartFragReq.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/StartInfo.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/StartMe.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/StartOrd.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/StartPerm.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/StartRec.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/StartTo.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/StopMe.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/StopPerm.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/StopReq.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/SumaImpl.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/SystemError.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/TamperOrd.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/TcCommit.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/TcContinueB.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/TcHbRep.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/TcIndx.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/TcKeyConf.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/TcKeyFailConf.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/TcKeyRef.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/TcKeyReq.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/TcRollbackRep.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/TcSizeAltReq.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/TestOrd.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/TransIdAI.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/TrigAttrInfo.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/TupCommit.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/TupFrag.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/TupKey.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/TupSizeAltReq.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/TuxBound.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/TuxContinueB.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/TuxMaint.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/TuxSizeAltReq.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/UpdateTo.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/UpgradeStartup.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/UtilDelete.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/UtilExecute.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/UtilLock.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/UtilPrepare.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/UtilRelease.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/UtilSequence.hpp (100%) rename {ndb => storage/ndb}/include/kernel/signaldata/WaitGCP.hpp (100%) rename {ndb => storage/ndb}/include/kernel/trigger_definitions.h (100%) rename {ndb => storage/ndb}/include/logger/ConsoleLogHandler.hpp (100%) rename {ndb => storage/ndb}/include/logger/FileLogHandler.hpp (100%) rename {ndb => storage/ndb}/include/logger/LogHandler.hpp (100%) rename {ndb => storage/ndb}/include/logger/Logger.hpp (100%) rename {ndb => storage/ndb}/include/logger/SysLogHandler.hpp (100%) rename {ndb => storage/ndb}/include/mgmapi/mgmapi.h (100%) rename {ndb => storage/ndb}/include/mgmapi/mgmapi_config_parameters.h (100%) rename {ndb => storage/ndb}/include/mgmapi/mgmapi_config_parameters_debug.h (100%) rename {ndb => storage/ndb}/include/mgmapi/mgmapi_debug.h (100%) rename {ndb => storage/ndb}/include/mgmapi/ndb_logevent.h (100%) rename {ndb => storage/ndb}/include/mgmcommon/ConfigRetriever.hpp (100%) rename {ndb => storage/ndb}/include/mgmcommon/IPCConfig.hpp (100%) rename {ndb => storage/ndb}/include/mgmcommon/MgmtErrorReporter.hpp (100%) rename {ndb => storage/ndb}/include/ndb_constants.h (100%) rename {ndb => storage/ndb}/include/ndb_global.h.in (100%) rename {ndb => storage/ndb}/include/ndb_init.h (100%) rename {ndb => storage/ndb}/include/ndb_net.h (100%) rename {ndb => storage/ndb}/include/ndb_types.h.in (100%) rename {ndb => storage/ndb}/include/ndb_version.h.in (100%) rename {ndb => storage/ndb}/include/ndbapi/Ndb.hpp (100%) rename {ndb => storage/ndb}/include/ndbapi/NdbApi.hpp (100%) rename {ndb => storage/ndb}/include/ndbapi/NdbBlob.hpp (100%) rename {ndb => storage/ndb}/include/ndbapi/NdbDictionary.hpp (100%) rename {ndb => storage/ndb}/include/ndbapi/NdbError.hpp (100%) rename {ndb => storage/ndb}/include/ndbapi/NdbEventOperation.hpp (100%) rename {ndb => storage/ndb}/include/ndbapi/NdbIndexOperation.hpp (100%) rename {ndb => storage/ndb}/include/ndbapi/NdbIndexScanOperation.hpp (100%) rename {ndb => storage/ndb}/include/ndbapi/NdbOperation.hpp (100%) rename {ndb => storage/ndb}/include/ndbapi/NdbPool.hpp (100%) rename {ndb => storage/ndb}/include/ndbapi/NdbRecAttr.hpp (100%) rename {ndb => storage/ndb}/include/ndbapi/NdbReceiver.hpp (100%) rename {ndb => storage/ndb}/include/ndbapi/NdbScanFilter.hpp (100%) rename {ndb => storage/ndb}/include/ndbapi/NdbScanOperation.hpp (100%) rename {ndb => storage/ndb}/include/ndbapi/NdbTransaction.hpp (100%) rename {ndb => storage/ndb}/include/ndbapi/ndb_cluster_connection.hpp (100%) rename {ndb => storage/ndb}/include/ndbapi/ndb_opt_defaults.h (100%) rename {ndb => storage/ndb}/include/ndbapi/ndbapi_limits.h (100%) rename {ndb => storage/ndb}/include/ndbapi/ndberror.h (100%) rename {ndb => storage/ndb}/include/newtonapi/dba.h (100%) rename {ndb => storage/ndb}/include/newtonapi/defs/pcn_types.h (100%) rename {ndb => storage/ndb}/include/portlib/NdbCondition.h (100%) rename {ndb => storage/ndb}/include/portlib/NdbConfig.h (100%) rename {ndb => storage/ndb}/include/portlib/NdbDaemon.h (100%) rename {ndb => storage/ndb}/include/portlib/NdbEnv.h (100%) rename {ndb => storage/ndb}/include/portlib/NdbHost.h (100%) rename {ndb => storage/ndb}/include/portlib/NdbMain.h (100%) rename {ndb => storage/ndb}/include/portlib/NdbMem.h (100%) rename {ndb => storage/ndb}/include/portlib/NdbMutex.h (100%) rename {ndb => storage/ndb}/include/portlib/NdbSleep.h (100%) rename {ndb => storage/ndb}/include/portlib/NdbTCP.h (100%) rename {ndb => storage/ndb}/include/portlib/NdbThread.h (100%) rename {ndb => storage/ndb}/include/portlib/NdbTick.h (100%) rename {ndb => storage/ndb}/include/portlib/PortDefs.h (100%) rename {ndb => storage/ndb}/include/portlib/prefetch.h (100%) rename {ndb => storage/ndb}/include/transporter/TransporterCallback.hpp (100%) rename {ndb => storage/ndb}/include/transporter/TransporterDefinitions.hpp (100%) rename {ndb => storage/ndb}/include/transporter/TransporterRegistry.hpp (100%) rename {ndb => storage/ndb}/include/util/Base64.hpp (100%) rename {ndb => storage/ndb}/include/util/BaseString.hpp (100%) rename {ndb => storage/ndb}/include/util/Bitmask.hpp (100%) rename {ndb => storage/ndb}/include/util/ConfigValues.hpp (100%) rename {ndb => storage/ndb}/include/util/File.hpp (100%) rename {ndb => storage/ndb}/include/util/InputStream.hpp (100%) rename {ndb => storage/ndb}/include/util/NdbAutoPtr.hpp (100%) rename {ndb => storage/ndb}/include/util/NdbOut.hpp (100%) rename {ndb => storage/ndb}/include/util/NdbSqlUtil.hpp (100%) rename {ndb => storage/ndb}/include/util/OutputStream.hpp (100%) rename {ndb => storage/ndb}/include/util/Parser.hpp (100%) rename {ndb => storage/ndb}/include/util/Properties.hpp (100%) rename {ndb => storage/ndb}/include/util/SimpleProperties.hpp (100%) rename {ndb => storage/ndb}/include/util/SocketAuthenticator.hpp (100%) rename {ndb => storage/ndb}/include/util/SocketClient.hpp (100%) rename {ndb => storage/ndb}/include/util/SocketServer.hpp (100%) rename {ndb => storage/ndb}/include/util/UtilBuffer.hpp (100%) rename {ndb => storage/ndb}/include/util/Vector.hpp (100%) rename {ndb => storage/ndb}/include/util/basestring_vsnprintf.h (100%) rename {ndb => storage/ndb}/include/util/md5_hash.hpp (100%) rename {ndb => storage/ndb}/include/util/ndb_opts.h (100%) rename {ndb => storage/ndb}/include/util/random.h (100%) rename {ndb => storage/ndb}/include/util/socket_io.h (100%) rename {ndb => storage/ndb}/include/util/uucode.h (100%) rename {ndb => storage/ndb}/include/util/version.h (100%) rename {ndb => storage/ndb}/lib/.empty (100%) rename {ndb => storage/ndb}/ndbapi-examples/Makefile (100%) rename {ndb => storage/ndb}/ndbapi-examples/mgmapi_logevent_example/Makefile (100%) rename {ndb => storage/ndb}/ndbapi-examples/mgmapi_logevent_example/mgmapi_logevent.cpp (100%) rename {ndb => storage/ndb}/ndbapi-examples/ndbapi_async_example/Makefile (100%) rename {ndb => storage/ndb}/ndbapi-examples/ndbapi_async_example/ndbapi_async.cpp (100%) rename {ndb => storage/ndb}/ndbapi-examples/ndbapi_async_example/readme.txt (100%) rename {ndb => storage/ndb}/ndbapi-examples/ndbapi_async_example1/Makefile (100%) rename {ndb => storage/ndb}/ndbapi-examples/ndbapi_async_example1/ndbapi_async1.cpp (100%) rename {ndb => storage/ndb}/ndbapi-examples/ndbapi_event_example/Makefile (100%) rename {ndb => storage/ndb}/ndbapi-examples/ndbapi_event_example/ndbapi_event.cpp (100%) rename {ndb => storage/ndb}/ndbapi-examples/ndbapi_retries_example/Makefile (100%) rename {ndb => storage/ndb}/ndbapi-examples/ndbapi_retries_example/ndbapi_retries.cpp (100%) rename {ndb => storage/ndb}/ndbapi-examples/ndbapi_scan_example/Makefile (100%) rename {ndb => storage/ndb}/ndbapi-examples/ndbapi_scan_example/ndbapi_scan.cpp (100%) rename {ndb => storage/ndb}/ndbapi-examples/ndbapi_scan_example/readme.txt (100%) rename {ndb => storage/ndb}/ndbapi-examples/ndbapi_simple_example/Makefile (100%) rename {ndb => storage/ndb}/ndbapi-examples/ndbapi_simple_example/ndbapi_simple.cpp (100%) rename {ndb => storage/ndb}/ndbapi-examples/ndbapi_simple_index_example/Makefile (100%) rename {ndb => storage/ndb}/ndbapi-examples/ndbapi_simple_index_example/ndbapi_simple_index.cpp (100%) rename {ndb => storage/ndb}/src/Makefile.am (100%) rename {ndb => storage/ndb}/src/common/Makefile.am (100%) rename {ndb => storage/ndb}/src/common/debugger/BlockNames.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/DebuggerNames.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/EventLogger.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/GrepError.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/Makefile.am (100%) rename {ndb => storage/ndb}/src/common/debugger/SignalLoggerManager.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/AccLock.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/AlterIndx.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/AlterTab.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/AlterTable.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/AlterTrig.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/BackupImpl.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/BackupSignalData.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/CloseComReqConf.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/CntrStart.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/ContinueB.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/CopyGCI.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/CreateEvnt.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/CreateFragmentation.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/CreateIndx.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/CreateTrig.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/DictTabInfo.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/DihContinueB.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/DisconnectRep.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/DropIndx.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/DropTab.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/DropTrig.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/FailRep.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/FireTrigOrd.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/FsAppendReq.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/FsCloseReq.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/FsConf.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/FsOpenReq.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/FsReadWriteReq.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/FsRef.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/GCPSave.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/IndxAttrInfo.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/IndxKeyInfo.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/LCP.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/LqhFrag.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/LqhKey.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/LqhTrans.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/Makefile.am (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/MasterLCP.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/NFCompleteRep.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/NdbSttor.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/NdbfsContinueB.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/PackedSignal.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/PrepDropTab.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/PrepFailReqRef.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/ReadNodesConf.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/ScanFrag.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/ScanTab.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/SignalDataPrint.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/SignalDroppedRep.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/SignalNames.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/StartRec.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/SumaImpl.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/SystemError.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/TcIndx.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/TcKeyConf.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/TcKeyRef.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/TcKeyReq.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/TcRollbackRep.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/TrigAttrInfo.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/TupCommit.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/TupKey.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/TuxMaint.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/UtilDelete.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/UtilExecute.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/UtilLock.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/UtilPrepare.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/UtilSequence.cpp (100%) rename {ndb => storage/ndb}/src/common/debugger/signaldata/print.awk (100%) rename {ndb => storage/ndb}/src/common/logger/ConsoleLogHandler.cpp (100%) rename {ndb => storage/ndb}/src/common/logger/FileLogHandler.cpp (100%) rename {ndb => storage/ndb}/src/common/logger/LogHandler.cpp (100%) rename {ndb => storage/ndb}/src/common/logger/LogHandlerList.cpp (100%) rename {ndb => storage/ndb}/src/common/logger/LogHandlerList.hpp (100%) rename {ndb => storage/ndb}/src/common/logger/Logger.cpp (100%) rename {ndb => storage/ndb}/src/common/logger/Makefile.am (100%) rename {ndb => storage/ndb}/src/common/logger/SysLogHandler.cpp (100%) rename {ndb => storage/ndb}/src/common/logger/listtest/LogHandlerListUnitTest.cpp (100%) rename {ndb => storage/ndb}/src/common/logger/listtest/LogHandlerListUnitTest.hpp (100%) rename {ndb => storage/ndb}/src/common/logger/listtest/Makefile (100%) rename {ndb => storage/ndb}/src/common/logger/loggertest/LoggerUnitTest.cpp (100%) rename {ndb => storage/ndb}/src/common/logger/loggertest/LoggerUnitTest.hpp (100%) rename {ndb => storage/ndb}/src/common/logger/loggertest/Makefile (100%) rename {ndb => storage/ndb}/src/common/mgmcommon/ConfigRetriever.cpp (100%) rename {ndb => storage/ndb}/src/common/mgmcommon/IPCConfig.cpp (100%) rename {ndb => storage/ndb}/src/common/mgmcommon/Makefile.am (100%) rename {ndb => storage/ndb}/src/common/mgmcommon/printConfig/Makefile (100%) rename {ndb => storage/ndb}/src/common/mgmcommon/printConfig/printConfig.cpp (100%) rename {ndb => storage/ndb}/src/common/portlib/Makefile.am (100%) rename {ndb => storage/ndb}/src/common/portlib/NdbCondition.c (100%) rename {ndb => storage/ndb}/src/common/portlib/NdbConfig.c (100%) rename {ndb => storage/ndb}/src/common/portlib/NdbDaemon.c (100%) rename {ndb => storage/ndb}/src/common/portlib/NdbEnv.c (100%) rename {ndb => storage/ndb}/src/common/portlib/NdbHost.c (100%) rename {ndb => storage/ndb}/src/common/portlib/NdbMem.c (100%) rename {ndb => storage/ndb}/src/common/portlib/NdbMutex.c (100%) rename {ndb => storage/ndb}/src/common/portlib/NdbPortLibTest.cpp (100%) rename {ndb => storage/ndb}/src/common/portlib/NdbSleep.c (100%) rename {ndb => storage/ndb}/src/common/portlib/NdbTCP.cpp (100%) rename {ndb => storage/ndb}/src/common/portlib/NdbThread.c (100%) rename {ndb => storage/ndb}/src/common/portlib/NdbTick.c (100%) rename {ndb => storage/ndb}/src/common/portlib/gcc.cpp (100%) rename {ndb => storage/ndb}/src/common/portlib/memtest.c (100%) rename {ndb => storage/ndb}/src/common/portlib/mmslist.cpp (100%) rename {ndb => storage/ndb}/src/common/portlib/mmstest.cpp (100%) rename {ndb => storage/ndb}/src/common/portlib/munmaptest.cpp (100%) rename {ndb => storage/ndb}/src/common/portlib/old_dirs/memtest/Makefile (100%) rename {ndb => storage/ndb}/src/common/portlib/old_dirs/memtest/munmaptest/Makefile (100%) rename {ndb => storage/ndb}/src/common/portlib/old_dirs/ose/Makefile (100%) rename {ndb => storage/ndb}/src/common/portlib/old_dirs/ose/NdbCondition.c (100%) rename {ndb => storage/ndb}/src/common/portlib/old_dirs/ose/NdbConditionOSE.h (100%) rename {ndb => storage/ndb}/src/common/portlib/old_dirs/ose/NdbEnv.c (100%) rename {ndb => storage/ndb}/src/common/portlib/old_dirs/ose/NdbHost.c (100%) rename {ndb => storage/ndb}/src/common/portlib/old_dirs/ose/NdbMem.c (100%) rename {ndb => storage/ndb}/src/common/portlib/old_dirs/ose/NdbMem_SoftOse.cpp (100%) rename {ndb => storage/ndb}/src/common/portlib/old_dirs/ose/NdbMutex.c (100%) rename {ndb => storage/ndb}/src/common/portlib/old_dirs/ose/NdbOut.cpp (100%) rename {ndb => storage/ndb}/src/common/portlib/old_dirs/ose/NdbSleep.c (100%) rename {ndb => storage/ndb}/src/common/portlib/old_dirs/ose/NdbTCP.c (100%) rename {ndb => storage/ndb}/src/common/portlib/old_dirs/ose/NdbThread.c (100%) rename {ndb => storage/ndb}/src/common/portlib/old_dirs/ose/NdbTick.c (100%) rename {ndb => storage/ndb}/src/common/portlib/old_dirs/test/Makefile (100%) rename {ndb => storage/ndb}/src/common/portlib/old_dirs/win32/Makefile (100%) rename {ndb => storage/ndb}/src/common/portlib/old_dirs/win32/NdbCondition.c (100%) rename {ndb => storage/ndb}/src/common/portlib/old_dirs/win32/NdbDaemon.c (100%) rename {ndb => storage/ndb}/src/common/portlib/old_dirs/win32/NdbEnv.c (100%) rename {ndb => storage/ndb}/src/common/portlib/old_dirs/win32/NdbHost.c (100%) rename {ndb => storage/ndb}/src/common/portlib/old_dirs/win32/NdbMem.c (100%) rename {ndb => storage/ndb}/src/common/portlib/old_dirs/win32/NdbMutex.c (100%) rename {ndb => storage/ndb}/src/common/portlib/old_dirs/win32/NdbSleep.c (100%) rename {ndb => storage/ndb}/src/common/portlib/old_dirs/win32/NdbTCP.c (100%) rename {ndb => storage/ndb}/src/common/portlib/old_dirs/win32/NdbThread.c (100%) rename {ndb => storage/ndb}/src/common/portlib/old_dirs/win32/NdbTick.c (100%) rename {ndb => storage/ndb}/src/common/portlib/win32/NdbCondition.c (100%) rename {ndb => storage/ndb}/src/common/portlib/win32/NdbDaemon.c (100%) rename {ndb => storage/ndb}/src/common/portlib/win32/NdbEnv.c (100%) rename {ndb => storage/ndb}/src/common/portlib/win32/NdbHost.c (100%) rename {ndb => storage/ndb}/src/common/portlib/win32/NdbMem.c (100%) rename {ndb => storage/ndb}/src/common/portlib/win32/NdbMutex.c (100%) rename {ndb => storage/ndb}/src/common/portlib/win32/NdbSleep.c (100%) rename {ndb => storage/ndb}/src/common/portlib/win32/NdbTCP.c (100%) rename {ndb => storage/ndb}/src/common/portlib/win32/NdbThread.c (100%) rename {ndb => storage/ndb}/src/common/portlib/win32/NdbTick.c (100%) rename {ndb => storage/ndb}/src/common/transporter/Makefile.am (100%) rename {ndb => storage/ndb}/src/common/transporter/OSE_Receiver.cpp (100%) rename {ndb => storage/ndb}/src/common/transporter/OSE_Receiver.hpp (100%) rename {ndb => storage/ndb}/src/common/transporter/OSE_Signals.hpp (100%) rename {ndb => storage/ndb}/src/common/transporter/OSE_Transporter.cpp (100%) rename {ndb => storage/ndb}/src/common/transporter/OSE_Transporter.hpp (100%) rename {ndb => storage/ndb}/src/common/transporter/Packer.cpp (100%) rename {ndb => storage/ndb}/src/common/transporter/Packer.hpp (100%) rename {ndb => storage/ndb}/src/common/transporter/SCI_Transporter.cpp (100%) rename {ndb => storage/ndb}/src/common/transporter/SCI_Transporter.hpp (100%) rename {ndb => storage/ndb}/src/common/transporter/SHM_Buffer.hpp (100%) rename {ndb => storage/ndb}/src/common/transporter/SHM_Transporter.cpp (100%) rename {ndb => storage/ndb}/src/common/transporter/SHM_Transporter.hpp (100%) rename {ndb => storage/ndb}/src/common/transporter/SHM_Transporter.unix.cpp (100%) rename {ndb => storage/ndb}/src/common/transporter/SHM_Transporter.win32.cpp (100%) rename {ndb => storage/ndb}/src/common/transporter/SendBuffer.cpp (100%) rename {ndb => storage/ndb}/src/common/transporter/SendBuffer.hpp (100%) rename {ndb => storage/ndb}/src/common/transporter/TCP_Transporter.cpp (100%) rename {ndb => storage/ndb}/src/common/transporter/TCP_Transporter.hpp (100%) rename {ndb => storage/ndb}/src/common/transporter/Transporter.cpp (100%) rename {ndb => storage/ndb}/src/common/transporter/Transporter.hpp (100%) rename {ndb => storage/ndb}/src/common/transporter/TransporterInternalDefinitions.hpp (100%) rename {ndb => storage/ndb}/src/common/transporter/TransporterRegistry.cpp (100%) rename {ndb => storage/ndb}/src/common/transporter/basictest/Makefile (100%) rename {ndb => storage/ndb}/src/common/transporter/basictest/basicTransporterTest.cpp (100%) rename {ndb => storage/ndb}/src/common/transporter/buddy.cpp (100%) rename {ndb => storage/ndb}/src/common/transporter/buddy.hpp (100%) rename {ndb => storage/ndb}/src/common/transporter/failoverSCI/Makefile (100%) rename {ndb => storage/ndb}/src/common/transporter/failoverSCI/failoverSCI.cpp (100%) rename {ndb => storage/ndb}/src/common/transporter/perftest/Makefile (100%) rename {ndb => storage/ndb}/src/common/transporter/perftest/perfTransporterTest.cpp (100%) rename {ndb => storage/ndb}/src/common/transporter/priotest/Makefile (100%) rename {ndb => storage/ndb}/src/common/transporter/priotest/prioOSE/Makefile (100%) rename {ndb => storage/ndb}/src/common/transporter/priotest/prioSCI/Makefile (100%) rename {ndb => storage/ndb}/src/common/transporter/priotest/prioSCI/prioSCI.cpp (100%) rename {ndb => storage/ndb}/src/common/transporter/priotest/prioSHM/Makefile (100%) rename {ndb => storage/ndb}/src/common/transporter/priotest/prioSHM/prioSHM.cpp (100%) rename {ndb => storage/ndb}/src/common/transporter/priotest/prioTCP/Makefile (100%) rename {ndb => storage/ndb}/src/common/transporter/priotest/prioTCP/prioTCP.cpp (100%) rename {ndb => storage/ndb}/src/common/transporter/priotest/prioTransporterTest.cpp (100%) rename {ndb => storage/ndb}/src/common/transporter/priotest/prioTransporterTest.hpp (100%) rename {ndb => storage/ndb}/src/common/util/Base64.cpp (100%) rename {ndb => storage/ndb}/src/common/util/BaseString.cpp (100%) rename {ndb => storage/ndb}/src/common/util/Bitmask.cpp (100%) rename {ndb => storage/ndb}/src/common/util/ConfigValues.cpp (100%) rename {ndb => storage/ndb}/src/common/util/File.cpp (100%) rename {ndb => storage/ndb}/src/common/util/InputStream.cpp (100%) rename {ndb => storage/ndb}/src/common/util/Makefile.am (100%) rename {ndb => storage/ndb}/src/common/util/NdbErrHnd.cpp (100%) rename {ndb => storage/ndb}/src/common/util/NdbOut.cpp (100%) rename {ndb => storage/ndb}/src/common/util/NdbSqlUtil.cpp (100%) rename {ndb => storage/ndb}/src/common/util/OutputStream.cpp (100%) rename {ndb => storage/ndb}/src/common/util/Parser.cpp (100%) rename {ndb => storage/ndb}/src/common/util/Properties.cpp (100%) rename {ndb => storage/ndb}/src/common/util/SimpleProperties.cpp (100%) rename {ndb => storage/ndb}/src/common/util/SocketAuthenticator.cpp (100%) rename {ndb => storage/ndb}/src/common/util/SocketClient.cpp (100%) rename {ndb => storage/ndb}/src/common/util/SocketServer.cpp (100%) rename {ndb => storage/ndb}/src/common/util/basestring_vsnprintf.c (100%) rename {ndb => storage/ndb}/src/common/util/filetest/FileUnitTest.cpp (100%) rename {ndb => storage/ndb}/src/common/util/filetest/FileUnitTest.hpp (100%) rename {ndb => storage/ndb}/src/common/util/filetest/Makefile (100%) rename {ndb => storage/ndb}/src/common/util/getarg.cat3 (100%) rename {ndb => storage/ndb}/src/common/util/md5_hash.cpp (100%) rename {ndb => storage/ndb}/src/common/util/ndb_init.c (100%) rename {ndb => storage/ndb}/src/common/util/new.cpp (100%) rename {ndb => storage/ndb}/src/common/util/random.c (100%) rename {ndb => storage/ndb}/src/common/util/socket_io.cpp (100%) rename {ndb => storage/ndb}/src/common/util/strdup.c (100%) rename {ndb => storage/ndb}/src/common/util/testConfigValues/Makefile (100%) rename {ndb => storage/ndb}/src/common/util/testConfigValues/testConfigValues.cpp (100%) rename {ndb => storage/ndb}/src/common/util/testProperties/Makefile (100%) rename {ndb => storage/ndb}/src/common/util/testProperties/testProperties.cpp (100%) rename {ndb => storage/ndb}/src/common/util/testSimpleProperties/Makefile (100%) rename {ndb => storage/ndb}/src/common/util/testSimpleProperties/sp_test.cpp (100%) rename {ndb => storage/ndb}/src/common/util/uucode.c (100%) rename {ndb => storage/ndb}/src/common/util/version.c (100%) rename {ndb => storage/ndb}/src/cw/Makefile.am (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/C++/CPC_GUI.cpp (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/C++/CPC_GUI.dsp (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/C++/CPC_GUI.dsw (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/C++/CPC_GUI.h (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/C++/CPC_GUI.ico (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/C++/CPC_GUI.rc (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/C++/CPC_GUI.sln (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/C++/CPC_GUI.suo (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/C++/CPC_GUI.vcproj (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/C++/Closed.ICO (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/C++/NdbControls.cpp (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/C++/Open.ICO (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/C++/StdAfx.cpp (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/C++/StdAfx.h (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/C++/TreeView.cpp (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/C++/TreeView.h (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/C++/bmp00001.bmp (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/C++/resource.h (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/C++/small.ico (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/C++/toolbar.bmp (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/csharp/App.ico (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/csharp/CPC_Form.cs (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/csharp/Computer.cs (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/csharp/DATABASE.ICO (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/csharp/Database.cs (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/csharp/NDB_CPC.csproj (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/csharp/NDB_CPC.csproj.user (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/csharp/NDB_CPC.ncb (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/csharp/NDB_CPC.sln (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/csharp/PanelWizard.cs (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/csharp/Process.cs (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/Computer.cls (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/Database.cls (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/Icon 110.ico (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/Icon 231.ico (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/Icon 237.ico (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/Icon 241.ico (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/Icon 242.ico (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/Icon 270.ico (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/Icon 271.ico (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/Icon 273.ico (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/Icon 31.ico (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/Icon 337.ico (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/Icon 338.ico (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/Icon 339.ico (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/MSSCCPRJ.SCC (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/Module1.bas (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/NdbCPC.vbp (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/NdbCPC.vbw (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/Process.cls (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/closed folder.ico (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/computer.ico (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/frmAbout.frm (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/frmLogin.frm (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/frmMain.frm (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/frmNewComputer.frm (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/frmNewComputer.frx (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/frmNewDatabase.frx (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/frmNewDatabase1.frm (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/frmNewDatabase2.frm (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/frmNewDatabase2.log (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/frmNewDatabase3.frm (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/frmOptions.frm (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/frmSplash.frx (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/networking.ico (100%) rename {ndb => storage/ndb}/src/cw/cpcc-win32/vb6/open folder.ico (100%) rename {ndb => storage/ndb}/src/cw/cpcd/APIService.cpp (100%) rename {ndb => storage/ndb}/src/cw/cpcd/APIService.hpp (100%) rename {ndb => storage/ndb}/src/cw/cpcd/CPCD.cpp (100%) rename {ndb => storage/ndb}/src/cw/cpcd/CPCD.hpp (100%) rename {ndb => storage/ndb}/src/cw/cpcd/Makefile.am (100%) rename {ndb => storage/ndb}/src/cw/cpcd/Monitor.cpp (100%) rename {ndb => storage/ndb}/src/cw/cpcd/Process.cpp (100%) rename {ndb => storage/ndb}/src/cw/cpcd/common.cpp (100%) rename {ndb => storage/ndb}/src/cw/cpcd/common.hpp (100%) rename {ndb => storage/ndb}/src/cw/cpcd/main.cpp (100%) rename {ndb => storage/ndb}/src/cw/test/socketclient/Makefile (100%) rename {ndb => storage/ndb}/src/cw/test/socketclient/socketClientTest.cpp (100%) rename {ndb => storage/ndb}/src/cw/util/ClientInterface.cpp (100%) rename {ndb => storage/ndb}/src/cw/util/ClientInterface.hpp (100%) rename {ndb => storage/ndb}/src/cw/util/Makefile (100%) rename {ndb => storage/ndb}/src/cw/util/SocketRegistry.cpp (100%) rename {ndb => storage/ndb}/src/cw/util/SocketRegistry.hpp (100%) rename {ndb => storage/ndb}/src/cw/util/SocketService.cpp (100%) rename {ndb => storage/ndb}/src/cw/util/SocketService.hpp (100%) rename {ndb => storage/ndb}/src/external/WIN32.x86/sci/lib/SISCI_LIBRARY_WIN32.TXT (100%) rename {ndb => storage/ndb}/src/external/WIN32.x86/sci/lib/scilib.lib (100%) rename {ndb => storage/ndb}/src/external/WIN32.x86/sci/lib/scilib_md.lib (100%) rename {ndb => storage/ndb}/src/external/WIN32.x86/sci/lib/scilib_mt.lib (100%) rename {ndb => storage/ndb}/src/external/WIN32.x86/sci/lib/sisci_api.lib (100%) rename {ndb => storage/ndb}/src/external/WIN32.x86/sci/lib/sisci_api_md.lib (100%) rename {ndb => storage/ndb}/src/external/WIN32.x86/sci/lib/sisci_api_mt.lib (100%) rename {ndb => storage/ndb}/src/kernel/Makefile.am (100%) rename {ndb => storage/ndb}/src/kernel/SimBlockList.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/ERROR_codes.txt (100%) rename {ndb => storage/ndb}/src/kernel/blocks/Makefile.am (100%) rename {ndb => storage/ndb}/src/kernel/blocks/NodeRestart.new.txt (100%) rename {ndb => storage/ndb}/src/kernel/blocks/NodeRestart.txt (100%) rename {ndb => storage/ndb}/src/kernel/blocks/Start.txt (100%) rename {ndb => storage/ndb}/src/kernel/blocks/SystemRestart.new.txt (100%) rename {ndb => storage/ndb}/src/kernel/blocks/SystemRestart.txt (100%) rename {ndb => storage/ndb}/src/kernel/blocks/backup/Backup.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/backup/Backup.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/backup/Backup.txt (100%) rename {ndb => storage/ndb}/src/kernel/blocks/backup/BackupFormat.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/backup/BackupInit.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/backup/FsBuffer.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/backup/Makefile.am (100%) rename {ndb => storage/ndb}/src/kernel/blocks/backup/read.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/cmvmi/Cmvmi.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/cmvmi/Cmvmi.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/cmvmi/Makefile.am (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbacc/Dbacc.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbacc/DbaccInit.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbacc/DbaccMain.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbacc/Makefile.am (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbdict/CreateIndex.txt (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbdict/CreateTable.new.txt (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbdict/CreateTable.txt (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbdict/Dbdict.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbdict/Dbdict.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbdict/Dbdict.txt (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbdict/DropTable.txt (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbdict/Event.txt (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbdict/Makefile.am (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbdict/Master_AddTable.sfl (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbdict/SchemaFile.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbdict/Slave_AddTable.sfl (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbdict/printSchemaFile.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbdih/Dbdih.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbdih/DbdihInit.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbdih/DbdihMain.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbdih/LCP.txt (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbdih/Makefile.am (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbdih/Sysfile.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbdih/printSysfile/Makefile (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dblqh/Dblqh.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dblqh/DblqhInit.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dblqh/DblqhMain.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dblqh/Makefile.am (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dblqh/redoLogReader/Makefile (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dblqh/redoLogReader/records.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dblqh/redoLogReader/records.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtc/Dbtc.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtc/DbtcInit.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtc/DbtcMain.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtc/Makefile.am (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtup/AttributeOffset.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtup/Dbtup.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtup/DbtupAbort.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtup/DbtupBuffer.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtup/DbtupCommit.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtup/DbtupDebug.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtup/DbtupExecQuery.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtup/DbtupGen.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtup/DbtupIndex.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtup/DbtupLCP.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtup/DbtupMeta.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtup/DbtupPagMan.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtup/DbtupPageMap.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtup/DbtupRoutines.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtup/DbtupTrigger.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtup/DbtupUndoLog.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtup/Makefile.am (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtup/Notes.txt (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtux/Dbtux.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtux/DbtuxCmp.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtux/DbtuxDebug.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtux/DbtuxGen.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtux/DbtuxMaint.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtux/DbtuxMeta.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtux/DbtuxNode.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtux/DbtuxScan.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtux/DbtuxSearch.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtux/DbtuxTree.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtux/Makefile.am (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtux/Times.txt (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbtux/tuxstatus.html (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbutil/DbUtil.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbutil/DbUtil.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbutil/DbUtil.txt (100%) rename {ndb => storage/ndb}/src/kernel/blocks/dbutil/Makefile.am (100%) rename {ndb => storage/ndb}/src/kernel/blocks/grep/Grep.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/grep/Grep.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/grep/GrepInit.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/grep/Makefile.am (100%) rename {ndb => storage/ndb}/src/kernel/blocks/grep/systab_test/Makefile (100%) rename {ndb => storage/ndb}/src/kernel/blocks/grep/systab_test/grep_systab_test.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/mutexes.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/ndbcntr/Makefile.am (100%) rename {ndb => storage/ndb}/src/kernel/blocks/ndbcntr/Ndbcntr.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/ndbfs/AsyncFile.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/ndbfs/AsyncFile.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/ndbfs/AsyncFileTest/Makefile (100%) rename {ndb => storage/ndb}/src/kernel/blocks/ndbfs/CircularIndex.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/ndbfs/CircularIndex.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/ndbfs/Filename.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/ndbfs/Filename.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/ndbfs/Makefile.am (100%) rename {ndb => storage/ndb}/src/kernel/blocks/ndbfs/MemoryChannel.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/ndbfs/MemoryChannel.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/ndbfs/MemoryChannelOSE.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/ndbfs/MemoryChannelTest/Makefile (100%) rename {ndb => storage/ndb}/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/ndbfs/Ndbfs.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/ndbfs/Ndbfs.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/ndbfs/OpenFiles.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/ndbfs/Pool.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/ndbfs/VoidFs.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/new-block.tar.gz (100%) rename {ndb => storage/ndb}/src/kernel/blocks/qmgr/Makefile.am (100%) rename {ndb => storage/ndb}/src/kernel/blocks/qmgr/Qmgr.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/qmgr/QmgrInit.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/qmgr/QmgrMain.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/qmgr/timer.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/suma/Makefile.am (100%) rename {ndb => storage/ndb}/src/kernel/blocks/suma/Suma.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/suma/Suma.hpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/suma/Suma.txt (100%) rename {ndb => storage/ndb}/src/kernel/blocks/suma/SumaInit.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/trix/Makefile.am (100%) rename {ndb => storage/ndb}/src/kernel/blocks/trix/Trix.cpp (100%) rename {ndb => storage/ndb}/src/kernel/blocks/trix/Trix.hpp (100%) rename {ndb => storage/ndb}/src/kernel/error/Error.hpp (100%) rename {ndb => storage/ndb}/src/kernel/error/ErrorHandlingMacros.hpp (100%) rename {ndb => storage/ndb}/src/kernel/error/ErrorMessages.cpp (100%) rename {ndb => storage/ndb}/src/kernel/error/ErrorMessages.hpp (100%) rename {ndb => storage/ndb}/src/kernel/error/ErrorReporter.cpp (100%) rename {ndb => storage/ndb}/src/kernel/error/ErrorReporter.hpp (100%) rename {ndb => storage/ndb}/src/kernel/error/Makefile.am (100%) rename {ndb => storage/ndb}/src/kernel/error/TimeModule.cpp (100%) rename {ndb => storage/ndb}/src/kernel/error/TimeModule.hpp (100%) rename {ndb => storage/ndb}/src/kernel/main.cpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/Array.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/ArrayFifoList.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/ArrayList.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/ArrayPool.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/CArray.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/Callback.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/ClusterConfiguration.cpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/ClusterConfiguration.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/Configuration.cpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/Configuration.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/DLFifoList.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/DLHashTable.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/DLHashTable2.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/DLList.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/DataBuffer.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/Emulator.cpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/Emulator.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/FastScheduler.cpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/FastScheduler.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/GlobalData.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/KeyTable.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/KeyTable2.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/LongSignal.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/Makefile.am (100%) rename {ndb => storage/ndb}/src/kernel/vm/MetaData.cpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/MetaData.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/Mutex.cpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/Mutex.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/Prio.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/RequestTracker.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/SLList.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/SafeCounter.cpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/SafeCounter.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/SectionReader.cpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/SectionReader.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/SignalCounter.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/SimBlockList.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/SimplePropertiesSection.cpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/SimulatedBlock.cpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/SimulatedBlock.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/ThreadConfig.cpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/ThreadConfig.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/TimeQueue.cpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/TimeQueue.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/TransporterCallback.cpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/VMSignal.cpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/VMSignal.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/WaitQueue.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/WatchDog.cpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/WatchDog.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/al_test/Makefile (100%) rename {ndb => storage/ndb}/src/kernel/vm/al_test/arrayListTest.cpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/al_test/arrayPoolTest.cpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/al_test/main.cpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/pc.hpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/testCopy/Makefile (100%) rename {ndb => storage/ndb}/src/kernel/vm/testCopy/rr.cpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/testCopy/testCopy.cpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/testDataBuffer/Makefile (100%) rename {ndb => storage/ndb}/src/kernel/vm/testDataBuffer/testDataBuffer.cpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/testLongSig/Makefile (100%) rename {ndb => storage/ndb}/src/kernel/vm/testLongSig/testLongSig.cpp (100%) rename {ndb => storage/ndb}/src/kernel/vm/testSimplePropertiesSection/Makefile (100%) rename {ndb => storage/ndb}/src/kernel/vm/testSimplePropertiesSection/test.cpp (100%) rename {ndb => storage/ndb}/src/mgmapi/LocalConfig.cpp (100%) rename {ndb => storage/ndb}/src/mgmapi/LocalConfig.hpp (100%) rename {ndb => storage/ndb}/src/mgmapi/Makefile.am (100%) rename {ndb => storage/ndb}/src/mgmapi/mgmapi.cpp (100%) rename {ndb => storage/ndb}/src/mgmapi/mgmapi_configuration.cpp (100%) rename {ndb => storage/ndb}/src/mgmapi/mgmapi_configuration.hpp (100%) rename {ndb => storage/ndb}/src/mgmapi/mgmapi_internal.h (100%) rename {ndb => storage/ndb}/src/mgmapi/ndb_logevent.cpp (100%) rename {ndb => storage/ndb}/src/mgmapi/ndb_logevent.hpp (100%) rename {ndb => storage/ndb}/src/mgmapi/test/Makefile (100%) rename {ndb => storage/ndb}/src/mgmapi/test/keso.c (100%) rename {ndb => storage/ndb}/src/mgmapi/test/mgmSrvApi.cpp (100%) rename {ndb => storage/ndb}/src/mgmclient/CommandInterpreter.cpp (100%) rename {ndb => storage/ndb}/src/mgmclient/Makefile.am (100%) rename {ndb => storage/ndb}/src/mgmclient/main.cpp (100%) rename {ndb => storage/ndb}/src/mgmclient/ndb_mgmclient.h (100%) rename {ndb => storage/ndb}/src/mgmclient/ndb_mgmclient.hpp (100%) rename {ndb => storage/ndb}/src/mgmclient/test_cpcd/Makefile (100%) rename {ndb => storage/ndb}/src/mgmclient/test_cpcd/test_cpcd.cpp (100%) rename {ndb => storage/ndb}/src/mgmsrv/Config.cpp (100%) rename {ndb => storage/ndb}/src/mgmsrv/Config.hpp (100%) rename {ndb => storage/ndb}/src/mgmsrv/ConfigInfo.cpp (100%) rename {ndb => storage/ndb}/src/mgmsrv/ConfigInfo.hpp (100%) rename {ndb => storage/ndb}/src/mgmsrv/InitConfigFileParser.cpp (100%) rename {ndb => storage/ndb}/src/mgmsrv/InitConfigFileParser.hpp (100%) rename {ndb => storage/ndb}/src/mgmsrv/Makefile.am (100%) rename {ndb => storage/ndb}/src/mgmsrv/MgmtSrvr.cpp (100%) rename {ndb => storage/ndb}/src/mgmsrv/MgmtSrvr.hpp (100%) rename {ndb => storage/ndb}/src/mgmsrv/MgmtSrvrConfig.cpp (100%) rename {ndb => storage/ndb}/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp (100%) rename {ndb => storage/ndb}/src/mgmsrv/Services.cpp (100%) rename {ndb => storage/ndb}/src/mgmsrv/Services.hpp (100%) rename {ndb => storage/ndb}/src/mgmsrv/SignalQueue.cpp (100%) rename {ndb => storage/ndb}/src/mgmsrv/SignalQueue.hpp (100%) rename {ndb => storage/ndb}/src/mgmsrv/convertStrToInt.cpp (100%) rename {ndb => storage/ndb}/src/mgmsrv/convertStrToInt.hpp (100%) rename {ndb => storage/ndb}/src/mgmsrv/main.cpp (100%) rename {ndb => storage/ndb}/src/mgmsrv/mkconfig/Makefile (100%) rename {ndb => storage/ndb}/src/mgmsrv/mkconfig/mkconfig.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/API.hpp (100%) rename {ndb => storage/ndb}/src/ndbapi/ClusterMgr.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/ClusterMgr.hpp (100%) rename {ndb => storage/ndb}/src/ndbapi/DictCache.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/DictCache.hpp (100%) rename {ndb => storage/ndb}/src/ndbapi/Makefile.am (100%) rename {ndb => storage/ndb}/src/ndbapi/Ndb.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbApiSignal.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbApiSignal.hpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbBlob.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbBlobImpl.hpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbDictionary.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbDictionaryImpl.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbDictionaryImpl.hpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbErrorOut.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbEventOperation.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbEventOperationImpl.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbEventOperationImpl.hpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbImpl.hpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbIndexOperation.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbLinHash.hpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbOperation.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbOperationDefine.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbOperationExec.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbOperationInt.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbOperationScan.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbOperationSearch.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbPool.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbPoolImpl.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbPoolImpl.hpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbRecAttr.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbReceiver.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbScanFilter.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbScanOperation.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbTransaction.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbTransactionScan.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbUtil.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbUtil.hpp (100%) rename {ndb => storage/ndb}/src/ndbapi/NdbWaiter.hpp (100%) rename {ndb => storage/ndb}/src/ndbapi/Ndberr.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/Ndbif.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/Ndbinit.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/Ndblist.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/ObjectMap.hpp (100%) rename {ndb => storage/ndb}/src/ndbapi/ScanOperation.txt (100%) rename {ndb => storage/ndb}/src/ndbapi/TransporterFacade.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/TransporterFacade.hpp (100%) rename {ndb => storage/ndb}/src/ndbapi/ndb_cluster_connection.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/ndb_cluster_connection_impl.hpp (100%) rename {ndb => storage/ndb}/src/ndbapi/ndberror.c (100%) rename {ndb => storage/ndb}/src/ndbapi/signal-sender/Makefile (100%) rename {ndb => storage/ndb}/src/ndbapi/signal-sender/SignalSender.cpp (100%) rename {ndb => storage/ndb}/src/ndbapi/signal-sender/SignalSender.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/Makefile (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/Extra.mk (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/Makefile (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/NdbOdbc.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/NdbOdbc.def (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/CodeGen.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/CodeGen.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_base.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_base.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_column.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_column.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_comp_op.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_comp_op.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_create_index.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_create_index.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_create_row.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_create_row.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_create_table.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_create_table.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_data_type.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_data_type.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_ddl.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_ddl.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_ddl_column.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_ddl_column.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_ddl_constr.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_ddl_constr.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_ddl_row.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_ddl_row.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_delete.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_delete.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_delete_index.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_delete_index.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_delete_lookup.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_delete_lookup.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_delete_scan.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_delete_scan.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_dml.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_dml.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_dml_column.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_dml_column.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_dml_row.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_dml_row.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_drop_index.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_drop_index.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_drop_table.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_drop_table.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_expr.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_expr.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_expr_column.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_expr_column.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_expr_const.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_expr_const.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_expr_conv.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_expr_conv.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_expr_func.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_expr_func.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_expr_op.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_expr_op.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_expr_param.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_expr_param.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_expr_row.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_expr_row.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_idx_column.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_idx_column.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_insert.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_insert.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_pred.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_pred.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_pred_op.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_pred_op.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_query.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_query.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_query_count.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_query_count.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_query_distinct.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_query_distinct.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_query_filter.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_query_filter.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_query_group.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_query_group.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_query_index.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_query_index.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_query_join.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_query_join.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_query_lookup.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_query_lookup.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_query_project.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_query_project.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_query_range.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_query_range.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_query_repeat.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_query_repeat.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_query_scan.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_query_scan.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_query_sort.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_query_sort.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_query_sys.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_query_sys.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_root.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_root.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_select.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_select.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_set_row.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_set_row.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_stmt.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_stmt.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_table.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_table.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_table_list.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_table_list.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_update.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_update.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_update_index.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_update_index.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_update_lookup.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_update_lookup.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_update_scan.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Code_update_scan.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/Makefile (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/SimpleGram.ypp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/SimpleParser.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/SimpleParser.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/codegen/SimpleScan.lpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/AttrArea.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/AttrArea.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/CodeTree.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/CodeTree.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/ConnArea.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/ConnArea.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/Ctx.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/Ctx.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/DataField.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/DataField.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/DataRow.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/DataRow.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/DataType.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/DataType.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/DescArea.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/DescArea.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/DiagArea.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/DiagArea.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/Makefile (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/OdbcData.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/OdbcData.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/ResultArea.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/ResultArea.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/Sqlstate.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/Sqlstate.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/StmtArea.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/StmtArea.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/StmtInfo.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/StmtInfo.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/common.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/common/common.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/dictionary/DictCatalog.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/dictionary/DictCatalog.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/dictionary/DictColumn.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/dictionary/DictColumn.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/dictionary/DictIndex.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/dictionary/DictIndex.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/dictionary/DictSchema.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/dictionary/DictSchema.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/dictionary/DictSys.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/dictionary/DictSys.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/dictionary/DictTable.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/dictionary/DictTable.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/dictionary/Makefile (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/docs/class.fig (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/docs/descfield.pl (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/docs/diag.txt (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/docs/getinfo.pl (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/docs/gettypeinfo.pl (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/docs/handleattr.pl (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/docs/main.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/docs/ndbodbc.html (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/docs/select.fig (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/docs/systables.pl (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/docs/type.txt (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/Func.data (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/Func.pl (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/Makefile (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLAllocConnect.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLAllocEnv.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLAllocHandle.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLAllocHandleStd.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLAllocStmt.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLBindCol.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLBindParam.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLBindParameter.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLBrowseConnect.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLBulkOperations.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLCancel.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLCloseCursor.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLColAttribute.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLColAttributes.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLColumnPrivileges.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLColumns.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLConnect.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLCopyDesc.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLDataSources.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLDescribeCol.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLDescribeParam.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLDisconnect.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLDriverConnect.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLDrivers.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLEndTran.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLError.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLExecDirect.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLExecute.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLExtendedFetch.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLFetch.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLFetchScroll.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLForeignKeys.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLFreeConnect.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLFreeEnv.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLFreeHandle.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLFreeStmt.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLGetConnectAttr.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLGetConnectOption.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLGetCursorName.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLGetData.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLGetDescField.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLGetDescRec.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLGetDiagField.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLGetDiagRec.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLGetEnvAttr.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLGetFunctions.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLGetInfo.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLGetStmtAttr.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLGetStmtOption.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLGetTypeInfo.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLMoreResults.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLNativeSql.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLNumParams.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLNumResultCols.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLParamData.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLParamOptions.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLPrepare.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLPrimaryKeys.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLProcedureColumns.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLProcedures.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLPutData.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLRowCount.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLSetConnectAttr.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLSetConnectOption.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLSetCursorName.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLSetDescField.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLSetDescRec.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLSetEnvAttr.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLSetParam.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLSetPos.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLSetScrollOptions.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLSetStmtAttr.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLSetStmtOption.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLSpecialColumns.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLStatistics.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLTablePrivileges.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLTables.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/SQLTransact.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/driver.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/driver/driver.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/executor/Exec_comp_op.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/executor/Exec_create_index.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/executor/Exec_create_table.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/executor/Exec_delete_index.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/executor/Exec_delete_lookup.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/executor/Exec_delete_scan.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/executor/Exec_drop_index.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/executor/Exec_drop_table.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/executor/Exec_expr_conv.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/executor/Exec_expr_func.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/executor/Exec_expr_op.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/executor/Exec_insert.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/executor/Exec_pred_op.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/executor/Exec_query_index.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/executor/Exec_query_lookup.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/executor/Exec_query_range.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/executor/Exec_query_scan.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/executor/Exec_query_sys.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/executor/Exec_update_index.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/executor/Exec_update_lookup.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/executor/Exec_update_scan.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/executor/Executor.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/executor/Executor.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/executor/Makefile (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/handles/AttrDbc.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/handles/AttrEnv.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/handles/AttrRoot.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/handles/AttrStmt.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/handles/DescSpec.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/handles/FuncTab.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/handles/HandleBase.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/handles/HandleBase.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/handles/HandleDbc.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/handles/HandleDbc.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/handles/HandleDesc.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/handles/HandleDesc.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/handles/HandleEnv.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/handles/HandleEnv.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/handles/HandleRoot.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/handles/HandleRoot.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/handles/HandleStmt.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/handles/HandleStmt.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/handles/InfoTab.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/handles/Makefile (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/handles/PoolNdb.cpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/handles/PoolNdb.hpp (100%) rename {ndb => storage/ndb}/src/old_files/client/odbc/handles/handles.hpp (100%) rename {ndb => storage/ndb}/src/old_files/ndbbaseclient/Makefile (100%) rename {ndb => storage/ndb}/src/old_files/ndbbaseclient/ndbbaseclient_dummy.cpp (100%) rename {ndb => storage/ndb}/src/old_files/ndbclient/Makefile (100%) rename {ndb => storage/ndb}/src/old_files/ndbclient/ndbclient_dummy.cpp (100%) rename {ndb => storage/ndb}/src/old_files/newtonapi/Makefile (100%) rename {ndb => storage/ndb}/src/old_files/newtonapi/dba_binding.cpp (100%) rename {ndb => storage/ndb}/src/old_files/newtonapi/dba_bulkread.cpp (100%) rename {ndb => storage/ndb}/src/old_files/newtonapi/dba_config.cpp (100%) rename {ndb => storage/ndb}/src/old_files/newtonapi/dba_dac.cpp (100%) rename {ndb => storage/ndb}/src/old_files/newtonapi/dba_error.cpp (100%) rename {ndb => storage/ndb}/src/old_files/newtonapi/dba_init.cpp (100%) rename {ndb => storage/ndb}/src/old_files/newtonapi/dba_internal.hpp (100%) rename {ndb => storage/ndb}/src/old_files/newtonapi/dba_process.cpp (100%) rename {ndb => storage/ndb}/src/old_files/newtonapi/dba_process.hpp (100%) rename {ndb => storage/ndb}/src/old_files/newtonapi/dba_schema.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/ExtSender.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/ExtSender.hpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/Makefile (100%) rename {ndb => storage/ndb}/src/old_files/rep/NodeConnectInfo.hpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/README (100%) rename {ndb => storage/ndb}/src/old_files/rep/RepApiInterpreter.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/RepApiInterpreter.hpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/RepApiService.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/RepApiService.hpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/RepCommandInterpreter.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/RepCommandInterpreter.hpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/RepComponents.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/RepComponents.hpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/RepMain.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/Requestor.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/Requestor.hpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/RequestorSubscriptions.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/SignalQueue.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/SignalQueue.hpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/TODO (100%) rename {ndb => storage/ndb}/src/old_files/rep/adapters/AppNDB.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/adapters/AppNDB.hpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/adapters/ExtAPI.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/adapters/ExtAPI.hpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/adapters/ExtNDB.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/adapters/ExtNDB.hpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/adapters/Makefile (100%) rename {ndb => storage/ndb}/src/old_files/rep/adapters/TableInfoPs.hpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/dbug_hack.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/rep_version.hpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/repapi/Makefile (100%) rename {ndb => storage/ndb}/src/old_files/rep/repapi/repapi.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/repapi/repapi.h (100%) rename {ndb => storage/ndb}/src/old_files/rep/state/Channel.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/state/Channel.hpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/state/Interval.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/state/Interval.hpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/state/Makefile (100%) rename {ndb => storage/ndb}/src/old_files/rep/state/RepState.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/state/RepState.hpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/state/RepStateEvent.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/state/RepStateRequests.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/state/testInterval/Makefile (100%) rename {ndb => storage/ndb}/src/old_files/rep/state/testInterval/testInterval.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/state/testRepState/Makefile (100%) rename {ndb => storage/ndb}/src/old_files/rep/state/testRepState/testRequestor.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/state/testRepState/testRequestor.hpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/storage/GCIBuffer.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/storage/GCIBuffer.hpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/storage/GCIContainer.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/storage/GCIContainer.hpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/storage/GCIContainerPS.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/storage/GCIContainerPS.hpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/storage/GCIPage.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/storage/GCIPage.hpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/storage/LogRecord.hpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/storage/Makefile (100%) rename {ndb => storage/ndb}/src/old_files/rep/storage/NodeConnectInfo.hpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/storage/NodeGroup.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/storage/NodeGroup.hpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/storage/NodeGroupInfo.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/storage/NodeGroupInfo.hpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/transfer/Makefile (100%) rename {ndb => storage/ndb}/src/old_files/rep/transfer/TransPS.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/transfer/TransPS.hpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/transfer/TransSS.cpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/transfer/TransSS.hpp (100%) rename {ndb => storage/ndb}/src/old_files/rep/transfer/TransSSSubscriptions.cpp (100%) rename {ndb => storage/ndb}/test/Makefile.am (100%) rename {ndb => storage/ndb}/test/include/CpcClient.hpp (100%) rename {ndb => storage/ndb}/test/include/HugoAsynchTransactions.hpp (100%) rename {ndb => storage/ndb}/test/include/HugoCalculator.hpp (100%) rename {ndb => storage/ndb}/test/include/HugoOperations.hpp (100%) rename {ndb => storage/ndb}/test/include/HugoTransactions.hpp (100%) rename {ndb => storage/ndb}/test/include/NDBT.hpp (100%) rename {ndb => storage/ndb}/test/include/NDBT_DataSet.hpp (100%) rename {ndb => storage/ndb}/test/include/NDBT_DataSetTransaction.hpp (100%) rename {ndb => storage/ndb}/test/include/NDBT_Error.hpp (100%) rename {ndb => storage/ndb}/test/include/NDBT_Output.hpp (100%) rename {ndb => storage/ndb}/test/include/NDBT_ResultRow.hpp (100%) rename {ndb => storage/ndb}/test/include/NDBT_ReturnCodes.h (100%) rename {ndb => storage/ndb}/test/include/NDBT_Stats.hpp (100%) rename {ndb => storage/ndb}/test/include/NDBT_Table.hpp (100%) rename {ndb => storage/ndb}/test/include/NDBT_Tables.hpp (100%) rename {ndb => storage/ndb}/test/include/NDBT_Test.hpp (100%) rename {ndb => storage/ndb}/test/include/NdbBackup.hpp (100%) rename {ndb => storage/ndb}/test/include/NdbConfig.hpp (100%) rename {ndb => storage/ndb}/test/include/NdbGrep.hpp (100%) rename {ndb => storage/ndb}/test/include/NdbRestarter.hpp (100%) rename {ndb => storage/ndb}/test/include/NdbRestarts.hpp (100%) rename {ndb => storage/ndb}/test/include/NdbSchemaCon.hpp (100%) rename {ndb => storage/ndb}/test/include/NdbSchemaOp.hpp (100%) rename {ndb => storage/ndb}/test/include/NdbTest.hpp (100%) rename {ndb => storage/ndb}/test/include/NdbTimer.hpp (100%) rename {ndb => storage/ndb}/test/include/TestNdbEventOperation.hpp (100%) rename {ndb => storage/ndb}/test/include/UtilTransactions.hpp (100%) rename {ndb => storage/ndb}/test/include/getarg.h (100%) rename {ndb => storage/ndb}/test/ndbapi/InsertRecs.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/Makefile.am (100%) rename {ndb => storage/ndb}/test/ndbapi/ScanFilter.hpp (100%) rename {ndb => storage/ndb}/test/ndbapi/ScanFunctions.hpp (100%) rename {ndb => storage/ndb}/test/ndbapi/ScanInterpretTest.hpp (100%) rename {ndb => storage/ndb}/test/ndbapi/TraceNdbApi.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/VerifyNdbApi.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/acid.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/acid2.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/adoInsertRecs.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/asyncGenerator.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/bank/Bank.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/bank/Bank.hpp (100%) rename {ndb => storage/ndb}/test/ndbapi/bank/BankLoad.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/bank/Makefile.am (100%) rename {ndb => storage/ndb}/test/ndbapi/bank/bankCreator.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/bank/bankMakeGL.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/bank/bankSumAccounts.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/bank/bankTimer.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/bank/bankTransactionMaker.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/bank/bankValidateAllGLs.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/bank/testBank.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/bench/asyncGenerator.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/bench/dbGenerator.h (100%) rename {ndb => storage/ndb}/test/ndbapi/bench/dbPopulate.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/bench/dbPopulate.h (100%) rename {ndb => storage/ndb}/test/ndbapi/bench/macros.h (100%) rename {ndb => storage/ndb}/test/ndbapi/bench/mainAsyncGenerator.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/bench/mainPopulate.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/bench/ndb_async1.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/bench/ndb_async2.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/bench/ndb_error.hpp (100%) rename {ndb => storage/ndb}/test/ndbapi/bench/ndb_schema.hpp (100%) rename {ndb => storage/ndb}/test/ndbapi/bench/ndb_user_transaction.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/bench/ndb_user_transaction2.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/bench/ndb_user_transaction3.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/bench/ndb_user_transaction4.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/bench/ndb_user_transaction5.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/bench/ndb_user_transaction6.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/bench/testData.h (100%) rename {ndb => storage/ndb}/test/ndbapi/bench/testDefinitions.h (100%) rename {ndb => storage/ndb}/test/ndbapi/bench/userInterface.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/bench/userInterface.h (100%) rename {ndb => storage/ndb}/test/ndbapi/benchronja.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/bulk_copy.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/cdrserver.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/celloDb.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/create_all_tabs.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/create_tab.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/drop_all_tabs.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/flexAsynch.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/flexBench.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/flexHammer.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/flexScan.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/flexTT.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/flexTimedAsynch.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/flex_bench_mysql.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/index.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/index2.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/initronja.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/interpreterInTup.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/mainAsyncGenerator.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/msa.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/ndb_async1.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/ndb_async2.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/ndb_user_populate.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/ndb_user_transaction.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/ndb_user_transaction2.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/ndb_user_transaction3.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/ndb_user_transaction4.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/ndb_user_transaction5.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/ndb_user_transaction6.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/acid/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/acid2/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/acid2/TraceNdbApi.hpp (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/acid2/VerifyNdbApi.hpp (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/basicAsynch/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/bulk_copy/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/create_all_tabs/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/create_tab/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/drop_all_tabs/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/flexAsynch/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/flexBench/Makefile.am (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/flexBench/ndbplot.pl (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/flexHammer/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/flexHammer/README (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/flexScan/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/flexScan/README (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/flexTT/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/flexTimedAsynch/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/flex_bench_mysql/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/indexTest/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/indexTest2/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/interpreterInTup/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/async-src/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/async-src/generator/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/async-src/include/dbGenerator.h (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/async-src/include/testData.h (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/async-src/include/userInterface.h (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/async-src/user/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/async-src/user/macros.h (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/async-src/user/ndb_error.hpp (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/bin/.empty (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/include/ndb_schema.hpp (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/include/testDefinitions.h (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/lib/.empty (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/script/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-l-p10.sh (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-l.sh (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-p10.sh (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench.sh (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/src/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/src/README (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/src/generator/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/src/generator/dbGenerator.c (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/src/generator/dbGenerator.h (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/src/generator/mainGenerator.c (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/src/include/testData.h (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/src/include/userInterface.h (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/src/makevars.linux (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/src/makevars.sparc (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/src/populator/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/src/populator/dbPopulate.c (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/src/populator/dbPopulate.h (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/src/populator/mainPopulate.c (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/src/user/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/src/user/localDbPrepare.c (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/src/user/macros.h (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/src/user/ndb_error.hpp (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/src/user/old/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/src/user/old/userHandle.h (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/src/user/old/userInterface.c (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/src/user/old/userTransaction.c (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/src/user/userHandle.h (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/src/user/userInterface.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/lmc-bench/src/user/userTransaction.c (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/restarter/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/restarter2/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/restarts/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/ronja/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/ronja/benchronja/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/ronja/initronja/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/telco/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/telco/readme (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/testBackup/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/testBasic/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/testBlobs/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/testDataBuffers/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/testDict/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/testGrep/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/testGrep/verify/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/testIndex/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/testInterpreter/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/testMgm/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/testNdbApi/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/testNodeRestart/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/testOIBasic/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/testOIBasic/times.txt (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/testOperations/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/testOrderedIndex/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/testRestartGci/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/testScan/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/testScanInterpreter/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/testSystemRestart/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/testTimeout/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/testTransactions/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/test_event/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/vw_test/Makefile (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/vw_test/bcd.h (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/vw_test/script/client_start (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/vw_test/utv.h (100%) rename {ndb => storage/ndb}/test/ndbapi/old_dirs/vw_test/vcdrfunc.h (100%) rename {ndb => storage/ndb}/test/ndbapi/restarter.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/restarter2.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/restarts.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/size.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/slow_select.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/testBackup.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/testBasic.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/testBasicAsynch.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/testBitfield.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/testBlobs.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/testDataBuffers.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/testDeadlock.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/testDict.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/testGrep.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/testGrepVerify.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/testIndex.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/testInterpreter.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/testLcp.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/testMgm.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/testNdbApi.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/testNodeRestart.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/testOIBasic.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/testOperations.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/testOrderedIndex.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/testPartitioning.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/testReadPerf.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/testRestartGci.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/testScan.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/testScanInterpreter.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/testScanPerf.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/testSystemRestart.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/testTimeout.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/testTransactions.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/test_event.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/test_event_multi_table.cpp (100%) rename {ndb => storage/ndb}/test/ndbapi/userInterface.cpp (100%) rename {ndb => storage/ndb}/test/ndbnet/test.run (100%) rename {ndb => storage/ndb}/test/ndbnet/testError.run (100%) rename {ndb => storage/ndb}/test/ndbnet/testMNF.run (100%) rename {ndb => storage/ndb}/test/ndbnet/testNR.run (100%) rename {ndb => storage/ndb}/test/ndbnet/testNR1.run (100%) rename {ndb => storage/ndb}/test/ndbnet/testNR4.run (100%) rename {ndb => storage/ndb}/test/ndbnet/testSRhang.run (100%) rename {ndb => storage/ndb}/test/ndbnet/testTR295.run (100%) rename {ndb => storage/ndb}/test/newtonapi/basic_test/Makefile (100%) rename {ndb => storage/ndb}/test/newtonapi/basic_test/basic/Makefile (100%) rename {ndb => storage/ndb}/test/newtonapi/basic_test/basic/basic.cpp (100%) rename {ndb => storage/ndb}/test/newtonapi/basic_test/bulk_read/Makefile (100%) rename {ndb => storage/ndb}/test/newtonapi/basic_test/bulk_read/br_test.cpp (100%) rename {ndb => storage/ndb}/test/newtonapi/basic_test/common.cpp (100%) rename {ndb => storage/ndb}/test/newtonapi/basic_test/common.hpp (100%) rename {ndb => storage/ndb}/test/newtonapi/basic_test/ptr_binding/Makefile (100%) rename {ndb => storage/ndb}/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp (100%) rename {ndb => storage/ndb}/test/newtonapi/basic_test/too_basic.cpp (100%) rename {ndb => storage/ndb}/test/newtonapi/perf_test/Makefile (100%) rename {ndb => storage/ndb}/test/newtonapi/perf_test/perf.cpp (100%) rename {ndb => storage/ndb}/test/odbc/SQL99_test/Makefile (100%) rename {ndb => storage/ndb}/test/odbc/SQL99_test/SQL99_test.cpp (100%) rename {ndb => storage/ndb}/test/odbc/SQL99_test/SQL99_test.h (100%) rename {ndb => storage/ndb}/test/odbc/client/Makefile (100%) rename {ndb => storage/ndb}/test/odbc/client/NDBT_ALLOCHANDLE.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/NDBT_SQLConnect.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/NDBT_SQLPrepare.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLAllocEnvTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLAllocHandleTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLAllocHandleTest_bf.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLBindColTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLBindParameterTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLCancelTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLCloseCursorTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLColAttributeTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLColAttributeTest1.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLColAttributeTest2.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLColAttributeTest3.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLConnectTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLCopyDescTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLDescribeColTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLDisconnectTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLDriverConnectTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLEndTranTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLErrorTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLExecDirectTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLExecuteTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLFetchScrollTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLFetchTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLFreeHandleTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLFreeStmtTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLGetConnectAttrTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLGetCursorNameTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLGetDataTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLGetDescFieldTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLGetDescRecTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLGetDiagFieldTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLGetDiagRecSimpleTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLGetDiagRecTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLGetEnvAttrTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLGetFunctionsTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLGetInfoTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLGetStmtAttrTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLGetTypeInfoTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLMoreResultsTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLNumResultColsTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLParamDataTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLPrepareTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLPutDataTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLRowCountTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLSetConnectAttrTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLSetCursorNameTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLSetDescFieldTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLSetDescRecTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLSetEnvAttrTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLSetStmtAttrTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLTablesTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/SQLTransactTest.cpp (100%) rename {ndb => storage/ndb}/test/odbc/client/common.hpp (100%) rename {ndb => storage/ndb}/test/odbc/client/main.cpp (100%) rename {ndb => storage/ndb}/test/odbc/dm-iodbc/Makefile (100%) rename {ndb => storage/ndb}/test/odbc/dm-unixodbc/Makefile (100%) rename {ndb => storage/ndb}/test/odbc/driver/Makefile (100%) rename {ndb => storage/ndb}/test/odbc/driver/testOdbcDriver.cpp (100%) rename {ndb => storage/ndb}/test/odbc/test_compiler/Makefile (100%) rename {ndb => storage/ndb}/test/odbc/test_compiler/test_compiler.cpp (100%) rename {ndb => storage/ndb}/test/run-test/16node-tests.txt (100%) rename {ndb => storage/ndb}/test/run-test/Makefile.am (100%) rename {ndb => storage/ndb}/test/run-test/README (100%) rename {ndb => storage/ndb}/test/run-test/README.ATRT (100%) rename {ndb => storage/ndb}/test/run-test/atrt-analyze-result.sh (100%) rename {ndb => storage/ndb}/test/run-test/atrt-clear-result.sh (100%) rename {ndb => storage/ndb}/test/run-test/atrt-example.tgz (100%) rename {ndb => storage/ndb}/test/run-test/atrt-gather-result.sh (100%) rename {ndb => storage/ndb}/test/run-test/atrt-mysql-test-run (100%) rename {ndb => storage/ndb}/test/run-test/atrt-setup.sh (100%) rename {ndb => storage/ndb}/test/run-test/atrt-testBackup (100%) rename {ndb => storage/ndb}/test/run-test/basic.txt (100%) rename {ndb => storage/ndb}/test/run-test/daily-basic-tests.txt (100%) rename {ndb => storage/ndb}/test/run-test/daily-devel-tests.txt (100%) rename {ndb => storage/ndb}/test/run-test/example.conf (100%) rename {ndb => storage/ndb}/test/run-test/main.cpp (100%) rename {ndb => storage/ndb}/test/run-test/make-config.sh (100%) rename {ndb => storage/ndb}/test/run-test/make-html-reports.sh (100%) rename {ndb => storage/ndb}/test/run-test/make-index.sh (100%) rename {ndb => storage/ndb}/test/run-test/ndb-autotest.sh (100%) rename {ndb => storage/ndb}/test/run-test/run-test.hpp (100%) rename {ndb => storage/ndb}/test/src/CpcClient.cpp (100%) rename {ndb => storage/ndb}/test/src/HugoAsynchTransactions.cpp (100%) rename {ndb => storage/ndb}/test/src/HugoCalculator.cpp (100%) rename {ndb => storage/ndb}/test/src/HugoOperations.cpp (100%) rename {ndb => storage/ndb}/test/src/HugoTransactions.cpp (100%) rename {ndb => storage/ndb}/test/src/Makefile.am (100%) rename {ndb => storage/ndb}/test/src/NDBT_Error.cpp (100%) rename {ndb => storage/ndb}/test/src/NDBT_Output.cpp (100%) rename {ndb => storage/ndb}/test/src/NDBT_ResultRow.cpp (100%) rename {ndb => storage/ndb}/test/src/NDBT_ReturnCodes.cpp (100%) rename {ndb => storage/ndb}/test/src/NDBT_Table.cpp (100%) rename {ndb => storage/ndb}/test/src/NDBT_Tables.cpp (100%) rename {ndb => storage/ndb}/test/src/NDBT_Test.cpp (100%) rename {ndb => storage/ndb}/test/src/NdbBackup.cpp (100%) rename {ndb => storage/ndb}/test/src/NdbConfig.cpp (100%) rename {ndb => storage/ndb}/test/src/NdbGrep.cpp (100%) rename {ndb => storage/ndb}/test/src/NdbRestarter.cpp (100%) rename {ndb => storage/ndb}/test/src/NdbRestarts.cpp (100%) rename {ndb => storage/ndb}/test/src/NdbSchemaCon.cpp (100%) rename {ndb => storage/ndb}/test/src/NdbSchemaOp.cpp (100%) rename {ndb => storage/ndb}/test/src/UtilTransactions.cpp (100%) rename {ndb => storage/ndb}/test/src/getarg.c (100%) rename {ndb => storage/ndb}/test/tools/Makefile.am (100%) rename {ndb => storage/ndb}/test/tools/copy_tab.cpp (100%) rename {ndb => storage/ndb}/test/tools/cpcc.cpp (100%) rename {ndb => storage/ndb}/test/tools/create_index.cpp (100%) rename {ndb => storage/ndb}/test/tools/hugoCalculator.cpp (100%) rename {ndb => storage/ndb}/test/tools/hugoFill.cpp (100%) rename {ndb => storage/ndb}/test/tools/hugoLoad.cpp (100%) rename {ndb => storage/ndb}/test/tools/hugoLockRecords.cpp (100%) rename {ndb => storage/ndb}/test/tools/hugoPkDelete.cpp (100%) rename {ndb => storage/ndb}/test/tools/hugoPkRead.cpp (100%) rename {ndb => storage/ndb}/test/tools/hugoPkReadRecord.cpp (100%) rename {ndb => storage/ndb}/test/tools/hugoPkUpdate.cpp (100%) rename {ndb => storage/ndb}/test/tools/hugoScanRead.cpp (100%) rename {ndb => storage/ndb}/test/tools/hugoScanUpdate.cpp (100%) rename {ndb => storage/ndb}/test/tools/old_dirs/hugoCalculator/Makefile (100%) rename {ndb => storage/ndb}/test/tools/old_dirs/hugoFill/Makefile (100%) rename {ndb => storage/ndb}/test/tools/old_dirs/hugoLoad/Makefile (100%) rename {ndb => storage/ndb}/test/tools/old_dirs/hugoLockRecords/Makefile (100%) rename {ndb => storage/ndb}/test/tools/old_dirs/hugoPkDelete/Makefile (100%) rename {ndb => storage/ndb}/test/tools/old_dirs/hugoPkRead/Makefile (100%) rename {ndb => storage/ndb}/test/tools/old_dirs/hugoPkReadRecord/Makefile (100%) rename {ndb => storage/ndb}/test/tools/old_dirs/hugoPkUpdate/Makefile (100%) rename {ndb => storage/ndb}/test/tools/old_dirs/hugoScanRead/Makefile (100%) rename {ndb => storage/ndb}/test/tools/old_dirs/hugoScanUpdate/Makefile (100%) rename {ndb => storage/ndb}/test/tools/old_dirs/restart/Makefile (100%) rename {ndb => storage/ndb}/test/tools/old_dirs/transproxy/Makefile (100%) rename {ndb => storage/ndb}/test/tools/old_dirs/verify_index/Makefile (100%) rename {ndb => storage/ndb}/test/tools/old_dirs/waiter/waiter.cpp (100%) rename {ndb => storage/ndb}/test/tools/restart.cpp (100%) rename {ndb => storage/ndb}/test/tools/transproxy.cpp (100%) rename {ndb => storage/ndb}/test/tools/verify_index.cpp (100%) rename {ndb => storage/ndb}/tools/Makefile.am (100%) rename {ndb => storage/ndb}/tools/clean-links.sh (100%) rename {ndb => storage/ndb}/tools/delete_all.cpp (100%) rename {ndb => storage/ndb}/tools/desc.cpp (100%) rename {ndb => storage/ndb}/tools/drop_index.cpp (100%) rename {ndb => storage/ndb}/tools/drop_tab.cpp (100%) rename {ndb => storage/ndb}/tools/listTables.cpp (100%) rename {ndb => storage/ndb}/tools/make-errors.pl (100%) rename {ndb => storage/ndb}/tools/make-links.sh (100%) rename {ndb => storage/ndb}/tools/ndb_test_platform.cpp (100%) rename {ndb => storage/ndb}/tools/ndbsql.cpp (100%) rename {ndb => storage/ndb}/tools/old_dirs/copy_tab/Makefile (100%) rename {ndb => storage/ndb}/tools/old_dirs/cpcc/Makefile (100%) rename {ndb => storage/ndb}/tools/old_dirs/create_index/Makefile (100%) rename {ndb => storage/ndb}/tools/old_dirs/delete_all/Makefile (100%) rename {ndb => storage/ndb}/tools/old_dirs/desc/Makefile (100%) rename {ndb => storage/ndb}/tools/old_dirs/drop_index/Makefile (100%) rename {ndb => storage/ndb}/tools/old_dirs/drop_tab/Makefile (100%) rename {ndb => storage/ndb}/tools/old_dirs/list_tables/Makefile (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/Makefile.PL (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Net.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Net/Base.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Net/Client.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Net/Command.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Net/Config.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Net/Database.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Net/Env.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Net/Node.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Net/NodeApi.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Net/NodeDb.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Net/NodeMgmt.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Net/Server.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Net/ServerINET.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Net/ServerUNIX.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Run.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Run/Base.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Run/Database.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Run/Env.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Run/Node.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Util.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Util/Base.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Util/Dir.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Util/Event.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Util/File.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Util/IO.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Util/Lock.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Util/Log.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Util/Socket.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Util/SocketINET.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/lib/NDB/Util/SocketUNIX.pm (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/ndbnet.pl (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/ndbnetd.pl (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbnet/ndbrun (100%) rename {ndb => storage/ndb}/tools/old_dirs/ndbsql/Makefile (100%) rename {ndb => storage/ndb}/tools/old_dirs/select_all/Makefile (100%) rename {ndb => storage/ndb}/tools/old_dirs/select_count/Makefile (100%) rename {ndb => storage/ndb}/tools/old_dirs/src/counterviewer/CounterViewer.java (100%) rename {ndb => storage/ndb}/tools/restore/Restore.cpp (100%) rename {ndb => storage/ndb}/tools/restore/Restore.hpp (100%) rename {ndb => storage/ndb}/tools/restore/consumer.cpp (100%) rename {ndb => storage/ndb}/tools/restore/consumer.hpp (100%) rename {ndb => storage/ndb}/tools/restore/consumer_printer.cpp (100%) rename {ndb => storage/ndb}/tools/restore/consumer_printer.hpp (100%) rename {ndb => storage/ndb}/tools/restore/consumer_restore.cpp (100%) rename {ndb => storage/ndb}/tools/restore/consumer_restore.hpp (100%) rename {ndb => storage/ndb}/tools/restore/consumer_restorem.cpp (100%) rename {ndb => storage/ndb}/tools/restore/restore_main.cpp (100%) rename {ndb => storage/ndb}/tools/rgrep (100%) rename {ndb => storage/ndb}/tools/select_all.cpp (100%) rename {ndb => storage/ndb}/tools/select_count.cpp (100%) rename {ndb => storage/ndb}/tools/waiter.cpp (100%) diff --git a/bdb/LICENSE b/storage/bdb/LICENSE similarity index 100% rename from bdb/LICENSE rename to storage/bdb/LICENSE diff --git a/bdb/Makefile.in b/storage/bdb/Makefile.in similarity index 100% rename from bdb/Makefile.in rename to storage/bdb/Makefile.in diff --git a/bdb/btree/bt_compare.c b/storage/bdb/btree/bt_compare.c similarity index 100% rename from bdb/btree/bt_compare.c rename to storage/bdb/btree/bt_compare.c diff --git a/bdb/btree/bt_conv.c b/storage/bdb/btree/bt_conv.c similarity index 100% rename from bdb/btree/bt_conv.c rename to storage/bdb/btree/bt_conv.c diff --git a/bdb/btree/bt_curadj.c b/storage/bdb/btree/bt_curadj.c similarity index 100% rename from bdb/btree/bt_curadj.c rename to storage/bdb/btree/bt_curadj.c diff --git a/bdb/btree/bt_cursor.c b/storage/bdb/btree/bt_cursor.c similarity index 100% rename from bdb/btree/bt_cursor.c rename to storage/bdb/btree/bt_cursor.c diff --git a/bdb/btree/bt_delete.c b/storage/bdb/btree/bt_delete.c similarity index 100% rename from bdb/btree/bt_delete.c rename to storage/bdb/btree/bt_delete.c diff --git a/bdb/btree/bt_method.c b/storage/bdb/btree/bt_method.c similarity index 100% rename from bdb/btree/bt_method.c rename to storage/bdb/btree/bt_method.c diff --git a/bdb/btree/bt_open.c b/storage/bdb/btree/bt_open.c similarity index 100% rename from bdb/btree/bt_open.c rename to storage/bdb/btree/bt_open.c diff --git a/bdb/btree/bt_put.c b/storage/bdb/btree/bt_put.c similarity index 100% rename from bdb/btree/bt_put.c rename to storage/bdb/btree/bt_put.c diff --git a/bdb/btree/bt_rec.c b/storage/bdb/btree/bt_rec.c similarity index 100% rename from bdb/btree/bt_rec.c rename to storage/bdb/btree/bt_rec.c diff --git a/bdb/btree/bt_reclaim.c b/storage/bdb/btree/bt_reclaim.c similarity index 100% rename from bdb/btree/bt_reclaim.c rename to storage/bdb/btree/bt_reclaim.c diff --git a/bdb/btree/bt_recno.c b/storage/bdb/btree/bt_recno.c similarity index 100% rename from bdb/btree/bt_recno.c rename to storage/bdb/btree/bt_recno.c diff --git a/bdb/btree/bt_rsearch.c b/storage/bdb/btree/bt_rsearch.c similarity index 100% rename from bdb/btree/bt_rsearch.c rename to storage/bdb/btree/bt_rsearch.c diff --git a/bdb/btree/bt_search.c b/storage/bdb/btree/bt_search.c similarity index 100% rename from bdb/btree/bt_search.c rename to storage/bdb/btree/bt_search.c diff --git a/bdb/btree/bt_split.c b/storage/bdb/btree/bt_split.c similarity index 100% rename from bdb/btree/bt_split.c rename to storage/bdb/btree/bt_split.c diff --git a/bdb/btree/bt_stat.c b/storage/bdb/btree/bt_stat.c similarity index 100% rename from bdb/btree/bt_stat.c rename to storage/bdb/btree/bt_stat.c diff --git a/bdb/btree/bt_upgrade.c b/storage/bdb/btree/bt_upgrade.c similarity index 100% rename from bdb/btree/bt_upgrade.c rename to storage/bdb/btree/bt_upgrade.c diff --git a/bdb/btree/bt_verify.c b/storage/bdb/btree/bt_verify.c similarity index 100% rename from bdb/btree/bt_verify.c rename to storage/bdb/btree/bt_verify.c diff --git a/bdb/btree/btree.src b/storage/bdb/btree/btree.src similarity index 100% rename from bdb/btree/btree.src rename to storage/bdb/btree/btree.src diff --git a/bdb/build_unix/.IGNORE_ME b/storage/bdb/build_unix/.IGNORE_ME similarity index 100% rename from bdb/build_unix/.IGNORE_ME rename to storage/bdb/build_unix/.IGNORE_ME diff --git a/bdb/build_vxworks/BerkeleyDB.wsp b/storage/bdb/build_vxworks/BerkeleyDB.wsp similarity index 100% rename from bdb/build_vxworks/BerkeleyDB.wsp rename to storage/bdb/build_vxworks/BerkeleyDB.wsp diff --git a/bdb/build_vxworks/dbdemo/README b/storage/bdb/build_vxworks/dbdemo/README similarity index 100% rename from bdb/build_vxworks/dbdemo/README rename to storage/bdb/build_vxworks/dbdemo/README diff --git a/bdb/build_win32/Berkeley_DB.dsw b/storage/bdb/build_win32/Berkeley_DB.dsw similarity index 100% rename from bdb/build_win32/Berkeley_DB.dsw rename to storage/bdb/build_win32/Berkeley_DB.dsw diff --git a/bdb/build_win32/app_dsp.src b/storage/bdb/build_win32/app_dsp.src similarity index 100% rename from bdb/build_win32/app_dsp.src rename to storage/bdb/build_win32/app_dsp.src diff --git a/bdb/build_win32/build_all.dsp b/storage/bdb/build_win32/build_all.dsp similarity index 100% rename from bdb/build_win32/build_all.dsp rename to 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 similarity index 100% rename from bdb/build_win32/db_java_xa.dsp rename to 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 similarity index 100% rename from bdb/build_win32/db_java_xaj.mak rename to 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 similarity index 100% rename from bdb/build_win32/db_lib.dsp rename to storage/bdb/build_win32/db_lib.dsp diff --git a/bdb/build_win32/db_test.src b/storage/bdb/build_win32/db_test.src similarity index 100% rename from bdb/build_win32/db_test.src rename to storage/bdb/build_win32/db_test.src diff --git a/bdb/build_win32/dbkill.cpp b/storage/bdb/build_win32/dbkill.cpp similarity index 100% rename from bdb/build_win32/dbkill.cpp rename to storage/bdb/build_win32/dbkill.cpp diff --git a/bdb/build_win32/dllmain.c b/storage/bdb/build_win32/dllmain.c similarity index 100% rename from bdb/build_win32/dllmain.c rename to storage/bdb/build_win32/dllmain.c diff --git a/bdb/build_win32/dynamic_dsp.src b/storage/bdb/build_win32/dynamic_dsp.src similarity index 100% rename from bdb/build_win32/dynamic_dsp.src rename to storage/bdb/build_win32/dynamic_dsp.src diff --git a/bdb/build_win32/java_dsp.src b/storage/bdb/build_win32/java_dsp.src similarity index 100% rename from bdb/build_win32/java_dsp.src rename to storage/bdb/build_win32/java_dsp.src diff --git a/bdb/build_win32/libdb_tcl.def b/storage/bdb/build_win32/libdb_tcl.def similarity index 100% rename from bdb/build_win32/libdb_tcl.def rename to storage/bdb/build_win32/libdb_tcl.def diff --git a/bdb/build_win32/libdbrc.src b/storage/bdb/build_win32/libdbrc.src similarity index 100% rename from bdb/build_win32/libdbrc.src rename to storage/bdb/build_win32/libdbrc.src diff --git a/bdb/build_win32/srcfile_dsp.src b/storage/bdb/build_win32/srcfile_dsp.src similarity index 100% rename from bdb/build_win32/srcfile_dsp.src rename to storage/bdb/build_win32/srcfile_dsp.src diff --git a/bdb/build_win32/static_dsp.src b/storage/bdb/build_win32/static_dsp.src similarity index 100% rename from bdb/build_win32/static_dsp.src rename to storage/bdb/build_win32/static_dsp.src diff --git a/bdb/build_win32/tcl_dsp.src b/storage/bdb/build_win32/tcl_dsp.src similarity index 100% rename from bdb/build_win32/tcl_dsp.src rename to storage/bdb/build_win32/tcl_dsp.src diff --git a/bdb/clib/getcwd.c b/storage/bdb/clib/getcwd.c similarity index 100% rename from bdb/clib/getcwd.c rename to storage/bdb/clib/getcwd.c diff --git a/bdb/clib/getopt.c b/storage/bdb/clib/getopt.c similarity index 100% rename from bdb/clib/getopt.c rename to storage/bdb/clib/getopt.c diff --git a/bdb/clib/memcmp.c b/storage/bdb/clib/memcmp.c similarity index 100% rename from bdb/clib/memcmp.c rename to storage/bdb/clib/memcmp.c diff --git a/bdb/clib/memmove.c b/storage/bdb/clib/memmove.c similarity index 100% rename from bdb/clib/memmove.c rename to storage/bdb/clib/memmove.c diff --git a/bdb/clib/raise.c b/storage/bdb/clib/raise.c similarity index 100% rename from bdb/clib/raise.c rename to storage/bdb/clib/raise.c diff --git a/bdb/clib/snprintf.c b/storage/bdb/clib/snprintf.c similarity index 100% rename from bdb/clib/snprintf.c rename to storage/bdb/clib/snprintf.c diff --git a/bdb/clib/strcasecmp.c b/storage/bdb/clib/strcasecmp.c similarity index 100% rename from bdb/clib/strcasecmp.c rename to storage/bdb/clib/strcasecmp.c diff --git a/bdb/clib/strdup.c b/storage/bdb/clib/strdup.c similarity index 100% rename from bdb/clib/strdup.c rename to storage/bdb/clib/strdup.c diff --git a/bdb/clib/strerror.c b/storage/bdb/clib/strerror.c similarity index 100% rename from bdb/clib/strerror.c rename to storage/bdb/clib/strerror.c diff --git a/bdb/clib/vsnprintf.c b/storage/bdb/clib/vsnprintf.c similarity index 100% rename from bdb/clib/vsnprintf.c rename to storage/bdb/clib/vsnprintf.c diff --git a/bdb/common/db_byteorder.c b/storage/bdb/common/db_byteorder.c similarity index 100% rename from bdb/common/db_byteorder.c rename to storage/bdb/common/db_byteorder.c diff --git a/bdb/common/db_err.c b/storage/bdb/common/db_err.c similarity index 100% rename from bdb/common/db_err.c rename to storage/bdb/common/db_err.c diff --git a/bdb/common/db_getlong.c b/storage/bdb/common/db_getlong.c similarity index 100% rename from bdb/common/db_getlong.c rename to storage/bdb/common/db_getlong.c diff --git a/bdb/common/db_idspace.c b/storage/bdb/common/db_idspace.c similarity index 100% rename from bdb/common/db_idspace.c rename to storage/bdb/common/db_idspace.c diff --git a/bdb/common/db_log2.c b/storage/bdb/common/db_log2.c similarity index 100% rename from bdb/common/db_log2.c rename to storage/bdb/common/db_log2.c diff --git a/bdb/common/util_arg.c b/storage/bdb/common/util_arg.c similarity index 100% rename from bdb/common/util_arg.c rename to storage/bdb/common/util_arg.c diff --git a/bdb/common/util_cache.c b/storage/bdb/common/util_cache.c similarity index 100% rename from bdb/common/util_cache.c rename to storage/bdb/common/util_cache.c diff --git a/bdb/common/util_log.c b/storage/bdb/common/util_log.c similarity index 100% rename from bdb/common/util_log.c rename to storage/bdb/common/util_log.c diff --git a/bdb/common/util_sig.c b/storage/bdb/common/util_sig.c similarity index 100% rename from bdb/common/util_sig.c rename to storage/bdb/common/util_sig.c diff --git a/bdb/cxx/cxx_db.cpp b/storage/bdb/cxx/cxx_db.cpp similarity index 100% rename from bdb/cxx/cxx_db.cpp rename to storage/bdb/cxx/cxx_db.cpp diff --git a/bdb/cxx/cxx_dbc.cpp b/storage/bdb/cxx/cxx_dbc.cpp similarity index 100% rename from bdb/cxx/cxx_dbc.cpp rename to storage/bdb/cxx/cxx_dbc.cpp diff --git a/bdb/cxx/cxx_dbt.cpp b/storage/bdb/cxx/cxx_dbt.cpp similarity index 100% rename from bdb/cxx/cxx_dbt.cpp rename to storage/bdb/cxx/cxx_dbt.cpp diff --git a/bdb/cxx/cxx_env.cpp b/storage/bdb/cxx/cxx_env.cpp similarity index 100% rename from bdb/cxx/cxx_env.cpp rename to storage/bdb/cxx/cxx_env.cpp diff --git a/bdb/cxx/cxx_except.cpp b/storage/bdb/cxx/cxx_except.cpp similarity index 100% rename from bdb/cxx/cxx_except.cpp rename to storage/bdb/cxx/cxx_except.cpp diff --git a/bdb/cxx/cxx_lock.cpp b/storage/bdb/cxx/cxx_lock.cpp similarity index 100% rename from bdb/cxx/cxx_lock.cpp rename to storage/bdb/cxx/cxx_lock.cpp diff --git a/bdb/cxx/cxx_logc.cpp b/storage/bdb/cxx/cxx_logc.cpp similarity index 100% rename from bdb/cxx/cxx_logc.cpp rename to storage/bdb/cxx/cxx_logc.cpp diff --git a/bdb/cxx/cxx_mpool.cpp b/storage/bdb/cxx/cxx_mpool.cpp similarity index 100% rename from bdb/cxx/cxx_mpool.cpp rename to storage/bdb/cxx/cxx_mpool.cpp diff --git a/bdb/cxx/cxx_txn.cpp b/storage/bdb/cxx/cxx_txn.cpp similarity index 100% rename from bdb/cxx/cxx_txn.cpp rename to storage/bdb/cxx/cxx_txn.cpp diff --git a/bdb/db/crdel.src b/storage/bdb/db/crdel.src similarity index 100% rename from bdb/db/crdel.src rename to storage/bdb/db/crdel.src diff --git a/bdb/db/crdel_rec.c b/storage/bdb/db/crdel_rec.c similarity index 100% rename from bdb/db/crdel_rec.c rename to storage/bdb/db/crdel_rec.c diff --git a/bdb/db/db.c b/storage/bdb/db/db.c similarity index 100% rename from bdb/db/db.c rename to storage/bdb/db/db.c diff --git a/bdb/db/db.src b/storage/bdb/db/db.src similarity index 100% rename from bdb/db/db.src rename to storage/bdb/db/db.src diff --git a/bdb/db/db_am.c b/storage/bdb/db/db_am.c similarity index 100% rename from bdb/db/db_am.c rename to storage/bdb/db/db_am.c diff --git a/bdb/db/db_cam.c b/storage/bdb/db/db_cam.c similarity index 100% rename from bdb/db/db_cam.c rename to storage/bdb/db/db_cam.c diff --git a/bdb/db/db_conv.c b/storage/bdb/db/db_conv.c similarity index 100% rename from bdb/db/db_conv.c rename to storage/bdb/db/db_conv.c diff --git a/bdb/db/db_dispatch.c b/storage/bdb/db/db_dispatch.c similarity index 100% rename from bdb/db/db_dispatch.c rename to storage/bdb/db/db_dispatch.c diff --git a/bdb/db/db_dup.c b/storage/bdb/db/db_dup.c similarity index 100% rename from bdb/db/db_dup.c rename to storage/bdb/db/db_dup.c diff --git a/bdb/db/db_iface.c b/storage/bdb/db/db_iface.c similarity index 100% rename from bdb/db/db_iface.c rename to storage/bdb/db/db_iface.c diff --git a/bdb/db/db_join.c b/storage/bdb/db/db_join.c similarity index 100% rename from bdb/db/db_join.c rename to storage/bdb/db/db_join.c diff --git a/bdb/db/db_meta.c b/storage/bdb/db/db_meta.c similarity index 100% rename from bdb/db/db_meta.c rename to storage/bdb/db/db_meta.c diff --git a/bdb/db/db_method.c b/storage/bdb/db/db_method.c similarity index 100% rename from bdb/db/db_method.c rename to storage/bdb/db/db_method.c diff --git a/bdb/db/db_open.c b/storage/bdb/db/db_open.c similarity index 100% rename from bdb/db/db_open.c rename to storage/bdb/db/db_open.c diff --git a/bdb/db/db_overflow.c b/storage/bdb/db/db_overflow.c similarity index 100% rename from bdb/db/db_overflow.c rename to storage/bdb/db/db_overflow.c diff --git a/bdb/db/db_pr.c b/storage/bdb/db/db_pr.c similarity index 100% rename from bdb/db/db_pr.c rename to storage/bdb/db/db_pr.c diff --git a/bdb/db/db_rec.c b/storage/bdb/db/db_rec.c similarity index 100% rename from bdb/db/db_rec.c rename to storage/bdb/db/db_rec.c diff --git a/bdb/db/db_reclaim.c b/storage/bdb/db/db_reclaim.c similarity index 100% rename from bdb/db/db_reclaim.c rename to storage/bdb/db/db_reclaim.c diff --git a/bdb/db/db_remove.c b/storage/bdb/db/db_remove.c similarity index 100% rename from bdb/db/db_remove.c rename to storage/bdb/db/db_remove.c diff --git a/bdb/db/db_rename.c b/storage/bdb/db/db_rename.c similarity index 100% rename from bdb/db/db_rename.c rename to storage/bdb/db/db_rename.c diff --git a/bdb/db/db_ret.c b/storage/bdb/db/db_ret.c similarity index 100% rename from bdb/db/db_ret.c rename to storage/bdb/db/db_ret.c diff --git a/bdb/db/db_truncate.c b/storage/bdb/db/db_truncate.c similarity index 100% rename from bdb/db/db_truncate.c rename to storage/bdb/db/db_truncate.c diff --git a/bdb/db/db_upg.c b/storage/bdb/db/db_upg.c similarity index 100% rename from bdb/db/db_upg.c rename to storage/bdb/db/db_upg.c diff --git a/bdb/db/db_upg_opd.c b/storage/bdb/db/db_upg_opd.c similarity index 100% rename from bdb/db/db_upg_opd.c rename to storage/bdb/db/db_upg_opd.c diff --git a/bdb/db/db_vrfy.c b/storage/bdb/db/db_vrfy.c similarity index 100% rename from bdb/db/db_vrfy.c rename to storage/bdb/db/db_vrfy.c diff --git a/bdb/db/db_vrfyutil.c b/storage/bdb/db/db_vrfyutil.c similarity index 100% rename from bdb/db/db_vrfyutil.c rename to storage/bdb/db/db_vrfyutil.c diff --git a/bdb/db185/db185.c b/storage/bdb/db185/db185.c similarity index 100% rename from bdb/db185/db185.c rename to storage/bdb/db185/db185.c diff --git a/bdb/db185/db185_int.in b/storage/bdb/db185/db185_int.in similarity index 100% rename from bdb/db185/db185_int.in rename to storage/bdb/db185/db185_int.in diff --git a/bdb/db_archive/db_archive.c b/storage/bdb/db_archive/db_archive.c similarity index 100% rename from bdb/db_archive/db_archive.c rename to storage/bdb/db_archive/db_archive.c diff --git a/bdb/db_checkpoint/db_checkpoint.c b/storage/bdb/db_checkpoint/db_checkpoint.c similarity index 100% rename from bdb/db_checkpoint/db_checkpoint.c rename to storage/bdb/db_checkpoint/db_checkpoint.c diff --git a/bdb/db_deadlock/db_deadlock.c b/storage/bdb/db_deadlock/db_deadlock.c similarity index 100% rename from bdb/db_deadlock/db_deadlock.c rename to storage/bdb/db_deadlock/db_deadlock.c diff --git a/bdb/db_dump/db_dump.c b/storage/bdb/db_dump/db_dump.c similarity index 100% rename from bdb/db_dump/db_dump.c rename to storage/bdb/db_dump/db_dump.c diff --git a/bdb/db_dump185/db_dump185.c b/storage/bdb/db_dump185/db_dump185.c similarity index 100% rename from bdb/db_dump185/db_dump185.c rename to storage/bdb/db_dump185/db_dump185.c diff --git a/bdb/db_load/db_load.c b/storage/bdb/db_load/db_load.c similarity index 100% rename from bdb/db_load/db_load.c rename to storage/bdb/db_load/db_load.c diff --git a/bdb/db_printlog/README b/storage/bdb/db_printlog/README similarity index 100% rename from bdb/db_printlog/README rename to storage/bdb/db_printlog/README diff --git a/bdb/db_printlog/commit.awk b/storage/bdb/db_printlog/commit.awk similarity index 100% rename from bdb/db_printlog/commit.awk rename to storage/bdb/db_printlog/commit.awk diff --git a/bdb/db_printlog/count.awk b/storage/bdb/db_printlog/count.awk similarity index 100% rename from bdb/db_printlog/count.awk rename to storage/bdb/db_printlog/count.awk diff --git a/bdb/db_printlog/db_printlog.c b/storage/bdb/db_printlog/db_printlog.c similarity index 100% rename from bdb/db_printlog/db_printlog.c rename to storage/bdb/db_printlog/db_printlog.c diff --git a/bdb/db_printlog/dbname.awk b/storage/bdb/db_printlog/dbname.awk similarity index 100% rename from bdb/db_printlog/dbname.awk rename to storage/bdb/db_printlog/dbname.awk diff --git a/bdb/db_printlog/fileid.awk b/storage/bdb/db_printlog/fileid.awk similarity index 100% rename from bdb/db_printlog/fileid.awk rename to storage/bdb/db_printlog/fileid.awk diff --git a/bdb/db_printlog/logstat.awk b/storage/bdb/db_printlog/logstat.awk similarity index 100% rename from bdb/db_printlog/logstat.awk rename to storage/bdb/db_printlog/logstat.awk diff --git a/bdb/db_printlog/pgno.awk b/storage/bdb/db_printlog/pgno.awk similarity index 100% rename from bdb/db_printlog/pgno.awk rename to storage/bdb/db_printlog/pgno.awk diff --git a/bdb/db_printlog/range.awk b/storage/bdb/db_printlog/range.awk similarity index 100% rename from bdb/db_printlog/range.awk rename to storage/bdb/db_printlog/range.awk diff --git a/bdb/db_printlog/rectype.awk b/storage/bdb/db_printlog/rectype.awk similarity index 100% rename from bdb/db_printlog/rectype.awk rename to storage/bdb/db_printlog/rectype.awk diff --git a/bdb/db_printlog/status.awk b/storage/bdb/db_printlog/status.awk similarity index 100% rename from bdb/db_printlog/status.awk rename to storage/bdb/db_printlog/status.awk diff --git a/bdb/db_printlog/txn.awk b/storage/bdb/db_printlog/txn.awk similarity index 100% rename from bdb/db_printlog/txn.awk rename to storage/bdb/db_printlog/txn.awk diff --git a/bdb/db_recover/db_recover.c b/storage/bdb/db_recover/db_recover.c similarity index 100% rename from bdb/db_recover/db_recover.c rename to storage/bdb/db_recover/db_recover.c diff --git a/bdb/db_stat/db_stat.c b/storage/bdb/db_stat/db_stat.c similarity index 100% rename from bdb/db_stat/db_stat.c rename to storage/bdb/db_stat/db_stat.c diff --git a/bdb/db_upgrade/db_upgrade.c b/storage/bdb/db_upgrade/db_upgrade.c similarity index 100% rename from bdb/db_upgrade/db_upgrade.c rename to storage/bdb/db_upgrade/db_upgrade.c diff --git a/bdb/db_verify/db_verify.c b/storage/bdb/db_verify/db_verify.c similarity index 100% rename from bdb/db_verify/db_verify.c rename to storage/bdb/db_verify/db_verify.c diff --git a/bdb/dbinc/btree.h b/storage/bdb/dbinc/btree.h similarity index 100% rename from bdb/dbinc/btree.h rename to storage/bdb/dbinc/btree.h diff --git a/bdb/dbinc/crypto.h b/storage/bdb/dbinc/crypto.h similarity index 100% rename from bdb/dbinc/crypto.h rename to storage/bdb/dbinc/crypto.h diff --git a/bdb/dbinc/cxx_common.h b/storage/bdb/dbinc/cxx_common.h similarity index 100% rename from bdb/dbinc/cxx_common.h rename to storage/bdb/dbinc/cxx_common.h diff --git a/bdb/dbinc/cxx_except.h b/storage/bdb/dbinc/cxx_except.h similarity index 100% rename from bdb/dbinc/cxx_except.h rename to storage/bdb/dbinc/cxx_except.h diff --git a/bdb/dbinc/cxx_int.h b/storage/bdb/dbinc/cxx_int.h similarity index 100% rename from bdb/dbinc/cxx_int.h rename to storage/bdb/dbinc/cxx_int.h diff --git a/bdb/dbinc/db.in b/storage/bdb/dbinc/db.in similarity index 100% rename from bdb/dbinc/db.in rename to storage/bdb/dbinc/db.in diff --git a/bdb/dbinc/db_185.in b/storage/bdb/dbinc/db_185.in similarity index 100% rename from bdb/dbinc/db_185.in rename to storage/bdb/dbinc/db_185.in diff --git a/bdb/dbinc/db_am.h b/storage/bdb/dbinc/db_am.h similarity index 100% rename from bdb/dbinc/db_am.h rename to storage/bdb/dbinc/db_am.h diff --git a/bdb/dbinc/db_cxx.in b/storage/bdb/dbinc/db_cxx.in similarity index 100% rename from bdb/dbinc/db_cxx.in rename to storage/bdb/dbinc/db_cxx.in diff --git a/bdb/dbinc/db_dispatch.h b/storage/bdb/dbinc/db_dispatch.h similarity index 100% rename from bdb/dbinc/db_dispatch.h rename to storage/bdb/dbinc/db_dispatch.h diff --git a/bdb/dbinc/db_int.in b/storage/bdb/dbinc/db_int.in similarity index 100% rename from bdb/dbinc/db_int.in rename to storage/bdb/dbinc/db_int.in diff --git a/bdb/dbinc/db_join.h b/storage/bdb/dbinc/db_join.h similarity index 100% rename from bdb/dbinc/db_join.h rename to storage/bdb/dbinc/db_join.h diff --git a/bdb/dbinc/db_page.h b/storage/bdb/dbinc/db_page.h similarity index 100% rename from bdb/dbinc/db_page.h rename to storage/bdb/dbinc/db_page.h diff --git a/bdb/dbinc/db_server_int.h b/storage/bdb/dbinc/db_server_int.h similarity index 100% rename from bdb/dbinc/db_server_int.h rename to storage/bdb/dbinc/db_server_int.h diff --git a/bdb/dbinc/db_shash.h b/storage/bdb/dbinc/db_shash.h similarity index 100% rename from bdb/dbinc/db_shash.h rename to storage/bdb/dbinc/db_shash.h diff --git a/bdb/dbinc/db_swap.h b/storage/bdb/dbinc/db_swap.h similarity index 100% rename from bdb/dbinc/db_swap.h rename to storage/bdb/dbinc/db_swap.h diff --git a/bdb/dbinc/db_upgrade.h b/storage/bdb/dbinc/db_upgrade.h similarity index 100% rename from bdb/dbinc/db_upgrade.h rename to storage/bdb/dbinc/db_upgrade.h diff --git a/bdb/dbinc/db_verify.h b/storage/bdb/dbinc/db_verify.h similarity index 100% rename from bdb/dbinc/db_verify.h rename to storage/bdb/dbinc/db_verify.h diff --git a/bdb/dbinc/debug.h b/storage/bdb/dbinc/debug.h similarity index 100% rename from bdb/dbinc/debug.h rename to storage/bdb/dbinc/debug.h diff --git a/bdb/dbinc/fop.h b/storage/bdb/dbinc/fop.h similarity index 100% rename from bdb/dbinc/fop.h rename to storage/bdb/dbinc/fop.h diff --git a/bdb/dbinc/globals.h b/storage/bdb/dbinc/globals.h similarity index 100% rename from bdb/dbinc/globals.h rename to storage/bdb/dbinc/globals.h diff --git a/bdb/dbinc/hash.h b/storage/bdb/dbinc/hash.h similarity index 100% rename from bdb/dbinc/hash.h rename to storage/bdb/dbinc/hash.h diff --git a/bdb/dbinc/hmac.h b/storage/bdb/dbinc/hmac.h similarity index 100% rename from bdb/dbinc/hmac.h rename to storage/bdb/dbinc/hmac.h diff --git a/bdb/dbinc/lock.h b/storage/bdb/dbinc/lock.h similarity index 100% rename from bdb/dbinc/lock.h rename to storage/bdb/dbinc/lock.h diff --git a/bdb/dbinc/log.h b/storage/bdb/dbinc/log.h similarity index 100% rename from bdb/dbinc/log.h rename to storage/bdb/dbinc/log.h diff --git a/bdb/dbinc/mp.h b/storage/bdb/dbinc/mp.h similarity index 100% rename from bdb/dbinc/mp.h rename to storage/bdb/dbinc/mp.h diff --git a/bdb/dbinc/mutex.h b/storage/bdb/dbinc/mutex.h similarity index 100% rename from bdb/dbinc/mutex.h rename to storage/bdb/dbinc/mutex.h diff --git a/bdb/dbinc/os.h b/storage/bdb/dbinc/os.h similarity index 100% rename from bdb/dbinc/os.h rename to storage/bdb/dbinc/os.h diff --git a/bdb/dbinc/qam.h b/storage/bdb/dbinc/qam.h similarity index 100% rename from bdb/dbinc/qam.h rename to storage/bdb/dbinc/qam.h diff --git a/bdb/dbinc/queue.h b/storage/bdb/dbinc/queue.h similarity index 100% rename from bdb/dbinc/queue.h rename to storage/bdb/dbinc/queue.h diff --git a/bdb/dbinc/region.h b/storage/bdb/dbinc/region.h similarity index 100% rename from bdb/dbinc/region.h rename to storage/bdb/dbinc/region.h diff --git a/bdb/dbinc/rep.h b/storage/bdb/dbinc/rep.h similarity index 100% rename from bdb/dbinc/rep.h rename to storage/bdb/dbinc/rep.h diff --git a/bdb/dbinc/shqueue.h b/storage/bdb/dbinc/shqueue.h similarity index 100% rename from bdb/dbinc/shqueue.h rename to storage/bdb/dbinc/shqueue.h diff --git a/bdb/dbinc/tcl_db.h b/storage/bdb/dbinc/tcl_db.h similarity index 100% rename from bdb/dbinc/tcl_db.h rename to storage/bdb/dbinc/tcl_db.h diff --git a/bdb/dbinc/txn.h b/storage/bdb/dbinc/txn.h similarity index 100% rename from bdb/dbinc/txn.h rename to storage/bdb/dbinc/txn.h diff --git a/bdb/dbinc/xa.h b/storage/bdb/dbinc/xa.h similarity index 100% rename from bdb/dbinc/xa.h rename to storage/bdb/dbinc/xa.h diff --git a/bdb/dbm/dbm.c b/storage/bdb/dbm/dbm.c similarity index 100% rename from bdb/dbm/dbm.c rename to storage/bdb/dbm/dbm.c diff --git a/bdb/dbreg/dbreg.c b/storage/bdb/dbreg/dbreg.c similarity index 100% rename from bdb/dbreg/dbreg.c rename to storage/bdb/dbreg/dbreg.c diff --git a/bdb/dbreg/dbreg.src b/storage/bdb/dbreg/dbreg.src similarity index 100% rename from bdb/dbreg/dbreg.src rename to storage/bdb/dbreg/dbreg.src diff --git a/bdb/dbreg/dbreg_rec.c b/storage/bdb/dbreg/dbreg_rec.c similarity index 100% rename from bdb/dbreg/dbreg_rec.c rename to storage/bdb/dbreg/dbreg_rec.c diff --git a/bdb/dbreg/dbreg_util.c b/storage/bdb/dbreg/dbreg_util.c similarity index 100% rename from bdb/dbreg/dbreg_util.c rename to storage/bdb/dbreg/dbreg_util.c diff --git a/bdb/dist/Makefile.in b/storage/bdb/dist/Makefile.in similarity index 100% rename from bdb/dist/Makefile.in rename to storage/bdb/dist/Makefile.in diff --git a/bdb/dist/RELEASE b/storage/bdb/dist/RELEASE similarity index 100% rename from bdb/dist/RELEASE rename to storage/bdb/dist/RELEASE diff --git a/bdb/dist/aclocal/config.ac b/storage/bdb/dist/aclocal/config.ac similarity index 100% rename from bdb/dist/aclocal/config.ac rename to storage/bdb/dist/aclocal/config.ac diff --git a/bdb/dist/aclocal/cxx.ac b/storage/bdb/dist/aclocal/cxx.ac similarity index 100% rename from bdb/dist/aclocal/cxx.ac rename to storage/bdb/dist/aclocal/cxx.ac diff --git a/bdb/dist/aclocal/gcc.ac b/storage/bdb/dist/aclocal/gcc.ac similarity index 100% rename from bdb/dist/aclocal/gcc.ac rename to storage/bdb/dist/aclocal/gcc.ac diff --git a/bdb/dist/aclocal/libtool.ac b/storage/bdb/dist/aclocal/libtool.ac similarity index 100% rename from bdb/dist/aclocal/libtool.ac rename to storage/bdb/dist/aclocal/libtool.ac diff --git a/bdb/dist/aclocal/mutex.ac b/storage/bdb/dist/aclocal/mutex.ac similarity index 100% rename from bdb/dist/aclocal/mutex.ac rename to storage/bdb/dist/aclocal/mutex.ac diff --git a/bdb/dist/aclocal/options.ac b/storage/bdb/dist/aclocal/options.ac similarity index 100% rename from bdb/dist/aclocal/options.ac rename to storage/bdb/dist/aclocal/options.ac diff --git a/bdb/dist/aclocal/programs.ac b/storage/bdb/dist/aclocal/programs.ac similarity index 100% rename from bdb/dist/aclocal/programs.ac rename to storage/bdb/dist/aclocal/programs.ac diff --git a/bdb/dist/aclocal/sosuffix.ac b/storage/bdb/dist/aclocal/sosuffix.ac similarity index 100% rename from bdb/dist/aclocal/sosuffix.ac rename to storage/bdb/dist/aclocal/sosuffix.ac diff --git a/bdb/dist/aclocal/tcl.ac b/storage/bdb/dist/aclocal/tcl.ac similarity index 100% rename from bdb/dist/aclocal/tcl.ac rename to storage/bdb/dist/aclocal/tcl.ac diff --git a/bdb/dist/aclocal/types.ac b/storage/bdb/dist/aclocal/types.ac similarity index 100% rename from bdb/dist/aclocal/types.ac rename to 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 similarity index 100% rename from bdb/dist/aclocal_java/ac_check_class.ac rename to 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 similarity index 100% rename from bdb/dist/aclocal_java/ac_check_classpath.ac rename to 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 similarity index 100% rename from bdb/dist/aclocal_java/ac_check_junit.ac rename to 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 similarity index 100% rename from bdb/dist/aclocal_java/ac_check_rqrd_class.ac rename to 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 similarity index 100% rename from bdb/dist/aclocal_java/ac_java_options.ac rename to 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 similarity index 100% rename from bdb/dist/aclocal_java/ac_jni_include_dirs.ac rename to 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 similarity index 100% rename from bdb/dist/aclocal_java/ac_prog_jar.ac rename to 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 similarity index 100% rename from bdb/dist/aclocal_java/ac_prog_java.ac rename to 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 similarity index 100% rename from bdb/dist/aclocal_java/ac_prog_java_works.ac rename to 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 similarity index 100% rename from bdb/dist/aclocal_java/ac_prog_javac.ac rename to 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 similarity index 100% rename from bdb/dist/aclocal_java/ac_prog_javac_works.ac rename to 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 similarity index 100% rename from bdb/dist/aclocal_java/ac_prog_javadoc.ac rename to 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 similarity index 100% rename from bdb/dist/aclocal_java/ac_prog_javah.ac rename to 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 similarity index 100% rename from bdb/dist/aclocal_java/ac_try_compile_java.ac rename to 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 similarity index 100% rename from bdb/dist/aclocal_java/ac_try_run_javac.ac rename to storage/bdb/dist/aclocal_java/ac_try_run_javac.ac diff --git a/bdb/dist/buildrel b/storage/bdb/dist/buildrel similarity index 100% rename from bdb/dist/buildrel rename to storage/bdb/dist/buildrel diff --git a/bdb/dist/config.guess b/storage/bdb/dist/config.guess similarity index 100% rename from bdb/dist/config.guess rename to storage/bdb/dist/config.guess diff --git a/bdb/dist/config.sub b/storage/bdb/dist/config.sub similarity index 100% rename from bdb/dist/config.sub rename to storage/bdb/dist/config.sub diff --git a/bdb/dist/configure.ac b/storage/bdb/dist/configure.ac similarity index 100% rename from bdb/dist/configure.ac rename to storage/bdb/dist/configure.ac diff --git a/bdb/dist/db.ecd.in b/storage/bdb/dist/db.ecd.in similarity index 100% rename from bdb/dist/db.ecd.in rename to storage/bdb/dist/db.ecd.in diff --git a/bdb/dist/db.spec.in b/storage/bdb/dist/db.spec.in similarity index 100% rename from bdb/dist/db.spec.in rename to storage/bdb/dist/db.spec.in diff --git a/bdb/dist/gen_inc.awk b/storage/bdb/dist/gen_inc.awk similarity index 100% rename from bdb/dist/gen_inc.awk rename to storage/bdb/dist/gen_inc.awk diff --git a/bdb/dist/gen_rec.awk b/storage/bdb/dist/gen_rec.awk similarity index 100% rename from bdb/dist/gen_rec.awk rename to storage/bdb/dist/gen_rec.awk diff --git a/bdb/dist/gen_rpc.awk b/storage/bdb/dist/gen_rpc.awk similarity index 100% rename from bdb/dist/gen_rpc.awk rename to storage/bdb/dist/gen_rpc.awk diff --git a/bdb/dist/install-sh b/storage/bdb/dist/install-sh similarity index 100% rename from bdb/dist/install-sh rename to storage/bdb/dist/install-sh diff --git a/bdb/dist/ltmain.sh b/storage/bdb/dist/ltmain.sh similarity index 100% rename from bdb/dist/ltmain.sh rename to storage/bdb/dist/ltmain.sh diff --git a/bdb/dist/pubdef.in b/storage/bdb/dist/pubdef.in similarity index 100% rename from bdb/dist/pubdef.in rename to storage/bdb/dist/pubdef.in diff --git a/bdb/dist/s_all b/storage/bdb/dist/s_all similarity index 100% rename from bdb/dist/s_all rename to storage/bdb/dist/s_all diff --git a/bdb/dist/s_config b/storage/bdb/dist/s_config similarity index 100% rename from bdb/dist/s_config rename to storage/bdb/dist/s_config diff --git a/bdb/dist/s_crypto b/storage/bdb/dist/s_crypto similarity index 100% rename from bdb/dist/s_crypto rename to storage/bdb/dist/s_crypto diff --git a/bdb/dist/s_dir b/storage/bdb/dist/s_dir similarity index 100% rename from bdb/dist/s_dir rename to storage/bdb/dist/s_dir diff --git a/bdb/dist/s_include b/storage/bdb/dist/s_include similarity index 100% rename from bdb/dist/s_include rename to storage/bdb/dist/s_include diff --git a/bdb/dist/s_java b/storage/bdb/dist/s_java similarity index 100% rename from bdb/dist/s_java rename to storage/bdb/dist/s_java diff --git a/bdb/dist/s_javah b/storage/bdb/dist/s_javah similarity index 100% rename from bdb/dist/s_javah rename to storage/bdb/dist/s_javah diff --git a/bdb/dist/s_perm b/storage/bdb/dist/s_perm similarity index 100% rename from bdb/dist/s_perm rename to storage/bdb/dist/s_perm diff --git a/bdb/dist/s_readme b/storage/bdb/dist/s_readme similarity index 100% rename from bdb/dist/s_readme rename to storage/bdb/dist/s_readme diff --git a/bdb/dist/s_recover b/storage/bdb/dist/s_recover similarity index 100% rename from bdb/dist/s_recover rename to storage/bdb/dist/s_recover diff --git a/bdb/dist/s_rpc b/storage/bdb/dist/s_rpc similarity index 100% rename from bdb/dist/s_rpc rename to storage/bdb/dist/s_rpc diff --git a/bdb/dist/s_symlink b/storage/bdb/dist/s_symlink similarity index 100% rename from bdb/dist/s_symlink rename to storage/bdb/dist/s_symlink diff --git a/bdb/dist/s_tags b/storage/bdb/dist/s_tags similarity index 100% rename from bdb/dist/s_tags rename to storage/bdb/dist/s_tags diff --git a/bdb/dist/s_test b/storage/bdb/dist/s_test similarity index 100% rename from bdb/dist/s_test rename to storage/bdb/dist/s_test diff --git a/bdb/dist/s_vxworks b/storage/bdb/dist/s_vxworks similarity index 100% rename from bdb/dist/s_vxworks rename to storage/bdb/dist/s_vxworks diff --git a/bdb/dist/s_win32 b/storage/bdb/dist/s_win32 similarity index 100% rename from bdb/dist/s_win32 rename to storage/bdb/dist/s_win32 diff --git a/bdb/dist/s_win32_dsp b/storage/bdb/dist/s_win32_dsp similarity index 100% rename from bdb/dist/s_win32_dsp rename to storage/bdb/dist/s_win32_dsp diff --git a/bdb/dist/srcfiles.in b/storage/bdb/dist/srcfiles.in similarity index 100% rename from bdb/dist/srcfiles.in rename to storage/bdb/dist/srcfiles.in diff --git a/bdb/dist/template/rec_ctemp b/storage/bdb/dist/template/rec_ctemp similarity index 100% rename from bdb/dist/template/rec_ctemp rename to 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 similarity index 100% rename from bdb/dist/vx_2.0/BerkeleyDB.wpj rename to 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 similarity index 100% rename from bdb/dist/vx_2.0/wpj.in rename to 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 similarity index 100% rename from bdb/dist/vx_3.1/Makefile.custom rename to 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 similarity index 100% rename from bdb/dist/vx_3.1/cdf.1 rename to 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 similarity index 100% rename from bdb/dist/vx_3.1/cdf.2 rename to 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 similarity index 100% rename from bdb/dist/vx_3.1/cdf.3 rename to 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 similarity index 100% rename from bdb/dist/vx_3.1/component.cdf rename to 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 similarity index 100% rename from bdb/dist/vx_3.1/component.wpj rename to 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 similarity index 100% rename from bdb/dist/vx_3.1/wpj.1 rename to 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 similarity index 100% rename from bdb/dist/vx_3.1/wpj.2 rename to 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 similarity index 100% rename from bdb/dist/vx_3.1/wpj.3 rename to 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 similarity index 100% rename from bdb/dist/vx_3.1/wpj.4 rename to 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 similarity index 100% rename from bdb/dist/vx_3.1/wpj.5 rename to storage/bdb/dist/vx_3.1/wpj.5 diff --git a/bdb/dist/vx_buildcd b/storage/bdb/dist/vx_buildcd similarity index 100% rename from bdb/dist/vx_buildcd rename to storage/bdb/dist/vx_buildcd diff --git a/bdb/dist/vx_config.in b/storage/bdb/dist/vx_config.in similarity index 100% rename from bdb/dist/vx_config.in rename to storage/bdb/dist/vx_config.in diff --git a/bdb/dist/vx_setup/CONFIG.in b/storage/bdb/dist/vx_setup/CONFIG.in similarity index 100% rename from bdb/dist/vx_setup/CONFIG.in rename to storage/bdb/dist/vx_setup/CONFIG.in diff --git a/bdb/dist/vx_setup/LICENSE.TXT b/storage/bdb/dist/vx_setup/LICENSE.TXT similarity index 100% rename from bdb/dist/vx_setup/LICENSE.TXT rename to storage/bdb/dist/vx_setup/LICENSE.TXT diff --git a/bdb/dist/vx_setup/MESSAGES.TCL b/storage/bdb/dist/vx_setup/MESSAGES.TCL similarity index 100% rename from bdb/dist/vx_setup/MESSAGES.TCL rename to storage/bdb/dist/vx_setup/MESSAGES.TCL diff --git a/bdb/dist/vx_setup/README.in b/storage/bdb/dist/vx_setup/README.in similarity index 100% rename from bdb/dist/vx_setup/README.in rename to storage/bdb/dist/vx_setup/README.in diff --git a/bdb/dist/vx_setup/SETUP.BMP b/storage/bdb/dist/vx_setup/SETUP.BMP similarity index 100% rename from bdb/dist/vx_setup/SETUP.BMP rename to 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 similarity index 100% rename from bdb/dist/vx_setup/vx_allfile.in rename to 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 similarity index 100% rename from bdb/dist/vx_setup/vx_demofile.in rename to 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 similarity index 100% rename from bdb/dist/vx_setup/vx_setup.in rename to storage/bdb/dist/vx_setup/vx_setup.in diff --git a/bdb/dist/win_config.in b/storage/bdb/dist/win_config.in similarity index 100% rename from bdb/dist/win_config.in rename to storage/bdb/dist/win_config.in diff --git a/bdb/dist/win_exports.in b/storage/bdb/dist/win_exports.in similarity index 100% rename from bdb/dist/win_exports.in rename to storage/bdb/dist/win_exports.in diff --git a/bdb/env/db_salloc.c b/storage/bdb/env/db_salloc.c similarity index 100% rename from bdb/env/db_salloc.c rename to storage/bdb/env/db_salloc.c diff --git a/bdb/env/db_shash.c b/storage/bdb/env/db_shash.c similarity index 100% rename from bdb/env/db_shash.c rename to storage/bdb/env/db_shash.c diff --git a/bdb/env/env_file.c b/storage/bdb/env/env_file.c similarity index 100% rename from bdb/env/env_file.c rename to storage/bdb/env/env_file.c diff --git a/bdb/env/env_method.c b/storage/bdb/env/env_method.c similarity index 100% rename from bdb/env/env_method.c rename to storage/bdb/env/env_method.c diff --git a/bdb/env/env_method.c.b b/storage/bdb/env/env_method.c.b similarity index 100% rename from bdb/env/env_method.c.b rename to storage/bdb/env/env_method.c.b diff --git a/bdb/env/env_open.c b/storage/bdb/env/env_open.c similarity index 100% rename from bdb/env/env_open.c rename to storage/bdb/env/env_open.c diff --git a/bdb/env/env_recover.c b/storage/bdb/env/env_recover.c similarity index 100% rename from bdb/env/env_recover.c rename to storage/bdb/env/env_recover.c diff --git a/bdb/env/env_region.c b/storage/bdb/env/env_region.c similarity index 100% rename from bdb/env/env_region.c rename to storage/bdb/env/env_region.c diff --git a/bdb/fileops/fileops.src b/storage/bdb/fileops/fileops.src similarity index 100% rename from bdb/fileops/fileops.src rename to storage/bdb/fileops/fileops.src diff --git a/bdb/fileops/fop_basic.c b/storage/bdb/fileops/fop_basic.c similarity index 100% rename from bdb/fileops/fop_basic.c rename to storage/bdb/fileops/fop_basic.c diff --git a/bdb/fileops/fop_rec.c b/storage/bdb/fileops/fop_rec.c similarity index 100% rename from bdb/fileops/fop_rec.c rename to storage/bdb/fileops/fop_rec.c diff --git a/bdb/fileops/fop_util.c b/storage/bdb/fileops/fop_util.c similarity index 100% rename from bdb/fileops/fop_util.c rename to storage/bdb/fileops/fop_util.c diff --git a/bdb/hash/hash.c b/storage/bdb/hash/hash.c similarity index 100% rename from bdb/hash/hash.c rename to storage/bdb/hash/hash.c diff --git a/bdb/hash/hash.src b/storage/bdb/hash/hash.src similarity index 100% rename from bdb/hash/hash.src rename to storage/bdb/hash/hash.src diff --git a/bdb/hash/hash_conv.c b/storage/bdb/hash/hash_conv.c similarity index 100% rename from bdb/hash/hash_conv.c rename to storage/bdb/hash/hash_conv.c diff --git a/bdb/hash/hash_dup.c b/storage/bdb/hash/hash_dup.c similarity index 100% rename from bdb/hash/hash_dup.c rename to storage/bdb/hash/hash_dup.c diff --git a/bdb/hash/hash_func.c b/storage/bdb/hash/hash_func.c similarity index 100% rename from bdb/hash/hash_func.c rename to storage/bdb/hash/hash_func.c diff --git a/bdb/hash/hash_meta.c b/storage/bdb/hash/hash_meta.c similarity index 100% rename from bdb/hash/hash_meta.c rename to storage/bdb/hash/hash_meta.c diff --git a/bdb/hash/hash_method.c b/storage/bdb/hash/hash_method.c similarity index 100% rename from bdb/hash/hash_method.c rename to storage/bdb/hash/hash_method.c diff --git a/bdb/hash/hash_open.c b/storage/bdb/hash/hash_open.c similarity index 100% rename from bdb/hash/hash_open.c rename to storage/bdb/hash/hash_open.c diff --git a/bdb/hash/hash_page.c b/storage/bdb/hash/hash_page.c similarity index 100% rename from bdb/hash/hash_page.c rename to storage/bdb/hash/hash_page.c diff --git a/bdb/hash/hash_rec.c b/storage/bdb/hash/hash_rec.c similarity index 100% rename from bdb/hash/hash_rec.c rename to storage/bdb/hash/hash_rec.c diff --git a/bdb/hash/hash_reclaim.c b/storage/bdb/hash/hash_reclaim.c similarity index 100% rename from bdb/hash/hash_reclaim.c rename to storage/bdb/hash/hash_reclaim.c diff --git a/bdb/hash/hash_stat.c b/storage/bdb/hash/hash_stat.c similarity index 100% rename from bdb/hash/hash_stat.c rename to storage/bdb/hash/hash_stat.c diff --git a/bdb/hash/hash_upgrade.c b/storage/bdb/hash/hash_upgrade.c similarity index 100% rename from bdb/hash/hash_upgrade.c rename to storage/bdb/hash/hash_upgrade.c diff --git a/bdb/hash/hash_verify.c b/storage/bdb/hash/hash_verify.c similarity index 100% rename from bdb/hash/hash_verify.c rename to storage/bdb/hash/hash_verify.c diff --git a/bdb/hmac/hmac.c b/storage/bdb/hmac/hmac.c similarity index 100% rename from bdb/hmac/hmac.c rename to storage/bdb/hmac/hmac.c diff --git a/bdb/hmac/sha1.c b/storage/bdb/hmac/sha1.c similarity index 100% rename from bdb/hmac/sha1.c rename to storage/bdb/hmac/sha1.c diff --git a/bdb/hsearch/hsearch.c b/storage/bdb/hsearch/hsearch.c similarity index 100% rename from bdb/hsearch/hsearch.c rename to storage/bdb/hsearch/hsearch.c diff --git a/bdb/libdb_java/checkapi.prl b/storage/bdb/libdb_java/checkapi.prl similarity index 100% rename from bdb/libdb_java/checkapi.prl rename to 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 similarity index 100% rename from bdb/libdb_java/com_sleepycat_db_Db.h rename to 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 similarity index 100% rename from bdb/libdb_java/com_sleepycat_db_DbEnv.h rename to 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 similarity index 100% rename from bdb/libdb_java/com_sleepycat_db_DbLock.h rename to 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 similarity index 100% rename from bdb/libdb_java/com_sleepycat_db_DbLogc.h rename to 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 similarity index 100% rename from bdb/libdb_java/com_sleepycat_db_DbLsn.h rename to 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 similarity index 100% rename from bdb/libdb_java/com_sleepycat_db_DbTxn.h rename to 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 similarity index 100% rename from bdb/libdb_java/com_sleepycat_db_DbUtil.h rename to 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 similarity index 100% rename from bdb/libdb_java/com_sleepycat_db_Dbc.h rename to 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 similarity index 100% rename from bdb/libdb_java/com_sleepycat_db_Dbt.h rename to 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 similarity index 100% rename from bdb/libdb_java/com_sleepycat_db_xa_DbXAResource.h rename to 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 similarity index 100% rename from bdb/libdb_java/java_Db.c rename to storage/bdb/libdb_java/java_Db.c diff --git a/bdb/libdb_java/java_DbEnv.c b/storage/bdb/libdb_java/java_DbEnv.c similarity index 100% rename from bdb/libdb_java/java_DbEnv.c rename to storage/bdb/libdb_java/java_DbEnv.c diff --git a/bdb/libdb_java/java_DbLock.c b/storage/bdb/libdb_java/java_DbLock.c similarity index 100% rename from bdb/libdb_java/java_DbLock.c rename to storage/bdb/libdb_java/java_DbLock.c diff --git a/bdb/libdb_java/java_DbLogc.c b/storage/bdb/libdb_java/java_DbLogc.c similarity index 100% rename from bdb/libdb_java/java_DbLogc.c rename to storage/bdb/libdb_java/java_DbLogc.c diff --git a/bdb/libdb_java/java_DbLsn.c b/storage/bdb/libdb_java/java_DbLsn.c similarity index 100% rename from bdb/libdb_java/java_DbLsn.c rename to storage/bdb/libdb_java/java_DbLsn.c diff --git a/bdb/libdb_java/java_DbTxn.c b/storage/bdb/libdb_java/java_DbTxn.c similarity index 100% rename from bdb/libdb_java/java_DbTxn.c rename to storage/bdb/libdb_java/java_DbTxn.c diff --git a/bdb/libdb_java/java_DbUtil.c b/storage/bdb/libdb_java/java_DbUtil.c similarity index 100% rename from bdb/libdb_java/java_DbUtil.c rename to storage/bdb/libdb_java/java_DbUtil.c diff --git a/bdb/libdb_java/java_DbXAResource.c b/storage/bdb/libdb_java/java_DbXAResource.c similarity index 100% rename from bdb/libdb_java/java_DbXAResource.c rename to storage/bdb/libdb_java/java_DbXAResource.c diff --git a/bdb/libdb_java/java_Dbc.c b/storage/bdb/libdb_java/java_Dbc.c similarity index 100% rename from bdb/libdb_java/java_Dbc.c rename to storage/bdb/libdb_java/java_Dbc.c diff --git a/bdb/libdb_java/java_Dbt.c b/storage/bdb/libdb_java/java_Dbt.c similarity index 100% rename from bdb/libdb_java/java_Dbt.c rename to storage/bdb/libdb_java/java_Dbt.c diff --git a/bdb/libdb_java/java_info.c b/storage/bdb/libdb_java/java_info.c similarity index 100% rename from bdb/libdb_java/java_info.c rename to storage/bdb/libdb_java/java_info.c diff --git a/bdb/libdb_java/java_info.h b/storage/bdb/libdb_java/java_info.h similarity index 100% rename from bdb/libdb_java/java_info.h rename to storage/bdb/libdb_java/java_info.h diff --git a/bdb/libdb_java/java_locked.c b/storage/bdb/libdb_java/java_locked.c similarity index 100% rename from bdb/libdb_java/java_locked.c rename to storage/bdb/libdb_java/java_locked.c diff --git a/bdb/libdb_java/java_locked.h b/storage/bdb/libdb_java/java_locked.h similarity index 100% rename from bdb/libdb_java/java_locked.h rename to storage/bdb/libdb_java/java_locked.h diff --git a/bdb/libdb_java/java_util.c b/storage/bdb/libdb_java/java_util.c similarity index 100% rename from bdb/libdb_java/java_util.c rename to storage/bdb/libdb_java/java_util.c diff --git a/bdb/libdb_java/java_util.h b/storage/bdb/libdb_java/java_util.h similarity index 100% rename from bdb/libdb_java/java_util.h rename to storage/bdb/libdb_java/java_util.h diff --git a/bdb/lock/Design b/storage/bdb/lock/Design similarity index 100% rename from bdb/lock/Design rename to storage/bdb/lock/Design diff --git a/bdb/lock/lock.c b/storage/bdb/lock/lock.c similarity index 100% rename from bdb/lock/lock.c rename to storage/bdb/lock/lock.c diff --git a/bdb/lock/lock_deadlock.c b/storage/bdb/lock/lock_deadlock.c similarity index 100% rename from bdb/lock/lock_deadlock.c rename to storage/bdb/lock/lock_deadlock.c diff --git a/bdb/lock/lock_method.c b/storage/bdb/lock/lock_method.c similarity index 100% rename from bdb/lock/lock_method.c rename to storage/bdb/lock/lock_method.c diff --git a/bdb/lock/lock_region.c b/storage/bdb/lock/lock_region.c similarity index 100% rename from bdb/lock/lock_region.c rename to storage/bdb/lock/lock_region.c diff --git a/bdb/lock/lock_stat.c b/storage/bdb/lock/lock_stat.c similarity index 100% rename from bdb/lock/lock_stat.c rename to storage/bdb/lock/lock_stat.c diff --git a/bdb/lock/lock_util.c b/storage/bdb/lock/lock_util.c similarity index 100% rename from bdb/lock/lock_util.c rename to storage/bdb/lock/lock_util.c diff --git a/bdb/log/log.c b/storage/bdb/log/log.c similarity index 100% rename from bdb/log/log.c rename to storage/bdb/log/log.c diff --git a/bdb/log/log_archive.c b/storage/bdb/log/log_archive.c similarity index 100% rename from bdb/log/log_archive.c rename to storage/bdb/log/log_archive.c diff --git a/bdb/log/log_compare.c b/storage/bdb/log/log_compare.c similarity index 100% rename from bdb/log/log_compare.c rename to storage/bdb/log/log_compare.c diff --git a/bdb/log/log_get.c b/storage/bdb/log/log_get.c similarity index 100% rename from bdb/log/log_get.c rename to storage/bdb/log/log_get.c diff --git a/bdb/log/log_method.c b/storage/bdb/log/log_method.c similarity index 100% rename from bdb/log/log_method.c rename to storage/bdb/log/log_method.c diff --git a/bdb/log/log_put.c b/storage/bdb/log/log_put.c similarity index 100% rename from bdb/log/log_put.c rename to storage/bdb/log/log_put.c diff --git a/bdb/mp/mp_alloc.c b/storage/bdb/mp/mp_alloc.c similarity index 100% rename from bdb/mp/mp_alloc.c rename to storage/bdb/mp/mp_alloc.c diff --git a/bdb/mp/mp_bh.c b/storage/bdb/mp/mp_bh.c similarity index 100% rename from bdb/mp/mp_bh.c rename to storage/bdb/mp/mp_bh.c diff --git a/bdb/mp/mp_fget.c b/storage/bdb/mp/mp_fget.c similarity index 100% rename from bdb/mp/mp_fget.c rename to storage/bdb/mp/mp_fget.c diff --git a/bdb/mp/mp_fopen.c b/storage/bdb/mp/mp_fopen.c similarity index 100% rename from bdb/mp/mp_fopen.c rename to storage/bdb/mp/mp_fopen.c diff --git a/bdb/mp/mp_fput.c b/storage/bdb/mp/mp_fput.c similarity index 100% rename from bdb/mp/mp_fput.c rename to storage/bdb/mp/mp_fput.c diff --git a/bdb/mp/mp_fset.c b/storage/bdb/mp/mp_fset.c similarity index 100% rename from bdb/mp/mp_fset.c rename to storage/bdb/mp/mp_fset.c diff --git a/bdb/mp/mp_method.c b/storage/bdb/mp/mp_method.c similarity index 100% rename from bdb/mp/mp_method.c rename to storage/bdb/mp/mp_method.c diff --git a/bdb/mp/mp_region.c b/storage/bdb/mp/mp_region.c similarity index 100% rename from bdb/mp/mp_region.c rename to storage/bdb/mp/mp_region.c diff --git a/bdb/mp/mp_register.c b/storage/bdb/mp/mp_register.c similarity index 100% rename from bdb/mp/mp_register.c rename to storage/bdb/mp/mp_register.c diff --git a/bdb/mp/mp_stat.c b/storage/bdb/mp/mp_stat.c similarity index 100% rename from bdb/mp/mp_stat.c rename to storage/bdb/mp/mp_stat.c diff --git a/bdb/mp/mp_sync.c b/storage/bdb/mp/mp_sync.c similarity index 100% rename from bdb/mp/mp_sync.c rename to storage/bdb/mp/mp_sync.c diff --git a/bdb/mp/mp_trickle.c b/storage/bdb/mp/mp_trickle.c similarity index 100% rename from bdb/mp/mp_trickle.c rename to storage/bdb/mp/mp_trickle.c diff --git a/bdb/mutex/README b/storage/bdb/mutex/README similarity index 100% rename from bdb/mutex/README rename to storage/bdb/mutex/README diff --git a/bdb/mutex/mut_fcntl.c b/storage/bdb/mutex/mut_fcntl.c similarity index 100% rename from bdb/mutex/mut_fcntl.c rename to storage/bdb/mutex/mut_fcntl.c diff --git a/bdb/mutex/mut_pthread.c b/storage/bdb/mutex/mut_pthread.c similarity index 100% rename from bdb/mutex/mut_pthread.c rename to storage/bdb/mutex/mut_pthread.c diff --git a/bdb/mutex/mut_tas.c b/storage/bdb/mutex/mut_tas.c similarity index 100% rename from bdb/mutex/mut_tas.c rename to storage/bdb/mutex/mut_tas.c diff --git a/bdb/mutex/mut_win32.c b/storage/bdb/mutex/mut_win32.c similarity index 100% rename from bdb/mutex/mut_win32.c rename to storage/bdb/mutex/mut_win32.c diff --git a/bdb/mutex/mutex.c b/storage/bdb/mutex/mutex.c similarity index 100% rename from bdb/mutex/mutex.c rename to storage/bdb/mutex/mutex.c diff --git a/bdb/mutex/tm.c b/storage/bdb/mutex/tm.c similarity index 100% rename from bdb/mutex/tm.c rename to storage/bdb/mutex/tm.c diff --git a/bdb/mutex/uts4_cc.s b/storage/bdb/mutex/uts4_cc.s similarity index 100% rename from bdb/mutex/uts4_cc.s rename to storage/bdb/mutex/uts4_cc.s diff --git a/bdb/os/os_abs.c b/storage/bdb/os/os_abs.c similarity index 100% rename from bdb/os/os_abs.c rename to storage/bdb/os/os_abs.c diff --git a/bdb/os/os_alloc.c b/storage/bdb/os/os_alloc.c similarity index 100% rename from bdb/os/os_alloc.c rename to storage/bdb/os/os_alloc.c diff --git a/bdb/os/os_clock.c b/storage/bdb/os/os_clock.c similarity index 100% rename from bdb/os/os_clock.c rename to storage/bdb/os/os_clock.c diff --git a/bdb/os/os_config.c b/storage/bdb/os/os_config.c similarity index 100% rename from bdb/os/os_config.c rename to storage/bdb/os/os_config.c diff --git a/bdb/os/os_dir.c b/storage/bdb/os/os_dir.c similarity index 100% rename from bdb/os/os_dir.c rename to storage/bdb/os/os_dir.c diff --git a/bdb/os/os_errno.c b/storage/bdb/os/os_errno.c similarity index 100% rename from bdb/os/os_errno.c rename to storage/bdb/os/os_errno.c diff --git a/bdb/os/os_fid.c b/storage/bdb/os/os_fid.c similarity index 100% rename from bdb/os/os_fid.c rename to storage/bdb/os/os_fid.c diff --git a/bdb/os/os_fsync.c b/storage/bdb/os/os_fsync.c similarity index 100% rename from bdb/os/os_fsync.c rename to storage/bdb/os/os_fsync.c diff --git a/bdb/os/os_handle.c b/storage/bdb/os/os_handle.c similarity index 100% rename from bdb/os/os_handle.c rename to storage/bdb/os/os_handle.c diff --git a/bdb/os/os_id.c b/storage/bdb/os/os_id.c similarity index 100% rename from bdb/os/os_id.c rename to storage/bdb/os/os_id.c diff --git a/bdb/os/os_map.c b/storage/bdb/os/os_map.c similarity index 100% rename from bdb/os/os_map.c rename to storage/bdb/os/os_map.c diff --git a/bdb/os/os_method.c b/storage/bdb/os/os_method.c similarity index 100% rename from bdb/os/os_method.c rename to storage/bdb/os/os_method.c diff --git a/bdb/os/os_oflags.c b/storage/bdb/os/os_oflags.c similarity index 100% rename from bdb/os/os_oflags.c rename to storage/bdb/os/os_oflags.c diff --git a/bdb/os/os_open.c b/storage/bdb/os/os_open.c similarity index 100% rename from bdb/os/os_open.c rename to storage/bdb/os/os_open.c diff --git a/bdb/os/os_region.c b/storage/bdb/os/os_region.c similarity index 100% rename from bdb/os/os_region.c rename to storage/bdb/os/os_region.c diff --git a/bdb/os/os_rename.c b/storage/bdb/os/os_rename.c similarity index 100% rename from bdb/os/os_rename.c rename to storage/bdb/os/os_rename.c diff --git a/bdb/os/os_root.c b/storage/bdb/os/os_root.c similarity index 100% rename from bdb/os/os_root.c rename to storage/bdb/os/os_root.c diff --git a/bdb/os/os_rpath.c b/storage/bdb/os/os_rpath.c similarity index 100% rename from bdb/os/os_rpath.c rename to storage/bdb/os/os_rpath.c diff --git a/bdb/os/os_rw.c b/storage/bdb/os/os_rw.c similarity index 100% rename from bdb/os/os_rw.c rename to storage/bdb/os/os_rw.c diff --git a/bdb/os/os_seek.c b/storage/bdb/os/os_seek.c similarity index 100% rename from bdb/os/os_seek.c rename to storage/bdb/os/os_seek.c diff --git a/bdb/os/os_sleep.c b/storage/bdb/os/os_sleep.c similarity index 100% rename from bdb/os/os_sleep.c rename to storage/bdb/os/os_sleep.c diff --git a/bdb/os/os_spin.c b/storage/bdb/os/os_spin.c similarity index 100% rename from bdb/os/os_spin.c rename to storage/bdb/os/os_spin.c diff --git a/bdb/os/os_stat.c b/storage/bdb/os/os_stat.c similarity index 100% rename from bdb/os/os_stat.c rename to storage/bdb/os/os_stat.c diff --git a/bdb/os/os_tmpdir.c b/storage/bdb/os/os_tmpdir.c similarity index 100% rename from bdb/os/os_tmpdir.c rename to storage/bdb/os/os_tmpdir.c diff --git a/bdb/os/os_unlink.c b/storage/bdb/os/os_unlink.c similarity index 100% rename from bdb/os/os_unlink.c rename to 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 similarity index 100% rename from bdb/os_vxworks/os_vx_abs.c rename to 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 similarity index 100% rename from bdb/os_vxworks/os_vx_config.c rename to 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 similarity index 100% rename from bdb/os_vxworks/os_vx_map.c rename to 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 similarity index 100% rename from bdb/os_win32/os_abs.c rename to storage/bdb/os_win32/os_abs.c diff --git a/bdb/os_win32/os_clock.c b/storage/bdb/os_win32/os_clock.c similarity index 100% rename from bdb/os_win32/os_clock.c rename to storage/bdb/os_win32/os_clock.c diff --git a/bdb/os_win32/os_config.c b/storage/bdb/os_win32/os_config.c similarity index 100% rename from bdb/os_win32/os_config.c rename to storage/bdb/os_win32/os_config.c diff --git a/bdb/os_win32/os_dir.c b/storage/bdb/os_win32/os_dir.c similarity index 100% rename from bdb/os_win32/os_dir.c rename to storage/bdb/os_win32/os_dir.c diff --git a/bdb/os_win32/os_errno.c b/storage/bdb/os_win32/os_errno.c similarity index 100% rename from bdb/os_win32/os_errno.c rename to storage/bdb/os_win32/os_errno.c diff --git a/bdb/os_win32/os_fid.c b/storage/bdb/os_win32/os_fid.c similarity index 100% rename from bdb/os_win32/os_fid.c rename to storage/bdb/os_win32/os_fid.c diff --git a/bdb/os_win32/os_fsync.c b/storage/bdb/os_win32/os_fsync.c similarity index 100% rename from bdb/os_win32/os_fsync.c rename to storage/bdb/os_win32/os_fsync.c diff --git a/bdb/os_win32/os_handle.c b/storage/bdb/os_win32/os_handle.c similarity index 100% rename from bdb/os_win32/os_handle.c rename to storage/bdb/os_win32/os_handle.c diff --git a/bdb/os_win32/os_map.c b/storage/bdb/os_win32/os_map.c similarity index 100% rename from bdb/os_win32/os_map.c rename to storage/bdb/os_win32/os_map.c diff --git a/bdb/os_win32/os_open.c b/storage/bdb/os_win32/os_open.c similarity index 100% rename from bdb/os_win32/os_open.c rename to storage/bdb/os_win32/os_open.c diff --git a/bdb/os_win32/os_rename.c b/storage/bdb/os_win32/os_rename.c similarity index 100% rename from bdb/os_win32/os_rename.c rename to storage/bdb/os_win32/os_rename.c diff --git a/bdb/os_win32/os_rw.c b/storage/bdb/os_win32/os_rw.c similarity index 100% rename from bdb/os_win32/os_rw.c rename to storage/bdb/os_win32/os_rw.c diff --git a/bdb/os_win32/os_seek.c b/storage/bdb/os_win32/os_seek.c similarity index 100% rename from bdb/os_win32/os_seek.c rename to storage/bdb/os_win32/os_seek.c diff --git a/bdb/os_win32/os_sleep.c b/storage/bdb/os_win32/os_sleep.c similarity index 100% rename from bdb/os_win32/os_sleep.c rename to storage/bdb/os_win32/os_sleep.c diff --git a/bdb/os_win32/os_spin.c b/storage/bdb/os_win32/os_spin.c similarity index 100% rename from bdb/os_win32/os_spin.c rename to storage/bdb/os_win32/os_spin.c diff --git a/bdb/os_win32/os_stat.c b/storage/bdb/os_win32/os_stat.c similarity index 100% rename from bdb/os_win32/os_stat.c rename to storage/bdb/os_win32/os_stat.c diff --git a/bdb/os_win32/os_type.c b/storage/bdb/os_win32/os_type.c similarity index 100% rename from bdb/os_win32/os_type.c rename to storage/bdb/os_win32/os_type.c diff --git a/bdb/perl/BerkeleyDB/BerkeleyDB.pm b/storage/bdb/perl/BerkeleyDB/BerkeleyDB.pm similarity index 100% rename from bdb/perl/BerkeleyDB/BerkeleyDB.pm rename to storage/bdb/perl/BerkeleyDB/BerkeleyDB.pm diff --git a/bdb/perl/BerkeleyDB/BerkeleyDB.pod b/storage/bdb/perl/BerkeleyDB/BerkeleyDB.pod similarity index 100% rename from bdb/perl/BerkeleyDB/BerkeleyDB.pod rename to storage/bdb/perl/BerkeleyDB/BerkeleyDB.pod diff --git a/bdb/perl/BerkeleyDB/BerkeleyDB.pod.P b/storage/bdb/perl/BerkeleyDB/BerkeleyDB.pod.P similarity index 100% rename from bdb/perl/BerkeleyDB/BerkeleyDB.pod.P rename to storage/bdb/perl/BerkeleyDB/BerkeleyDB.pod.P diff --git a/bdb/perl/BerkeleyDB/BerkeleyDB.xs b/storage/bdb/perl/BerkeleyDB/BerkeleyDB.xs similarity index 100% rename from bdb/perl/BerkeleyDB/BerkeleyDB.xs rename to storage/bdb/perl/BerkeleyDB/BerkeleyDB.xs diff --git a/bdb/perl/BerkeleyDB/BerkeleyDB/Btree.pm b/storage/bdb/perl/BerkeleyDB/BerkeleyDB/Btree.pm similarity index 100% rename from bdb/perl/BerkeleyDB/BerkeleyDB/Btree.pm rename to storage/bdb/perl/BerkeleyDB/BerkeleyDB/Btree.pm diff --git a/bdb/perl/BerkeleyDB/BerkeleyDB/Hash.pm b/storage/bdb/perl/BerkeleyDB/BerkeleyDB/Hash.pm similarity index 100% rename from bdb/perl/BerkeleyDB/BerkeleyDB/Hash.pm rename to storage/bdb/perl/BerkeleyDB/BerkeleyDB/Hash.pm diff --git a/bdb/perl/BerkeleyDB/Changes b/storage/bdb/perl/BerkeleyDB/Changes similarity index 100% rename from bdb/perl/BerkeleyDB/Changes rename to storage/bdb/perl/BerkeleyDB/Changes diff --git a/bdb/perl/BerkeleyDB/MANIFEST b/storage/bdb/perl/BerkeleyDB/MANIFEST similarity index 100% rename from bdb/perl/BerkeleyDB/MANIFEST rename to storage/bdb/perl/BerkeleyDB/MANIFEST diff --git a/bdb/perl/BerkeleyDB/Makefile.PL b/storage/bdb/perl/BerkeleyDB/Makefile.PL similarity index 100% rename from bdb/perl/BerkeleyDB/Makefile.PL rename to storage/bdb/perl/BerkeleyDB/Makefile.PL diff --git a/bdb/perl/BerkeleyDB/README b/storage/bdb/perl/BerkeleyDB/README similarity index 100% rename from bdb/perl/BerkeleyDB/README rename to storage/bdb/perl/BerkeleyDB/README diff --git a/bdb/perl/BerkeleyDB/Todo b/storage/bdb/perl/BerkeleyDB/Todo similarity index 100% rename from bdb/perl/BerkeleyDB/Todo rename to storage/bdb/perl/BerkeleyDB/Todo diff --git a/bdb/perl/BerkeleyDB/config.in b/storage/bdb/perl/BerkeleyDB/config.in similarity index 100% rename from bdb/perl/BerkeleyDB/config.in rename to storage/bdb/perl/BerkeleyDB/config.in diff --git a/bdb/perl/BerkeleyDB/constants.h b/storage/bdb/perl/BerkeleyDB/constants.h similarity index 100% rename from bdb/perl/BerkeleyDB/constants.h rename to storage/bdb/perl/BerkeleyDB/constants.h diff --git a/bdb/perl/BerkeleyDB/constants.xs b/storage/bdb/perl/BerkeleyDB/constants.xs similarity index 100% rename from bdb/perl/BerkeleyDB/constants.xs rename to storage/bdb/perl/BerkeleyDB/constants.xs diff --git a/bdb/perl/BerkeleyDB/dbinfo b/storage/bdb/perl/BerkeleyDB/dbinfo similarity index 100% rename from bdb/perl/BerkeleyDB/dbinfo rename to storage/bdb/perl/BerkeleyDB/dbinfo diff --git a/bdb/perl/BerkeleyDB/hints/dec_osf.pl b/storage/bdb/perl/BerkeleyDB/hints/dec_osf.pl similarity index 100% rename from bdb/perl/BerkeleyDB/hints/dec_osf.pl rename to 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 similarity index 100% rename from bdb/perl/BerkeleyDB/hints/irix_6_5.pl rename to 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 similarity index 100% rename from bdb/perl/BerkeleyDB/hints/solaris.pl rename to storage/bdb/perl/BerkeleyDB/hints/solaris.pl diff --git a/bdb/perl/BerkeleyDB/mkconsts b/storage/bdb/perl/BerkeleyDB/mkconsts similarity index 100% rename from bdb/perl/BerkeleyDB/mkconsts rename to storage/bdb/perl/BerkeleyDB/mkconsts diff --git a/bdb/perl/BerkeleyDB/mkpod b/storage/bdb/perl/BerkeleyDB/mkpod similarity index 100% rename from bdb/perl/BerkeleyDB/mkpod rename to storage/bdb/perl/BerkeleyDB/mkpod diff --git a/bdb/perl/BerkeleyDB/patches/5.004 b/storage/bdb/perl/BerkeleyDB/patches/5.004 similarity index 100% rename from bdb/perl/BerkeleyDB/patches/5.004 rename to 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 similarity index 100% rename from bdb/perl/BerkeleyDB/patches/5.004_01 rename to 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 similarity index 100% rename from bdb/perl/BerkeleyDB/patches/5.004_02 rename to 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 similarity index 100% rename from bdb/perl/BerkeleyDB/patches/5.004_03 rename to 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 similarity index 100% rename from bdb/perl/BerkeleyDB/patches/5.004_04 rename to 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 similarity index 100% rename from bdb/perl/BerkeleyDB/patches/5.004_05 rename to 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 similarity index 100% rename from bdb/perl/BerkeleyDB/patches/5.005 rename to 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 similarity index 100% rename from bdb/perl/BerkeleyDB/patches/5.005_01 rename to 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 similarity index 100% rename from bdb/perl/BerkeleyDB/patches/5.005_02 rename to 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 similarity index 100% rename from bdb/perl/BerkeleyDB/patches/5.005_03 rename to 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 similarity index 100% rename from bdb/perl/BerkeleyDB/patches/5.6.0 rename to storage/bdb/perl/BerkeleyDB/patches/5.6.0 diff --git a/bdb/perl/BerkeleyDB/ppport.h b/storage/bdb/perl/BerkeleyDB/ppport.h similarity index 100% rename from bdb/perl/BerkeleyDB/ppport.h rename to storage/bdb/perl/BerkeleyDB/ppport.h diff --git a/bdb/perl/BerkeleyDB/scan b/storage/bdb/perl/BerkeleyDB/scan similarity index 100% rename from bdb/perl/BerkeleyDB/scan rename to storage/bdb/perl/BerkeleyDB/scan diff --git a/bdb/perl/BerkeleyDB/t/btree.t b/storage/bdb/perl/BerkeleyDB/t/btree.t similarity index 100% rename from bdb/perl/BerkeleyDB/t/btree.t rename to storage/bdb/perl/BerkeleyDB/t/btree.t diff --git a/bdb/perl/BerkeleyDB/t/destroy.t b/storage/bdb/perl/BerkeleyDB/t/destroy.t similarity index 100% rename from bdb/perl/BerkeleyDB/t/destroy.t rename to storage/bdb/perl/BerkeleyDB/t/destroy.t diff --git a/bdb/perl/BerkeleyDB/t/env.t b/storage/bdb/perl/BerkeleyDB/t/env.t similarity index 100% rename from bdb/perl/BerkeleyDB/t/env.t rename to storage/bdb/perl/BerkeleyDB/t/env.t diff --git a/bdb/perl/BerkeleyDB/t/examples.t b/storage/bdb/perl/BerkeleyDB/t/examples.t similarity index 100% rename from bdb/perl/BerkeleyDB/t/examples.t rename to 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 similarity index 100% rename from bdb/perl/BerkeleyDB/t/examples.t.T rename to 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 similarity index 100% rename from bdb/perl/BerkeleyDB/t/examples3.t rename to 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 similarity index 100% rename from bdb/perl/BerkeleyDB/t/examples3.t.T rename to 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 similarity index 100% rename from bdb/perl/BerkeleyDB/t/filter.t rename to storage/bdb/perl/BerkeleyDB/t/filter.t diff --git a/bdb/perl/BerkeleyDB/t/hash.t b/storage/bdb/perl/BerkeleyDB/t/hash.t similarity index 100% rename from bdb/perl/BerkeleyDB/t/hash.t rename to storage/bdb/perl/BerkeleyDB/t/hash.t diff --git a/bdb/perl/BerkeleyDB/t/join.t b/storage/bdb/perl/BerkeleyDB/t/join.t similarity index 100% rename from bdb/perl/BerkeleyDB/t/join.t rename to storage/bdb/perl/BerkeleyDB/t/join.t diff --git a/bdb/perl/BerkeleyDB/t/mldbm.t b/storage/bdb/perl/BerkeleyDB/t/mldbm.t similarity index 100% rename from bdb/perl/BerkeleyDB/t/mldbm.t rename to storage/bdb/perl/BerkeleyDB/t/mldbm.t diff --git a/bdb/perl/BerkeleyDB/t/queue.t b/storage/bdb/perl/BerkeleyDB/t/queue.t similarity index 100% rename from bdb/perl/BerkeleyDB/t/queue.t rename to storage/bdb/perl/BerkeleyDB/t/queue.t diff --git a/bdb/perl/BerkeleyDB/t/recno.t b/storage/bdb/perl/BerkeleyDB/t/recno.t similarity index 100% rename from bdb/perl/BerkeleyDB/t/recno.t rename to storage/bdb/perl/BerkeleyDB/t/recno.t diff --git a/bdb/perl/BerkeleyDB/t/strict.t b/storage/bdb/perl/BerkeleyDB/t/strict.t similarity index 100% rename from bdb/perl/BerkeleyDB/t/strict.t rename to storage/bdb/perl/BerkeleyDB/t/strict.t diff --git a/bdb/perl/BerkeleyDB/t/subdb.t b/storage/bdb/perl/BerkeleyDB/t/subdb.t similarity index 100% rename from bdb/perl/BerkeleyDB/t/subdb.t rename to storage/bdb/perl/BerkeleyDB/t/subdb.t diff --git a/bdb/perl/BerkeleyDB/t/txn.t b/storage/bdb/perl/BerkeleyDB/t/txn.t similarity index 100% rename from bdb/perl/BerkeleyDB/t/txn.t rename to storage/bdb/perl/BerkeleyDB/t/txn.t diff --git a/bdb/perl/BerkeleyDB/t/unknown.t b/storage/bdb/perl/BerkeleyDB/t/unknown.t similarity index 100% rename from bdb/perl/BerkeleyDB/t/unknown.t rename to storage/bdb/perl/BerkeleyDB/t/unknown.t diff --git a/bdb/perl/BerkeleyDB/t/util.pm b/storage/bdb/perl/BerkeleyDB/t/util.pm similarity index 100% rename from bdb/perl/BerkeleyDB/t/util.pm rename to storage/bdb/perl/BerkeleyDB/t/util.pm diff --git a/bdb/perl/BerkeleyDB/typemap b/storage/bdb/perl/BerkeleyDB/typemap similarity index 100% rename from bdb/perl/BerkeleyDB/typemap rename to storage/bdb/perl/BerkeleyDB/typemap diff --git a/bdb/perl/DB_File/Changes b/storage/bdb/perl/DB_File/Changes similarity index 100% rename from bdb/perl/DB_File/Changes rename to 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 similarity index 100% rename from bdb/perl/DB_File/DB_File.pm rename to 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 similarity index 100% rename from bdb/perl/DB_File/DB_File.xs rename to 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 similarity index 100% rename from bdb/perl/DB_File/DB_File_BS rename to storage/bdb/perl/DB_File/DB_File_BS diff --git a/bdb/perl/DB_File/MANIFEST b/storage/bdb/perl/DB_File/MANIFEST similarity index 100% rename from bdb/perl/DB_File/MANIFEST rename to storage/bdb/perl/DB_File/MANIFEST diff --git a/bdb/perl/DB_File/Makefile.PL b/storage/bdb/perl/DB_File/Makefile.PL similarity index 100% rename from bdb/perl/DB_File/Makefile.PL rename to storage/bdb/perl/DB_File/Makefile.PL diff --git a/bdb/perl/DB_File/README b/storage/bdb/perl/DB_File/README similarity index 100% rename from bdb/perl/DB_File/README rename to storage/bdb/perl/DB_File/README diff --git a/bdb/perl/DB_File/config.in b/storage/bdb/perl/DB_File/config.in similarity index 100% rename from bdb/perl/DB_File/config.in rename to storage/bdb/perl/DB_File/config.in diff --git a/bdb/perl/DB_File/dbinfo b/storage/bdb/perl/DB_File/dbinfo similarity index 100% rename from bdb/perl/DB_File/dbinfo rename to storage/bdb/perl/DB_File/dbinfo diff --git a/bdb/perl/DB_File/fallback.h b/storage/bdb/perl/DB_File/fallback.h similarity index 100% rename from bdb/perl/DB_File/fallback.h rename to storage/bdb/perl/DB_File/fallback.h diff --git a/bdb/perl/DB_File/fallback.xs b/storage/bdb/perl/DB_File/fallback.xs similarity index 100% rename from bdb/perl/DB_File/fallback.xs rename to 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 similarity index 100% rename from bdb/perl/DB_File/hints/dynixptx.pl rename to 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 similarity index 100% rename from bdb/perl/DB_File/hints/sco.pl rename to 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 similarity index 100% rename from bdb/perl/DB_File/patches/5.004 rename to 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 similarity index 100% rename from bdb/perl/DB_File/patches/5.004_01 rename to 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 similarity index 100% rename from bdb/perl/DB_File/patches/5.004_02 rename to 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 similarity index 100% rename from bdb/perl/DB_File/patches/5.004_03 rename to 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 similarity index 100% rename from bdb/perl/DB_File/patches/5.004_04 rename to 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 similarity index 100% rename from bdb/perl/DB_File/patches/5.004_05 rename to 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 similarity index 100% rename from bdb/perl/DB_File/patches/5.005 rename to 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 similarity index 100% rename from bdb/perl/DB_File/patches/5.005_01 rename to 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 similarity index 100% rename from bdb/perl/DB_File/patches/5.005_02 rename to 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 similarity index 100% rename from bdb/perl/DB_File/patches/5.005_03 rename to 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 similarity index 100% rename from bdb/perl/DB_File/patches/5.6.0 rename to 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 similarity index 100% rename from bdb/perl/DB_File/ppport.h rename to 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 similarity index 100% rename from bdb/perl/DB_File/t/db-btree.t rename to 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 similarity index 100% rename from bdb/perl/DB_File/t/db-hash.t rename to 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 similarity index 100% rename from bdb/perl/DB_File/t/db-recno.t rename to storage/bdb/perl/DB_File/t/db-recno.t diff --git a/bdb/perl/DB_File/typemap b/storage/bdb/perl/DB_File/typemap similarity index 100% rename from bdb/perl/DB_File/typemap rename to storage/bdb/perl/DB_File/typemap diff --git a/bdb/perl/DB_File/version.c b/storage/bdb/perl/DB_File/version.c similarity index 100% rename from bdb/perl/DB_File/version.c rename to storage/bdb/perl/DB_File/version.c diff --git a/bdb/qam/qam.c b/storage/bdb/qam/qam.c similarity index 100% rename from bdb/qam/qam.c rename to storage/bdb/qam/qam.c diff --git a/bdb/qam/qam.src b/storage/bdb/qam/qam.src similarity index 100% rename from bdb/qam/qam.src rename to storage/bdb/qam/qam.src diff --git a/bdb/qam/qam_conv.c b/storage/bdb/qam/qam_conv.c similarity index 100% rename from bdb/qam/qam_conv.c rename to storage/bdb/qam/qam_conv.c diff --git a/bdb/qam/qam_files.c b/storage/bdb/qam/qam_files.c similarity index 100% rename from bdb/qam/qam_files.c rename to storage/bdb/qam/qam_files.c diff --git a/bdb/qam/qam_method.c b/storage/bdb/qam/qam_method.c similarity index 100% rename from bdb/qam/qam_method.c rename to storage/bdb/qam/qam_method.c diff --git a/bdb/qam/qam_open.c b/storage/bdb/qam/qam_open.c similarity index 100% rename from bdb/qam/qam_open.c rename to storage/bdb/qam/qam_open.c diff --git a/bdb/qam/qam_rec.c b/storage/bdb/qam/qam_rec.c similarity index 100% rename from bdb/qam/qam_rec.c rename to storage/bdb/qam/qam_rec.c diff --git a/bdb/qam/qam_stat.c b/storage/bdb/qam/qam_stat.c similarity index 100% rename from bdb/qam/qam_stat.c rename to storage/bdb/qam/qam_stat.c diff --git a/bdb/qam/qam_upgrade.c b/storage/bdb/qam/qam_upgrade.c similarity index 100% rename from bdb/qam/qam_upgrade.c rename to storage/bdb/qam/qam_upgrade.c diff --git a/bdb/qam/qam_verify.c b/storage/bdb/qam/qam_verify.c similarity index 100% rename from bdb/qam/qam_verify.c rename to storage/bdb/qam/qam_verify.c diff --git a/bdb/rep/rep_method.c b/storage/bdb/rep/rep_method.c similarity index 100% rename from bdb/rep/rep_method.c rename to storage/bdb/rep/rep_method.c diff --git a/bdb/rep/rep_record.c b/storage/bdb/rep/rep_record.c similarity index 100% rename from bdb/rep/rep_record.c rename to storage/bdb/rep/rep_record.c diff --git a/bdb/rep/rep_region.c b/storage/bdb/rep/rep_region.c similarity index 100% rename from bdb/rep/rep_region.c rename to storage/bdb/rep/rep_region.c diff --git a/bdb/rep/rep_util.c b/storage/bdb/rep/rep_util.c similarity index 100% rename from bdb/rep/rep_util.c rename to storage/bdb/rep/rep_util.c diff --git a/bdb/rpc_client/client.c b/storage/bdb/rpc_client/client.c similarity index 100% rename from bdb/rpc_client/client.c rename to 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 similarity index 100% rename from bdb/rpc_client/gen_client_ret.c rename to 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 similarity index 100% rename from bdb/rpc_server/c/db_server_proc.c.in rename to 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 similarity index 100% rename from bdb/rpc_server/c/db_server_util.c rename to storage/bdb/rpc_server/c/db_server_util.c diff --git a/bdb/rpc_server/clsrv.html b/storage/bdb/rpc_server/clsrv.html similarity index 100% rename from bdb/rpc_server/clsrv.html rename to 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 similarity index 100% rename from bdb/rpc_server/cxx/db_server_cxxproc.cpp rename to 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 similarity index 100% rename from bdb/rpc_server/cxx/db_server_cxxutil.cpp rename to 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 similarity index 100% rename from bdb/rpc_server/java/DbDispatcher.java rename to storage/bdb/rpc_server/java/DbDispatcher.java diff --git a/bdb/rpc_server/java/DbServer.java b/storage/bdb/rpc_server/java/DbServer.java similarity index 100% rename from bdb/rpc_server/java/DbServer.java rename to storage/bdb/rpc_server/java/DbServer.java diff --git a/bdb/rpc_server/java/FreeList.java b/storage/bdb/rpc_server/java/FreeList.java similarity index 100% rename from bdb/rpc_server/java/FreeList.java rename to storage/bdb/rpc_server/java/FreeList.java diff --git a/bdb/rpc_server/java/LocalIterator.java b/storage/bdb/rpc_server/java/LocalIterator.java similarity index 100% rename from bdb/rpc_server/java/LocalIterator.java rename to storage/bdb/rpc_server/java/LocalIterator.java diff --git a/bdb/rpc_server/java/README b/storage/bdb/rpc_server/java/README similarity index 100% rename from bdb/rpc_server/java/README rename to storage/bdb/rpc_server/java/README diff --git a/bdb/rpc_server/java/RpcDb.java b/storage/bdb/rpc_server/java/RpcDb.java similarity index 100% rename from bdb/rpc_server/java/RpcDb.java rename to storage/bdb/rpc_server/java/RpcDb.java diff --git a/bdb/rpc_server/java/RpcDbEnv.java b/storage/bdb/rpc_server/java/RpcDbEnv.java similarity index 100% rename from bdb/rpc_server/java/RpcDbEnv.java rename to storage/bdb/rpc_server/java/RpcDbEnv.java diff --git a/bdb/rpc_server/java/RpcDbTxn.java b/storage/bdb/rpc_server/java/RpcDbTxn.java similarity index 100% rename from bdb/rpc_server/java/RpcDbTxn.java rename to storage/bdb/rpc_server/java/RpcDbTxn.java diff --git a/bdb/rpc_server/java/RpcDbc.java b/storage/bdb/rpc_server/java/RpcDbc.java similarity index 100% rename from bdb/rpc_server/java/RpcDbc.java rename to storage/bdb/rpc_server/java/RpcDbc.java diff --git a/bdb/rpc_server/java/Timer.java b/storage/bdb/rpc_server/java/Timer.java similarity index 100% rename from bdb/rpc_server/java/Timer.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/DbServerStub.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_associate_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_associate_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_bt_maxkey_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_bt_maxkey_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_bt_minkey_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_bt_minkey_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_close_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_close_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_create_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_create_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_cursor_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_cursor_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_del_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_del_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_encrypt_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_encrypt_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_extentsize_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_extentsize_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_flags_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_flags_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_get_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_get_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_h_ffactor_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_h_ffactor_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_h_nelem_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_h_nelem_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_join_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_join_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_key_range_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_key_range_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_lorder_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_lorder_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_open_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_open_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_pagesize_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_pagesize_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_pget_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_pget_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_put_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_put_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_re_delim_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_re_delim_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_re_len_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_re_len_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_re_pad_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_re_pad_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_remove_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_remove_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_rename_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_rename_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_stat_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_stat_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_sync_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_sync_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_truncate_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__db_truncate_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__dbc_close_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__dbc_close_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__dbc_count_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__dbc_count_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__dbc_del_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__dbc_del_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__dbc_dup_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__dbc_dup_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__dbc_get_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__dbc_get_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__dbc_pget_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__dbc_pget_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__dbc_put_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__dbc_put_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__env_cachesize_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__env_cachesize_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__env_close_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__env_close_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__env_create_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__env_create_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__env_dbremove_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__env_dbremove_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__env_dbrename_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__env_dbrename_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__env_encrypt_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__env_encrypt_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__env_flags_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__env_flags_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__env_open_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__env_open_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__env_remove_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__env_remove_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__txn_abort_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__txn_abort_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__txn_begin_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__txn_begin_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__txn_commit_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__txn_commit_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__txn_discard_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__txn_discard_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__txn_prepare_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__txn_prepare_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__txn_recover_msg.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/__txn_recover_reply.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/gen/db_server.java rename to 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 similarity index 100% rename from bdb/rpc_server/java/jrpcgen.jar rename to storage/bdb/rpc_server/java/jrpcgen.jar diff --git a/bdb/rpc_server/java/oncrpc.jar b/storage/bdb/rpc_server/java/oncrpc.jar similarity index 100% rename from bdb/rpc_server/java/oncrpc.jar rename to storage/bdb/rpc_server/java/oncrpc.jar diff --git a/bdb/rpc_server/java/s_jrpcgen b/storage/bdb/rpc_server/java/s_jrpcgen similarity index 100% rename from bdb/rpc_server/java/s_jrpcgen rename to storage/bdb/rpc_server/java/s_jrpcgen diff --git a/bdb/rpc_server/rpc.src b/storage/bdb/rpc_server/rpc.src similarity index 100% rename from bdb/rpc_server/rpc.src rename to storage/bdb/rpc_server/rpc.src diff --git a/bdb/tcl/docs/db.html b/storage/bdb/tcl/docs/db.html similarity index 100% rename from bdb/tcl/docs/db.html rename to storage/bdb/tcl/docs/db.html diff --git a/bdb/tcl/docs/env.html b/storage/bdb/tcl/docs/env.html similarity index 100% rename from bdb/tcl/docs/env.html rename to storage/bdb/tcl/docs/env.html diff --git a/bdb/tcl/docs/historic.html b/storage/bdb/tcl/docs/historic.html similarity index 100% rename from bdb/tcl/docs/historic.html rename to storage/bdb/tcl/docs/historic.html diff --git a/bdb/tcl/docs/index.html b/storage/bdb/tcl/docs/index.html similarity index 100% rename from bdb/tcl/docs/index.html rename to storage/bdb/tcl/docs/index.html diff --git a/bdb/tcl/docs/library.html b/storage/bdb/tcl/docs/library.html similarity index 100% rename from bdb/tcl/docs/library.html rename to storage/bdb/tcl/docs/library.html diff --git a/bdb/tcl/docs/lock.html b/storage/bdb/tcl/docs/lock.html similarity index 100% rename from bdb/tcl/docs/lock.html rename to storage/bdb/tcl/docs/lock.html diff --git a/bdb/tcl/docs/log.html b/storage/bdb/tcl/docs/log.html similarity index 100% rename from bdb/tcl/docs/log.html rename to storage/bdb/tcl/docs/log.html diff --git a/bdb/tcl/docs/mpool.html b/storage/bdb/tcl/docs/mpool.html similarity index 100% rename from bdb/tcl/docs/mpool.html rename to storage/bdb/tcl/docs/mpool.html diff --git a/bdb/tcl/docs/rep.html b/storage/bdb/tcl/docs/rep.html similarity index 100% rename from bdb/tcl/docs/rep.html rename to storage/bdb/tcl/docs/rep.html diff --git a/bdb/tcl/docs/test.html b/storage/bdb/tcl/docs/test.html similarity index 100% rename from bdb/tcl/docs/test.html rename to storage/bdb/tcl/docs/test.html diff --git a/bdb/tcl/docs/txn.html b/storage/bdb/tcl/docs/txn.html similarity index 100% rename from bdb/tcl/docs/txn.html rename to storage/bdb/tcl/docs/txn.html diff --git a/bdb/tcl/tcl_compat.c b/storage/bdb/tcl/tcl_compat.c similarity index 100% rename from bdb/tcl/tcl_compat.c rename to storage/bdb/tcl/tcl_compat.c diff --git a/bdb/tcl/tcl_db.c b/storage/bdb/tcl/tcl_db.c similarity index 100% rename from bdb/tcl/tcl_db.c rename to storage/bdb/tcl/tcl_db.c diff --git a/bdb/tcl/tcl_db_pkg.c b/storage/bdb/tcl/tcl_db_pkg.c similarity index 100% rename from bdb/tcl/tcl_db_pkg.c rename to storage/bdb/tcl/tcl_db_pkg.c diff --git a/bdb/tcl/tcl_dbcursor.c b/storage/bdb/tcl/tcl_dbcursor.c similarity index 100% rename from bdb/tcl/tcl_dbcursor.c rename to storage/bdb/tcl/tcl_dbcursor.c diff --git a/bdb/tcl/tcl_env.c b/storage/bdb/tcl/tcl_env.c similarity index 100% rename from bdb/tcl/tcl_env.c rename to storage/bdb/tcl/tcl_env.c diff --git a/bdb/tcl/tcl_internal.c b/storage/bdb/tcl/tcl_internal.c similarity index 100% rename from bdb/tcl/tcl_internal.c rename to storage/bdb/tcl/tcl_internal.c diff --git a/bdb/tcl/tcl_lock.c b/storage/bdb/tcl/tcl_lock.c similarity index 100% rename from bdb/tcl/tcl_lock.c rename to storage/bdb/tcl/tcl_lock.c diff --git a/bdb/tcl/tcl_log.c b/storage/bdb/tcl/tcl_log.c similarity index 100% rename from bdb/tcl/tcl_log.c rename to storage/bdb/tcl/tcl_log.c diff --git a/bdb/tcl/tcl_mp.c b/storage/bdb/tcl/tcl_mp.c similarity index 100% rename from bdb/tcl/tcl_mp.c rename to storage/bdb/tcl/tcl_mp.c diff --git a/bdb/tcl/tcl_rep.c b/storage/bdb/tcl/tcl_rep.c similarity index 100% rename from bdb/tcl/tcl_rep.c rename to storage/bdb/tcl/tcl_rep.c diff --git a/bdb/tcl/tcl_txn.c b/storage/bdb/tcl/tcl_txn.c similarity index 100% rename from bdb/tcl/tcl_txn.c rename to storage/bdb/tcl/tcl_txn.c diff --git a/bdb/tcl/tcl_util.c b/storage/bdb/tcl/tcl_util.c similarity index 100% rename from bdb/tcl/tcl_util.c rename to storage/bdb/tcl/tcl_util.c diff --git a/bdb/test/archive.tcl b/storage/bdb/test/archive.tcl similarity index 100% rename from bdb/test/archive.tcl rename to storage/bdb/test/archive.tcl diff --git a/bdb/test/bigfile001.tcl b/storage/bdb/test/bigfile001.tcl similarity index 100% rename from bdb/test/bigfile001.tcl rename to storage/bdb/test/bigfile001.tcl diff --git a/bdb/test/bigfile002.tcl b/storage/bdb/test/bigfile002.tcl similarity index 100% rename from bdb/test/bigfile002.tcl rename to storage/bdb/test/bigfile002.tcl diff --git a/bdb/test/byteorder.tcl b/storage/bdb/test/byteorder.tcl similarity index 100% rename from bdb/test/byteorder.tcl rename to storage/bdb/test/byteorder.tcl diff --git a/bdb/test/conscript.tcl b/storage/bdb/test/conscript.tcl similarity index 100% rename from bdb/test/conscript.tcl rename to storage/bdb/test/conscript.tcl diff --git a/bdb/test/dbm.tcl b/storage/bdb/test/dbm.tcl similarity index 100% rename from bdb/test/dbm.tcl rename to storage/bdb/test/dbm.tcl diff --git a/bdb/test/dbscript.tcl b/storage/bdb/test/dbscript.tcl similarity index 100% rename from bdb/test/dbscript.tcl rename to storage/bdb/test/dbscript.tcl diff --git a/bdb/test/ddoyscript.tcl b/storage/bdb/test/ddoyscript.tcl similarity index 100% rename from bdb/test/ddoyscript.tcl rename to storage/bdb/test/ddoyscript.tcl diff --git a/bdb/test/ddscript.tcl b/storage/bdb/test/ddscript.tcl similarity index 100% rename from bdb/test/ddscript.tcl rename to storage/bdb/test/ddscript.tcl diff --git a/bdb/test/dead001.tcl b/storage/bdb/test/dead001.tcl similarity index 100% rename from bdb/test/dead001.tcl rename to storage/bdb/test/dead001.tcl diff --git a/bdb/test/dead002.tcl b/storage/bdb/test/dead002.tcl similarity index 100% rename from bdb/test/dead002.tcl rename to storage/bdb/test/dead002.tcl diff --git a/bdb/test/dead003.tcl b/storage/bdb/test/dead003.tcl similarity index 100% rename from bdb/test/dead003.tcl rename to storage/bdb/test/dead003.tcl diff --git a/bdb/test/dead004.tcl b/storage/bdb/test/dead004.tcl similarity index 100% rename from bdb/test/dead004.tcl rename to storage/bdb/test/dead004.tcl diff --git a/bdb/test/dead005.tcl b/storage/bdb/test/dead005.tcl similarity index 100% rename from bdb/test/dead005.tcl rename to storage/bdb/test/dead005.tcl diff --git a/bdb/test/dead006.tcl b/storage/bdb/test/dead006.tcl similarity index 100% rename from bdb/test/dead006.tcl rename to storage/bdb/test/dead006.tcl diff --git a/bdb/test/dead007.tcl b/storage/bdb/test/dead007.tcl similarity index 100% rename from bdb/test/dead007.tcl rename to storage/bdb/test/dead007.tcl diff --git a/bdb/test/env001.tcl b/storage/bdb/test/env001.tcl similarity index 100% rename from bdb/test/env001.tcl rename to storage/bdb/test/env001.tcl diff --git a/bdb/test/env002.tcl b/storage/bdb/test/env002.tcl similarity index 100% rename from bdb/test/env002.tcl rename to storage/bdb/test/env002.tcl diff --git a/bdb/test/env003.tcl b/storage/bdb/test/env003.tcl similarity index 100% rename from bdb/test/env003.tcl rename to storage/bdb/test/env003.tcl diff --git a/bdb/test/env004.tcl b/storage/bdb/test/env004.tcl similarity index 100% rename from bdb/test/env004.tcl rename to storage/bdb/test/env004.tcl diff --git a/bdb/test/env005.tcl b/storage/bdb/test/env005.tcl similarity index 100% rename from bdb/test/env005.tcl rename to storage/bdb/test/env005.tcl diff --git a/bdb/test/env006.tcl b/storage/bdb/test/env006.tcl similarity index 100% rename from bdb/test/env006.tcl rename to storage/bdb/test/env006.tcl diff --git a/bdb/test/env007.tcl b/storage/bdb/test/env007.tcl similarity index 100% rename from bdb/test/env007.tcl rename to storage/bdb/test/env007.tcl diff --git a/bdb/test/env008.tcl b/storage/bdb/test/env008.tcl similarity index 100% rename from bdb/test/env008.tcl rename to storage/bdb/test/env008.tcl diff --git a/bdb/test/env009.tcl b/storage/bdb/test/env009.tcl similarity index 100% rename from bdb/test/env009.tcl rename to storage/bdb/test/env009.tcl diff --git a/bdb/test/env010.tcl b/storage/bdb/test/env010.tcl similarity index 100% rename from bdb/test/env010.tcl rename to storage/bdb/test/env010.tcl diff --git a/bdb/test/env011.tcl b/storage/bdb/test/env011.tcl similarity index 100% rename from bdb/test/env011.tcl rename to storage/bdb/test/env011.tcl diff --git a/bdb/test/hsearch.tcl b/storage/bdb/test/hsearch.tcl similarity index 100% rename from bdb/test/hsearch.tcl rename to storage/bdb/test/hsearch.tcl diff --git a/bdb/test/join.tcl b/storage/bdb/test/join.tcl similarity index 100% rename from bdb/test/join.tcl rename to storage/bdb/test/join.tcl diff --git a/bdb/test/lock001.tcl b/storage/bdb/test/lock001.tcl similarity index 100% rename from bdb/test/lock001.tcl rename to storage/bdb/test/lock001.tcl diff --git a/bdb/test/lock002.tcl b/storage/bdb/test/lock002.tcl similarity index 100% rename from bdb/test/lock002.tcl rename to storage/bdb/test/lock002.tcl diff --git a/bdb/test/lock003.tcl b/storage/bdb/test/lock003.tcl similarity index 100% rename from bdb/test/lock003.tcl rename to storage/bdb/test/lock003.tcl diff --git a/bdb/test/lock004.tcl b/storage/bdb/test/lock004.tcl similarity index 100% rename from bdb/test/lock004.tcl rename to storage/bdb/test/lock004.tcl diff --git a/bdb/test/lock005.tcl b/storage/bdb/test/lock005.tcl similarity index 100% rename from bdb/test/lock005.tcl rename to storage/bdb/test/lock005.tcl diff --git a/bdb/test/lockscript.tcl b/storage/bdb/test/lockscript.tcl similarity index 100% rename from bdb/test/lockscript.tcl rename to storage/bdb/test/lockscript.tcl diff --git a/bdb/test/log001.tcl b/storage/bdb/test/log001.tcl similarity index 100% rename from bdb/test/log001.tcl rename to storage/bdb/test/log001.tcl diff --git a/bdb/test/log002.tcl b/storage/bdb/test/log002.tcl similarity index 100% rename from bdb/test/log002.tcl rename to storage/bdb/test/log002.tcl diff --git a/bdb/test/log003.tcl b/storage/bdb/test/log003.tcl similarity index 100% rename from bdb/test/log003.tcl rename to storage/bdb/test/log003.tcl diff --git a/bdb/test/log004.tcl b/storage/bdb/test/log004.tcl similarity index 100% rename from bdb/test/log004.tcl rename to storage/bdb/test/log004.tcl diff --git a/bdb/test/log005.tcl b/storage/bdb/test/log005.tcl similarity index 100% rename from bdb/test/log005.tcl rename to storage/bdb/test/log005.tcl diff --git a/bdb/test/logtrack.tcl b/storage/bdb/test/logtrack.tcl similarity index 100% rename from bdb/test/logtrack.tcl rename to storage/bdb/test/logtrack.tcl diff --git a/bdb/test/mdbscript.tcl b/storage/bdb/test/mdbscript.tcl similarity index 100% rename from bdb/test/mdbscript.tcl rename to storage/bdb/test/mdbscript.tcl diff --git a/bdb/test/memp001.tcl b/storage/bdb/test/memp001.tcl similarity index 100% rename from bdb/test/memp001.tcl rename to storage/bdb/test/memp001.tcl diff --git a/bdb/test/memp002.tcl b/storage/bdb/test/memp002.tcl similarity index 100% rename from bdb/test/memp002.tcl rename to storage/bdb/test/memp002.tcl diff --git a/bdb/test/memp003.tcl b/storage/bdb/test/memp003.tcl similarity index 100% rename from bdb/test/memp003.tcl rename to storage/bdb/test/memp003.tcl diff --git a/bdb/test/mpoolscript.tcl b/storage/bdb/test/mpoolscript.tcl similarity index 100% rename from bdb/test/mpoolscript.tcl rename to storage/bdb/test/mpoolscript.tcl diff --git a/bdb/test/mutex001.tcl b/storage/bdb/test/mutex001.tcl similarity index 100% rename from bdb/test/mutex001.tcl rename to storage/bdb/test/mutex001.tcl diff --git a/bdb/test/mutex002.tcl b/storage/bdb/test/mutex002.tcl similarity index 100% rename from bdb/test/mutex002.tcl rename to storage/bdb/test/mutex002.tcl diff --git a/bdb/test/mutex003.tcl b/storage/bdb/test/mutex003.tcl similarity index 100% rename from bdb/test/mutex003.tcl rename to storage/bdb/test/mutex003.tcl diff --git a/bdb/test/mutexscript.tcl b/storage/bdb/test/mutexscript.tcl similarity index 100% rename from bdb/test/mutexscript.tcl rename to storage/bdb/test/mutexscript.tcl diff --git a/bdb/test/ndbm.tcl b/storage/bdb/test/ndbm.tcl similarity index 100% rename from bdb/test/ndbm.tcl rename to storage/bdb/test/ndbm.tcl diff --git a/bdb/test/parallel.tcl b/storage/bdb/test/parallel.tcl similarity index 100% rename from bdb/test/parallel.tcl rename to storage/bdb/test/parallel.tcl diff --git a/bdb/test/recd001.tcl b/storage/bdb/test/recd001.tcl similarity index 100% rename from bdb/test/recd001.tcl rename to storage/bdb/test/recd001.tcl diff --git a/bdb/test/recd002.tcl b/storage/bdb/test/recd002.tcl similarity index 100% rename from bdb/test/recd002.tcl rename to storage/bdb/test/recd002.tcl diff --git a/bdb/test/recd003.tcl b/storage/bdb/test/recd003.tcl similarity index 100% rename from bdb/test/recd003.tcl rename to storage/bdb/test/recd003.tcl diff --git a/bdb/test/recd004.tcl b/storage/bdb/test/recd004.tcl similarity index 100% rename from bdb/test/recd004.tcl rename to storage/bdb/test/recd004.tcl diff --git a/bdb/test/recd005.tcl b/storage/bdb/test/recd005.tcl similarity index 100% rename from bdb/test/recd005.tcl rename to storage/bdb/test/recd005.tcl diff --git a/bdb/test/recd006.tcl b/storage/bdb/test/recd006.tcl similarity index 100% rename from bdb/test/recd006.tcl rename to storage/bdb/test/recd006.tcl diff --git a/bdb/test/recd007.tcl b/storage/bdb/test/recd007.tcl similarity index 100% rename from bdb/test/recd007.tcl rename to storage/bdb/test/recd007.tcl diff --git a/bdb/test/recd008.tcl b/storage/bdb/test/recd008.tcl similarity index 100% rename from bdb/test/recd008.tcl rename to storage/bdb/test/recd008.tcl diff --git a/bdb/test/recd009.tcl b/storage/bdb/test/recd009.tcl similarity index 100% rename from bdb/test/recd009.tcl rename to storage/bdb/test/recd009.tcl diff --git a/bdb/test/recd010.tcl b/storage/bdb/test/recd010.tcl similarity index 100% rename from bdb/test/recd010.tcl rename to storage/bdb/test/recd010.tcl diff --git a/bdb/test/recd011.tcl b/storage/bdb/test/recd011.tcl similarity index 100% rename from bdb/test/recd011.tcl rename to storage/bdb/test/recd011.tcl diff --git a/bdb/test/recd012.tcl b/storage/bdb/test/recd012.tcl similarity index 100% rename from bdb/test/recd012.tcl rename to storage/bdb/test/recd012.tcl diff --git a/bdb/test/recd013.tcl b/storage/bdb/test/recd013.tcl similarity index 100% rename from bdb/test/recd013.tcl rename to storage/bdb/test/recd013.tcl diff --git a/bdb/test/recd014.tcl b/storage/bdb/test/recd014.tcl similarity index 100% rename from bdb/test/recd014.tcl rename to storage/bdb/test/recd014.tcl diff --git a/bdb/test/recd015.tcl b/storage/bdb/test/recd015.tcl similarity index 100% rename from bdb/test/recd015.tcl rename to storage/bdb/test/recd015.tcl diff --git a/bdb/test/recd016.tcl b/storage/bdb/test/recd016.tcl similarity index 100% rename from bdb/test/recd016.tcl rename to storage/bdb/test/recd016.tcl diff --git a/bdb/test/recd017.tcl b/storage/bdb/test/recd017.tcl similarity index 100% rename from bdb/test/recd017.tcl rename to storage/bdb/test/recd017.tcl diff --git a/bdb/test/recd018.tcl b/storage/bdb/test/recd018.tcl similarity index 100% rename from bdb/test/recd018.tcl rename to storage/bdb/test/recd018.tcl diff --git a/bdb/test/recd019.tcl b/storage/bdb/test/recd019.tcl similarity index 100% rename from bdb/test/recd019.tcl rename to storage/bdb/test/recd019.tcl diff --git a/bdb/test/recd020.tcl b/storage/bdb/test/recd020.tcl similarity index 100% rename from bdb/test/recd020.tcl rename to storage/bdb/test/recd020.tcl diff --git a/bdb/test/recd15scr.tcl b/storage/bdb/test/recd15scr.tcl similarity index 100% rename from bdb/test/recd15scr.tcl rename to storage/bdb/test/recd15scr.tcl diff --git a/bdb/test/recdscript.tcl b/storage/bdb/test/recdscript.tcl similarity index 100% rename from bdb/test/recdscript.tcl rename to storage/bdb/test/recdscript.tcl diff --git a/bdb/test/rep001.tcl b/storage/bdb/test/rep001.tcl similarity index 100% rename from bdb/test/rep001.tcl rename to storage/bdb/test/rep001.tcl diff --git a/bdb/test/rep002.tcl b/storage/bdb/test/rep002.tcl similarity index 100% rename from bdb/test/rep002.tcl rename to storage/bdb/test/rep002.tcl diff --git a/bdb/test/rep003.tcl b/storage/bdb/test/rep003.tcl similarity index 100% rename from bdb/test/rep003.tcl rename to storage/bdb/test/rep003.tcl diff --git a/bdb/test/rep004.tcl b/storage/bdb/test/rep004.tcl similarity index 100% rename from bdb/test/rep004.tcl rename to storage/bdb/test/rep004.tcl diff --git a/bdb/test/rep005.tcl b/storage/bdb/test/rep005.tcl similarity index 100% rename from bdb/test/rep005.tcl rename to storage/bdb/test/rep005.tcl diff --git a/bdb/test/reputils.tcl b/storage/bdb/test/reputils.tcl similarity index 100% rename from bdb/test/reputils.tcl rename to storage/bdb/test/reputils.tcl diff --git a/bdb/test/rpc001.tcl b/storage/bdb/test/rpc001.tcl similarity index 100% rename from bdb/test/rpc001.tcl rename to storage/bdb/test/rpc001.tcl diff --git a/bdb/test/rpc002.tcl b/storage/bdb/test/rpc002.tcl similarity index 100% rename from bdb/test/rpc002.tcl rename to storage/bdb/test/rpc002.tcl diff --git a/bdb/test/rpc003.tcl b/storage/bdb/test/rpc003.tcl similarity index 100% rename from bdb/test/rpc003.tcl rename to storage/bdb/test/rpc003.tcl diff --git a/bdb/test/rpc004.tcl b/storage/bdb/test/rpc004.tcl similarity index 100% rename from bdb/test/rpc004.tcl rename to storage/bdb/test/rpc004.tcl diff --git a/bdb/test/rpc005.tcl b/storage/bdb/test/rpc005.tcl similarity index 100% rename from bdb/test/rpc005.tcl rename to storage/bdb/test/rpc005.tcl diff --git a/bdb/test/rsrc001.tcl b/storage/bdb/test/rsrc001.tcl similarity index 100% rename from bdb/test/rsrc001.tcl rename to storage/bdb/test/rsrc001.tcl diff --git a/bdb/test/rsrc002.tcl b/storage/bdb/test/rsrc002.tcl similarity index 100% rename from bdb/test/rsrc002.tcl rename to storage/bdb/test/rsrc002.tcl diff --git a/bdb/test/rsrc003.tcl b/storage/bdb/test/rsrc003.tcl similarity index 100% rename from bdb/test/rsrc003.tcl rename to storage/bdb/test/rsrc003.tcl diff --git a/bdb/test/rsrc004.tcl b/storage/bdb/test/rsrc004.tcl similarity index 100% rename from bdb/test/rsrc004.tcl rename to storage/bdb/test/rsrc004.tcl diff --git a/bdb/test/scr001/chk.code b/storage/bdb/test/scr001/chk.code similarity index 100% rename from bdb/test/scr001/chk.code rename to storage/bdb/test/scr001/chk.code diff --git a/bdb/test/scr002/chk.def b/storage/bdb/test/scr002/chk.def similarity index 100% rename from bdb/test/scr002/chk.def rename to storage/bdb/test/scr002/chk.def diff --git a/bdb/test/scr003/chk.define b/storage/bdb/test/scr003/chk.define similarity index 100% rename from bdb/test/scr003/chk.define rename to storage/bdb/test/scr003/chk.define diff --git a/bdb/test/scr004/chk.javafiles b/storage/bdb/test/scr004/chk.javafiles similarity index 100% rename from bdb/test/scr004/chk.javafiles rename to storage/bdb/test/scr004/chk.javafiles diff --git a/bdb/test/scr005/chk.nl b/storage/bdb/test/scr005/chk.nl similarity index 100% rename from bdb/test/scr005/chk.nl rename to storage/bdb/test/scr005/chk.nl diff --git a/bdb/test/scr006/chk.offt b/storage/bdb/test/scr006/chk.offt similarity index 100% rename from bdb/test/scr006/chk.offt rename to storage/bdb/test/scr006/chk.offt diff --git a/bdb/test/scr007/chk.proto b/storage/bdb/test/scr007/chk.proto similarity index 100% rename from bdb/test/scr007/chk.proto rename to storage/bdb/test/scr007/chk.proto diff --git a/bdb/test/scr008/chk.pubdef b/storage/bdb/test/scr008/chk.pubdef similarity index 100% rename from bdb/test/scr008/chk.pubdef rename to storage/bdb/test/scr008/chk.pubdef diff --git a/bdb/test/scr009/chk.srcfiles b/storage/bdb/test/scr009/chk.srcfiles similarity index 100% rename from bdb/test/scr009/chk.srcfiles rename to storage/bdb/test/scr009/chk.srcfiles diff --git a/bdb/test/scr010/chk.str b/storage/bdb/test/scr010/chk.str similarity index 100% rename from bdb/test/scr010/chk.str rename to storage/bdb/test/scr010/chk.str diff --git a/bdb/test/scr010/spell.ok b/storage/bdb/test/scr010/spell.ok similarity index 100% rename from bdb/test/scr010/spell.ok rename to storage/bdb/test/scr010/spell.ok diff --git a/bdb/test/scr011/chk.tags b/storage/bdb/test/scr011/chk.tags similarity index 100% rename from bdb/test/scr011/chk.tags rename to storage/bdb/test/scr011/chk.tags diff --git a/bdb/test/scr012/chk.vx_code b/storage/bdb/test/scr012/chk.vx_code similarity index 100% rename from bdb/test/scr012/chk.vx_code rename to storage/bdb/test/scr012/chk.vx_code diff --git a/bdb/test/scr013/chk.stats b/storage/bdb/test/scr013/chk.stats similarity index 100% rename from bdb/test/scr013/chk.stats rename to storage/bdb/test/scr013/chk.stats diff --git a/bdb/test/scr014/chk.err b/storage/bdb/test/scr014/chk.err similarity index 100% rename from bdb/test/scr014/chk.err rename to storage/bdb/test/scr014/chk.err diff --git a/bdb/test/scr015/README b/storage/bdb/test/scr015/README similarity index 100% rename from bdb/test/scr015/README rename to storage/bdb/test/scr015/README diff --git a/bdb/test/scr015/TestConstruct01.cpp b/storage/bdb/test/scr015/TestConstruct01.cpp similarity index 100% rename from bdb/test/scr015/TestConstruct01.cpp rename to storage/bdb/test/scr015/TestConstruct01.cpp diff --git a/bdb/test/scr015/TestConstruct01.testerr b/storage/bdb/test/scr015/TestConstruct01.testerr similarity index 100% rename from bdb/test/scr015/TestConstruct01.testerr rename to storage/bdb/test/scr015/TestConstruct01.testerr diff --git a/bdb/test/scr015/TestConstruct01.testout b/storage/bdb/test/scr015/TestConstruct01.testout similarity index 100% rename from bdb/test/scr015/TestConstruct01.testout rename to storage/bdb/test/scr015/TestConstruct01.testout diff --git a/bdb/test/scr015/TestExceptInclude.cpp b/storage/bdb/test/scr015/TestExceptInclude.cpp similarity index 100% rename from bdb/test/scr015/TestExceptInclude.cpp rename to storage/bdb/test/scr015/TestExceptInclude.cpp diff --git a/bdb/test/scr015/TestGetSetMethods.cpp b/storage/bdb/test/scr015/TestGetSetMethods.cpp similarity index 100% rename from bdb/test/scr015/TestGetSetMethods.cpp rename to storage/bdb/test/scr015/TestGetSetMethods.cpp diff --git a/bdb/test/scr015/TestKeyRange.cpp b/storage/bdb/test/scr015/TestKeyRange.cpp similarity index 100% rename from bdb/test/scr015/TestKeyRange.cpp rename to storage/bdb/test/scr015/TestKeyRange.cpp diff --git a/bdb/test/scr015/TestKeyRange.testin b/storage/bdb/test/scr015/TestKeyRange.testin similarity index 100% rename from bdb/test/scr015/TestKeyRange.testin rename to storage/bdb/test/scr015/TestKeyRange.testin diff --git a/bdb/test/scr015/TestKeyRange.testout b/storage/bdb/test/scr015/TestKeyRange.testout similarity index 100% rename from bdb/test/scr015/TestKeyRange.testout rename to storage/bdb/test/scr015/TestKeyRange.testout diff --git a/bdb/test/scr015/TestLogc.cpp b/storage/bdb/test/scr015/TestLogc.cpp similarity index 100% rename from bdb/test/scr015/TestLogc.cpp rename to storage/bdb/test/scr015/TestLogc.cpp diff --git a/bdb/test/scr015/TestLogc.testout b/storage/bdb/test/scr015/TestLogc.testout similarity index 100% rename from bdb/test/scr015/TestLogc.testout rename to storage/bdb/test/scr015/TestLogc.testout diff --git a/bdb/test/scr015/TestSimpleAccess.cpp b/storage/bdb/test/scr015/TestSimpleAccess.cpp similarity index 100% rename from bdb/test/scr015/TestSimpleAccess.cpp rename to storage/bdb/test/scr015/TestSimpleAccess.cpp diff --git a/bdb/test/scr015/TestSimpleAccess.testout b/storage/bdb/test/scr015/TestSimpleAccess.testout similarity index 100% rename from bdb/test/scr015/TestSimpleAccess.testout rename to storage/bdb/test/scr015/TestSimpleAccess.testout diff --git a/bdb/test/scr015/TestTruncate.cpp b/storage/bdb/test/scr015/TestTruncate.cpp similarity index 100% rename from bdb/test/scr015/TestTruncate.cpp rename to storage/bdb/test/scr015/TestTruncate.cpp diff --git a/bdb/test/scr015/TestTruncate.testout b/storage/bdb/test/scr015/TestTruncate.testout similarity index 100% rename from bdb/test/scr015/TestTruncate.testout rename to storage/bdb/test/scr015/TestTruncate.testout diff --git a/bdb/test/scr015/chk.cxxtests b/storage/bdb/test/scr015/chk.cxxtests similarity index 100% rename from bdb/test/scr015/chk.cxxtests rename to storage/bdb/test/scr015/chk.cxxtests diff --git a/bdb/test/scr015/ignore b/storage/bdb/test/scr015/ignore similarity index 100% rename from bdb/test/scr015/ignore rename to storage/bdb/test/scr015/ignore diff --git a/bdb/test/scr015/testall b/storage/bdb/test/scr015/testall similarity index 100% rename from bdb/test/scr015/testall rename to storage/bdb/test/scr015/testall diff --git a/bdb/test/scr015/testone b/storage/bdb/test/scr015/testone similarity index 100% rename from bdb/test/scr015/testone rename to storage/bdb/test/scr015/testone diff --git a/bdb/test/scr016/CallbackTest.java b/storage/bdb/test/scr016/CallbackTest.java similarity index 100% rename from bdb/test/scr016/CallbackTest.java rename to storage/bdb/test/scr016/CallbackTest.java diff --git a/bdb/test/scr016/CallbackTest.testout b/storage/bdb/test/scr016/CallbackTest.testout similarity index 100% rename from bdb/test/scr016/CallbackTest.testout rename to storage/bdb/test/scr016/CallbackTest.testout diff --git a/bdb/test/scr016/README b/storage/bdb/test/scr016/README similarity index 100% rename from bdb/test/scr016/README rename to storage/bdb/test/scr016/README diff --git a/bdb/test/scr016/TestAppendRecno.java b/storage/bdb/test/scr016/TestAppendRecno.java similarity index 100% rename from bdb/test/scr016/TestAppendRecno.java rename to storage/bdb/test/scr016/TestAppendRecno.java diff --git a/bdb/test/scr016/TestAppendRecno.testout b/storage/bdb/test/scr016/TestAppendRecno.testout similarity index 100% rename from bdb/test/scr016/TestAppendRecno.testout rename to storage/bdb/test/scr016/TestAppendRecno.testout diff --git a/bdb/test/scr016/TestAssociate.java b/storage/bdb/test/scr016/TestAssociate.java similarity index 100% rename from bdb/test/scr016/TestAssociate.java rename to storage/bdb/test/scr016/TestAssociate.java diff --git a/bdb/test/scr016/TestAssociate.testout b/storage/bdb/test/scr016/TestAssociate.testout similarity index 100% rename from bdb/test/scr016/TestAssociate.testout rename to storage/bdb/test/scr016/TestAssociate.testout diff --git a/bdb/test/scr016/TestClosedDb.java b/storage/bdb/test/scr016/TestClosedDb.java similarity index 100% rename from bdb/test/scr016/TestClosedDb.java rename to storage/bdb/test/scr016/TestClosedDb.java diff --git a/bdb/test/scr016/TestClosedDb.testout b/storage/bdb/test/scr016/TestClosedDb.testout similarity index 100% rename from bdb/test/scr016/TestClosedDb.testout rename to storage/bdb/test/scr016/TestClosedDb.testout diff --git a/bdb/test/scr016/TestConstruct01.java b/storage/bdb/test/scr016/TestConstruct01.java similarity index 100% rename from bdb/test/scr016/TestConstruct01.java rename to storage/bdb/test/scr016/TestConstruct01.java diff --git a/bdb/test/scr016/TestConstruct01.testerr b/storage/bdb/test/scr016/TestConstruct01.testerr similarity index 100% rename from bdb/test/scr016/TestConstruct01.testerr rename to storage/bdb/test/scr016/TestConstruct01.testerr diff --git a/bdb/test/scr016/TestConstruct01.testout b/storage/bdb/test/scr016/TestConstruct01.testout similarity index 100% rename from bdb/test/scr016/TestConstruct01.testout rename to storage/bdb/test/scr016/TestConstruct01.testout diff --git a/bdb/test/scr016/TestConstruct02.java b/storage/bdb/test/scr016/TestConstruct02.java similarity index 100% rename from bdb/test/scr016/TestConstruct02.java rename to storage/bdb/test/scr016/TestConstruct02.java diff --git a/bdb/test/scr016/TestConstruct02.testout b/storage/bdb/test/scr016/TestConstruct02.testout similarity index 100% rename from bdb/test/scr016/TestConstruct02.testout rename to storage/bdb/test/scr016/TestConstruct02.testout diff --git a/bdb/test/scr016/TestDbtFlags.java b/storage/bdb/test/scr016/TestDbtFlags.java similarity index 100% rename from bdb/test/scr016/TestDbtFlags.java rename to storage/bdb/test/scr016/TestDbtFlags.java diff --git a/bdb/test/scr016/TestDbtFlags.testerr b/storage/bdb/test/scr016/TestDbtFlags.testerr similarity index 100% rename from bdb/test/scr016/TestDbtFlags.testerr rename to storage/bdb/test/scr016/TestDbtFlags.testerr diff --git a/bdb/test/scr016/TestDbtFlags.testout b/storage/bdb/test/scr016/TestDbtFlags.testout similarity index 100% rename from bdb/test/scr016/TestDbtFlags.testout rename to storage/bdb/test/scr016/TestDbtFlags.testout diff --git a/bdb/test/scr016/TestGetSetMethods.java b/storage/bdb/test/scr016/TestGetSetMethods.java similarity index 100% rename from bdb/test/scr016/TestGetSetMethods.java rename to storage/bdb/test/scr016/TestGetSetMethods.java diff --git a/bdb/test/scr016/TestKeyRange.java b/storage/bdb/test/scr016/TestKeyRange.java similarity index 100% rename from bdb/test/scr016/TestKeyRange.java rename to storage/bdb/test/scr016/TestKeyRange.java diff --git a/bdb/test/scr016/TestKeyRange.testout b/storage/bdb/test/scr016/TestKeyRange.testout similarity index 100% rename from bdb/test/scr016/TestKeyRange.testout rename to storage/bdb/test/scr016/TestKeyRange.testout diff --git a/bdb/test/scr016/TestLockVec.java b/storage/bdb/test/scr016/TestLockVec.java similarity index 100% rename from bdb/test/scr016/TestLockVec.java rename to storage/bdb/test/scr016/TestLockVec.java diff --git a/bdb/test/scr016/TestLockVec.testout b/storage/bdb/test/scr016/TestLockVec.testout similarity index 100% rename from bdb/test/scr016/TestLockVec.testout rename to storage/bdb/test/scr016/TestLockVec.testout diff --git a/bdb/test/scr016/TestLogc.java b/storage/bdb/test/scr016/TestLogc.java similarity index 100% rename from bdb/test/scr016/TestLogc.java rename to storage/bdb/test/scr016/TestLogc.java diff --git a/bdb/test/scr016/TestLogc.testout b/storage/bdb/test/scr016/TestLogc.testout similarity index 100% rename from bdb/test/scr016/TestLogc.testout rename to storage/bdb/test/scr016/TestLogc.testout diff --git a/bdb/test/scr016/TestOpenEmpty.java b/storage/bdb/test/scr016/TestOpenEmpty.java similarity index 100% rename from bdb/test/scr016/TestOpenEmpty.java rename to storage/bdb/test/scr016/TestOpenEmpty.java diff --git a/bdb/test/scr016/TestOpenEmpty.testerr b/storage/bdb/test/scr016/TestOpenEmpty.testerr similarity index 100% rename from bdb/test/scr016/TestOpenEmpty.testerr rename to storage/bdb/test/scr016/TestOpenEmpty.testerr diff --git a/bdb/test/scr016/TestReplication.java b/storage/bdb/test/scr016/TestReplication.java similarity index 100% rename from bdb/test/scr016/TestReplication.java rename to storage/bdb/test/scr016/TestReplication.java diff --git a/bdb/test/scr016/TestRpcServer.java b/storage/bdb/test/scr016/TestRpcServer.java similarity index 100% rename from bdb/test/scr016/TestRpcServer.java rename to storage/bdb/test/scr016/TestRpcServer.java diff --git a/bdb/test/scr016/TestSameDbt.java b/storage/bdb/test/scr016/TestSameDbt.java similarity index 100% rename from bdb/test/scr016/TestSameDbt.java rename to storage/bdb/test/scr016/TestSameDbt.java diff --git a/bdb/test/scr016/TestSameDbt.testout b/storage/bdb/test/scr016/TestSameDbt.testout similarity index 100% rename from bdb/test/scr016/TestSameDbt.testout rename to storage/bdb/test/scr016/TestSameDbt.testout diff --git a/bdb/test/scr016/TestSimpleAccess.java b/storage/bdb/test/scr016/TestSimpleAccess.java similarity index 100% rename from bdb/test/scr016/TestSimpleAccess.java rename to storage/bdb/test/scr016/TestSimpleAccess.java diff --git a/bdb/test/scr016/TestSimpleAccess.testout b/storage/bdb/test/scr016/TestSimpleAccess.testout similarity index 100% rename from bdb/test/scr016/TestSimpleAccess.testout rename to storage/bdb/test/scr016/TestSimpleAccess.testout diff --git a/bdb/test/scr016/TestStat.java b/storage/bdb/test/scr016/TestStat.java similarity index 100% rename from bdb/test/scr016/TestStat.java rename to storage/bdb/test/scr016/TestStat.java diff --git a/bdb/test/scr016/TestStat.testout b/storage/bdb/test/scr016/TestStat.testout similarity index 100% rename from bdb/test/scr016/TestStat.testout rename to storage/bdb/test/scr016/TestStat.testout diff --git a/bdb/test/scr016/TestTruncate.java b/storage/bdb/test/scr016/TestTruncate.java similarity index 100% rename from bdb/test/scr016/TestTruncate.java rename to storage/bdb/test/scr016/TestTruncate.java diff --git a/bdb/test/scr016/TestTruncate.testout b/storage/bdb/test/scr016/TestTruncate.testout similarity index 100% rename from bdb/test/scr016/TestTruncate.testout rename to storage/bdb/test/scr016/TestTruncate.testout diff --git a/bdb/test/scr016/TestUtil.java b/storage/bdb/test/scr016/TestUtil.java similarity index 100% rename from bdb/test/scr016/TestUtil.java rename to storage/bdb/test/scr016/TestUtil.java diff --git a/bdb/test/scr016/TestXAServlet.java b/storage/bdb/test/scr016/TestXAServlet.java similarity index 100% rename from bdb/test/scr016/TestXAServlet.java rename to storage/bdb/test/scr016/TestXAServlet.java diff --git a/bdb/test/scr016/chk.javatests b/storage/bdb/test/scr016/chk.javatests similarity index 100% rename from bdb/test/scr016/chk.javatests rename to storage/bdb/test/scr016/chk.javatests diff --git a/bdb/test/scr016/ignore b/storage/bdb/test/scr016/ignore similarity index 100% rename from bdb/test/scr016/ignore rename to storage/bdb/test/scr016/ignore diff --git a/bdb/test/scr016/testall b/storage/bdb/test/scr016/testall similarity index 100% rename from bdb/test/scr016/testall rename to storage/bdb/test/scr016/testall diff --git a/bdb/test/scr016/testone b/storage/bdb/test/scr016/testone similarity index 100% rename from bdb/test/scr016/testone rename to storage/bdb/test/scr016/testone diff --git a/bdb/test/scr017/O.BH b/storage/bdb/test/scr017/O.BH similarity index 100% rename from bdb/test/scr017/O.BH rename to storage/bdb/test/scr017/O.BH diff --git a/bdb/test/scr017/O.R b/storage/bdb/test/scr017/O.R similarity index 100% rename from bdb/test/scr017/O.R rename to storage/bdb/test/scr017/O.R diff --git a/bdb/test/scr017/chk.db185 b/storage/bdb/test/scr017/chk.db185 similarity index 100% rename from bdb/test/scr017/chk.db185 rename to storage/bdb/test/scr017/chk.db185 diff --git a/bdb/test/scr017/t.c b/storage/bdb/test/scr017/t.c similarity index 100% rename from bdb/test/scr017/t.c rename to storage/bdb/test/scr017/t.c diff --git a/bdb/test/scr018/chk.comma b/storage/bdb/test/scr018/chk.comma similarity index 100% rename from bdb/test/scr018/chk.comma rename to storage/bdb/test/scr018/chk.comma diff --git a/bdb/test/scr018/t.c b/storage/bdb/test/scr018/t.c similarity index 100% rename from bdb/test/scr018/t.c rename to storage/bdb/test/scr018/t.c diff --git a/bdb/test/scr019/chk.include b/storage/bdb/test/scr019/chk.include similarity index 100% rename from bdb/test/scr019/chk.include rename to storage/bdb/test/scr019/chk.include diff --git a/bdb/test/scr020/chk.inc b/storage/bdb/test/scr020/chk.inc similarity index 100% rename from bdb/test/scr020/chk.inc rename to storage/bdb/test/scr020/chk.inc diff --git a/bdb/test/scr021/chk.flags b/storage/bdb/test/scr021/chk.flags similarity index 100% rename from bdb/test/scr021/chk.flags rename to storage/bdb/test/scr021/chk.flags diff --git a/bdb/test/scr022/chk.rr b/storage/bdb/test/scr022/chk.rr similarity index 100% rename from bdb/test/scr022/chk.rr rename to storage/bdb/test/scr022/chk.rr diff --git a/bdb/test/sdb001.tcl b/storage/bdb/test/sdb001.tcl similarity index 100% rename from bdb/test/sdb001.tcl rename to storage/bdb/test/sdb001.tcl diff --git a/bdb/test/sdb002.tcl b/storage/bdb/test/sdb002.tcl similarity index 100% rename from bdb/test/sdb002.tcl rename to storage/bdb/test/sdb002.tcl diff --git a/bdb/test/sdb003.tcl b/storage/bdb/test/sdb003.tcl similarity index 100% rename from bdb/test/sdb003.tcl rename to storage/bdb/test/sdb003.tcl diff --git a/bdb/test/sdb004.tcl b/storage/bdb/test/sdb004.tcl similarity index 100% rename from bdb/test/sdb004.tcl rename to storage/bdb/test/sdb004.tcl diff --git a/bdb/test/sdb005.tcl b/storage/bdb/test/sdb005.tcl similarity index 100% rename from bdb/test/sdb005.tcl rename to storage/bdb/test/sdb005.tcl diff --git a/bdb/test/sdb006.tcl b/storage/bdb/test/sdb006.tcl similarity index 100% rename from bdb/test/sdb006.tcl rename to storage/bdb/test/sdb006.tcl diff --git a/bdb/test/sdb007.tcl b/storage/bdb/test/sdb007.tcl similarity index 100% rename from bdb/test/sdb007.tcl rename to storage/bdb/test/sdb007.tcl diff --git a/bdb/test/sdb008.tcl b/storage/bdb/test/sdb008.tcl similarity index 100% rename from bdb/test/sdb008.tcl rename to storage/bdb/test/sdb008.tcl diff --git a/bdb/test/sdb009.tcl b/storage/bdb/test/sdb009.tcl similarity index 100% rename from bdb/test/sdb009.tcl rename to storage/bdb/test/sdb009.tcl diff --git a/bdb/test/sdb010.tcl b/storage/bdb/test/sdb010.tcl similarity index 100% rename from bdb/test/sdb010.tcl rename to storage/bdb/test/sdb010.tcl diff --git a/bdb/test/sdb011.tcl b/storage/bdb/test/sdb011.tcl similarity index 100% rename from bdb/test/sdb011.tcl rename to storage/bdb/test/sdb011.tcl diff --git a/bdb/test/sdb012.tcl b/storage/bdb/test/sdb012.tcl similarity index 100% rename from bdb/test/sdb012.tcl rename to storage/bdb/test/sdb012.tcl diff --git a/bdb/test/sdbscript.tcl b/storage/bdb/test/sdbscript.tcl similarity index 100% rename from bdb/test/sdbscript.tcl rename to storage/bdb/test/sdbscript.tcl diff --git a/bdb/test/sdbtest001.tcl b/storage/bdb/test/sdbtest001.tcl similarity index 100% rename from bdb/test/sdbtest001.tcl rename to storage/bdb/test/sdbtest001.tcl diff --git a/bdb/test/sdbtest002.tcl b/storage/bdb/test/sdbtest002.tcl similarity index 100% rename from bdb/test/sdbtest002.tcl rename to storage/bdb/test/sdbtest002.tcl diff --git a/bdb/test/sdbutils.tcl b/storage/bdb/test/sdbutils.tcl similarity index 100% rename from bdb/test/sdbutils.tcl rename to storage/bdb/test/sdbutils.tcl diff --git a/bdb/test/sec001.tcl b/storage/bdb/test/sec001.tcl similarity index 100% rename from bdb/test/sec001.tcl rename to storage/bdb/test/sec001.tcl diff --git a/bdb/test/sec002.tcl b/storage/bdb/test/sec002.tcl similarity index 100% rename from bdb/test/sec002.tcl rename to storage/bdb/test/sec002.tcl diff --git a/bdb/test/shelltest.tcl b/storage/bdb/test/shelltest.tcl similarity index 100% rename from bdb/test/shelltest.tcl rename to storage/bdb/test/shelltest.tcl diff --git a/bdb/test/si001.tcl b/storage/bdb/test/si001.tcl similarity index 100% rename from bdb/test/si001.tcl rename to storage/bdb/test/si001.tcl diff --git a/bdb/test/si002.tcl b/storage/bdb/test/si002.tcl similarity index 100% rename from bdb/test/si002.tcl rename to storage/bdb/test/si002.tcl diff --git a/bdb/test/si003.tcl b/storage/bdb/test/si003.tcl similarity index 100% rename from bdb/test/si003.tcl rename to storage/bdb/test/si003.tcl diff --git a/bdb/test/si004.tcl b/storage/bdb/test/si004.tcl similarity index 100% rename from bdb/test/si004.tcl rename to storage/bdb/test/si004.tcl diff --git a/bdb/test/si005.tcl b/storage/bdb/test/si005.tcl similarity index 100% rename from bdb/test/si005.tcl rename to storage/bdb/test/si005.tcl diff --git a/bdb/test/si006.tcl b/storage/bdb/test/si006.tcl similarity index 100% rename from bdb/test/si006.tcl rename to storage/bdb/test/si006.tcl diff --git a/bdb/test/sindex.tcl b/storage/bdb/test/sindex.tcl similarity index 100% rename from bdb/test/sindex.tcl rename to storage/bdb/test/sindex.tcl diff --git a/bdb/test/sysscript.tcl b/storage/bdb/test/sysscript.tcl similarity index 100% rename from bdb/test/sysscript.tcl rename to storage/bdb/test/sysscript.tcl diff --git a/bdb/test/test.tcl b/storage/bdb/test/test.tcl similarity index 100% rename from bdb/test/test.tcl rename to storage/bdb/test/test.tcl diff --git a/bdb/test/test001.tcl b/storage/bdb/test/test001.tcl similarity index 100% rename from bdb/test/test001.tcl rename to storage/bdb/test/test001.tcl diff --git a/bdb/test/test002.tcl b/storage/bdb/test/test002.tcl similarity index 100% rename from bdb/test/test002.tcl rename to storage/bdb/test/test002.tcl diff --git a/bdb/test/test003.tcl b/storage/bdb/test/test003.tcl similarity index 100% rename from bdb/test/test003.tcl rename to storage/bdb/test/test003.tcl diff --git a/bdb/test/test004.tcl b/storage/bdb/test/test004.tcl similarity index 100% rename from bdb/test/test004.tcl rename to storage/bdb/test/test004.tcl diff --git a/bdb/test/test005.tcl b/storage/bdb/test/test005.tcl similarity index 100% rename from bdb/test/test005.tcl rename to storage/bdb/test/test005.tcl diff --git a/bdb/test/test006.tcl b/storage/bdb/test/test006.tcl similarity index 100% rename from bdb/test/test006.tcl rename to storage/bdb/test/test006.tcl diff --git a/bdb/test/test007.tcl b/storage/bdb/test/test007.tcl similarity index 100% rename from bdb/test/test007.tcl rename to storage/bdb/test/test007.tcl diff --git a/bdb/test/test008.tcl b/storage/bdb/test/test008.tcl similarity index 100% rename from bdb/test/test008.tcl rename to storage/bdb/test/test008.tcl diff --git a/bdb/test/test009.tcl b/storage/bdb/test/test009.tcl similarity index 100% rename from bdb/test/test009.tcl rename to storage/bdb/test/test009.tcl diff --git a/bdb/test/test010.tcl b/storage/bdb/test/test010.tcl similarity index 100% rename from bdb/test/test010.tcl rename to storage/bdb/test/test010.tcl diff --git a/bdb/test/test011.tcl b/storage/bdb/test/test011.tcl similarity index 100% rename from bdb/test/test011.tcl rename to storage/bdb/test/test011.tcl diff --git a/bdb/test/test012.tcl b/storage/bdb/test/test012.tcl similarity index 100% rename from bdb/test/test012.tcl rename to storage/bdb/test/test012.tcl diff --git a/bdb/test/test013.tcl b/storage/bdb/test/test013.tcl similarity index 100% rename from bdb/test/test013.tcl rename to storage/bdb/test/test013.tcl diff --git a/bdb/test/test014.tcl b/storage/bdb/test/test014.tcl similarity index 100% rename from bdb/test/test014.tcl rename to storage/bdb/test/test014.tcl diff --git a/bdb/test/test015.tcl b/storage/bdb/test/test015.tcl similarity index 100% rename from bdb/test/test015.tcl rename to storage/bdb/test/test015.tcl diff --git a/bdb/test/test016.tcl b/storage/bdb/test/test016.tcl similarity index 100% rename from bdb/test/test016.tcl rename to storage/bdb/test/test016.tcl diff --git a/bdb/test/test017.tcl b/storage/bdb/test/test017.tcl similarity index 100% rename from bdb/test/test017.tcl rename to storage/bdb/test/test017.tcl diff --git a/bdb/test/test018.tcl b/storage/bdb/test/test018.tcl similarity index 100% rename from bdb/test/test018.tcl rename to storage/bdb/test/test018.tcl diff --git a/bdb/test/test019.tcl b/storage/bdb/test/test019.tcl similarity index 100% rename from bdb/test/test019.tcl rename to storage/bdb/test/test019.tcl diff --git a/bdb/test/test020.tcl b/storage/bdb/test/test020.tcl similarity index 100% rename from bdb/test/test020.tcl rename to storage/bdb/test/test020.tcl diff --git a/bdb/test/test021.tcl b/storage/bdb/test/test021.tcl similarity index 100% rename from bdb/test/test021.tcl rename to storage/bdb/test/test021.tcl diff --git a/bdb/test/test022.tcl b/storage/bdb/test/test022.tcl similarity index 100% rename from bdb/test/test022.tcl rename to storage/bdb/test/test022.tcl diff --git a/bdb/test/test023.tcl b/storage/bdb/test/test023.tcl similarity index 100% rename from bdb/test/test023.tcl rename to storage/bdb/test/test023.tcl diff --git a/bdb/test/test024.tcl b/storage/bdb/test/test024.tcl similarity index 100% rename from bdb/test/test024.tcl rename to storage/bdb/test/test024.tcl diff --git a/bdb/test/test025.tcl b/storage/bdb/test/test025.tcl similarity index 100% rename from bdb/test/test025.tcl rename to storage/bdb/test/test025.tcl diff --git a/bdb/test/test026.tcl b/storage/bdb/test/test026.tcl similarity index 100% rename from bdb/test/test026.tcl rename to storage/bdb/test/test026.tcl diff --git a/bdb/test/test027.tcl b/storage/bdb/test/test027.tcl similarity index 100% rename from bdb/test/test027.tcl rename to storage/bdb/test/test027.tcl diff --git a/bdb/test/test028.tcl b/storage/bdb/test/test028.tcl similarity index 100% rename from bdb/test/test028.tcl rename to storage/bdb/test/test028.tcl diff --git a/bdb/test/test029.tcl b/storage/bdb/test/test029.tcl similarity index 100% rename from bdb/test/test029.tcl rename to storage/bdb/test/test029.tcl diff --git a/bdb/test/test030.tcl b/storage/bdb/test/test030.tcl similarity index 100% rename from bdb/test/test030.tcl rename to storage/bdb/test/test030.tcl diff --git a/bdb/test/test031.tcl b/storage/bdb/test/test031.tcl similarity index 100% rename from bdb/test/test031.tcl rename to storage/bdb/test/test031.tcl diff --git a/bdb/test/test032.tcl b/storage/bdb/test/test032.tcl similarity index 100% rename from bdb/test/test032.tcl rename to storage/bdb/test/test032.tcl diff --git a/bdb/test/test033.tcl b/storage/bdb/test/test033.tcl similarity index 100% rename from bdb/test/test033.tcl rename to storage/bdb/test/test033.tcl diff --git a/bdb/test/test034.tcl b/storage/bdb/test/test034.tcl similarity index 100% rename from bdb/test/test034.tcl rename to storage/bdb/test/test034.tcl diff --git a/bdb/test/test035.tcl b/storage/bdb/test/test035.tcl similarity index 100% rename from bdb/test/test035.tcl rename to storage/bdb/test/test035.tcl diff --git a/bdb/test/test036.tcl b/storage/bdb/test/test036.tcl similarity index 100% rename from bdb/test/test036.tcl rename to storage/bdb/test/test036.tcl diff --git a/bdb/test/test037.tcl b/storage/bdb/test/test037.tcl similarity index 100% rename from bdb/test/test037.tcl rename to storage/bdb/test/test037.tcl diff --git a/bdb/test/test038.tcl b/storage/bdb/test/test038.tcl similarity index 100% rename from bdb/test/test038.tcl rename to storage/bdb/test/test038.tcl diff --git a/bdb/test/test039.tcl b/storage/bdb/test/test039.tcl similarity index 100% rename from bdb/test/test039.tcl rename to storage/bdb/test/test039.tcl diff --git a/bdb/test/test040.tcl b/storage/bdb/test/test040.tcl similarity index 100% rename from bdb/test/test040.tcl rename to storage/bdb/test/test040.tcl diff --git a/bdb/test/test041.tcl b/storage/bdb/test/test041.tcl similarity index 100% rename from bdb/test/test041.tcl rename to storage/bdb/test/test041.tcl diff --git a/bdb/test/test042.tcl b/storage/bdb/test/test042.tcl similarity index 100% rename from bdb/test/test042.tcl rename to storage/bdb/test/test042.tcl diff --git a/bdb/test/test043.tcl b/storage/bdb/test/test043.tcl similarity index 100% rename from bdb/test/test043.tcl rename to storage/bdb/test/test043.tcl diff --git a/bdb/test/test044.tcl b/storage/bdb/test/test044.tcl similarity index 100% rename from bdb/test/test044.tcl rename to storage/bdb/test/test044.tcl diff --git a/bdb/test/test045.tcl b/storage/bdb/test/test045.tcl similarity index 100% rename from bdb/test/test045.tcl rename to storage/bdb/test/test045.tcl diff --git a/bdb/test/test046.tcl b/storage/bdb/test/test046.tcl similarity index 100% rename from bdb/test/test046.tcl rename to storage/bdb/test/test046.tcl diff --git a/bdb/test/test047.tcl b/storage/bdb/test/test047.tcl similarity index 100% rename from bdb/test/test047.tcl rename to storage/bdb/test/test047.tcl diff --git a/bdb/test/test048.tcl b/storage/bdb/test/test048.tcl similarity index 100% rename from bdb/test/test048.tcl rename to storage/bdb/test/test048.tcl diff --git a/bdb/test/test049.tcl b/storage/bdb/test/test049.tcl similarity index 100% rename from bdb/test/test049.tcl rename to storage/bdb/test/test049.tcl diff --git a/bdb/test/test050.tcl b/storage/bdb/test/test050.tcl similarity index 100% rename from bdb/test/test050.tcl rename to storage/bdb/test/test050.tcl diff --git a/bdb/test/test051.tcl b/storage/bdb/test/test051.tcl similarity index 100% rename from bdb/test/test051.tcl rename to storage/bdb/test/test051.tcl diff --git a/bdb/test/test052.tcl b/storage/bdb/test/test052.tcl similarity index 100% rename from bdb/test/test052.tcl rename to storage/bdb/test/test052.tcl diff --git a/bdb/test/test053.tcl b/storage/bdb/test/test053.tcl similarity index 100% rename from bdb/test/test053.tcl rename to storage/bdb/test/test053.tcl diff --git a/bdb/test/test054.tcl b/storage/bdb/test/test054.tcl similarity index 100% rename from bdb/test/test054.tcl rename to storage/bdb/test/test054.tcl diff --git a/bdb/test/test055.tcl b/storage/bdb/test/test055.tcl similarity index 100% rename from bdb/test/test055.tcl rename to storage/bdb/test/test055.tcl diff --git a/bdb/test/test056.tcl b/storage/bdb/test/test056.tcl similarity index 100% rename from bdb/test/test056.tcl rename to storage/bdb/test/test056.tcl diff --git a/bdb/test/test057.tcl b/storage/bdb/test/test057.tcl similarity index 100% rename from bdb/test/test057.tcl rename to storage/bdb/test/test057.tcl diff --git a/bdb/test/test058.tcl b/storage/bdb/test/test058.tcl similarity index 100% rename from bdb/test/test058.tcl rename to storage/bdb/test/test058.tcl diff --git a/bdb/test/test059.tcl b/storage/bdb/test/test059.tcl similarity index 100% rename from bdb/test/test059.tcl rename to storage/bdb/test/test059.tcl diff --git a/bdb/test/test060.tcl b/storage/bdb/test/test060.tcl similarity index 100% rename from bdb/test/test060.tcl rename to storage/bdb/test/test060.tcl diff --git a/bdb/test/test061.tcl b/storage/bdb/test/test061.tcl similarity index 100% rename from bdb/test/test061.tcl rename to storage/bdb/test/test061.tcl diff --git a/bdb/test/test062.tcl b/storage/bdb/test/test062.tcl similarity index 100% rename from bdb/test/test062.tcl rename to storage/bdb/test/test062.tcl diff --git a/bdb/test/test063.tcl b/storage/bdb/test/test063.tcl similarity index 100% rename from bdb/test/test063.tcl rename to storage/bdb/test/test063.tcl diff --git a/bdb/test/test064.tcl b/storage/bdb/test/test064.tcl similarity index 100% rename from bdb/test/test064.tcl rename to storage/bdb/test/test064.tcl diff --git a/bdb/test/test065.tcl b/storage/bdb/test/test065.tcl similarity index 100% rename from bdb/test/test065.tcl rename to storage/bdb/test/test065.tcl diff --git a/bdb/test/test066.tcl b/storage/bdb/test/test066.tcl similarity index 100% rename from bdb/test/test066.tcl rename to storage/bdb/test/test066.tcl diff --git a/bdb/test/test067.tcl b/storage/bdb/test/test067.tcl similarity index 100% rename from bdb/test/test067.tcl rename to storage/bdb/test/test067.tcl diff --git a/bdb/test/test068.tcl b/storage/bdb/test/test068.tcl similarity index 100% rename from bdb/test/test068.tcl rename to storage/bdb/test/test068.tcl diff --git a/bdb/test/test069.tcl b/storage/bdb/test/test069.tcl similarity index 100% rename from bdb/test/test069.tcl rename to storage/bdb/test/test069.tcl diff --git a/bdb/test/test070.tcl b/storage/bdb/test/test070.tcl similarity index 100% rename from bdb/test/test070.tcl rename to storage/bdb/test/test070.tcl diff --git a/bdb/test/test071.tcl b/storage/bdb/test/test071.tcl similarity index 100% rename from bdb/test/test071.tcl rename to storage/bdb/test/test071.tcl diff --git a/bdb/test/test072.tcl b/storage/bdb/test/test072.tcl similarity index 100% rename from bdb/test/test072.tcl rename to storage/bdb/test/test072.tcl diff --git a/bdb/test/test073.tcl b/storage/bdb/test/test073.tcl similarity index 100% rename from bdb/test/test073.tcl rename to storage/bdb/test/test073.tcl diff --git a/bdb/test/test074.tcl b/storage/bdb/test/test074.tcl similarity index 100% rename from bdb/test/test074.tcl rename to storage/bdb/test/test074.tcl diff --git a/bdb/test/test075.tcl b/storage/bdb/test/test075.tcl similarity index 100% rename from bdb/test/test075.tcl rename to storage/bdb/test/test075.tcl diff --git a/bdb/test/test076.tcl b/storage/bdb/test/test076.tcl similarity index 100% rename from bdb/test/test076.tcl rename to storage/bdb/test/test076.tcl diff --git a/bdb/test/test077.tcl b/storage/bdb/test/test077.tcl similarity index 100% rename from bdb/test/test077.tcl rename to storage/bdb/test/test077.tcl diff --git a/bdb/test/test078.tcl b/storage/bdb/test/test078.tcl similarity index 100% rename from bdb/test/test078.tcl rename to storage/bdb/test/test078.tcl diff --git a/bdb/test/test079.tcl b/storage/bdb/test/test079.tcl similarity index 100% rename from bdb/test/test079.tcl rename to storage/bdb/test/test079.tcl diff --git a/bdb/test/test080.tcl b/storage/bdb/test/test080.tcl similarity index 100% rename from bdb/test/test080.tcl rename to storage/bdb/test/test080.tcl diff --git a/bdb/test/test081.tcl b/storage/bdb/test/test081.tcl similarity index 100% rename from bdb/test/test081.tcl rename to storage/bdb/test/test081.tcl diff --git a/bdb/test/test082.tcl b/storage/bdb/test/test082.tcl similarity index 100% rename from bdb/test/test082.tcl rename to storage/bdb/test/test082.tcl diff --git a/bdb/test/test083.tcl b/storage/bdb/test/test083.tcl similarity index 100% rename from bdb/test/test083.tcl rename to storage/bdb/test/test083.tcl diff --git a/bdb/test/test084.tcl b/storage/bdb/test/test084.tcl similarity index 100% rename from bdb/test/test084.tcl rename to storage/bdb/test/test084.tcl diff --git a/bdb/test/test085.tcl b/storage/bdb/test/test085.tcl similarity index 100% rename from bdb/test/test085.tcl rename to storage/bdb/test/test085.tcl diff --git a/bdb/test/test086.tcl b/storage/bdb/test/test086.tcl similarity index 100% rename from bdb/test/test086.tcl rename to storage/bdb/test/test086.tcl diff --git a/bdb/test/test087.tcl b/storage/bdb/test/test087.tcl similarity index 100% rename from bdb/test/test087.tcl rename to storage/bdb/test/test087.tcl diff --git a/bdb/test/test088.tcl b/storage/bdb/test/test088.tcl similarity index 100% rename from bdb/test/test088.tcl rename to storage/bdb/test/test088.tcl diff --git a/bdb/test/test089.tcl b/storage/bdb/test/test089.tcl similarity index 100% rename from bdb/test/test089.tcl rename to storage/bdb/test/test089.tcl diff --git a/bdb/test/test090.tcl b/storage/bdb/test/test090.tcl similarity index 100% rename from bdb/test/test090.tcl rename to storage/bdb/test/test090.tcl diff --git a/bdb/test/test091.tcl b/storage/bdb/test/test091.tcl similarity index 100% rename from bdb/test/test091.tcl rename to storage/bdb/test/test091.tcl diff --git a/bdb/test/test092.tcl b/storage/bdb/test/test092.tcl similarity index 100% rename from bdb/test/test092.tcl rename to storage/bdb/test/test092.tcl diff --git a/bdb/test/test093.tcl b/storage/bdb/test/test093.tcl similarity index 100% rename from bdb/test/test093.tcl rename to storage/bdb/test/test093.tcl diff --git a/bdb/test/test094.tcl b/storage/bdb/test/test094.tcl similarity index 100% rename from bdb/test/test094.tcl rename to storage/bdb/test/test094.tcl diff --git a/bdb/test/test095.tcl b/storage/bdb/test/test095.tcl similarity index 100% rename from bdb/test/test095.tcl rename to storage/bdb/test/test095.tcl diff --git a/bdb/test/test096.tcl b/storage/bdb/test/test096.tcl similarity index 100% rename from bdb/test/test096.tcl rename to storage/bdb/test/test096.tcl diff --git a/bdb/test/test097.tcl b/storage/bdb/test/test097.tcl similarity index 100% rename from bdb/test/test097.tcl rename to storage/bdb/test/test097.tcl diff --git a/bdb/test/test098.tcl b/storage/bdb/test/test098.tcl similarity index 100% rename from bdb/test/test098.tcl rename to storage/bdb/test/test098.tcl diff --git a/bdb/test/test099.tcl b/storage/bdb/test/test099.tcl similarity index 100% rename from bdb/test/test099.tcl rename to storage/bdb/test/test099.tcl diff --git a/bdb/test/test100.tcl b/storage/bdb/test/test100.tcl similarity index 100% rename from bdb/test/test100.tcl rename to storage/bdb/test/test100.tcl diff --git a/bdb/test/test101.tcl b/storage/bdb/test/test101.tcl similarity index 100% rename from bdb/test/test101.tcl rename to storage/bdb/test/test101.tcl diff --git a/bdb/test/testparams.tcl b/storage/bdb/test/testparams.tcl similarity index 100% rename from bdb/test/testparams.tcl rename to storage/bdb/test/testparams.tcl diff --git a/bdb/test/testutils.tcl b/storage/bdb/test/testutils.tcl similarity index 100% rename from bdb/test/testutils.tcl rename to storage/bdb/test/testutils.tcl diff --git a/bdb/test/txn001.tcl b/storage/bdb/test/txn001.tcl similarity index 100% rename from bdb/test/txn001.tcl rename to storage/bdb/test/txn001.tcl diff --git a/bdb/test/txn002.tcl b/storage/bdb/test/txn002.tcl similarity index 100% rename from bdb/test/txn002.tcl rename to storage/bdb/test/txn002.tcl diff --git a/bdb/test/txn003.tcl b/storage/bdb/test/txn003.tcl similarity index 100% rename from bdb/test/txn003.tcl rename to storage/bdb/test/txn003.tcl diff --git a/bdb/test/txn004.tcl b/storage/bdb/test/txn004.tcl similarity index 100% rename from bdb/test/txn004.tcl rename to storage/bdb/test/txn004.tcl diff --git a/bdb/test/txn005.tcl b/storage/bdb/test/txn005.tcl similarity index 100% rename from bdb/test/txn005.tcl rename to storage/bdb/test/txn005.tcl diff --git a/bdb/test/txn006.tcl b/storage/bdb/test/txn006.tcl similarity index 100% rename from bdb/test/txn006.tcl rename to storage/bdb/test/txn006.tcl diff --git a/bdb/test/txn007.tcl b/storage/bdb/test/txn007.tcl similarity index 100% rename from bdb/test/txn007.tcl rename to storage/bdb/test/txn007.tcl diff --git a/bdb/test/txn008.tcl b/storage/bdb/test/txn008.tcl similarity index 100% rename from bdb/test/txn008.tcl rename to storage/bdb/test/txn008.tcl diff --git a/bdb/test/txn009.tcl b/storage/bdb/test/txn009.tcl similarity index 100% rename from bdb/test/txn009.tcl rename to storage/bdb/test/txn009.tcl diff --git a/bdb/test/txnscript.tcl b/storage/bdb/test/txnscript.tcl similarity index 100% rename from bdb/test/txnscript.tcl rename to storage/bdb/test/txnscript.tcl diff --git a/bdb/test/update.tcl b/storage/bdb/test/update.tcl similarity index 100% rename from bdb/test/update.tcl rename to storage/bdb/test/update.tcl diff --git a/bdb/test/upgrade.tcl b/storage/bdb/test/upgrade.tcl similarity index 100% rename from bdb/test/upgrade.tcl rename to storage/bdb/test/upgrade.tcl diff --git a/bdb/test/wordlist b/storage/bdb/test/wordlist similarity index 100% rename from bdb/test/wordlist rename to storage/bdb/test/wordlist diff --git a/bdb/test/wrap.tcl b/storage/bdb/test/wrap.tcl similarity index 100% rename from bdb/test/wrap.tcl rename to storage/bdb/test/wrap.tcl diff --git a/bdb/txn/txn.c b/storage/bdb/txn/txn.c similarity index 100% rename from bdb/txn/txn.c rename to storage/bdb/txn/txn.c diff --git a/bdb/txn/txn.src b/storage/bdb/txn/txn.src similarity index 100% rename from bdb/txn/txn.src rename to storage/bdb/txn/txn.src diff --git a/bdb/txn/txn_method.c b/storage/bdb/txn/txn_method.c similarity index 100% rename from bdb/txn/txn_method.c rename to storage/bdb/txn/txn_method.c diff --git a/bdb/txn/txn_rec.c b/storage/bdb/txn/txn_rec.c similarity index 100% rename from bdb/txn/txn_rec.c rename to storage/bdb/txn/txn_rec.c diff --git a/bdb/txn/txn_recover.c b/storage/bdb/txn/txn_recover.c similarity index 100% rename from bdb/txn/txn_recover.c rename to storage/bdb/txn/txn_recover.c diff --git a/bdb/txn/txn_region.c b/storage/bdb/txn/txn_region.c similarity index 100% rename from bdb/txn/txn_region.c rename to storage/bdb/txn/txn_region.c diff --git a/bdb/txn/txn_stat.c b/storage/bdb/txn/txn_stat.c similarity index 100% rename from bdb/txn/txn_stat.c rename to storage/bdb/txn/txn_stat.c diff --git a/bdb/txn/txn_util.c b/storage/bdb/txn/txn_util.c similarity index 100% rename from bdb/txn/txn_util.c rename to storage/bdb/txn/txn_util.c diff --git a/bdb/xa/xa.c b/storage/bdb/xa/xa.c similarity index 100% rename from bdb/xa/xa.c rename to storage/bdb/xa/xa.c diff --git a/bdb/xa/xa_db.c b/storage/bdb/xa/xa_db.c similarity index 100% rename from bdb/xa/xa_db.c rename to storage/bdb/xa/xa_db.c diff --git a/bdb/xa/xa_map.c b/storage/bdb/xa/xa_map.c similarity index 100% rename from bdb/xa/xa_map.c rename to storage/bdb/xa/xa_map.c diff --git a/heap/.cvsignore b/storage/heap/.cvsignore similarity index 100% rename from heap/.cvsignore rename to storage/heap/.cvsignore diff --git a/heap/ChangeLog b/storage/heap/ChangeLog similarity index 100% rename from heap/ChangeLog rename to storage/heap/ChangeLog diff --git a/heap/Makefile.am b/storage/heap/Makefile.am similarity index 100% rename from heap/Makefile.am rename to storage/heap/Makefile.am diff --git a/heap/_check.c b/storage/heap/_check.c similarity index 100% rename from heap/_check.c rename to storage/heap/_check.c diff --git a/heap/_rectest.c b/storage/heap/_rectest.c similarity index 100% rename from heap/_rectest.c rename to storage/heap/_rectest.c diff --git a/heap/heapdef.h b/storage/heap/heapdef.h similarity index 100% rename from heap/heapdef.h rename to storage/heap/heapdef.h diff --git a/heap/hp_block.c b/storage/heap/hp_block.c similarity index 100% rename from heap/hp_block.c rename to storage/heap/hp_block.c diff --git a/heap/hp_clear.c b/storage/heap/hp_clear.c similarity index 100% rename from heap/hp_clear.c rename to storage/heap/hp_clear.c diff --git a/heap/hp_close.c b/storage/heap/hp_close.c similarity index 100% rename from heap/hp_close.c rename to storage/heap/hp_close.c diff --git a/heap/hp_create.c b/storage/heap/hp_create.c similarity index 100% rename from heap/hp_create.c rename to storage/heap/hp_create.c diff --git a/heap/hp_delete.c b/storage/heap/hp_delete.c similarity index 100% rename from heap/hp_delete.c rename to storage/heap/hp_delete.c diff --git a/heap/hp_extra.c b/storage/heap/hp_extra.c similarity index 100% rename from heap/hp_extra.c rename to storage/heap/hp_extra.c diff --git a/heap/hp_hash.c b/storage/heap/hp_hash.c similarity index 100% rename from heap/hp_hash.c rename to storage/heap/hp_hash.c diff --git a/heap/hp_info.c b/storage/heap/hp_info.c similarity index 100% rename from heap/hp_info.c rename to storage/heap/hp_info.c diff --git a/heap/hp_open.c b/storage/heap/hp_open.c similarity index 100% rename from heap/hp_open.c rename to storage/heap/hp_open.c diff --git a/heap/hp_panic.c b/storage/heap/hp_panic.c similarity index 100% rename from heap/hp_panic.c rename to storage/heap/hp_panic.c diff --git a/heap/hp_rename.c b/storage/heap/hp_rename.c similarity index 100% rename from heap/hp_rename.c rename to storage/heap/hp_rename.c diff --git a/heap/hp_rfirst.c b/storage/heap/hp_rfirst.c similarity index 100% rename from heap/hp_rfirst.c rename to storage/heap/hp_rfirst.c diff --git a/heap/hp_rkey.c b/storage/heap/hp_rkey.c similarity index 100% rename from heap/hp_rkey.c rename to storage/heap/hp_rkey.c diff --git a/heap/hp_rlast.c b/storage/heap/hp_rlast.c similarity index 100% rename from heap/hp_rlast.c rename to storage/heap/hp_rlast.c diff --git a/heap/hp_rnext.c b/storage/heap/hp_rnext.c similarity index 100% rename from heap/hp_rnext.c rename to storage/heap/hp_rnext.c diff --git a/heap/hp_rprev.c b/storage/heap/hp_rprev.c similarity index 100% rename from heap/hp_rprev.c rename to storage/heap/hp_rprev.c diff --git a/heap/hp_rrnd.c b/storage/heap/hp_rrnd.c similarity index 100% rename from heap/hp_rrnd.c rename to storage/heap/hp_rrnd.c diff --git a/heap/hp_rsame.c b/storage/heap/hp_rsame.c similarity index 100% rename from heap/hp_rsame.c rename to storage/heap/hp_rsame.c diff --git a/heap/hp_scan.c b/storage/heap/hp_scan.c similarity index 100% rename from heap/hp_scan.c rename to storage/heap/hp_scan.c diff --git a/heap/hp_static.c b/storage/heap/hp_static.c similarity index 100% rename from heap/hp_static.c rename to storage/heap/hp_static.c diff --git a/heap/hp_test1.c b/storage/heap/hp_test1.c similarity index 100% rename from heap/hp_test1.c rename to storage/heap/hp_test1.c diff --git a/heap/hp_test2.c b/storage/heap/hp_test2.c similarity index 100% rename from heap/hp_test2.c rename to storage/heap/hp_test2.c diff --git a/heap/hp_update.c b/storage/heap/hp_update.c similarity index 100% rename from heap/hp_update.c rename to storage/heap/hp_update.c diff --git a/heap/hp_write.c b/storage/heap/hp_write.c similarity index 100% rename from heap/hp_write.c rename to storage/heap/hp_write.c diff --git a/heap/make-ccc b/storage/heap/make-ccc similarity index 100% rename from heap/make-ccc rename to storage/heap/make-ccc diff --git a/innobase/Makefile.am b/storage/innobase/Makefile.am similarity index 100% rename from innobase/Makefile.am rename to storage/innobase/Makefile.am diff --git a/innobase/btr/Makefile.am b/storage/innobase/btr/Makefile.am similarity index 100% rename from innobase/btr/Makefile.am rename to storage/innobase/btr/Makefile.am diff --git a/innobase/btr/btr0btr.c b/storage/innobase/btr/btr0btr.c similarity index 100% rename from innobase/btr/btr0btr.c rename to storage/innobase/btr/btr0btr.c diff --git a/innobase/btr/btr0cur.c b/storage/innobase/btr/btr0cur.c similarity index 100% rename from innobase/btr/btr0cur.c rename to storage/innobase/btr/btr0cur.c diff --git a/innobase/btr/btr0pcur.c b/storage/innobase/btr/btr0pcur.c similarity index 100% rename from innobase/btr/btr0pcur.c rename to storage/innobase/btr/btr0pcur.c diff --git a/innobase/btr/btr0sea.c b/storage/innobase/btr/btr0sea.c similarity index 100% rename from innobase/btr/btr0sea.c rename to storage/innobase/btr/btr0sea.c diff --git a/innobase/btr/makefilewin b/storage/innobase/btr/makefilewin similarity index 100% rename from innobase/btr/makefilewin rename to storage/innobase/btr/makefilewin diff --git a/innobase/buf/Makefile.am b/storage/innobase/buf/Makefile.am similarity index 100% rename from innobase/buf/Makefile.am rename to storage/innobase/buf/Makefile.am diff --git a/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c similarity index 100% rename from innobase/buf/buf0buf.c rename to storage/innobase/buf/buf0buf.c diff --git a/innobase/buf/buf0flu.c b/storage/innobase/buf/buf0flu.c similarity index 100% rename from innobase/buf/buf0flu.c rename to storage/innobase/buf/buf0flu.c diff --git a/innobase/buf/buf0lru.c b/storage/innobase/buf/buf0lru.c similarity index 100% rename from innobase/buf/buf0lru.c rename to storage/innobase/buf/buf0lru.c diff --git a/innobase/buf/buf0rea.c b/storage/innobase/buf/buf0rea.c similarity index 100% rename from innobase/buf/buf0rea.c rename to storage/innobase/buf/buf0rea.c diff --git a/innobase/buf/makefilewin b/storage/innobase/buf/makefilewin similarity index 100% rename from innobase/buf/makefilewin rename to storage/innobase/buf/makefilewin diff --git a/innobase/configure.in b/storage/innobase/configure.in similarity index 100% rename from innobase/configure.in rename to storage/innobase/configure.in diff --git a/innobase/data/Makefile.am b/storage/innobase/data/Makefile.am similarity index 100% rename from innobase/data/Makefile.am rename to storage/innobase/data/Makefile.am diff --git a/innobase/data/data0data.c b/storage/innobase/data/data0data.c similarity index 100% rename from innobase/data/data0data.c rename to storage/innobase/data/data0data.c diff --git a/innobase/data/data0type.c b/storage/innobase/data/data0type.c similarity index 100% rename from innobase/data/data0type.c rename to storage/innobase/data/data0type.c diff --git a/innobase/data/makefilewin b/storage/innobase/data/makefilewin similarity index 100% rename from innobase/data/makefilewin rename to storage/innobase/data/makefilewin diff --git a/innobase/db/db0err.h b/storage/innobase/db/db0err.h similarity index 100% rename from innobase/db/db0err.h rename to storage/innobase/db/db0err.h diff --git a/innobase/dict/Makefile.am b/storage/innobase/dict/Makefile.am similarity index 100% rename from innobase/dict/Makefile.am rename to storage/innobase/dict/Makefile.am diff --git a/innobase/dict/dict0boot.c b/storage/innobase/dict/dict0boot.c similarity index 100% rename from innobase/dict/dict0boot.c rename to storage/innobase/dict/dict0boot.c diff --git a/innobase/dict/dict0crea.c b/storage/innobase/dict/dict0crea.c similarity index 100% rename from innobase/dict/dict0crea.c rename to storage/innobase/dict/dict0crea.c diff --git a/innobase/dict/dict0dict.c b/storage/innobase/dict/dict0dict.c similarity index 100% rename from innobase/dict/dict0dict.c rename to storage/innobase/dict/dict0dict.c diff --git a/innobase/dict/dict0load.c b/storage/innobase/dict/dict0load.c similarity index 100% rename from innobase/dict/dict0load.c rename to storage/innobase/dict/dict0load.c diff --git a/innobase/dict/dict0mem.c b/storage/innobase/dict/dict0mem.c similarity index 100% rename from innobase/dict/dict0mem.c rename to storage/innobase/dict/dict0mem.c diff --git a/innobase/dict/makefilewin b/storage/innobase/dict/makefilewin similarity index 100% rename from innobase/dict/makefilewin rename to storage/innobase/dict/makefilewin diff --git a/innobase/dyn/Makefile.am b/storage/innobase/dyn/Makefile.am similarity index 100% rename from innobase/dyn/Makefile.am rename to storage/innobase/dyn/Makefile.am diff --git a/innobase/dyn/dyn0dyn.c b/storage/innobase/dyn/dyn0dyn.c similarity index 100% rename from innobase/dyn/dyn0dyn.c rename to storage/innobase/dyn/dyn0dyn.c diff --git a/innobase/dyn/makefilewin b/storage/innobase/dyn/makefilewin similarity index 100% rename from innobase/dyn/makefilewin rename to storage/innobase/dyn/makefilewin diff --git a/innobase/eval/Makefile.am b/storage/innobase/eval/Makefile.am similarity index 100% rename from innobase/eval/Makefile.am rename to storage/innobase/eval/Makefile.am diff --git a/innobase/eval/eval0eval.c b/storage/innobase/eval/eval0eval.c similarity index 100% rename from innobase/eval/eval0eval.c rename to storage/innobase/eval/eval0eval.c diff --git a/innobase/eval/eval0proc.c b/storage/innobase/eval/eval0proc.c similarity index 100% rename from innobase/eval/eval0proc.c rename to storage/innobase/eval/eval0proc.c diff --git a/innobase/eval/makefilewin b/storage/innobase/eval/makefilewin similarity index 100% rename from innobase/eval/makefilewin rename to storage/innobase/eval/makefilewin diff --git a/innobase/fil/Makefile.am b/storage/innobase/fil/Makefile.am similarity index 100% rename from innobase/fil/Makefile.am rename to storage/innobase/fil/Makefile.am diff --git a/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c similarity index 100% rename from innobase/fil/fil0fil.c rename to storage/innobase/fil/fil0fil.c diff --git a/innobase/fil/makefilewin b/storage/innobase/fil/makefilewin similarity index 100% rename from innobase/fil/makefilewin rename to storage/innobase/fil/makefilewin diff --git a/innobase/fsp/Makefile.am b/storage/innobase/fsp/Makefile.am similarity index 100% rename from innobase/fsp/Makefile.am rename to storage/innobase/fsp/Makefile.am diff --git a/innobase/fsp/fsp0fsp.c b/storage/innobase/fsp/fsp0fsp.c similarity index 100% rename from innobase/fsp/fsp0fsp.c rename to storage/innobase/fsp/fsp0fsp.c diff --git a/innobase/fsp/makefilewin b/storage/innobase/fsp/makefilewin similarity index 100% rename from innobase/fsp/makefilewin rename to storage/innobase/fsp/makefilewin diff --git a/innobase/fut/Makefile.am b/storage/innobase/fut/Makefile.am similarity index 100% rename from innobase/fut/Makefile.am rename to storage/innobase/fut/Makefile.am diff --git a/innobase/fut/fut0fut.c b/storage/innobase/fut/fut0fut.c similarity index 100% rename from innobase/fut/fut0fut.c rename to storage/innobase/fut/fut0fut.c diff --git a/innobase/fut/fut0lst.c b/storage/innobase/fut/fut0lst.c similarity index 100% rename from innobase/fut/fut0lst.c rename to storage/innobase/fut/fut0lst.c diff --git a/innobase/fut/makefilewin b/storage/innobase/fut/makefilewin similarity index 100% rename from innobase/fut/makefilewin rename to storage/innobase/fut/makefilewin diff --git a/innobase/ha/Makefile.am b/storage/innobase/ha/Makefile.am similarity index 100% rename from innobase/ha/Makefile.am rename to storage/innobase/ha/Makefile.am diff --git a/innobase/ha/ha0ha.c b/storage/innobase/ha/ha0ha.c similarity index 100% rename from innobase/ha/ha0ha.c rename to storage/innobase/ha/ha0ha.c diff --git a/innobase/ha/hash0hash.c b/storage/innobase/ha/hash0hash.c similarity index 100% rename from innobase/ha/hash0hash.c rename to storage/innobase/ha/hash0hash.c diff --git a/innobase/ha/makefilewin b/storage/innobase/ha/makefilewin similarity index 100% rename from innobase/ha/makefilewin rename to storage/innobase/ha/makefilewin diff --git a/innobase/ibuf/Makefile.am b/storage/innobase/ibuf/Makefile.am similarity index 100% rename from innobase/ibuf/Makefile.am rename to storage/innobase/ibuf/Makefile.am diff --git a/innobase/ibuf/ibuf0ibuf.c b/storage/innobase/ibuf/ibuf0ibuf.c similarity index 100% rename from innobase/ibuf/ibuf0ibuf.c rename to storage/innobase/ibuf/ibuf0ibuf.c diff --git a/innobase/ibuf/makefilewin b/storage/innobase/ibuf/makefilewin similarity index 100% rename from innobase/ibuf/makefilewin rename to storage/innobase/ibuf/makefilewin diff --git a/innobase/include/Makefile.am b/storage/innobase/include/Makefile.am similarity index 100% rename from innobase/include/Makefile.am rename to storage/innobase/include/Makefile.am diff --git a/innobase/include/Makefile.i b/storage/innobase/include/Makefile.i similarity index 100% rename from innobase/include/Makefile.i rename to storage/innobase/include/Makefile.i diff --git a/innobase/include/btr0btr.h b/storage/innobase/include/btr0btr.h similarity index 100% rename from innobase/include/btr0btr.h rename to storage/innobase/include/btr0btr.h diff --git a/innobase/include/btr0btr.ic b/storage/innobase/include/btr0btr.ic similarity index 100% rename from innobase/include/btr0btr.ic rename to storage/innobase/include/btr0btr.ic diff --git a/innobase/include/btr0cur.h b/storage/innobase/include/btr0cur.h similarity index 100% rename from innobase/include/btr0cur.h rename to storage/innobase/include/btr0cur.h diff --git a/innobase/include/btr0cur.ic b/storage/innobase/include/btr0cur.ic similarity index 100% rename from innobase/include/btr0cur.ic rename to storage/innobase/include/btr0cur.ic diff --git a/innobase/include/btr0pcur.h b/storage/innobase/include/btr0pcur.h similarity index 100% rename from innobase/include/btr0pcur.h rename to storage/innobase/include/btr0pcur.h diff --git a/innobase/include/btr0pcur.ic b/storage/innobase/include/btr0pcur.ic similarity index 100% rename from innobase/include/btr0pcur.ic rename to storage/innobase/include/btr0pcur.ic diff --git a/innobase/include/btr0sea.h b/storage/innobase/include/btr0sea.h similarity index 100% rename from innobase/include/btr0sea.h rename to storage/innobase/include/btr0sea.h diff --git a/innobase/include/btr0sea.ic b/storage/innobase/include/btr0sea.ic similarity index 100% rename from innobase/include/btr0sea.ic rename to storage/innobase/include/btr0sea.ic diff --git a/innobase/include/btr0types.h b/storage/innobase/include/btr0types.h similarity index 100% rename from innobase/include/btr0types.h rename to storage/innobase/include/btr0types.h diff --git a/innobase/include/buf0buf.h b/storage/innobase/include/buf0buf.h similarity index 100% rename from innobase/include/buf0buf.h rename to storage/innobase/include/buf0buf.h diff --git a/innobase/include/buf0buf.ic b/storage/innobase/include/buf0buf.ic similarity index 100% rename from innobase/include/buf0buf.ic rename to storage/innobase/include/buf0buf.ic diff --git a/innobase/include/buf0flu.h b/storage/innobase/include/buf0flu.h similarity index 100% rename from innobase/include/buf0flu.h rename to storage/innobase/include/buf0flu.h diff --git a/innobase/include/buf0flu.ic b/storage/innobase/include/buf0flu.ic similarity index 100% rename from innobase/include/buf0flu.ic rename to storage/innobase/include/buf0flu.ic diff --git a/innobase/include/buf0lru.h b/storage/innobase/include/buf0lru.h similarity index 100% rename from innobase/include/buf0lru.h rename to storage/innobase/include/buf0lru.h diff --git a/innobase/include/buf0lru.ic b/storage/innobase/include/buf0lru.ic similarity index 100% rename from innobase/include/buf0lru.ic rename to storage/innobase/include/buf0lru.ic diff --git a/innobase/include/buf0rea.h b/storage/innobase/include/buf0rea.h similarity index 100% rename from innobase/include/buf0rea.h rename to storage/innobase/include/buf0rea.h diff --git a/innobase/include/buf0types.h b/storage/innobase/include/buf0types.h similarity index 100% rename from innobase/include/buf0types.h rename to storage/innobase/include/buf0types.h diff --git a/innobase/include/data0data.h b/storage/innobase/include/data0data.h similarity index 100% rename from innobase/include/data0data.h rename to storage/innobase/include/data0data.h diff --git a/innobase/include/data0data.ic b/storage/innobase/include/data0data.ic similarity index 100% rename from innobase/include/data0data.ic rename to storage/innobase/include/data0data.ic diff --git a/innobase/include/data0type.h b/storage/innobase/include/data0type.h similarity index 100% rename from innobase/include/data0type.h rename to storage/innobase/include/data0type.h diff --git a/innobase/include/data0type.ic b/storage/innobase/include/data0type.ic similarity index 100% rename from innobase/include/data0type.ic rename to storage/innobase/include/data0type.ic diff --git a/innobase/include/data0types.h b/storage/innobase/include/data0types.h similarity index 100% rename from innobase/include/data0types.h rename to storage/innobase/include/data0types.h diff --git a/innobase/include/db0err.h b/storage/innobase/include/db0err.h similarity index 100% rename from innobase/include/db0err.h rename to storage/innobase/include/db0err.h diff --git a/innobase/include/dict0boot.h b/storage/innobase/include/dict0boot.h similarity index 100% rename from innobase/include/dict0boot.h rename to storage/innobase/include/dict0boot.h diff --git a/innobase/include/dict0boot.ic b/storage/innobase/include/dict0boot.ic similarity index 100% rename from innobase/include/dict0boot.ic rename to storage/innobase/include/dict0boot.ic diff --git a/innobase/include/dict0crea.h b/storage/innobase/include/dict0crea.h similarity index 100% rename from innobase/include/dict0crea.h rename to storage/innobase/include/dict0crea.h diff --git a/innobase/include/dict0crea.ic b/storage/innobase/include/dict0crea.ic similarity index 100% rename from innobase/include/dict0crea.ic rename to storage/innobase/include/dict0crea.ic diff --git a/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h similarity index 100% rename from innobase/include/dict0dict.h rename to storage/innobase/include/dict0dict.h diff --git a/innobase/include/dict0dict.ic b/storage/innobase/include/dict0dict.ic similarity index 100% rename from innobase/include/dict0dict.ic rename to storage/innobase/include/dict0dict.ic diff --git a/innobase/include/dict0load.h b/storage/innobase/include/dict0load.h similarity index 100% rename from innobase/include/dict0load.h rename to storage/innobase/include/dict0load.h diff --git a/innobase/include/dict0load.ic b/storage/innobase/include/dict0load.ic similarity index 100% rename from innobase/include/dict0load.ic rename to storage/innobase/include/dict0load.ic diff --git a/innobase/include/dict0mem.h b/storage/innobase/include/dict0mem.h similarity index 100% rename from innobase/include/dict0mem.h rename to storage/innobase/include/dict0mem.h diff --git a/innobase/include/dict0mem.ic b/storage/innobase/include/dict0mem.ic similarity index 100% rename from innobase/include/dict0mem.ic rename to storage/innobase/include/dict0mem.ic diff --git a/innobase/include/dict0types.h b/storage/innobase/include/dict0types.h similarity index 100% rename from innobase/include/dict0types.h rename to storage/innobase/include/dict0types.h diff --git a/innobase/include/dyn0dyn.h b/storage/innobase/include/dyn0dyn.h similarity index 100% rename from innobase/include/dyn0dyn.h rename to storage/innobase/include/dyn0dyn.h diff --git a/innobase/include/dyn0dyn.ic b/storage/innobase/include/dyn0dyn.ic similarity index 100% rename from innobase/include/dyn0dyn.ic rename to storage/innobase/include/dyn0dyn.ic diff --git a/innobase/include/eval0eval.h b/storage/innobase/include/eval0eval.h similarity index 100% rename from innobase/include/eval0eval.h rename to storage/innobase/include/eval0eval.h diff --git a/innobase/include/eval0eval.ic b/storage/innobase/include/eval0eval.ic similarity index 100% rename from innobase/include/eval0eval.ic rename to storage/innobase/include/eval0eval.ic diff --git a/innobase/include/eval0proc.h b/storage/innobase/include/eval0proc.h similarity index 100% rename from innobase/include/eval0proc.h rename to storage/innobase/include/eval0proc.h diff --git a/innobase/include/eval0proc.ic b/storage/innobase/include/eval0proc.ic similarity index 100% rename from innobase/include/eval0proc.ic rename to storage/innobase/include/eval0proc.ic diff --git a/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h similarity index 100% rename from innobase/include/fil0fil.h rename to storage/innobase/include/fil0fil.h diff --git a/innobase/include/fsp0fsp.h b/storage/innobase/include/fsp0fsp.h similarity index 100% rename from innobase/include/fsp0fsp.h rename to storage/innobase/include/fsp0fsp.h diff --git a/innobase/include/fsp0fsp.ic b/storage/innobase/include/fsp0fsp.ic similarity index 100% rename from innobase/include/fsp0fsp.ic rename to storage/innobase/include/fsp0fsp.ic diff --git a/innobase/include/fut0fut.h b/storage/innobase/include/fut0fut.h similarity index 100% rename from innobase/include/fut0fut.h rename to storage/innobase/include/fut0fut.h diff --git a/innobase/include/fut0fut.ic b/storage/innobase/include/fut0fut.ic similarity index 100% rename from innobase/include/fut0fut.ic rename to storage/innobase/include/fut0fut.ic diff --git a/innobase/include/fut0lst.h b/storage/innobase/include/fut0lst.h similarity index 100% rename from innobase/include/fut0lst.h rename to storage/innobase/include/fut0lst.h diff --git a/innobase/include/fut0lst.ic b/storage/innobase/include/fut0lst.ic similarity index 100% rename from innobase/include/fut0lst.ic rename to storage/innobase/include/fut0lst.ic diff --git a/innobase/include/ha0ha.h b/storage/innobase/include/ha0ha.h similarity index 100% rename from innobase/include/ha0ha.h rename to storage/innobase/include/ha0ha.h diff --git a/innobase/include/ha0ha.ic b/storage/innobase/include/ha0ha.ic similarity index 100% rename from innobase/include/ha0ha.ic rename to storage/innobase/include/ha0ha.ic diff --git a/innobase/include/hash0hash.h b/storage/innobase/include/hash0hash.h similarity index 100% rename from innobase/include/hash0hash.h rename to storage/innobase/include/hash0hash.h diff --git a/innobase/include/hash0hash.ic b/storage/innobase/include/hash0hash.ic similarity index 100% rename from innobase/include/hash0hash.ic rename to storage/innobase/include/hash0hash.ic diff --git a/innobase/include/ibuf0ibuf.h b/storage/innobase/include/ibuf0ibuf.h similarity index 100% rename from innobase/include/ibuf0ibuf.h rename to storage/innobase/include/ibuf0ibuf.h diff --git a/innobase/include/ibuf0ibuf.ic b/storage/innobase/include/ibuf0ibuf.ic similarity index 100% rename from innobase/include/ibuf0ibuf.ic rename to storage/innobase/include/ibuf0ibuf.ic diff --git a/innobase/include/ibuf0types.h b/storage/innobase/include/ibuf0types.h similarity index 100% rename from innobase/include/ibuf0types.h rename to storage/innobase/include/ibuf0types.h diff --git a/innobase/include/lock0lock.h b/storage/innobase/include/lock0lock.h similarity index 100% rename from innobase/include/lock0lock.h rename to storage/innobase/include/lock0lock.h diff --git a/innobase/include/lock0lock.ic b/storage/innobase/include/lock0lock.ic similarity index 100% rename from innobase/include/lock0lock.ic rename to storage/innobase/include/lock0lock.ic diff --git a/innobase/include/lock0types.h b/storage/innobase/include/lock0types.h similarity index 100% rename from innobase/include/lock0types.h rename to storage/innobase/include/lock0types.h diff --git a/innobase/include/log0log.h b/storage/innobase/include/log0log.h similarity index 100% rename from innobase/include/log0log.h rename to storage/innobase/include/log0log.h diff --git a/innobase/include/log0log.ic b/storage/innobase/include/log0log.ic similarity index 100% rename from innobase/include/log0log.ic rename to storage/innobase/include/log0log.ic diff --git a/innobase/include/log0recv.h b/storage/innobase/include/log0recv.h similarity index 100% rename from innobase/include/log0recv.h rename to storage/innobase/include/log0recv.h diff --git a/innobase/include/log0recv.ic b/storage/innobase/include/log0recv.ic similarity index 100% rename from innobase/include/log0recv.ic rename to storage/innobase/include/log0recv.ic diff --git a/innobase/include/mach0data.h b/storage/innobase/include/mach0data.h similarity index 100% rename from innobase/include/mach0data.h rename to storage/innobase/include/mach0data.h diff --git a/innobase/include/mach0data.ic b/storage/innobase/include/mach0data.ic similarity index 100% rename from innobase/include/mach0data.ic rename to storage/innobase/include/mach0data.ic diff --git a/innobase/include/makefilewin.i b/storage/innobase/include/makefilewin.i similarity index 100% rename from innobase/include/makefilewin.i rename to storage/innobase/include/makefilewin.i diff --git a/innobase/include/mem0dbg.h b/storage/innobase/include/mem0dbg.h similarity index 100% rename from innobase/include/mem0dbg.h rename to storage/innobase/include/mem0dbg.h diff --git a/innobase/include/mem0dbg.ic b/storage/innobase/include/mem0dbg.ic similarity index 100% rename from innobase/include/mem0dbg.ic rename to storage/innobase/include/mem0dbg.ic diff --git a/innobase/include/mem0mem.h b/storage/innobase/include/mem0mem.h similarity index 100% rename from innobase/include/mem0mem.h rename to storage/innobase/include/mem0mem.h diff --git a/innobase/include/mem0mem.ic b/storage/innobase/include/mem0mem.ic similarity index 100% rename from innobase/include/mem0mem.ic rename to storage/innobase/include/mem0mem.ic diff --git a/innobase/include/mem0pool.h b/storage/innobase/include/mem0pool.h similarity index 100% rename from innobase/include/mem0pool.h rename to storage/innobase/include/mem0pool.h diff --git a/innobase/include/mem0pool.ic b/storage/innobase/include/mem0pool.ic similarity index 100% rename from innobase/include/mem0pool.ic rename to storage/innobase/include/mem0pool.ic diff --git a/innobase/include/mtr0log.h b/storage/innobase/include/mtr0log.h similarity index 100% rename from innobase/include/mtr0log.h rename to storage/innobase/include/mtr0log.h diff --git a/innobase/include/mtr0log.ic b/storage/innobase/include/mtr0log.ic similarity index 100% rename from innobase/include/mtr0log.ic rename to storage/innobase/include/mtr0log.ic diff --git a/innobase/include/mtr0mtr.h b/storage/innobase/include/mtr0mtr.h similarity index 100% rename from innobase/include/mtr0mtr.h rename to storage/innobase/include/mtr0mtr.h diff --git a/innobase/include/mtr0mtr.ic b/storage/innobase/include/mtr0mtr.ic similarity index 100% rename from innobase/include/mtr0mtr.ic rename to storage/innobase/include/mtr0mtr.ic diff --git a/innobase/include/mtr0types.h b/storage/innobase/include/mtr0types.h similarity index 100% rename from innobase/include/mtr0types.h rename to storage/innobase/include/mtr0types.h diff --git a/innobase/include/os0file.h b/storage/innobase/include/os0file.h similarity index 100% rename from innobase/include/os0file.h rename to storage/innobase/include/os0file.h diff --git a/innobase/include/os0proc.h b/storage/innobase/include/os0proc.h similarity index 100% rename from innobase/include/os0proc.h rename to storage/innobase/include/os0proc.h diff --git a/innobase/include/os0proc.ic b/storage/innobase/include/os0proc.ic similarity index 100% rename from innobase/include/os0proc.ic rename to storage/innobase/include/os0proc.ic diff --git a/innobase/include/os0sync.h b/storage/innobase/include/os0sync.h similarity index 100% rename from innobase/include/os0sync.h rename to storage/innobase/include/os0sync.h diff --git a/innobase/include/os0sync.ic b/storage/innobase/include/os0sync.ic similarity index 100% rename from innobase/include/os0sync.ic rename to storage/innobase/include/os0sync.ic diff --git a/innobase/include/os0thread.h b/storage/innobase/include/os0thread.h similarity index 100% rename from innobase/include/os0thread.h rename to storage/innobase/include/os0thread.h diff --git a/innobase/include/os0thread.ic b/storage/innobase/include/os0thread.ic similarity index 100% rename from innobase/include/os0thread.ic rename to storage/innobase/include/os0thread.ic diff --git a/innobase/include/page0cur.h b/storage/innobase/include/page0cur.h similarity index 100% rename from innobase/include/page0cur.h rename to storage/innobase/include/page0cur.h diff --git a/innobase/include/page0cur.ic b/storage/innobase/include/page0cur.ic similarity index 100% rename from innobase/include/page0cur.ic rename to storage/innobase/include/page0cur.ic diff --git a/innobase/include/page0page.h b/storage/innobase/include/page0page.h similarity index 100% rename from innobase/include/page0page.h rename to storage/innobase/include/page0page.h diff --git a/innobase/include/page0page.ic b/storage/innobase/include/page0page.ic similarity index 100% rename from innobase/include/page0page.ic rename to storage/innobase/include/page0page.ic diff --git a/innobase/include/page0types.h b/storage/innobase/include/page0types.h similarity index 100% rename from innobase/include/page0types.h rename to storage/innobase/include/page0types.h diff --git a/innobase/include/pars0grm.h b/storage/innobase/include/pars0grm.h similarity index 100% rename from innobase/include/pars0grm.h rename to storage/innobase/include/pars0grm.h diff --git a/innobase/include/pars0opt.h b/storage/innobase/include/pars0opt.h similarity index 100% rename from innobase/include/pars0opt.h rename to storage/innobase/include/pars0opt.h diff --git a/innobase/include/pars0opt.ic b/storage/innobase/include/pars0opt.ic similarity index 100% rename from innobase/include/pars0opt.ic rename to storage/innobase/include/pars0opt.ic diff --git a/innobase/include/pars0pars.h b/storage/innobase/include/pars0pars.h similarity index 100% rename from innobase/include/pars0pars.h rename to storage/innobase/include/pars0pars.h diff --git a/innobase/include/pars0pars.ic b/storage/innobase/include/pars0pars.ic similarity index 100% rename from innobase/include/pars0pars.ic rename to storage/innobase/include/pars0pars.ic diff --git a/innobase/include/pars0sym.h b/storage/innobase/include/pars0sym.h similarity index 100% rename from innobase/include/pars0sym.h rename to storage/innobase/include/pars0sym.h diff --git a/innobase/include/pars0sym.ic b/storage/innobase/include/pars0sym.ic similarity index 100% rename from innobase/include/pars0sym.ic rename to storage/innobase/include/pars0sym.ic diff --git a/innobase/include/pars0types.h b/storage/innobase/include/pars0types.h similarity index 100% rename from innobase/include/pars0types.h rename to storage/innobase/include/pars0types.h diff --git a/innobase/include/que0que.h b/storage/innobase/include/que0que.h similarity index 100% rename from innobase/include/que0que.h rename to storage/innobase/include/que0que.h diff --git a/innobase/include/que0que.ic b/storage/innobase/include/que0que.ic similarity index 100% rename from innobase/include/que0que.ic rename to storage/innobase/include/que0que.ic diff --git a/innobase/include/que0types.h b/storage/innobase/include/que0types.h similarity index 100% rename from innobase/include/que0types.h rename to storage/innobase/include/que0types.h diff --git a/innobase/include/read0read.h b/storage/innobase/include/read0read.h similarity index 100% rename from innobase/include/read0read.h rename to storage/innobase/include/read0read.h diff --git a/innobase/include/read0read.ic b/storage/innobase/include/read0read.ic similarity index 100% rename from innobase/include/read0read.ic rename to storage/innobase/include/read0read.ic diff --git a/innobase/include/read0types.h b/storage/innobase/include/read0types.h similarity index 100% rename from innobase/include/read0types.h rename to storage/innobase/include/read0types.h diff --git a/innobase/include/rem0cmp.h b/storage/innobase/include/rem0cmp.h similarity index 100% rename from innobase/include/rem0cmp.h rename to storage/innobase/include/rem0cmp.h diff --git a/innobase/include/rem0cmp.ic b/storage/innobase/include/rem0cmp.ic similarity index 100% rename from innobase/include/rem0cmp.ic rename to storage/innobase/include/rem0cmp.ic diff --git a/innobase/include/rem0rec.h b/storage/innobase/include/rem0rec.h similarity index 100% rename from innobase/include/rem0rec.h rename to storage/innobase/include/rem0rec.h diff --git a/innobase/include/rem0rec.ic b/storage/innobase/include/rem0rec.ic similarity index 100% rename from innobase/include/rem0rec.ic rename to storage/innobase/include/rem0rec.ic diff --git a/innobase/include/rem0types.h b/storage/innobase/include/rem0types.h similarity index 100% rename from innobase/include/rem0types.h rename to storage/innobase/include/rem0types.h diff --git a/innobase/include/row0ins.h b/storage/innobase/include/row0ins.h similarity index 100% rename from innobase/include/row0ins.h rename to storage/innobase/include/row0ins.h diff --git a/innobase/include/row0ins.ic b/storage/innobase/include/row0ins.ic similarity index 100% rename from innobase/include/row0ins.ic rename to storage/innobase/include/row0ins.ic diff --git a/innobase/include/row0mysql.h b/storage/innobase/include/row0mysql.h similarity index 100% rename from innobase/include/row0mysql.h rename to storage/innobase/include/row0mysql.h diff --git a/innobase/include/row0mysql.ic b/storage/innobase/include/row0mysql.ic similarity index 100% rename from innobase/include/row0mysql.ic rename to storage/innobase/include/row0mysql.ic diff --git a/innobase/include/row0purge.h b/storage/innobase/include/row0purge.h similarity index 100% rename from innobase/include/row0purge.h rename to storage/innobase/include/row0purge.h diff --git a/innobase/include/row0purge.ic b/storage/innobase/include/row0purge.ic similarity index 100% rename from innobase/include/row0purge.ic rename to storage/innobase/include/row0purge.ic diff --git a/innobase/include/row0row.h b/storage/innobase/include/row0row.h similarity index 100% rename from innobase/include/row0row.h rename to storage/innobase/include/row0row.h diff --git a/innobase/include/row0row.ic b/storage/innobase/include/row0row.ic similarity index 100% rename from innobase/include/row0row.ic rename to storage/innobase/include/row0row.ic diff --git a/innobase/include/row0sel.h b/storage/innobase/include/row0sel.h similarity index 100% rename from innobase/include/row0sel.h rename to storage/innobase/include/row0sel.h diff --git a/innobase/include/row0sel.ic b/storage/innobase/include/row0sel.ic similarity index 100% rename from innobase/include/row0sel.ic rename to storage/innobase/include/row0sel.ic diff --git a/innobase/include/row0types.h b/storage/innobase/include/row0types.h similarity index 100% rename from innobase/include/row0types.h rename to storage/innobase/include/row0types.h diff --git a/innobase/include/row0uins.h b/storage/innobase/include/row0uins.h similarity index 100% rename from innobase/include/row0uins.h rename to storage/innobase/include/row0uins.h diff --git a/innobase/include/row0uins.ic b/storage/innobase/include/row0uins.ic similarity index 100% rename from innobase/include/row0uins.ic rename to storage/innobase/include/row0uins.ic diff --git a/innobase/include/row0umod.h b/storage/innobase/include/row0umod.h similarity index 100% rename from innobase/include/row0umod.h rename to storage/innobase/include/row0umod.h diff --git a/innobase/include/row0umod.ic b/storage/innobase/include/row0umod.ic similarity index 100% rename from innobase/include/row0umod.ic rename to storage/innobase/include/row0umod.ic diff --git a/innobase/include/row0undo.h b/storage/innobase/include/row0undo.h similarity index 100% rename from innobase/include/row0undo.h rename to storage/innobase/include/row0undo.h diff --git a/innobase/include/row0undo.ic b/storage/innobase/include/row0undo.ic similarity index 100% rename from innobase/include/row0undo.ic rename to storage/innobase/include/row0undo.ic diff --git a/innobase/include/row0upd.h b/storage/innobase/include/row0upd.h similarity index 100% rename from innobase/include/row0upd.h rename to storage/innobase/include/row0upd.h diff --git a/innobase/include/row0upd.ic b/storage/innobase/include/row0upd.ic similarity index 100% rename from innobase/include/row0upd.ic rename to storage/innobase/include/row0upd.ic diff --git a/innobase/include/row0vers.h b/storage/innobase/include/row0vers.h similarity index 100% rename from innobase/include/row0vers.h rename to storage/innobase/include/row0vers.h diff --git a/innobase/include/row0vers.ic b/storage/innobase/include/row0vers.ic similarity index 100% rename from innobase/include/row0vers.ic rename to storage/innobase/include/row0vers.ic diff --git a/innobase/include/srv0que.h b/storage/innobase/include/srv0que.h similarity index 100% rename from innobase/include/srv0que.h rename to storage/innobase/include/srv0que.h diff --git a/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h similarity index 100% rename from innobase/include/srv0srv.h rename to storage/innobase/include/srv0srv.h diff --git a/innobase/include/srv0srv.ic b/storage/innobase/include/srv0srv.ic similarity index 100% rename from innobase/include/srv0srv.ic rename to storage/innobase/include/srv0srv.ic diff --git a/innobase/include/srv0start.h b/storage/innobase/include/srv0start.h similarity index 100% rename from innobase/include/srv0start.h rename to storage/innobase/include/srv0start.h diff --git a/innobase/include/sync0arr.h b/storage/innobase/include/sync0arr.h similarity index 100% rename from innobase/include/sync0arr.h rename to storage/innobase/include/sync0arr.h diff --git a/innobase/include/sync0arr.ic b/storage/innobase/include/sync0arr.ic similarity index 100% rename from innobase/include/sync0arr.ic rename to storage/innobase/include/sync0arr.ic diff --git a/innobase/include/sync0rw.h b/storage/innobase/include/sync0rw.h similarity index 100% rename from innobase/include/sync0rw.h rename to storage/innobase/include/sync0rw.h diff --git a/innobase/include/sync0rw.ic b/storage/innobase/include/sync0rw.ic similarity index 100% rename from innobase/include/sync0rw.ic rename to storage/innobase/include/sync0rw.ic diff --git a/innobase/include/sync0sync.h b/storage/innobase/include/sync0sync.h similarity index 100% rename from innobase/include/sync0sync.h rename to storage/innobase/include/sync0sync.h diff --git a/innobase/include/sync0sync.ic b/storage/innobase/include/sync0sync.ic similarity index 100% rename from innobase/include/sync0sync.ic rename to storage/innobase/include/sync0sync.ic diff --git a/innobase/include/sync0types.h b/storage/innobase/include/sync0types.h similarity index 100% rename from innobase/include/sync0types.h rename to storage/innobase/include/sync0types.h diff --git a/innobase/include/thr0loc.h b/storage/innobase/include/thr0loc.h similarity index 100% rename from innobase/include/thr0loc.h rename to storage/innobase/include/thr0loc.h diff --git a/innobase/include/thr0loc.ic b/storage/innobase/include/thr0loc.ic similarity index 100% rename from innobase/include/thr0loc.ic rename to storage/innobase/include/thr0loc.ic diff --git a/innobase/include/trx0purge.h b/storage/innobase/include/trx0purge.h similarity index 100% rename from innobase/include/trx0purge.h rename to storage/innobase/include/trx0purge.h diff --git a/innobase/include/trx0purge.ic b/storage/innobase/include/trx0purge.ic similarity index 100% rename from innobase/include/trx0purge.ic rename to storage/innobase/include/trx0purge.ic diff --git a/innobase/include/trx0rec.h b/storage/innobase/include/trx0rec.h similarity index 100% rename from innobase/include/trx0rec.h rename to storage/innobase/include/trx0rec.h diff --git a/innobase/include/trx0rec.ic b/storage/innobase/include/trx0rec.ic similarity index 100% rename from innobase/include/trx0rec.ic rename to storage/innobase/include/trx0rec.ic diff --git a/innobase/include/trx0roll.h b/storage/innobase/include/trx0roll.h similarity index 100% rename from innobase/include/trx0roll.h rename to storage/innobase/include/trx0roll.h diff --git a/innobase/include/trx0roll.ic b/storage/innobase/include/trx0roll.ic similarity index 100% rename from innobase/include/trx0roll.ic rename to storage/innobase/include/trx0roll.ic diff --git a/innobase/include/trx0rseg.h b/storage/innobase/include/trx0rseg.h similarity index 100% rename from innobase/include/trx0rseg.h rename to storage/innobase/include/trx0rseg.h diff --git a/innobase/include/trx0rseg.ic b/storage/innobase/include/trx0rseg.ic similarity index 100% rename from innobase/include/trx0rseg.ic rename to storage/innobase/include/trx0rseg.ic diff --git a/innobase/include/trx0sys.h b/storage/innobase/include/trx0sys.h similarity index 100% rename from innobase/include/trx0sys.h rename to storage/innobase/include/trx0sys.h diff --git a/innobase/include/trx0sys.ic b/storage/innobase/include/trx0sys.ic similarity index 100% rename from innobase/include/trx0sys.ic rename to storage/innobase/include/trx0sys.ic diff --git a/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h similarity index 100% rename from innobase/include/trx0trx.h rename to storage/innobase/include/trx0trx.h diff --git a/innobase/include/trx0trx.ic b/storage/innobase/include/trx0trx.ic similarity index 100% rename from innobase/include/trx0trx.ic rename to storage/innobase/include/trx0trx.ic diff --git a/innobase/include/trx0types.h b/storage/innobase/include/trx0types.h similarity index 100% rename from innobase/include/trx0types.h rename to storage/innobase/include/trx0types.h diff --git a/innobase/include/trx0undo.h b/storage/innobase/include/trx0undo.h similarity index 100% rename from innobase/include/trx0undo.h rename to storage/innobase/include/trx0undo.h diff --git a/innobase/include/trx0undo.ic b/storage/innobase/include/trx0undo.ic similarity index 100% rename from innobase/include/trx0undo.ic rename to storage/innobase/include/trx0undo.ic diff --git a/innobase/include/trx0xa.h b/storage/innobase/include/trx0xa.h similarity index 100% rename from innobase/include/trx0xa.h rename to storage/innobase/include/trx0xa.h diff --git a/innobase/include/univ.i b/storage/innobase/include/univ.i similarity index 100% rename from innobase/include/univ.i rename to storage/innobase/include/univ.i diff --git a/innobase/include/usr0sess.h b/storage/innobase/include/usr0sess.h similarity index 100% rename from innobase/include/usr0sess.h rename to storage/innobase/include/usr0sess.h diff --git a/innobase/include/usr0sess.ic b/storage/innobase/include/usr0sess.ic similarity index 100% rename from innobase/include/usr0sess.ic rename to storage/innobase/include/usr0sess.ic diff --git a/innobase/include/usr0types.h b/storage/innobase/include/usr0types.h similarity index 100% rename from innobase/include/usr0types.h rename to storage/innobase/include/usr0types.h diff --git a/innobase/include/ut0byte.h b/storage/innobase/include/ut0byte.h similarity index 100% rename from innobase/include/ut0byte.h rename to storage/innobase/include/ut0byte.h diff --git a/innobase/include/ut0byte.ic b/storage/innobase/include/ut0byte.ic similarity index 100% rename from innobase/include/ut0byte.ic rename to storage/innobase/include/ut0byte.ic diff --git a/innobase/include/ut0dbg.h b/storage/innobase/include/ut0dbg.h similarity index 100% rename from innobase/include/ut0dbg.h rename to storage/innobase/include/ut0dbg.h diff --git a/innobase/include/ut0lst.h b/storage/innobase/include/ut0lst.h similarity index 100% rename from innobase/include/ut0lst.h rename to storage/innobase/include/ut0lst.h diff --git a/innobase/include/ut0mem.h b/storage/innobase/include/ut0mem.h similarity index 100% rename from innobase/include/ut0mem.h rename to storage/innobase/include/ut0mem.h diff --git a/innobase/include/ut0mem.ic b/storage/innobase/include/ut0mem.ic similarity index 100% rename from innobase/include/ut0mem.ic rename to storage/innobase/include/ut0mem.ic diff --git a/innobase/include/ut0rnd.h b/storage/innobase/include/ut0rnd.h similarity index 100% rename from innobase/include/ut0rnd.h rename to storage/innobase/include/ut0rnd.h diff --git a/innobase/include/ut0rnd.ic b/storage/innobase/include/ut0rnd.ic similarity index 100% rename from innobase/include/ut0rnd.ic rename to storage/innobase/include/ut0rnd.ic diff --git a/innobase/include/ut0sort.h b/storage/innobase/include/ut0sort.h similarity index 100% rename from innobase/include/ut0sort.h rename to storage/innobase/include/ut0sort.h diff --git a/innobase/include/ut0ut.h b/storage/innobase/include/ut0ut.h similarity index 100% rename from innobase/include/ut0ut.h rename to storage/innobase/include/ut0ut.h diff --git a/innobase/include/ut0ut.ic b/storage/innobase/include/ut0ut.ic similarity index 100% rename from innobase/include/ut0ut.ic rename to storage/innobase/include/ut0ut.ic diff --git a/innobase/lock/Makefile.am b/storage/innobase/lock/Makefile.am similarity index 100% rename from innobase/lock/Makefile.am rename to storage/innobase/lock/Makefile.am diff --git a/innobase/lock/lock0lock.c b/storage/innobase/lock/lock0lock.c similarity index 100% rename from innobase/lock/lock0lock.c rename to storage/innobase/lock/lock0lock.c diff --git a/innobase/lock/makefilewin b/storage/innobase/lock/makefilewin similarity index 100% rename from innobase/lock/makefilewin rename to storage/innobase/lock/makefilewin diff --git a/innobase/log/Makefile.am b/storage/innobase/log/Makefile.am similarity index 100% rename from innobase/log/Makefile.am rename to storage/innobase/log/Makefile.am diff --git a/innobase/log/log0log.c b/storage/innobase/log/log0log.c similarity index 100% rename from innobase/log/log0log.c rename to storage/innobase/log/log0log.c diff --git a/innobase/log/log0recv.c b/storage/innobase/log/log0recv.c similarity index 100% rename from innobase/log/log0recv.c rename to storage/innobase/log/log0recv.c diff --git a/innobase/log/makefilewin b/storage/innobase/log/makefilewin similarity index 100% rename from innobase/log/makefilewin rename to storage/innobase/log/makefilewin diff --git a/innobase/mach/Makefile.am b/storage/innobase/mach/Makefile.am similarity index 100% rename from innobase/mach/Makefile.am rename to storage/innobase/mach/Makefile.am diff --git a/innobase/mach/mach0data.c b/storage/innobase/mach/mach0data.c similarity index 100% rename from innobase/mach/mach0data.c rename to storage/innobase/mach/mach0data.c diff --git a/innobase/mach/makefilewin b/storage/innobase/mach/makefilewin similarity index 100% rename from innobase/mach/makefilewin rename to storage/innobase/mach/makefilewin diff --git a/innobase/makefilewin b/storage/innobase/makefilewin similarity index 100% rename from innobase/makefilewin rename to storage/innobase/makefilewin diff --git a/innobase/mem/Makefile.am b/storage/innobase/mem/Makefile.am similarity index 100% rename from innobase/mem/Makefile.am rename to storage/innobase/mem/Makefile.am diff --git a/innobase/mem/makefilewin b/storage/innobase/mem/makefilewin similarity index 100% rename from innobase/mem/makefilewin rename to storage/innobase/mem/makefilewin diff --git a/innobase/mem/mem0dbg.c b/storage/innobase/mem/mem0dbg.c similarity index 100% rename from innobase/mem/mem0dbg.c rename to storage/innobase/mem/mem0dbg.c diff --git a/innobase/mem/mem0mem.c b/storage/innobase/mem/mem0mem.c similarity index 100% rename from innobase/mem/mem0mem.c rename to storage/innobase/mem/mem0mem.c diff --git a/innobase/mem/mem0pool.c b/storage/innobase/mem/mem0pool.c similarity index 100% rename from innobase/mem/mem0pool.c rename to storage/innobase/mem/mem0pool.c diff --git a/innobase/mtr/Makefile.am b/storage/innobase/mtr/Makefile.am similarity index 100% rename from innobase/mtr/Makefile.am rename to storage/innobase/mtr/Makefile.am diff --git a/innobase/mtr/makefilewin b/storage/innobase/mtr/makefilewin similarity index 100% rename from innobase/mtr/makefilewin rename to storage/innobase/mtr/makefilewin diff --git a/innobase/mtr/mtr0log.c b/storage/innobase/mtr/mtr0log.c similarity index 100% rename from innobase/mtr/mtr0log.c rename to storage/innobase/mtr/mtr0log.c diff --git a/innobase/mtr/mtr0mtr.c b/storage/innobase/mtr/mtr0mtr.c similarity index 100% rename from innobase/mtr/mtr0mtr.c rename to storage/innobase/mtr/mtr0mtr.c diff --git a/innobase/my_cnf b/storage/innobase/my_cnf similarity index 100% rename from innobase/my_cnf rename to storage/innobase/my_cnf diff --git a/innobase/os/Makefile.am b/storage/innobase/os/Makefile.am similarity index 100% rename from innobase/os/Makefile.am rename to storage/innobase/os/Makefile.am diff --git a/innobase/os/makefilewin b/storage/innobase/os/makefilewin similarity index 100% rename from innobase/os/makefilewin rename to storage/innobase/os/makefilewin diff --git a/innobase/os/os0file.c b/storage/innobase/os/os0file.c similarity index 100% rename from innobase/os/os0file.c rename to storage/innobase/os/os0file.c diff --git a/innobase/os/os0proc.c b/storage/innobase/os/os0proc.c similarity index 100% rename from innobase/os/os0proc.c rename to storage/innobase/os/os0proc.c diff --git a/innobase/os/os0sync.c b/storage/innobase/os/os0sync.c similarity index 100% rename from innobase/os/os0sync.c rename to storage/innobase/os/os0sync.c diff --git a/innobase/os/os0thread.c b/storage/innobase/os/os0thread.c similarity index 100% rename from innobase/os/os0thread.c rename to storage/innobase/os/os0thread.c diff --git a/innobase/page/Makefile.am b/storage/innobase/page/Makefile.am similarity index 100% rename from innobase/page/Makefile.am rename to storage/innobase/page/Makefile.am diff --git a/innobase/page/makefilewin b/storage/innobase/page/makefilewin similarity index 100% rename from innobase/page/makefilewin rename to storage/innobase/page/makefilewin diff --git a/innobase/page/page0cur.c b/storage/innobase/page/page0cur.c similarity index 100% rename from innobase/page/page0cur.c rename to storage/innobase/page/page0cur.c diff --git a/innobase/page/page0page.c b/storage/innobase/page/page0page.c similarity index 100% rename from innobase/page/page0page.c rename to storage/innobase/page/page0page.c diff --git a/innobase/pars/Makefile.am b/storage/innobase/pars/Makefile.am similarity index 100% rename from innobase/pars/Makefile.am rename to storage/innobase/pars/Makefile.am diff --git a/innobase/pars/lexyy.c b/storage/innobase/pars/lexyy.c similarity index 100% rename from innobase/pars/lexyy.c rename to storage/innobase/pars/lexyy.c diff --git a/innobase/pars/makefilewin b/storage/innobase/pars/makefilewin similarity index 100% rename from innobase/pars/makefilewin rename to storage/innobase/pars/makefilewin diff --git a/innobase/pars/pars0grm.c b/storage/innobase/pars/pars0grm.c similarity index 100% rename from innobase/pars/pars0grm.c rename to storage/innobase/pars/pars0grm.c diff --git a/innobase/pars/pars0grm.h b/storage/innobase/pars/pars0grm.h similarity index 100% rename from innobase/pars/pars0grm.h rename to storage/innobase/pars/pars0grm.h diff --git a/innobase/pars/pars0grm.y b/storage/innobase/pars/pars0grm.y similarity index 100% rename from innobase/pars/pars0grm.y rename to storage/innobase/pars/pars0grm.y diff --git a/innobase/pars/pars0lex.l b/storage/innobase/pars/pars0lex.l similarity index 100% rename from innobase/pars/pars0lex.l rename to storage/innobase/pars/pars0lex.l diff --git a/innobase/pars/pars0opt.c b/storage/innobase/pars/pars0opt.c similarity index 100% rename from innobase/pars/pars0opt.c rename to storage/innobase/pars/pars0opt.c diff --git a/innobase/pars/pars0pars.c b/storage/innobase/pars/pars0pars.c similarity index 100% rename from innobase/pars/pars0pars.c rename to storage/innobase/pars/pars0pars.c diff --git a/innobase/pars/pars0sym.c b/storage/innobase/pars/pars0sym.c similarity index 100% rename from innobase/pars/pars0sym.c rename to storage/innobase/pars/pars0sym.c diff --git a/innobase/que/Makefile.am b/storage/innobase/que/Makefile.am similarity index 100% rename from innobase/que/Makefile.am rename to storage/innobase/que/Makefile.am diff --git a/innobase/que/makefilewin b/storage/innobase/que/makefilewin similarity index 100% rename from innobase/que/makefilewin rename to storage/innobase/que/makefilewin diff --git a/innobase/que/que0que.c b/storage/innobase/que/que0que.c similarity index 100% rename from innobase/que/que0que.c rename to storage/innobase/que/que0que.c diff --git a/innobase/read/Makefile.am b/storage/innobase/read/Makefile.am similarity index 100% rename from innobase/read/Makefile.am rename to storage/innobase/read/Makefile.am diff --git a/innobase/read/makefilewin b/storage/innobase/read/makefilewin similarity index 100% rename from innobase/read/makefilewin rename to storage/innobase/read/makefilewin diff --git a/innobase/read/read0read.c b/storage/innobase/read/read0read.c similarity index 100% rename from innobase/read/read0read.c rename to storage/innobase/read/read0read.c diff --git a/innobase/rem/Makefile.am b/storage/innobase/rem/Makefile.am similarity index 100% rename from innobase/rem/Makefile.am rename to storage/innobase/rem/Makefile.am diff --git a/innobase/rem/makefilewin b/storage/innobase/rem/makefilewin similarity index 100% rename from innobase/rem/makefilewin rename to storage/innobase/rem/makefilewin diff --git a/innobase/rem/rem0cmp.c b/storage/innobase/rem/rem0cmp.c similarity index 100% rename from innobase/rem/rem0cmp.c rename to storage/innobase/rem/rem0cmp.c diff --git a/innobase/rem/rem0rec.c b/storage/innobase/rem/rem0rec.c similarity index 100% rename from innobase/rem/rem0rec.c rename to storage/innobase/rem/rem0rec.c diff --git a/innobase/row/Makefile.am b/storage/innobase/row/Makefile.am similarity index 100% rename from innobase/row/Makefile.am rename to storage/innobase/row/Makefile.am diff --git a/innobase/row/makefilewin b/storage/innobase/row/makefilewin similarity index 100% rename from innobase/row/makefilewin rename to storage/innobase/row/makefilewin diff --git a/innobase/row/row0ins.c b/storage/innobase/row/row0ins.c similarity index 100% rename from innobase/row/row0ins.c rename to storage/innobase/row/row0ins.c diff --git a/innobase/row/row0mysql.c b/storage/innobase/row/row0mysql.c similarity index 100% rename from innobase/row/row0mysql.c rename to storage/innobase/row/row0mysql.c diff --git a/innobase/row/row0purge.c b/storage/innobase/row/row0purge.c similarity index 100% rename from innobase/row/row0purge.c rename to storage/innobase/row/row0purge.c diff --git a/innobase/row/row0row.c b/storage/innobase/row/row0row.c similarity index 100% rename from innobase/row/row0row.c rename to storage/innobase/row/row0row.c diff --git a/innobase/row/row0sel.c b/storage/innobase/row/row0sel.c similarity index 100% rename from innobase/row/row0sel.c rename to storage/innobase/row/row0sel.c diff --git a/innobase/row/row0uins.c b/storage/innobase/row/row0uins.c similarity index 100% rename from innobase/row/row0uins.c rename to storage/innobase/row/row0uins.c diff --git a/innobase/row/row0umod.c b/storage/innobase/row/row0umod.c similarity index 100% rename from innobase/row/row0umod.c rename to storage/innobase/row/row0umod.c diff --git a/innobase/row/row0undo.c b/storage/innobase/row/row0undo.c similarity index 100% rename from innobase/row/row0undo.c rename to storage/innobase/row/row0undo.c diff --git a/innobase/row/row0upd.c b/storage/innobase/row/row0upd.c similarity index 100% rename from innobase/row/row0upd.c rename to storage/innobase/row/row0upd.c diff --git a/innobase/row/row0vers.c b/storage/innobase/row/row0vers.c similarity index 100% rename from innobase/row/row0vers.c rename to storage/innobase/row/row0vers.c diff --git a/innobase/srv/Makefile.am b/storage/innobase/srv/Makefile.am similarity index 100% rename from innobase/srv/Makefile.am rename to storage/innobase/srv/Makefile.am diff --git a/innobase/srv/makefilewin b/storage/innobase/srv/makefilewin similarity index 100% rename from innobase/srv/makefilewin rename to storage/innobase/srv/makefilewin diff --git a/innobase/srv/srv0que.c b/storage/innobase/srv/srv0que.c similarity index 100% rename from innobase/srv/srv0que.c rename to storage/innobase/srv/srv0que.c diff --git a/innobase/srv/srv0srv.c b/storage/innobase/srv/srv0srv.c similarity index 100% rename from innobase/srv/srv0srv.c rename to storage/innobase/srv/srv0srv.c diff --git a/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c similarity index 100% rename from innobase/srv/srv0start.c rename to storage/innobase/srv/srv0start.c diff --git a/innobase/sync/Makefile.am b/storage/innobase/sync/Makefile.am similarity index 100% rename from innobase/sync/Makefile.am rename to storage/innobase/sync/Makefile.am diff --git a/innobase/sync/makefilewin b/storage/innobase/sync/makefilewin similarity index 100% rename from innobase/sync/makefilewin rename to storage/innobase/sync/makefilewin diff --git a/innobase/sync/sync0arr.c b/storage/innobase/sync/sync0arr.c similarity index 100% rename from innobase/sync/sync0arr.c rename to storage/innobase/sync/sync0arr.c diff --git a/innobase/sync/sync0rw.c b/storage/innobase/sync/sync0rw.c similarity index 100% rename from innobase/sync/sync0rw.c rename to storage/innobase/sync/sync0rw.c diff --git a/innobase/sync/sync0sync.c b/storage/innobase/sync/sync0sync.c similarity index 100% rename from innobase/sync/sync0sync.c rename to storage/innobase/sync/sync0sync.c diff --git a/innobase/thr/Makefile.am b/storage/innobase/thr/Makefile.am similarity index 100% rename from innobase/thr/Makefile.am rename to storage/innobase/thr/Makefile.am diff --git a/innobase/thr/makefilewin b/storage/innobase/thr/makefilewin similarity index 100% rename from innobase/thr/makefilewin rename to storage/innobase/thr/makefilewin diff --git a/innobase/thr/thr0loc.c b/storage/innobase/thr/thr0loc.c similarity index 100% rename from innobase/thr/thr0loc.c rename to storage/innobase/thr/thr0loc.c diff --git a/innobase/trx/Makefile.am b/storage/innobase/trx/Makefile.am similarity index 100% rename from innobase/trx/Makefile.am rename to storage/innobase/trx/Makefile.am diff --git a/innobase/trx/makefilewin b/storage/innobase/trx/makefilewin similarity index 100% rename from innobase/trx/makefilewin rename to storage/innobase/trx/makefilewin diff --git a/innobase/trx/trx0purge.c b/storage/innobase/trx/trx0purge.c similarity index 100% rename from innobase/trx/trx0purge.c rename to storage/innobase/trx/trx0purge.c diff --git a/innobase/trx/trx0rec.c b/storage/innobase/trx/trx0rec.c similarity index 100% rename from innobase/trx/trx0rec.c rename to storage/innobase/trx/trx0rec.c diff --git a/innobase/trx/trx0roll.c b/storage/innobase/trx/trx0roll.c similarity index 100% rename from innobase/trx/trx0roll.c rename to storage/innobase/trx/trx0roll.c diff --git a/innobase/trx/trx0rseg.c b/storage/innobase/trx/trx0rseg.c similarity index 100% rename from innobase/trx/trx0rseg.c rename to storage/innobase/trx/trx0rseg.c diff --git a/innobase/trx/trx0sys.c b/storage/innobase/trx/trx0sys.c similarity index 100% rename from innobase/trx/trx0sys.c rename to storage/innobase/trx/trx0sys.c diff --git a/innobase/trx/trx0trx.c b/storage/innobase/trx/trx0trx.c similarity index 100% rename from innobase/trx/trx0trx.c rename to storage/innobase/trx/trx0trx.c diff --git a/innobase/trx/trx0undo.c b/storage/innobase/trx/trx0undo.c similarity index 100% rename from innobase/trx/trx0undo.c rename to storage/innobase/trx/trx0undo.c diff --git a/innobase/usr/Makefile.am b/storage/innobase/usr/Makefile.am similarity index 100% rename from innobase/usr/Makefile.am rename to storage/innobase/usr/Makefile.am diff --git a/innobase/usr/makefilewin b/storage/innobase/usr/makefilewin similarity index 100% rename from innobase/usr/makefilewin rename to storage/innobase/usr/makefilewin diff --git a/innobase/usr/usr0sess.c b/storage/innobase/usr/usr0sess.c similarity index 100% rename from innobase/usr/usr0sess.c rename to storage/innobase/usr/usr0sess.c diff --git a/innobase/ut/Makefile.am b/storage/innobase/ut/Makefile.am similarity index 100% rename from innobase/ut/Makefile.am rename to storage/innobase/ut/Makefile.am diff --git a/innobase/ut/makefilewin b/storage/innobase/ut/makefilewin similarity index 100% rename from innobase/ut/makefilewin rename to storage/innobase/ut/makefilewin diff --git a/innobase/ut/ut0byte.c b/storage/innobase/ut/ut0byte.c similarity index 100% rename from innobase/ut/ut0byte.c rename to storage/innobase/ut/ut0byte.c diff --git a/innobase/ut/ut0dbg.c b/storage/innobase/ut/ut0dbg.c similarity index 100% rename from innobase/ut/ut0dbg.c rename to storage/innobase/ut/ut0dbg.c diff --git a/innobase/ut/ut0mem.c b/storage/innobase/ut/ut0mem.c similarity index 100% rename from innobase/ut/ut0mem.c rename to storage/innobase/ut/ut0mem.c diff --git a/innobase/ut/ut0rnd.c b/storage/innobase/ut/ut0rnd.c similarity index 100% rename from innobase/ut/ut0rnd.c rename to storage/innobase/ut/ut0rnd.c diff --git a/innobase/ut/ut0ut.c b/storage/innobase/ut/ut0ut.c similarity index 100% rename from innobase/ut/ut0ut.c rename to storage/innobase/ut/ut0ut.c diff --git a/myisam/.cvsignore b/storage/myisam/.cvsignore similarity index 100% rename from myisam/.cvsignore rename to storage/myisam/.cvsignore diff --git a/myisam/ChangeLog b/storage/myisam/ChangeLog similarity index 100% rename from myisam/ChangeLog rename to storage/myisam/ChangeLog diff --git a/myisam/Makefile.am b/storage/myisam/Makefile.am similarity index 100% rename from myisam/Makefile.am rename to storage/myisam/Makefile.am diff --git a/myisam/NEWS b/storage/myisam/NEWS similarity index 100% rename from myisam/NEWS rename to storage/myisam/NEWS diff --git a/myisam/TODO b/storage/myisam/TODO similarity index 100% rename from myisam/TODO rename to storage/myisam/TODO diff --git a/myisam/ft_boolean_search.c b/storage/myisam/ft_boolean_search.c similarity index 100% rename from myisam/ft_boolean_search.c rename to storage/myisam/ft_boolean_search.c diff --git a/myisam/ft_eval.c b/storage/myisam/ft_eval.c similarity index 100% rename from myisam/ft_eval.c rename to storage/myisam/ft_eval.c diff --git a/myisam/ft_eval.h b/storage/myisam/ft_eval.h similarity index 100% rename from myisam/ft_eval.h rename to storage/myisam/ft_eval.h diff --git a/myisam/ft_nlq_search.c b/storage/myisam/ft_nlq_search.c similarity index 100% rename from myisam/ft_nlq_search.c rename to storage/myisam/ft_nlq_search.c diff --git a/myisam/ft_parser.c b/storage/myisam/ft_parser.c similarity index 100% rename from myisam/ft_parser.c rename to storage/myisam/ft_parser.c diff --git a/myisam/ft_static.c b/storage/myisam/ft_static.c similarity index 100% rename from myisam/ft_static.c rename to storage/myisam/ft_static.c diff --git a/myisam/ft_stem.c b/storage/myisam/ft_stem.c similarity index 100% rename from myisam/ft_stem.c rename to storage/myisam/ft_stem.c diff --git a/myisam/ft_stopwords.c b/storage/myisam/ft_stopwords.c similarity index 100% rename from myisam/ft_stopwords.c rename to storage/myisam/ft_stopwords.c diff --git a/myisam/ft_test1.c b/storage/myisam/ft_test1.c similarity index 100% rename from myisam/ft_test1.c rename to storage/myisam/ft_test1.c diff --git a/myisam/ft_test1.h b/storage/myisam/ft_test1.h similarity index 100% rename from myisam/ft_test1.h rename to storage/myisam/ft_test1.h diff --git a/myisam/ft_update.c b/storage/myisam/ft_update.c similarity index 100% rename from myisam/ft_update.c rename to storage/myisam/ft_update.c diff --git a/myisam/ftbench/Ecompare.pl b/storage/myisam/ftbench/Ecompare.pl similarity index 100% rename from myisam/ftbench/Ecompare.pl rename to storage/myisam/ftbench/Ecompare.pl diff --git a/myisam/ftbench/Ecreate.pl b/storage/myisam/ftbench/Ecreate.pl similarity index 100% rename from myisam/ftbench/Ecreate.pl rename to storage/myisam/ftbench/Ecreate.pl diff --git a/myisam/ftbench/Ereport.pl b/storage/myisam/ftbench/Ereport.pl similarity index 100% rename from myisam/ftbench/Ereport.pl rename to storage/myisam/ftbench/Ereport.pl diff --git a/myisam/ftbench/README b/storage/myisam/ftbench/README similarity index 100% rename from myisam/ftbench/README rename to storage/myisam/ftbench/README diff --git a/myisam/ftbench/ft-test-run.sh b/storage/myisam/ftbench/ft-test-run.sh similarity index 100% rename from myisam/ftbench/ft-test-run.sh rename to storage/myisam/ftbench/ft-test-run.sh diff --git a/myisam/ftdefs.h b/storage/myisam/ftdefs.h similarity index 100% rename from myisam/ftdefs.h rename to storage/myisam/ftdefs.h diff --git a/myisam/fulltext.h b/storage/myisam/fulltext.h similarity index 100% rename from myisam/fulltext.h rename to storage/myisam/fulltext.h diff --git a/myisam/make-ccc b/storage/myisam/make-ccc similarity index 100% rename from myisam/make-ccc rename to storage/myisam/make-ccc diff --git a/myisam/mi_cache.c b/storage/myisam/mi_cache.c similarity index 100% rename from myisam/mi_cache.c rename to storage/myisam/mi_cache.c diff --git a/myisam/mi_changed.c b/storage/myisam/mi_changed.c similarity index 100% rename from myisam/mi_changed.c rename to storage/myisam/mi_changed.c diff --git a/myisam/mi_check.c b/storage/myisam/mi_check.c similarity index 100% rename from myisam/mi_check.c rename to storage/myisam/mi_check.c diff --git a/myisam/mi_checksum.c b/storage/myisam/mi_checksum.c similarity index 100% rename from myisam/mi_checksum.c rename to storage/myisam/mi_checksum.c diff --git a/myisam/mi_close.c b/storage/myisam/mi_close.c similarity index 100% rename from myisam/mi_close.c rename to storage/myisam/mi_close.c diff --git a/myisam/mi_create.c b/storage/myisam/mi_create.c similarity index 100% rename from myisam/mi_create.c rename to storage/myisam/mi_create.c diff --git a/myisam/mi_dbug.c b/storage/myisam/mi_dbug.c similarity index 100% rename from myisam/mi_dbug.c rename to storage/myisam/mi_dbug.c diff --git a/myisam/mi_delete.c b/storage/myisam/mi_delete.c similarity index 100% rename from myisam/mi_delete.c rename to storage/myisam/mi_delete.c diff --git a/myisam/mi_delete_all.c b/storage/myisam/mi_delete_all.c similarity index 100% rename from myisam/mi_delete_all.c rename to storage/myisam/mi_delete_all.c diff --git a/myisam/mi_delete_table.c b/storage/myisam/mi_delete_table.c similarity index 100% rename from myisam/mi_delete_table.c rename to storage/myisam/mi_delete_table.c diff --git a/myisam/mi_dynrec.c b/storage/myisam/mi_dynrec.c similarity index 100% rename from myisam/mi_dynrec.c rename to storage/myisam/mi_dynrec.c diff --git a/myisam/mi_extra.c b/storage/myisam/mi_extra.c similarity index 100% rename from myisam/mi_extra.c rename to storage/myisam/mi_extra.c diff --git a/myisam/mi_info.c b/storage/myisam/mi_info.c similarity index 100% rename from myisam/mi_info.c rename to storage/myisam/mi_info.c diff --git a/myisam/mi_key.c b/storage/myisam/mi_key.c similarity index 100% rename from myisam/mi_key.c rename to storage/myisam/mi_key.c diff --git a/myisam/mi_keycache.c b/storage/myisam/mi_keycache.c similarity index 100% rename from myisam/mi_keycache.c rename to storage/myisam/mi_keycache.c diff --git a/myisam/mi_locking.c b/storage/myisam/mi_locking.c similarity index 100% rename from myisam/mi_locking.c rename to storage/myisam/mi_locking.c diff --git a/myisam/mi_log.c b/storage/myisam/mi_log.c similarity index 100% rename from myisam/mi_log.c rename to storage/myisam/mi_log.c diff --git a/myisam/mi_open.c b/storage/myisam/mi_open.c similarity index 100% rename from myisam/mi_open.c rename to storage/myisam/mi_open.c diff --git a/myisam/mi_packrec.c b/storage/myisam/mi_packrec.c similarity index 100% rename from myisam/mi_packrec.c rename to storage/myisam/mi_packrec.c diff --git a/myisam/mi_page.c b/storage/myisam/mi_page.c similarity index 100% rename from myisam/mi_page.c rename to storage/myisam/mi_page.c diff --git a/myisam/mi_panic.c b/storage/myisam/mi_panic.c similarity index 100% rename from myisam/mi_panic.c rename to storage/myisam/mi_panic.c diff --git a/myisam/mi_preload.c b/storage/myisam/mi_preload.c similarity index 100% rename from myisam/mi_preload.c rename to storage/myisam/mi_preload.c diff --git a/myisam/mi_range.c b/storage/myisam/mi_range.c similarity index 100% rename from myisam/mi_range.c rename to storage/myisam/mi_range.c diff --git a/myisam/mi_rename.c b/storage/myisam/mi_rename.c similarity index 100% rename from myisam/mi_rename.c rename to storage/myisam/mi_rename.c diff --git a/myisam/mi_rfirst.c b/storage/myisam/mi_rfirst.c similarity index 100% rename from myisam/mi_rfirst.c rename to storage/myisam/mi_rfirst.c diff --git a/myisam/mi_rkey.c b/storage/myisam/mi_rkey.c similarity index 100% rename from myisam/mi_rkey.c rename to storage/myisam/mi_rkey.c diff --git a/myisam/mi_rlast.c b/storage/myisam/mi_rlast.c similarity index 100% rename from myisam/mi_rlast.c rename to storage/myisam/mi_rlast.c diff --git a/myisam/mi_rnext.c b/storage/myisam/mi_rnext.c similarity index 100% rename from myisam/mi_rnext.c rename to storage/myisam/mi_rnext.c diff --git a/myisam/mi_rnext_same.c b/storage/myisam/mi_rnext_same.c similarity index 100% rename from myisam/mi_rnext_same.c rename to storage/myisam/mi_rnext_same.c diff --git a/myisam/mi_rprev.c b/storage/myisam/mi_rprev.c similarity index 100% rename from myisam/mi_rprev.c rename to storage/myisam/mi_rprev.c diff --git a/myisam/mi_rrnd.c b/storage/myisam/mi_rrnd.c similarity index 100% rename from myisam/mi_rrnd.c rename to storage/myisam/mi_rrnd.c diff --git a/myisam/mi_rsame.c b/storage/myisam/mi_rsame.c similarity index 100% rename from myisam/mi_rsame.c rename to storage/myisam/mi_rsame.c diff --git a/myisam/mi_rsamepos.c b/storage/myisam/mi_rsamepos.c similarity index 100% rename from myisam/mi_rsamepos.c rename to storage/myisam/mi_rsamepos.c diff --git a/myisam/mi_scan.c b/storage/myisam/mi_scan.c similarity index 100% rename from myisam/mi_scan.c rename to storage/myisam/mi_scan.c diff --git a/myisam/mi_search.c b/storage/myisam/mi_search.c similarity index 100% rename from myisam/mi_search.c rename to storage/myisam/mi_search.c diff --git a/myisam/mi_static.c b/storage/myisam/mi_static.c similarity index 100% rename from myisam/mi_static.c rename to storage/myisam/mi_static.c diff --git a/myisam/mi_statrec.c b/storage/myisam/mi_statrec.c similarity index 100% rename from myisam/mi_statrec.c rename to storage/myisam/mi_statrec.c diff --git a/myisam/mi_test1.c b/storage/myisam/mi_test1.c similarity index 100% rename from myisam/mi_test1.c rename to storage/myisam/mi_test1.c diff --git a/myisam/mi_test2.c b/storage/myisam/mi_test2.c similarity index 100% rename from myisam/mi_test2.c rename to storage/myisam/mi_test2.c diff --git a/myisam/mi_test3.c b/storage/myisam/mi_test3.c similarity index 100% rename from myisam/mi_test3.c rename to storage/myisam/mi_test3.c diff --git a/myisam/mi_test_all.res b/storage/myisam/mi_test_all.res similarity index 100% rename from myisam/mi_test_all.res rename to storage/myisam/mi_test_all.res diff --git a/myisam/mi_test_all.sh b/storage/myisam/mi_test_all.sh similarity index 100% rename from myisam/mi_test_all.sh rename to storage/myisam/mi_test_all.sh diff --git a/myisam/mi_unique.c b/storage/myisam/mi_unique.c similarity index 100% rename from myisam/mi_unique.c rename to storage/myisam/mi_unique.c diff --git a/myisam/mi_update.c b/storage/myisam/mi_update.c similarity index 100% rename from myisam/mi_update.c rename to storage/myisam/mi_update.c diff --git a/myisam/mi_write.c b/storage/myisam/mi_write.c similarity index 100% rename from myisam/mi_write.c rename to storage/myisam/mi_write.c diff --git a/myisam/myisam_ftdump.c b/storage/myisam/myisam_ftdump.c similarity index 100% rename from myisam/myisam_ftdump.c rename to storage/myisam/myisam_ftdump.c diff --git a/myisam/myisamchk.c b/storage/myisam/myisamchk.c similarity index 100% rename from myisam/myisamchk.c rename to storage/myisam/myisamchk.c diff --git a/myisam/myisamdef.h b/storage/myisam/myisamdef.h similarity index 100% rename from myisam/myisamdef.h rename to storage/myisam/myisamdef.h diff --git a/myisam/myisamlog.c b/storage/myisam/myisamlog.c similarity index 100% rename from myisam/myisamlog.c rename to storage/myisam/myisamlog.c diff --git a/myisam/myisampack.c b/storage/myisam/myisampack.c similarity index 100% rename from myisam/myisampack.c rename to storage/myisam/myisampack.c diff --git a/myisam/rt_index.c b/storage/myisam/rt_index.c similarity index 100% rename from myisam/rt_index.c rename to storage/myisam/rt_index.c diff --git a/myisam/rt_index.h b/storage/myisam/rt_index.h similarity index 100% rename from myisam/rt_index.h rename to storage/myisam/rt_index.h diff --git a/myisam/rt_key.c b/storage/myisam/rt_key.c similarity index 100% rename from myisam/rt_key.c rename to storage/myisam/rt_key.c diff --git a/myisam/rt_key.h b/storage/myisam/rt_key.h similarity index 100% rename from myisam/rt_key.h rename to storage/myisam/rt_key.h diff --git a/myisam/rt_mbr.c b/storage/myisam/rt_mbr.c similarity index 100% rename from myisam/rt_mbr.c rename to storage/myisam/rt_mbr.c diff --git a/myisam/rt_mbr.h b/storage/myisam/rt_mbr.h similarity index 100% rename from myisam/rt_mbr.h rename to storage/myisam/rt_mbr.h diff --git a/myisam/rt_split.c b/storage/myisam/rt_split.c similarity index 100% rename from myisam/rt_split.c rename to storage/myisam/rt_split.c diff --git a/myisam/rt_test.c b/storage/myisam/rt_test.c similarity index 100% rename from myisam/rt_test.c rename to storage/myisam/rt_test.c diff --git a/myisam/sort.c b/storage/myisam/sort.c similarity index 100% rename from myisam/sort.c rename to storage/myisam/sort.c diff --git a/myisam/sp_defs.h b/storage/myisam/sp_defs.h similarity index 100% rename from myisam/sp_defs.h rename to storage/myisam/sp_defs.h diff --git a/myisam/sp_key.c b/storage/myisam/sp_key.c similarity index 100% rename from myisam/sp_key.c rename to storage/myisam/sp_key.c diff --git a/myisam/sp_test.c b/storage/myisam/sp_test.c similarity index 100% rename from myisam/sp_test.c rename to storage/myisam/sp_test.c diff --git a/myisam/test_pack b/storage/myisam/test_pack similarity index 100% rename from myisam/test_pack rename to storage/myisam/test_pack diff --git a/myisammrg/.cvsignore b/storage/myisammrg/.cvsignore similarity index 100% rename from myisammrg/.cvsignore rename to storage/myisammrg/.cvsignore diff --git a/myisammrg/Makefile.am b/storage/myisammrg/Makefile.am similarity index 100% rename from myisammrg/Makefile.am rename to storage/myisammrg/Makefile.am diff --git a/myisammrg/make-ccc b/storage/myisammrg/make-ccc similarity index 100% rename from myisammrg/make-ccc rename to storage/myisammrg/make-ccc diff --git a/myisammrg/myrg_close.c b/storage/myisammrg/myrg_close.c similarity index 100% rename from myisammrg/myrg_close.c rename to storage/myisammrg/myrg_close.c diff --git a/myisammrg/myrg_create.c b/storage/myisammrg/myrg_create.c similarity index 100% rename from myisammrg/myrg_create.c rename to storage/myisammrg/myrg_create.c diff --git a/myisammrg/myrg_def.h b/storage/myisammrg/myrg_def.h similarity index 96% rename from myisammrg/myrg_def.h rename to storage/myisammrg/myrg_def.h index 00e7950bccf..99d7cf541d5 100644 --- a/myisammrg/myrg_def.h +++ b/storage/myisammrg/myrg_def.h @@ -17,7 +17,7 @@ /* This file is included by all myisam-merge files */ #ifndef N_MAXKEY -#include "../myisam/myisamdef.h" +#include "../storage/myisam/myisamdef.h" #endif #include "myisammrg.h" diff --git a/myisammrg/myrg_delete.c b/storage/myisammrg/myrg_delete.c similarity index 100% rename from myisammrg/myrg_delete.c rename to storage/myisammrg/myrg_delete.c diff --git a/myisammrg/myrg_extra.c b/storage/myisammrg/myrg_extra.c similarity index 100% rename from myisammrg/myrg_extra.c rename to storage/myisammrg/myrg_extra.c diff --git a/myisammrg/myrg_info.c b/storage/myisammrg/myrg_info.c similarity index 100% rename from myisammrg/myrg_info.c rename to storage/myisammrg/myrg_info.c diff --git a/myisammrg/myrg_locking.c b/storage/myisammrg/myrg_locking.c similarity index 100% rename from myisammrg/myrg_locking.c rename to storage/myisammrg/myrg_locking.c diff --git a/myisammrg/myrg_open.c b/storage/myisammrg/myrg_open.c similarity index 100% rename from myisammrg/myrg_open.c rename to storage/myisammrg/myrg_open.c diff --git a/myisammrg/myrg_panic.c b/storage/myisammrg/myrg_panic.c similarity index 100% rename from myisammrg/myrg_panic.c rename to storage/myisammrg/myrg_panic.c diff --git a/myisammrg/myrg_queue.c b/storage/myisammrg/myrg_queue.c similarity index 100% rename from myisammrg/myrg_queue.c rename to storage/myisammrg/myrg_queue.c diff --git a/myisammrg/myrg_range.c b/storage/myisammrg/myrg_range.c similarity index 100% rename from myisammrg/myrg_range.c rename to storage/myisammrg/myrg_range.c diff --git a/myisammrg/myrg_rfirst.c b/storage/myisammrg/myrg_rfirst.c similarity index 100% rename from myisammrg/myrg_rfirst.c rename to storage/myisammrg/myrg_rfirst.c diff --git a/myisammrg/myrg_rkey.c b/storage/myisammrg/myrg_rkey.c similarity index 100% rename from myisammrg/myrg_rkey.c rename to storage/myisammrg/myrg_rkey.c diff --git a/myisammrg/myrg_rlast.c b/storage/myisammrg/myrg_rlast.c similarity index 100% rename from myisammrg/myrg_rlast.c rename to storage/myisammrg/myrg_rlast.c diff --git a/myisammrg/myrg_rnext.c b/storage/myisammrg/myrg_rnext.c similarity index 100% rename from myisammrg/myrg_rnext.c rename to storage/myisammrg/myrg_rnext.c diff --git a/myisammrg/myrg_rnext_same.c b/storage/myisammrg/myrg_rnext_same.c similarity index 100% rename from myisammrg/myrg_rnext_same.c rename to storage/myisammrg/myrg_rnext_same.c diff --git a/myisammrg/myrg_rprev.c b/storage/myisammrg/myrg_rprev.c similarity index 100% rename from myisammrg/myrg_rprev.c rename to storage/myisammrg/myrg_rprev.c diff --git a/myisammrg/myrg_rrnd.c b/storage/myisammrg/myrg_rrnd.c similarity index 100% rename from myisammrg/myrg_rrnd.c rename to storage/myisammrg/myrg_rrnd.c diff --git a/myisammrg/myrg_rsame.c b/storage/myisammrg/myrg_rsame.c similarity index 100% rename from myisammrg/myrg_rsame.c rename to storage/myisammrg/myrg_rsame.c diff --git a/myisammrg/myrg_static.c b/storage/myisammrg/myrg_static.c similarity index 100% rename from myisammrg/myrg_static.c rename to storage/myisammrg/myrg_static.c diff --git a/myisammrg/myrg_update.c b/storage/myisammrg/myrg_update.c similarity index 100% rename from myisammrg/myrg_update.c rename to storage/myisammrg/myrg_update.c diff --git a/myisammrg/myrg_write.c b/storage/myisammrg/myrg_write.c similarity index 100% rename from myisammrg/myrg_write.c rename to storage/myisammrg/myrg_write.c diff --git a/ndb/Makefile.am b/storage/ndb/Makefile.am similarity index 100% rename from ndb/Makefile.am rename to storage/ndb/Makefile.am diff --git a/ndb/bin/.empty b/storage/ndb/bin/.empty similarity index 100% rename from ndb/bin/.empty rename to storage/ndb/bin/.empty diff --git a/ndb/bin/check-regression.sh b/storage/ndb/bin/check-regression.sh similarity index 100% rename from ndb/bin/check-regression.sh rename to storage/ndb/bin/check-regression.sh diff --git a/ndb/bin/makeTestPrograms_html.sh b/storage/ndb/bin/makeTestPrograms_html.sh similarity index 100% rename from ndb/bin/makeTestPrograms_html.sh rename to storage/ndb/bin/makeTestPrograms_html.sh diff --git a/ndb/config/common.mk.am b/storage/ndb/config/common.mk.am similarity index 100% rename from ndb/config/common.mk.am rename to storage/ndb/config/common.mk.am diff --git a/ndb/config/make-win-dsw.sh b/storage/ndb/config/make-win-dsw.sh similarity index 100% rename from ndb/config/make-win-dsw.sh rename to storage/ndb/config/make-win-dsw.sh diff --git a/ndb/config/type_kernel.mk.am b/storage/ndb/config/type_kernel.mk.am similarity index 100% rename from ndb/config/type_kernel.mk.am rename to storage/ndb/config/type_kernel.mk.am diff --git a/ndb/config/type_mgmapiclient.mk.am b/storage/ndb/config/type_mgmapiclient.mk.am similarity index 100% rename from ndb/config/type_mgmapiclient.mk.am rename to storage/ndb/config/type_mgmapiclient.mk.am diff --git a/ndb/config/type_ndbapi.mk.am b/storage/ndb/config/type_ndbapi.mk.am similarity index 100% rename from ndb/config/type_ndbapi.mk.am rename to storage/ndb/config/type_ndbapi.mk.am diff --git a/ndb/config/type_ndbapiclient.mk.am b/storage/ndb/config/type_ndbapiclient.mk.am similarity index 100% rename from ndb/config/type_ndbapiclient.mk.am rename to storage/ndb/config/type_ndbapiclient.mk.am diff --git a/ndb/config/type_ndbapitest.mk.am b/storage/ndb/config/type_ndbapitest.mk.am similarity index 100% rename from ndb/config/type_ndbapitest.mk.am rename to storage/ndb/config/type_ndbapitest.mk.am diff --git a/ndb/config/type_ndbapitools.mk.am b/storage/ndb/config/type_ndbapitools.mk.am similarity index 100% rename from ndb/config/type_ndbapitools.mk.am rename to storage/ndb/config/type_ndbapitools.mk.am diff --git a/ndb/config/type_util.mk.am b/storage/ndb/config/type_util.mk.am similarity index 100% rename from ndb/config/type_util.mk.am rename to storage/ndb/config/type_util.mk.am diff --git a/ndb/config/win-includes b/storage/ndb/config/win-includes similarity index 100% rename from ndb/config/win-includes rename to storage/ndb/config/win-includes diff --git a/ndb/config/win-lib.am b/storage/ndb/config/win-lib.am similarity index 100% rename from ndb/config/win-lib.am rename to storage/ndb/config/win-lib.am diff --git a/ndb/config/win-libraries b/storage/ndb/config/win-libraries similarity index 100% rename from ndb/config/win-libraries rename to storage/ndb/config/win-libraries diff --git a/ndb/config/win-name b/storage/ndb/config/win-name similarity index 100% rename from ndb/config/win-name rename to storage/ndb/config/win-name diff --git a/ndb/config/win-prg.am b/storage/ndb/config/win-prg.am similarity index 100% rename from ndb/config/win-prg.am rename to storage/ndb/config/win-prg.am diff --git a/ndb/config/win-sources b/storage/ndb/config/win-sources similarity index 100% rename from ndb/config/win-sources rename to 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 similarity index 100% rename from ndb/demos/1-node/1-api-3/Ndb.cfg rename to 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 similarity index 100% rename from ndb/demos/1-node/1-db-2/Ndb.cfg rename to 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 similarity index 100% rename from ndb/demos/1-node/1-mgm-1/Ndb.cfg rename to 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 similarity index 100% rename from ndb/demos/1-node/1-mgm-1/template_config.ini rename to 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 similarity index 100% rename from ndb/demos/2-node/2-api-4/Ndb.cfg rename to 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 similarity index 100% rename from ndb/demos/2-node/2-api-5/Ndb.cfg rename to 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 similarity index 100% rename from ndb/demos/2-node/2-api-6/Ndb.cfg rename to 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 similarity index 100% rename from ndb/demos/2-node/2-api-7/Ndb.cfg rename to 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 similarity index 100% rename from ndb/demos/2-node/2-db-2/Ndb.cfg rename to 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 similarity index 100% rename from ndb/demos/2-node/2-db-3/Ndb.cfg rename to 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 similarity index 100% rename from ndb/demos/2-node/2-mgm-1/Ndb.cfg rename to 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 similarity index 100% rename from ndb/demos/2-node/2-mgm-1/template_config.ini rename to 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 similarity index 100% rename from ndb/demos/config-templates/config_template-1-REP.ini rename to 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 similarity index 100% rename from ndb/demos/config-templates/config_template-4.ini rename to 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 similarity index 100% rename from ndb/demos/config-templates/config_template-install.ini rename to 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 similarity index 100% rename from ndb/demos/run_demo1-PS-SS_common.sh rename to 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 similarity index 100% rename from ndb/demos/run_demo1-PS.sh rename to storage/ndb/demos/run_demo1-PS.sh diff --git a/ndb/demos/run_demo1-SS.sh b/storage/ndb/demos/run_demo1-SS.sh similarity index 100% rename from ndb/demos/run_demo1-SS.sh rename to storage/ndb/demos/run_demo1-SS.sh diff --git a/ndb/demos/run_demo1.sh b/storage/ndb/demos/run_demo1.sh similarity index 100% rename from ndb/demos/run_demo1.sh rename to storage/ndb/demos/run_demo1.sh diff --git a/ndb/demos/run_demo2.sh b/storage/ndb/demos/run_demo2.sh similarity index 100% rename from ndb/demos/run_demo2.sh rename to storage/ndb/demos/run_demo2.sh diff --git a/ndb/docs/Makefile.am b/storage/ndb/docs/Makefile.am similarity index 100% rename from ndb/docs/Makefile.am rename to storage/ndb/docs/Makefile.am diff --git a/ndb/docs/README b/storage/ndb/docs/README similarity index 100% rename from ndb/docs/README rename to storage/ndb/docs/README diff --git a/ndb/docs/doxygen/Doxyfile.mgmapi b/storage/ndb/docs/doxygen/Doxyfile.mgmapi similarity index 100% rename from ndb/docs/doxygen/Doxyfile.mgmapi rename to storage/ndb/docs/doxygen/Doxyfile.mgmapi diff --git a/ndb/docs/doxygen/Doxyfile.ndb b/storage/ndb/docs/doxygen/Doxyfile.ndb similarity index 100% rename from ndb/docs/doxygen/Doxyfile.ndb rename to storage/ndb/docs/doxygen/Doxyfile.ndb diff --git a/ndb/docs/doxygen/Doxyfile.ndbapi b/storage/ndb/docs/doxygen/Doxyfile.ndbapi similarity index 100% rename from ndb/docs/doxygen/Doxyfile.ndbapi rename to storage/ndb/docs/doxygen/Doxyfile.ndbapi diff --git a/ndb/docs/doxygen/Doxyfile.odbc b/storage/ndb/docs/doxygen/Doxyfile.odbc similarity index 100% rename from ndb/docs/doxygen/Doxyfile.odbc rename to storage/ndb/docs/doxygen/Doxyfile.odbc diff --git a/ndb/docs/doxygen/Doxyfile.test b/storage/ndb/docs/doxygen/Doxyfile.test similarity index 100% rename from ndb/docs/doxygen/Doxyfile.test rename to storage/ndb/docs/doxygen/Doxyfile.test diff --git a/ndb/docs/doxygen/header.mgmapi.tex b/storage/ndb/docs/doxygen/header.mgmapi.tex similarity index 100% rename from ndb/docs/doxygen/header.mgmapi.tex rename to storage/ndb/docs/doxygen/header.mgmapi.tex diff --git a/ndb/docs/doxygen/header.ndbapi.tex b/storage/ndb/docs/doxygen/header.ndbapi.tex similarity index 100% rename from ndb/docs/doxygen/header.ndbapi.tex rename to storage/ndb/docs/doxygen/header.ndbapi.tex diff --git a/ndb/docs/doxygen/postdoxy.pl b/storage/ndb/docs/doxygen/postdoxy.pl similarity index 100% rename from ndb/docs/doxygen/postdoxy.pl rename to storage/ndb/docs/doxygen/postdoxy.pl diff --git a/ndb/docs/doxygen/predoxy.pl b/storage/ndb/docs/doxygen/predoxy.pl similarity index 100% rename from ndb/docs/doxygen/predoxy.pl rename to storage/ndb/docs/doxygen/predoxy.pl diff --git a/ndb/docs/wl2077.txt b/storage/ndb/docs/wl2077.txt similarity index 100% rename from ndb/docs/wl2077.txt rename to storage/ndb/docs/wl2077.txt diff --git a/ndb/home/bin/Linuxmkisofs b/storage/ndb/home/bin/Linuxmkisofs similarity index 100% rename from ndb/home/bin/Linuxmkisofs rename to storage/ndb/home/bin/Linuxmkisofs diff --git a/ndb/home/bin/Solarismkisofs b/storage/ndb/home/bin/Solarismkisofs similarity index 100% rename from ndb/home/bin/Solarismkisofs rename to storage/ndb/home/bin/Solarismkisofs diff --git a/ndb/home/bin/cvs2cl.pl b/storage/ndb/home/bin/cvs2cl.pl similarity index 100% rename from ndb/home/bin/cvs2cl.pl rename to storage/ndb/home/bin/cvs2cl.pl diff --git a/ndb/home/bin/fix-cvs-root b/storage/ndb/home/bin/fix-cvs-root similarity index 100% rename from ndb/home/bin/fix-cvs-root rename to 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 similarity index 100% rename from ndb/home/bin/import-from-bk.sh rename to storage/ndb/home/bin/import-from-bk.sh diff --git a/ndb/home/bin/ndb_deploy b/storage/ndb/home/bin/ndb_deploy similarity index 100% rename from ndb/home/bin/ndb_deploy rename to storage/ndb/home/bin/ndb_deploy diff --git a/ndb/home/bin/ndbdoxy.pl b/storage/ndb/home/bin/ndbdoxy.pl similarity index 100% rename from ndb/home/bin/ndbdoxy.pl rename to storage/ndb/home/bin/ndbdoxy.pl diff --git a/ndb/home/bin/ngcalc b/storage/ndb/home/bin/ngcalc similarity index 100% rename from ndb/home/bin/ngcalc rename to storage/ndb/home/bin/ngcalc diff --git a/ndb/home/bin/parseConfigFile.awk b/storage/ndb/home/bin/parseConfigFile.awk similarity index 100% rename from ndb/home/bin/parseConfigFile.awk rename to storage/ndb/home/bin/parseConfigFile.awk diff --git a/ndb/home/bin/setup-test.sh b/storage/ndb/home/bin/setup-test.sh similarity index 100% rename from ndb/home/bin/setup-test.sh rename to 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 similarity index 100% rename from ndb/home/bin/signallog2html.lib/signallog2list.awk rename to 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 similarity index 100% rename from ndb/home/bin/signallog2html.lib/uniq_blocks.awk rename to storage/ndb/home/bin/signallog2html.lib/uniq_blocks.awk diff --git a/ndb/home/bin/signallog2html.sh b/storage/ndb/home/bin/signallog2html.sh similarity index 100% rename from ndb/home/bin/signallog2html.sh rename to storage/ndb/home/bin/signallog2html.sh diff --git a/ndb/home/bin/stripcr b/storage/ndb/home/bin/stripcr similarity index 100% rename from ndb/home/bin/stripcr rename to storage/ndb/home/bin/stripcr diff --git a/ndb/home/lib/funcs.sh b/storage/ndb/home/lib/funcs.sh similarity index 100% rename from ndb/home/lib/funcs.sh rename to storage/ndb/home/lib/funcs.sh diff --git a/ndb/include/Makefile.am b/storage/ndb/include/Makefile.am similarity index 100% rename from ndb/include/Makefile.am rename to storage/ndb/include/Makefile.am diff --git a/ndb/include/debugger/DebuggerNames.hpp b/storage/ndb/include/debugger/DebuggerNames.hpp similarity index 100% rename from ndb/include/debugger/DebuggerNames.hpp rename to storage/ndb/include/debugger/DebuggerNames.hpp diff --git a/ndb/include/debugger/EventLogger.hpp b/storage/ndb/include/debugger/EventLogger.hpp similarity index 100% rename from ndb/include/debugger/EventLogger.hpp rename to storage/ndb/include/debugger/EventLogger.hpp diff --git a/ndb/include/debugger/GrepError.hpp b/storage/ndb/include/debugger/GrepError.hpp similarity index 100% rename from ndb/include/debugger/GrepError.hpp rename to storage/ndb/include/debugger/GrepError.hpp diff --git a/ndb/include/debugger/SignalLoggerManager.hpp b/storage/ndb/include/debugger/SignalLoggerManager.hpp similarity index 100% rename from ndb/include/debugger/SignalLoggerManager.hpp rename to storage/ndb/include/debugger/SignalLoggerManager.hpp diff --git a/ndb/include/editline/editline.h b/storage/ndb/include/editline/editline.h similarity index 100% rename from ndb/include/editline/editline.h rename to storage/ndb/include/editline/editline.h diff --git a/ndb/include/kernel/AttributeDescriptor.hpp b/storage/ndb/include/kernel/AttributeDescriptor.hpp similarity index 100% rename from ndb/include/kernel/AttributeDescriptor.hpp rename to storage/ndb/include/kernel/AttributeDescriptor.hpp diff --git a/ndb/include/kernel/AttributeHeader.hpp b/storage/ndb/include/kernel/AttributeHeader.hpp similarity index 100% rename from ndb/include/kernel/AttributeHeader.hpp rename to storage/ndb/include/kernel/AttributeHeader.hpp diff --git a/ndb/include/kernel/AttributeList.hpp b/storage/ndb/include/kernel/AttributeList.hpp similarity index 100% rename from ndb/include/kernel/AttributeList.hpp rename to storage/ndb/include/kernel/AttributeList.hpp diff --git a/ndb/include/kernel/BlockNumbers.h b/storage/ndb/include/kernel/BlockNumbers.h similarity index 100% rename from ndb/include/kernel/BlockNumbers.h rename to storage/ndb/include/kernel/BlockNumbers.h diff --git a/ndb/include/kernel/GlobalSignalNumbers.h b/storage/ndb/include/kernel/GlobalSignalNumbers.h similarity index 100% rename from ndb/include/kernel/GlobalSignalNumbers.h rename to storage/ndb/include/kernel/GlobalSignalNumbers.h diff --git a/ndb/include/kernel/GrepEvent.hpp b/storage/ndb/include/kernel/GrepEvent.hpp similarity index 100% rename from ndb/include/kernel/GrepEvent.hpp rename to storage/ndb/include/kernel/GrepEvent.hpp diff --git a/ndb/include/kernel/Interpreter.hpp b/storage/ndb/include/kernel/Interpreter.hpp similarity index 100% rename from ndb/include/kernel/Interpreter.hpp rename to storage/ndb/include/kernel/Interpreter.hpp diff --git a/ndb/include/kernel/LogLevel.hpp b/storage/ndb/include/kernel/LogLevel.hpp similarity index 100% rename from ndb/include/kernel/LogLevel.hpp rename to storage/ndb/include/kernel/LogLevel.hpp diff --git a/ndb/include/kernel/NodeBitmask.hpp b/storage/ndb/include/kernel/NodeBitmask.hpp similarity index 100% rename from ndb/include/kernel/NodeBitmask.hpp rename to storage/ndb/include/kernel/NodeBitmask.hpp diff --git a/ndb/include/kernel/NodeInfo.hpp b/storage/ndb/include/kernel/NodeInfo.hpp similarity index 100% rename from ndb/include/kernel/NodeInfo.hpp rename to storage/ndb/include/kernel/NodeInfo.hpp diff --git a/ndb/include/kernel/NodeState.hpp b/storage/ndb/include/kernel/NodeState.hpp similarity index 100% rename from ndb/include/kernel/NodeState.hpp rename to storage/ndb/include/kernel/NodeState.hpp diff --git a/ndb/include/kernel/RefConvert.hpp b/storage/ndb/include/kernel/RefConvert.hpp similarity index 100% rename from ndb/include/kernel/RefConvert.hpp rename to 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 similarity index 100% rename from ndb/include/kernel/kernel_config_parameters.h rename to 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 similarity index 100% rename from ndb/include/kernel/kernel_types.h rename to storage/ndb/include/kernel/kernel_types.h diff --git a/ndb/include/kernel/ndb_limits.h b/storage/ndb/include/kernel/ndb_limits.h similarity index 100% rename from ndb/include/kernel/ndb_limits.h rename to storage/ndb/include/kernel/ndb_limits.h diff --git a/ndb/include/kernel/signaldata/AbortAll.hpp b/storage/ndb/include/kernel/signaldata/AbortAll.hpp similarity index 100% rename from ndb/include/kernel/signaldata/AbortAll.hpp rename to storage/ndb/include/kernel/signaldata/AbortAll.hpp diff --git a/ndb/include/kernel/signaldata/AccFrag.hpp b/storage/ndb/include/kernel/signaldata/AccFrag.hpp similarity index 100% rename from ndb/include/kernel/signaldata/AccFrag.hpp rename to storage/ndb/include/kernel/signaldata/AccFrag.hpp diff --git a/ndb/include/kernel/signaldata/AccLock.hpp b/storage/ndb/include/kernel/signaldata/AccLock.hpp similarity index 100% rename from ndb/include/kernel/signaldata/AccLock.hpp rename to storage/ndb/include/kernel/signaldata/AccLock.hpp diff --git a/ndb/include/kernel/signaldata/AccScan.hpp b/storage/ndb/include/kernel/signaldata/AccScan.hpp similarity index 100% rename from ndb/include/kernel/signaldata/AccScan.hpp rename to storage/ndb/include/kernel/signaldata/AccScan.hpp diff --git a/ndb/include/kernel/signaldata/AccSizeAltReq.hpp b/storage/ndb/include/kernel/signaldata/AccSizeAltReq.hpp similarity index 100% rename from ndb/include/kernel/signaldata/AccSizeAltReq.hpp rename to storage/ndb/include/kernel/signaldata/AccSizeAltReq.hpp diff --git a/ndb/include/kernel/signaldata/AlterIndx.hpp b/storage/ndb/include/kernel/signaldata/AlterIndx.hpp similarity index 100% rename from ndb/include/kernel/signaldata/AlterIndx.hpp rename to storage/ndb/include/kernel/signaldata/AlterIndx.hpp diff --git a/ndb/include/kernel/signaldata/AlterTab.hpp b/storage/ndb/include/kernel/signaldata/AlterTab.hpp similarity index 100% rename from ndb/include/kernel/signaldata/AlterTab.hpp rename to storage/ndb/include/kernel/signaldata/AlterTab.hpp diff --git a/ndb/include/kernel/signaldata/AlterTable.hpp b/storage/ndb/include/kernel/signaldata/AlterTable.hpp similarity index 100% rename from ndb/include/kernel/signaldata/AlterTable.hpp rename to storage/ndb/include/kernel/signaldata/AlterTable.hpp diff --git a/ndb/include/kernel/signaldata/AlterTrig.hpp b/storage/ndb/include/kernel/signaldata/AlterTrig.hpp similarity index 100% rename from ndb/include/kernel/signaldata/AlterTrig.hpp rename to storage/ndb/include/kernel/signaldata/AlterTrig.hpp diff --git a/ndb/include/kernel/signaldata/ApiRegSignalData.hpp b/storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp similarity index 100% rename from ndb/include/kernel/signaldata/ApiRegSignalData.hpp rename to storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp diff --git a/ndb/include/kernel/signaldata/ApiVersion.hpp b/storage/ndb/include/kernel/signaldata/ApiVersion.hpp similarity index 100% rename from ndb/include/kernel/signaldata/ApiVersion.hpp rename to storage/ndb/include/kernel/signaldata/ApiVersion.hpp diff --git a/ndb/include/kernel/signaldata/ArbitSignalData.hpp b/storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp similarity index 100% rename from ndb/include/kernel/signaldata/ArbitSignalData.hpp rename to storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp diff --git a/ndb/include/kernel/signaldata/AttrInfo.hpp b/storage/ndb/include/kernel/signaldata/AttrInfo.hpp similarity index 100% rename from ndb/include/kernel/signaldata/AttrInfo.hpp rename to storage/ndb/include/kernel/signaldata/AttrInfo.hpp diff --git a/ndb/include/kernel/signaldata/BackupContinueB.hpp b/storage/ndb/include/kernel/signaldata/BackupContinueB.hpp similarity index 100% rename from ndb/include/kernel/signaldata/BackupContinueB.hpp rename to storage/ndb/include/kernel/signaldata/BackupContinueB.hpp diff --git a/ndb/include/kernel/signaldata/BackupImpl.hpp b/storage/ndb/include/kernel/signaldata/BackupImpl.hpp similarity index 100% rename from ndb/include/kernel/signaldata/BackupImpl.hpp rename to storage/ndb/include/kernel/signaldata/BackupImpl.hpp diff --git a/ndb/include/kernel/signaldata/BackupSignalData.hpp b/storage/ndb/include/kernel/signaldata/BackupSignalData.hpp similarity index 100% rename from ndb/include/kernel/signaldata/BackupSignalData.hpp rename to storage/ndb/include/kernel/signaldata/BackupSignalData.hpp diff --git a/ndb/include/kernel/signaldata/BlockCommitOrd.hpp b/storage/ndb/include/kernel/signaldata/BlockCommitOrd.hpp similarity index 100% rename from ndb/include/kernel/signaldata/BlockCommitOrd.hpp rename to storage/ndb/include/kernel/signaldata/BlockCommitOrd.hpp diff --git a/ndb/include/kernel/signaldata/BuildIndx.hpp b/storage/ndb/include/kernel/signaldata/BuildIndx.hpp similarity index 100% rename from ndb/include/kernel/signaldata/BuildIndx.hpp rename to storage/ndb/include/kernel/signaldata/BuildIndx.hpp diff --git a/ndb/include/kernel/signaldata/CheckNodeGroups.hpp b/storage/ndb/include/kernel/signaldata/CheckNodeGroups.hpp similarity index 100% rename from ndb/include/kernel/signaldata/CheckNodeGroups.hpp rename to storage/ndb/include/kernel/signaldata/CheckNodeGroups.hpp diff --git a/ndb/include/kernel/signaldata/CloseComReqConf.hpp b/storage/ndb/include/kernel/signaldata/CloseComReqConf.hpp similarity index 100% rename from ndb/include/kernel/signaldata/CloseComReqConf.hpp rename to storage/ndb/include/kernel/signaldata/CloseComReqConf.hpp diff --git a/ndb/include/kernel/signaldata/CmInit.hpp b/storage/ndb/include/kernel/signaldata/CmInit.hpp similarity index 100% rename from ndb/include/kernel/signaldata/CmInit.hpp rename to storage/ndb/include/kernel/signaldata/CmInit.hpp diff --git a/ndb/include/kernel/signaldata/CmRegSignalData.hpp b/storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp similarity index 100% rename from ndb/include/kernel/signaldata/CmRegSignalData.hpp rename to storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp diff --git a/ndb/include/kernel/signaldata/CmvmiCfgConf.hpp b/storage/ndb/include/kernel/signaldata/CmvmiCfgConf.hpp similarity index 100% rename from ndb/include/kernel/signaldata/CmvmiCfgConf.hpp rename to storage/ndb/include/kernel/signaldata/CmvmiCfgConf.hpp diff --git a/ndb/include/kernel/signaldata/CntrMasterConf.hpp b/storage/ndb/include/kernel/signaldata/CntrMasterConf.hpp similarity index 100% rename from ndb/include/kernel/signaldata/CntrMasterConf.hpp rename to storage/ndb/include/kernel/signaldata/CntrMasterConf.hpp diff --git a/ndb/include/kernel/signaldata/CntrMasterReq.hpp b/storage/ndb/include/kernel/signaldata/CntrMasterReq.hpp similarity index 100% rename from ndb/include/kernel/signaldata/CntrMasterReq.hpp rename to storage/ndb/include/kernel/signaldata/CntrMasterReq.hpp diff --git a/ndb/include/kernel/signaldata/CntrStart.hpp b/storage/ndb/include/kernel/signaldata/CntrStart.hpp similarity index 100% rename from ndb/include/kernel/signaldata/CntrStart.hpp rename to storage/ndb/include/kernel/signaldata/CntrStart.hpp diff --git a/ndb/include/kernel/signaldata/ConfigParamId.hpp b/storage/ndb/include/kernel/signaldata/ConfigParamId.hpp similarity index 100% rename from ndb/include/kernel/signaldata/ConfigParamId.hpp rename to storage/ndb/include/kernel/signaldata/ConfigParamId.hpp diff --git a/ndb/include/kernel/signaldata/ContinueFragmented.hpp b/storage/ndb/include/kernel/signaldata/ContinueFragmented.hpp similarity index 100% rename from ndb/include/kernel/signaldata/ContinueFragmented.hpp rename to storage/ndb/include/kernel/signaldata/ContinueFragmented.hpp diff --git a/ndb/include/kernel/signaldata/CopyActive.hpp b/storage/ndb/include/kernel/signaldata/CopyActive.hpp similarity index 100% rename from ndb/include/kernel/signaldata/CopyActive.hpp rename to storage/ndb/include/kernel/signaldata/CopyActive.hpp diff --git a/ndb/include/kernel/signaldata/CopyFrag.hpp b/storage/ndb/include/kernel/signaldata/CopyFrag.hpp similarity index 100% rename from ndb/include/kernel/signaldata/CopyFrag.hpp rename to storage/ndb/include/kernel/signaldata/CopyFrag.hpp diff --git a/ndb/include/kernel/signaldata/CopyGCIReq.hpp b/storage/ndb/include/kernel/signaldata/CopyGCIReq.hpp similarity index 100% rename from ndb/include/kernel/signaldata/CopyGCIReq.hpp rename to storage/ndb/include/kernel/signaldata/CopyGCIReq.hpp diff --git a/ndb/include/kernel/signaldata/CreateEvnt.hpp b/storage/ndb/include/kernel/signaldata/CreateEvnt.hpp similarity index 100% rename from ndb/include/kernel/signaldata/CreateEvnt.hpp rename to storage/ndb/include/kernel/signaldata/CreateEvnt.hpp diff --git a/ndb/include/kernel/signaldata/CreateFrag.hpp b/storage/ndb/include/kernel/signaldata/CreateFrag.hpp similarity index 100% rename from ndb/include/kernel/signaldata/CreateFrag.hpp rename to storage/ndb/include/kernel/signaldata/CreateFrag.hpp diff --git a/ndb/include/kernel/signaldata/CreateFragmentation.hpp b/storage/ndb/include/kernel/signaldata/CreateFragmentation.hpp similarity index 100% rename from ndb/include/kernel/signaldata/CreateFragmentation.hpp rename to storage/ndb/include/kernel/signaldata/CreateFragmentation.hpp diff --git a/ndb/include/kernel/signaldata/CreateIndx.hpp b/storage/ndb/include/kernel/signaldata/CreateIndx.hpp similarity index 100% rename from ndb/include/kernel/signaldata/CreateIndx.hpp rename to storage/ndb/include/kernel/signaldata/CreateIndx.hpp diff --git a/ndb/include/kernel/signaldata/CreateTab.hpp b/storage/ndb/include/kernel/signaldata/CreateTab.hpp similarity index 100% rename from ndb/include/kernel/signaldata/CreateTab.hpp rename to storage/ndb/include/kernel/signaldata/CreateTab.hpp diff --git a/ndb/include/kernel/signaldata/CreateTable.hpp b/storage/ndb/include/kernel/signaldata/CreateTable.hpp similarity index 100% rename from ndb/include/kernel/signaldata/CreateTable.hpp rename to storage/ndb/include/kernel/signaldata/CreateTable.hpp diff --git a/ndb/include/kernel/signaldata/CreateTrig.hpp b/storage/ndb/include/kernel/signaldata/CreateTrig.hpp similarity index 100% rename from ndb/include/kernel/signaldata/CreateTrig.hpp rename to storage/ndb/include/kernel/signaldata/CreateTrig.hpp diff --git a/ndb/include/kernel/signaldata/DiAddTab.hpp b/storage/ndb/include/kernel/signaldata/DiAddTab.hpp similarity index 100% rename from ndb/include/kernel/signaldata/DiAddTab.hpp rename to storage/ndb/include/kernel/signaldata/DiAddTab.hpp diff --git a/ndb/include/kernel/signaldata/DiGetNodes.hpp b/storage/ndb/include/kernel/signaldata/DiGetNodes.hpp similarity index 100% rename from ndb/include/kernel/signaldata/DiGetNodes.hpp rename to storage/ndb/include/kernel/signaldata/DiGetNodes.hpp diff --git a/ndb/include/kernel/signaldata/DictSchemaInfo.hpp b/storage/ndb/include/kernel/signaldata/DictSchemaInfo.hpp similarity index 100% rename from ndb/include/kernel/signaldata/DictSchemaInfo.hpp rename to storage/ndb/include/kernel/signaldata/DictSchemaInfo.hpp diff --git a/ndb/include/kernel/signaldata/DictSizeAltReq.hpp b/storage/ndb/include/kernel/signaldata/DictSizeAltReq.hpp similarity index 100% rename from ndb/include/kernel/signaldata/DictSizeAltReq.hpp rename to storage/ndb/include/kernel/signaldata/DictSizeAltReq.hpp diff --git a/ndb/include/kernel/signaldata/DictStart.hpp b/storage/ndb/include/kernel/signaldata/DictStart.hpp similarity index 100% rename from ndb/include/kernel/signaldata/DictStart.hpp rename to storage/ndb/include/kernel/signaldata/DictStart.hpp diff --git a/ndb/include/kernel/signaldata/DictTabInfo.hpp b/storage/ndb/include/kernel/signaldata/DictTabInfo.hpp similarity index 100% rename from ndb/include/kernel/signaldata/DictTabInfo.hpp rename to storage/ndb/include/kernel/signaldata/DictTabInfo.hpp diff --git a/ndb/include/kernel/signaldata/DihAddFrag.hpp b/storage/ndb/include/kernel/signaldata/DihAddFrag.hpp similarity index 100% rename from ndb/include/kernel/signaldata/DihAddFrag.hpp rename to storage/ndb/include/kernel/signaldata/DihAddFrag.hpp diff --git a/ndb/include/kernel/signaldata/DihContinueB.hpp b/storage/ndb/include/kernel/signaldata/DihContinueB.hpp similarity index 100% rename from ndb/include/kernel/signaldata/DihContinueB.hpp rename to storage/ndb/include/kernel/signaldata/DihContinueB.hpp diff --git a/ndb/include/kernel/signaldata/DihSizeAltReq.hpp b/storage/ndb/include/kernel/signaldata/DihSizeAltReq.hpp similarity index 100% rename from ndb/include/kernel/signaldata/DihSizeAltReq.hpp rename to storage/ndb/include/kernel/signaldata/DihSizeAltReq.hpp diff --git a/ndb/include/kernel/signaldata/DihStartTab.hpp b/storage/ndb/include/kernel/signaldata/DihStartTab.hpp similarity index 100% rename from ndb/include/kernel/signaldata/DihStartTab.hpp rename to storage/ndb/include/kernel/signaldata/DihStartTab.hpp diff --git a/ndb/include/kernel/signaldata/DihSwitchReplica.hpp b/storage/ndb/include/kernel/signaldata/DihSwitchReplica.hpp similarity index 100% rename from ndb/include/kernel/signaldata/DihSwitchReplica.hpp rename to storage/ndb/include/kernel/signaldata/DihSwitchReplica.hpp diff --git a/ndb/include/kernel/signaldata/DisconnectRep.hpp b/storage/ndb/include/kernel/signaldata/DisconnectRep.hpp similarity index 100% rename from ndb/include/kernel/signaldata/DisconnectRep.hpp rename to storage/ndb/include/kernel/signaldata/DisconnectRep.hpp diff --git a/ndb/include/kernel/signaldata/DropIndx.hpp b/storage/ndb/include/kernel/signaldata/DropIndx.hpp similarity index 100% rename from ndb/include/kernel/signaldata/DropIndx.hpp rename to storage/ndb/include/kernel/signaldata/DropIndx.hpp diff --git a/ndb/include/kernel/signaldata/DropTab.hpp b/storage/ndb/include/kernel/signaldata/DropTab.hpp similarity index 100% rename from ndb/include/kernel/signaldata/DropTab.hpp rename to storage/ndb/include/kernel/signaldata/DropTab.hpp diff --git a/ndb/include/kernel/signaldata/DropTabFile.hpp b/storage/ndb/include/kernel/signaldata/DropTabFile.hpp similarity index 100% rename from ndb/include/kernel/signaldata/DropTabFile.hpp rename to storage/ndb/include/kernel/signaldata/DropTabFile.hpp diff --git a/ndb/include/kernel/signaldata/DropTable.hpp b/storage/ndb/include/kernel/signaldata/DropTable.hpp similarity index 100% rename from ndb/include/kernel/signaldata/DropTable.hpp rename to storage/ndb/include/kernel/signaldata/DropTable.hpp diff --git a/ndb/include/kernel/signaldata/DropTrig.hpp b/storage/ndb/include/kernel/signaldata/DropTrig.hpp similarity index 100% rename from ndb/include/kernel/signaldata/DropTrig.hpp rename to storage/ndb/include/kernel/signaldata/DropTrig.hpp diff --git a/ndb/include/kernel/signaldata/DumpStateOrd.hpp b/storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp similarity index 100% rename from ndb/include/kernel/signaldata/DumpStateOrd.hpp rename to storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp diff --git a/ndb/include/kernel/signaldata/EmptyLcp.hpp b/storage/ndb/include/kernel/signaldata/EmptyLcp.hpp similarity index 100% rename from ndb/include/kernel/signaldata/EmptyLcp.hpp rename to storage/ndb/include/kernel/signaldata/EmptyLcp.hpp diff --git a/ndb/include/kernel/signaldata/EndTo.hpp b/storage/ndb/include/kernel/signaldata/EndTo.hpp similarity index 100% rename from ndb/include/kernel/signaldata/EndTo.hpp rename to storage/ndb/include/kernel/signaldata/EndTo.hpp diff --git a/ndb/include/kernel/signaldata/EventReport.hpp b/storage/ndb/include/kernel/signaldata/EventReport.hpp similarity index 100% rename from ndb/include/kernel/signaldata/EventReport.hpp rename to storage/ndb/include/kernel/signaldata/EventReport.hpp diff --git a/ndb/include/kernel/signaldata/EventSubscribeReq.hpp b/storage/ndb/include/kernel/signaldata/EventSubscribeReq.hpp similarity index 100% rename from ndb/include/kernel/signaldata/EventSubscribeReq.hpp rename to storage/ndb/include/kernel/signaldata/EventSubscribeReq.hpp diff --git a/ndb/include/kernel/signaldata/ExecFragReq.hpp b/storage/ndb/include/kernel/signaldata/ExecFragReq.hpp similarity index 100% rename from ndb/include/kernel/signaldata/ExecFragReq.hpp rename to storage/ndb/include/kernel/signaldata/ExecFragReq.hpp diff --git a/ndb/include/kernel/signaldata/FailRep.hpp b/storage/ndb/include/kernel/signaldata/FailRep.hpp similarity index 100% rename from ndb/include/kernel/signaldata/FailRep.hpp rename to storage/ndb/include/kernel/signaldata/FailRep.hpp diff --git a/ndb/include/kernel/signaldata/FireTrigOrd.hpp b/storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp similarity index 100% rename from ndb/include/kernel/signaldata/FireTrigOrd.hpp rename to storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp diff --git a/ndb/include/kernel/signaldata/FsAppendReq.hpp b/storage/ndb/include/kernel/signaldata/FsAppendReq.hpp similarity index 100% rename from ndb/include/kernel/signaldata/FsAppendReq.hpp rename to storage/ndb/include/kernel/signaldata/FsAppendReq.hpp diff --git a/ndb/include/kernel/signaldata/FsCloseReq.hpp b/storage/ndb/include/kernel/signaldata/FsCloseReq.hpp similarity index 100% rename from ndb/include/kernel/signaldata/FsCloseReq.hpp rename to storage/ndb/include/kernel/signaldata/FsCloseReq.hpp diff --git a/ndb/include/kernel/signaldata/FsConf.hpp b/storage/ndb/include/kernel/signaldata/FsConf.hpp similarity index 100% rename from ndb/include/kernel/signaldata/FsConf.hpp rename to storage/ndb/include/kernel/signaldata/FsConf.hpp diff --git a/ndb/include/kernel/signaldata/FsOpenReq.hpp b/storage/ndb/include/kernel/signaldata/FsOpenReq.hpp similarity index 100% rename from ndb/include/kernel/signaldata/FsOpenReq.hpp rename to storage/ndb/include/kernel/signaldata/FsOpenReq.hpp diff --git a/ndb/include/kernel/signaldata/FsReadWriteReq.hpp b/storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp similarity index 100% rename from ndb/include/kernel/signaldata/FsReadWriteReq.hpp rename to storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp diff --git a/ndb/include/kernel/signaldata/FsRef.hpp b/storage/ndb/include/kernel/signaldata/FsRef.hpp similarity index 100% rename from ndb/include/kernel/signaldata/FsRef.hpp rename to storage/ndb/include/kernel/signaldata/FsRef.hpp diff --git a/ndb/include/kernel/signaldata/FsRemoveReq.hpp b/storage/ndb/include/kernel/signaldata/FsRemoveReq.hpp similarity index 100% rename from ndb/include/kernel/signaldata/FsRemoveReq.hpp rename to storage/ndb/include/kernel/signaldata/FsRemoveReq.hpp diff --git a/ndb/include/kernel/signaldata/GCPSave.hpp b/storage/ndb/include/kernel/signaldata/GCPSave.hpp similarity index 100% rename from ndb/include/kernel/signaldata/GCPSave.hpp rename to storage/ndb/include/kernel/signaldata/GCPSave.hpp diff --git a/ndb/include/kernel/signaldata/GetTabInfo.hpp b/storage/ndb/include/kernel/signaldata/GetTabInfo.hpp similarity index 100% rename from ndb/include/kernel/signaldata/GetTabInfo.hpp rename to storage/ndb/include/kernel/signaldata/GetTabInfo.hpp diff --git a/ndb/include/kernel/signaldata/GetTableId.hpp b/storage/ndb/include/kernel/signaldata/GetTableId.hpp similarity index 100% rename from ndb/include/kernel/signaldata/GetTableId.hpp rename to storage/ndb/include/kernel/signaldata/GetTableId.hpp diff --git a/ndb/include/kernel/signaldata/GrepImpl.hpp b/storage/ndb/include/kernel/signaldata/GrepImpl.hpp similarity index 100% rename from ndb/include/kernel/signaldata/GrepImpl.hpp rename to storage/ndb/include/kernel/signaldata/GrepImpl.hpp diff --git a/ndb/include/kernel/signaldata/HotSpareRep.hpp b/storage/ndb/include/kernel/signaldata/HotSpareRep.hpp similarity index 100% rename from ndb/include/kernel/signaldata/HotSpareRep.hpp rename to storage/ndb/include/kernel/signaldata/HotSpareRep.hpp diff --git a/ndb/include/kernel/signaldata/IndxAttrInfo.hpp b/storage/ndb/include/kernel/signaldata/IndxAttrInfo.hpp similarity index 100% rename from ndb/include/kernel/signaldata/IndxAttrInfo.hpp rename to storage/ndb/include/kernel/signaldata/IndxAttrInfo.hpp diff --git a/ndb/include/kernel/signaldata/IndxKeyInfo.hpp b/storage/ndb/include/kernel/signaldata/IndxKeyInfo.hpp similarity index 100% rename from ndb/include/kernel/signaldata/IndxKeyInfo.hpp rename to storage/ndb/include/kernel/signaldata/IndxKeyInfo.hpp diff --git a/ndb/include/kernel/signaldata/InvalidateNodeLCPConf.hpp b/storage/ndb/include/kernel/signaldata/InvalidateNodeLCPConf.hpp similarity index 100% rename from ndb/include/kernel/signaldata/InvalidateNodeLCPConf.hpp rename to storage/ndb/include/kernel/signaldata/InvalidateNodeLCPConf.hpp diff --git a/ndb/include/kernel/signaldata/InvalidateNodeLCPReq.hpp b/storage/ndb/include/kernel/signaldata/InvalidateNodeLCPReq.hpp similarity index 100% rename from ndb/include/kernel/signaldata/InvalidateNodeLCPReq.hpp rename to storage/ndb/include/kernel/signaldata/InvalidateNodeLCPReq.hpp diff --git a/ndb/include/kernel/signaldata/KeyInfo.hpp b/storage/ndb/include/kernel/signaldata/KeyInfo.hpp similarity index 100% rename from ndb/include/kernel/signaldata/KeyInfo.hpp rename to storage/ndb/include/kernel/signaldata/KeyInfo.hpp diff --git a/ndb/include/kernel/signaldata/LCP.hpp b/storage/ndb/include/kernel/signaldata/LCP.hpp similarity index 100% rename from ndb/include/kernel/signaldata/LCP.hpp rename to storage/ndb/include/kernel/signaldata/LCP.hpp diff --git a/ndb/include/kernel/signaldata/ListTables.hpp b/storage/ndb/include/kernel/signaldata/ListTables.hpp similarity index 100% rename from ndb/include/kernel/signaldata/ListTables.hpp rename to storage/ndb/include/kernel/signaldata/ListTables.hpp diff --git a/ndb/include/kernel/signaldata/LqhFrag.hpp b/storage/ndb/include/kernel/signaldata/LqhFrag.hpp similarity index 100% rename from ndb/include/kernel/signaldata/LqhFrag.hpp rename to storage/ndb/include/kernel/signaldata/LqhFrag.hpp diff --git a/ndb/include/kernel/signaldata/LqhKey.hpp b/storage/ndb/include/kernel/signaldata/LqhKey.hpp similarity index 100% rename from ndb/include/kernel/signaldata/LqhKey.hpp rename to storage/ndb/include/kernel/signaldata/LqhKey.hpp diff --git a/ndb/include/kernel/signaldata/LqhSizeAltReq.hpp b/storage/ndb/include/kernel/signaldata/LqhSizeAltReq.hpp similarity index 100% rename from ndb/include/kernel/signaldata/LqhSizeAltReq.hpp rename to storage/ndb/include/kernel/signaldata/LqhSizeAltReq.hpp diff --git a/ndb/include/kernel/signaldata/LqhTransConf.hpp b/storage/ndb/include/kernel/signaldata/LqhTransConf.hpp similarity index 100% rename from ndb/include/kernel/signaldata/LqhTransConf.hpp rename to storage/ndb/include/kernel/signaldata/LqhTransConf.hpp diff --git a/ndb/include/kernel/signaldata/ManagementServer.hpp b/storage/ndb/include/kernel/signaldata/ManagementServer.hpp similarity index 100% rename from ndb/include/kernel/signaldata/ManagementServer.hpp rename to storage/ndb/include/kernel/signaldata/ManagementServer.hpp diff --git a/ndb/include/kernel/signaldata/MasterGCP.hpp b/storage/ndb/include/kernel/signaldata/MasterGCP.hpp similarity index 100% rename from ndb/include/kernel/signaldata/MasterGCP.hpp rename to storage/ndb/include/kernel/signaldata/MasterGCP.hpp diff --git a/ndb/include/kernel/signaldata/MasterLCP.hpp b/storage/ndb/include/kernel/signaldata/MasterLCP.hpp similarity index 100% rename from ndb/include/kernel/signaldata/MasterLCP.hpp rename to storage/ndb/include/kernel/signaldata/MasterLCP.hpp diff --git a/ndb/include/kernel/signaldata/NFCompleteRep.hpp b/storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp similarity index 100% rename from ndb/include/kernel/signaldata/NFCompleteRep.hpp rename to storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp diff --git a/ndb/include/kernel/signaldata/NdbSttor.hpp b/storage/ndb/include/kernel/signaldata/NdbSttor.hpp similarity index 100% rename from ndb/include/kernel/signaldata/NdbSttor.hpp rename to storage/ndb/include/kernel/signaldata/NdbSttor.hpp diff --git a/ndb/include/kernel/signaldata/NdbfsContinueB.hpp b/storage/ndb/include/kernel/signaldata/NdbfsContinueB.hpp similarity index 100% rename from ndb/include/kernel/signaldata/NdbfsContinueB.hpp rename to storage/ndb/include/kernel/signaldata/NdbfsContinueB.hpp diff --git a/ndb/include/kernel/signaldata/NextScan.hpp b/storage/ndb/include/kernel/signaldata/NextScan.hpp similarity index 100% rename from ndb/include/kernel/signaldata/NextScan.hpp rename to storage/ndb/include/kernel/signaldata/NextScan.hpp diff --git a/ndb/include/kernel/signaldata/NodeFailRep.hpp b/storage/ndb/include/kernel/signaldata/NodeFailRep.hpp similarity index 100% rename from ndb/include/kernel/signaldata/NodeFailRep.hpp rename to storage/ndb/include/kernel/signaldata/NodeFailRep.hpp diff --git a/ndb/include/kernel/signaldata/NodeStateSignalData.hpp b/storage/ndb/include/kernel/signaldata/NodeStateSignalData.hpp similarity index 100% rename from ndb/include/kernel/signaldata/NodeStateSignalData.hpp rename to storage/ndb/include/kernel/signaldata/NodeStateSignalData.hpp diff --git a/ndb/include/kernel/signaldata/PackedSignal.hpp b/storage/ndb/include/kernel/signaldata/PackedSignal.hpp similarity index 100% rename from ndb/include/kernel/signaldata/PackedSignal.hpp rename to storage/ndb/include/kernel/signaldata/PackedSignal.hpp diff --git a/ndb/include/kernel/signaldata/PrepDropTab.hpp b/storage/ndb/include/kernel/signaldata/PrepDropTab.hpp similarity index 100% rename from ndb/include/kernel/signaldata/PrepDropTab.hpp rename to storage/ndb/include/kernel/signaldata/PrepDropTab.hpp diff --git a/ndb/include/kernel/signaldata/PrepFailReqRef.hpp b/storage/ndb/include/kernel/signaldata/PrepFailReqRef.hpp similarity index 100% rename from ndb/include/kernel/signaldata/PrepFailReqRef.hpp rename to storage/ndb/include/kernel/signaldata/PrepFailReqRef.hpp diff --git a/ndb/include/kernel/signaldata/ReadConfig.hpp b/storage/ndb/include/kernel/signaldata/ReadConfig.hpp similarity index 100% rename from ndb/include/kernel/signaldata/ReadConfig.hpp rename to storage/ndb/include/kernel/signaldata/ReadConfig.hpp diff --git a/ndb/include/kernel/signaldata/ReadNodesConf.hpp b/storage/ndb/include/kernel/signaldata/ReadNodesConf.hpp similarity index 100% rename from ndb/include/kernel/signaldata/ReadNodesConf.hpp rename to storage/ndb/include/kernel/signaldata/ReadNodesConf.hpp diff --git a/ndb/include/kernel/signaldata/RelTabMem.hpp b/storage/ndb/include/kernel/signaldata/RelTabMem.hpp similarity index 100% rename from ndb/include/kernel/signaldata/RelTabMem.hpp rename to storage/ndb/include/kernel/signaldata/RelTabMem.hpp diff --git a/ndb/include/kernel/signaldata/RepImpl.hpp b/storage/ndb/include/kernel/signaldata/RepImpl.hpp similarity index 100% rename from ndb/include/kernel/signaldata/RepImpl.hpp rename to storage/ndb/include/kernel/signaldata/RepImpl.hpp diff --git a/ndb/include/kernel/signaldata/ResumeReq.hpp b/storage/ndb/include/kernel/signaldata/ResumeReq.hpp similarity index 100% rename from ndb/include/kernel/signaldata/ResumeReq.hpp rename to storage/ndb/include/kernel/signaldata/ResumeReq.hpp diff --git a/ndb/include/kernel/signaldata/ScanFrag.hpp b/storage/ndb/include/kernel/signaldata/ScanFrag.hpp similarity index 100% rename from ndb/include/kernel/signaldata/ScanFrag.hpp rename to storage/ndb/include/kernel/signaldata/ScanFrag.hpp diff --git a/ndb/include/kernel/signaldata/ScanTab.hpp b/storage/ndb/include/kernel/signaldata/ScanTab.hpp similarity index 100% rename from ndb/include/kernel/signaldata/ScanTab.hpp rename to storage/ndb/include/kernel/signaldata/ScanTab.hpp diff --git a/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp b/storage/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp similarity index 100% rename from ndb/include/kernel/signaldata/SetLogLevelOrd.hpp rename to storage/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp diff --git a/ndb/include/kernel/signaldata/SetVarReq.hpp b/storage/ndb/include/kernel/signaldata/SetVarReq.hpp similarity index 100% rename from ndb/include/kernel/signaldata/SetVarReq.hpp rename to storage/ndb/include/kernel/signaldata/SetVarReq.hpp diff --git a/ndb/include/kernel/signaldata/SignalData.hpp b/storage/ndb/include/kernel/signaldata/SignalData.hpp similarity index 100% rename from ndb/include/kernel/signaldata/SignalData.hpp rename to storage/ndb/include/kernel/signaldata/SignalData.hpp diff --git a/ndb/include/kernel/signaldata/SignalDataPrint.hpp b/storage/ndb/include/kernel/signaldata/SignalDataPrint.hpp similarity index 100% rename from ndb/include/kernel/signaldata/SignalDataPrint.hpp rename to storage/ndb/include/kernel/signaldata/SignalDataPrint.hpp diff --git a/ndb/include/kernel/signaldata/SignalDroppedRep.hpp b/storage/ndb/include/kernel/signaldata/SignalDroppedRep.hpp similarity index 100% rename from ndb/include/kernel/signaldata/SignalDroppedRep.hpp rename to storage/ndb/include/kernel/signaldata/SignalDroppedRep.hpp diff --git a/ndb/include/kernel/signaldata/SrFragidConf.hpp b/storage/ndb/include/kernel/signaldata/SrFragidConf.hpp similarity index 100% rename from ndb/include/kernel/signaldata/SrFragidConf.hpp rename to storage/ndb/include/kernel/signaldata/SrFragidConf.hpp diff --git a/ndb/include/kernel/signaldata/StartFragReq.hpp b/storage/ndb/include/kernel/signaldata/StartFragReq.hpp similarity index 100% rename from ndb/include/kernel/signaldata/StartFragReq.hpp rename to storage/ndb/include/kernel/signaldata/StartFragReq.hpp diff --git a/ndb/include/kernel/signaldata/StartInfo.hpp b/storage/ndb/include/kernel/signaldata/StartInfo.hpp similarity index 100% rename from ndb/include/kernel/signaldata/StartInfo.hpp rename to storage/ndb/include/kernel/signaldata/StartInfo.hpp diff --git a/ndb/include/kernel/signaldata/StartMe.hpp b/storage/ndb/include/kernel/signaldata/StartMe.hpp similarity index 100% rename from ndb/include/kernel/signaldata/StartMe.hpp rename to storage/ndb/include/kernel/signaldata/StartMe.hpp diff --git a/ndb/include/kernel/signaldata/StartOrd.hpp b/storage/ndb/include/kernel/signaldata/StartOrd.hpp similarity index 100% rename from ndb/include/kernel/signaldata/StartOrd.hpp rename to storage/ndb/include/kernel/signaldata/StartOrd.hpp diff --git a/ndb/include/kernel/signaldata/StartPerm.hpp b/storage/ndb/include/kernel/signaldata/StartPerm.hpp similarity index 100% rename from ndb/include/kernel/signaldata/StartPerm.hpp rename to storage/ndb/include/kernel/signaldata/StartPerm.hpp diff --git a/ndb/include/kernel/signaldata/StartRec.hpp b/storage/ndb/include/kernel/signaldata/StartRec.hpp similarity index 100% rename from ndb/include/kernel/signaldata/StartRec.hpp rename to storage/ndb/include/kernel/signaldata/StartRec.hpp diff --git a/ndb/include/kernel/signaldata/StartTo.hpp b/storage/ndb/include/kernel/signaldata/StartTo.hpp similarity index 100% rename from ndb/include/kernel/signaldata/StartTo.hpp rename to storage/ndb/include/kernel/signaldata/StartTo.hpp diff --git a/ndb/include/kernel/signaldata/StopMe.hpp b/storage/ndb/include/kernel/signaldata/StopMe.hpp similarity index 100% rename from ndb/include/kernel/signaldata/StopMe.hpp rename to storage/ndb/include/kernel/signaldata/StopMe.hpp diff --git a/ndb/include/kernel/signaldata/StopPerm.hpp b/storage/ndb/include/kernel/signaldata/StopPerm.hpp similarity index 100% rename from ndb/include/kernel/signaldata/StopPerm.hpp rename to storage/ndb/include/kernel/signaldata/StopPerm.hpp diff --git a/ndb/include/kernel/signaldata/StopReq.hpp b/storage/ndb/include/kernel/signaldata/StopReq.hpp similarity index 100% rename from ndb/include/kernel/signaldata/StopReq.hpp rename to storage/ndb/include/kernel/signaldata/StopReq.hpp diff --git a/ndb/include/kernel/signaldata/SumaImpl.hpp b/storage/ndb/include/kernel/signaldata/SumaImpl.hpp similarity index 100% rename from ndb/include/kernel/signaldata/SumaImpl.hpp rename to storage/ndb/include/kernel/signaldata/SumaImpl.hpp diff --git a/ndb/include/kernel/signaldata/SystemError.hpp b/storage/ndb/include/kernel/signaldata/SystemError.hpp similarity index 100% rename from ndb/include/kernel/signaldata/SystemError.hpp rename to storage/ndb/include/kernel/signaldata/SystemError.hpp diff --git a/ndb/include/kernel/signaldata/TamperOrd.hpp b/storage/ndb/include/kernel/signaldata/TamperOrd.hpp similarity index 100% rename from ndb/include/kernel/signaldata/TamperOrd.hpp rename to storage/ndb/include/kernel/signaldata/TamperOrd.hpp diff --git a/ndb/include/kernel/signaldata/TcCommit.hpp b/storage/ndb/include/kernel/signaldata/TcCommit.hpp similarity index 100% rename from ndb/include/kernel/signaldata/TcCommit.hpp rename to storage/ndb/include/kernel/signaldata/TcCommit.hpp diff --git a/ndb/include/kernel/signaldata/TcContinueB.hpp b/storage/ndb/include/kernel/signaldata/TcContinueB.hpp similarity index 100% rename from ndb/include/kernel/signaldata/TcContinueB.hpp rename to storage/ndb/include/kernel/signaldata/TcContinueB.hpp diff --git a/ndb/include/kernel/signaldata/TcHbRep.hpp b/storage/ndb/include/kernel/signaldata/TcHbRep.hpp similarity index 100% rename from ndb/include/kernel/signaldata/TcHbRep.hpp rename to storage/ndb/include/kernel/signaldata/TcHbRep.hpp diff --git a/ndb/include/kernel/signaldata/TcIndx.hpp b/storage/ndb/include/kernel/signaldata/TcIndx.hpp similarity index 100% rename from ndb/include/kernel/signaldata/TcIndx.hpp rename to storage/ndb/include/kernel/signaldata/TcIndx.hpp diff --git a/ndb/include/kernel/signaldata/TcKeyConf.hpp b/storage/ndb/include/kernel/signaldata/TcKeyConf.hpp similarity index 100% rename from ndb/include/kernel/signaldata/TcKeyConf.hpp rename to storage/ndb/include/kernel/signaldata/TcKeyConf.hpp diff --git a/ndb/include/kernel/signaldata/TcKeyFailConf.hpp b/storage/ndb/include/kernel/signaldata/TcKeyFailConf.hpp similarity index 100% rename from ndb/include/kernel/signaldata/TcKeyFailConf.hpp rename to storage/ndb/include/kernel/signaldata/TcKeyFailConf.hpp diff --git a/ndb/include/kernel/signaldata/TcKeyRef.hpp b/storage/ndb/include/kernel/signaldata/TcKeyRef.hpp similarity index 100% rename from ndb/include/kernel/signaldata/TcKeyRef.hpp rename to storage/ndb/include/kernel/signaldata/TcKeyRef.hpp diff --git a/ndb/include/kernel/signaldata/TcKeyReq.hpp b/storage/ndb/include/kernel/signaldata/TcKeyReq.hpp similarity index 100% rename from ndb/include/kernel/signaldata/TcKeyReq.hpp rename to storage/ndb/include/kernel/signaldata/TcKeyReq.hpp diff --git a/ndb/include/kernel/signaldata/TcRollbackRep.hpp b/storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp similarity index 100% rename from ndb/include/kernel/signaldata/TcRollbackRep.hpp rename to storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp diff --git a/ndb/include/kernel/signaldata/TcSizeAltReq.hpp b/storage/ndb/include/kernel/signaldata/TcSizeAltReq.hpp similarity index 100% rename from ndb/include/kernel/signaldata/TcSizeAltReq.hpp rename to storage/ndb/include/kernel/signaldata/TcSizeAltReq.hpp diff --git a/ndb/include/kernel/signaldata/TestOrd.hpp b/storage/ndb/include/kernel/signaldata/TestOrd.hpp similarity index 100% rename from ndb/include/kernel/signaldata/TestOrd.hpp rename to storage/ndb/include/kernel/signaldata/TestOrd.hpp diff --git a/ndb/include/kernel/signaldata/TransIdAI.hpp b/storage/ndb/include/kernel/signaldata/TransIdAI.hpp similarity index 100% rename from ndb/include/kernel/signaldata/TransIdAI.hpp rename to storage/ndb/include/kernel/signaldata/TransIdAI.hpp diff --git a/ndb/include/kernel/signaldata/TrigAttrInfo.hpp b/storage/ndb/include/kernel/signaldata/TrigAttrInfo.hpp similarity index 100% rename from ndb/include/kernel/signaldata/TrigAttrInfo.hpp rename to storage/ndb/include/kernel/signaldata/TrigAttrInfo.hpp diff --git a/ndb/include/kernel/signaldata/TupCommit.hpp b/storage/ndb/include/kernel/signaldata/TupCommit.hpp similarity index 100% rename from ndb/include/kernel/signaldata/TupCommit.hpp rename to storage/ndb/include/kernel/signaldata/TupCommit.hpp diff --git a/ndb/include/kernel/signaldata/TupFrag.hpp b/storage/ndb/include/kernel/signaldata/TupFrag.hpp similarity index 100% rename from ndb/include/kernel/signaldata/TupFrag.hpp rename to storage/ndb/include/kernel/signaldata/TupFrag.hpp diff --git a/ndb/include/kernel/signaldata/TupKey.hpp b/storage/ndb/include/kernel/signaldata/TupKey.hpp similarity index 100% rename from ndb/include/kernel/signaldata/TupKey.hpp rename to storage/ndb/include/kernel/signaldata/TupKey.hpp diff --git a/ndb/include/kernel/signaldata/TupSizeAltReq.hpp b/storage/ndb/include/kernel/signaldata/TupSizeAltReq.hpp similarity index 100% rename from ndb/include/kernel/signaldata/TupSizeAltReq.hpp rename to storage/ndb/include/kernel/signaldata/TupSizeAltReq.hpp diff --git a/ndb/include/kernel/signaldata/TuxBound.hpp b/storage/ndb/include/kernel/signaldata/TuxBound.hpp similarity index 100% rename from ndb/include/kernel/signaldata/TuxBound.hpp rename to storage/ndb/include/kernel/signaldata/TuxBound.hpp diff --git a/ndb/include/kernel/signaldata/TuxContinueB.hpp b/storage/ndb/include/kernel/signaldata/TuxContinueB.hpp similarity index 100% rename from ndb/include/kernel/signaldata/TuxContinueB.hpp rename to storage/ndb/include/kernel/signaldata/TuxContinueB.hpp diff --git a/ndb/include/kernel/signaldata/TuxMaint.hpp b/storage/ndb/include/kernel/signaldata/TuxMaint.hpp similarity index 100% rename from ndb/include/kernel/signaldata/TuxMaint.hpp rename to storage/ndb/include/kernel/signaldata/TuxMaint.hpp diff --git a/ndb/include/kernel/signaldata/TuxSizeAltReq.hpp b/storage/ndb/include/kernel/signaldata/TuxSizeAltReq.hpp similarity index 100% rename from ndb/include/kernel/signaldata/TuxSizeAltReq.hpp rename to storage/ndb/include/kernel/signaldata/TuxSizeAltReq.hpp diff --git a/ndb/include/kernel/signaldata/UpdateTo.hpp b/storage/ndb/include/kernel/signaldata/UpdateTo.hpp similarity index 100% rename from ndb/include/kernel/signaldata/UpdateTo.hpp rename to storage/ndb/include/kernel/signaldata/UpdateTo.hpp diff --git a/ndb/include/kernel/signaldata/UpgradeStartup.hpp b/storage/ndb/include/kernel/signaldata/UpgradeStartup.hpp similarity index 100% rename from ndb/include/kernel/signaldata/UpgradeStartup.hpp rename to storage/ndb/include/kernel/signaldata/UpgradeStartup.hpp diff --git a/ndb/include/kernel/signaldata/UtilDelete.hpp b/storage/ndb/include/kernel/signaldata/UtilDelete.hpp similarity index 100% rename from ndb/include/kernel/signaldata/UtilDelete.hpp rename to storage/ndb/include/kernel/signaldata/UtilDelete.hpp diff --git a/ndb/include/kernel/signaldata/UtilExecute.hpp b/storage/ndb/include/kernel/signaldata/UtilExecute.hpp similarity index 100% rename from ndb/include/kernel/signaldata/UtilExecute.hpp rename to storage/ndb/include/kernel/signaldata/UtilExecute.hpp diff --git a/ndb/include/kernel/signaldata/UtilLock.hpp b/storage/ndb/include/kernel/signaldata/UtilLock.hpp similarity index 100% rename from ndb/include/kernel/signaldata/UtilLock.hpp rename to storage/ndb/include/kernel/signaldata/UtilLock.hpp diff --git a/ndb/include/kernel/signaldata/UtilPrepare.hpp b/storage/ndb/include/kernel/signaldata/UtilPrepare.hpp similarity index 100% rename from ndb/include/kernel/signaldata/UtilPrepare.hpp rename to storage/ndb/include/kernel/signaldata/UtilPrepare.hpp diff --git a/ndb/include/kernel/signaldata/UtilRelease.hpp b/storage/ndb/include/kernel/signaldata/UtilRelease.hpp similarity index 100% rename from ndb/include/kernel/signaldata/UtilRelease.hpp rename to storage/ndb/include/kernel/signaldata/UtilRelease.hpp diff --git a/ndb/include/kernel/signaldata/UtilSequence.hpp b/storage/ndb/include/kernel/signaldata/UtilSequence.hpp similarity index 100% rename from ndb/include/kernel/signaldata/UtilSequence.hpp rename to storage/ndb/include/kernel/signaldata/UtilSequence.hpp diff --git a/ndb/include/kernel/signaldata/WaitGCP.hpp b/storage/ndb/include/kernel/signaldata/WaitGCP.hpp similarity index 100% rename from ndb/include/kernel/signaldata/WaitGCP.hpp rename to storage/ndb/include/kernel/signaldata/WaitGCP.hpp diff --git a/ndb/include/kernel/trigger_definitions.h b/storage/ndb/include/kernel/trigger_definitions.h similarity index 100% rename from ndb/include/kernel/trigger_definitions.h rename to storage/ndb/include/kernel/trigger_definitions.h diff --git a/ndb/include/logger/ConsoleLogHandler.hpp b/storage/ndb/include/logger/ConsoleLogHandler.hpp similarity index 100% rename from ndb/include/logger/ConsoleLogHandler.hpp rename to storage/ndb/include/logger/ConsoleLogHandler.hpp diff --git a/ndb/include/logger/FileLogHandler.hpp b/storage/ndb/include/logger/FileLogHandler.hpp similarity index 100% rename from ndb/include/logger/FileLogHandler.hpp rename to storage/ndb/include/logger/FileLogHandler.hpp diff --git a/ndb/include/logger/LogHandler.hpp b/storage/ndb/include/logger/LogHandler.hpp similarity index 100% rename from ndb/include/logger/LogHandler.hpp rename to storage/ndb/include/logger/LogHandler.hpp diff --git a/ndb/include/logger/Logger.hpp b/storage/ndb/include/logger/Logger.hpp similarity index 100% rename from ndb/include/logger/Logger.hpp rename to storage/ndb/include/logger/Logger.hpp diff --git a/ndb/include/logger/SysLogHandler.hpp b/storage/ndb/include/logger/SysLogHandler.hpp similarity index 100% rename from ndb/include/logger/SysLogHandler.hpp rename to storage/ndb/include/logger/SysLogHandler.hpp diff --git a/ndb/include/mgmapi/mgmapi.h b/storage/ndb/include/mgmapi/mgmapi.h similarity index 100% rename from ndb/include/mgmapi/mgmapi.h rename to 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 similarity index 100% rename from ndb/include/mgmapi/mgmapi_config_parameters.h rename to 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 similarity index 100% rename from ndb/include/mgmapi/mgmapi_config_parameters_debug.h rename to 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 similarity index 100% rename from ndb/include/mgmapi/mgmapi_debug.h rename to storage/ndb/include/mgmapi/mgmapi_debug.h diff --git a/ndb/include/mgmapi/ndb_logevent.h b/storage/ndb/include/mgmapi/ndb_logevent.h similarity index 100% rename from ndb/include/mgmapi/ndb_logevent.h rename to storage/ndb/include/mgmapi/ndb_logevent.h diff --git a/ndb/include/mgmcommon/ConfigRetriever.hpp b/storage/ndb/include/mgmcommon/ConfigRetriever.hpp similarity index 100% rename from ndb/include/mgmcommon/ConfigRetriever.hpp rename to storage/ndb/include/mgmcommon/ConfigRetriever.hpp diff --git a/ndb/include/mgmcommon/IPCConfig.hpp b/storage/ndb/include/mgmcommon/IPCConfig.hpp similarity index 100% rename from ndb/include/mgmcommon/IPCConfig.hpp rename to storage/ndb/include/mgmcommon/IPCConfig.hpp diff --git a/ndb/include/mgmcommon/MgmtErrorReporter.hpp b/storage/ndb/include/mgmcommon/MgmtErrorReporter.hpp similarity index 100% rename from ndb/include/mgmcommon/MgmtErrorReporter.hpp rename to storage/ndb/include/mgmcommon/MgmtErrorReporter.hpp diff --git a/ndb/include/ndb_constants.h b/storage/ndb/include/ndb_constants.h similarity index 100% rename from ndb/include/ndb_constants.h rename to storage/ndb/include/ndb_constants.h diff --git a/ndb/include/ndb_global.h.in b/storage/ndb/include/ndb_global.h.in similarity index 100% rename from ndb/include/ndb_global.h.in rename to storage/ndb/include/ndb_global.h.in diff --git a/ndb/include/ndb_init.h b/storage/ndb/include/ndb_init.h similarity index 100% rename from ndb/include/ndb_init.h rename to storage/ndb/include/ndb_init.h diff --git a/ndb/include/ndb_net.h b/storage/ndb/include/ndb_net.h similarity index 100% rename from ndb/include/ndb_net.h rename to storage/ndb/include/ndb_net.h diff --git a/ndb/include/ndb_types.h.in b/storage/ndb/include/ndb_types.h.in similarity index 100% rename from ndb/include/ndb_types.h.in rename to storage/ndb/include/ndb_types.h.in diff --git a/ndb/include/ndb_version.h.in b/storage/ndb/include/ndb_version.h.in similarity index 100% rename from ndb/include/ndb_version.h.in rename to storage/ndb/include/ndb_version.h.in diff --git a/ndb/include/ndbapi/Ndb.hpp b/storage/ndb/include/ndbapi/Ndb.hpp similarity index 100% rename from ndb/include/ndbapi/Ndb.hpp rename to storage/ndb/include/ndbapi/Ndb.hpp diff --git a/ndb/include/ndbapi/NdbApi.hpp b/storage/ndb/include/ndbapi/NdbApi.hpp similarity index 100% rename from ndb/include/ndbapi/NdbApi.hpp rename to storage/ndb/include/ndbapi/NdbApi.hpp diff --git a/ndb/include/ndbapi/NdbBlob.hpp b/storage/ndb/include/ndbapi/NdbBlob.hpp similarity index 100% rename from ndb/include/ndbapi/NdbBlob.hpp rename to storage/ndb/include/ndbapi/NdbBlob.hpp diff --git a/ndb/include/ndbapi/NdbDictionary.hpp b/storage/ndb/include/ndbapi/NdbDictionary.hpp similarity index 100% rename from ndb/include/ndbapi/NdbDictionary.hpp rename to storage/ndb/include/ndbapi/NdbDictionary.hpp diff --git a/ndb/include/ndbapi/NdbError.hpp b/storage/ndb/include/ndbapi/NdbError.hpp similarity index 100% rename from ndb/include/ndbapi/NdbError.hpp rename to storage/ndb/include/ndbapi/NdbError.hpp diff --git a/ndb/include/ndbapi/NdbEventOperation.hpp b/storage/ndb/include/ndbapi/NdbEventOperation.hpp similarity index 100% rename from ndb/include/ndbapi/NdbEventOperation.hpp rename to storage/ndb/include/ndbapi/NdbEventOperation.hpp diff --git a/ndb/include/ndbapi/NdbIndexOperation.hpp b/storage/ndb/include/ndbapi/NdbIndexOperation.hpp similarity index 100% rename from ndb/include/ndbapi/NdbIndexOperation.hpp rename to storage/ndb/include/ndbapi/NdbIndexOperation.hpp diff --git a/ndb/include/ndbapi/NdbIndexScanOperation.hpp b/storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp similarity index 100% rename from ndb/include/ndbapi/NdbIndexScanOperation.hpp rename to storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp diff --git a/ndb/include/ndbapi/NdbOperation.hpp b/storage/ndb/include/ndbapi/NdbOperation.hpp similarity index 100% rename from ndb/include/ndbapi/NdbOperation.hpp rename to storage/ndb/include/ndbapi/NdbOperation.hpp diff --git a/ndb/include/ndbapi/NdbPool.hpp b/storage/ndb/include/ndbapi/NdbPool.hpp similarity index 100% rename from ndb/include/ndbapi/NdbPool.hpp rename to storage/ndb/include/ndbapi/NdbPool.hpp diff --git a/ndb/include/ndbapi/NdbRecAttr.hpp b/storage/ndb/include/ndbapi/NdbRecAttr.hpp similarity index 100% rename from ndb/include/ndbapi/NdbRecAttr.hpp rename to storage/ndb/include/ndbapi/NdbRecAttr.hpp diff --git a/ndb/include/ndbapi/NdbReceiver.hpp b/storage/ndb/include/ndbapi/NdbReceiver.hpp similarity index 100% rename from ndb/include/ndbapi/NdbReceiver.hpp rename to storage/ndb/include/ndbapi/NdbReceiver.hpp diff --git a/ndb/include/ndbapi/NdbScanFilter.hpp b/storage/ndb/include/ndbapi/NdbScanFilter.hpp similarity index 100% rename from ndb/include/ndbapi/NdbScanFilter.hpp rename to storage/ndb/include/ndbapi/NdbScanFilter.hpp diff --git a/ndb/include/ndbapi/NdbScanOperation.hpp b/storage/ndb/include/ndbapi/NdbScanOperation.hpp similarity index 100% rename from ndb/include/ndbapi/NdbScanOperation.hpp rename to storage/ndb/include/ndbapi/NdbScanOperation.hpp diff --git a/ndb/include/ndbapi/NdbTransaction.hpp b/storage/ndb/include/ndbapi/NdbTransaction.hpp similarity index 100% rename from ndb/include/ndbapi/NdbTransaction.hpp rename to 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 similarity index 100% rename from ndb/include/ndbapi/ndb_cluster_connection.hpp rename to 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 similarity index 100% rename from ndb/include/ndbapi/ndb_opt_defaults.h rename to 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 similarity index 100% rename from ndb/include/ndbapi/ndbapi_limits.h rename to storage/ndb/include/ndbapi/ndbapi_limits.h diff --git a/ndb/include/ndbapi/ndberror.h b/storage/ndb/include/ndbapi/ndberror.h similarity index 100% rename from ndb/include/ndbapi/ndberror.h rename to storage/ndb/include/ndbapi/ndberror.h diff --git a/ndb/include/newtonapi/dba.h b/storage/ndb/include/newtonapi/dba.h similarity index 100% rename from ndb/include/newtonapi/dba.h rename to 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 similarity index 100% rename from ndb/include/newtonapi/defs/pcn_types.h rename to storage/ndb/include/newtonapi/defs/pcn_types.h diff --git a/ndb/include/portlib/NdbCondition.h b/storage/ndb/include/portlib/NdbCondition.h similarity index 100% rename from ndb/include/portlib/NdbCondition.h rename to storage/ndb/include/portlib/NdbCondition.h diff --git a/ndb/include/portlib/NdbConfig.h b/storage/ndb/include/portlib/NdbConfig.h similarity index 100% rename from ndb/include/portlib/NdbConfig.h rename to storage/ndb/include/portlib/NdbConfig.h diff --git a/ndb/include/portlib/NdbDaemon.h b/storage/ndb/include/portlib/NdbDaemon.h similarity index 100% rename from ndb/include/portlib/NdbDaemon.h rename to storage/ndb/include/portlib/NdbDaemon.h diff --git a/ndb/include/portlib/NdbEnv.h b/storage/ndb/include/portlib/NdbEnv.h similarity index 100% rename from ndb/include/portlib/NdbEnv.h rename to storage/ndb/include/portlib/NdbEnv.h diff --git a/ndb/include/portlib/NdbHost.h b/storage/ndb/include/portlib/NdbHost.h similarity index 100% rename from ndb/include/portlib/NdbHost.h rename to storage/ndb/include/portlib/NdbHost.h diff --git a/ndb/include/portlib/NdbMain.h b/storage/ndb/include/portlib/NdbMain.h similarity index 100% rename from ndb/include/portlib/NdbMain.h rename to storage/ndb/include/portlib/NdbMain.h diff --git a/ndb/include/portlib/NdbMem.h b/storage/ndb/include/portlib/NdbMem.h similarity index 100% rename from ndb/include/portlib/NdbMem.h rename to storage/ndb/include/portlib/NdbMem.h diff --git a/ndb/include/portlib/NdbMutex.h b/storage/ndb/include/portlib/NdbMutex.h similarity index 100% rename from ndb/include/portlib/NdbMutex.h rename to storage/ndb/include/portlib/NdbMutex.h diff --git a/ndb/include/portlib/NdbSleep.h b/storage/ndb/include/portlib/NdbSleep.h similarity index 100% rename from ndb/include/portlib/NdbSleep.h rename to storage/ndb/include/portlib/NdbSleep.h diff --git a/ndb/include/portlib/NdbTCP.h b/storage/ndb/include/portlib/NdbTCP.h similarity index 100% rename from ndb/include/portlib/NdbTCP.h rename to storage/ndb/include/portlib/NdbTCP.h diff --git a/ndb/include/portlib/NdbThread.h b/storage/ndb/include/portlib/NdbThread.h similarity index 100% rename from ndb/include/portlib/NdbThread.h rename to storage/ndb/include/portlib/NdbThread.h diff --git a/ndb/include/portlib/NdbTick.h b/storage/ndb/include/portlib/NdbTick.h similarity index 100% rename from ndb/include/portlib/NdbTick.h rename to storage/ndb/include/portlib/NdbTick.h diff --git a/ndb/include/portlib/PortDefs.h b/storage/ndb/include/portlib/PortDefs.h similarity index 100% rename from ndb/include/portlib/PortDefs.h rename to storage/ndb/include/portlib/PortDefs.h diff --git a/ndb/include/portlib/prefetch.h b/storage/ndb/include/portlib/prefetch.h similarity index 100% rename from ndb/include/portlib/prefetch.h rename to storage/ndb/include/portlib/prefetch.h diff --git a/ndb/include/transporter/TransporterCallback.hpp b/storage/ndb/include/transporter/TransporterCallback.hpp similarity index 100% rename from ndb/include/transporter/TransporterCallback.hpp rename to storage/ndb/include/transporter/TransporterCallback.hpp diff --git a/ndb/include/transporter/TransporterDefinitions.hpp b/storage/ndb/include/transporter/TransporterDefinitions.hpp similarity index 100% rename from ndb/include/transporter/TransporterDefinitions.hpp rename to storage/ndb/include/transporter/TransporterDefinitions.hpp diff --git a/ndb/include/transporter/TransporterRegistry.hpp b/storage/ndb/include/transporter/TransporterRegistry.hpp similarity index 100% rename from ndb/include/transporter/TransporterRegistry.hpp rename to storage/ndb/include/transporter/TransporterRegistry.hpp diff --git a/ndb/include/util/Base64.hpp b/storage/ndb/include/util/Base64.hpp similarity index 100% rename from ndb/include/util/Base64.hpp rename to storage/ndb/include/util/Base64.hpp diff --git a/ndb/include/util/BaseString.hpp b/storage/ndb/include/util/BaseString.hpp similarity index 100% rename from ndb/include/util/BaseString.hpp rename to storage/ndb/include/util/BaseString.hpp diff --git a/ndb/include/util/Bitmask.hpp b/storage/ndb/include/util/Bitmask.hpp similarity index 100% rename from ndb/include/util/Bitmask.hpp rename to storage/ndb/include/util/Bitmask.hpp diff --git a/ndb/include/util/ConfigValues.hpp b/storage/ndb/include/util/ConfigValues.hpp similarity index 100% rename from ndb/include/util/ConfigValues.hpp rename to storage/ndb/include/util/ConfigValues.hpp diff --git a/ndb/include/util/File.hpp b/storage/ndb/include/util/File.hpp similarity index 100% rename from ndb/include/util/File.hpp rename to storage/ndb/include/util/File.hpp diff --git a/ndb/include/util/InputStream.hpp b/storage/ndb/include/util/InputStream.hpp similarity index 100% rename from ndb/include/util/InputStream.hpp rename to storage/ndb/include/util/InputStream.hpp diff --git a/ndb/include/util/NdbAutoPtr.hpp b/storage/ndb/include/util/NdbAutoPtr.hpp similarity index 100% rename from ndb/include/util/NdbAutoPtr.hpp rename to storage/ndb/include/util/NdbAutoPtr.hpp diff --git a/ndb/include/util/NdbOut.hpp b/storage/ndb/include/util/NdbOut.hpp similarity index 100% rename from ndb/include/util/NdbOut.hpp rename to storage/ndb/include/util/NdbOut.hpp diff --git a/ndb/include/util/NdbSqlUtil.hpp b/storage/ndb/include/util/NdbSqlUtil.hpp similarity index 100% rename from ndb/include/util/NdbSqlUtil.hpp rename to storage/ndb/include/util/NdbSqlUtil.hpp diff --git a/ndb/include/util/OutputStream.hpp b/storage/ndb/include/util/OutputStream.hpp similarity index 100% rename from ndb/include/util/OutputStream.hpp rename to storage/ndb/include/util/OutputStream.hpp diff --git a/ndb/include/util/Parser.hpp b/storage/ndb/include/util/Parser.hpp similarity index 100% rename from ndb/include/util/Parser.hpp rename to storage/ndb/include/util/Parser.hpp diff --git a/ndb/include/util/Properties.hpp b/storage/ndb/include/util/Properties.hpp similarity index 100% rename from ndb/include/util/Properties.hpp rename to storage/ndb/include/util/Properties.hpp diff --git a/ndb/include/util/SimpleProperties.hpp b/storage/ndb/include/util/SimpleProperties.hpp similarity index 100% rename from ndb/include/util/SimpleProperties.hpp rename to storage/ndb/include/util/SimpleProperties.hpp diff --git a/ndb/include/util/SocketAuthenticator.hpp b/storage/ndb/include/util/SocketAuthenticator.hpp similarity index 100% rename from ndb/include/util/SocketAuthenticator.hpp rename to storage/ndb/include/util/SocketAuthenticator.hpp diff --git a/ndb/include/util/SocketClient.hpp b/storage/ndb/include/util/SocketClient.hpp similarity index 100% rename from ndb/include/util/SocketClient.hpp rename to storage/ndb/include/util/SocketClient.hpp diff --git a/ndb/include/util/SocketServer.hpp b/storage/ndb/include/util/SocketServer.hpp similarity index 100% rename from ndb/include/util/SocketServer.hpp rename to storage/ndb/include/util/SocketServer.hpp diff --git a/ndb/include/util/UtilBuffer.hpp b/storage/ndb/include/util/UtilBuffer.hpp similarity index 100% rename from ndb/include/util/UtilBuffer.hpp rename to storage/ndb/include/util/UtilBuffer.hpp diff --git a/ndb/include/util/Vector.hpp b/storage/ndb/include/util/Vector.hpp similarity index 100% rename from ndb/include/util/Vector.hpp rename to storage/ndb/include/util/Vector.hpp diff --git a/ndb/include/util/basestring_vsnprintf.h b/storage/ndb/include/util/basestring_vsnprintf.h similarity index 100% rename from ndb/include/util/basestring_vsnprintf.h rename to storage/ndb/include/util/basestring_vsnprintf.h diff --git a/ndb/include/util/md5_hash.hpp b/storage/ndb/include/util/md5_hash.hpp similarity index 100% rename from ndb/include/util/md5_hash.hpp rename to storage/ndb/include/util/md5_hash.hpp diff --git a/ndb/include/util/ndb_opts.h b/storage/ndb/include/util/ndb_opts.h similarity index 100% rename from ndb/include/util/ndb_opts.h rename to storage/ndb/include/util/ndb_opts.h diff --git a/ndb/include/util/random.h b/storage/ndb/include/util/random.h similarity index 100% rename from ndb/include/util/random.h rename to storage/ndb/include/util/random.h diff --git a/ndb/include/util/socket_io.h b/storage/ndb/include/util/socket_io.h similarity index 100% rename from ndb/include/util/socket_io.h rename to storage/ndb/include/util/socket_io.h diff --git a/ndb/include/util/uucode.h b/storage/ndb/include/util/uucode.h similarity index 100% rename from ndb/include/util/uucode.h rename to storage/ndb/include/util/uucode.h diff --git a/ndb/include/util/version.h b/storage/ndb/include/util/version.h similarity index 100% rename from ndb/include/util/version.h rename to storage/ndb/include/util/version.h diff --git a/ndb/lib/.empty b/storage/ndb/lib/.empty similarity index 100% rename from ndb/lib/.empty rename to storage/ndb/lib/.empty diff --git a/ndb/ndbapi-examples/Makefile b/storage/ndb/ndbapi-examples/Makefile similarity index 100% rename from ndb/ndbapi-examples/Makefile rename to storage/ndb/ndbapi-examples/Makefile diff --git a/ndb/ndbapi-examples/mgmapi_logevent_example/Makefile b/storage/ndb/ndbapi-examples/mgmapi_logevent_example/Makefile similarity index 100% rename from ndb/ndbapi-examples/mgmapi_logevent_example/Makefile rename to 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 similarity index 100% rename from ndb/ndbapi-examples/mgmapi_logevent_example/mgmapi_logevent.cpp rename to 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 similarity index 100% rename from ndb/ndbapi-examples/ndbapi_async_example/Makefile rename to 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 similarity index 100% rename from ndb/ndbapi-examples/ndbapi_async_example/ndbapi_async.cpp rename to 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 similarity index 100% rename from ndb/ndbapi-examples/ndbapi_async_example/readme.txt rename to 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 similarity index 100% rename from ndb/ndbapi-examples/ndbapi_async_example1/Makefile rename to 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 similarity index 100% rename from ndb/ndbapi-examples/ndbapi_async_example1/ndbapi_async1.cpp rename to 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 similarity index 100% rename from ndb/ndbapi-examples/ndbapi_event_example/Makefile rename to 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 similarity index 100% rename from ndb/ndbapi-examples/ndbapi_event_example/ndbapi_event.cpp rename to 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 similarity index 100% rename from ndb/ndbapi-examples/ndbapi_retries_example/Makefile rename to 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 similarity index 100% rename from ndb/ndbapi-examples/ndbapi_retries_example/ndbapi_retries.cpp rename to 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 similarity index 100% rename from ndb/ndbapi-examples/ndbapi_scan_example/Makefile rename to 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 similarity index 100% rename from ndb/ndbapi-examples/ndbapi_scan_example/ndbapi_scan.cpp rename to 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 similarity index 100% rename from ndb/ndbapi-examples/ndbapi_scan_example/readme.txt rename to 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 similarity index 100% rename from ndb/ndbapi-examples/ndbapi_simple_example/Makefile rename to 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 similarity index 100% rename from ndb/ndbapi-examples/ndbapi_simple_example/ndbapi_simple.cpp rename to 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 similarity index 100% rename from ndb/ndbapi-examples/ndbapi_simple_index_example/Makefile rename to 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 similarity index 100% rename from ndb/ndbapi-examples/ndbapi_simple_index_example/ndbapi_simple_index.cpp rename to storage/ndb/ndbapi-examples/ndbapi_simple_index_example/ndbapi_simple_index.cpp diff --git a/ndb/src/Makefile.am b/storage/ndb/src/Makefile.am similarity index 100% rename from ndb/src/Makefile.am rename to storage/ndb/src/Makefile.am diff --git a/ndb/src/common/Makefile.am b/storage/ndb/src/common/Makefile.am similarity index 100% rename from ndb/src/common/Makefile.am rename to storage/ndb/src/common/Makefile.am diff --git a/ndb/src/common/debugger/BlockNames.cpp b/storage/ndb/src/common/debugger/BlockNames.cpp similarity index 100% rename from ndb/src/common/debugger/BlockNames.cpp rename to storage/ndb/src/common/debugger/BlockNames.cpp diff --git a/ndb/src/common/debugger/DebuggerNames.cpp b/storage/ndb/src/common/debugger/DebuggerNames.cpp similarity index 100% rename from ndb/src/common/debugger/DebuggerNames.cpp rename to storage/ndb/src/common/debugger/DebuggerNames.cpp diff --git a/ndb/src/common/debugger/EventLogger.cpp b/storage/ndb/src/common/debugger/EventLogger.cpp similarity index 100% rename from ndb/src/common/debugger/EventLogger.cpp rename to storage/ndb/src/common/debugger/EventLogger.cpp diff --git a/ndb/src/common/debugger/GrepError.cpp b/storage/ndb/src/common/debugger/GrepError.cpp similarity index 100% rename from ndb/src/common/debugger/GrepError.cpp rename to storage/ndb/src/common/debugger/GrepError.cpp diff --git a/ndb/src/common/debugger/Makefile.am b/storage/ndb/src/common/debugger/Makefile.am similarity index 100% rename from ndb/src/common/debugger/Makefile.am rename to storage/ndb/src/common/debugger/Makefile.am diff --git a/ndb/src/common/debugger/SignalLoggerManager.cpp b/storage/ndb/src/common/debugger/SignalLoggerManager.cpp similarity index 100% rename from ndb/src/common/debugger/SignalLoggerManager.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/AccLock.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/AlterIndx.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/AlterTab.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/AlterTable.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/AlterTrig.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/BackupImpl.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/BackupSignalData.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/CloseComReqConf.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/CntrStart.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/ContinueB.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/CopyGCI.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/CreateEvnt.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/CreateFragmentation.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/CreateIndx.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/CreateTrig.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/DictTabInfo.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/DihContinueB.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/DisconnectRep.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/DropIndx.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/DropTab.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/DropTrig.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/FailRep.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/FireTrigOrd.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/FsAppendReq.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/FsCloseReq.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/FsConf.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/FsOpenReq.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/FsRef.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/GCPSave.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/LCP.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/LqhFrag.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/LqhKey.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/LqhTrans.cpp rename to storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp diff --git a/ndb/src/common/debugger/signaldata/Makefile.am b/storage/ndb/src/common/debugger/signaldata/Makefile.am similarity index 100% rename from ndb/src/common/debugger/signaldata/Makefile.am rename to storage/ndb/src/common/debugger/signaldata/Makefile.am diff --git a/ndb/src/common/debugger/signaldata/MasterLCP.cpp b/storage/ndb/src/common/debugger/signaldata/MasterLCP.cpp similarity index 100% rename from ndb/src/common/debugger/signaldata/MasterLCP.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/NFCompleteRep.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/NdbSttor.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/PackedSignal.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/PrepDropTab.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/ReadNodesConf.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/ScanFrag.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/ScanTab.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/SignalDataPrint.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/SignalNames.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/StartRec.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/SumaImpl.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/SystemError.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/TcIndx.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/TcKeyConf.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/TcKeyRef.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/TcKeyReq.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/TcRollbackRep.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/TupCommit.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/TupKey.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/TuxMaint.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/UtilDelete.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/UtilExecute.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/UtilLock.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/UtilPrepare.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/UtilSequence.cpp rename to 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 similarity index 100% rename from ndb/src/common/debugger/signaldata/print.awk rename to 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 similarity index 100% rename from ndb/src/common/logger/ConsoleLogHandler.cpp rename to storage/ndb/src/common/logger/ConsoleLogHandler.cpp diff --git a/ndb/src/common/logger/FileLogHandler.cpp b/storage/ndb/src/common/logger/FileLogHandler.cpp similarity index 100% rename from ndb/src/common/logger/FileLogHandler.cpp rename to storage/ndb/src/common/logger/FileLogHandler.cpp diff --git a/ndb/src/common/logger/LogHandler.cpp b/storage/ndb/src/common/logger/LogHandler.cpp similarity index 100% rename from ndb/src/common/logger/LogHandler.cpp rename to storage/ndb/src/common/logger/LogHandler.cpp diff --git a/ndb/src/common/logger/LogHandlerList.cpp b/storage/ndb/src/common/logger/LogHandlerList.cpp similarity index 100% rename from ndb/src/common/logger/LogHandlerList.cpp rename to storage/ndb/src/common/logger/LogHandlerList.cpp diff --git a/ndb/src/common/logger/LogHandlerList.hpp b/storage/ndb/src/common/logger/LogHandlerList.hpp similarity index 100% rename from ndb/src/common/logger/LogHandlerList.hpp rename to storage/ndb/src/common/logger/LogHandlerList.hpp diff --git a/ndb/src/common/logger/Logger.cpp b/storage/ndb/src/common/logger/Logger.cpp similarity index 100% rename from ndb/src/common/logger/Logger.cpp rename to storage/ndb/src/common/logger/Logger.cpp diff --git a/ndb/src/common/logger/Makefile.am b/storage/ndb/src/common/logger/Makefile.am similarity index 100% rename from ndb/src/common/logger/Makefile.am rename to storage/ndb/src/common/logger/Makefile.am diff --git a/ndb/src/common/logger/SysLogHandler.cpp b/storage/ndb/src/common/logger/SysLogHandler.cpp similarity index 100% rename from ndb/src/common/logger/SysLogHandler.cpp rename to 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 similarity index 100% rename from ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp rename to 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 similarity index 100% rename from ndb/src/common/logger/listtest/LogHandlerListUnitTest.hpp rename to 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 similarity index 100% rename from ndb/src/common/logger/listtest/Makefile rename to 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 similarity index 100% rename from ndb/src/common/logger/loggertest/LoggerUnitTest.cpp rename to 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 similarity index 100% rename from ndb/src/common/logger/loggertest/LoggerUnitTest.hpp rename to 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 similarity index 100% rename from ndb/src/common/logger/loggertest/Makefile rename to storage/ndb/src/common/logger/loggertest/Makefile diff --git a/ndb/src/common/mgmcommon/ConfigRetriever.cpp b/storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp similarity index 100% rename from ndb/src/common/mgmcommon/ConfigRetriever.cpp rename to storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp diff --git a/ndb/src/common/mgmcommon/IPCConfig.cpp b/storage/ndb/src/common/mgmcommon/IPCConfig.cpp similarity index 100% rename from ndb/src/common/mgmcommon/IPCConfig.cpp rename to storage/ndb/src/common/mgmcommon/IPCConfig.cpp diff --git a/ndb/src/common/mgmcommon/Makefile.am b/storage/ndb/src/common/mgmcommon/Makefile.am similarity index 100% rename from ndb/src/common/mgmcommon/Makefile.am rename to storage/ndb/src/common/mgmcommon/Makefile.am diff --git a/ndb/src/common/mgmcommon/printConfig/Makefile b/storage/ndb/src/common/mgmcommon/printConfig/Makefile similarity index 100% rename from ndb/src/common/mgmcommon/printConfig/Makefile rename to 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 similarity index 100% rename from ndb/src/common/mgmcommon/printConfig/printConfig.cpp rename to storage/ndb/src/common/mgmcommon/printConfig/printConfig.cpp diff --git a/ndb/src/common/portlib/Makefile.am b/storage/ndb/src/common/portlib/Makefile.am similarity index 100% rename from ndb/src/common/portlib/Makefile.am rename to storage/ndb/src/common/portlib/Makefile.am diff --git a/ndb/src/common/portlib/NdbCondition.c b/storage/ndb/src/common/portlib/NdbCondition.c similarity index 100% rename from ndb/src/common/portlib/NdbCondition.c rename to storage/ndb/src/common/portlib/NdbCondition.c diff --git a/ndb/src/common/portlib/NdbConfig.c b/storage/ndb/src/common/portlib/NdbConfig.c similarity index 100% rename from ndb/src/common/portlib/NdbConfig.c rename to storage/ndb/src/common/portlib/NdbConfig.c diff --git a/ndb/src/common/portlib/NdbDaemon.c b/storage/ndb/src/common/portlib/NdbDaemon.c similarity index 100% rename from ndb/src/common/portlib/NdbDaemon.c rename to storage/ndb/src/common/portlib/NdbDaemon.c diff --git a/ndb/src/common/portlib/NdbEnv.c b/storage/ndb/src/common/portlib/NdbEnv.c similarity index 100% rename from ndb/src/common/portlib/NdbEnv.c rename to storage/ndb/src/common/portlib/NdbEnv.c diff --git a/ndb/src/common/portlib/NdbHost.c b/storage/ndb/src/common/portlib/NdbHost.c similarity index 100% rename from ndb/src/common/portlib/NdbHost.c rename to storage/ndb/src/common/portlib/NdbHost.c diff --git a/ndb/src/common/portlib/NdbMem.c b/storage/ndb/src/common/portlib/NdbMem.c similarity index 100% rename from ndb/src/common/portlib/NdbMem.c rename to storage/ndb/src/common/portlib/NdbMem.c diff --git a/ndb/src/common/portlib/NdbMutex.c b/storage/ndb/src/common/portlib/NdbMutex.c similarity index 100% rename from ndb/src/common/portlib/NdbMutex.c rename to storage/ndb/src/common/portlib/NdbMutex.c diff --git a/ndb/src/common/portlib/NdbPortLibTest.cpp b/storage/ndb/src/common/portlib/NdbPortLibTest.cpp similarity index 100% rename from ndb/src/common/portlib/NdbPortLibTest.cpp rename to storage/ndb/src/common/portlib/NdbPortLibTest.cpp diff --git a/ndb/src/common/portlib/NdbSleep.c b/storage/ndb/src/common/portlib/NdbSleep.c similarity index 100% rename from ndb/src/common/portlib/NdbSleep.c rename to storage/ndb/src/common/portlib/NdbSleep.c diff --git a/ndb/src/common/portlib/NdbTCP.cpp b/storage/ndb/src/common/portlib/NdbTCP.cpp similarity index 100% rename from ndb/src/common/portlib/NdbTCP.cpp rename to storage/ndb/src/common/portlib/NdbTCP.cpp diff --git a/ndb/src/common/portlib/NdbThread.c b/storage/ndb/src/common/portlib/NdbThread.c similarity index 100% rename from ndb/src/common/portlib/NdbThread.c rename to storage/ndb/src/common/portlib/NdbThread.c diff --git a/ndb/src/common/portlib/NdbTick.c b/storage/ndb/src/common/portlib/NdbTick.c similarity index 100% rename from ndb/src/common/portlib/NdbTick.c rename to storage/ndb/src/common/portlib/NdbTick.c diff --git a/ndb/src/common/portlib/gcc.cpp b/storage/ndb/src/common/portlib/gcc.cpp similarity index 100% rename from ndb/src/common/portlib/gcc.cpp rename to storage/ndb/src/common/portlib/gcc.cpp diff --git a/ndb/src/common/portlib/memtest.c b/storage/ndb/src/common/portlib/memtest.c similarity index 100% rename from ndb/src/common/portlib/memtest.c rename to storage/ndb/src/common/portlib/memtest.c diff --git a/ndb/src/common/portlib/mmslist.cpp b/storage/ndb/src/common/portlib/mmslist.cpp similarity index 100% rename from ndb/src/common/portlib/mmslist.cpp rename to storage/ndb/src/common/portlib/mmslist.cpp diff --git a/ndb/src/common/portlib/mmstest.cpp b/storage/ndb/src/common/portlib/mmstest.cpp similarity index 100% rename from ndb/src/common/portlib/mmstest.cpp rename to storage/ndb/src/common/portlib/mmstest.cpp diff --git a/ndb/src/common/portlib/munmaptest.cpp b/storage/ndb/src/common/portlib/munmaptest.cpp similarity index 100% rename from ndb/src/common/portlib/munmaptest.cpp rename to 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 similarity index 100% rename from ndb/src/common/portlib/old_dirs/memtest/Makefile rename to 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 similarity index 100% rename from ndb/src/common/portlib/old_dirs/memtest/munmaptest/Makefile rename to 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 similarity index 100% rename from ndb/src/common/portlib/old_dirs/ose/Makefile rename to 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 similarity index 100% rename from ndb/src/common/portlib/old_dirs/ose/NdbCondition.c rename to 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 similarity index 100% rename from ndb/src/common/portlib/old_dirs/ose/NdbConditionOSE.h rename to 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 similarity index 100% rename from ndb/src/common/portlib/old_dirs/ose/NdbEnv.c rename to 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 similarity index 100% rename from ndb/src/common/portlib/old_dirs/ose/NdbHost.c rename to 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 similarity index 100% rename from ndb/src/common/portlib/old_dirs/ose/NdbMem.c rename to 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 similarity index 100% rename from ndb/src/common/portlib/old_dirs/ose/NdbMem_SoftOse.cpp rename to 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 similarity index 100% rename from ndb/src/common/portlib/old_dirs/ose/NdbMutex.c rename to 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 similarity index 100% rename from ndb/src/common/portlib/old_dirs/ose/NdbOut.cpp rename to 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 similarity index 100% rename from ndb/src/common/portlib/old_dirs/ose/NdbSleep.c rename to 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 similarity index 100% rename from ndb/src/common/portlib/old_dirs/ose/NdbTCP.c rename to 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 similarity index 100% rename from ndb/src/common/portlib/old_dirs/ose/NdbThread.c rename to 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 similarity index 100% rename from ndb/src/common/portlib/old_dirs/ose/NdbTick.c rename to 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 similarity index 100% rename from ndb/src/common/portlib/old_dirs/test/Makefile rename to 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 similarity index 100% rename from ndb/src/common/portlib/old_dirs/win32/Makefile rename to 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 similarity index 100% rename from ndb/src/common/portlib/old_dirs/win32/NdbCondition.c rename to 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 similarity index 100% rename from ndb/src/common/portlib/old_dirs/win32/NdbDaemon.c rename to 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 similarity index 100% rename from ndb/src/common/portlib/old_dirs/win32/NdbEnv.c rename to 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 similarity index 100% rename from ndb/src/common/portlib/old_dirs/win32/NdbHost.c rename to 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 similarity index 100% rename from ndb/src/common/portlib/old_dirs/win32/NdbMem.c rename to 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 similarity index 100% rename from ndb/src/common/portlib/old_dirs/win32/NdbMutex.c rename to 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 similarity index 100% rename from ndb/src/common/portlib/old_dirs/win32/NdbSleep.c rename to 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 similarity index 100% rename from ndb/src/common/portlib/old_dirs/win32/NdbTCP.c rename to 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 similarity index 100% rename from ndb/src/common/portlib/old_dirs/win32/NdbThread.c rename to 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 similarity index 100% rename from ndb/src/common/portlib/old_dirs/win32/NdbTick.c rename to 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 similarity index 100% rename from ndb/src/common/portlib/win32/NdbCondition.c rename to 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 similarity index 100% rename from ndb/src/common/portlib/win32/NdbDaemon.c rename to 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 similarity index 100% rename from ndb/src/common/portlib/win32/NdbEnv.c rename to 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 similarity index 100% rename from ndb/src/common/portlib/win32/NdbHost.c rename to 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 similarity index 100% rename from ndb/src/common/portlib/win32/NdbMem.c rename to 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 similarity index 100% rename from ndb/src/common/portlib/win32/NdbMutex.c rename to 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 similarity index 100% rename from ndb/src/common/portlib/win32/NdbSleep.c rename to 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 similarity index 100% rename from ndb/src/common/portlib/win32/NdbTCP.c rename to 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 similarity index 100% rename from ndb/src/common/portlib/win32/NdbThread.c rename to 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 similarity index 100% rename from ndb/src/common/portlib/win32/NdbTick.c rename to storage/ndb/src/common/portlib/win32/NdbTick.c diff --git a/ndb/src/common/transporter/Makefile.am b/storage/ndb/src/common/transporter/Makefile.am similarity index 100% rename from ndb/src/common/transporter/Makefile.am rename to storage/ndb/src/common/transporter/Makefile.am diff --git a/ndb/src/common/transporter/OSE_Receiver.cpp b/storage/ndb/src/common/transporter/OSE_Receiver.cpp similarity index 100% rename from ndb/src/common/transporter/OSE_Receiver.cpp rename to 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 similarity index 100% rename from ndb/src/common/transporter/OSE_Receiver.hpp rename to 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 similarity index 100% rename from ndb/src/common/transporter/OSE_Signals.hpp rename to 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 similarity index 100% rename from ndb/src/common/transporter/OSE_Transporter.cpp rename to 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 similarity index 100% rename from ndb/src/common/transporter/OSE_Transporter.hpp rename to 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 similarity index 100% rename from ndb/src/common/transporter/Packer.cpp rename to storage/ndb/src/common/transporter/Packer.cpp diff --git a/ndb/src/common/transporter/Packer.hpp b/storage/ndb/src/common/transporter/Packer.hpp similarity index 100% rename from ndb/src/common/transporter/Packer.hpp rename to 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 similarity index 100% rename from ndb/src/common/transporter/SCI_Transporter.cpp rename to 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 similarity index 100% rename from ndb/src/common/transporter/SCI_Transporter.hpp rename to 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 similarity index 100% rename from ndb/src/common/transporter/SHM_Buffer.hpp rename to 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 similarity index 100% rename from ndb/src/common/transporter/SHM_Transporter.cpp rename to 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 similarity index 100% rename from ndb/src/common/transporter/SHM_Transporter.hpp rename to 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 similarity index 100% rename from ndb/src/common/transporter/SHM_Transporter.unix.cpp rename to 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 similarity index 100% rename from ndb/src/common/transporter/SHM_Transporter.win32.cpp rename to 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 similarity index 100% rename from ndb/src/common/transporter/SendBuffer.cpp rename to storage/ndb/src/common/transporter/SendBuffer.cpp diff --git a/ndb/src/common/transporter/SendBuffer.hpp b/storage/ndb/src/common/transporter/SendBuffer.hpp similarity index 100% rename from ndb/src/common/transporter/SendBuffer.hpp rename to 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 similarity index 100% rename from ndb/src/common/transporter/TCP_Transporter.cpp rename to 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 similarity index 100% rename from ndb/src/common/transporter/TCP_Transporter.hpp rename to 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 similarity index 100% rename from ndb/src/common/transporter/Transporter.cpp rename to storage/ndb/src/common/transporter/Transporter.cpp diff --git a/ndb/src/common/transporter/Transporter.hpp b/storage/ndb/src/common/transporter/Transporter.hpp similarity index 100% rename from ndb/src/common/transporter/Transporter.hpp rename to storage/ndb/src/common/transporter/Transporter.hpp diff --git a/ndb/src/common/transporter/TransporterInternalDefinitions.hpp b/storage/ndb/src/common/transporter/TransporterInternalDefinitions.hpp similarity index 100% rename from ndb/src/common/transporter/TransporterInternalDefinitions.hpp rename to storage/ndb/src/common/transporter/TransporterInternalDefinitions.hpp diff --git a/ndb/src/common/transporter/TransporterRegistry.cpp b/storage/ndb/src/common/transporter/TransporterRegistry.cpp similarity index 100% rename from ndb/src/common/transporter/TransporterRegistry.cpp rename to storage/ndb/src/common/transporter/TransporterRegistry.cpp diff --git a/ndb/src/common/transporter/basictest/Makefile b/storage/ndb/src/common/transporter/basictest/Makefile similarity index 100% rename from ndb/src/common/transporter/basictest/Makefile rename to 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 similarity index 100% rename from ndb/src/common/transporter/basictest/basicTransporterTest.cpp rename to 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 similarity index 100% rename from ndb/src/common/transporter/buddy.cpp rename to storage/ndb/src/common/transporter/buddy.cpp diff --git a/ndb/src/common/transporter/buddy.hpp b/storage/ndb/src/common/transporter/buddy.hpp similarity index 100% rename from ndb/src/common/transporter/buddy.hpp rename to storage/ndb/src/common/transporter/buddy.hpp diff --git a/ndb/src/common/transporter/failoverSCI/Makefile b/storage/ndb/src/common/transporter/failoverSCI/Makefile similarity index 100% rename from ndb/src/common/transporter/failoverSCI/Makefile rename to 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 similarity index 100% rename from ndb/src/common/transporter/failoverSCI/failoverSCI.cpp rename to 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 similarity index 100% rename from ndb/src/common/transporter/perftest/Makefile rename to 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 similarity index 100% rename from ndb/src/common/transporter/perftest/perfTransporterTest.cpp rename to 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 similarity index 100% rename from ndb/src/common/transporter/priotest/Makefile rename to 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 similarity index 100% rename from ndb/src/common/transporter/priotest/prioOSE/Makefile rename to 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 similarity index 100% rename from ndb/src/common/transporter/priotest/prioSCI/Makefile rename to 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 similarity index 100% rename from ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp rename to 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 similarity index 100% rename from ndb/src/common/transporter/priotest/prioSHM/Makefile rename to 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 similarity index 100% rename from ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp rename to 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 similarity index 100% rename from ndb/src/common/transporter/priotest/prioTCP/Makefile rename to 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 similarity index 100% rename from ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp rename to 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 similarity index 100% rename from ndb/src/common/transporter/priotest/prioTransporterTest.cpp rename to 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 similarity index 100% rename from ndb/src/common/transporter/priotest/prioTransporterTest.hpp rename to 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 similarity index 100% rename from ndb/src/common/util/Base64.cpp rename to storage/ndb/src/common/util/Base64.cpp diff --git a/ndb/src/common/util/BaseString.cpp b/storage/ndb/src/common/util/BaseString.cpp similarity index 100% rename from ndb/src/common/util/BaseString.cpp rename to storage/ndb/src/common/util/BaseString.cpp diff --git a/ndb/src/common/util/Bitmask.cpp b/storage/ndb/src/common/util/Bitmask.cpp similarity index 100% rename from ndb/src/common/util/Bitmask.cpp rename to storage/ndb/src/common/util/Bitmask.cpp diff --git a/ndb/src/common/util/ConfigValues.cpp b/storage/ndb/src/common/util/ConfigValues.cpp similarity index 100% rename from ndb/src/common/util/ConfigValues.cpp rename to storage/ndb/src/common/util/ConfigValues.cpp diff --git a/ndb/src/common/util/File.cpp b/storage/ndb/src/common/util/File.cpp similarity index 100% rename from ndb/src/common/util/File.cpp rename to storage/ndb/src/common/util/File.cpp diff --git a/ndb/src/common/util/InputStream.cpp b/storage/ndb/src/common/util/InputStream.cpp similarity index 100% rename from ndb/src/common/util/InputStream.cpp rename to storage/ndb/src/common/util/InputStream.cpp diff --git a/ndb/src/common/util/Makefile.am b/storage/ndb/src/common/util/Makefile.am similarity index 100% rename from ndb/src/common/util/Makefile.am rename to storage/ndb/src/common/util/Makefile.am diff --git a/ndb/src/common/util/NdbErrHnd.cpp b/storage/ndb/src/common/util/NdbErrHnd.cpp similarity index 100% rename from ndb/src/common/util/NdbErrHnd.cpp rename to storage/ndb/src/common/util/NdbErrHnd.cpp diff --git a/ndb/src/common/util/NdbOut.cpp b/storage/ndb/src/common/util/NdbOut.cpp similarity index 100% rename from ndb/src/common/util/NdbOut.cpp rename to storage/ndb/src/common/util/NdbOut.cpp diff --git a/ndb/src/common/util/NdbSqlUtil.cpp b/storage/ndb/src/common/util/NdbSqlUtil.cpp similarity index 100% rename from ndb/src/common/util/NdbSqlUtil.cpp rename to storage/ndb/src/common/util/NdbSqlUtil.cpp diff --git a/ndb/src/common/util/OutputStream.cpp b/storage/ndb/src/common/util/OutputStream.cpp similarity index 100% rename from ndb/src/common/util/OutputStream.cpp rename to storage/ndb/src/common/util/OutputStream.cpp diff --git a/ndb/src/common/util/Parser.cpp b/storage/ndb/src/common/util/Parser.cpp similarity index 100% rename from ndb/src/common/util/Parser.cpp rename to storage/ndb/src/common/util/Parser.cpp diff --git a/ndb/src/common/util/Properties.cpp b/storage/ndb/src/common/util/Properties.cpp similarity index 100% rename from ndb/src/common/util/Properties.cpp rename to storage/ndb/src/common/util/Properties.cpp diff --git a/ndb/src/common/util/SimpleProperties.cpp b/storage/ndb/src/common/util/SimpleProperties.cpp similarity index 100% rename from ndb/src/common/util/SimpleProperties.cpp rename to storage/ndb/src/common/util/SimpleProperties.cpp diff --git a/ndb/src/common/util/SocketAuthenticator.cpp b/storage/ndb/src/common/util/SocketAuthenticator.cpp similarity index 100% rename from ndb/src/common/util/SocketAuthenticator.cpp rename to storage/ndb/src/common/util/SocketAuthenticator.cpp diff --git a/ndb/src/common/util/SocketClient.cpp b/storage/ndb/src/common/util/SocketClient.cpp similarity index 100% rename from ndb/src/common/util/SocketClient.cpp rename to storage/ndb/src/common/util/SocketClient.cpp diff --git a/ndb/src/common/util/SocketServer.cpp b/storage/ndb/src/common/util/SocketServer.cpp similarity index 100% rename from ndb/src/common/util/SocketServer.cpp rename to 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 similarity index 100% rename from ndb/src/common/util/basestring_vsnprintf.c rename to 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 similarity index 100% rename from ndb/src/common/util/filetest/FileUnitTest.cpp rename to 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 similarity index 100% rename from ndb/src/common/util/filetest/FileUnitTest.hpp rename to 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 similarity index 100% rename from ndb/src/common/util/filetest/Makefile rename to storage/ndb/src/common/util/filetest/Makefile diff --git a/ndb/src/common/util/getarg.cat3 b/storage/ndb/src/common/util/getarg.cat3 similarity index 100% rename from ndb/src/common/util/getarg.cat3 rename to 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 similarity index 100% rename from ndb/src/common/util/md5_hash.cpp rename to 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 similarity index 100% rename from ndb/src/common/util/ndb_init.c rename to 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 similarity index 100% rename from ndb/src/common/util/new.cpp rename to storage/ndb/src/common/util/new.cpp diff --git a/ndb/src/common/util/random.c b/storage/ndb/src/common/util/random.c similarity index 100% rename from ndb/src/common/util/random.c rename to 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 similarity index 100% rename from ndb/src/common/util/socket_io.cpp rename to 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 similarity index 100% rename from ndb/src/common/util/strdup.c rename to storage/ndb/src/common/util/strdup.c diff --git a/ndb/src/common/util/testConfigValues/Makefile b/storage/ndb/src/common/util/testConfigValues/Makefile similarity index 100% rename from ndb/src/common/util/testConfigValues/Makefile rename to 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 similarity index 100% rename from ndb/src/common/util/testConfigValues/testConfigValues.cpp rename to 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 similarity index 100% rename from ndb/src/common/util/testProperties/Makefile rename to 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 similarity index 100% rename from ndb/src/common/util/testProperties/testProperties.cpp rename to 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 similarity index 100% rename from ndb/src/common/util/testSimpleProperties/Makefile rename to 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 similarity index 100% rename from ndb/src/common/util/testSimpleProperties/sp_test.cpp rename to 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 similarity index 100% rename from ndb/src/common/util/uucode.c rename to storage/ndb/src/common/util/uucode.c diff --git a/ndb/src/common/util/version.c b/storage/ndb/src/common/util/version.c similarity index 100% rename from ndb/src/common/util/version.c rename to storage/ndb/src/common/util/version.c diff --git a/ndb/src/cw/Makefile.am b/storage/ndb/src/cw/Makefile.am similarity index 100% rename from ndb/src/cw/Makefile.am rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/C++/CPC_GUI.cpp rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/C++/CPC_GUI.dsp rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/C++/CPC_GUI.dsw rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/C++/CPC_GUI.h rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/C++/CPC_GUI.ico rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/C++/CPC_GUI.rc rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/C++/CPC_GUI.sln rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/C++/CPC_GUI.suo rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/C++/CPC_GUI.vcproj rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/C++/Closed.ICO rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/C++/NdbControls.cpp rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/C++/Open.ICO rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/C++/StdAfx.cpp rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/C++/StdAfx.h rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/C++/TreeView.cpp rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/C++/TreeView.h rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/C++/bmp00001.bmp rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/C++/resource.h rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/C++/small.ico rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/C++/toolbar.bmp rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/csharp/App.ico rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/csharp/Computer.cs rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/csharp/DATABASE.ICO rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/csharp/Database.cs rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/csharp/NDB_CPC.csproj rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/csharp/NDB_CPC.csproj.user rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/csharp/NDB_CPC.ncb rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/csharp/NDB_CPC.sln rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/csharp/PanelWizard.cs rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/csharp/Process.cs rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/Computer.cls rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/Database.cls rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/Icon 110.ico rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/Icon 231.ico rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/Icon 237.ico rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/Icon 241.ico rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/Icon 242.ico rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/Icon 270.ico rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/Icon 271.ico rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/Icon 273.ico rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/Icon 31.ico rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/Icon 337.ico rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/Icon 338.ico rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/Icon 339.ico rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/MSSCCPRJ.SCC rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/Module1.bas rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/NdbCPC.vbp rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/NdbCPC.vbw rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/Process.cls rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/closed folder.ico rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/computer.ico rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/frmAbout.frm rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/frmLogin.frm rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/frmMain.frm rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/frmNewComputer.frm rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/frmNewComputer.frx rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/frmNewDatabase.frx rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/frmNewDatabase1.frm rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/frmNewDatabase2.frm rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/frmNewDatabase2.log rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/frmNewDatabase3.frm rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/frmOptions.frm rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/frmSplash.frx rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/networking.ico rename to 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 similarity index 100% rename from ndb/src/cw/cpcc-win32/vb6/open folder.ico rename to 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 similarity index 100% rename from ndb/src/cw/cpcd/APIService.cpp rename to storage/ndb/src/cw/cpcd/APIService.cpp diff --git a/ndb/src/cw/cpcd/APIService.hpp b/storage/ndb/src/cw/cpcd/APIService.hpp similarity index 100% rename from ndb/src/cw/cpcd/APIService.hpp rename to storage/ndb/src/cw/cpcd/APIService.hpp diff --git a/ndb/src/cw/cpcd/CPCD.cpp b/storage/ndb/src/cw/cpcd/CPCD.cpp similarity index 100% rename from ndb/src/cw/cpcd/CPCD.cpp rename to storage/ndb/src/cw/cpcd/CPCD.cpp diff --git a/ndb/src/cw/cpcd/CPCD.hpp b/storage/ndb/src/cw/cpcd/CPCD.hpp similarity index 100% rename from ndb/src/cw/cpcd/CPCD.hpp rename to storage/ndb/src/cw/cpcd/CPCD.hpp diff --git a/ndb/src/cw/cpcd/Makefile.am b/storage/ndb/src/cw/cpcd/Makefile.am similarity index 100% rename from ndb/src/cw/cpcd/Makefile.am rename to storage/ndb/src/cw/cpcd/Makefile.am diff --git a/ndb/src/cw/cpcd/Monitor.cpp b/storage/ndb/src/cw/cpcd/Monitor.cpp similarity index 100% rename from ndb/src/cw/cpcd/Monitor.cpp rename to storage/ndb/src/cw/cpcd/Monitor.cpp diff --git a/ndb/src/cw/cpcd/Process.cpp b/storage/ndb/src/cw/cpcd/Process.cpp similarity index 100% rename from ndb/src/cw/cpcd/Process.cpp rename to storage/ndb/src/cw/cpcd/Process.cpp diff --git a/ndb/src/cw/cpcd/common.cpp b/storage/ndb/src/cw/cpcd/common.cpp similarity index 100% rename from ndb/src/cw/cpcd/common.cpp rename to storage/ndb/src/cw/cpcd/common.cpp diff --git a/ndb/src/cw/cpcd/common.hpp b/storage/ndb/src/cw/cpcd/common.hpp similarity index 100% rename from ndb/src/cw/cpcd/common.hpp rename to storage/ndb/src/cw/cpcd/common.hpp diff --git a/ndb/src/cw/cpcd/main.cpp b/storage/ndb/src/cw/cpcd/main.cpp similarity index 100% rename from ndb/src/cw/cpcd/main.cpp rename to storage/ndb/src/cw/cpcd/main.cpp diff --git a/ndb/src/cw/test/socketclient/Makefile b/storage/ndb/src/cw/test/socketclient/Makefile similarity index 100% rename from ndb/src/cw/test/socketclient/Makefile rename to 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 similarity index 100% rename from ndb/src/cw/test/socketclient/socketClientTest.cpp rename to 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 similarity index 100% rename from ndb/src/cw/util/ClientInterface.cpp rename to storage/ndb/src/cw/util/ClientInterface.cpp diff --git a/ndb/src/cw/util/ClientInterface.hpp b/storage/ndb/src/cw/util/ClientInterface.hpp similarity index 100% rename from ndb/src/cw/util/ClientInterface.hpp rename to storage/ndb/src/cw/util/ClientInterface.hpp diff --git a/ndb/src/cw/util/Makefile b/storage/ndb/src/cw/util/Makefile similarity index 100% rename from ndb/src/cw/util/Makefile rename to storage/ndb/src/cw/util/Makefile diff --git a/ndb/src/cw/util/SocketRegistry.cpp b/storage/ndb/src/cw/util/SocketRegistry.cpp similarity index 100% rename from ndb/src/cw/util/SocketRegistry.cpp rename to storage/ndb/src/cw/util/SocketRegistry.cpp diff --git a/ndb/src/cw/util/SocketRegistry.hpp b/storage/ndb/src/cw/util/SocketRegistry.hpp similarity index 100% rename from ndb/src/cw/util/SocketRegistry.hpp rename to storage/ndb/src/cw/util/SocketRegistry.hpp diff --git a/ndb/src/cw/util/SocketService.cpp b/storage/ndb/src/cw/util/SocketService.cpp similarity index 100% rename from ndb/src/cw/util/SocketService.cpp rename to storage/ndb/src/cw/util/SocketService.cpp diff --git a/ndb/src/cw/util/SocketService.hpp b/storage/ndb/src/cw/util/SocketService.hpp similarity index 100% rename from ndb/src/cw/util/SocketService.hpp rename to 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 similarity index 100% rename from ndb/src/external/WIN32.x86/sci/lib/SISCI_LIBRARY_WIN32.TXT rename to 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 similarity index 100% rename from ndb/src/external/WIN32.x86/sci/lib/scilib.lib rename to 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 similarity index 100% rename from ndb/src/external/WIN32.x86/sci/lib/scilib_md.lib rename to 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 similarity index 100% rename from ndb/src/external/WIN32.x86/sci/lib/scilib_mt.lib rename to 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 similarity index 100% rename from ndb/src/external/WIN32.x86/sci/lib/sisci_api.lib rename to 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 similarity index 100% rename from ndb/src/external/WIN32.x86/sci/lib/sisci_api_md.lib rename to 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 similarity index 100% rename from ndb/src/external/WIN32.x86/sci/lib/sisci_api_mt.lib rename to storage/ndb/src/external/WIN32.x86/sci/lib/sisci_api_mt.lib diff --git a/ndb/src/kernel/Makefile.am b/storage/ndb/src/kernel/Makefile.am similarity index 100% rename from ndb/src/kernel/Makefile.am rename to storage/ndb/src/kernel/Makefile.am diff --git a/ndb/src/kernel/SimBlockList.cpp b/storage/ndb/src/kernel/SimBlockList.cpp similarity index 100% rename from ndb/src/kernel/SimBlockList.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/ERROR_codes.txt rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/Makefile.am rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/NodeRestart.new.txt rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/NodeRestart.txt rename to storage/ndb/src/kernel/blocks/NodeRestart.txt diff --git a/ndb/src/kernel/blocks/Start.txt b/storage/ndb/src/kernel/blocks/Start.txt similarity index 100% rename from ndb/src/kernel/blocks/Start.txt rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/SystemRestart.new.txt rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/SystemRestart.txt rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/backup/Backup.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/backup/Backup.hpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/backup/Backup.txt rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/backup/BackupFormat.hpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/backup/BackupInit.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/backup/FsBuffer.hpp rename to storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp diff --git a/ndb/src/kernel/blocks/backup/Makefile.am b/storage/ndb/src/kernel/blocks/backup/Makefile.am similarity index 100% rename from ndb/src/kernel/blocks/backup/Makefile.am rename to storage/ndb/src/kernel/blocks/backup/Makefile.am diff --git a/ndb/src/kernel/blocks/backup/read.cpp b/storage/ndb/src/kernel/blocks/backup/read.cpp similarity index 100% rename from ndb/src/kernel/blocks/backup/read.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp rename to storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp diff --git a/ndb/src/kernel/blocks/cmvmi/Makefile.am b/storage/ndb/src/kernel/blocks/cmvmi/Makefile.am similarity index 100% rename from ndb/src/kernel/blocks/cmvmi/Makefile.am rename to storage/ndb/src/kernel/blocks/cmvmi/Makefile.am diff --git a/ndb/src/kernel/blocks/dbacc/Dbacc.hpp b/storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp similarity index 100% rename from ndb/src/kernel/blocks/dbacc/Dbacc.hpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbacc/DbaccInit.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbacc/DbaccMain.cpp rename to storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp diff --git a/ndb/src/kernel/blocks/dbacc/Makefile.am b/storage/ndb/src/kernel/blocks/dbacc/Makefile.am similarity index 100% rename from ndb/src/kernel/blocks/dbacc/Makefile.am rename to storage/ndb/src/kernel/blocks/dbacc/Makefile.am diff --git a/ndb/src/kernel/blocks/dbdict/CreateIndex.txt b/storage/ndb/src/kernel/blocks/dbdict/CreateIndex.txt similarity index 100% rename from ndb/src/kernel/blocks/dbdict/CreateIndex.txt rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbdict/CreateTable.new.txt rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbdict/CreateTable.txt rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbdict/Dbdict.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbdict/Dbdict.hpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbdict/Dbdict.txt rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbdict/DropTable.txt rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbdict/Event.txt rename to storage/ndb/src/kernel/blocks/dbdict/Event.txt diff --git a/ndb/src/kernel/blocks/dbdict/Makefile.am b/storage/ndb/src/kernel/blocks/dbdict/Makefile.am similarity index 100% rename from ndb/src/kernel/blocks/dbdict/Makefile.am rename to storage/ndb/src/kernel/blocks/dbdict/Makefile.am diff --git a/ndb/src/kernel/blocks/dbdict/Master_AddTable.sfl b/storage/ndb/src/kernel/blocks/dbdict/Master_AddTable.sfl similarity index 100% rename from ndb/src/kernel/blocks/dbdict/Master_AddTable.sfl rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbdict/SchemaFile.hpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbdict/Slave_AddTable.sfl rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbdih/Dbdih.hpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbdih/DbdihInit.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbdih/DbdihMain.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbdih/LCP.txt rename to storage/ndb/src/kernel/blocks/dbdih/LCP.txt diff --git a/ndb/src/kernel/blocks/dbdih/Makefile.am b/storage/ndb/src/kernel/blocks/dbdih/Makefile.am similarity index 100% rename from ndb/src/kernel/blocks/dbdih/Makefile.am rename to storage/ndb/src/kernel/blocks/dbdih/Makefile.am diff --git a/ndb/src/kernel/blocks/dbdih/Sysfile.hpp b/storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp similarity index 100% rename from ndb/src/kernel/blocks/dbdih/Sysfile.hpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbdih/printSysfile/Makefile rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dblqh/Dblqh.hpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dblqh/DblqhInit.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dblqh/DblqhMain.cpp rename to storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp diff --git a/ndb/src/kernel/blocks/dblqh/Makefile.am b/storage/ndb/src/kernel/blocks/dblqh/Makefile.am similarity index 100% rename from ndb/src/kernel/blocks/dblqh/Makefile.am rename to storage/ndb/src/kernel/blocks/dblqh/Makefile.am diff --git a/ndb/src/kernel/blocks/dblqh/redoLogReader/Makefile b/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/Makefile similarity index 100% rename from ndb/src/kernel/blocks/dblqh/redoLogReader/Makefile rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtc/Dbtc.hpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtc/DbtcInit.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtc/DbtcMain.cpp rename to storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp diff --git a/ndb/src/kernel/blocks/dbtc/Makefile.am b/storage/ndb/src/kernel/blocks/dbtc/Makefile.am similarity index 100% rename from ndb/src/kernel/blocks/dbtc/Makefile.am rename to storage/ndb/src/kernel/blocks/dbtc/Makefile.am diff --git a/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp b/storage/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp similarity index 100% rename from ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtup/Dbtup.hpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtup/DbtupGen.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtup/DbtupLCP.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp rename to storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp diff --git a/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp b/storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp similarity index 100% rename from ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtup/DbtupUndoLog.cpp rename to storage/ndb/src/kernel/blocks/dbtup/DbtupUndoLog.cpp diff --git a/ndb/src/kernel/blocks/dbtup/Makefile.am b/storage/ndb/src/kernel/blocks/dbtup/Makefile.am similarity index 100% rename from ndb/src/kernel/blocks/dbtup/Makefile.am rename to storage/ndb/src/kernel/blocks/dbtup/Makefile.am diff --git a/ndb/src/kernel/blocks/dbtup/Notes.txt b/storage/ndb/src/kernel/blocks/dbtup/Notes.txt similarity index 100% rename from ndb/src/kernel/blocks/dbtup/Notes.txt rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtux/Dbtux.hpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp rename to storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp diff --git a/ndb/src/kernel/blocks/dbtux/Makefile.am b/storage/ndb/src/kernel/blocks/dbtux/Makefile.am similarity index 100% rename from ndb/src/kernel/blocks/dbtux/Makefile.am rename to storage/ndb/src/kernel/blocks/dbtux/Makefile.am diff --git a/ndb/src/kernel/blocks/dbtux/Times.txt b/storage/ndb/src/kernel/blocks/dbtux/Times.txt similarity index 100% rename from ndb/src/kernel/blocks/dbtux/Times.txt rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbtux/tuxstatus.html rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbutil/DbUtil.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbutil/DbUtil.hpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/dbutil/DbUtil.txt rename to storage/ndb/src/kernel/blocks/dbutil/DbUtil.txt diff --git a/ndb/src/kernel/blocks/dbutil/Makefile.am b/storage/ndb/src/kernel/blocks/dbutil/Makefile.am similarity index 100% rename from ndb/src/kernel/blocks/dbutil/Makefile.am rename to storage/ndb/src/kernel/blocks/dbutil/Makefile.am diff --git a/ndb/src/kernel/blocks/grep/Grep.cpp b/storage/ndb/src/kernel/blocks/grep/Grep.cpp similarity index 100% rename from ndb/src/kernel/blocks/grep/Grep.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/grep/Grep.hpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/grep/GrepInit.cpp rename to storage/ndb/src/kernel/blocks/grep/GrepInit.cpp diff --git a/ndb/src/kernel/blocks/grep/Makefile.am b/storage/ndb/src/kernel/blocks/grep/Makefile.am similarity index 100% rename from ndb/src/kernel/blocks/grep/Makefile.am rename to storage/ndb/src/kernel/blocks/grep/Makefile.am diff --git a/ndb/src/kernel/blocks/grep/systab_test/Makefile b/storage/ndb/src/kernel/blocks/grep/systab_test/Makefile similarity index 100% rename from ndb/src/kernel/blocks/grep/systab_test/Makefile rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/grep/systab_test/grep_systab_test.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/mutexes.hpp rename to storage/ndb/src/kernel/blocks/mutexes.hpp diff --git a/ndb/src/kernel/blocks/ndbcntr/Makefile.am b/storage/ndb/src/kernel/blocks/ndbcntr/Makefile.am similarity index 100% rename from ndb/src/kernel/blocks/ndbcntr/Makefile.am rename to storage/ndb/src/kernel/blocks/ndbcntr/Makefile.am diff --git a/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp b/storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp similarity index 100% rename from ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/ndbfs/AsyncFileTest/Makefile rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/ndbfs/CircularIndex.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/ndbfs/Filename.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/ndbfs/Filename.hpp rename to storage/ndb/src/kernel/blocks/ndbfs/Filename.hpp diff --git a/ndb/src/kernel/blocks/ndbfs/Makefile.am b/storage/ndb/src/kernel/blocks/ndbfs/Makefile.am similarity index 100% rename from ndb/src/kernel/blocks/ndbfs/Makefile.am rename to storage/ndb/src/kernel/blocks/ndbfs/Makefile.am diff --git a/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp b/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp similarity index 100% rename from ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/ndbfs/MemoryChannelOSE.hpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/Makefile rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/ndbfs/Pool.hpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/ndbfs/VoidFs.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/new-block.tar.gz rename to storage/ndb/src/kernel/blocks/new-block.tar.gz diff --git a/ndb/src/kernel/blocks/qmgr/Makefile.am b/storage/ndb/src/kernel/blocks/qmgr/Makefile.am similarity index 100% rename from ndb/src/kernel/blocks/qmgr/Makefile.am rename to storage/ndb/src/kernel/blocks/qmgr/Makefile.am diff --git a/ndb/src/kernel/blocks/qmgr/Qmgr.hpp b/storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp similarity index 100% rename from ndb/src/kernel/blocks/qmgr/Qmgr.hpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/qmgr/QmgrInit.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/qmgr/QmgrMain.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/qmgr/timer.hpp rename to storage/ndb/src/kernel/blocks/qmgr/timer.hpp diff --git a/ndb/src/kernel/blocks/suma/Makefile.am b/storage/ndb/src/kernel/blocks/suma/Makefile.am similarity index 100% rename from ndb/src/kernel/blocks/suma/Makefile.am rename to storage/ndb/src/kernel/blocks/suma/Makefile.am diff --git a/ndb/src/kernel/blocks/suma/Suma.cpp b/storage/ndb/src/kernel/blocks/suma/Suma.cpp similarity index 100% rename from ndb/src/kernel/blocks/suma/Suma.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/suma/Suma.hpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/suma/Suma.txt rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/suma/SumaInit.cpp rename to storage/ndb/src/kernel/blocks/suma/SumaInit.cpp diff --git a/ndb/src/kernel/blocks/trix/Makefile.am b/storage/ndb/src/kernel/blocks/trix/Makefile.am similarity index 100% rename from ndb/src/kernel/blocks/trix/Makefile.am rename to storage/ndb/src/kernel/blocks/trix/Makefile.am diff --git a/ndb/src/kernel/blocks/trix/Trix.cpp b/storage/ndb/src/kernel/blocks/trix/Trix.cpp similarity index 100% rename from ndb/src/kernel/blocks/trix/Trix.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/blocks/trix/Trix.hpp rename to 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 similarity index 100% rename from ndb/src/kernel/error/Error.hpp rename to storage/ndb/src/kernel/error/Error.hpp diff --git a/ndb/src/kernel/error/ErrorHandlingMacros.hpp b/storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp similarity index 100% rename from ndb/src/kernel/error/ErrorHandlingMacros.hpp rename to storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp diff --git a/ndb/src/kernel/error/ErrorMessages.cpp b/storage/ndb/src/kernel/error/ErrorMessages.cpp similarity index 100% rename from ndb/src/kernel/error/ErrorMessages.cpp rename to storage/ndb/src/kernel/error/ErrorMessages.cpp diff --git a/ndb/src/kernel/error/ErrorMessages.hpp b/storage/ndb/src/kernel/error/ErrorMessages.hpp similarity index 100% rename from ndb/src/kernel/error/ErrorMessages.hpp rename to storage/ndb/src/kernel/error/ErrorMessages.hpp diff --git a/ndb/src/kernel/error/ErrorReporter.cpp b/storage/ndb/src/kernel/error/ErrorReporter.cpp similarity index 100% rename from ndb/src/kernel/error/ErrorReporter.cpp rename to storage/ndb/src/kernel/error/ErrorReporter.cpp diff --git a/ndb/src/kernel/error/ErrorReporter.hpp b/storage/ndb/src/kernel/error/ErrorReporter.hpp similarity index 100% rename from ndb/src/kernel/error/ErrorReporter.hpp rename to storage/ndb/src/kernel/error/ErrorReporter.hpp diff --git a/ndb/src/kernel/error/Makefile.am b/storage/ndb/src/kernel/error/Makefile.am similarity index 100% rename from ndb/src/kernel/error/Makefile.am rename to storage/ndb/src/kernel/error/Makefile.am diff --git a/ndb/src/kernel/error/TimeModule.cpp b/storage/ndb/src/kernel/error/TimeModule.cpp similarity index 100% rename from ndb/src/kernel/error/TimeModule.cpp rename to storage/ndb/src/kernel/error/TimeModule.cpp diff --git a/ndb/src/kernel/error/TimeModule.hpp b/storage/ndb/src/kernel/error/TimeModule.hpp similarity index 100% rename from ndb/src/kernel/error/TimeModule.hpp rename to storage/ndb/src/kernel/error/TimeModule.hpp diff --git a/ndb/src/kernel/main.cpp b/storage/ndb/src/kernel/main.cpp similarity index 100% rename from ndb/src/kernel/main.cpp rename to storage/ndb/src/kernel/main.cpp diff --git a/ndb/src/kernel/vm/Array.hpp b/storage/ndb/src/kernel/vm/Array.hpp similarity index 100% rename from ndb/src/kernel/vm/Array.hpp rename to storage/ndb/src/kernel/vm/Array.hpp diff --git a/ndb/src/kernel/vm/ArrayFifoList.hpp b/storage/ndb/src/kernel/vm/ArrayFifoList.hpp similarity index 100% rename from ndb/src/kernel/vm/ArrayFifoList.hpp rename to storage/ndb/src/kernel/vm/ArrayFifoList.hpp diff --git a/ndb/src/kernel/vm/ArrayList.hpp b/storage/ndb/src/kernel/vm/ArrayList.hpp similarity index 100% rename from ndb/src/kernel/vm/ArrayList.hpp rename to storage/ndb/src/kernel/vm/ArrayList.hpp diff --git a/ndb/src/kernel/vm/ArrayPool.hpp b/storage/ndb/src/kernel/vm/ArrayPool.hpp similarity index 100% rename from ndb/src/kernel/vm/ArrayPool.hpp rename to storage/ndb/src/kernel/vm/ArrayPool.hpp diff --git a/ndb/src/kernel/vm/CArray.hpp b/storage/ndb/src/kernel/vm/CArray.hpp similarity index 100% rename from ndb/src/kernel/vm/CArray.hpp rename to storage/ndb/src/kernel/vm/CArray.hpp diff --git a/ndb/src/kernel/vm/Callback.hpp b/storage/ndb/src/kernel/vm/Callback.hpp similarity index 100% rename from ndb/src/kernel/vm/Callback.hpp rename to storage/ndb/src/kernel/vm/Callback.hpp diff --git a/ndb/src/kernel/vm/ClusterConfiguration.cpp b/storage/ndb/src/kernel/vm/ClusterConfiguration.cpp similarity index 100% rename from ndb/src/kernel/vm/ClusterConfiguration.cpp rename to storage/ndb/src/kernel/vm/ClusterConfiguration.cpp diff --git a/ndb/src/kernel/vm/ClusterConfiguration.hpp b/storage/ndb/src/kernel/vm/ClusterConfiguration.hpp similarity index 100% rename from ndb/src/kernel/vm/ClusterConfiguration.hpp rename to storage/ndb/src/kernel/vm/ClusterConfiguration.hpp diff --git a/ndb/src/kernel/vm/Configuration.cpp b/storage/ndb/src/kernel/vm/Configuration.cpp similarity index 100% rename from ndb/src/kernel/vm/Configuration.cpp rename to storage/ndb/src/kernel/vm/Configuration.cpp diff --git a/ndb/src/kernel/vm/Configuration.hpp b/storage/ndb/src/kernel/vm/Configuration.hpp similarity index 100% rename from ndb/src/kernel/vm/Configuration.hpp rename to storage/ndb/src/kernel/vm/Configuration.hpp diff --git a/ndb/src/kernel/vm/DLFifoList.hpp b/storage/ndb/src/kernel/vm/DLFifoList.hpp similarity index 100% rename from ndb/src/kernel/vm/DLFifoList.hpp rename to storage/ndb/src/kernel/vm/DLFifoList.hpp diff --git a/ndb/src/kernel/vm/DLHashTable.hpp b/storage/ndb/src/kernel/vm/DLHashTable.hpp similarity index 100% rename from ndb/src/kernel/vm/DLHashTable.hpp rename to storage/ndb/src/kernel/vm/DLHashTable.hpp diff --git a/ndb/src/kernel/vm/DLHashTable2.hpp b/storage/ndb/src/kernel/vm/DLHashTable2.hpp similarity index 100% rename from ndb/src/kernel/vm/DLHashTable2.hpp rename to storage/ndb/src/kernel/vm/DLHashTable2.hpp diff --git a/ndb/src/kernel/vm/DLList.hpp b/storage/ndb/src/kernel/vm/DLList.hpp similarity index 100% rename from ndb/src/kernel/vm/DLList.hpp rename to storage/ndb/src/kernel/vm/DLList.hpp diff --git a/ndb/src/kernel/vm/DataBuffer.hpp b/storage/ndb/src/kernel/vm/DataBuffer.hpp similarity index 100% rename from ndb/src/kernel/vm/DataBuffer.hpp rename to storage/ndb/src/kernel/vm/DataBuffer.hpp diff --git a/ndb/src/kernel/vm/Emulator.cpp b/storage/ndb/src/kernel/vm/Emulator.cpp similarity index 100% rename from ndb/src/kernel/vm/Emulator.cpp rename to storage/ndb/src/kernel/vm/Emulator.cpp diff --git a/ndb/src/kernel/vm/Emulator.hpp b/storage/ndb/src/kernel/vm/Emulator.hpp similarity index 100% rename from ndb/src/kernel/vm/Emulator.hpp rename to storage/ndb/src/kernel/vm/Emulator.hpp diff --git a/ndb/src/kernel/vm/FastScheduler.cpp b/storage/ndb/src/kernel/vm/FastScheduler.cpp similarity index 100% rename from ndb/src/kernel/vm/FastScheduler.cpp rename to storage/ndb/src/kernel/vm/FastScheduler.cpp diff --git a/ndb/src/kernel/vm/FastScheduler.hpp b/storage/ndb/src/kernel/vm/FastScheduler.hpp similarity index 100% rename from ndb/src/kernel/vm/FastScheduler.hpp rename to storage/ndb/src/kernel/vm/FastScheduler.hpp diff --git a/ndb/src/kernel/vm/GlobalData.hpp b/storage/ndb/src/kernel/vm/GlobalData.hpp similarity index 100% rename from ndb/src/kernel/vm/GlobalData.hpp rename to storage/ndb/src/kernel/vm/GlobalData.hpp diff --git a/ndb/src/kernel/vm/KeyTable.hpp b/storage/ndb/src/kernel/vm/KeyTable.hpp similarity index 100% rename from ndb/src/kernel/vm/KeyTable.hpp rename to storage/ndb/src/kernel/vm/KeyTable.hpp diff --git a/ndb/src/kernel/vm/KeyTable2.hpp b/storage/ndb/src/kernel/vm/KeyTable2.hpp similarity index 100% rename from ndb/src/kernel/vm/KeyTable2.hpp rename to storage/ndb/src/kernel/vm/KeyTable2.hpp diff --git a/ndb/src/kernel/vm/LongSignal.hpp b/storage/ndb/src/kernel/vm/LongSignal.hpp similarity index 100% rename from ndb/src/kernel/vm/LongSignal.hpp rename to storage/ndb/src/kernel/vm/LongSignal.hpp diff --git a/ndb/src/kernel/vm/Makefile.am b/storage/ndb/src/kernel/vm/Makefile.am similarity index 100% rename from ndb/src/kernel/vm/Makefile.am rename to storage/ndb/src/kernel/vm/Makefile.am diff --git a/ndb/src/kernel/vm/MetaData.cpp b/storage/ndb/src/kernel/vm/MetaData.cpp similarity index 100% rename from ndb/src/kernel/vm/MetaData.cpp rename to storage/ndb/src/kernel/vm/MetaData.cpp diff --git a/ndb/src/kernel/vm/MetaData.hpp b/storage/ndb/src/kernel/vm/MetaData.hpp similarity index 100% rename from ndb/src/kernel/vm/MetaData.hpp rename to storage/ndb/src/kernel/vm/MetaData.hpp diff --git a/ndb/src/kernel/vm/Mutex.cpp b/storage/ndb/src/kernel/vm/Mutex.cpp similarity index 100% rename from ndb/src/kernel/vm/Mutex.cpp rename to storage/ndb/src/kernel/vm/Mutex.cpp diff --git a/ndb/src/kernel/vm/Mutex.hpp b/storage/ndb/src/kernel/vm/Mutex.hpp similarity index 100% rename from ndb/src/kernel/vm/Mutex.hpp rename to storage/ndb/src/kernel/vm/Mutex.hpp diff --git a/ndb/src/kernel/vm/Prio.hpp b/storage/ndb/src/kernel/vm/Prio.hpp similarity index 100% rename from ndb/src/kernel/vm/Prio.hpp rename to storage/ndb/src/kernel/vm/Prio.hpp diff --git a/ndb/src/kernel/vm/RequestTracker.hpp b/storage/ndb/src/kernel/vm/RequestTracker.hpp similarity index 100% rename from ndb/src/kernel/vm/RequestTracker.hpp rename to storage/ndb/src/kernel/vm/RequestTracker.hpp diff --git a/ndb/src/kernel/vm/SLList.hpp b/storage/ndb/src/kernel/vm/SLList.hpp similarity index 100% rename from ndb/src/kernel/vm/SLList.hpp rename to storage/ndb/src/kernel/vm/SLList.hpp diff --git a/ndb/src/kernel/vm/SafeCounter.cpp b/storage/ndb/src/kernel/vm/SafeCounter.cpp similarity index 100% rename from ndb/src/kernel/vm/SafeCounter.cpp rename to storage/ndb/src/kernel/vm/SafeCounter.cpp diff --git a/ndb/src/kernel/vm/SafeCounter.hpp b/storage/ndb/src/kernel/vm/SafeCounter.hpp similarity index 100% rename from ndb/src/kernel/vm/SafeCounter.hpp rename to storage/ndb/src/kernel/vm/SafeCounter.hpp diff --git a/ndb/src/kernel/vm/SectionReader.cpp b/storage/ndb/src/kernel/vm/SectionReader.cpp similarity index 100% rename from ndb/src/kernel/vm/SectionReader.cpp rename to storage/ndb/src/kernel/vm/SectionReader.cpp diff --git a/ndb/src/kernel/vm/SectionReader.hpp b/storage/ndb/src/kernel/vm/SectionReader.hpp similarity index 100% rename from ndb/src/kernel/vm/SectionReader.hpp rename to storage/ndb/src/kernel/vm/SectionReader.hpp diff --git a/ndb/src/kernel/vm/SignalCounter.hpp b/storage/ndb/src/kernel/vm/SignalCounter.hpp similarity index 100% rename from ndb/src/kernel/vm/SignalCounter.hpp rename to storage/ndb/src/kernel/vm/SignalCounter.hpp diff --git a/ndb/src/kernel/vm/SimBlockList.hpp b/storage/ndb/src/kernel/vm/SimBlockList.hpp similarity index 100% rename from ndb/src/kernel/vm/SimBlockList.hpp rename to storage/ndb/src/kernel/vm/SimBlockList.hpp diff --git a/ndb/src/kernel/vm/SimplePropertiesSection.cpp b/storage/ndb/src/kernel/vm/SimplePropertiesSection.cpp similarity index 100% rename from ndb/src/kernel/vm/SimplePropertiesSection.cpp rename to storage/ndb/src/kernel/vm/SimplePropertiesSection.cpp diff --git a/ndb/src/kernel/vm/SimulatedBlock.cpp b/storage/ndb/src/kernel/vm/SimulatedBlock.cpp similarity index 100% rename from ndb/src/kernel/vm/SimulatedBlock.cpp rename to storage/ndb/src/kernel/vm/SimulatedBlock.cpp diff --git a/ndb/src/kernel/vm/SimulatedBlock.hpp b/storage/ndb/src/kernel/vm/SimulatedBlock.hpp similarity index 100% rename from ndb/src/kernel/vm/SimulatedBlock.hpp rename to storage/ndb/src/kernel/vm/SimulatedBlock.hpp diff --git a/ndb/src/kernel/vm/ThreadConfig.cpp b/storage/ndb/src/kernel/vm/ThreadConfig.cpp similarity index 100% rename from ndb/src/kernel/vm/ThreadConfig.cpp rename to storage/ndb/src/kernel/vm/ThreadConfig.cpp diff --git a/ndb/src/kernel/vm/ThreadConfig.hpp b/storage/ndb/src/kernel/vm/ThreadConfig.hpp similarity index 100% rename from ndb/src/kernel/vm/ThreadConfig.hpp rename to storage/ndb/src/kernel/vm/ThreadConfig.hpp diff --git a/ndb/src/kernel/vm/TimeQueue.cpp b/storage/ndb/src/kernel/vm/TimeQueue.cpp similarity index 100% rename from ndb/src/kernel/vm/TimeQueue.cpp rename to storage/ndb/src/kernel/vm/TimeQueue.cpp diff --git a/ndb/src/kernel/vm/TimeQueue.hpp b/storage/ndb/src/kernel/vm/TimeQueue.hpp similarity index 100% rename from ndb/src/kernel/vm/TimeQueue.hpp rename to storage/ndb/src/kernel/vm/TimeQueue.hpp diff --git a/ndb/src/kernel/vm/TransporterCallback.cpp b/storage/ndb/src/kernel/vm/TransporterCallback.cpp similarity index 100% rename from ndb/src/kernel/vm/TransporterCallback.cpp rename to storage/ndb/src/kernel/vm/TransporterCallback.cpp diff --git a/ndb/src/kernel/vm/VMSignal.cpp b/storage/ndb/src/kernel/vm/VMSignal.cpp similarity index 100% rename from ndb/src/kernel/vm/VMSignal.cpp rename to storage/ndb/src/kernel/vm/VMSignal.cpp diff --git a/ndb/src/kernel/vm/VMSignal.hpp b/storage/ndb/src/kernel/vm/VMSignal.hpp similarity index 100% rename from ndb/src/kernel/vm/VMSignal.hpp rename to storage/ndb/src/kernel/vm/VMSignal.hpp diff --git a/ndb/src/kernel/vm/WaitQueue.hpp b/storage/ndb/src/kernel/vm/WaitQueue.hpp similarity index 100% rename from ndb/src/kernel/vm/WaitQueue.hpp rename to storage/ndb/src/kernel/vm/WaitQueue.hpp diff --git a/ndb/src/kernel/vm/WatchDog.cpp b/storage/ndb/src/kernel/vm/WatchDog.cpp similarity index 100% rename from ndb/src/kernel/vm/WatchDog.cpp rename to storage/ndb/src/kernel/vm/WatchDog.cpp diff --git a/ndb/src/kernel/vm/WatchDog.hpp b/storage/ndb/src/kernel/vm/WatchDog.hpp similarity index 100% rename from ndb/src/kernel/vm/WatchDog.hpp rename to 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 similarity index 100% rename from ndb/src/kernel/vm/al_test/Makefile rename to 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 similarity index 100% rename from ndb/src/kernel/vm/al_test/arrayListTest.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/vm/al_test/arrayPoolTest.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/vm/al_test/main.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/vm/pc.hpp rename to storage/ndb/src/kernel/vm/pc.hpp diff --git a/ndb/src/kernel/vm/testCopy/Makefile b/storage/ndb/src/kernel/vm/testCopy/Makefile similarity index 100% rename from ndb/src/kernel/vm/testCopy/Makefile rename to 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 similarity index 100% rename from ndb/src/kernel/vm/testCopy/rr.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/vm/testCopy/testCopy.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/vm/testDataBuffer/Makefile rename to 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 similarity index 100% rename from ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/vm/testLongSig/Makefile rename to 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 similarity index 100% rename from ndb/src/kernel/vm/testLongSig/testLongSig.cpp rename to 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 similarity index 100% rename from ndb/src/kernel/vm/testSimplePropertiesSection/Makefile rename to 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 similarity index 100% rename from ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp rename to storage/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp diff --git a/ndb/src/mgmapi/LocalConfig.cpp b/storage/ndb/src/mgmapi/LocalConfig.cpp similarity index 100% rename from ndb/src/mgmapi/LocalConfig.cpp rename to storage/ndb/src/mgmapi/LocalConfig.cpp diff --git a/ndb/src/mgmapi/LocalConfig.hpp b/storage/ndb/src/mgmapi/LocalConfig.hpp similarity index 100% rename from ndb/src/mgmapi/LocalConfig.hpp rename to storage/ndb/src/mgmapi/LocalConfig.hpp diff --git a/ndb/src/mgmapi/Makefile.am b/storage/ndb/src/mgmapi/Makefile.am similarity index 100% rename from ndb/src/mgmapi/Makefile.am rename to storage/ndb/src/mgmapi/Makefile.am diff --git a/ndb/src/mgmapi/mgmapi.cpp b/storage/ndb/src/mgmapi/mgmapi.cpp similarity index 100% rename from ndb/src/mgmapi/mgmapi.cpp rename to storage/ndb/src/mgmapi/mgmapi.cpp diff --git a/ndb/src/mgmapi/mgmapi_configuration.cpp b/storage/ndb/src/mgmapi/mgmapi_configuration.cpp similarity index 100% rename from ndb/src/mgmapi/mgmapi_configuration.cpp rename to storage/ndb/src/mgmapi/mgmapi_configuration.cpp diff --git a/ndb/src/mgmapi/mgmapi_configuration.hpp b/storage/ndb/src/mgmapi/mgmapi_configuration.hpp similarity index 100% rename from ndb/src/mgmapi/mgmapi_configuration.hpp rename to storage/ndb/src/mgmapi/mgmapi_configuration.hpp diff --git a/ndb/src/mgmapi/mgmapi_internal.h b/storage/ndb/src/mgmapi/mgmapi_internal.h similarity index 100% rename from ndb/src/mgmapi/mgmapi_internal.h rename to storage/ndb/src/mgmapi/mgmapi_internal.h diff --git a/ndb/src/mgmapi/ndb_logevent.cpp b/storage/ndb/src/mgmapi/ndb_logevent.cpp similarity index 100% rename from ndb/src/mgmapi/ndb_logevent.cpp rename to storage/ndb/src/mgmapi/ndb_logevent.cpp diff --git a/ndb/src/mgmapi/ndb_logevent.hpp b/storage/ndb/src/mgmapi/ndb_logevent.hpp similarity index 100% rename from ndb/src/mgmapi/ndb_logevent.hpp rename to storage/ndb/src/mgmapi/ndb_logevent.hpp diff --git a/ndb/src/mgmapi/test/Makefile b/storage/ndb/src/mgmapi/test/Makefile similarity index 100% rename from ndb/src/mgmapi/test/Makefile rename to storage/ndb/src/mgmapi/test/Makefile diff --git a/ndb/src/mgmapi/test/keso.c b/storage/ndb/src/mgmapi/test/keso.c similarity index 100% rename from ndb/src/mgmapi/test/keso.c rename to storage/ndb/src/mgmapi/test/keso.c diff --git a/ndb/src/mgmapi/test/mgmSrvApi.cpp b/storage/ndb/src/mgmapi/test/mgmSrvApi.cpp similarity index 100% rename from ndb/src/mgmapi/test/mgmSrvApi.cpp rename to storage/ndb/src/mgmapi/test/mgmSrvApi.cpp diff --git a/ndb/src/mgmclient/CommandInterpreter.cpp b/storage/ndb/src/mgmclient/CommandInterpreter.cpp similarity index 100% rename from ndb/src/mgmclient/CommandInterpreter.cpp rename to storage/ndb/src/mgmclient/CommandInterpreter.cpp diff --git a/ndb/src/mgmclient/Makefile.am b/storage/ndb/src/mgmclient/Makefile.am similarity index 100% rename from ndb/src/mgmclient/Makefile.am rename to storage/ndb/src/mgmclient/Makefile.am diff --git a/ndb/src/mgmclient/main.cpp b/storage/ndb/src/mgmclient/main.cpp similarity index 100% rename from ndb/src/mgmclient/main.cpp rename to storage/ndb/src/mgmclient/main.cpp diff --git a/ndb/src/mgmclient/ndb_mgmclient.h b/storage/ndb/src/mgmclient/ndb_mgmclient.h similarity index 100% rename from ndb/src/mgmclient/ndb_mgmclient.h rename to storage/ndb/src/mgmclient/ndb_mgmclient.h diff --git a/ndb/src/mgmclient/ndb_mgmclient.hpp b/storage/ndb/src/mgmclient/ndb_mgmclient.hpp similarity index 100% rename from ndb/src/mgmclient/ndb_mgmclient.hpp rename to storage/ndb/src/mgmclient/ndb_mgmclient.hpp diff --git a/ndb/src/mgmclient/test_cpcd/Makefile b/storage/ndb/src/mgmclient/test_cpcd/Makefile similarity index 100% rename from ndb/src/mgmclient/test_cpcd/Makefile rename to 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 similarity index 100% rename from ndb/src/mgmclient/test_cpcd/test_cpcd.cpp rename to storage/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp diff --git a/ndb/src/mgmsrv/Config.cpp b/storage/ndb/src/mgmsrv/Config.cpp similarity index 100% rename from ndb/src/mgmsrv/Config.cpp rename to storage/ndb/src/mgmsrv/Config.cpp diff --git a/ndb/src/mgmsrv/Config.hpp b/storage/ndb/src/mgmsrv/Config.hpp similarity index 100% rename from ndb/src/mgmsrv/Config.hpp rename to storage/ndb/src/mgmsrv/Config.hpp diff --git a/ndb/src/mgmsrv/ConfigInfo.cpp b/storage/ndb/src/mgmsrv/ConfigInfo.cpp similarity index 100% rename from ndb/src/mgmsrv/ConfigInfo.cpp rename to storage/ndb/src/mgmsrv/ConfigInfo.cpp diff --git a/ndb/src/mgmsrv/ConfigInfo.hpp b/storage/ndb/src/mgmsrv/ConfigInfo.hpp similarity index 100% rename from ndb/src/mgmsrv/ConfigInfo.hpp rename to storage/ndb/src/mgmsrv/ConfigInfo.hpp diff --git a/ndb/src/mgmsrv/InitConfigFileParser.cpp b/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp similarity index 100% rename from ndb/src/mgmsrv/InitConfigFileParser.cpp rename to storage/ndb/src/mgmsrv/InitConfigFileParser.cpp diff --git a/ndb/src/mgmsrv/InitConfigFileParser.hpp b/storage/ndb/src/mgmsrv/InitConfigFileParser.hpp similarity index 100% rename from ndb/src/mgmsrv/InitConfigFileParser.hpp rename to storage/ndb/src/mgmsrv/InitConfigFileParser.hpp diff --git a/ndb/src/mgmsrv/Makefile.am b/storage/ndb/src/mgmsrv/Makefile.am similarity index 100% rename from ndb/src/mgmsrv/Makefile.am rename to storage/ndb/src/mgmsrv/Makefile.am diff --git a/ndb/src/mgmsrv/MgmtSrvr.cpp b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp similarity index 100% rename from ndb/src/mgmsrv/MgmtSrvr.cpp rename to storage/ndb/src/mgmsrv/MgmtSrvr.cpp diff --git a/ndb/src/mgmsrv/MgmtSrvr.hpp b/storage/ndb/src/mgmsrv/MgmtSrvr.hpp similarity index 100% rename from ndb/src/mgmsrv/MgmtSrvr.hpp rename to storage/ndb/src/mgmsrv/MgmtSrvr.hpp diff --git a/ndb/src/mgmsrv/MgmtSrvrConfig.cpp b/storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp similarity index 100% rename from ndb/src/mgmsrv/MgmtSrvrConfig.cpp rename to storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp diff --git a/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp b/storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp similarity index 100% rename from ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp rename to storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp diff --git a/ndb/src/mgmsrv/Services.cpp b/storage/ndb/src/mgmsrv/Services.cpp similarity index 100% rename from ndb/src/mgmsrv/Services.cpp rename to storage/ndb/src/mgmsrv/Services.cpp diff --git a/ndb/src/mgmsrv/Services.hpp b/storage/ndb/src/mgmsrv/Services.hpp similarity index 100% rename from ndb/src/mgmsrv/Services.hpp rename to storage/ndb/src/mgmsrv/Services.hpp diff --git a/ndb/src/mgmsrv/SignalQueue.cpp b/storage/ndb/src/mgmsrv/SignalQueue.cpp similarity index 100% rename from ndb/src/mgmsrv/SignalQueue.cpp rename to storage/ndb/src/mgmsrv/SignalQueue.cpp diff --git a/ndb/src/mgmsrv/SignalQueue.hpp b/storage/ndb/src/mgmsrv/SignalQueue.hpp similarity index 100% rename from ndb/src/mgmsrv/SignalQueue.hpp rename to storage/ndb/src/mgmsrv/SignalQueue.hpp diff --git a/ndb/src/mgmsrv/convertStrToInt.cpp b/storage/ndb/src/mgmsrv/convertStrToInt.cpp similarity index 100% rename from ndb/src/mgmsrv/convertStrToInt.cpp rename to storage/ndb/src/mgmsrv/convertStrToInt.cpp diff --git a/ndb/src/mgmsrv/convertStrToInt.hpp b/storage/ndb/src/mgmsrv/convertStrToInt.hpp similarity index 100% rename from ndb/src/mgmsrv/convertStrToInt.hpp rename to storage/ndb/src/mgmsrv/convertStrToInt.hpp diff --git a/ndb/src/mgmsrv/main.cpp b/storage/ndb/src/mgmsrv/main.cpp similarity index 100% rename from ndb/src/mgmsrv/main.cpp rename to storage/ndb/src/mgmsrv/main.cpp diff --git a/ndb/src/mgmsrv/mkconfig/Makefile b/storage/ndb/src/mgmsrv/mkconfig/Makefile similarity index 100% rename from ndb/src/mgmsrv/mkconfig/Makefile rename to storage/ndb/src/mgmsrv/mkconfig/Makefile diff --git a/ndb/src/mgmsrv/mkconfig/mkconfig.cpp b/storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp similarity index 100% rename from ndb/src/mgmsrv/mkconfig/mkconfig.cpp rename to storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp diff --git a/ndb/src/ndbapi/API.hpp b/storage/ndb/src/ndbapi/API.hpp similarity index 100% rename from ndb/src/ndbapi/API.hpp rename to storage/ndb/src/ndbapi/API.hpp diff --git a/ndb/src/ndbapi/ClusterMgr.cpp b/storage/ndb/src/ndbapi/ClusterMgr.cpp similarity index 100% rename from ndb/src/ndbapi/ClusterMgr.cpp rename to storage/ndb/src/ndbapi/ClusterMgr.cpp diff --git a/ndb/src/ndbapi/ClusterMgr.hpp b/storage/ndb/src/ndbapi/ClusterMgr.hpp similarity index 100% rename from ndb/src/ndbapi/ClusterMgr.hpp rename to storage/ndb/src/ndbapi/ClusterMgr.hpp diff --git a/ndb/src/ndbapi/DictCache.cpp b/storage/ndb/src/ndbapi/DictCache.cpp similarity index 100% rename from ndb/src/ndbapi/DictCache.cpp rename to storage/ndb/src/ndbapi/DictCache.cpp diff --git a/ndb/src/ndbapi/DictCache.hpp b/storage/ndb/src/ndbapi/DictCache.hpp similarity index 100% rename from ndb/src/ndbapi/DictCache.hpp rename to storage/ndb/src/ndbapi/DictCache.hpp diff --git a/ndb/src/ndbapi/Makefile.am b/storage/ndb/src/ndbapi/Makefile.am similarity index 100% rename from ndb/src/ndbapi/Makefile.am rename to storage/ndb/src/ndbapi/Makefile.am diff --git a/ndb/src/ndbapi/Ndb.cpp b/storage/ndb/src/ndbapi/Ndb.cpp similarity index 100% rename from ndb/src/ndbapi/Ndb.cpp rename to storage/ndb/src/ndbapi/Ndb.cpp diff --git a/ndb/src/ndbapi/NdbApiSignal.cpp b/storage/ndb/src/ndbapi/NdbApiSignal.cpp similarity index 100% rename from ndb/src/ndbapi/NdbApiSignal.cpp rename to storage/ndb/src/ndbapi/NdbApiSignal.cpp diff --git a/ndb/src/ndbapi/NdbApiSignal.hpp b/storage/ndb/src/ndbapi/NdbApiSignal.hpp similarity index 100% rename from ndb/src/ndbapi/NdbApiSignal.hpp rename to storage/ndb/src/ndbapi/NdbApiSignal.hpp diff --git a/ndb/src/ndbapi/NdbBlob.cpp b/storage/ndb/src/ndbapi/NdbBlob.cpp similarity index 100% rename from ndb/src/ndbapi/NdbBlob.cpp rename to storage/ndb/src/ndbapi/NdbBlob.cpp diff --git a/ndb/src/ndbapi/NdbBlobImpl.hpp b/storage/ndb/src/ndbapi/NdbBlobImpl.hpp similarity index 100% rename from ndb/src/ndbapi/NdbBlobImpl.hpp rename to storage/ndb/src/ndbapi/NdbBlobImpl.hpp diff --git a/ndb/src/ndbapi/NdbDictionary.cpp b/storage/ndb/src/ndbapi/NdbDictionary.cpp similarity index 100% rename from ndb/src/ndbapi/NdbDictionary.cpp rename to storage/ndb/src/ndbapi/NdbDictionary.cpp diff --git a/ndb/src/ndbapi/NdbDictionaryImpl.cpp b/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp similarity index 100% rename from ndb/src/ndbapi/NdbDictionaryImpl.cpp rename to storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp diff --git a/ndb/src/ndbapi/NdbDictionaryImpl.hpp b/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp similarity index 100% rename from ndb/src/ndbapi/NdbDictionaryImpl.hpp rename to storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp diff --git a/ndb/src/ndbapi/NdbErrorOut.cpp b/storage/ndb/src/ndbapi/NdbErrorOut.cpp similarity index 100% rename from ndb/src/ndbapi/NdbErrorOut.cpp rename to storage/ndb/src/ndbapi/NdbErrorOut.cpp diff --git a/ndb/src/ndbapi/NdbEventOperation.cpp b/storage/ndb/src/ndbapi/NdbEventOperation.cpp similarity index 100% rename from ndb/src/ndbapi/NdbEventOperation.cpp rename to storage/ndb/src/ndbapi/NdbEventOperation.cpp diff --git a/ndb/src/ndbapi/NdbEventOperationImpl.cpp b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp similarity index 100% rename from ndb/src/ndbapi/NdbEventOperationImpl.cpp rename to storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp diff --git a/ndb/src/ndbapi/NdbEventOperationImpl.hpp b/storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp similarity index 100% rename from ndb/src/ndbapi/NdbEventOperationImpl.hpp rename to storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp diff --git a/ndb/src/ndbapi/NdbImpl.hpp b/storage/ndb/src/ndbapi/NdbImpl.hpp similarity index 100% rename from ndb/src/ndbapi/NdbImpl.hpp rename to storage/ndb/src/ndbapi/NdbImpl.hpp diff --git a/ndb/src/ndbapi/NdbIndexOperation.cpp b/storage/ndb/src/ndbapi/NdbIndexOperation.cpp similarity index 100% rename from ndb/src/ndbapi/NdbIndexOperation.cpp rename to storage/ndb/src/ndbapi/NdbIndexOperation.cpp diff --git a/ndb/src/ndbapi/NdbLinHash.hpp b/storage/ndb/src/ndbapi/NdbLinHash.hpp similarity index 100% rename from ndb/src/ndbapi/NdbLinHash.hpp rename to storage/ndb/src/ndbapi/NdbLinHash.hpp diff --git a/ndb/src/ndbapi/NdbOperation.cpp b/storage/ndb/src/ndbapi/NdbOperation.cpp similarity index 100% rename from ndb/src/ndbapi/NdbOperation.cpp rename to storage/ndb/src/ndbapi/NdbOperation.cpp diff --git a/ndb/src/ndbapi/NdbOperationDefine.cpp b/storage/ndb/src/ndbapi/NdbOperationDefine.cpp similarity index 100% rename from ndb/src/ndbapi/NdbOperationDefine.cpp rename to storage/ndb/src/ndbapi/NdbOperationDefine.cpp diff --git a/ndb/src/ndbapi/NdbOperationExec.cpp b/storage/ndb/src/ndbapi/NdbOperationExec.cpp similarity index 100% rename from ndb/src/ndbapi/NdbOperationExec.cpp rename to storage/ndb/src/ndbapi/NdbOperationExec.cpp diff --git a/ndb/src/ndbapi/NdbOperationInt.cpp b/storage/ndb/src/ndbapi/NdbOperationInt.cpp similarity index 100% rename from ndb/src/ndbapi/NdbOperationInt.cpp rename to storage/ndb/src/ndbapi/NdbOperationInt.cpp diff --git a/ndb/src/ndbapi/NdbOperationScan.cpp b/storage/ndb/src/ndbapi/NdbOperationScan.cpp similarity index 100% rename from ndb/src/ndbapi/NdbOperationScan.cpp rename to storage/ndb/src/ndbapi/NdbOperationScan.cpp diff --git a/ndb/src/ndbapi/NdbOperationSearch.cpp b/storage/ndb/src/ndbapi/NdbOperationSearch.cpp similarity index 100% rename from ndb/src/ndbapi/NdbOperationSearch.cpp rename to storage/ndb/src/ndbapi/NdbOperationSearch.cpp diff --git a/ndb/src/ndbapi/NdbPool.cpp b/storage/ndb/src/ndbapi/NdbPool.cpp similarity index 100% rename from ndb/src/ndbapi/NdbPool.cpp rename to storage/ndb/src/ndbapi/NdbPool.cpp diff --git a/ndb/src/ndbapi/NdbPoolImpl.cpp b/storage/ndb/src/ndbapi/NdbPoolImpl.cpp similarity index 100% rename from ndb/src/ndbapi/NdbPoolImpl.cpp rename to storage/ndb/src/ndbapi/NdbPoolImpl.cpp diff --git a/ndb/src/ndbapi/NdbPoolImpl.hpp b/storage/ndb/src/ndbapi/NdbPoolImpl.hpp similarity index 100% rename from ndb/src/ndbapi/NdbPoolImpl.hpp rename to storage/ndb/src/ndbapi/NdbPoolImpl.hpp diff --git a/ndb/src/ndbapi/NdbRecAttr.cpp b/storage/ndb/src/ndbapi/NdbRecAttr.cpp similarity index 100% rename from ndb/src/ndbapi/NdbRecAttr.cpp rename to storage/ndb/src/ndbapi/NdbRecAttr.cpp diff --git a/ndb/src/ndbapi/NdbReceiver.cpp b/storage/ndb/src/ndbapi/NdbReceiver.cpp similarity index 100% rename from ndb/src/ndbapi/NdbReceiver.cpp rename to storage/ndb/src/ndbapi/NdbReceiver.cpp diff --git a/ndb/src/ndbapi/NdbScanFilter.cpp b/storage/ndb/src/ndbapi/NdbScanFilter.cpp similarity index 100% rename from ndb/src/ndbapi/NdbScanFilter.cpp rename to storage/ndb/src/ndbapi/NdbScanFilter.cpp diff --git a/ndb/src/ndbapi/NdbScanOperation.cpp b/storage/ndb/src/ndbapi/NdbScanOperation.cpp similarity index 100% rename from ndb/src/ndbapi/NdbScanOperation.cpp rename to storage/ndb/src/ndbapi/NdbScanOperation.cpp diff --git a/ndb/src/ndbapi/NdbTransaction.cpp b/storage/ndb/src/ndbapi/NdbTransaction.cpp similarity index 100% rename from ndb/src/ndbapi/NdbTransaction.cpp rename to storage/ndb/src/ndbapi/NdbTransaction.cpp diff --git a/ndb/src/ndbapi/NdbTransactionScan.cpp b/storage/ndb/src/ndbapi/NdbTransactionScan.cpp similarity index 100% rename from ndb/src/ndbapi/NdbTransactionScan.cpp rename to storage/ndb/src/ndbapi/NdbTransactionScan.cpp diff --git a/ndb/src/ndbapi/NdbUtil.cpp b/storage/ndb/src/ndbapi/NdbUtil.cpp similarity index 100% rename from ndb/src/ndbapi/NdbUtil.cpp rename to storage/ndb/src/ndbapi/NdbUtil.cpp diff --git a/ndb/src/ndbapi/NdbUtil.hpp b/storage/ndb/src/ndbapi/NdbUtil.hpp similarity index 100% rename from ndb/src/ndbapi/NdbUtil.hpp rename to storage/ndb/src/ndbapi/NdbUtil.hpp diff --git a/ndb/src/ndbapi/NdbWaiter.hpp b/storage/ndb/src/ndbapi/NdbWaiter.hpp similarity index 100% rename from ndb/src/ndbapi/NdbWaiter.hpp rename to storage/ndb/src/ndbapi/NdbWaiter.hpp diff --git a/ndb/src/ndbapi/Ndberr.cpp b/storage/ndb/src/ndbapi/Ndberr.cpp similarity index 100% rename from ndb/src/ndbapi/Ndberr.cpp rename to storage/ndb/src/ndbapi/Ndberr.cpp diff --git a/ndb/src/ndbapi/Ndbif.cpp b/storage/ndb/src/ndbapi/Ndbif.cpp similarity index 100% rename from ndb/src/ndbapi/Ndbif.cpp rename to storage/ndb/src/ndbapi/Ndbif.cpp diff --git a/ndb/src/ndbapi/Ndbinit.cpp b/storage/ndb/src/ndbapi/Ndbinit.cpp similarity index 100% rename from ndb/src/ndbapi/Ndbinit.cpp rename to storage/ndb/src/ndbapi/Ndbinit.cpp diff --git a/ndb/src/ndbapi/Ndblist.cpp b/storage/ndb/src/ndbapi/Ndblist.cpp similarity index 100% rename from ndb/src/ndbapi/Ndblist.cpp rename to storage/ndb/src/ndbapi/Ndblist.cpp diff --git a/ndb/src/ndbapi/ObjectMap.hpp b/storage/ndb/src/ndbapi/ObjectMap.hpp similarity index 100% rename from ndb/src/ndbapi/ObjectMap.hpp rename to storage/ndb/src/ndbapi/ObjectMap.hpp diff --git a/ndb/src/ndbapi/ScanOperation.txt b/storage/ndb/src/ndbapi/ScanOperation.txt similarity index 100% rename from ndb/src/ndbapi/ScanOperation.txt rename to storage/ndb/src/ndbapi/ScanOperation.txt diff --git a/ndb/src/ndbapi/TransporterFacade.cpp b/storage/ndb/src/ndbapi/TransporterFacade.cpp similarity index 100% rename from ndb/src/ndbapi/TransporterFacade.cpp rename to storage/ndb/src/ndbapi/TransporterFacade.cpp diff --git a/ndb/src/ndbapi/TransporterFacade.hpp b/storage/ndb/src/ndbapi/TransporterFacade.hpp similarity index 100% rename from ndb/src/ndbapi/TransporterFacade.hpp rename to 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 similarity index 100% rename from ndb/src/ndbapi/ndb_cluster_connection.cpp rename to 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 similarity index 100% rename from ndb/src/ndbapi/ndb_cluster_connection_impl.hpp rename to storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp diff --git a/ndb/src/ndbapi/ndberror.c b/storage/ndb/src/ndbapi/ndberror.c similarity index 100% rename from ndb/src/ndbapi/ndberror.c rename to storage/ndb/src/ndbapi/ndberror.c diff --git a/ndb/src/ndbapi/signal-sender/Makefile b/storage/ndb/src/ndbapi/signal-sender/Makefile similarity index 100% rename from ndb/src/ndbapi/signal-sender/Makefile rename to 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 similarity index 100% rename from ndb/src/ndbapi/signal-sender/SignalSender.cpp rename to 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 similarity index 100% rename from ndb/src/ndbapi/signal-sender/SignalSender.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/Makefile rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/Extra.mk rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/Makefile rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/NdbOdbc.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/NdbOdbc.def rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/CodeGen.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/CodeGen.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_base.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_base.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_column.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_column.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_comp_op.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_comp_op.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_create_index.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_create_index.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_create_row.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_create_row.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_create_table.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_create_table.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_data_type.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_data_type.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_ddl.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_ddl.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_ddl_column.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_ddl_column.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_ddl_constr.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_ddl_constr.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_ddl_row.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_ddl_row.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_delete.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_delete.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_delete_index.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_delete_index.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_delete_lookup.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_delete_lookup.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_delete_scan.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_delete_scan.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_dml.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_dml.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_dml_column.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_dml_column.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_dml_row.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_dml_row.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_drop_index.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_drop_index.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_drop_table.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_drop_table.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_expr.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_expr.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_expr_column.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_expr_column.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_expr_const.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_expr_const.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_expr_conv.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_expr_conv.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_expr_func.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_expr_func.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_expr_op.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_expr_op.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_expr_param.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_expr_param.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_expr_row.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_expr_row.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_idx_column.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_idx_column.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_insert.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_insert.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_pred.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_pred.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_pred_op.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_pred_op.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_query.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_query.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_query_count.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_query_count.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_query_distinct.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_query_distinct.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_query_filter.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_query_filter.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_query_group.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_query_group.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_query_index.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_query_index.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_query_join.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_query_join.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_query_lookup.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_query_lookup.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_query_project.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_query_project.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_query_range.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_query_range.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_query_repeat.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_query_repeat.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_query_scan.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_query_scan.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_query_sort.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_query_sort.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_query_sys.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_query_sys.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_root.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_root.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_select.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_select.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_set_row.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_set_row.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_stmt.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_stmt.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_table.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_table.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_table_list.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_table_list.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_update.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_update.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_update_index.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_update_index.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_update_lookup.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_update_lookup.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_update_scan.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Code_update_scan.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/Makefile rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/SimpleGram.ypp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/SimpleParser.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/SimpleParser.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/codegen/SimpleScan.lpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/AttrArea.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/AttrArea.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/CodeTree.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/CodeTree.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/ConnArea.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/ConnArea.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/Ctx.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/Ctx.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/DataField.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/DataField.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/DataRow.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/DataRow.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/DataType.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/DataType.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/DescArea.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/DescArea.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/DiagArea.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/DiagArea.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/Makefile rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/OdbcData.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/OdbcData.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/ResultArea.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/ResultArea.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/Sqlstate.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/Sqlstate.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/StmtArea.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/StmtArea.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/StmtInfo.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/StmtInfo.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/common.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/common/common.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/dictionary/DictCatalog.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/dictionary/DictCatalog.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/dictionary/DictColumn.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/dictionary/DictColumn.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/dictionary/DictIndex.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/dictionary/DictIndex.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/dictionary/DictSchema.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/dictionary/DictSchema.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/dictionary/DictSys.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/dictionary/DictSys.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/dictionary/DictTable.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/dictionary/DictTable.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/dictionary/Makefile rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/docs/class.fig rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/docs/descfield.pl rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/docs/diag.txt rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/docs/getinfo.pl rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/docs/gettypeinfo.pl rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/docs/handleattr.pl rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/docs/main.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/docs/ndbodbc.html rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/docs/select.fig rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/docs/systables.pl rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/docs/type.txt rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/Func.data rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/Func.pl rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/Makefile rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLAllocConnect.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLAllocEnv.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLAllocHandle.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLAllocHandleStd.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLAllocStmt.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLBindCol.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLBindParam.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLBindParameter.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLBrowseConnect.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLBulkOperations.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLCancel.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLCloseCursor.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLColAttribute.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLColAttributes.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLColumnPrivileges.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLColumns.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLConnect.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLCopyDesc.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLDataSources.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLDescribeCol.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLDescribeParam.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLDisconnect.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLDriverConnect.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLDrivers.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLEndTran.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLError.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLExecDirect.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLExecute.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLExtendedFetch.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLFetch.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLFetchScroll.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLForeignKeys.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLFreeConnect.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLFreeEnv.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLFreeHandle.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLFreeStmt.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLGetConnectAttr.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLGetConnectOption.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLGetCursorName.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLGetData.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLGetDescField.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLGetDescRec.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLGetDiagField.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLGetDiagRec.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLGetEnvAttr.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLGetFunctions.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLGetInfo.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLGetStmtAttr.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLGetStmtOption.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLGetTypeInfo.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLMoreResults.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLNativeSql.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLNumParams.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLNumResultCols.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLParamData.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLParamOptions.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLPrepare.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLPrimaryKeys.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLProcedureColumns.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLProcedures.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLPutData.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLRowCount.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLSetConnectAttr.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLSetConnectOption.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLSetCursorName.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLSetDescField.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLSetDescRec.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLSetEnvAttr.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLSetParam.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLSetPos.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLSetScrollOptions.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLSetStmtAttr.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLSetStmtOption.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLSpecialColumns.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLStatistics.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLTablePrivileges.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLTables.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/SQLTransact.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/driver.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/driver/driver.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/executor/Exec_comp_op.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/executor/Exec_create_index.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/executor/Exec_create_table.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/executor/Exec_delete_index.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/executor/Exec_delete_lookup.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/executor/Exec_delete_scan.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/executor/Exec_drop_index.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/executor/Exec_drop_table.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/executor/Exec_expr_conv.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/executor/Exec_expr_func.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/executor/Exec_expr_op.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/executor/Exec_insert.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/executor/Exec_pred_op.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/executor/Exec_query_index.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/executor/Exec_query_lookup.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/executor/Exec_query_range.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/executor/Exec_query_scan.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/executor/Exec_query_sys.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/executor/Exec_update_index.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/executor/Exec_update_lookup.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/executor/Exec_update_scan.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/executor/Executor.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/executor/Executor.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/executor/Makefile rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/handles/AttrDbc.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/handles/AttrEnv.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/handles/AttrRoot.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/handles/AttrStmt.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/handles/DescSpec.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/handles/FuncTab.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/handles/HandleBase.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/handles/HandleBase.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/handles/HandleDbc.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/handles/HandleDbc.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/handles/HandleDesc.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/handles/HandleDesc.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/handles/HandleEnv.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/handles/HandleEnv.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/handles/HandleRoot.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/handles/HandleRoot.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/handles/HandleStmt.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/handles/HandleStmt.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/handles/InfoTab.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/handles/Makefile rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/handles/PoolNdb.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/handles/PoolNdb.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/client/odbc/handles/handles.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/ndbbaseclient/Makefile rename to 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 similarity index 100% rename from ndb/src/old_files/ndbbaseclient/ndbbaseclient_dummy.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/ndbclient/Makefile rename to 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 similarity index 100% rename from ndb/src/old_files/ndbclient/ndbclient_dummy.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/newtonapi/Makefile rename to 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 similarity index 100% rename from ndb/src/old_files/newtonapi/dba_binding.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/newtonapi/dba_bulkread.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/newtonapi/dba_config.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/newtonapi/dba_dac.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/newtonapi/dba_error.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/newtonapi/dba_init.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/newtonapi/dba_internal.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/newtonapi/dba_process.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/newtonapi/dba_process.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/newtonapi/dba_schema.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/ExtSender.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/ExtSender.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/Makefile rename to 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 similarity index 100% rename from ndb/src/old_files/rep/NodeConnectInfo.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/README rename to 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 similarity index 100% rename from ndb/src/old_files/rep/RepApiInterpreter.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/RepApiInterpreter.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/RepApiService.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/RepApiService.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/RepCommandInterpreter.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/RepCommandInterpreter.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/RepComponents.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/RepComponents.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/RepMain.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/Requestor.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/Requestor.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/RequestorSubscriptions.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/SignalQueue.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/SignalQueue.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/TODO rename to 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 similarity index 100% rename from ndb/src/old_files/rep/adapters/AppNDB.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/adapters/AppNDB.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/adapters/ExtAPI.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/adapters/ExtAPI.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/adapters/ExtNDB.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/adapters/ExtNDB.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/adapters/Makefile rename to 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 similarity index 100% rename from ndb/src/old_files/rep/adapters/TableInfoPs.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/dbug_hack.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/rep_version.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/repapi/Makefile rename to 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 similarity index 100% rename from ndb/src/old_files/rep/repapi/repapi.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/repapi/repapi.h rename to 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 similarity index 100% rename from ndb/src/old_files/rep/state/Channel.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/state/Channel.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/state/Interval.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/state/Interval.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/state/Makefile rename to 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 similarity index 100% rename from ndb/src/old_files/rep/state/RepState.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/state/RepState.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/state/RepStateEvent.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/state/RepStateRequests.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/state/testInterval/Makefile rename to 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 similarity index 100% rename from ndb/src/old_files/rep/state/testInterval/testInterval.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/state/testRepState/Makefile rename to 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 similarity index 100% rename from ndb/src/old_files/rep/state/testRepState/testRequestor.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/state/testRepState/testRequestor.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/storage/GCIBuffer.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/storage/GCIBuffer.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/storage/GCIContainer.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/storage/GCIContainer.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/storage/GCIContainerPS.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/storage/GCIContainerPS.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/storage/GCIPage.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/storage/GCIPage.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/storage/LogRecord.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/storage/Makefile rename to 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 similarity index 100% rename from ndb/src/old_files/rep/storage/NodeConnectInfo.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/storage/NodeGroup.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/storage/NodeGroup.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/storage/NodeGroupInfo.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/storage/NodeGroupInfo.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/transfer/Makefile rename to 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 similarity index 100% rename from ndb/src/old_files/rep/transfer/TransPS.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/transfer/TransPS.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/transfer/TransSS.cpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/transfer/TransSS.hpp rename to 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 similarity index 100% rename from ndb/src/old_files/rep/transfer/TransSSSubscriptions.cpp rename to storage/ndb/src/old_files/rep/transfer/TransSSSubscriptions.cpp diff --git a/ndb/test/Makefile.am b/storage/ndb/test/Makefile.am similarity index 100% rename from ndb/test/Makefile.am rename to storage/ndb/test/Makefile.am diff --git a/ndb/test/include/CpcClient.hpp b/storage/ndb/test/include/CpcClient.hpp similarity index 100% rename from ndb/test/include/CpcClient.hpp rename to storage/ndb/test/include/CpcClient.hpp diff --git a/ndb/test/include/HugoAsynchTransactions.hpp b/storage/ndb/test/include/HugoAsynchTransactions.hpp similarity index 100% rename from ndb/test/include/HugoAsynchTransactions.hpp rename to storage/ndb/test/include/HugoAsynchTransactions.hpp diff --git a/ndb/test/include/HugoCalculator.hpp b/storage/ndb/test/include/HugoCalculator.hpp similarity index 100% rename from ndb/test/include/HugoCalculator.hpp rename to storage/ndb/test/include/HugoCalculator.hpp diff --git a/ndb/test/include/HugoOperations.hpp b/storage/ndb/test/include/HugoOperations.hpp similarity index 100% rename from ndb/test/include/HugoOperations.hpp rename to storage/ndb/test/include/HugoOperations.hpp diff --git a/ndb/test/include/HugoTransactions.hpp b/storage/ndb/test/include/HugoTransactions.hpp similarity index 100% rename from ndb/test/include/HugoTransactions.hpp rename to storage/ndb/test/include/HugoTransactions.hpp diff --git a/ndb/test/include/NDBT.hpp b/storage/ndb/test/include/NDBT.hpp similarity index 100% rename from ndb/test/include/NDBT.hpp rename to storage/ndb/test/include/NDBT.hpp diff --git a/ndb/test/include/NDBT_DataSet.hpp b/storage/ndb/test/include/NDBT_DataSet.hpp similarity index 100% rename from ndb/test/include/NDBT_DataSet.hpp rename to storage/ndb/test/include/NDBT_DataSet.hpp diff --git a/ndb/test/include/NDBT_DataSetTransaction.hpp b/storage/ndb/test/include/NDBT_DataSetTransaction.hpp similarity index 100% rename from ndb/test/include/NDBT_DataSetTransaction.hpp rename to storage/ndb/test/include/NDBT_DataSetTransaction.hpp diff --git a/ndb/test/include/NDBT_Error.hpp b/storage/ndb/test/include/NDBT_Error.hpp similarity index 100% rename from ndb/test/include/NDBT_Error.hpp rename to storage/ndb/test/include/NDBT_Error.hpp diff --git a/ndb/test/include/NDBT_Output.hpp b/storage/ndb/test/include/NDBT_Output.hpp similarity index 100% rename from ndb/test/include/NDBT_Output.hpp rename to storage/ndb/test/include/NDBT_Output.hpp diff --git a/ndb/test/include/NDBT_ResultRow.hpp b/storage/ndb/test/include/NDBT_ResultRow.hpp similarity index 100% rename from ndb/test/include/NDBT_ResultRow.hpp rename to storage/ndb/test/include/NDBT_ResultRow.hpp diff --git a/ndb/test/include/NDBT_ReturnCodes.h b/storage/ndb/test/include/NDBT_ReturnCodes.h similarity index 100% rename from ndb/test/include/NDBT_ReturnCodes.h rename to storage/ndb/test/include/NDBT_ReturnCodes.h diff --git a/ndb/test/include/NDBT_Stats.hpp b/storage/ndb/test/include/NDBT_Stats.hpp similarity index 100% rename from ndb/test/include/NDBT_Stats.hpp rename to storage/ndb/test/include/NDBT_Stats.hpp diff --git a/ndb/test/include/NDBT_Table.hpp b/storage/ndb/test/include/NDBT_Table.hpp similarity index 100% rename from ndb/test/include/NDBT_Table.hpp rename to storage/ndb/test/include/NDBT_Table.hpp diff --git a/ndb/test/include/NDBT_Tables.hpp b/storage/ndb/test/include/NDBT_Tables.hpp similarity index 100% rename from ndb/test/include/NDBT_Tables.hpp rename to storage/ndb/test/include/NDBT_Tables.hpp diff --git a/ndb/test/include/NDBT_Test.hpp b/storage/ndb/test/include/NDBT_Test.hpp similarity index 100% rename from ndb/test/include/NDBT_Test.hpp rename to storage/ndb/test/include/NDBT_Test.hpp diff --git a/ndb/test/include/NdbBackup.hpp b/storage/ndb/test/include/NdbBackup.hpp similarity index 100% rename from ndb/test/include/NdbBackup.hpp rename to storage/ndb/test/include/NdbBackup.hpp diff --git a/ndb/test/include/NdbConfig.hpp b/storage/ndb/test/include/NdbConfig.hpp similarity index 100% rename from ndb/test/include/NdbConfig.hpp rename to storage/ndb/test/include/NdbConfig.hpp diff --git a/ndb/test/include/NdbGrep.hpp b/storage/ndb/test/include/NdbGrep.hpp similarity index 100% rename from ndb/test/include/NdbGrep.hpp rename to storage/ndb/test/include/NdbGrep.hpp diff --git a/ndb/test/include/NdbRestarter.hpp b/storage/ndb/test/include/NdbRestarter.hpp similarity index 100% rename from ndb/test/include/NdbRestarter.hpp rename to storage/ndb/test/include/NdbRestarter.hpp diff --git a/ndb/test/include/NdbRestarts.hpp b/storage/ndb/test/include/NdbRestarts.hpp similarity index 100% rename from ndb/test/include/NdbRestarts.hpp rename to storage/ndb/test/include/NdbRestarts.hpp diff --git a/ndb/test/include/NdbSchemaCon.hpp b/storage/ndb/test/include/NdbSchemaCon.hpp similarity index 100% rename from ndb/test/include/NdbSchemaCon.hpp rename to storage/ndb/test/include/NdbSchemaCon.hpp diff --git a/ndb/test/include/NdbSchemaOp.hpp b/storage/ndb/test/include/NdbSchemaOp.hpp similarity index 100% rename from ndb/test/include/NdbSchemaOp.hpp rename to storage/ndb/test/include/NdbSchemaOp.hpp diff --git a/ndb/test/include/NdbTest.hpp b/storage/ndb/test/include/NdbTest.hpp similarity index 100% rename from ndb/test/include/NdbTest.hpp rename to storage/ndb/test/include/NdbTest.hpp diff --git a/ndb/test/include/NdbTimer.hpp b/storage/ndb/test/include/NdbTimer.hpp similarity index 100% rename from ndb/test/include/NdbTimer.hpp rename to storage/ndb/test/include/NdbTimer.hpp diff --git a/ndb/test/include/TestNdbEventOperation.hpp b/storage/ndb/test/include/TestNdbEventOperation.hpp similarity index 100% rename from ndb/test/include/TestNdbEventOperation.hpp rename to storage/ndb/test/include/TestNdbEventOperation.hpp diff --git a/ndb/test/include/UtilTransactions.hpp b/storage/ndb/test/include/UtilTransactions.hpp similarity index 100% rename from ndb/test/include/UtilTransactions.hpp rename to storage/ndb/test/include/UtilTransactions.hpp diff --git a/ndb/test/include/getarg.h b/storage/ndb/test/include/getarg.h similarity index 100% rename from ndb/test/include/getarg.h rename to storage/ndb/test/include/getarg.h diff --git a/ndb/test/ndbapi/InsertRecs.cpp b/storage/ndb/test/ndbapi/InsertRecs.cpp similarity index 100% rename from ndb/test/ndbapi/InsertRecs.cpp rename to storage/ndb/test/ndbapi/InsertRecs.cpp diff --git a/ndb/test/ndbapi/Makefile.am b/storage/ndb/test/ndbapi/Makefile.am similarity index 100% rename from ndb/test/ndbapi/Makefile.am rename to storage/ndb/test/ndbapi/Makefile.am diff --git a/ndb/test/ndbapi/ScanFilter.hpp b/storage/ndb/test/ndbapi/ScanFilter.hpp similarity index 100% rename from ndb/test/ndbapi/ScanFilter.hpp rename to storage/ndb/test/ndbapi/ScanFilter.hpp diff --git a/ndb/test/ndbapi/ScanFunctions.hpp b/storage/ndb/test/ndbapi/ScanFunctions.hpp similarity index 100% rename from ndb/test/ndbapi/ScanFunctions.hpp rename to storage/ndb/test/ndbapi/ScanFunctions.hpp diff --git a/ndb/test/ndbapi/ScanInterpretTest.hpp b/storage/ndb/test/ndbapi/ScanInterpretTest.hpp similarity index 100% rename from ndb/test/ndbapi/ScanInterpretTest.hpp rename to storage/ndb/test/ndbapi/ScanInterpretTest.hpp diff --git a/ndb/test/ndbapi/TraceNdbApi.cpp b/storage/ndb/test/ndbapi/TraceNdbApi.cpp similarity index 100% rename from ndb/test/ndbapi/TraceNdbApi.cpp rename to storage/ndb/test/ndbapi/TraceNdbApi.cpp diff --git a/ndb/test/ndbapi/VerifyNdbApi.cpp b/storage/ndb/test/ndbapi/VerifyNdbApi.cpp similarity index 100% rename from ndb/test/ndbapi/VerifyNdbApi.cpp rename to storage/ndb/test/ndbapi/VerifyNdbApi.cpp diff --git a/ndb/test/ndbapi/acid.cpp b/storage/ndb/test/ndbapi/acid.cpp similarity index 100% rename from ndb/test/ndbapi/acid.cpp rename to storage/ndb/test/ndbapi/acid.cpp diff --git a/ndb/test/ndbapi/acid2.cpp b/storage/ndb/test/ndbapi/acid2.cpp similarity index 100% rename from ndb/test/ndbapi/acid2.cpp rename to storage/ndb/test/ndbapi/acid2.cpp diff --git a/ndb/test/ndbapi/adoInsertRecs.cpp b/storage/ndb/test/ndbapi/adoInsertRecs.cpp similarity index 100% rename from ndb/test/ndbapi/adoInsertRecs.cpp rename to storage/ndb/test/ndbapi/adoInsertRecs.cpp diff --git a/ndb/test/ndbapi/asyncGenerator.cpp b/storage/ndb/test/ndbapi/asyncGenerator.cpp similarity index 100% rename from ndb/test/ndbapi/asyncGenerator.cpp rename to storage/ndb/test/ndbapi/asyncGenerator.cpp diff --git a/ndb/test/ndbapi/bank/Bank.cpp b/storage/ndb/test/ndbapi/bank/Bank.cpp similarity index 100% rename from ndb/test/ndbapi/bank/Bank.cpp rename to storage/ndb/test/ndbapi/bank/Bank.cpp diff --git a/ndb/test/ndbapi/bank/Bank.hpp b/storage/ndb/test/ndbapi/bank/Bank.hpp similarity index 100% rename from ndb/test/ndbapi/bank/Bank.hpp rename to storage/ndb/test/ndbapi/bank/Bank.hpp diff --git a/ndb/test/ndbapi/bank/BankLoad.cpp b/storage/ndb/test/ndbapi/bank/BankLoad.cpp similarity index 100% rename from ndb/test/ndbapi/bank/BankLoad.cpp rename to storage/ndb/test/ndbapi/bank/BankLoad.cpp diff --git a/ndb/test/ndbapi/bank/Makefile.am b/storage/ndb/test/ndbapi/bank/Makefile.am similarity index 100% rename from ndb/test/ndbapi/bank/Makefile.am rename to storage/ndb/test/ndbapi/bank/Makefile.am diff --git a/ndb/test/ndbapi/bank/bankCreator.cpp b/storage/ndb/test/ndbapi/bank/bankCreator.cpp similarity index 100% rename from ndb/test/ndbapi/bank/bankCreator.cpp rename to storage/ndb/test/ndbapi/bank/bankCreator.cpp diff --git a/ndb/test/ndbapi/bank/bankMakeGL.cpp b/storage/ndb/test/ndbapi/bank/bankMakeGL.cpp similarity index 100% rename from ndb/test/ndbapi/bank/bankMakeGL.cpp rename to storage/ndb/test/ndbapi/bank/bankMakeGL.cpp diff --git a/ndb/test/ndbapi/bank/bankSumAccounts.cpp b/storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp similarity index 100% rename from ndb/test/ndbapi/bank/bankSumAccounts.cpp rename to storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp diff --git a/ndb/test/ndbapi/bank/bankTimer.cpp b/storage/ndb/test/ndbapi/bank/bankTimer.cpp similarity index 100% rename from ndb/test/ndbapi/bank/bankTimer.cpp rename to storage/ndb/test/ndbapi/bank/bankTimer.cpp diff --git a/ndb/test/ndbapi/bank/bankTransactionMaker.cpp b/storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp similarity index 100% rename from ndb/test/ndbapi/bank/bankTransactionMaker.cpp rename to storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp diff --git a/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp b/storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp similarity index 100% rename from ndb/test/ndbapi/bank/bankValidateAllGLs.cpp rename to storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp diff --git a/ndb/test/ndbapi/bank/testBank.cpp b/storage/ndb/test/ndbapi/bank/testBank.cpp similarity index 100% rename from ndb/test/ndbapi/bank/testBank.cpp rename to storage/ndb/test/ndbapi/bank/testBank.cpp diff --git a/ndb/test/ndbapi/bench/asyncGenerator.cpp b/storage/ndb/test/ndbapi/bench/asyncGenerator.cpp similarity index 100% rename from ndb/test/ndbapi/bench/asyncGenerator.cpp rename to storage/ndb/test/ndbapi/bench/asyncGenerator.cpp diff --git a/ndb/test/ndbapi/bench/dbGenerator.h b/storage/ndb/test/ndbapi/bench/dbGenerator.h similarity index 100% rename from ndb/test/ndbapi/bench/dbGenerator.h rename to storage/ndb/test/ndbapi/bench/dbGenerator.h diff --git a/ndb/test/ndbapi/bench/dbPopulate.cpp b/storage/ndb/test/ndbapi/bench/dbPopulate.cpp similarity index 100% rename from ndb/test/ndbapi/bench/dbPopulate.cpp rename to storage/ndb/test/ndbapi/bench/dbPopulate.cpp diff --git a/ndb/test/ndbapi/bench/dbPopulate.h b/storage/ndb/test/ndbapi/bench/dbPopulate.h similarity index 100% rename from ndb/test/ndbapi/bench/dbPopulate.h rename to storage/ndb/test/ndbapi/bench/dbPopulate.h diff --git a/ndb/test/ndbapi/bench/macros.h b/storage/ndb/test/ndbapi/bench/macros.h similarity index 100% rename from ndb/test/ndbapi/bench/macros.h rename to storage/ndb/test/ndbapi/bench/macros.h diff --git a/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp b/storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp similarity index 100% rename from ndb/test/ndbapi/bench/mainAsyncGenerator.cpp rename to storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp diff --git a/ndb/test/ndbapi/bench/mainPopulate.cpp b/storage/ndb/test/ndbapi/bench/mainPopulate.cpp similarity index 100% rename from ndb/test/ndbapi/bench/mainPopulate.cpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/bench/ndb_async1.cpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/bench/ndb_async2.cpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/bench/ndb_error.hpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/bench/ndb_schema.hpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/bench/ndb_user_transaction.cpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/bench/ndb_user_transaction2.cpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/bench/ndb_user_transaction3.cpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/bench/ndb_user_transaction4.cpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/bench/ndb_user_transaction5.cpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/bench/ndb_user_transaction6.cpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/bench/testData.h rename to storage/ndb/test/ndbapi/bench/testData.h diff --git a/ndb/test/ndbapi/bench/testDefinitions.h b/storage/ndb/test/ndbapi/bench/testDefinitions.h similarity index 100% rename from ndb/test/ndbapi/bench/testDefinitions.h rename to storage/ndb/test/ndbapi/bench/testDefinitions.h diff --git a/ndb/test/ndbapi/bench/userInterface.cpp b/storage/ndb/test/ndbapi/bench/userInterface.cpp similarity index 100% rename from ndb/test/ndbapi/bench/userInterface.cpp rename to storage/ndb/test/ndbapi/bench/userInterface.cpp diff --git a/ndb/test/ndbapi/bench/userInterface.h b/storage/ndb/test/ndbapi/bench/userInterface.h similarity index 100% rename from ndb/test/ndbapi/bench/userInterface.h rename to storage/ndb/test/ndbapi/bench/userInterface.h diff --git a/ndb/test/ndbapi/benchronja.cpp b/storage/ndb/test/ndbapi/benchronja.cpp similarity index 100% rename from ndb/test/ndbapi/benchronja.cpp rename to storage/ndb/test/ndbapi/benchronja.cpp diff --git a/ndb/test/ndbapi/bulk_copy.cpp b/storage/ndb/test/ndbapi/bulk_copy.cpp similarity index 100% rename from ndb/test/ndbapi/bulk_copy.cpp rename to storage/ndb/test/ndbapi/bulk_copy.cpp diff --git a/ndb/test/ndbapi/cdrserver.cpp b/storage/ndb/test/ndbapi/cdrserver.cpp similarity index 100% rename from ndb/test/ndbapi/cdrserver.cpp rename to storage/ndb/test/ndbapi/cdrserver.cpp diff --git a/ndb/test/ndbapi/celloDb.cpp b/storage/ndb/test/ndbapi/celloDb.cpp similarity index 100% rename from ndb/test/ndbapi/celloDb.cpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/create_all_tabs.cpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/create_tab.cpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/drop_all_tabs.cpp rename to storage/ndb/test/ndbapi/drop_all_tabs.cpp diff --git a/ndb/test/ndbapi/flexAsynch.cpp b/storage/ndb/test/ndbapi/flexAsynch.cpp similarity index 100% rename from ndb/test/ndbapi/flexAsynch.cpp rename to storage/ndb/test/ndbapi/flexAsynch.cpp diff --git a/ndb/test/ndbapi/flexBench.cpp b/storage/ndb/test/ndbapi/flexBench.cpp similarity index 100% rename from ndb/test/ndbapi/flexBench.cpp rename to storage/ndb/test/ndbapi/flexBench.cpp diff --git a/ndb/test/ndbapi/flexHammer.cpp b/storage/ndb/test/ndbapi/flexHammer.cpp similarity index 100% rename from ndb/test/ndbapi/flexHammer.cpp rename to storage/ndb/test/ndbapi/flexHammer.cpp diff --git a/ndb/test/ndbapi/flexScan.cpp b/storage/ndb/test/ndbapi/flexScan.cpp similarity index 100% rename from ndb/test/ndbapi/flexScan.cpp rename to storage/ndb/test/ndbapi/flexScan.cpp diff --git a/ndb/test/ndbapi/flexTT.cpp b/storage/ndb/test/ndbapi/flexTT.cpp similarity index 100% rename from ndb/test/ndbapi/flexTT.cpp rename to storage/ndb/test/ndbapi/flexTT.cpp diff --git a/ndb/test/ndbapi/flexTimedAsynch.cpp b/storage/ndb/test/ndbapi/flexTimedAsynch.cpp similarity index 100% rename from ndb/test/ndbapi/flexTimedAsynch.cpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/flex_bench_mysql.cpp rename to storage/ndb/test/ndbapi/flex_bench_mysql.cpp diff --git a/ndb/test/ndbapi/index.cpp b/storage/ndb/test/ndbapi/index.cpp similarity index 100% rename from ndb/test/ndbapi/index.cpp rename to storage/ndb/test/ndbapi/index.cpp diff --git a/ndb/test/ndbapi/index2.cpp b/storage/ndb/test/ndbapi/index2.cpp similarity index 100% rename from ndb/test/ndbapi/index2.cpp rename to storage/ndb/test/ndbapi/index2.cpp diff --git a/ndb/test/ndbapi/initronja.cpp b/storage/ndb/test/ndbapi/initronja.cpp similarity index 100% rename from ndb/test/ndbapi/initronja.cpp rename to storage/ndb/test/ndbapi/initronja.cpp diff --git a/ndb/test/ndbapi/interpreterInTup.cpp b/storage/ndb/test/ndbapi/interpreterInTup.cpp similarity index 100% rename from ndb/test/ndbapi/interpreterInTup.cpp rename to storage/ndb/test/ndbapi/interpreterInTup.cpp diff --git a/ndb/test/ndbapi/mainAsyncGenerator.cpp b/storage/ndb/test/ndbapi/mainAsyncGenerator.cpp similarity index 100% rename from ndb/test/ndbapi/mainAsyncGenerator.cpp rename to storage/ndb/test/ndbapi/mainAsyncGenerator.cpp diff --git a/ndb/test/ndbapi/msa.cpp b/storage/ndb/test/ndbapi/msa.cpp similarity index 100% rename from ndb/test/ndbapi/msa.cpp rename to storage/ndb/test/ndbapi/msa.cpp diff --git a/ndb/test/ndbapi/ndb_async1.cpp b/storage/ndb/test/ndbapi/ndb_async1.cpp similarity index 100% rename from ndb/test/ndbapi/ndb_async1.cpp rename to storage/ndb/test/ndbapi/ndb_async1.cpp diff --git a/ndb/test/ndbapi/ndb_async2.cpp b/storage/ndb/test/ndbapi/ndb_async2.cpp similarity index 100% rename from ndb/test/ndbapi/ndb_async2.cpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/ndb_user_populate.cpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/ndb_user_transaction.cpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/ndb_user_transaction2.cpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/ndb_user_transaction3.cpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/ndb_user_transaction4.cpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/ndb_user_transaction5.cpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/ndb_user_transaction6.cpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/acid/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/acid2/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/acid2/TraceNdbApi.hpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/acid2/VerifyNdbApi.hpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/basicAsynch/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/bulk_copy/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/create_all_tabs/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/create_tab/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/drop_all_tabs/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/flexAsynch/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/flexBench/Makefile.am rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/flexBench/ndbplot.pl rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/flexHammer/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/flexHammer/README rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/flexScan/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/flexScan/README rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/flexTT/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/flexTimedAsynch/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/flex_bench_mysql/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/indexTest/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/indexTest2/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/interpreterInTup/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/async-src/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/async-src/generator/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/dbGenerator.h rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/testData.h rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/userInterface.h rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/macros.h rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/ndb_error.hpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/bin/.empty rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/include/ndb_schema.hpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/include/testDefinitions.h rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/lib/.empty rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/script/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-l-p10.sh rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-l.sh rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-p10.sh rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench.sh rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/src/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/src/README rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/dbGenerator.c rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/dbGenerator.h rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/mainGenerator.c rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/src/include/testData.h rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/src/include/userInterface.h rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/src/makevars.linux rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/src/makevars.sparc rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/dbPopulate.c rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/dbPopulate.h rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/mainPopulate.c rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/src/user/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/src/user/localDbPrepare.c rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/src/user/macros.h rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/src/user/ndb_error.hpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userHandle.h rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userInterface.c rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userTransaction.c rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userHandle.h rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userInterface.cpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userTransaction.c rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/restarter/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/restarter2/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/restarts/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/ronja/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/ronja/benchronja/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/ronja/initronja/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/telco/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/telco/readme rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/testBackup/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/testBasic/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/testBlobs/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/testDataBuffers/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/testDict/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/testGrep/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/testGrep/verify/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/testIndex/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/testInterpreter/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/testMgm/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/testNdbApi/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/testNodeRestart/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/testOIBasic/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/testOIBasic/times.txt rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/testOperations/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/testOrderedIndex/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/testRestartGci/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/testScan/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/testScanInterpreter/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/testSystemRestart/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/testTimeout/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/testTransactions/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/test_event/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/vw_test/Makefile rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/vw_test/bcd.h rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/vw_test/script/client_start rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/vw_test/utv.h rename to 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 similarity index 100% rename from ndb/test/ndbapi/old_dirs/vw_test/vcdrfunc.h rename to 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 similarity index 100% rename from ndb/test/ndbapi/restarter.cpp rename to storage/ndb/test/ndbapi/restarter.cpp diff --git a/ndb/test/ndbapi/restarter2.cpp b/storage/ndb/test/ndbapi/restarter2.cpp similarity index 100% rename from ndb/test/ndbapi/restarter2.cpp rename to storage/ndb/test/ndbapi/restarter2.cpp diff --git a/ndb/test/ndbapi/restarts.cpp b/storage/ndb/test/ndbapi/restarts.cpp similarity index 100% rename from ndb/test/ndbapi/restarts.cpp rename to storage/ndb/test/ndbapi/restarts.cpp diff --git a/ndb/test/ndbapi/size.cpp b/storage/ndb/test/ndbapi/size.cpp similarity index 100% rename from ndb/test/ndbapi/size.cpp rename to storage/ndb/test/ndbapi/size.cpp diff --git a/ndb/test/ndbapi/slow_select.cpp b/storage/ndb/test/ndbapi/slow_select.cpp similarity index 100% rename from ndb/test/ndbapi/slow_select.cpp rename to storage/ndb/test/ndbapi/slow_select.cpp diff --git a/ndb/test/ndbapi/testBackup.cpp b/storage/ndb/test/ndbapi/testBackup.cpp similarity index 100% rename from ndb/test/ndbapi/testBackup.cpp rename to storage/ndb/test/ndbapi/testBackup.cpp diff --git a/ndb/test/ndbapi/testBasic.cpp b/storage/ndb/test/ndbapi/testBasic.cpp similarity index 100% rename from ndb/test/ndbapi/testBasic.cpp rename to storage/ndb/test/ndbapi/testBasic.cpp diff --git a/ndb/test/ndbapi/testBasicAsynch.cpp b/storage/ndb/test/ndbapi/testBasicAsynch.cpp similarity index 100% rename from ndb/test/ndbapi/testBasicAsynch.cpp rename to storage/ndb/test/ndbapi/testBasicAsynch.cpp diff --git a/ndb/test/ndbapi/testBitfield.cpp b/storage/ndb/test/ndbapi/testBitfield.cpp similarity index 100% rename from ndb/test/ndbapi/testBitfield.cpp rename to storage/ndb/test/ndbapi/testBitfield.cpp diff --git a/ndb/test/ndbapi/testBlobs.cpp b/storage/ndb/test/ndbapi/testBlobs.cpp similarity index 100% rename from ndb/test/ndbapi/testBlobs.cpp rename to storage/ndb/test/ndbapi/testBlobs.cpp diff --git a/ndb/test/ndbapi/testDataBuffers.cpp b/storage/ndb/test/ndbapi/testDataBuffers.cpp similarity index 100% rename from ndb/test/ndbapi/testDataBuffers.cpp rename to storage/ndb/test/ndbapi/testDataBuffers.cpp diff --git a/ndb/test/ndbapi/testDeadlock.cpp b/storage/ndb/test/ndbapi/testDeadlock.cpp similarity index 100% rename from ndb/test/ndbapi/testDeadlock.cpp rename to storage/ndb/test/ndbapi/testDeadlock.cpp diff --git a/ndb/test/ndbapi/testDict.cpp b/storage/ndb/test/ndbapi/testDict.cpp similarity index 100% rename from ndb/test/ndbapi/testDict.cpp rename to storage/ndb/test/ndbapi/testDict.cpp diff --git a/ndb/test/ndbapi/testGrep.cpp b/storage/ndb/test/ndbapi/testGrep.cpp similarity index 100% rename from ndb/test/ndbapi/testGrep.cpp rename to storage/ndb/test/ndbapi/testGrep.cpp diff --git a/ndb/test/ndbapi/testGrepVerify.cpp b/storage/ndb/test/ndbapi/testGrepVerify.cpp similarity index 100% rename from ndb/test/ndbapi/testGrepVerify.cpp rename to storage/ndb/test/ndbapi/testGrepVerify.cpp diff --git a/ndb/test/ndbapi/testIndex.cpp b/storage/ndb/test/ndbapi/testIndex.cpp similarity index 100% rename from ndb/test/ndbapi/testIndex.cpp rename to storage/ndb/test/ndbapi/testIndex.cpp diff --git a/ndb/test/ndbapi/testInterpreter.cpp b/storage/ndb/test/ndbapi/testInterpreter.cpp similarity index 100% rename from ndb/test/ndbapi/testInterpreter.cpp rename to storage/ndb/test/ndbapi/testInterpreter.cpp diff --git a/ndb/test/ndbapi/testLcp.cpp b/storage/ndb/test/ndbapi/testLcp.cpp similarity index 100% rename from ndb/test/ndbapi/testLcp.cpp rename to storage/ndb/test/ndbapi/testLcp.cpp diff --git a/ndb/test/ndbapi/testMgm.cpp b/storage/ndb/test/ndbapi/testMgm.cpp similarity index 100% rename from ndb/test/ndbapi/testMgm.cpp rename to storage/ndb/test/ndbapi/testMgm.cpp diff --git a/ndb/test/ndbapi/testNdbApi.cpp b/storage/ndb/test/ndbapi/testNdbApi.cpp similarity index 100% rename from ndb/test/ndbapi/testNdbApi.cpp rename to storage/ndb/test/ndbapi/testNdbApi.cpp diff --git a/ndb/test/ndbapi/testNodeRestart.cpp b/storage/ndb/test/ndbapi/testNodeRestart.cpp similarity index 100% rename from ndb/test/ndbapi/testNodeRestart.cpp rename to storage/ndb/test/ndbapi/testNodeRestart.cpp diff --git a/ndb/test/ndbapi/testOIBasic.cpp b/storage/ndb/test/ndbapi/testOIBasic.cpp similarity index 100% rename from ndb/test/ndbapi/testOIBasic.cpp rename to storage/ndb/test/ndbapi/testOIBasic.cpp diff --git a/ndb/test/ndbapi/testOperations.cpp b/storage/ndb/test/ndbapi/testOperations.cpp similarity index 100% rename from ndb/test/ndbapi/testOperations.cpp rename to storage/ndb/test/ndbapi/testOperations.cpp diff --git a/ndb/test/ndbapi/testOrderedIndex.cpp b/storage/ndb/test/ndbapi/testOrderedIndex.cpp similarity index 100% rename from ndb/test/ndbapi/testOrderedIndex.cpp rename to storage/ndb/test/ndbapi/testOrderedIndex.cpp diff --git a/ndb/test/ndbapi/testPartitioning.cpp b/storage/ndb/test/ndbapi/testPartitioning.cpp similarity index 100% rename from ndb/test/ndbapi/testPartitioning.cpp rename to storage/ndb/test/ndbapi/testPartitioning.cpp diff --git a/ndb/test/ndbapi/testReadPerf.cpp b/storage/ndb/test/ndbapi/testReadPerf.cpp similarity index 100% rename from ndb/test/ndbapi/testReadPerf.cpp rename to storage/ndb/test/ndbapi/testReadPerf.cpp diff --git a/ndb/test/ndbapi/testRestartGci.cpp b/storage/ndb/test/ndbapi/testRestartGci.cpp similarity index 100% rename from ndb/test/ndbapi/testRestartGci.cpp rename to storage/ndb/test/ndbapi/testRestartGci.cpp diff --git a/ndb/test/ndbapi/testScan.cpp b/storage/ndb/test/ndbapi/testScan.cpp similarity index 100% rename from ndb/test/ndbapi/testScan.cpp rename to storage/ndb/test/ndbapi/testScan.cpp diff --git a/ndb/test/ndbapi/testScanInterpreter.cpp b/storage/ndb/test/ndbapi/testScanInterpreter.cpp similarity index 100% rename from ndb/test/ndbapi/testScanInterpreter.cpp rename to storage/ndb/test/ndbapi/testScanInterpreter.cpp diff --git a/ndb/test/ndbapi/testScanPerf.cpp b/storage/ndb/test/ndbapi/testScanPerf.cpp similarity index 100% rename from ndb/test/ndbapi/testScanPerf.cpp rename to storage/ndb/test/ndbapi/testScanPerf.cpp diff --git a/ndb/test/ndbapi/testSystemRestart.cpp b/storage/ndb/test/ndbapi/testSystemRestart.cpp similarity index 100% rename from ndb/test/ndbapi/testSystemRestart.cpp rename to storage/ndb/test/ndbapi/testSystemRestart.cpp diff --git a/ndb/test/ndbapi/testTimeout.cpp b/storage/ndb/test/ndbapi/testTimeout.cpp similarity index 100% rename from ndb/test/ndbapi/testTimeout.cpp rename to storage/ndb/test/ndbapi/testTimeout.cpp diff --git a/ndb/test/ndbapi/testTransactions.cpp b/storage/ndb/test/ndbapi/testTransactions.cpp similarity index 100% rename from ndb/test/ndbapi/testTransactions.cpp rename to storage/ndb/test/ndbapi/testTransactions.cpp diff --git a/ndb/test/ndbapi/test_event.cpp b/storage/ndb/test/ndbapi/test_event.cpp similarity index 100% rename from ndb/test/ndbapi/test_event.cpp rename to 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 similarity index 100% rename from ndb/test/ndbapi/test_event_multi_table.cpp rename to storage/ndb/test/ndbapi/test_event_multi_table.cpp diff --git a/ndb/test/ndbapi/userInterface.cpp b/storage/ndb/test/ndbapi/userInterface.cpp similarity index 100% rename from ndb/test/ndbapi/userInterface.cpp rename to storage/ndb/test/ndbapi/userInterface.cpp diff --git a/ndb/test/ndbnet/test.run b/storage/ndb/test/ndbnet/test.run similarity index 100% rename from ndb/test/ndbnet/test.run rename to storage/ndb/test/ndbnet/test.run diff --git a/ndb/test/ndbnet/testError.run b/storage/ndb/test/ndbnet/testError.run similarity index 100% rename from ndb/test/ndbnet/testError.run rename to storage/ndb/test/ndbnet/testError.run diff --git a/ndb/test/ndbnet/testMNF.run b/storage/ndb/test/ndbnet/testMNF.run similarity index 100% rename from ndb/test/ndbnet/testMNF.run rename to storage/ndb/test/ndbnet/testMNF.run diff --git a/ndb/test/ndbnet/testNR.run b/storage/ndb/test/ndbnet/testNR.run similarity index 100% rename from ndb/test/ndbnet/testNR.run rename to storage/ndb/test/ndbnet/testNR.run diff --git a/ndb/test/ndbnet/testNR1.run b/storage/ndb/test/ndbnet/testNR1.run similarity index 100% rename from ndb/test/ndbnet/testNR1.run rename to storage/ndb/test/ndbnet/testNR1.run diff --git a/ndb/test/ndbnet/testNR4.run b/storage/ndb/test/ndbnet/testNR4.run similarity index 100% rename from ndb/test/ndbnet/testNR4.run rename to storage/ndb/test/ndbnet/testNR4.run diff --git a/ndb/test/ndbnet/testSRhang.run b/storage/ndb/test/ndbnet/testSRhang.run similarity index 100% rename from ndb/test/ndbnet/testSRhang.run rename to storage/ndb/test/ndbnet/testSRhang.run diff --git a/ndb/test/ndbnet/testTR295.run b/storage/ndb/test/ndbnet/testTR295.run similarity index 100% rename from ndb/test/ndbnet/testTR295.run rename to storage/ndb/test/ndbnet/testTR295.run diff --git a/ndb/test/newtonapi/basic_test/Makefile b/storage/ndb/test/newtonapi/basic_test/Makefile similarity index 100% rename from ndb/test/newtonapi/basic_test/Makefile rename to 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 similarity index 100% rename from ndb/test/newtonapi/basic_test/basic/Makefile rename to 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 similarity index 100% rename from ndb/test/newtonapi/basic_test/basic/basic.cpp rename to 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 similarity index 100% rename from ndb/test/newtonapi/basic_test/bulk_read/Makefile rename to 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 similarity index 100% rename from ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp rename to 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 similarity index 100% rename from ndb/test/newtonapi/basic_test/common.cpp rename to 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 similarity index 100% rename from ndb/test/newtonapi/basic_test/common.hpp rename to 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 similarity index 100% rename from ndb/test/newtonapi/basic_test/ptr_binding/Makefile rename to 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 similarity index 100% rename from ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp rename to 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 similarity index 100% rename from ndb/test/newtonapi/basic_test/too_basic.cpp rename to 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 similarity index 100% rename from ndb/test/newtonapi/perf_test/Makefile rename to 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 similarity index 100% rename from ndb/test/newtonapi/perf_test/perf.cpp rename to 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 similarity index 100% rename from ndb/test/odbc/SQL99_test/Makefile rename to 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 similarity index 100% rename from ndb/test/odbc/SQL99_test/SQL99_test.cpp rename to 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 similarity index 100% rename from ndb/test/odbc/SQL99_test/SQL99_test.h rename to storage/ndb/test/odbc/SQL99_test/SQL99_test.h diff --git a/ndb/test/odbc/client/Makefile b/storage/ndb/test/odbc/client/Makefile similarity index 100% rename from ndb/test/odbc/client/Makefile rename to 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 similarity index 100% rename from ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp rename to 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 similarity index 100% rename from ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp rename to 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 similarity index 100% rename from ndb/test/odbc/client/NDBT_SQLConnect.cpp rename to 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 similarity index 100% rename from ndb/test/odbc/client/NDBT_SQLPrepare.cpp rename to 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 similarity index 100% rename from ndb/test/odbc/client/SQLAllocEnvTest.cpp rename to storage/ndb/test/odbc/client/SQLAllocEnvTest.cpp diff --git a/ndb/test/odbc/client/SQLAllocHandleTest.cpp b/storage/ndb/test/odbc/client/SQLAllocHandleTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLAllocHandleTest.cpp rename to 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 similarity index 100% rename from ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp rename to 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 similarity index 100% rename from ndb/test/odbc/client/SQLBindColTest.cpp rename to storage/ndb/test/odbc/client/SQLBindColTest.cpp diff --git a/ndb/test/odbc/client/SQLBindParameterTest.cpp b/storage/ndb/test/odbc/client/SQLBindParameterTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLBindParameterTest.cpp rename to storage/ndb/test/odbc/client/SQLBindParameterTest.cpp diff --git a/ndb/test/odbc/client/SQLCancelTest.cpp b/storage/ndb/test/odbc/client/SQLCancelTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLCancelTest.cpp rename to storage/ndb/test/odbc/client/SQLCancelTest.cpp diff --git a/ndb/test/odbc/client/SQLCloseCursorTest.cpp b/storage/ndb/test/odbc/client/SQLCloseCursorTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLCloseCursorTest.cpp rename to storage/ndb/test/odbc/client/SQLCloseCursorTest.cpp diff --git a/ndb/test/odbc/client/SQLColAttributeTest.cpp b/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLColAttributeTest.cpp rename to storage/ndb/test/odbc/client/SQLColAttributeTest.cpp diff --git a/ndb/test/odbc/client/SQLColAttributeTest1.cpp b/storage/ndb/test/odbc/client/SQLColAttributeTest1.cpp similarity index 100% rename from ndb/test/odbc/client/SQLColAttributeTest1.cpp rename to storage/ndb/test/odbc/client/SQLColAttributeTest1.cpp diff --git a/ndb/test/odbc/client/SQLColAttributeTest2.cpp b/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp similarity index 100% rename from ndb/test/odbc/client/SQLColAttributeTest2.cpp rename to storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp diff --git a/ndb/test/odbc/client/SQLColAttributeTest3.cpp b/storage/ndb/test/odbc/client/SQLColAttributeTest3.cpp similarity index 100% rename from ndb/test/odbc/client/SQLColAttributeTest3.cpp rename to storage/ndb/test/odbc/client/SQLColAttributeTest3.cpp diff --git a/ndb/test/odbc/client/SQLConnectTest.cpp b/storage/ndb/test/odbc/client/SQLConnectTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLConnectTest.cpp rename to storage/ndb/test/odbc/client/SQLConnectTest.cpp diff --git a/ndb/test/odbc/client/SQLCopyDescTest.cpp b/storage/ndb/test/odbc/client/SQLCopyDescTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLCopyDescTest.cpp rename to storage/ndb/test/odbc/client/SQLCopyDescTest.cpp diff --git a/ndb/test/odbc/client/SQLDescribeColTest.cpp b/storage/ndb/test/odbc/client/SQLDescribeColTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLDescribeColTest.cpp rename to storage/ndb/test/odbc/client/SQLDescribeColTest.cpp diff --git a/ndb/test/odbc/client/SQLDisconnectTest.cpp b/storage/ndb/test/odbc/client/SQLDisconnectTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLDisconnectTest.cpp rename to storage/ndb/test/odbc/client/SQLDisconnectTest.cpp diff --git a/ndb/test/odbc/client/SQLDriverConnectTest.cpp b/storage/ndb/test/odbc/client/SQLDriverConnectTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLDriverConnectTest.cpp rename to storage/ndb/test/odbc/client/SQLDriverConnectTest.cpp diff --git a/ndb/test/odbc/client/SQLEndTranTest.cpp b/storage/ndb/test/odbc/client/SQLEndTranTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLEndTranTest.cpp rename to storage/ndb/test/odbc/client/SQLEndTranTest.cpp diff --git a/ndb/test/odbc/client/SQLErrorTest.cpp b/storage/ndb/test/odbc/client/SQLErrorTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLErrorTest.cpp rename to storage/ndb/test/odbc/client/SQLErrorTest.cpp diff --git a/ndb/test/odbc/client/SQLExecDirectTest.cpp b/storage/ndb/test/odbc/client/SQLExecDirectTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLExecDirectTest.cpp rename to storage/ndb/test/odbc/client/SQLExecDirectTest.cpp diff --git a/ndb/test/odbc/client/SQLExecuteTest.cpp b/storage/ndb/test/odbc/client/SQLExecuteTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLExecuteTest.cpp rename to storage/ndb/test/odbc/client/SQLExecuteTest.cpp diff --git a/ndb/test/odbc/client/SQLFetchScrollTest.cpp b/storage/ndb/test/odbc/client/SQLFetchScrollTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLFetchScrollTest.cpp rename to storage/ndb/test/odbc/client/SQLFetchScrollTest.cpp diff --git a/ndb/test/odbc/client/SQLFetchTest.cpp b/storage/ndb/test/odbc/client/SQLFetchTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLFetchTest.cpp rename to storage/ndb/test/odbc/client/SQLFetchTest.cpp diff --git a/ndb/test/odbc/client/SQLFreeHandleTest.cpp b/storage/ndb/test/odbc/client/SQLFreeHandleTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLFreeHandleTest.cpp rename to storage/ndb/test/odbc/client/SQLFreeHandleTest.cpp diff --git a/ndb/test/odbc/client/SQLFreeStmtTest.cpp b/storage/ndb/test/odbc/client/SQLFreeStmtTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLFreeStmtTest.cpp rename to storage/ndb/test/odbc/client/SQLFreeStmtTest.cpp diff --git a/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp b/storage/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLGetConnectAttrTest.cpp rename to storage/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp diff --git a/ndb/test/odbc/client/SQLGetCursorNameTest.cpp b/storage/ndb/test/odbc/client/SQLGetCursorNameTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLGetCursorNameTest.cpp rename to storage/ndb/test/odbc/client/SQLGetCursorNameTest.cpp diff --git a/ndb/test/odbc/client/SQLGetDataTest.cpp b/storage/ndb/test/odbc/client/SQLGetDataTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLGetDataTest.cpp rename to storage/ndb/test/odbc/client/SQLGetDataTest.cpp diff --git a/ndb/test/odbc/client/SQLGetDescFieldTest.cpp b/storage/ndb/test/odbc/client/SQLGetDescFieldTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLGetDescFieldTest.cpp rename to storage/ndb/test/odbc/client/SQLGetDescFieldTest.cpp diff --git a/ndb/test/odbc/client/SQLGetDescRecTest.cpp b/storage/ndb/test/odbc/client/SQLGetDescRecTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLGetDescRecTest.cpp rename to storage/ndb/test/odbc/client/SQLGetDescRecTest.cpp diff --git a/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp b/storage/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLGetDiagFieldTest.cpp rename to storage/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp diff --git a/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp b/storage/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp rename to storage/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp diff --git a/ndb/test/odbc/client/SQLGetDiagRecTest.cpp b/storage/ndb/test/odbc/client/SQLGetDiagRecTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLGetDiagRecTest.cpp rename to storage/ndb/test/odbc/client/SQLGetDiagRecTest.cpp diff --git a/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp b/storage/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLGetEnvAttrTest.cpp rename to storage/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp diff --git a/ndb/test/odbc/client/SQLGetFunctionsTest.cpp b/storage/ndb/test/odbc/client/SQLGetFunctionsTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLGetFunctionsTest.cpp rename to storage/ndb/test/odbc/client/SQLGetFunctionsTest.cpp diff --git a/ndb/test/odbc/client/SQLGetInfoTest.cpp b/storage/ndb/test/odbc/client/SQLGetInfoTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLGetInfoTest.cpp rename to storage/ndb/test/odbc/client/SQLGetInfoTest.cpp diff --git a/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp b/storage/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLGetStmtAttrTest.cpp rename to storage/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp diff --git a/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp b/storage/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLGetTypeInfoTest.cpp rename to storage/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp diff --git a/ndb/test/odbc/client/SQLMoreResultsTest.cpp b/storage/ndb/test/odbc/client/SQLMoreResultsTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLMoreResultsTest.cpp rename to storage/ndb/test/odbc/client/SQLMoreResultsTest.cpp diff --git a/ndb/test/odbc/client/SQLNumResultColsTest.cpp b/storage/ndb/test/odbc/client/SQLNumResultColsTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLNumResultColsTest.cpp rename to storage/ndb/test/odbc/client/SQLNumResultColsTest.cpp diff --git a/ndb/test/odbc/client/SQLParamDataTest.cpp b/storage/ndb/test/odbc/client/SQLParamDataTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLParamDataTest.cpp rename to storage/ndb/test/odbc/client/SQLParamDataTest.cpp diff --git a/ndb/test/odbc/client/SQLPrepareTest.cpp b/storage/ndb/test/odbc/client/SQLPrepareTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLPrepareTest.cpp rename to storage/ndb/test/odbc/client/SQLPrepareTest.cpp diff --git a/ndb/test/odbc/client/SQLPutDataTest.cpp b/storage/ndb/test/odbc/client/SQLPutDataTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLPutDataTest.cpp rename to storage/ndb/test/odbc/client/SQLPutDataTest.cpp diff --git a/ndb/test/odbc/client/SQLRowCountTest.cpp b/storage/ndb/test/odbc/client/SQLRowCountTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLRowCountTest.cpp rename to storage/ndb/test/odbc/client/SQLRowCountTest.cpp diff --git a/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp b/storage/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLSetConnectAttrTest.cpp rename to storage/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp diff --git a/ndb/test/odbc/client/SQLSetCursorNameTest.cpp b/storage/ndb/test/odbc/client/SQLSetCursorNameTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLSetCursorNameTest.cpp rename to storage/ndb/test/odbc/client/SQLSetCursorNameTest.cpp diff --git a/ndb/test/odbc/client/SQLSetDescFieldTest.cpp b/storage/ndb/test/odbc/client/SQLSetDescFieldTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLSetDescFieldTest.cpp rename to storage/ndb/test/odbc/client/SQLSetDescFieldTest.cpp diff --git a/ndb/test/odbc/client/SQLSetDescRecTest.cpp b/storage/ndb/test/odbc/client/SQLSetDescRecTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLSetDescRecTest.cpp rename to storage/ndb/test/odbc/client/SQLSetDescRecTest.cpp diff --git a/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp b/storage/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLSetEnvAttrTest.cpp rename to storage/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp diff --git a/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp b/storage/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLSetStmtAttrTest.cpp rename to storage/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp diff --git a/ndb/test/odbc/client/SQLTablesTest.cpp b/storage/ndb/test/odbc/client/SQLTablesTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLTablesTest.cpp rename to storage/ndb/test/odbc/client/SQLTablesTest.cpp diff --git a/ndb/test/odbc/client/SQLTransactTest.cpp b/storage/ndb/test/odbc/client/SQLTransactTest.cpp similarity index 100% rename from ndb/test/odbc/client/SQLTransactTest.cpp rename to storage/ndb/test/odbc/client/SQLTransactTest.cpp diff --git a/ndb/test/odbc/client/common.hpp b/storage/ndb/test/odbc/client/common.hpp similarity index 100% rename from ndb/test/odbc/client/common.hpp rename to storage/ndb/test/odbc/client/common.hpp diff --git a/ndb/test/odbc/client/main.cpp b/storage/ndb/test/odbc/client/main.cpp similarity index 100% rename from ndb/test/odbc/client/main.cpp rename to storage/ndb/test/odbc/client/main.cpp diff --git a/ndb/test/odbc/dm-iodbc/Makefile b/storage/ndb/test/odbc/dm-iodbc/Makefile similarity index 100% rename from ndb/test/odbc/dm-iodbc/Makefile rename to storage/ndb/test/odbc/dm-iodbc/Makefile diff --git a/ndb/test/odbc/dm-unixodbc/Makefile b/storage/ndb/test/odbc/dm-unixodbc/Makefile similarity index 100% rename from ndb/test/odbc/dm-unixodbc/Makefile rename to storage/ndb/test/odbc/dm-unixodbc/Makefile diff --git a/ndb/test/odbc/driver/Makefile b/storage/ndb/test/odbc/driver/Makefile similarity index 100% rename from ndb/test/odbc/driver/Makefile rename to storage/ndb/test/odbc/driver/Makefile diff --git a/ndb/test/odbc/driver/testOdbcDriver.cpp b/storage/ndb/test/odbc/driver/testOdbcDriver.cpp similarity index 100% rename from ndb/test/odbc/driver/testOdbcDriver.cpp rename to storage/ndb/test/odbc/driver/testOdbcDriver.cpp diff --git a/ndb/test/odbc/test_compiler/Makefile b/storage/ndb/test/odbc/test_compiler/Makefile similarity index 100% rename from ndb/test/odbc/test_compiler/Makefile rename to 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 similarity index 100% rename from ndb/test/odbc/test_compiler/test_compiler.cpp rename to 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 similarity index 100% rename from ndb/test/run-test/16node-tests.txt rename to storage/ndb/test/run-test/16node-tests.txt diff --git a/ndb/test/run-test/Makefile.am b/storage/ndb/test/run-test/Makefile.am similarity index 100% rename from ndb/test/run-test/Makefile.am rename to storage/ndb/test/run-test/Makefile.am diff --git a/ndb/test/run-test/README b/storage/ndb/test/run-test/README similarity index 100% rename from ndb/test/run-test/README rename to storage/ndb/test/run-test/README diff --git a/ndb/test/run-test/README.ATRT b/storage/ndb/test/run-test/README.ATRT similarity index 100% rename from ndb/test/run-test/README.ATRT rename to 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 similarity index 100% rename from ndb/test/run-test/atrt-analyze-result.sh rename to 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 similarity index 100% rename from ndb/test/run-test/atrt-clear-result.sh rename to 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 similarity index 100% rename from ndb/test/run-test/atrt-example.tgz rename to 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 similarity index 100% rename from ndb/test/run-test/atrt-gather-result.sh rename to 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 similarity index 100% rename from ndb/test/run-test/atrt-mysql-test-run rename to 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 similarity index 100% rename from ndb/test/run-test/atrt-setup.sh rename to 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 similarity index 100% rename from ndb/test/run-test/atrt-testBackup rename to storage/ndb/test/run-test/atrt-testBackup diff --git a/ndb/test/run-test/basic.txt b/storage/ndb/test/run-test/basic.txt similarity index 100% rename from ndb/test/run-test/basic.txt rename to storage/ndb/test/run-test/basic.txt diff --git a/ndb/test/run-test/daily-basic-tests.txt b/storage/ndb/test/run-test/daily-basic-tests.txt similarity index 100% rename from ndb/test/run-test/daily-basic-tests.txt rename to 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 similarity index 100% rename from ndb/test/run-test/daily-devel-tests.txt rename to 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 similarity index 100% rename from ndb/test/run-test/example.conf rename to storage/ndb/test/run-test/example.conf diff --git a/ndb/test/run-test/main.cpp b/storage/ndb/test/run-test/main.cpp similarity index 100% rename from ndb/test/run-test/main.cpp rename to 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 similarity index 100% rename from ndb/test/run-test/make-config.sh rename to 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 similarity index 100% rename from ndb/test/run-test/make-html-reports.sh rename to 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 similarity index 100% rename from ndb/test/run-test/make-index.sh rename to 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 similarity index 100% rename from ndb/test/run-test/ndb-autotest.sh rename to 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 similarity index 100% rename from ndb/test/run-test/run-test.hpp rename to storage/ndb/test/run-test/run-test.hpp diff --git a/ndb/test/src/CpcClient.cpp b/storage/ndb/test/src/CpcClient.cpp similarity index 100% rename from ndb/test/src/CpcClient.cpp rename to storage/ndb/test/src/CpcClient.cpp diff --git a/ndb/test/src/HugoAsynchTransactions.cpp b/storage/ndb/test/src/HugoAsynchTransactions.cpp similarity index 100% rename from ndb/test/src/HugoAsynchTransactions.cpp rename to storage/ndb/test/src/HugoAsynchTransactions.cpp diff --git a/ndb/test/src/HugoCalculator.cpp b/storage/ndb/test/src/HugoCalculator.cpp similarity index 100% rename from ndb/test/src/HugoCalculator.cpp rename to storage/ndb/test/src/HugoCalculator.cpp diff --git a/ndb/test/src/HugoOperations.cpp b/storage/ndb/test/src/HugoOperations.cpp similarity index 100% rename from ndb/test/src/HugoOperations.cpp rename to storage/ndb/test/src/HugoOperations.cpp diff --git a/ndb/test/src/HugoTransactions.cpp b/storage/ndb/test/src/HugoTransactions.cpp similarity index 100% rename from ndb/test/src/HugoTransactions.cpp rename to storage/ndb/test/src/HugoTransactions.cpp diff --git a/ndb/test/src/Makefile.am b/storage/ndb/test/src/Makefile.am similarity index 100% rename from ndb/test/src/Makefile.am rename to storage/ndb/test/src/Makefile.am diff --git a/ndb/test/src/NDBT_Error.cpp b/storage/ndb/test/src/NDBT_Error.cpp similarity index 100% rename from ndb/test/src/NDBT_Error.cpp rename to storage/ndb/test/src/NDBT_Error.cpp diff --git a/ndb/test/src/NDBT_Output.cpp b/storage/ndb/test/src/NDBT_Output.cpp similarity index 100% rename from ndb/test/src/NDBT_Output.cpp rename to storage/ndb/test/src/NDBT_Output.cpp diff --git a/ndb/test/src/NDBT_ResultRow.cpp b/storage/ndb/test/src/NDBT_ResultRow.cpp similarity index 100% rename from ndb/test/src/NDBT_ResultRow.cpp rename to storage/ndb/test/src/NDBT_ResultRow.cpp diff --git a/ndb/test/src/NDBT_ReturnCodes.cpp b/storage/ndb/test/src/NDBT_ReturnCodes.cpp similarity index 100% rename from ndb/test/src/NDBT_ReturnCodes.cpp rename to storage/ndb/test/src/NDBT_ReturnCodes.cpp diff --git a/ndb/test/src/NDBT_Table.cpp b/storage/ndb/test/src/NDBT_Table.cpp similarity index 100% rename from ndb/test/src/NDBT_Table.cpp rename to storage/ndb/test/src/NDBT_Table.cpp diff --git a/ndb/test/src/NDBT_Tables.cpp b/storage/ndb/test/src/NDBT_Tables.cpp similarity index 100% rename from ndb/test/src/NDBT_Tables.cpp rename to storage/ndb/test/src/NDBT_Tables.cpp diff --git a/ndb/test/src/NDBT_Test.cpp b/storage/ndb/test/src/NDBT_Test.cpp similarity index 100% rename from ndb/test/src/NDBT_Test.cpp rename to storage/ndb/test/src/NDBT_Test.cpp diff --git a/ndb/test/src/NdbBackup.cpp b/storage/ndb/test/src/NdbBackup.cpp similarity index 100% rename from ndb/test/src/NdbBackup.cpp rename to storage/ndb/test/src/NdbBackup.cpp diff --git a/ndb/test/src/NdbConfig.cpp b/storage/ndb/test/src/NdbConfig.cpp similarity index 100% rename from ndb/test/src/NdbConfig.cpp rename to storage/ndb/test/src/NdbConfig.cpp diff --git a/ndb/test/src/NdbGrep.cpp b/storage/ndb/test/src/NdbGrep.cpp similarity index 100% rename from ndb/test/src/NdbGrep.cpp rename to storage/ndb/test/src/NdbGrep.cpp diff --git a/ndb/test/src/NdbRestarter.cpp b/storage/ndb/test/src/NdbRestarter.cpp similarity index 100% rename from ndb/test/src/NdbRestarter.cpp rename to storage/ndb/test/src/NdbRestarter.cpp diff --git a/ndb/test/src/NdbRestarts.cpp b/storage/ndb/test/src/NdbRestarts.cpp similarity index 100% rename from ndb/test/src/NdbRestarts.cpp rename to storage/ndb/test/src/NdbRestarts.cpp diff --git a/ndb/test/src/NdbSchemaCon.cpp b/storage/ndb/test/src/NdbSchemaCon.cpp similarity index 100% rename from ndb/test/src/NdbSchemaCon.cpp rename to storage/ndb/test/src/NdbSchemaCon.cpp diff --git a/ndb/test/src/NdbSchemaOp.cpp b/storage/ndb/test/src/NdbSchemaOp.cpp similarity index 100% rename from ndb/test/src/NdbSchemaOp.cpp rename to storage/ndb/test/src/NdbSchemaOp.cpp diff --git a/ndb/test/src/UtilTransactions.cpp b/storage/ndb/test/src/UtilTransactions.cpp similarity index 100% rename from ndb/test/src/UtilTransactions.cpp rename to storage/ndb/test/src/UtilTransactions.cpp diff --git a/ndb/test/src/getarg.c b/storage/ndb/test/src/getarg.c similarity index 100% rename from ndb/test/src/getarg.c rename to storage/ndb/test/src/getarg.c diff --git a/ndb/test/tools/Makefile.am b/storage/ndb/test/tools/Makefile.am similarity index 100% rename from ndb/test/tools/Makefile.am rename to storage/ndb/test/tools/Makefile.am diff --git a/ndb/test/tools/copy_tab.cpp b/storage/ndb/test/tools/copy_tab.cpp similarity index 100% rename from ndb/test/tools/copy_tab.cpp rename to storage/ndb/test/tools/copy_tab.cpp diff --git a/ndb/test/tools/cpcc.cpp b/storage/ndb/test/tools/cpcc.cpp similarity index 100% rename from ndb/test/tools/cpcc.cpp rename to storage/ndb/test/tools/cpcc.cpp diff --git a/ndb/test/tools/create_index.cpp b/storage/ndb/test/tools/create_index.cpp similarity index 100% rename from ndb/test/tools/create_index.cpp rename to storage/ndb/test/tools/create_index.cpp diff --git a/ndb/test/tools/hugoCalculator.cpp b/storage/ndb/test/tools/hugoCalculator.cpp similarity index 100% rename from ndb/test/tools/hugoCalculator.cpp rename to storage/ndb/test/tools/hugoCalculator.cpp diff --git a/ndb/test/tools/hugoFill.cpp b/storage/ndb/test/tools/hugoFill.cpp similarity index 100% rename from ndb/test/tools/hugoFill.cpp rename to storage/ndb/test/tools/hugoFill.cpp diff --git a/ndb/test/tools/hugoLoad.cpp b/storage/ndb/test/tools/hugoLoad.cpp similarity index 100% rename from ndb/test/tools/hugoLoad.cpp rename to storage/ndb/test/tools/hugoLoad.cpp diff --git a/ndb/test/tools/hugoLockRecords.cpp b/storage/ndb/test/tools/hugoLockRecords.cpp similarity index 100% rename from ndb/test/tools/hugoLockRecords.cpp rename to storage/ndb/test/tools/hugoLockRecords.cpp diff --git a/ndb/test/tools/hugoPkDelete.cpp b/storage/ndb/test/tools/hugoPkDelete.cpp similarity index 100% rename from ndb/test/tools/hugoPkDelete.cpp rename to storage/ndb/test/tools/hugoPkDelete.cpp diff --git a/ndb/test/tools/hugoPkRead.cpp b/storage/ndb/test/tools/hugoPkRead.cpp similarity index 100% rename from ndb/test/tools/hugoPkRead.cpp rename to storage/ndb/test/tools/hugoPkRead.cpp diff --git a/ndb/test/tools/hugoPkReadRecord.cpp b/storage/ndb/test/tools/hugoPkReadRecord.cpp similarity index 100% rename from ndb/test/tools/hugoPkReadRecord.cpp rename to storage/ndb/test/tools/hugoPkReadRecord.cpp diff --git a/ndb/test/tools/hugoPkUpdate.cpp b/storage/ndb/test/tools/hugoPkUpdate.cpp similarity index 100% rename from ndb/test/tools/hugoPkUpdate.cpp rename to storage/ndb/test/tools/hugoPkUpdate.cpp diff --git a/ndb/test/tools/hugoScanRead.cpp b/storage/ndb/test/tools/hugoScanRead.cpp similarity index 100% rename from ndb/test/tools/hugoScanRead.cpp rename to storage/ndb/test/tools/hugoScanRead.cpp diff --git a/ndb/test/tools/hugoScanUpdate.cpp b/storage/ndb/test/tools/hugoScanUpdate.cpp similarity index 100% rename from ndb/test/tools/hugoScanUpdate.cpp rename to 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 similarity index 100% rename from ndb/test/tools/old_dirs/hugoCalculator/Makefile rename to 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 similarity index 100% rename from ndb/test/tools/old_dirs/hugoFill/Makefile rename to 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 similarity index 100% rename from ndb/test/tools/old_dirs/hugoLoad/Makefile rename to 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 similarity index 100% rename from ndb/test/tools/old_dirs/hugoLockRecords/Makefile rename to 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 similarity index 100% rename from ndb/test/tools/old_dirs/hugoPkDelete/Makefile rename to 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 similarity index 100% rename from ndb/test/tools/old_dirs/hugoPkRead/Makefile rename to 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 similarity index 100% rename from ndb/test/tools/old_dirs/hugoPkReadRecord/Makefile rename to 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 similarity index 100% rename from ndb/test/tools/old_dirs/hugoPkUpdate/Makefile rename to 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 similarity index 100% rename from ndb/test/tools/old_dirs/hugoScanRead/Makefile rename to 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 similarity index 100% rename from ndb/test/tools/old_dirs/hugoScanUpdate/Makefile rename to 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 similarity index 100% rename from ndb/test/tools/old_dirs/restart/Makefile rename to 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 similarity index 100% rename from ndb/test/tools/old_dirs/transproxy/Makefile rename to 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 similarity index 100% rename from ndb/test/tools/old_dirs/verify_index/Makefile rename to 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 similarity index 100% rename from ndb/test/tools/old_dirs/waiter/waiter.cpp rename to storage/ndb/test/tools/old_dirs/waiter/waiter.cpp diff --git a/ndb/test/tools/restart.cpp b/storage/ndb/test/tools/restart.cpp similarity index 100% rename from ndb/test/tools/restart.cpp rename to storage/ndb/test/tools/restart.cpp diff --git a/ndb/test/tools/transproxy.cpp b/storage/ndb/test/tools/transproxy.cpp similarity index 100% rename from ndb/test/tools/transproxy.cpp rename to storage/ndb/test/tools/transproxy.cpp diff --git a/ndb/test/tools/verify_index.cpp b/storage/ndb/test/tools/verify_index.cpp similarity index 100% rename from ndb/test/tools/verify_index.cpp rename to storage/ndb/test/tools/verify_index.cpp diff --git a/ndb/tools/Makefile.am b/storage/ndb/tools/Makefile.am similarity index 100% rename from ndb/tools/Makefile.am rename to storage/ndb/tools/Makefile.am diff --git a/ndb/tools/clean-links.sh b/storage/ndb/tools/clean-links.sh similarity index 100% rename from ndb/tools/clean-links.sh rename to storage/ndb/tools/clean-links.sh diff --git a/ndb/tools/delete_all.cpp b/storage/ndb/tools/delete_all.cpp similarity index 100% rename from ndb/tools/delete_all.cpp rename to storage/ndb/tools/delete_all.cpp diff --git a/ndb/tools/desc.cpp b/storage/ndb/tools/desc.cpp similarity index 100% rename from ndb/tools/desc.cpp rename to storage/ndb/tools/desc.cpp diff --git a/ndb/tools/drop_index.cpp b/storage/ndb/tools/drop_index.cpp similarity index 100% rename from ndb/tools/drop_index.cpp rename to storage/ndb/tools/drop_index.cpp diff --git a/ndb/tools/drop_tab.cpp b/storage/ndb/tools/drop_tab.cpp similarity index 100% rename from ndb/tools/drop_tab.cpp rename to storage/ndb/tools/drop_tab.cpp diff --git a/ndb/tools/listTables.cpp b/storage/ndb/tools/listTables.cpp similarity index 100% rename from ndb/tools/listTables.cpp rename to storage/ndb/tools/listTables.cpp diff --git a/ndb/tools/make-errors.pl b/storage/ndb/tools/make-errors.pl similarity index 100% rename from ndb/tools/make-errors.pl rename to storage/ndb/tools/make-errors.pl diff --git a/ndb/tools/make-links.sh b/storage/ndb/tools/make-links.sh similarity index 100% rename from ndb/tools/make-links.sh rename to storage/ndb/tools/make-links.sh diff --git a/ndb/tools/ndb_test_platform.cpp b/storage/ndb/tools/ndb_test_platform.cpp similarity index 100% rename from ndb/tools/ndb_test_platform.cpp rename to storage/ndb/tools/ndb_test_platform.cpp diff --git a/ndb/tools/ndbsql.cpp b/storage/ndb/tools/ndbsql.cpp similarity index 100% rename from ndb/tools/ndbsql.cpp rename to storage/ndb/tools/ndbsql.cpp diff --git a/ndb/tools/old_dirs/copy_tab/Makefile b/storage/ndb/tools/old_dirs/copy_tab/Makefile similarity index 100% rename from ndb/tools/old_dirs/copy_tab/Makefile rename to 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 similarity index 100% rename from ndb/tools/old_dirs/cpcc/Makefile rename to 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 similarity index 100% rename from ndb/tools/old_dirs/create_index/Makefile rename to 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 similarity index 100% rename from ndb/tools/old_dirs/delete_all/Makefile rename to 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 similarity index 100% rename from ndb/tools/old_dirs/desc/Makefile rename to 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 similarity index 100% rename from ndb/tools/old_dirs/drop_index/Makefile rename to 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 similarity index 100% rename from ndb/tools/old_dirs/drop_tab/Makefile rename to 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 similarity index 100% rename from ndb/tools/old_dirs/list_tables/Makefile rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/Makefile.PL rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Net.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Base.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Client.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Command.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Config.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Database.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Env.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Node.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeApi.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeDb.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeMgmt.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Server.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Net/ServerINET.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Net/ServerUNIX.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Run.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Base.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Database.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Env.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Node.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Util.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Base.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Dir.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Event.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Util/File.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Util/IO.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Lock.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Log.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Socket.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Util/SocketINET.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/lib/NDB/Util/SocketUNIX.pm rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/ndbnet.pl rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/ndbnetd.pl rename to 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 similarity index 100% rename from ndb/tools/old_dirs/ndbnet/ndbrun rename to storage/ndb/tools/old_dirs/ndbnet/ndbrun diff --git a/ndb/tools/old_dirs/ndbsql/Makefile b/storage/ndb/tools/old_dirs/ndbsql/Makefile similarity index 100% rename from ndb/tools/old_dirs/ndbsql/Makefile rename to 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 similarity index 100% rename from ndb/tools/old_dirs/select_all/Makefile rename to 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 similarity index 100% rename from ndb/tools/old_dirs/select_count/Makefile rename to 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 similarity index 100% rename from ndb/tools/old_dirs/src/counterviewer/CounterViewer.java rename to storage/ndb/tools/old_dirs/src/counterviewer/CounterViewer.java diff --git a/ndb/tools/restore/Restore.cpp b/storage/ndb/tools/restore/Restore.cpp similarity index 100% rename from ndb/tools/restore/Restore.cpp rename to storage/ndb/tools/restore/Restore.cpp diff --git a/ndb/tools/restore/Restore.hpp b/storage/ndb/tools/restore/Restore.hpp similarity index 100% rename from ndb/tools/restore/Restore.hpp rename to storage/ndb/tools/restore/Restore.hpp diff --git a/ndb/tools/restore/consumer.cpp b/storage/ndb/tools/restore/consumer.cpp similarity index 100% rename from ndb/tools/restore/consumer.cpp rename to storage/ndb/tools/restore/consumer.cpp diff --git a/ndb/tools/restore/consumer.hpp b/storage/ndb/tools/restore/consumer.hpp similarity index 100% rename from ndb/tools/restore/consumer.hpp rename to storage/ndb/tools/restore/consumer.hpp diff --git a/ndb/tools/restore/consumer_printer.cpp b/storage/ndb/tools/restore/consumer_printer.cpp similarity index 100% rename from ndb/tools/restore/consumer_printer.cpp rename to storage/ndb/tools/restore/consumer_printer.cpp diff --git a/ndb/tools/restore/consumer_printer.hpp b/storage/ndb/tools/restore/consumer_printer.hpp similarity index 100% rename from ndb/tools/restore/consumer_printer.hpp rename to storage/ndb/tools/restore/consumer_printer.hpp diff --git a/ndb/tools/restore/consumer_restore.cpp b/storage/ndb/tools/restore/consumer_restore.cpp similarity index 100% rename from ndb/tools/restore/consumer_restore.cpp rename to storage/ndb/tools/restore/consumer_restore.cpp diff --git a/ndb/tools/restore/consumer_restore.hpp b/storage/ndb/tools/restore/consumer_restore.hpp similarity index 100% rename from ndb/tools/restore/consumer_restore.hpp rename to storage/ndb/tools/restore/consumer_restore.hpp diff --git a/ndb/tools/restore/consumer_restorem.cpp b/storage/ndb/tools/restore/consumer_restorem.cpp similarity index 100% rename from ndb/tools/restore/consumer_restorem.cpp rename to storage/ndb/tools/restore/consumer_restorem.cpp diff --git a/ndb/tools/restore/restore_main.cpp b/storage/ndb/tools/restore/restore_main.cpp similarity index 100% rename from ndb/tools/restore/restore_main.cpp rename to storage/ndb/tools/restore/restore_main.cpp diff --git a/ndb/tools/rgrep b/storage/ndb/tools/rgrep similarity index 100% rename from ndb/tools/rgrep rename to storage/ndb/tools/rgrep diff --git a/ndb/tools/select_all.cpp b/storage/ndb/tools/select_all.cpp similarity index 100% rename from ndb/tools/select_all.cpp rename to storage/ndb/tools/select_all.cpp diff --git a/ndb/tools/select_count.cpp b/storage/ndb/tools/select_count.cpp similarity index 100% rename from ndb/tools/select_count.cpp rename to storage/ndb/tools/select_count.cpp diff --git a/ndb/tools/waiter.cpp b/storage/ndb/tools/waiter.cpp similarity index 100% rename from ndb/tools/waiter.cpp rename to storage/ndb/tools/waiter.cpp From 2193fd86669001d6caae4009e4be429d00b8710d Mon Sep 17 00:00:00 2001 From: "brian@zim.(none)" <> Date: Tue, 26 Apr 2005 19:04:36 -0700 Subject: [PATCH 21/51] All changes for change to all storage engines being under storage directory. --- config/ac-macros/ha_berkeley.m4 | 2 +- config/ac-macros/ha_innodb.m4 | 70 ++++---- config/ac-macros/ha_ndbcluster.m4 | 6 +- configure.in | 116 +++++++------ extra/perror.c | 2 +- libmysqld/Makefile.am | 6 +- mysql-test/mysql-test-run.sh | 4 +- sql/Makefile.am | 6 +- sql/ha_innodb.cc | 44 ++--- sql/ha_myisam.cc | 4 +- sql/ha_myisammrg.cc | 2 +- sql/lock.cc | 2 +- sql/sql_cache.cc | 2 +- storage/heap/Makefile.am | 5 +- storage/innobase/include/Makefile.i | 2 +- storage/myisammrg/myrg_def.h | 2 +- storage/ndb/Makefile.am | 4 +- storage/ndb/config/common.mk.am | 8 +- storage/ndb/config/type_kernel.mk.am | 26 +-- storage/ndb/config/type_mgmapiclient.mk.am | 2 +- storage/ndb/config/type_ndbapi.mk.am | 20 +-- storage/ndb/config/type_ndbapiclient.mk.am | 2 +- storage/ndb/config/type_ndbapitest.mk.am | 16 +- storage/ndb/config/type_ndbapitools.mk.am | 16 +- storage/ndb/config/type_util.mk.am | 8 +- storage/ndb/docs/Makefile.am | 12 +- storage/ndb/include/Makefile.am | 2 +- storage/ndb/src/Makefile.am | 22 +-- storage/ndb/src/common/debugger/Makefile.am | 24 +-- .../common/debugger/signaldata/Makefile.am | 24 +-- storage/ndb/src/common/logger/Makefile.am | 24 +-- storage/ndb/src/common/mgmcommon/Makefile.am | 28 +-- storage/ndb/src/common/portlib/Makefile.am | 24 +-- .../ndb/src/common/transporter/Makefile.am | 26 +-- storage/ndb/src/common/util/Makefile.am | 26 +-- storage/ndb/src/cw/cpcd/Makefile.am | 6 +- storage/ndb/src/kernel/Makefile.am | 42 ++--- .../ndb/src/kernel/blocks/backup/Makefile.am | 24 +-- .../ndb/src/kernel/blocks/cmvmi/Makefile.am | 24 +-- .../ndb/src/kernel/blocks/dbacc/Makefile.am | 26 +-- .../ndb/src/kernel/blocks/dbdict/Makefile.am | 24 +-- .../ndb/src/kernel/blocks/dbdih/Makefile.am | 24 +-- .../ndb/src/kernel/blocks/dblqh/Makefile.am | 24 +-- .../ndb/src/kernel/blocks/dbtc/Makefile.am | 24 +-- .../ndb/src/kernel/blocks/dbtup/Makefile.am | 24 +-- .../ndb/src/kernel/blocks/dbtux/Makefile.am | 26 +-- .../ndb/src/kernel/blocks/dbutil/Makefile.am | 24 +-- .../ndb/src/kernel/blocks/grep/Makefile.am | 24 +-- .../ndb/src/kernel/blocks/ndbcntr/Makefile.am | 24 +-- .../ndb/src/kernel/blocks/ndbfs/Makefile.am | 24 +-- .../ndb/src/kernel/blocks/qmgr/Makefile.am | 24 +-- .../ndb/src/kernel/blocks/suma/Makefile.am | 24 +-- .../ndb/src/kernel/blocks/trix/Makefile.am | 24 +-- storage/ndb/src/kernel/error/Makefile.am | 24 +-- storage/ndb/src/kernel/vm/Makefile.am | 26 +-- storage/ndb/src/mgmapi/Makefile.am | 26 +-- storage/ndb/src/mgmclient/Makefile.am | 48 +++--- storage/ndb/src/mgmsrv/Makefile.am | 36 ++-- storage/ndb/src/ndbapi/Makefile.am | 26 +-- storage/ndb/test/ndbapi/Makefile.am | 106 ++++++------ storage/ndb/test/ndbapi/bank/Makefile.am | 4 +- storage/ndb/test/run-test/Makefile.am | 12 +- storage/ndb/test/src/Makefile.am | 26 +-- storage/ndb/test/tools/Makefile.am | 4 +- storage/ndb/tools/Makefile.am | 162 +++++++++--------- 65 files changed, 765 insertions(+), 760 deletions(-) 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 11bd87651da..cd13dd8d0d7 100644 --- a/configure.in +++ b/configure.in @@ -2443,7 +2443,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" @@ -2469,8 +2469,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]) @@ -2483,12 +2485,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 < bdb/build_unix/db.h + cat < 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 @@ -2511,8 +2513,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 @@ -2534,12 +2536,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 @@ -2672,51 +2674,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 @@ -2724,8 +2728,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 #include #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/libmysqld/Makefile.am b/libmysqld/Makefile.am index ab52e8245a2..9007e9af769 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -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/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index ac1755cab9c..9bbfaf69c15 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -584,8 +584,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/purify.suppress" diff --git a/sql/Makefile.am b/sql/Makefile.am index 783ea7dfda6..02e347084c7 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 \ diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index e29560f15a5..2411a35e659 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -59,28 +59,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 */ diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc index 2179eaa7f8f..9d17ebd06e3 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 4cd39660728..1d86e31054e 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/lock.cc b/sql/lock.cc index 266e8dc4d4d..9c2531037bf 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, diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 4a4f61f985c..9c5e1f5e58f 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -304,7 +304,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/storage/heap/Makefile.am b/storage/heap/Makefile.am index 2262fa3d5b1..f9f0ba775ff 100644 --- a/storage/heap/Makefile.am +++ b/storage/heap/Makefile.am @@ -15,8 +15,9 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA INCLUDES = -I$(top_srcdir)/include -LDADD = libheap.a ../mysys/libmysys.a ../dbug/libdbug.a \ - ../strings/libmystrings.a +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@ diff --git a/storage/innobase/include/Makefile.i b/storage/innobase/include/Makefile.i index f3e3fbe989e..87952a7abc8 100644 --- a/storage/innobase/include/Makefile.i +++ b/storage/innobase/include/Makefile.i @@ -1,6 +1,6 @@ # Makefile included in Makefile.am in every subdirectory -INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../../include -I../../include +INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/../../include # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/storage/myisammrg/myrg_def.h b/storage/myisammrg/myrg_def.h index 99d7cf541d5..00e7950bccf 100644 --- a/storage/myisammrg/myrg_def.h +++ b/storage/myisammrg/myrg_def.h @@ -17,7 +17,7 @@ /* This file is included by all myisam-merge files */ #ifndef N_MAXKEY -#include "../storage/myisam/myisamdef.h" +#include "../myisam/myisamdef.h" #endif #include "myisammrg.h" diff --git a/storage/ndb/Makefile.am b/storage/ndb/Makefile.am index 3aac54b38ee..9adb67f89fc 100644 --- a/storage/ndb/Makefile.am +++ b/storage/ndb/Makefile.am @@ -2,7 +2,7 @@ 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 +include $(top_srcdir)/storage/ndb/config/common.mk.am dist-hook: -rm -rf `find $(distdir) -type d -name SCCS` @@ -26,5 +26,5 @@ 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 + $(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/storage/ndb/config/common.mk.am b/storage/ndb/config/common.mk.am index 869e2fae91d..1fc254ef57c 100644 --- a/storage/ndb/config/common.mk.am +++ b/storage/ndb/config/common.mk.am @@ -2,11 +2,11 @@ ndbbindir = "$(libexecdir)" ndbtoolsdir = "$(bindir)" ndbtestdir = "$(bindir)" ndblibdir = "$(pkglibdir)" -ndbincludedir = "$(pkgincludedir)/ndb" -ndbapiincludedir = "$(pkgincludedir)/ndb/ndbapi" -mgmapiincludedir = "$(pkgincludedir)/ndb/mgmapi" +ndbincludedir = "$(pkgincludedir)/storage/ndb" +ndbapiincludedir = "$(pkgincludedir)/storage/ndb/ndbapi" +mgmapiincludedir = "$(pkgincludedir)/storage/ndb/mgmapi" INCLUDES = $(INCLUDES_LOC) -LDADD = $(top_srcdir)/ndb/src/common/portlib/gcc.cpp $(LDADD_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/storage/ndb/config/type_kernel.mk.am b/storage/ndb/config/type_kernel.mk.am index 703876ee2e9..710cdbd80fa 100644 --- a/storage/ndb/config/type_kernel.mk.am +++ b/storage/ndb/config/type_kernel.mk.am @@ -1,18 +1,18 @@ 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 + -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 index 1ef4a81d67e..d1d002962ae 100644 --- a/storage/ndb/config/type_mgmapiclient.mk.am +++ b/storage/ndb/config/type_mgmapiclient.mk.am @@ -1,2 +1,2 @@ -INCLUDES += -I$(top_srcdir)/ndb/include/mgmapi +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 index ed648273aea..d4be0c40b36 100644 --- a/storage/ndb/config/type_ndbapi.mk.am +++ b/storage/ndb/config/type_ndbapi.mk.am @@ -1,12 +1,12 @@ 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 + -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 index 88b57e49e19..eae7ca73ea2 100644 --- a/storage/ndb/config/type_ndbapiclient.mk.am +++ b/storage/ndb/config/type_ndbapiclient.mk.am @@ -1,2 +1,2 @@ -INCLUDES += -I$(top_srcdir)/ndb/include/ndbapi +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 index 392c4e9fc70..f4a339b27c7 100644 --- a/storage/ndb/config/type_ndbapitest.mk.am +++ b/storage/ndb/config/type_ndbapitest.mk.am @@ -1,14 +1,14 @@ -LDADD += $(top_builddir)/ndb/test/src/libNDBT.a \ - $(top_builddir)/ndb/src/libndbclient.la \ +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)/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)/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 index d4eb090112d..e0f2fd1c0f6 100644 --- a/storage/ndb/config/type_ndbapitools.mk.am +++ b/storage/ndb/config/type_ndbapitools.mk.am @@ -1,15 +1,15 @@ LDADD += \ - $(top_builddir)/ndb/src/libndbclient.la \ + $(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)/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 + -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 index 0dfa77b7a7c..5d7ad6e57b9 100644 --- a/storage/ndb/config/type_util.mk.am +++ b/storage/ndb/config/type_util.mk.am @@ -1,6 +1,6 @@ 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 + -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/storage/ndb/docs/Makefile.am b/storage/ndb/docs/Makefile.am index afa91857771..d10228d419d 100644 --- a/storage/ndb/docs/Makefile.am +++ b/storage/ndb/docs/Makefile.am @@ -47,8 +47,8 @@ ndbapi.html: $(noinst_HEADERS) @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); \ + @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); \ @@ -74,7 +74,7 @@ mgmapi.html: $(noinst_HEADERS) @RM@ -f mgmapi.pdf mgmapi.html; \ @RM@ -rf $(DOXYTMP) $(DOXYOUT); \ mkdir -p $(DOXYTMP) $(DOXYOUT); \ - @CP@ $(top_srcdir)/ndb/include/mgmapi/* $(DOXYTMP); \ + @CP@ $(top_srcdir)/storage/ndb/include/mgmapi/* $(DOXYTMP); \ @PERL@ $(DOXYDIR)/predoxy.pl; \ mv footer.html $(DOXYTMP); \ (cd $(DOXYTMP) ; @DOXYGEN@ ../$(DOXYDIR)/Doxyfile.mgmapi); \ @@ -97,7 +97,7 @@ mgmapi.pdf: mgmapi.html # src/client ndbdoc: DUMMY mkdir -p $(OUTDIR) - cd $(top_srcdir)/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.ndb + cd $(top_srcdir)/storage/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.ndb ### # @@ -105,10 +105,10 @@ ndbdoc: DUMMY odbcdoc: DUMMY mkdir -p $(OUTDIR) - cd $(top_srcdir)/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.odbc + cd $(top_srcdir)/storage/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.odbc testdoc: DUMMY mkdir -p $(OUTDIR) - cd $(top_srcdir)/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.test + cd $(top_srcdir)/storage/ndb ; $(DOXYGEN) $(DOXYDIR)/Doxyfile.test windoze-dsp: diff --git a/storage/ndb/include/Makefile.am b/storage/ndb/include/Makefile.am index 10f297492e9..f702514d4e2 100644 --- a/storage/ndb/include/Makefile.am +++ b/storage/ndb/include/Makefile.am @@ -1,5 +1,5 @@ -include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/storage/ndb/config/common.mk.am ndbinclude_HEADERS = \ ndb_constants.h \ diff --git a/storage/ndb/src/Makefile.am b/storage/ndb/src/Makefile.am index d35790a2e43..23ba5f6f9e4 100644 --- a/storage/ndb/src/Makefile.am +++ b/storage/ndb/src/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = common mgmapi ndbapi . kernel mgmclient mgmsrv cw -include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/storage/ndb/config/common.mk.am ndblib_LTLIBRARIES = libndbclient.la @@ -20,14 +20,14 @@ libndbclient_la_LIBADD = \ 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) + $(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/storage/ndb/src/common/debugger/Makefile.am b/storage/ndb/src/common/debugger/Makefile.am index e25a11c9bee..71b8ed55561 100644 --- a/storage/ndb/src/common/debugger/Makefile.am +++ b/storage/ndb/src/common/debugger/Makefile.am @@ -4,8 +4,8 @@ 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 +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.% @@ -13,13 +13,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am 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) + $(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/storage/ndb/src/common/debugger/signaldata/Makefile.am b/storage/ndb/src/common/debugger/signaldata/Makefile.am index 9146d552568..af9d343de44 100644 --- a/storage/ndb/src/common/debugger/signaldata/Makefile.am +++ b/storage/ndb/src/common/debugger/signaldata/Makefile.am @@ -26,8 +26,8 @@ libsignaldataprint_la_SOURCES = \ 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 +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.% @@ -35,13 +35,13 @@ include $(top_srcdir)/ndb/config/type_ndbapi.mk.am 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) + $(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/storage/ndb/src/common/logger/Makefile.am b/storage/ndb/src/common/logger/Makefile.am index 0af21f9fbde..8a26d4258f1 100644 --- a/storage/ndb/src/common/logger/Makefile.am +++ b/storage/ndb/src/common/logger/Makefile.am @@ -5,21 +5,21 @@ 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 +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)/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) + $(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/storage/ndb/src/common/mgmcommon/Makefile.am b/storage/ndb/src/common/mgmcommon/Makefile.am index 104bf0b29f2..0540ef012b8 100644 --- a/storage/ndb/src/common/mgmcommon/Makefile.am +++ b/storage/ndb/src/common/mgmcommon/Makefile.am @@ -4,11 +4,11 @@ libmgmsrvcommon_la_SOURCES = \ ConfigRetriever.cpp \ IPCConfig.cpp -INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmapi -I$(top_srcdir)/ndb/src/mgmsrv +INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/mgmapi -I$(top_srcdir)/storage/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 +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.% @@ -16,13 +16,13 @@ include $(top_srcdir)/ndb/config/type_mgmapiclient.mk.am 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) + $(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/storage/ndb/src/common/portlib/Makefile.am b/storage/ndb/src/common/portlib/Makefile.am index 99138a7414e..cdefa46af50 100644 --- a/storage/ndb/src/common/portlib/Makefile.am +++ b/storage/ndb/src/common/portlib/Makefile.am @@ -8,8 +8,8 @@ libportlib_la_SOURCES = \ NdbDaemon.c NdbMem.c \ NdbConfig.c -include $(top_srcdir)/ndb/config/common.mk.am -include $(top_srcdir)/ndb/config/type_util.mk.am +include $(top_srcdir)/storage/ndb/config/common.mk.am +include $(top_srcdir)/storage/ndb/config/type_util.mk.am EXTRA_PROGRAMS = memtest PortLibTest munmaptest @@ -31,13 +31,13 @@ WIN_src = win32/NdbCondition.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) + $(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/storage/ndb/src/common/transporter/Makefile.am b/storage/ndb/src/common/transporter/Makefile.am index 4c277097a91..bf7b64af186 100644 --- a/storage/ndb/src/common/transporter/Makefile.am +++ b/storage/ndb/src/common/transporter/Makefile.am @@ -13,10 +13,10 @@ EXTRA_libtransporter_la_SOURCES = SHM_Transporter.cpp SHM_Transporter.unix.cpp S 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@ +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)/ndb/config/common.mk.am -include $(top_srcdir)/ndb/config/type_util.mk.am +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.% @@ -24,13 +24,13 @@ include $(top_srcdir)/ndb/config/type_util.mk.am 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) + $(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/storage/ndb/src/common/util/Makefile.am b/storage/ndb/src/common/util/Makefile.am index 2719d14ee92..7ba3ef941c5 100644 --- a/storage/ndb/src/common/util/Makefile.am +++ b/storage/ndb/src/common/util/Makefile.am @@ -15,7 +15,7 @@ libgeneral_la_SOURCES = \ EXTRA_PROGRAMS = testBitmask testBitmask_SOURCES = testBitmask.cpp testBitmask_LDFLAGS = @ndb_bin_am_ldflags@ \ - $(top_builddir)/ndb/src/libndbclient.la \ + $(top_builddir)/storage/ndb/src/libndbclient.la \ $(top_builddir)/dbug/libdbug.a \ $(top_builddir)/mysys/libmysys.a \ $(top_builddir)/strings/libmystrings.a @@ -28,8 +28,8 @@ 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 +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.% @@ -37,13 +37,13 @@ include $(top_srcdir)/ndb/config/type_util.mk.am 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) + $(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/storage/ndb/src/cw/cpcd/Makefile.am b/storage/ndb/src/cw/cpcd/Makefile.am index 75f557b2af7..e0b22be6b8d 100644 --- a/storage/ndb/src/cw/cpcd/Makefile.am +++ b/storage/ndb/src/cw/cpcd/Makefile.am @@ -4,13 +4,13 @@ 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)/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)/ndb/config/common.mk.am -include $(top_srcdir)/ndb/config/type_util.mk.am +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@ diff --git a/storage/ndb/src/kernel/Makefile.am b/storage/ndb/src/kernel/Makefile.am index 55d3c5a578f..6e3664f0997 100644 --- a/storage/ndb/src/kernel/Makefile.am +++ b/storage/ndb/src/kernel/Makefile.am @@ -1,12 +1,12 @@ SUBDIRS = error blocks vm -include $(top_srcdir)/ndb/config/common.mk.am +include $(top_srcdir)/storage/ndb/config/common.mk.am ndbbin_PROGRAMS = ndbd ndbd_SOURCES = main.cpp SimBlockList.cpp -include $(top_srcdir)/ndb/config/type_kernel.mk.am +include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am INCLUDES += \ -Iblocks/cmvmi \ @@ -45,14 +45,14 @@ LDADD += \ 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)/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@ @@ -62,14 +62,14 @@ LDADD += \ 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) +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/storage/ndb/src/kernel/blocks/backup/Makefile.am b/storage/ndb/src/kernel/blocks/backup/Makefile.am index c8f44f31292..8d1df032514 100644 --- a/storage/ndb/src/kernel/blocks/backup/Makefile.am +++ b/storage/ndb/src/kernel/blocks/backup/Makefile.am @@ -3,8 +3,8 @@ 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 +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.% @@ -12,13 +12,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am 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) + $(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/storage/ndb/src/kernel/blocks/cmvmi/Makefile.am b/storage/ndb/src/kernel/blocks/cmvmi/Makefile.am index dc2e12746fd..c9a105dc613 100644 --- a/storage/ndb/src/kernel/blocks/cmvmi/Makefile.am +++ b/storage/ndb/src/kernel/blocks/cmvmi/Makefile.am @@ -3,8 +3,8 @@ 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 +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.% @@ -12,13 +12,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am 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) + $(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/storage/ndb/src/kernel/blocks/dbacc/Makefile.am b/storage/ndb/src/kernel/blocks/dbacc/Makefile.am index ca1b1efac37..75a457da5bb 100644 --- a/storage/ndb/src/kernel/blocks/dbacc/Makefile.am +++ b/storage/ndb/src/kernel/blocks/dbacc/Makefile.am @@ -3,10 +3,10 @@ noinst_LIBRARIES = libdbacc.a libdbacc_a_SOURCES = DbaccInit.cpp DbaccMain.cpp -INCLUDES_LOC = -I$(top_srcdir)/ndb/src/kernel/blocks/dbtup +INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/kernel/blocks/dbtup -include $(top_srcdir)/ndb/config/common.mk.am -include $(top_srcdir)/ndb/config/type_kernel.mk.am +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.% @@ -14,13 +14,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am 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) + $(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/storage/ndb/src/kernel/blocks/dbdict/Makefile.am b/storage/ndb/src/kernel/blocks/dbdict/Makefile.am index 9a0d68f8148..0c22e06b855 100644 --- a/storage/ndb/src/kernel/blocks/dbdict/Makefile.am +++ b/storage/ndb/src/kernel/blocks/dbdict/Makefile.am @@ -4,8 +4,8 @@ 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 +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.% @@ -13,13 +13,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am 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) + $(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/storage/ndb/src/kernel/blocks/dbdih/Makefile.am b/storage/ndb/src/kernel/blocks/dbdih/Makefile.am index d6ad380b806..0b35884a586 100644 --- a/storage/ndb/src/kernel/blocks/dbdih/Makefile.am +++ b/storage/ndb/src/kernel/blocks/dbdih/Makefile.am @@ -2,8 +2,8 @@ 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 +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.% @@ -11,13 +11,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am 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) + $(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/storage/ndb/src/kernel/blocks/dblqh/Makefile.am b/storage/ndb/src/kernel/blocks/dblqh/Makefile.am index 854860b269c..4807a8ec5d0 100644 --- a/storage/ndb/src/kernel/blocks/dblqh/Makefile.am +++ b/storage/ndb/src/kernel/blocks/dblqh/Makefile.am @@ -4,8 +4,8 @@ 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 +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.% @@ -13,13 +13,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am 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) + $(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/storage/ndb/src/kernel/blocks/dbtc/Makefile.am b/storage/ndb/src/kernel/blocks/dbtc/Makefile.am index 98ee2639bac..4b3b102d8ac 100644 --- a/storage/ndb/src/kernel/blocks/dbtc/Makefile.am +++ b/storage/ndb/src/kernel/blocks/dbtc/Makefile.am @@ -2,8 +2,8 @@ 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 +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.% @@ -11,13 +11,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am 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) + $(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/storage/ndb/src/kernel/blocks/dbtup/Makefile.am b/storage/ndb/src/kernel/blocks/dbtup/Makefile.am index e51410e6be3..4fc83476733 100644 --- a/storage/ndb/src/kernel/blocks/dbtup/Makefile.am +++ b/storage/ndb/src/kernel/blocks/dbtup/Makefile.am @@ -20,8 +20,8 @@ libdbtup_a_SOURCES = \ DbtupIndex.cpp \ DbtupDebug.cpp -include $(top_srcdir)/ndb/config/common.mk.am -include $(top_srcdir)/ndb/config/type_kernel.mk.am +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.% @@ -29,13 +29,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am 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) + $(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/storage/ndb/src/kernel/blocks/dbtux/Makefile.am b/storage/ndb/src/kernel/blocks/dbtux/Makefile.am index b5951e8ed37..12d450e8632 100644 --- a/storage/ndb/src/kernel/blocks/dbtux/Makefile.am +++ b/storage/ndb/src/kernel/blocks/dbtux/Makefile.am @@ -11,10 +11,10 @@ libdbtux_a_SOURCES = \ DbtuxCmp.cpp \ DbtuxDebug.cpp -INCLUDES_LOC = -I$(top_srcdir)/ndb/src/kernel/blocks/dbtup +INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/kernel/blocks/dbtup -include $(top_srcdir)/ndb/config/common.mk.am -include $(top_srcdir)/ndb/config/type_kernel.mk.am +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.% @@ -22,13 +22,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am 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) + $(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/storage/ndb/src/kernel/blocks/dbutil/Makefile.am b/storage/ndb/src/kernel/blocks/dbutil/Makefile.am index 925356c2f76..4a0b180283e 100644 --- a/storage/ndb/src/kernel/blocks/dbutil/Makefile.am +++ b/storage/ndb/src/kernel/blocks/dbutil/Makefile.am @@ -2,8 +2,8 @@ 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 +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.% @@ -11,13 +11,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am 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) + $(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/storage/ndb/src/kernel/blocks/grep/Makefile.am b/storage/ndb/src/kernel/blocks/grep/Makefile.am index 6d2b422784b..92d75d002a5 100644 --- a/storage/ndb/src/kernel/blocks/grep/Makefile.am +++ b/storage/ndb/src/kernel/blocks/grep/Makefile.am @@ -2,8 +2,8 @@ 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 +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.% @@ -11,13 +11,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am 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) + $(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/storage/ndb/src/kernel/blocks/ndbcntr/Makefile.am b/storage/ndb/src/kernel/blocks/ndbcntr/Makefile.am index 3f24675b2b3..7bdcf046a19 100644 --- a/storage/ndb/src/kernel/blocks/ndbcntr/Makefile.am +++ b/storage/ndb/src/kernel/blocks/ndbcntr/Makefile.am @@ -5,8 +5,8 @@ libndbcntr_a_SOURCES = \ NdbcntrSysTable.cpp \ NdbcntrMain.cpp -include $(top_srcdir)/ndb/config/common.mk.am -include $(top_srcdir)/ndb/config/type_kernel.mk.am +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.% @@ -14,13 +14,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am 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) + $(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/storage/ndb/src/kernel/blocks/ndbfs/Makefile.am b/storage/ndb/src/kernel/blocks/ndbfs/Makefile.am index a22386f8612..b4233720003 100644 --- a/storage/ndb/src/kernel/blocks/ndbfs/Makefile.am +++ b/storage/ndb/src/kernel/blocks/ndbfs/Makefile.am @@ -6,8 +6,8 @@ libndbfs_a_SOURCES = \ Filename.cpp \ CircularIndex.cpp -include $(top_srcdir)/ndb/config/common.mk.am -include $(top_srcdir)/ndb/config/type_kernel.mk.am +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.% @@ -15,13 +15,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am 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) + $(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/storage/ndb/src/kernel/blocks/qmgr/Makefile.am b/storage/ndb/src/kernel/blocks/qmgr/Makefile.am index 278af2a7865..577a31348ad 100644 --- a/storage/ndb/src/kernel/blocks/qmgr/Makefile.am +++ b/storage/ndb/src/kernel/blocks/qmgr/Makefile.am @@ -4,8 +4,8 @@ libqmgr_a_SOURCES = \ QmgrInit.cpp \ QmgrMain.cpp -include $(top_srcdir)/ndb/config/common.mk.am -include $(top_srcdir)/ndb/config/type_kernel.mk.am +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.% @@ -13,13 +13,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am 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) + $(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/storage/ndb/src/kernel/blocks/suma/Makefile.am b/storage/ndb/src/kernel/blocks/suma/Makefile.am index 5a74dbb74eb..6fd7033e068 100644 --- a/storage/ndb/src/kernel/blocks/suma/Makefile.am +++ b/storage/ndb/src/kernel/blocks/suma/Makefile.am @@ -2,8 +2,8 @@ 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 +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.% @@ -11,13 +11,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am 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) + $(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/storage/ndb/src/kernel/blocks/trix/Makefile.am b/storage/ndb/src/kernel/blocks/trix/Makefile.am index 343063a6283..886a9dc60f0 100644 --- a/storage/ndb/src/kernel/blocks/trix/Makefile.am +++ b/storage/ndb/src/kernel/blocks/trix/Makefile.am @@ -2,8 +2,8 @@ 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 +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.% @@ -11,13 +11,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am 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) + $(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/storage/ndb/src/kernel/error/Makefile.am b/storage/ndb/src/kernel/error/Makefile.am index 54f3de2d76d..b6e3b7962fa 100644 --- a/storage/ndb/src/kernel/error/Makefile.am +++ b/storage/ndb/src/kernel/error/Makefile.am @@ -4,8 +4,8 @@ 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 +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.% @@ -13,13 +13,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am 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) + $(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/storage/ndb/src/kernel/vm/Makefile.am b/storage/ndb/src/kernel/vm/Makefile.am index 0dce9285ae3..01857b01d80 100644 --- a/storage/ndb/src/kernel/vm/Makefile.am +++ b/storage/ndb/src/kernel/vm/Makefile.am @@ -20,10 +20,10 @@ libkernel_a_SOURCES = \ MetaData.cpp \ Mutex.cpp SafeCounter.cpp -INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmapi +INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/mgmapi -include $(top_srcdir)/ndb/config/common.mk.am -include $(top_srcdir)/ndb/config/type_kernel.mk.am +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.% @@ -31,13 +31,13 @@ include $(top_srcdir)/ndb/config/type_kernel.mk.am 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) + $(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/storage/ndb/src/mgmapi/Makefile.am b/storage/ndb/src/mgmapi/Makefile.am index db730bf8c89..21966fd69de 100644 --- a/storage/ndb/src/mgmapi/Makefile.am +++ b/storage/ndb/src/mgmapi/Makefile.am @@ -3,12 +3,12 @@ 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 +INCLUDES_LOC = -I$(top_srcdir)/storage/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 +include $(top_srcdir)/storage/ndb/config/common.mk.am +include $(top_srcdir)/storage/ndb/config/type_util.mk.am #ndbtest_PROGRAMS = ndb_test_mgmapi @@ -18,13 +18,13 @@ include $(top_srcdir)/ndb/config/type_util.mk.am 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) + $(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/storage/ndb/src/mgmclient/Makefile.am b/storage/ndb/src/mgmclient/Makefile.am index c63e8d1bff8..217f3e993a7 100644 --- a/storage/ndb/src/mgmclient/Makefile.am +++ b/storage/ndb/src/mgmclient/Makefile.am @@ -12,11 +12,11 @@ libndbmgmclient_la_LIBADD = ../mgmapi/libmgmapi.la \ ndb_mgm_SOURCES = main.cpp -include $(top_srcdir)/ndb/config/common.mk.am -include $(top_srcdir)/ndb/config/type_ndbapi.mk.am +include $(top_srcdir)/storage/ndb/config/common.mk.am +include $(top_srcdir)/storage/ndb/config/type_ndbapi.mk.am -INCLUDES += -I$(top_srcdir)/ndb/include/mgmapi \ - -I$(top_srcdir)/ndb/src/common/mgmcommon +INCLUDES += -I$(top_srcdir)/storage/ndb/include/mgmapi \ + -I$(top_srcdir)/storage/ndb/src/common/mgmcommon LDADD_LOC = $(noinst_LTLIBRARIES) \ ../common/portlib/libportlib.la \ @@ -34,25 +34,25 @@ ndb_mgm_LDFLAGS = @ndb_bin_am_ldflags@ 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) + $(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)/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 + $(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/storage/ndb/src/mgmsrv/Makefile.am b/storage/ndb/src/mgmsrv/Makefile.am index 7fd3fa66b43..3ee39767834 100644 --- a/storage/ndb/src/mgmsrv/Makefile.am +++ b/storage/ndb/src/mgmsrv/Makefile.am @@ -18,13 +18,13 @@ ndb_mgmd_SOURCES = \ 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 +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)/ndb/src/mgmclient/CommandInterpreter.o \ - $(top_builddir)/ndb/src/libndbclient.la \ +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 \ @@ -37,8 +37,8 @@ DEFS_LOC = -DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \ -DMYSQLCLUSTERDIR="\"$(MYSQLCLUSTERdir)\"" -include $(top_srcdir)/ndb/config/common.mk.am -include $(top_srcdir)/ndb/config/type_ndbapi.mk.am +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@ @@ -48,13 +48,13 @@ ndb_mgmd_LDFLAGS = @ndb_bin_am_ldflags@ 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) + $(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/storage/ndb/src/ndbapi/Makefile.am b/storage/ndb/src/ndbapi/Makefile.am index b734e058b87..0656aad7ed3 100644 --- a/storage/ndb/src/ndbapi/Makefile.am +++ b/storage/ndb/src/ndbapi/Makefile.am @@ -36,13 +36,13 @@ libndbapi_la_SOURCES = \ ndb_cluster_connection.cpp \ NdbBlob.cpp -INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmapi +INCLUDES_LOC = -I$(top_srcdir)/storage/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 +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.% @@ -50,13 +50,13 @@ include $(top_srcdir)/ndb/config/type_ndbapi.mk.am 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) + $(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/storage/ndb/test/ndbapi/Makefile.am b/storage/ndb/test/ndbapi/Makefile.am index 1d2dfb3f948..f096a7c74e9 100644 --- a/storage/ndb/test/ndbapi/Makefile.am +++ b/storage/ndb/test/ndbapi/Makefile.am @@ -79,10 +79,10 @@ DbCreate_SOURCES = bench/mainPopulate.cpp bench/dbPopulate.cpp bench/userInterfa 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 +INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/include/kernel -include $(top_srcdir)/ndb/config/common.mk.am -include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am +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 @@ -99,61 +99,61 @@ 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) + $(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)/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) + $(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)/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) + $(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)/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) + $(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)/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) + $(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/storage/ndb/test/ndbapi/bank/Makefile.am b/storage/ndb/test/ndbapi/bank/Makefile.am index d4f82a7f9c4..d269ddc047a 100644 --- a/storage/ndb/test/ndbapi/bank/Makefile.am +++ b/storage/ndb/test/ndbapi/bank/Makefile.am @@ -15,8 +15,8 @@ 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 +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.% diff --git a/storage/ndb/test/run-test/Makefile.am b/storage/ndb/test/run-test/Makefile.am index 1067328dcc3..63d2933b6c6 100644 --- a/storage/ndb/test/run-test/Makefile.am +++ b/storage/ndb/test/run-test/Makefile.am @@ -1,9 +1,9 @@ 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 +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 @@ -11,9 +11,9 @@ 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 \ +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@ diff --git a/storage/ndb/test/src/Makefile.am b/storage/ndb/test/src/Makefile.am index 289633b060a..d141a356ac0 100644 --- a/storage/ndb/test/src/Makefile.am +++ b/storage/ndb/test/src/Makefile.am @@ -12,10 +12,10 @@ libNDBT_a_SOURCES = \ 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 +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)/ndb/config/common.mk.am -include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am +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.% @@ -23,13 +23,13 @@ include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am 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 + $(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/storage/ndb/test/tools/Makefile.am b/storage/ndb/test/tools/Makefile.am index 873136e254d..a7ab7669052 100644 --- a/storage/ndb/test/tools/Makefile.am +++ b/storage/ndb/test/tools/Makefile.am @@ -19,8 +19,8 @@ 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 +include $(top_srcdir)/storage/ndb/config/common.mk.am +include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am ndb_cpcc_LDADD = $(LDADD) diff --git a/storage/ndb/tools/Makefile.am b/storage/ndb/tools/Makefile.am index c350fb0a141..958f28bae02 100644 --- a/storage/ndb/tools/Makefile.am +++ b/storage/ndb/tools/Makefile.am @@ -32,8 +32,8 @@ ndb_restore_SOURCES = restore/restore_main.cpp \ restore/consumer_printer.cpp \ restore/Restore.cpp -include $(top_srcdir)/ndb/config/common.mk.am -include $(top_srcdir)/ndb/config/type_ndbapitools.mk.am +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@ @@ -60,97 +60,97 @@ windoze-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) + $(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)/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) + $(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)/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) + $(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)/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) + $(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)/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) + $(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)/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) + $(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)/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) + $(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)/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) + $(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) From 72955bd0e22719a5a82a0b3e0c0e9beb7ca8c707 Mon Sep 17 00:00:00 2001 From: "brian@zim.(none)" <> Date: Wed, 27 Apr 2005 01:32:03 -0700 Subject: [PATCH 22/51] Missed a file for storage change (thanks go to Guilhem who noticed it) --- storage/Makefile.am | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 storage/Makefile.am diff --git a/storage/Makefile.am b/storage/Makefile.am new file mode 100644 index 00000000000..7da3c9d50c3 --- /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 = + +# Don't update the files from bitkeeper +%::SCCS/s.% From 0998abc83125c36142d84da47438a9a789bd40c5 Mon Sep 17 00:00:00 2001 From: "ingo@mysql.com" <> Date: Wed, 27 Apr 2005 12:40:37 +0200 Subject: [PATCH 23/51] Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock Added protection against global read lock while creating and initializing a delayed insert handler. Allowed to ignore a global read lock when locking the table inside the delayed insert handler. Added some minor improvements. --- sql/lock.cc | 51 ++++++++++++++++++++++++++++++-- sql/mysql_priv.h | 5 +++- sql/sql_insert.cc | 75 ++++++++++++++++++++++++++++++++++------------- 3 files changed, 108 insertions(+), 23 deletions(-) diff --git a/sql/lock.cc b/sql/lock.cc index c7e6ebfda83..951b0e2ff6a 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -79,7 +79,8 @@ static int unlock_external(THD *thd, TABLE **table,uint count); static void print_lock_error(int error); -MYSQL_LOCK *mysql_lock_tables(THD *thd,TABLE **tables,uint count) +MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **tables, uint count, + bool ignore_global_read_lock) { MYSQL_LOCK *sql_lock; TABLE *write_lock_used; @@ -90,7 +91,7 @@ MYSQL_LOCK *mysql_lock_tables(THD *thd,TABLE **tables,uint count) if (!(sql_lock = get_lock_data(thd,tables,count, 0,&write_lock_used))) break; - if (global_read_lock && write_lock_used) + if (global_read_lock && write_lock_used && ! ignore_global_read_lock) { /* Someone has issued LOCK ALL TABLES FOR READ and we want a write lock @@ -865,3 +866,49 @@ void make_global_read_lock_block_commit(THD *thd) pthread_mutex_unlock(&LOCK_open); thd->global_read_lock= MADE_GLOBAL_READ_LOCK_BLOCK_COMMIT; } + + +/* + Set protection against global read lock. + + SYNOPSIS + set_protect_against_global_read_lock() + void + + RETURN + FALSE OK, no global read lock exists. + TRUE Error, global read lock exists already. +*/ + +my_bool set_protect_against_global_read_lock(void) +{ + my_bool global_read_lock_exists; + + pthread_mutex_lock(&LOCK_open); + if (! (global_read_lock_exists= test(global_read_lock))) + protect_against_global_read_lock++; + pthread_mutex_unlock(&LOCK_open); + return global_read_lock_exists; +} + + +/* + Unset protection against global read lock. + + SYNOPSIS + unset_protect_against_global_read_lock() + void + + RETURN + void +*/ + +void unset_protect_against_global_read_lock(void) +{ + pthread_mutex_lock(&LOCK_open); + protect_against_global_read_lock--; + pthread_mutex_unlock(&LOCK_open); + pthread_cond_broadcast(&COND_refresh); +} + + diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 6281b64bc5e..6a25536b3f1 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -766,7 +766,8 @@ extern pthread_t signal_thread; extern struct st_VioSSLAcceptorFd * ssl_acceptor_fd; #endif /* HAVE_OPENSSL */ -MYSQL_LOCK *mysql_lock_tables(THD *thd,TABLE **table,uint count); +MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **table, uint count, + bool ignore_global_read_lock= FALSE); void mysql_unlock_tables(THD *thd, MYSQL_LOCK *sql_lock); void mysql_unlock_read_tables(THD *thd, MYSQL_LOCK *sql_lock); void mysql_unlock_some_tables(THD *thd, TABLE **table,uint count); @@ -779,6 +780,8 @@ void unlock_global_read_lock(THD *thd); bool wait_if_global_read_lock(THD *thd, bool abort_on_refresh, bool is_not_commit); void start_waiting_global_read_lock(THD *thd); void make_global_read_lock_block_commit(THD *thd); +my_bool set_protect_against_global_read_lock(void); +void unset_protect_against_global_read_lock(void); /* Lock based on name */ int lock_and_wait_for_table_name(THD *thd, TABLE_LIST *table_list); diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 0c62a9af7ba..c6b7b1d6c15 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -647,27 +647,42 @@ static TABLE *delayed_get_table(THD *thd,TABLE_LIST *table_list) { int error; delayed_insert *tmp; + TABLE *table; DBUG_ENTER("delayed_get_table"); if (!table_list->db) table_list->db=thd->db; - /* no match; create a new thread to handle the table */ + /* Find the thread which handles this table. */ if (!(tmp=find_handler(thd,table_list))) { - /* Don't create more than max_insert_delayed_threads */ + /* + No match. Create a new thread to handle the table, but + no more than max_insert_delayed_threads. + */ if (delayed_insert_threads >= thd->variables.max_insert_delayed_threads) DBUG_RETURN(0); thd->proc_info="Creating delayed handler"; pthread_mutex_lock(&LOCK_delayed_create); - if (!(tmp=find_handler(thd,table_list))) // Was just created + /* + The first search above was done without LOCK_delayed_create. + Another thread might have created the handler in between. Search again. + */ + if (! (tmp= find_handler(thd, table_list))) { + /* + Avoid that a global read lock steps in while we are creating the + new thread. It would block trying to open the table. Hence, the + DI thread and this thread would wait until after the global + readlock is gone. If the read lock exists already, we leave with + no table and then switch to non-delayed insert. + */ + if (set_protect_against_global_read_lock()) + goto err; if (!(tmp=new delayed_insert())) { - thd->fatal_error=1; my_error(ER_OUTOFMEMORY,MYF(0),sizeof(delayed_insert)); - pthread_mutex_unlock(&LOCK_delayed_create); - DBUG_RETURN(0); + goto err1; } pthread_mutex_lock(&LOCK_thread_count); thread_count++; @@ -676,10 +691,8 @@ static TABLE *delayed_get_table(THD *thd,TABLE_LIST *table_list) !(tmp->thd.query=my_strdup(table_list->real_name,MYF(MY_WME)))) { delete tmp; - thd->fatal_error=1; my_error(ER_OUT_OF_RESOURCES,MYF(0)); - pthread_mutex_unlock(&LOCK_delayed_create); - DBUG_RETURN(0); + goto err1; } tmp->table_list= *table_list; // Needed to open table tmp->table_list.db= tmp->thd.db; @@ -695,10 +708,8 @@ static TABLE *delayed_get_table(THD *thd,TABLE_LIST *table_list) pthread_mutex_unlock(&tmp->mutex); tmp->unlock(); delete tmp; - thd->fatal_error=1; - pthread_mutex_unlock(&LOCK_delayed_create); net_printf(&thd->net,ER_CANT_CREATE_THREAD,error); - DBUG_RETURN(0); + goto err1; } /* Wait until table is open */ @@ -708,6 +719,7 @@ static TABLE *delayed_get_table(THD *thd,TABLE_LIST *table_list) pthread_cond_wait(&tmp->cond_client,&tmp->mutex); } pthread_mutex_unlock(&tmp->mutex); + unset_protect_against_global_read_lock(); thd->proc_info="got old table"; if (tmp->thd.killed) { @@ -719,28 +731,34 @@ static TABLE *delayed_get_table(THD *thd,TABLE_LIST *table_list) thd->net.last_errno=tmp->thd.net.last_errno; } tmp->unlock(); - pthread_mutex_unlock(&LOCK_delayed_create); - DBUG_RETURN(0); // Continue with normal insert + goto err; } if (thd->killed) { tmp->unlock(); - pthread_mutex_unlock(&LOCK_delayed_create); - DBUG_RETURN(0); + goto err; } } pthread_mutex_unlock(&LOCK_delayed_create); } pthread_mutex_lock(&tmp->mutex); - TABLE *table=tmp->get_local_table(thd); + table= tmp->get_local_table(thd); pthread_mutex_unlock(&tmp->mutex); - tmp->unlock(); if (table) thd->di=tmp; else if (tmp->thd.fatal_error) thd->fatal_error=1; + /* Unlock the delayed insert object after its last access. */ + tmp->unlock(); DBUG_RETURN((table_list->table=table)); + + err1: + thd->fatal_error= 1; + unset_protect_against_global_read_lock(); + err: + pthread_mutex_unlock(&LOCK_delayed_create); + DBUG_RETURN(0); // Continue with normal insert } @@ -955,6 +973,14 @@ extern "C" pthread_handler_decl(handle_delayed_insert,arg) thd->killed=abort_loop; pthread_mutex_unlock(&LOCK_thread_count); + /* + Wait until the client runs into pthread_cond_wait(), + where we free it after the table is opened and di linked in the list. + If we did not wait here, the client might detect the opened table + before it is linked to the list. It would release LOCK_delayed_create + and allow another thread to create another handler for the same table, + since it does not find one in the list. + */ pthread_mutex_lock(&di->mutex); #if !defined( __WIN__) && !defined(OS2) /* Win32 calls this in pthread_create */ if (my_thread_init()) @@ -1069,8 +1095,17 @@ extern "C" pthread_handler_decl(handle_delayed_insert,arg) if (di->tables_in_use && ! thd->lock) { - /* request for new delayed insert */ - if (!(thd->lock=mysql_lock_tables(thd,&di->table,1))) + /* + Request for new delayed insert. + Lock the table, but avoid to be blocked by a global read lock. + If we got here while a global read lock exists, then one or more + inserts started before the lock was requested. These are allowed + to complete their work before the server returns control to the + client which requested the global read lock. The delayed insert + handler will close the table and finish when the outstanding + inserts are done. + */ + if (! (thd->lock= mysql_lock_tables(thd, &di->table, 1, TRUE))) { di->dead=thd->killed=1; // Fatal error } From e18a155fd67913e7c34628d4ce235ba3f1d504fc Mon Sep 17 00:00:00 2001 From: "monty@mysql.com" <> Date: Wed, 27 Apr 2005 14:31:04 +0300 Subject: [PATCH 24/51] Fixed core dump bug when hot link list in key cache was empty. Bug #10167 --- mysql-test/r/drop.result | 4 +- mysys/mf_keycache.c | 11 +- tests/index_corrupt.pl | 212 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 221 insertions(+), 6 deletions(-) create mode 100755 tests/index_corrupt.pl diff --git a/mysql-test/r/drop.result b/mysql-test/r/drop.result index 40dda86b729..b07cf16aa64 100644 --- a/mysql-test/r/drop.result +++ b/mysql-test/r/drop.result @@ -30,13 +30,13 @@ table7, table8, table9, table10, table11, table12, table13, table14, table15, table16, table17, table18, table19, table20, table21, table22, table23, table24, table25, table26, table27, table28; -ERROR 42S02: Unknown table 'table1,table2,table3,table4,table5,table6,table7,table8,table9,table10,table11,table12,table13,table14,table15,table16,table17,table18,table19,table20,table21,table22,table23,table' +ERROR 42S02: Unknown table 'table1,table2,table3,table4,table5,table6,table7,table8,table9,table10,table11,table12,table13,table' drop table table1, table2, table3, table4, table5, table6, table7, table8, table9, table10, table11, table12, table13, table14, table15, table16, table17, table18, table19, table20, table21, table22, table23, table24, table25, table26, table27, table28, table29, table30; -ERROR 42S02: Unknown table 'table1,table2,table3,table4,table5,table6,table7,table8,table9,table10,table11,table12,table13,table14,table15,table16,table17,table18,table19,table20,table21,table22,table23,table' +ERROR 42S02: Unknown table 'table1,table2,table3,table4,table5,table6,table7,table8,table9,table10,table11,table12,table13,table' use test; drop database mysqltest; flush tables with read lock; diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index 9feaf8dcd57..cee1b7eb4e9 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -1025,8 +1025,8 @@ static void reg_requests(KEY_CACHE *keycache, BLOCK_LINK *block, int count) for a too long time (this time is determined by parameter age_threshold). */ -static inline void unreg_request(KEY_CACHE *keycache, - BLOCK_LINK *block, int at_end) +static void unreg_request(KEY_CACHE *keycache, + BLOCK_LINK *block, int at_end) { if (! --block->requests) { @@ -1045,10 +1045,13 @@ static inline void unreg_request(KEY_CACHE *keycache, } link_block(keycache, block, hot, (my_bool)at_end); block->last_hit_time= keycache->keycache_time; - if (++keycache->keycache_time - keycache->used_ins->last_hit_time > + keycache->keycache_time++; + + block= keycache->used_ins; + /* Check if we should link a hot block to the warm block */ + if (block && keycache->keycache_time - block->last_hit_time > keycache->age_threshold) { - block= keycache->used_ins; unlink_block(keycache, block); link_block(keycache, block, 0, 0); if (block->temperature != BLOCK_WARM) diff --git a/tests/index_corrupt.pl b/tests/index_corrupt.pl new file mode 100755 index 00000000000..19bf54f5d11 --- /dev/null +++ b/tests/index_corrupt.pl @@ -0,0 +1,212 @@ +#!/usr/bin/perl -w +# +# This is a test for a key cache bug (bug #10167) +# To expose the bug mysqld should be started with --key-buffer-size=64K +# + +$opt_loop_count=100000; # Change this to make test harder/easier + +##################### Standard benchmark inits ############################## + +use DBI; +use Getopt::Long; +use Benchmark; + +package main; + +$opt_skip_create=$opt_skip_in=$opt_verbose=$opt_fast_insert= + $opt_lock_tables=$opt_debug=$opt_skip_delete=$opt_fast=$opt_force=0; +$opt_host=$opt_user=$opt_password=""; $opt_db="test"; + +GetOptions("host=s","db=s","loop-count=i","skip-create","skip-in", + "skip-delete","verbose","fast-insert","lock-tables","debug","fast", + "force","user=s","password=s") || die "Aborted"; +$opt_verbose=$opt_debug=$opt_lock_tables=$opt_fast_insert=$opt_fast=$opt_skip_in=$opt_force=undef; # Ignore warnings from these + +$firsttable = "bench_f1"; +$secondtable = "bench_f2"; +$kill_file= "/tmp/mysqltest_index_corrupt.$$"; + +#### +#### Start timeing and start test +#### + +$start_time=new Benchmark; +if (!$opt_skip_create) +{ + $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $opt_user, $opt_password, + { PrintError => 0}) || die $DBI::errstr; + $dbh->do("drop table if exists $firsttable, $secondtable"); + + print "Creating tables in $opt_db\n"; + $dbh->do("create table $firsttable ( +c_pollid INTEGER NOT NULL, +c_time BIGINT NOT NULL, +c_data DOUBLE NOT NULL, +c_error INTEGER NOT NULL, +c_warning INTEGER NOT NULL, +c_okay INTEGER NOT NULL, +c_unknown INTEGER NOT NULL, +c_rolled_up BIT NOT NULL, +INDEX t_mgmt_hist_r_i1 (c_pollid), +INDEX t_mgmt_hist_r_i2 (c_time), +INDEX t_mgmt_hist_r_i3 (c_rolled_up))") or die $DBI::errstr; + + $dbh->do("create table $secondtable ( +c_pollid INTEGER NOT NULL, +c_min_time BIGINT NOT NULL, +c_max_time BIGINT NOT NULL, +c_min_data DOUBLE NOT NULL, +c_max_data DOUBLE NOT NULL, +c_avg_data DOUBLE NOT NULL, +c_error INTEGER NOT NULL, +c_warning INTEGER NOT NULL, +c_okay INTEGER NOT NULL, +c_unknown INTEGER NOT NULL, +c_rolled_up BIT NOT NULL, +INDEX t_mgmt_hist_d_i1 (c_pollid), +INDEX t_mgmt_hist_d_i2 (c_min_time), +INDEX t_mgmt_hist_d_i3 (c_max_time), +INDEX t_mgmt_hist_d_i4 (c_rolled_up))") or die $DBI::errstr; + + + $dbh->disconnect; $dbh=0; # Close handler +} +$|= 1; # Autoflush + +#### +#### Start the tests +#### + +print "Running tests\n"; +insert_in_bench() if (($pid=fork()) == 0); $work{$pid}="insert"; +select_from_bench() if (($pid=fork()) == 0); $work{$pid}="insert-select; +delete_from_bench() if (($pid=fork()) == 0); $work{$pid}="delete"; + +$errors=0; +while (($pid=wait()) != -1) +{ + $ret=$?/256; + print "thread '" . $work{$pid} . "' finished with exit code $ret\n"; + $errors++ if ($ret != 0); +} + +if (!$opt_skip_delete && !$errors) +{ + $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $opt_user, $opt_password, + { PrintError => 0}) || die $DBI::errstr; + $dbh->do("drop table $firsttable, $secondtable"); +} +print ($errors ? "Test failed\n" :"Test ok\n"); + +$end_time=new Benchmark; +print "Total time: " . + timestr(timediff($end_time, $start_time),"noc") . "\n"; + +unlink $kill_file; + +exit(0); + +# +# Insert records in the two tables +# + +sub insert_in_bench +{ + my ($dbh,$rows,$found,$i); + + $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $opt_user, $opt_password, + { PrintError => 0}) || die $DBI::errstr; + for ($rows= 1; $rows <= $opt_loop_count ; $rows++) + { + $c_pollid = sprintf("%d",rand 1000); + $c_time = sprintf("%d",rand 100000); + $c_data = rand 1000000; + $test = rand 1; + $c_error=0; + $c_warning=0; + $c_okay=0; + $c_unknown=0; + if ($test < .8) { + $c_okay=1; + } elsif ($test <.9) { + $c_error=1; + } elsif ($test <.95) { + $c_warning=1; + } else { + $c_unknown=1; + } + $statement = "INSERT INTO $firsttable (c_pollid, c_time, c_data, c_error +, c_warning, c_okay, c_unknown, c_rolled_up) ". + "VALUES ($c_pollid,$c_time,$c_data,$c_error,$c_warning,$c_okay,$c_unknown,0)"; + $cursor = $dbh->prepare($statement); + $cursor->execute(); + $cursor->finish(); + } + + $dbh->disconnect; $dbh=0; + print "insert_in_bench: Inserted $rows rows\n"; + + # Kill other threads + open(KILLFILE, "> $kill_file"); + close(KILLFILE); + + exit(0); +} + + +sub select_from_bench +{ + my ($dbh,$rows,$cursor); + + $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $opt_user, $opt_password, + { PrintError => 0}) || die $DBI::errstr; + for ($rows= 1; $rows < $opt_loop_count ; $rows++) + { + $t_value = rand 100000; + $t_value2 = $t_value+10000; + $statement = "INSERT INTO $secondtable (c_pollid, c_min_time, c_max_time +, c_min_data, c_max_data, c_avg_data, c_error, c_warning, c_okay, c_unknown, c_rolled_up) SELECT c_pollid, MIN(c_time), MAX(c_time), MIN(c_data), MAX(c_data), AVG(c_data), SUM(c_error), SUM(c_warning), SUM(c_okay), SUM(c_unknown), 0 FROM $firsttable WHERE (c_time>=$t_value) AND (c_time<$t_value2) AND (c_rolled_up=0) GROUP BY c_pollid"; + $cursor = $dbh->prepare($statement); + $cursor->execute(); + $cursor->finish(); + sleep 1; + if (-e $kill_file) + { + last; + } + } + print "select_from_bench: insert-select executed $rows times\n"; + exit(0); +} + + +sub delete_from_bench +{ + my ($dbh,$row, $t_value, $t2_value, $statement, $cursor); + + $dbh = DBI->connect("DBI:mysql:$opt_db:$opt_host", + $opt_user, $opt_password, + { PrintError => 0}) || die $DBI::errstr; + + for ($rows= 1; $rows < $opt_loop_count ; $rows++) + { + $t_value = rand 50000; + $t2_value = $t_value + 50001; + $statement = "DELETE FROM $firsttable WHERE (c_time>$t_value) AND (c_time<$t2_value)"; + $cursor = $dbh->prepare($statement); + $cursor->execute(); + $cursor->finish(); + sleep 10; + if (-e $kill_file) + { + last; + } + } + print "delete: delete executed $rows times\n"; + exit(0); +} From 69b813a901f2031fdd7fd6dfb7661c432e91934e Mon Sep 17 00:00:00 2001 From: "monty@mysql.com" <> Date: Wed, 27 Apr 2005 17:16:08 +0300 Subject: [PATCH 25/51] mysqladmin extended-status now displays global status Fixed problem with NULL in VARCHAR/BLOB keys for multi-part keys where VARCHAR/BLOB is first part --- client/mysqladmin.cc | 2 +- myisam/mi_key.c | 3 +++ sql/handler.cc | 7 ++++--- tests/mysql_client_test.c | 7 ++++--- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc index 24fe14b6675..c6274e499ab 100644 --- a/client/mysqladmin.cc +++ b/client/mysqladmin.cc @@ -727,7 +727,7 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv) void (*func) (MYSQL_RES*, MYSQL_ROW, uint); new_line = 1; - if (mysql_query(mysql, "show status") || + if (mysql_query(mysql, "show /*!50002 GLOBAL */ status") || !(res = mysql_store_result(mysql))) { my_printf_error(0, "unable to show status; error: '%s'", MYF(ME_BELL), diff --git a/myisam/mi_key.c b/myisam/mi_key.c index ab5ddd3a378..d7d10e116aa 100644 --- a/myisam/mi_key.c +++ b/myisam/mi_key.c @@ -242,7 +242,10 @@ uint _mi_pack_key(register MI_INFO *info, uint keynr, uchar *key, uchar *old, { k_length-=length; if (keyseg->flag & (HA_VAR_LENGTH_PART | HA_BLOB_PART)) + { k_length-=2; /* Skip length */ + old+= 2; + } continue; /* Found NULL */ } } diff --git a/sql/handler.cc b/sql/handler.cc index dc63b4b038f..50f82eb5753 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -175,9 +175,10 @@ enum db_type ha_checktype(enum db_type database_type) return ((enum db_type) thd->variables.table_type != DB_TYPE_UNKNOWN ? (enum db_type) thd->variables.table_type : - (enum db_type) global_system_variables.table_type != - DB_TYPE_UNKNOWN ? - (enum db_type) global_system_variables.table_type : DB_TYPE_MYISAM); + ((enum db_type) global_system_variables.table_type != + DB_TYPE_UNKNOWN ? + (enum db_type) global_system_variables.table_type : DB_TYPE_MYISAM) + ); } /* ha_checktype */ diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 2dd5fda6f05..ae000a4273d 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -7046,6 +7046,7 @@ static void test_set_option() bug #89 (reported by mark@mysql.com) */ +#ifndef EMBEDDED_LIBRARY static void test_prepare_grant() { int rc; @@ -7138,7 +7139,7 @@ static void test_prepare_grant() } } - +#endif /* Test a crash when invalid/corrupted .frm is used in the @@ -12598,7 +12599,7 @@ static void test_bug8330() const char *stmt_text; MYSQL_STMT *stmt[2]; int i, rc; - char *query= "select a,b from t1 where a=?"; + const char *query= "select a,b from t1 where a=?"; MYSQL_BIND bind[2]; long lval[2]; @@ -12789,7 +12790,7 @@ static void test_bug8722() } -MYSQL_STMT *open_cursor(char *query) +MYSQL_STMT *open_cursor(const char *query) { int rc; const ulong type= (ulong)CURSOR_TYPE_READ_ONLY; From 5f9843aeee235ab06ab00ad96c4b044f8be9d558 Mon Sep 17 00:00:00 2001 From: "mskold@mysql.com" <> Date: Wed, 27 Apr 2005 18:17:41 +0200 Subject: [PATCH 26/51] Fix for avoiding gettin Invalid schema object version when doing local changes --- mysql-test/r/ndb_multi.result | 22 +++++++++++- mysql-test/t/ndb_multi.test | 24 +++++++++++++ ndb/include/ndbapi/NdbDictionary.hpp | 5 ++- ndb/src/ndbapi/NdbDictionaryImpl.cpp | 11 +++--- sql/ha_ndbcluster.cc | 54 +++++++++++++++++++++------- sql/ha_ndbcluster.h | 4 +-- 6 files changed, 99 insertions(+), 21 deletions(-) diff --git a/mysql-test/r/ndb_multi.result b/mysql-test/r/ndb_multi.result index 5696fda1c07..2080be241e8 100644 --- a/mysql-test/r/ndb_multi.result +++ b/mysql-test/r/ndb_multi.result @@ -13,6 +13,26 @@ a show status like 'handler_discover%'; Variable_name Value Handler_discover 0 +select * from t1; +a +2 +drop table t1; +create table t1 (a int) engine=ndbcluster; +insert into t1 value (2); +select * from t1; +a +2 +show status like 'handler_discover%'; +Variable_name Value +Handler_discover 0 +drop table t1; +create table t1 (a int) engine=ndbcluster; +insert into t1 value (2); +select * from t1; +ERROR HY000: Got error 241 'Invalid schema object version' from ndbcluster +select * from t1; +a +2 flush status; select * from t1; a @@ -20,7 +40,7 @@ a update t1 set a=3 where a=2; show status like 'handler_discover%'; Variable_name Value -Handler_discover 1 +Handler_discover 0 create table t3 (a int not null primary key, b varchar(22), c int, last_col text) engine=ndb; insert into t3 values(1, 'Hi!', 89, 'Longtext column'); diff --git a/mysql-test/t/ndb_multi.test b/mysql-test/t/ndb_multi.test index 24651913a79..85950c72cf9 100644 --- a/mysql-test/t/ndb_multi.test +++ b/mysql-test/t/ndb_multi.test @@ -18,6 +18,30 @@ select * from t1; select * from t2; show status like 'handler_discover%'; +# Check dropping and recreating table on same server +connect (con1,localhost,,,test); +connect (con2,localhost,,,test); +connection con1; +select * from t1; +connection con2; +drop table t1; +create table t1 (a int) engine=ndbcluster; +insert into t1 value (2); +connection con1; +select * from t1; + +# Check dropping and recreating table on different server +connection server2; +show status like 'handler_discover%'; +drop table t1; +create table t1 (a int) engine=ndbcluster; +insert into t1 value (2); +connection server1; +# Currently a retry is required remotely +--error 1296 +select * from t1; +select * from t1; + # Connect to server2 and use the tables from there connection server2; flush status; diff --git a/ndb/include/ndbapi/NdbDictionary.hpp b/ndb/include/ndbapi/NdbDictionary.hpp index 6aa675a2319..0e4f506c604 100644 --- a/ndb/include/ndbapi/NdbDictionary.hpp +++ b/ndb/include/ndbapi/NdbDictionary.hpp @@ -75,8 +75,11 @@ public: Changed, ///< The object has been modified in memory ///< and has to be commited in NDB Kernel for ///< changes to take effect - Retrieved ///< The object exist and has been read + Retrieved, ///< The object exist and has been read ///< into main memory from NDB Kernel + Invalid ///< The object has been invalidated + ///< and should not be used + }; /** diff --git a/ndb/src/ndbapi/NdbDictionaryImpl.cpp b/ndb/src/ndbapi/NdbDictionaryImpl.cpp index fb2e0d673cd..4523ae2c261 100644 --- a/ndb/src/ndbapi/NdbDictionaryImpl.cpp +++ b/ndb/src/ndbapi/NdbDictionaryImpl.cpp @@ -1448,6 +1448,7 @@ int NdbDictionaryImpl::alterTable(NdbTableImpl &impl) // If in local cache it must be in global if (!cachedImpl) abort(); + cachedImpl->m_status = NdbDictionary::Object::Invalid; m_globalHash->drop(cachedImpl); m_globalHash->unlock(); } @@ -1747,8 +1748,8 @@ NdbDictionaryImpl::dropTable(const char * name) DBUG_PRINT("info",("INCOMPATIBLE_VERSION internal_name: %s", internalTableName)); m_localHash.drop(internalTableName); - m_globalHash->lock(); + tab->m_status = NdbDictionary::Object::Invalid; m_globalHash->drop(tab); m_globalHash->unlock(); DBUG_RETURN(dropTable(name)); @@ -1792,10 +1793,11 @@ NdbDictionaryImpl::dropTable(NdbTableImpl & impl) int ret = m_receiver.dropTable(impl); if(ret == 0 || m_error.code == 709){ const char * internalTableName = impl.m_internalName.c_str(); + m_localHash.drop(internalTableName); - m_globalHash->lock(); + impl.m_status = NdbDictionary::Object::Invalid; m_globalHash->drop(&impl); m_globalHash->unlock(); @@ -1889,6 +1891,7 @@ NdbDictionaryImpl::invalidateObject(NdbTableImpl & impl) m_localHash.drop(internalTableName); m_globalHash->lock(); + impl.m_status = NdbDictionary::Object::Invalid; m_globalHash->drop(&impl); m_globalHash->unlock(); return 0; @@ -2152,8 +2155,8 @@ NdbDictionaryImpl::dropIndex(const char * indexName, m_ndb.internalizeTableName(indexName); // Index is also a table m_localHash.drop(internalIndexName); - m_globalHash->lock(); + idx->m_table->m_status = NdbDictionary::Object::Invalid; m_globalHash->drop(idx->m_table); m_globalHash->unlock(); return dropIndex(indexName, tableName); @@ -2187,8 +2190,8 @@ NdbDictionaryImpl::dropIndex(NdbIndexImpl & impl, const char * tableName) int ret = m_receiver.dropIndex(impl, *timpl); if(ret == 0){ m_localHash.drop(internalIndexName); - m_globalHash->lock(); + impl.m_table->m_status = NdbDictionary::Object::Invalid; m_globalHash->drop(impl.m_table); m_globalHash->unlock(); } diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 8c12cccf5ee..0d6bfcb9d0d 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -331,11 +331,14 @@ void ha_ndbcluster::no_uncommitted_rows_reset(THD *thd) # The mapped error code */ -void ha_ndbcluster::invalidateDictionaryCache() +void ha_ndbcluster::invalidate_dictionary_cache(bool global) { NDBDICT *dict= get_ndb()->getDictionary(); DBUG_PRINT("info", ("invalidating %s", m_tabname)); - dict->invalidateTable(m_tabname); + if (global) + dict->invalidateTable(m_tabname); + else + dict->removeCachedTable(m_tabname); table->version=0L; /* Free when thread is ready */ /* Invalidate indexes */ for (uint i= 0; i < table->keys; i++) @@ -347,12 +350,21 @@ void ha_ndbcluster::invalidateDictionaryCache() switch(idx_type) { case(PRIMARY_KEY_ORDERED_INDEX): case(ORDERED_INDEX): - dict->invalidateIndex(index->getName(), m_tabname); + if (global) + dict->invalidateIndex(index->getName(), m_tabname); + else + dict->removeCachedIndex(index->getName(), m_tabname); break; case(UNIQUE_ORDERED_INDEX): - dict->invalidateIndex(index->getName(), m_tabname); + if (global) + dict->invalidateIndex(index->getName(), m_tabname); + else + dict->removeCachedIndex(index->getName(), m_tabname); case(UNIQUE_INDEX): - dict->invalidateIndex(unique_index->getName(), m_tabname); + if (global) + dict->invalidateIndex(unique_index->getName(), m_tabname); + else + dict->removeCachedIndex(unique_index->getName(), m_tabname); break; case(PRIMARY_KEY_INDEX): case(UNDEFINED_INDEX): @@ -371,7 +383,7 @@ int ha_ndbcluster::ndb_err(NdbConnection *trans) switch (err.classification) { case NdbError::SchemaError: { - invalidateDictionaryCache(); + invalidate_dictionary_cache(TRUE); if (err.code==284) { @@ -767,7 +779,13 @@ int ha_ndbcluster::get_metadata(const char *path) if (!(tab= dict->getTable(m_tabname))) ERR_RETURN(dict->getNdbError()); - DBUG_PRINT("info", ("Table schema version: %d", tab->getObjectVersion())); + if (tab->getObjectStatus() == NdbDictionary::Object::Invalid) + { + invalidate_dictionary_cache(FALSE); + if (!(tab= dict->getTable(m_tabname))) + ERR_RETURN(dict->getNdbError()); + DBUG_PRINT("info", ("Table schema version: %d", tab->getObjectVersion())); + } /* Compare FrmData in NDB with frm file from disk. */ @@ -786,7 +804,7 @@ int ha_ndbcluster::get_metadata(const char *path) if (!invalidating_ndb_table) { DBUG_PRINT("info", ("Invalidating table")); - invalidateDictionaryCache(); + invalidate_dictionary_cache(TRUE); invalidating_ndb_table= TRUE; } else @@ -812,7 +830,7 @@ int ha_ndbcluster::get_metadata(const char *path) if (error) DBUG_RETURN(error); - m_tableVersion= tab->getObjectVersion(); + m_table_version= tab->getObjectVersion(); m_table= (void *)tab; m_table_info= NULL; // Set in external lock @@ -3226,15 +3244,25 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type) void *tab_info; if (!(tab= dict->getTable(m_tabname, &tab_info))) ERR_RETURN(dict->getNdbError()); - DBUG_PRINT("info", ("Table schema version: %d", tab->getObjectVersion())); - if (m_table != (void *)tab || m_tableVersion != tab->getObjectVersion()) + DBUG_PRINT("info", ("Table schema version: %d", + tab->getObjectVersion())); + // Check if thread has stale local cache + if (tab->getObjectStatus() == NdbDictionary::Object::Invalid) + { + invalidate_dictionary_cache(FALSE); + if (!(tab= dict->getTable(m_tabname))) + ERR_RETURN(dict->getNdbError()); + DBUG_PRINT("info", ("Table schema version: %d", + tab->getObjectVersion())); + } + if (m_table != (void *)tab || m_table_version < tab->getObjectVersion()) { /* The table has been altered, refresh the index list */ build_index_list(ndb, table, ILBP_OPEN); m_table= (void *)tab; - m_tableVersion = tab->getObjectVersion(); + m_table_version = tab->getObjectVersion(); } m_table_info= tab_info; } @@ -4006,7 +4034,7 @@ ha_ndbcluster::ha_ndbcluster(TABLE *table_arg): m_active_trans(NULL), m_active_cursor(NULL), m_table(NULL), - m_tableVersion(-1), + m_table_version(-1), m_table_info(NULL), m_table_flags(HA_REC_NOT_IN_SEQ | HA_NULL_IN_KEY | diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h index ac2d27b9ec7..7de5dd503e7 100644 --- a/sql/ha_ndbcluster.h +++ b/sql/ha_ndbcluster.h @@ -203,7 +203,7 @@ class ha_ndbcluster: public handler void print_results(); longlong get_auto_increment(); - void invalidateDictionaryCache(); + void invalidate_dictionary_cache(bool global); int ndb_err(NdbConnection*); bool uses_blob_value(bool all_fields); @@ -215,7 +215,7 @@ class ha_ndbcluster: public handler NdbConnection *m_active_trans; NdbResultSet *m_active_cursor; void *m_table; - int m_tableVersion; + int m_table_version; void *m_table_info; char m_dbname[FN_HEADLEN]; //char m_schemaname[FN_HEADLEN]; From 63fa61c6e2b83bebcebb9850c83ee697b2fa4694 Mon Sep 17 00:00:00 2001 From: "jimw@mysql.com" <> Date: Wed, 27 Apr 2005 10:01:41 -0700 Subject: [PATCH 27/51] Carry over change to fix build on ICC that was lost in merge from 4.1. --- config/ac-macros/misc.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/ac-macros/misc.m4 b/config/ac-macros/misc.m4 index 201702e5379..d75dedafa2a 100644 --- a/config/ac-macros/misc.m4 +++ b/config/ac-macros/misc.m4 @@ -646,8 +646,8 @@ m4_define([_AC_PROG_CXX_EXIT_DECLARATION], 'void exit (int);' \ '#include ' do - _AC_COMPILE_IFELSE([AC_LANG_PROGRAM([@%:@include -$ac_declaration], + _AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$ac_declaration +@%:@include ], [exit (42);])], [], [continue]) From 1df110057ca2218fc3ff2fbd085553aecbc7ec69 Mon Sep 17 00:00:00 2001 From: "ingo@mysql.com" <> Date: Wed, 27 Apr 2005 20:54:19 +0200 Subject: [PATCH 28/51] Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock After merge fix. --- sql/sql_insert.cc | 75 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 55 insertions(+), 20 deletions(-) diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 7f890a583c6..31393b2173a 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -851,27 +851,42 @@ static TABLE *delayed_get_table(THD *thd,TABLE_LIST *table_list) { int error; delayed_insert *tmp; + TABLE *table; DBUG_ENTER("delayed_get_table"); if (!table_list->db) table_list->db=thd->db; - /* no match; create a new thread to handle the table */ + /* Find the thread which handles this table. */ if (!(tmp=find_handler(thd,table_list))) { - /* Don't create more than max_insert_delayed_threads */ + /* + No match. Create a new thread to handle the table, but + no more than max_insert_delayed_threads. + */ if (delayed_insert_threads >= thd->variables.max_insert_delayed_threads) DBUG_RETURN(0); thd->proc_info="Creating delayed handler"; pthread_mutex_lock(&LOCK_delayed_create); - if (!(tmp=find_handler(thd,table_list))) // Was just created + /* + The first search above was done without LOCK_delayed_create. + Another thread might have created the handler in between. Search again. + */ + if (! (tmp= find_handler(thd, table_list))) { + /* + Avoid that a global read lock steps in while we are creating the + new thread. It would block trying to open the table. Hence, the + DI thread and this thread would wait until after the global + readlock is gone. If the read lock exists already, we leave with + no table and then switch to non-delayed insert. + */ + if (set_protect_against_global_read_lock()) + goto err; if (!(tmp=new delayed_insert())) { - thd->fatal_error(); my_error(ER_OUTOFMEMORY,MYF(0),sizeof(delayed_insert)); - pthread_mutex_unlock(&LOCK_delayed_create); - DBUG_RETURN(0); + goto err1; } pthread_mutex_lock(&LOCK_thread_count); thread_count++; @@ -880,10 +895,8 @@ static TABLE *delayed_get_table(THD *thd,TABLE_LIST *table_list) !(tmp->thd.query=my_strdup(table_list->real_name,MYF(MY_WME)))) { delete tmp; - thd->fatal_error(); my_error(ER_OUT_OF_RESOURCES,MYF(0)); - pthread_mutex_unlock(&LOCK_delayed_create); - DBUG_RETURN(0); + goto err1; } tmp->table_list= *table_list; // Needed to open table tmp->table_list.db= tmp->thd.db; @@ -899,10 +912,8 @@ static TABLE *delayed_get_table(THD *thd,TABLE_LIST *table_list) pthread_mutex_unlock(&tmp->mutex); tmp->unlock(); delete tmp; - thd->fatal_error(); - pthread_mutex_unlock(&LOCK_delayed_create); net_printf(thd,ER_CANT_CREATE_THREAD,error); - DBUG_RETURN(0); + goto err1; } /* Wait until table is open */ @@ -912,6 +923,7 @@ static TABLE *delayed_get_table(THD *thd,TABLE_LIST *table_list) pthread_cond_wait(&tmp->cond_client,&tmp->mutex); } pthread_mutex_unlock(&tmp->mutex); + unset_protect_against_global_read_lock(); thd->proc_info="got old table"; if (tmp->thd.killed) { @@ -923,28 +935,34 @@ static TABLE *delayed_get_table(THD *thd,TABLE_LIST *table_list) thd->net.last_errno=tmp->thd.net.last_errno; } tmp->unlock(); - pthread_mutex_unlock(&LOCK_delayed_create); - DBUG_RETURN(0); // Continue with normal insert + goto err; } if (thd->killed) { tmp->unlock(); - pthread_mutex_unlock(&LOCK_delayed_create); - DBUG_RETURN(0); + goto err; } } pthread_mutex_unlock(&LOCK_delayed_create); } pthread_mutex_lock(&tmp->mutex); - TABLE *table=tmp->get_local_table(thd); + table=tmp->get_local_table(thd); pthread_mutex_unlock(&tmp->mutex); - tmp->unlock(); if (table) thd->di=tmp; else if (tmp->thd.is_fatal_error) thd->fatal_error(); + /* Unlock the delayed insert object after its last access. */ + tmp->unlock(); DBUG_RETURN((table_list->table=table)); + + err1: + thd->fatal_error(); + unset_protect_against_global_read_lock(); + err: + pthread_mutex_unlock(&LOCK_delayed_create); + DBUG_RETURN(0); // Continue with normal insert } @@ -1165,6 +1183,14 @@ extern "C" pthread_handler_decl(handle_delayed_insert,arg) thd->killed=abort_loop; pthread_mutex_unlock(&LOCK_thread_count); + /* + Wait until the client runs into pthread_cond_wait(), + where we free it after the table is opened and di linked in the list. + If we did not wait here, the client might detect the opened table + before it is linked to the list. It would release LOCK_delayed_create + and allow another thread to create another handler for the same table, + since it does not find one in the list. + */ pthread_mutex_lock(&di->mutex); #if !defined( __WIN__) && !defined(OS2) /* Win32 calls this in pthread_create */ if (my_thread_init()) @@ -1279,8 +1305,17 @@ extern "C" pthread_handler_decl(handle_delayed_insert,arg) if (di->tables_in_use && ! thd->lock) { - /* request for new delayed insert */ - if (!(thd->lock=mysql_lock_tables(thd,&di->table,1))) + /* + Request for new delayed insert. + Lock the table, but avoid to be blocked by a global read lock. + If we got here while a global read lock exists, then one or more + inserts started before the lock was requested. These are allowed + to complete their work before the server returns control to the + client which requested the global read lock. The delayed insert + handler will close the table and finish when the outstanding + inserts are done. + */ + if (! (thd->lock= mysql_lock_tables(thd, &di->table, 1, TRUE))) { di->dead= 1; // Some fatal error thd->killed= 1; From 0a21c374da30caeb5ed7446bb3efada616c44e41 Mon Sep 17 00:00:00 2001 From: "guilhem@mysql.com" <> Date: Wed, 27 Apr 2005 22:46:20 +0200 Subject: [PATCH 29/51] update of BUILD/* scripts to storage/ directory structure (they didn't work anymore) --- BUILD/FINISH.sh | 6 +++--- BUILD/compile-alpha-cxx | 2 +- BUILD/compile-alpha-debug | 2 +- BUILD/compile-dist | 4 ++-- BUILD/compile-hpux11-parisc2-aCC | 4 ++-- BUILD/compile-ia64-debug-max | 6 +++--- BUILD/compile-irix-mips64-mipspro | 4 ++-- BUILD/compile-pentium-pgcc | 4 ++-- BUILD/compile-solaris-sparc | 4 ++-- BUILD/compile-solaris-sparc-debug | 4 ++-- BUILD/compile-solaris-sparc-forte | 4 ++-- BUILD/compile-solaris-sparc-purify | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh index 81defaa7f52..ae0518c150d 100644 --- a/BUILD/FINISH.sh +++ b/BUILD/FINISH.sh @@ -11,15 +11,15 @@ done 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; aclocal || (echo \"Can't execute aclocal\" && exit 1) autoheader || (echo \"Can't execute autoheader\" && exit 1) aclocal || (echo \"Can't execute aclocal\" && exit 1) automake || (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) if [ -d gemini ] then (cd gemini && aclocal && autoheader && aclocal && automake && autoconf) diff --git a/BUILD/compile-alpha-cxx b/BUILD/compile-alpha-cxx index a342d927868..c6344b1bbe4 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 aclocal; autoheader; aclocal; automake; autoconf CC=ccc CFLAGS="-fast" CXX=cxx CXXFLAGS="-fast -noexceptions -nortti" ./configure --prefix=/usr/local/mysql --disable-shared --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-non_shared --with-client-ldflags=-non_shared --without-extra-tools --disable-dependency-tracking diff --git a/BUILD/compile-alpha-debug b/BUILD/compile-alpha-debug index 60d1b9af659..03497f423dd 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 aclocal; autoheader; aclocal; automake; autoconf CFLAGS=-O1 CC=gcc CXX=gcc CXXFLAGS="-O1 -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --with-debug --with-extra-charsets=complex --without-extra-tools diff --git a/BUILD/compile-dist b/BUILD/compile-dist index 7c177f54258..248f4bb04ce 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-hpux11-parisc2-aCC b/BUILD/compile-hpux11-parisc2-aCC index 2fc7a6d2b6e..b309efb21b6 100755 --- a/BUILD/compile-hpux11-parisc2-aCC +++ b/BUILD/compile-hpux11-parisc2-aCC @@ -68,8 +68,8 @@ libtoolize --automake --force automake --force --add-missing 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) CC=cc CXX=aCC CFLAGS="$cflags" CXXFLAGS="$cxxflags" \ ./configure --prefix=/usr/local/mysql --disable-shared \ diff --git a/BUILD/compile-ia64-debug-max b/BUILD/compile-ia64-debug-max index 56c36059ea9..9e1628a3641 100755 --- a/BUILD/compile-ia64-debug-max +++ b/BUILD/compile-ia64-debug-max @@ -1,9 +1,9 @@ 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 aclocal && autoheader && aclocal && automake && 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) if [ -d gemini ] then (cd gemini && aclocal && autoheader && aclocal && automake && autoconf) diff --git a/BUILD/compile-irix-mips64-mipspro b/BUILD/compile-irix-mips64-mipspro index 1987fa13b1f..3b5f5519442 100755 --- a/BUILD/compile-irix-mips64-mipspro +++ b/BUILD/compile-irix-mips64-mipspro @@ -40,8 +40,8 @@ libtoolize --automake --force automake --force --add-missing 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) # C options: # -apo - auto-parallize for multiprocessors (implies -mp) diff --git a/BUILD/compile-pentium-pgcc b/BUILD/compile-pentium-pgcc index 2d806009b21..1ba0d9562ba 100755 --- a/BUILD/compile-pentium-pgcc +++ b/BUILD/compile-pentium-pgcc @@ -3,8 +3,8 @@ gmake -k clean || true /bin/rm -f */.deps/*.P config.cache aclocal && autoheader && aclocal && automake && 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) if [ -d gemini ] then (cd gemini && aclocal && autoheader && aclocal && automake && autoconf) diff --git a/BUILD/compile-solaris-sparc b/BUILD/compile-solaris-sparc index 143a4b7867d..43c7e673f5d 100755 --- a/BUILD/compile-solaris-sparc +++ b/BUILD/compile-solaris-sparc @@ -4,8 +4,8 @@ gmake -k clean || true /bin/rm -f */.deps/*.P config.cache aclocal && autoheader && aclocal && automake && 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) if [ -d gemini ] then (cd gemini && aclocal && autoheader && aclocal && automake && autoconf) diff --git a/BUILD/compile-solaris-sparc-debug b/BUILD/compile-solaris-sparc-debug index 527f135ac62..d0a431d22d6 100755 --- a/BUILD/compile-solaris-sparc-debug +++ b/BUILD/compile-solaris-sparc-debug @@ -4,8 +4,8 @@ gmake -k clean || true /bin/rm -f */.deps/*.P config.cache aclocal && autoheader && aclocal && automake && 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) if [ -d gemini ] then (cd gemini && aclocal && autoheader && aclocal && automake && autoconf) diff --git a/BUILD/compile-solaris-sparc-forte b/BUILD/compile-solaris-sparc-forte index afd106afc67..185b14a9e24 100755 --- a/BUILD/compile-solaris-sparc-forte +++ b/BUILD/compile-solaris-sparc-forte @@ -4,8 +4,8 @@ gmake -k clean || true /bin/rm -f */.deps/*.P config.cache aclocal && autoheader && aclocal && automake && 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) if [ -d gemini ] then (cd gemini && aclocal && autoheader && aclocal && automake && autoconf) diff --git a/BUILD/compile-solaris-sparc-purify b/BUILD/compile-solaris-sparc-purify index 41ecd4ed530..c2703117770 100755 --- a/BUILD/compile-solaris-sparc-purify +++ b/BUILD/compile-solaris-sparc-purify @@ -34,8 +34,8 @@ done gmake -k clean || true /bin/rm -f */.deps/*.P config.cache aclocal && autoheader && aclocal && automake && 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) CFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wimplicit-int -Wparentheses -Wsign-compare -Wwrite-strings -Wunused -DHAVE_purify -DEXTRA_DEBUG -O2" CXX=gcc CXXLD=g++ CXXFLAGS="-g -Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor -felide-constructors -fno-exceptions -fno-rtti -DHAVE_purify -DEXTRA_DEBUG -O2" ./configure --prefix=/usr/local/mysql --enable-assembler --with-extra-charsets=complex --enable-thread-safe-client --with-berkeley-db --with-embedded-server --with-innodb $EXTRA_CONFIG_FLAGS From 731c8da030baa2a47b800a01221e4844180abd13 Mon Sep 17 00:00:00 2001 From: "ingo@mysql.com" <> Date: Wed, 27 Apr 2005 22:58:11 +0200 Subject: [PATCH 30/51] Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlock After merge fix. --- sql/lock.cc | 51 +++++++++++++++++++++++++++++++++++++++++++++-- sql/mysql_priv.h | 5 ++++- sql/sql_insert.cc | 2 +- 3 files changed, 54 insertions(+), 4 deletions(-) diff --git a/sql/lock.cc b/sql/lock.cc index a8ccba32d4f..83a39005cd8 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -82,7 +82,8 @@ static int unlock_external(THD *thd, TABLE **table,uint count); static void print_lock_error(int error, const char *); -MYSQL_LOCK *mysql_lock_tables(THD *thd,TABLE **tables,uint count) +MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **tables, uint count, + bool ignore_global_read_lock) { MYSQL_LOCK *sql_lock; TABLE *write_lock_used; @@ -93,7 +94,7 @@ MYSQL_LOCK *mysql_lock_tables(THD *thd,TABLE **tables,uint count) if (!(sql_lock = get_lock_data(thd,tables,count, 0,&write_lock_used))) break; - if (global_read_lock && write_lock_used) + if (global_read_lock && write_lock_used && ! ignore_global_read_lock) { /* Someone has issued LOCK ALL TABLES FOR READ and we want a write lock @@ -949,3 +950,49 @@ bool make_global_read_lock_block_commit(THD *thd) DBUG_RETURN(error); } + + +/* + Set protection against global read lock. + + SYNOPSIS + set_protect_against_global_read_lock() + void + + RETURN + FALSE OK, no global read lock exists. + TRUE Error, global read lock exists already. +*/ + +bool set_protect_against_global_read_lock(void) +{ + bool global_read_lock_exists; + + pthread_mutex_lock(&LOCK_open); + if (! (global_read_lock_exists= test(global_read_lock))) + protect_against_global_read_lock++; + pthread_mutex_unlock(&LOCK_open); + return global_read_lock_exists; +} + + +/* + Unset protection against global read lock. + + SYNOPSIS + unset_protect_against_global_read_lock() + void + + RETURN + void +*/ + +void unset_protect_against_global_read_lock(void) +{ + pthread_mutex_lock(&LOCK_open); + protect_against_global_read_lock--; + pthread_mutex_unlock(&LOCK_open); + pthread_cond_broadcast(&COND_refresh); +} + + diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 56fbd993aed..06c946114eb 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -1151,7 +1151,8 @@ extern pthread_t signal_thread; extern struct st_VioSSLAcceptorFd * ssl_acceptor_fd; #endif /* HAVE_OPENSSL */ -MYSQL_LOCK *mysql_lock_tables(THD *thd,TABLE **table,uint count); +MYSQL_LOCK *mysql_lock_tables(THD *thd, TABLE **table, uint count, + bool ignore_global_read_lock= FALSE); void mysql_unlock_tables(THD *thd, MYSQL_LOCK *sql_lock); void mysql_unlock_read_tables(THD *thd, MYSQL_LOCK *sql_lock); void mysql_unlock_some_tables(THD *thd, TABLE **table,uint count); @@ -1165,6 +1166,8 @@ bool wait_if_global_read_lock(THD *thd, bool abort_on_refresh, bool is_not_commit); void start_waiting_global_read_lock(THD *thd); bool make_global_read_lock_block_commit(THD *thd); +bool set_protect_against_global_read_lock(void); +void unset_protect_against_global_read_lock(void); /* Lock based on name */ int lock_and_wait_for_table_name(THD *thd, TABLE_LIST *table_list); diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 56b6ab1aeed..ac8f5a06745 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1213,7 +1213,7 @@ static TABLE *delayed_get_table(THD *thd,TABLE_LIST *table_list) } pthread_mutex_lock(&tmp->mutex); - table=tmp->get_local_table(thd); + table= tmp->get_local_table(thd); pthread_mutex_unlock(&tmp->mutex); if (table) thd->di=tmp; From 2df87238080705b46f3427c745ef9fb27c47c4d8 Mon Sep 17 00:00:00 2001 From: "tulin@mysql.com" <> Date: Thu, 28 Apr 2005 09:09:52 +0200 Subject: [PATCH 31/51] ndbcluster.sh: merge --- mysql-test/ndb/ndbcluster.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From bbee23435d3a2927acdfef1df3486c146aee2840 Mon Sep 17 00:00:00 2001 From: "mskold@mysql.com" <> Date: Thu, 28 Apr 2005 09:39:29 +0200 Subject: [PATCH 32/51] Fix for avoiding gettin Invalid schema object version when doing local changes, post review fixes --- sql/ha_ndbcluster.cc | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 0d6bfcb9d0d..306d3224930 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -336,7 +336,17 @@ void ha_ndbcluster::invalidate_dictionary_cache(bool global) NDBDICT *dict= get_ndb()->getDictionary(); DBUG_PRINT("info", ("invalidating %s", m_tabname)); if (global) - dict->invalidateTable(m_tabname); + { + if (((const NDBTAB *)m_table)->getObjectStatus() + == NdbDictionary::Object::Invalid) + { + // Global cache has already been invalidated + dict->removeCachedTable(m_tabname); + global= FALSE; + } + else + dict->invalidateTable(m_tabname); + } else dict->removeCachedTable(m_tabname); table->version=0L; /* Free when thread is ready */ @@ -779,6 +789,7 @@ int ha_ndbcluster::get_metadata(const char *path) if (!(tab= dict->getTable(m_tabname))) ERR_RETURN(dict->getNdbError()); + // Check if thread has stale local cache if (tab->getObjectStatus() == NdbDictionary::Object::Invalid) { invalidate_dictionary_cache(FALSE); @@ -804,6 +815,7 @@ int ha_ndbcluster::get_metadata(const char *path) if (!invalidating_ndb_table) { DBUG_PRINT("info", ("Invalidating table")); + m_table= (void *) tab; invalidate_dictionary_cache(TRUE); invalidating_ndb_table= TRUE; } @@ -3288,7 +3300,6 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type) thd->transaction.stmt.ndb_tid= 0; } } - m_table= NULL; m_table_info= NULL; /* This is the place to make sure this handler instance @@ -3910,7 +3921,13 @@ int ha_ndbcluster::rename_table(const char *from, const char *to) dict= ndb->getDictionary(); if (!(orig_tab= dict->getTable(m_tabname))) ERR_RETURN(dict->getNdbError()); - + // Check if thread has stale local cache + if (orig_tab->getObjectStatus() == NdbDictionary::Object::Invalid) + { + dict->removeCachedTable(m_tabname); + if (!(orig_tab= dict->getTable(m_tabname))) + ERR_RETURN(dict->getNdbError()); + } m_table= (void *)orig_tab; // Change current database to that of target table set_dbname(to); @@ -4278,7 +4295,6 @@ int ndbcluster_discover(THD* thd, const char *db, const char *name, DBUG_RETURN(1); ERR_RETURN(err); } - DBUG_PRINT("info", ("Found table %s", tab->getName())); len= tab->getFrmLength(); From 92dc45c86f867affa06650d26d115c07b68ee0d4 Mon Sep 17 00:00:00 2001 From: "mskold@mysql.com" <> Date: Thu, 28 Apr 2005 10:46:39 +0200 Subject: [PATCH 33/51] Fix for avoiding gettin Invalid schema object version when doing local changes, more post review fixes --- sql/ha_ndbcluster.cc | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 306d3224930..181ae5e5b54 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -334,11 +334,15 @@ void ha_ndbcluster::no_uncommitted_rows_reset(THD *thd) void ha_ndbcluster::invalidate_dictionary_cache(bool global) { NDBDICT *dict= get_ndb()->getDictionary(); + DBUG_ENTER("invalidate_dictionary_cache"); DBUG_PRINT("info", ("invalidating %s", m_tabname)); + if (global) { - if (((const NDBTAB *)m_table)->getObjectStatus() - == NdbDictionary::Object::Invalid) + const NDBTAB *tab= dict->getTable(m_tabname); + if (!tab) + DBUG_VOID_RETURN; + if (tab->getObjectStatus() == NdbDictionary::Object::Invalid) { // Global cache has already been invalidated dict->removeCachedTable(m_tabname); @@ -381,6 +385,7 @@ void ha_ndbcluster::invalidate_dictionary_cache(bool global) break; } } + DBUG_VOID_RETURN; } int ha_ndbcluster::ndb_err(NdbConnection *trans) @@ -815,7 +820,6 @@ int ha_ndbcluster::get_metadata(const char *path) if (!invalidating_ndb_table) { DBUG_PRINT("info", ("Invalidating table")); - m_table= (void *) tab; invalidate_dictionary_cache(TRUE); invalidating_ndb_table= TRUE; } From 9969e1c5ea6c2ae84e07a6345462dd3c257329bf Mon Sep 17 00:00:00 2001 From: "msvensson@neptunus.(none)" <> Date: Thu, 28 Apr 2005 10:49:18 +0200 Subject: [PATCH 34/51] BUG#9911 After review fixes - Remove ha_archive::rename_table and move the fix to handler::rename_table --- sql/examples/ha_archive.cc | 24 ------------------------ sql/examples/ha_archive.h | 1 - sql/handler.cc | 14 +++++++++----- 3 files changed, 9 insertions(+), 30 deletions(-) diff --git a/sql/examples/ha_archive.cc b/sql/examples/ha_archive.cc index 0e1df45a70b..bc4af0c7dc7 100644 --- a/sql/examples/ha_archive.cc +++ b/sql/examples/ha_archive.cc @@ -427,30 +427,6 @@ const char **ha_archive::bas_ext() const { static const char *ext[]= { ARZ, ARN, ARM, NullS }; return ext; } -/* - Rename all files that this handler defines in bas_ext list - - NOTE Don't care if the .arn file is missing -*/ -int ha_archive::rename_table(const char * from, const char * to) -{ - DBUG_ENTER("ha_archive::rename_table"); - for (const char **ext=bas_ext(); *ext ; ext++) - { - if (rename_file_ext(from,to,*ext)) - { - if (my_errno == ENOENT && - !my_strcasecmp(system_charset_info, *ext, ARN)) - continue; - - DBUG_RETURN(my_errno); - } - - } - DBUG_RETURN(0); -} - - /* When opening a file we: Create/get our shared structure. diff --git a/sql/examples/ha_archive.h b/sql/examples/ha_archive.h index 1d3365aca67..855d756368d 100644 --- a/sql/examples/ha_archive.h +++ b/sql/examples/ha_archive.h @@ -124,7 +124,6 @@ public: int optimize(THD* thd, HA_CHECK_OPT* check_opt); THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to, enum thr_lock_type lock_type); - int rename_table(const char * from, const char * to); }; bool archive_db_init(void); diff --git a/sql/handler.cc b/sql/handler.cc index 7c369a72392..f174f51514e 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -1255,13 +1255,17 @@ int handler::delete_table(const char *name) int handler::rename_table(const char * from, const char * to) { - DBUG_ENTER("handler::rename_table"); - for (const char **ext=bas_ext(); *ext ; ext++) + int error= 0; + for (const char **ext= bas_ext(); *ext ; ext++) { - if (rename_file_ext(from,to,*ext)) - DBUG_RETURN(my_errno); + if (rename_file_ext(from, to, *ext)) + { + if ((error=my_errno) != ENOENT) + break; + error= 0; + } } - DBUG_RETURN(0); + return error; } /* From 9e2e0deece3fbcb1c516690ddee0f2d66f79cd84 Mon Sep 17 00:00:00 2001 From: "msvensson@neptunus.(none)" <> Date: Thu, 28 Apr 2005 11:05:44 +0200 Subject: [PATCH 35/51] Merge bug9911 with 5.0 --- mysql-test/r/archive.result | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mysql-test/r/archive.result b/mysql-test/r/archive.result index 9cd5bba267f..793e50cf653 100644 --- a/mysql-test/r/archive.result +++ b/mysql-test/r/archive.result @@ -192,6 +192,8 @@ select count(*) from t3; count(*) 1199 rename table t3 to t4; +Warnings: +Error 7 Error on rename of './test/t3.ARN' to './test/t4.ARN' (Errcode: 2) select * from t4 where fld3='bonfire'; auto fld1 companynr fld3 fld4 fld5 fld6 1191 068504 00 bonfire corresponds positively From d84ed6466b26b29e31f624759b9ee825a896b5b0 Mon Sep 17 00:00:00 2001 From: "konstantin@mysql.com" <> Date: Thu, 28 Apr 2005 13:06:36 +0400 Subject: [PATCH 36/51] A test case for Bug#5673 "Rounding problem in 4.0.21 inserting decimal value into a char field": the patch submitted for the bug a while ago has never been reviewed or approved to push into 4.0. Decimal support in 5.0 resolves the issue. Adding the test case and closing the bug report. --- mysql-test/r/type_decimal.result | 20 ++++++++++++++++++++ mysql-test/t/type_decimal.test | 28 ++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/mysql-test/r/type_decimal.result b/mysql-test/r/type_decimal.result index a01f8ee08a1..a7b6fa1b376 100644 --- a/mysql-test/r/type_decimal.result +++ b/mysql-test/r/type_decimal.result @@ -764,3 +764,23 @@ non PS, 1.0 in parameter 1.0 PS, 1.0 in parameter 1.0 deallocate prepare stmt; drop table t1; +create table t1 ( +strippedproductid char(15) not null default '', +zlevelprice decimal(10,2) default null, +primary key (strippedproductid) +); +create table t2 ( +productid char(15) not null default '', +zlevelprice char(21) default null, +primary key (productid) +); +insert into t1 values ('002trans','49.99'); +insert into t1 values ('003trans','39.98'); +insert into t1 values ('004trans','31.18'); +insert INTO t2 SELECT * FROM t1; +select * from t2; +productid zlevelprice +002trans 49.99 +003trans 39.98 +004trans 31.18 +drop table t1, t2; diff --git a/mysql-test/t/type_decimal.test b/mysql-test/t/type_decimal.test index 107f4a06ec5..f86113ac66b 100644 --- a/mysql-test/t/type_decimal.test +++ b/mysql-test/t/type_decimal.test @@ -343,3 +343,31 @@ execute stmt using @a; select * from t1; deallocate prepare stmt; drop table t1; + +# +# A test case for Bug#5673 "Rounding problem in 4.0.21 inserting decimal +# value into a char field": this is a regression bug in 4.0 tree caused by +# a fix for some other decimal conversion issue. The patch never was +# approved to get into 4.0 (maybe because it was considered too intrusive) +# + +create table t1 ( + strippedproductid char(15) not null default '', + zlevelprice decimal(10,2) default null, + primary key (strippedproductid) +); + +create table t2 ( + productid char(15) not null default '', + zlevelprice char(21) default null, + primary key (productid) +); + +insert into t1 values ('002trans','49.99'); +insert into t1 values ('003trans','39.98'); +insert into t1 values ('004trans','31.18'); + +insert INTO t2 SELECT * FROM t1; + +select * from t2; +drop table t1, t2; From 370cd22b577a382f7d5767c6fd16b41ef233e5e5 Mon Sep 17 00:00:00 2001 From: "msvensson@neptunus.(none)" <> Date: Thu, 28 Apr 2005 13:30:45 +0200 Subject: [PATCH 37/51] After review fixes to check-cpu --- BUILD/check-cpu | 2 -- 1 file changed, 2 deletions(-) diff --git a/BUILD/check-cpu b/BUILD/check-cpu index b5c14e38403..553df39191f 100755 --- a/BUILD/check-cpu +++ b/BUILD/check-cpu @@ -19,8 +19,6 @@ if test -r /proc/cpuinfo ; then if test -z "$model_name" ; then model_name=`uname -m` fi -else - exit 0 fi case "$cpu_family--$model_name" in From 6d1186b6acced2b9c57d130430ba83ddc189502f Mon Sep 17 00:00:00 2001 From: "msvensson@neptunus.(none)" <> Date: Thu, 28 Apr 2005 13:48:51 +0200 Subject: [PATCH 38/51] Removing duplicate AC_PREREQ macros Setting AC_PREREQ required version to 2.50 until we have sorted out what is required. The manual says 2.58. --- configure.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 07ce041b283..f6a50dcb46f 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl -*- ksh -*- +bdnl -*- ksh -*- dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.50)dnl Minimum Autoconf version required. @@ -116,8 +116,6 @@ AC_SUBST(SAVE_LDFLAGS) AC_SUBST(SAVE_CXXLDFLAGS) AC_SUBST(CXXLDFLAGS) -AC_PREREQ(2.58)dnl Minimum Autoconf version required. - #AC_ARG_PROGRAM # Automaticly invoked by AM_INIT_AUTOMAKE AM_SANITY_CHECK From 66a158a9dbe42d4786c16d5a0cd476de6f4ce825 Mon Sep 17 00:00:00 2001 From: "ingo@mysql.com" <> Date: Thu, 28 Apr 2005 15:27:42 +0200 Subject: [PATCH 39/51] Bug#8321 - myisampack bug in compression algorithm This is the second of three changesets. It contains the pure bug fix. It also contains the second after-review fixes. The problem was that with gcc on x86, shifts are done modulo word size. 'value' is 32 bits wide and shifting it by 32 bits is a no-op. This was triggered by an evil distribution of character incidences. A distribution of 2917027827 characters made of 202 distinct values led to 34 occurrences of 32-bit Huffman codes. This might have been the first time ever that write_bits() had to write 32-bit values. Since it can be expected that one day even 32 bits might be insufficient, the third changeset suggests to enlarge some variables to 64 bits. --- myisam/myisampack.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/myisam/myisampack.c b/myisam/myisampack.c index 9f4e3bde65a..90689b08476 100644 --- a/myisam/myisampack.c +++ b/myisam/myisampack.c @@ -31,6 +31,7 @@ #define __GNU_LIBRARY__ /* Skip warnings in getopt.h */ #endif #include +#include #if INT_MAX > 32767 #define BITS_SAVED 32 @@ -1975,7 +1976,9 @@ static void write_bits (register ulong value, register uint bits) { reg3 uint byte_buff; bits= (uint) -file_buffer.bits; - byte_buff=file_buffer.byte | (uint) (value >> bits); + DBUG_ASSERT(bits <= 8 * sizeof(value)); + byte_buff= (file_buffer.byte | + ((bits != 8 * sizeof(value)) ? (uint) (value >> bits) : 0)); #if BITS_SAVED == 32 *file_buffer.pos++= (byte) (byte_buff >> 24) ; *file_buffer.pos++= (byte) (byte_buff >> 16) ; @@ -1983,7 +1986,9 @@ static void write_bits (register ulong value, register uint bits) *file_buffer.pos++= (byte) (byte_buff >> 8) ; *file_buffer.pos++= (byte) byte_buff; - value&=(1 << bits)-1; + DBUG_ASSERT(bits <= 8 * sizeof(ulong)); + if (bits != 8 * sizeof(value)) + value&= (((ulong) 1) << bits) - 1; #if BITS_SAVED == 16 if (bits >= sizeof(uint)) { From b31960f71dd4d5809635858d774bdf292a067b3d Mon Sep 17 00:00:00 2001 From: "jimw@mysql.com" <> Date: Thu, 28 Apr 2005 07:47:59 -0700 Subject: [PATCH 40/51] Fix tiny typo in configure.in --- configure.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in index f6a50dcb46f..da707080006 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -bdnl -*- ksh -*- +dnl -*- ksh -*- dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.50)dnl Minimum Autoconf version required. From 1f0d0a6729690bfda6466130957393242d37cfe0 Mon Sep 17 00:00:00 2001 From: "ingo@mysql.com" <> Date: Thu, 28 Apr 2005 18:28:50 +0200 Subject: [PATCH 41/51] BUG#5964 - 4.1 MERGE tables regression from 4.0 Changed the creation of the .MRG file so that only the table name is written when the MyISAM table is in the same database as the MERGE table, a relative path is used in other cases in mysqld, and possibly an absolute path is used in an embedded server. No test case is added as the external behaviour is unchanged. Only the file names within the .MRG file are changed. --- include/my_sys.h | 1 + myisammrg/myrg_open.c | 2 +- mysys/my_getwd.c | 22 ++++++++++++++++++++++ sql/ha_myisammrg.cc | 28 ++++++++++++++++++++++++---- 4 files changed, 48 insertions(+), 5 deletions(-) diff --git a/include/my_sys.h b/include/my_sys.h index b54e2581bd4..7ead643a9c6 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -609,6 +609,7 @@ extern uint dirname_part(my_string to,const char *name); extern uint dirname_length(const char *name); #define base_name(A) (A+dirname_length(A)) extern int test_if_hard_path(const char *dir_name); +extern my_bool has_path(const char *name); extern char *convert_dirname(char *to, const char *from, const char *from_end); extern void to_unix_path(my_string name); extern my_string fn_ext(const char *name); diff --git a/myisammrg/myrg_open.c b/myisammrg/myrg_open.c index a59ccb7d966..0dc2f4f9768 100644 --- a/myisammrg/myrg_open.c +++ b/myisammrg/myrg_open.c @@ -80,7 +80,7 @@ MYRG_INFO *myrg_open(const char *name, int mode, int handle_locking) continue; /* Skip comments */ } - if (!test_if_hard_path(buff)) + if (!has_path(buff)) { VOID(strmake(name_buff+dir_length,buff, sizeof(name_buff)-1-dir_length)); diff --git a/mysys/my_getwd.c b/mysys/my_getwd.c index d6f647254e8..89f949eca27 100644 --- a/mysys/my_getwd.c +++ b/mysys/my_getwd.c @@ -192,3 +192,25 @@ int test_if_hard_path(register const char *dir_name) return FALSE; #endif } /* test_if_hard_path */ + + +/* + Test if a name contains an (absolute or relative) path. + + SYNOPSIS + has_path() + name The name to test. + + RETURN + TRUE name contains a path. + FALSE name does not contain a path. +*/ + +my_bool has_path(const char *name) +{ + return test(strchr(name, FN_LIBCHAR)) +#ifdef FN_DEVCHAR + || test(strchr(name, FN_DEVCHAR)) +#endif + ; +} diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc index bf47b4625e0..7a5d4fcf0a1 100644 --- a/sql/ha_myisammrg.cc +++ b/sql/ha_myisammrg.cc @@ -381,6 +381,7 @@ int ha_myisammrg::create(const char *name, register TABLE *form, char buff[FN_REFLEN],**table_names,**pos; TABLE_LIST *tables= (TABLE_LIST*) create_info->merge_list.first; THD *thd= current_thd; + uint dirlgt= dirname_length(name); DBUG_ENTER("ha_myisammrg::create"); if (!(table_names= (char**) thd->alloc((create_info->merge_list.elements+1)* @@ -394,11 +395,30 @@ int ha_myisammrg::create(const char *name, register TABLE *form, tbl= find_temporary_table(thd, tables->db, tables->real_name); if (!tbl) { - uint length= my_snprintf(buff,FN_REFLEN,"%s%s/%s", - mysql_real_data_home, + /* + Construct the path to the MyISAM table. Try to meet two conditions: + 1.) Allow to include MyISAM tables from different databases, and + 2.) allow for moving DATADIR around in the file system. + The first means that we need paths in the .MRG file. The second + means that we should not have absolute paths in the .MRG file. + The best, we can do, is to use 'mysql_data_home', which is '.' + in mysqld and may be an absolute path in an embedded server. + This means that it might not be possible to move the DATADIR of + an embedded server without changing the paths in the .MRG file. + */ + uint length= my_snprintf(buff, FN_REFLEN, "%s/%s/%s", mysql_data_home, tables->db, tables->real_name); - if (!(table_name= thd->strmake(buff, length))) - DBUG_RETURN(HA_ERR_OUT_OF_MEM); + /* + If a MyISAM table is in the same directory as the MERGE table, + we use the table name without a path. This means that the + DATADIR can easily be moved even for an embedded server as long + as the MyISAM tables are from the same database as the MERGE table. + */ + if ((dirname_length(buff) == dirlgt) && ! memcmp(buff, name, dirlgt)) + table_name= tables->real_name; + else + if (! (table_name= thd->strmake(buff, length))) + DBUG_RETURN(HA_ERR_OUT_OF_MEM); } else table_name=(*tbl)->path; From e465c0e0f3d605d2f0c27a3ab899afaccd252c7b Mon Sep 17 00:00:00 2001 From: "ingo@mysql.com" <> Date: Fri, 29 Apr 2005 10:59:34 +0200 Subject: [PATCH 42/51] BUG#5964 - 4.1 MERGE tables regression from 4.0 After merge fix. --- sql/ha_myisammrg.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc index 20b5ad44629..f7c0abf9810 100644 --- a/sql/ha_myisammrg.cc +++ b/sql/ha_myisammrg.cc @@ -434,7 +434,7 @@ int ha_myisammrg::create(const char *name, register TABLE *form, as the MyISAM tables are from the same database as the MERGE table. */ if ((dirname_length(buff) == dirlgt) && ! memcmp(buff, name, dirlgt)) - table_name= tables->real_name; + table_name= tables->table_name; else if (! (table_name= thd->strmake(buff, length))) DBUG_RETURN(HA_ERR_OUT_OF_MEM); From 1e6dba4d88404d64929dee360bad98db7fe8c84e Mon Sep 17 00:00:00 2001 From: "heikki@hundin.mysql.fi" <> Date: Fri, 29 Apr 2005 12:11:04 +0300 Subject: [PATCH 43/51] ha_innodb.cc: Fix compilation error on Windows in innobase_report_binlog_offset_and_commit() --- sql/ha_innodb.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index f6398b8423e..4217b694f06 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -1632,7 +1632,7 @@ innobase_report_binlog_offset_and_commit( #endif /* HAVE_REPLICATION */ trx->flush_log_later = TRUE; - innobase_commit(thd, trx_handle); + innobase_commit(thd, TRUE); trx->flush_log_later = FALSE; From 2428e7b1ccd23e4cddadf64eb8d74ab47623599b Mon Sep 17 00:00:00 2001 From: "mskold@mysql.com" <> Date: Fri, 29 Apr 2005 11:37:47 +0200 Subject: [PATCH 44/51] Fix for avoiding gettin Invalid schema object version when doing local changes, fixed found bug --- sql/ha_ndbcluster.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 181ae5e5b54..a1166641f7d 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -3266,7 +3266,7 @@ int ha_ndbcluster::external_lock(THD *thd, int lock_type) if (tab->getObjectStatus() == NdbDictionary::Object::Invalid) { invalidate_dictionary_cache(FALSE); - if (!(tab= dict->getTable(m_tabname))) + if (!(tab= dict->getTable(m_tabname, &tab_info))) ERR_RETURN(dict->getNdbError()); DBUG_PRINT("info", ("Table schema version: %d", tab->getObjectVersion())); From fbf31c4a8c68419c689c52c031a98275755a0961 Mon Sep 17 00:00:00 2001 From: "monty@mysql.com" <> Date: Fri, 29 Apr 2005 17:03:34 +0300 Subject: [PATCH 45/51] CAST(string_argument AS UNSIGNED) didn't work for big integers above the signed range. (Bug #7036) Produce warnings of wrong cast of strings to signed/unsigned. Don't block not resolved IP's if DNS server is down (Bug #8467) Fix compiler problems with MinGW (Bug #8872) --- configure.in | 3 ++ include/config-win.h | 17 ++++++- include/my_global.h | 2 + mysql-test/r/cast.result | 71 +++++++++++++++++++++++++-- mysql-test/t/cast.test | 26 +++++++++- mysys/default.c | 103 ++++++++++++++++++++++----------------- sql/field.h | 2 + sql/hostname.cc | 9 +++- sql/item.h | 7 ++- sql/item_func.cc | 73 +++++++++++++++++++++++++++ sql/item_func.h | 9 ++-- 11 files changed, 263 insertions(+), 59 deletions(-) diff --git a/configure.in b/configure.in index e90bea90dad..6efdc56d450 100644 --- a/configure.in +++ b/configure.in @@ -1860,6 +1860,9 @@ If you are using gcc 2.8.# you should upgrade to egcs 1.0.3 or newer and try again]); fi fi +AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include ]) +AC_CHECK_TYPES([size_t], [], [], [#include ]) + MYSQL_PTHREAD_YIELD ###################################################################### diff --git a/include/config-win.h b/include/config-win.h index 472190e53ca..b3865c1fda7 100644 --- a/include/config-win.h +++ b/include/config-win.h @@ -106,20 +106,33 @@ functions */ /* Type information */ +#if defined(__EMX__) || !defined(HAVE_UINT) +#undef HAVE_UINT +#define HAVE_UINT typedef unsigned short ushort; typedef unsigned int uint; +#endif /* defined(__EMX__) || !defined(HAVE_UINT) */ + typedef unsigned __int64 ulonglong; /* Microsofts 64 bit types */ typedef __int64 longlong; +#ifndef HAVE_SIGSET_T typedef int sigset_t; +#endif #define longlong_defined -/* off_t should not be __int64 because of conflicts in header files; - Use my_off_t or os_off_t instead */ +/* + off_t should not be __int64 because of conflicts in header files; + Use my_off_t or os_off_t instead +*/ +#ifndef HAVE_OFF_T typedef long off_t; +#endif typedef __int64 os_off_t; #ifdef _WIN64 typedef UINT_PTR rf_SetTimer; #else +#ifndef HAVE_SIZE_T typedef unsigned int size_t; +#endif typedef uint rf_SetTimer; #endif diff --git a/include/my_global.h b/include/my_global.h index 745179e8a06..bf6f3b52c4b 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -393,6 +393,8 @@ int __void__; #endif #if defined(__EMX__) || !defined(HAVE_UINT) +#undef HAVE_UINT +#define HAVE_UINT typedef unsigned int uint; typedef unsigned short ushort; #endif diff --git a/mysql-test/r/cast.result b/mysql-test/r/cast.result index 636e2603f9b..7cd0934f7a3 100644 --- a/mysql-test/r/cast.result +++ b/mysql-test/r/cast.result @@ -4,9 +4,6 @@ CAST(1-2 AS UNSIGNED) select CAST(CAST(1-2 AS UNSIGNED) AS SIGNED INTEGER); CAST(CAST(1-2 AS UNSIGNED) AS SIGNED INTEGER) -1 -select CONVERT('-1',UNSIGNED); -CONVERT('-1',UNSIGNED) -18446744073709551615 select cast(-5 as unsigned) | 1, cast(-5 as unsigned) & -1; cast(-5 as unsigned) | 1 cast(-5 as unsigned) & -1 18446744073709551611 18446744073709551611 @@ -57,6 +54,41 @@ CONVERT(DATE "2004-01-22 21:45:33",BINARY(4)) select CAST(DATE "2004-01-22 21:45:33" AS BINARY(4)); CAST(DATE "2004-01-22 21:45:33" AS BINARY(4)) 2004 +select cast('18446744073709551616' as unsigned); +cast('18446744073709551616' as unsigned) +18446744073709551615 +Warnings: +Warning 1292 Truncated incorrect INTEGER value: '18446744073709551616' +select cast('18446744073709551616' as signed); +cast('18446744073709551616' as signed) +-1 +Warnings: +Warning 1292 Truncated incorrect INTEGER value: '18446744073709551616' +select cast('9223372036854775809' as signed); +cast('9223372036854775809' as signed) +-9223372036854775807 +Warnings: +Warning 1105 Cast to signed converted positive out-of-range integer to it's negative complement +select cast('-1' as unsigned); +cast('-1' as unsigned) +18446744073709551615 +Warnings: +Warning 1105 Cast to unsigned converted negative integer to it's positive complement +select cast('abc' as signed); +cast('abc' as signed) +0 +Warnings: +Warning 1292 Truncated incorrect INTEGER value: 'abc' +select cast('1a' as signed); +cast('1a' as signed) +1 +Warnings: +Warning 1292 Truncated incorrect INTEGER value: '1a' +select cast('' as signed); +cast('' as signed) +0 +Warnings: +Warning 1292 Truncated incorrect INTEGER value: '' set names binary; select cast(_latin1'test' as char character set latin2); cast(_latin1'test' as char character set latin2) @@ -187,3 +219,36 @@ timediff(cast('2004-12-30 12:00:00' as time), '12:00:00') select timediff(cast('1 12:00:00' as time), '12:00:00'); timediff(cast('1 12:00:00' as time), '12:00:00') 24:00:00 +select cast(18446744073709551615 as unsigned); +cast(18446744073709551615 as unsigned) +18446744073709551615 +select cast(18446744073709551615 as signed); +cast(18446744073709551615 as signed) +-1 +select cast('18446744073709551615' as unsigned); +cast('18446744073709551615' as unsigned) +18446744073709551615 +select cast('18446744073709551615' as signed); +cast('18446744073709551615' as signed) +-1 +Warnings: +Warning 1105 Cast to signed converted positive out-of-range integer to it's negative complement +select cast('9223372036854775807' as signed); +cast('9223372036854775807' as signed) +9223372036854775807 +select cast(concat('184467440','73709551615') as unsigned); +cast(concat('184467440','73709551615') as unsigned) +18446744073709551615 +select cast(concat('184467440','73709551615') as signed); +cast(concat('184467440','73709551615') as signed) +-1 +Warnings: +Warning 1105 Cast to signed converted positive out-of-range integer to it's negative complement +select cast(repeat('1',20) as unsigned); +cast(repeat('1',20) as unsigned) +11111111111111111111 +select cast(repeat('1',20) as signed); +cast(repeat('1',20) as signed) +-7335632962598440505 +Warnings: +Warning 1105 Cast to signed converted positive out-of-range integer to it's negative complement diff --git a/mysql-test/t/cast.test b/mysql-test/t/cast.test index 23bba7d5aff..aeab81585f0 100644 --- a/mysql-test/t/cast.test +++ b/mysql-test/t/cast.test @@ -4,7 +4,6 @@ select CAST(1-2 AS UNSIGNED); select CAST(CAST(1-2 AS UNSIGNED) AS SIGNED INTEGER); -select CONVERT('-1',UNSIGNED); select cast(-5 as unsigned) | 1, cast(-5 as unsigned) & -1; select cast(-5 as unsigned) -1, cast(-5 as unsigned) + 1; select ~5, cast(~5 as signed); @@ -22,6 +21,15 @@ select CONVERT(DATE "2004-01-22 21:45:33",CHAR(4)); select CONVERT(DATE "2004-01-22 21:45:33",BINARY(4)); select CAST(DATE "2004-01-22 21:45:33" AS BINARY(4)); +# out-of-range cases +select cast('18446744073709551616' as unsigned); +select cast('18446744073709551616' as signed); +select cast('9223372036854775809' as signed); +select cast('-1' as unsigned); +select cast('abc' as signed); +select cast('1a' as signed); +select cast('' as signed); + # # Character set convertion # @@ -118,3 +126,19 @@ select date_add(cast('2004-12-30 12:00:00' as date), interval 0 hour); select timediff(cast('2004-12-30 12:00:00' as time), '12:00:00'); # Still we should not throw away "days" part of time value select timediff(cast('1 12:00:00' as time), '12:00:00'); + +# +# Bug #7036: Casting from string to unsigned would cap value of result at +# maximum signed value instead of maximum unsigned value +# +select cast(18446744073709551615 as unsigned); +select cast(18446744073709551615 as signed); +select cast('18446744073709551615' as unsigned); +select cast('18446744073709551615' as signed); +select cast('9223372036854775807' as signed); + +select cast(concat('184467440','73709551615') as unsigned); +select cast(concat('184467440','73709551615') as signed); + +select cast(repeat('1',20) as unsigned); +select cast(repeat('1',20) as signed); diff --git a/mysys/default.c b/mysys/default.c index 4ee2041bc39..bf23502389d 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -318,6 +318,56 @@ static int search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, } +/* + Skip over keyword and get argument after keyword + + SYNOPSIS + get_argument() + keyword Include directive keyword + kwlen Length of keyword + ptr Pointer to the keword in the line under process + line line number + + RETURN + 0 error + # Returns pointer to the argument after the keyword. +*/ + +static char *get_argument(const char *keyword, uint kwlen, + char *ptr, char *name, uint line) +{ + char *end; + + /* Skip over "include / includedir keyword" and following whitespace */ + + for (ptr+= kwlen - 1; + my_isspace(&my_charset_latin1, ptr[0]); + ptr++) + {} + + /* + Trim trailing whitespace from directory name + The -1 below is for the newline added by fgets() + Note that my_isspace() is true for \r and \n + */ + for (end= ptr + strlen(ptr) - 1; + my_isspace(&my_charset_latin1, *(end - 1)); + end--) + {} + end[0]= 0; /* Cut off end space */ + + /* Print error msg if there is nothing after !include* directive */ + if (end <= ptr) + { + fprintf(stderr, + "error: Wrong '!%s' directive in config file: %s at line %d\n", + keyword, name, line); + return 0; + } + return ptr; +} + + /* Open a configuration file (if exists) and read given options from it @@ -426,31 +476,10 @@ static int search_default_file_with_ext(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, sizeof(includedir_keyword) - 1)) && my_isspace(&my_charset_latin1, ptr[sizeof(includedir_keyword) - 1])) { - /* skip over "includedir" and following whitespace */ - for (ptr+= sizeof(includedir_keyword) - 1; - my_isspace(&my_charset_latin1, ptr[0]); ptr++) - {} - - /* - trim trailing whitespace from directory name - The -1 below is for the newline added by fgets() - Note that my_isspace() is true for \r and \n - */ - for (end= ptr + strlen(ptr) - 1; - my_isspace(&my_charset_latin1, *(end - 1)); - end--) - {} - end[0]= 0; - - /* print error msg if there is nothing after !includedir directive */ - if (end <= ptr) - { - fprintf(stderr, - "error: Wrong !includedir directive in config " - "file: %s at line %d\n", - name,line); - goto err; - } + if (!(ptr= get_argument(includedir_keyword, + sizeof(includedir_keyword), + ptr, name, line))) + goto err; if (!(search_dir= my_dir(ptr, MYF(MY_WME)))) goto err; @@ -486,26 +515,10 @@ static int search_default_file_with_ext(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, else if ((!strncmp(ptr, include_keyword, sizeof(include_keyword) - 1)) && my_isspace(&my_charset_latin1, ptr[sizeof(include_keyword)-1])) { - /* skip over `include' and following whitespace */ - for (ptr+= sizeof(include_keyword) - 1; - my_isspace(&my_charset_latin1, ptr[0]); ptr++) - {} - - /* trim trailing whitespace from filename */ - for (end= ptr + strlen(ptr) - 1; - my_isspace(&my_charset_latin1, *(end - 1)); - end--) - {} - end[0]= 0; - - if (end <= ptr) - { - fprintf(stderr, - "error: Wrong !include directive in config " - "file: %s at line %d\n", - name,line); - goto err; - } + if (!(ptr= get_argument(include_keyword, + sizeof(include_keyword), ptr, + name, line))) + goto err; search_default_file_with_ext(args, alloc, "", "", ptr, group, recursion_level + 1); diff --git a/sql/field.h b/sql/field.h index 5dc124aba35..f19771c3f9c 100644 --- a/sql/field.h +++ b/sql/field.h @@ -119,6 +119,7 @@ public: virtual String *val_str(String*,String *)=0; virtual Item_result result_type () const=0; virtual Item_result cmp_type () const { return result_type(); } + virtual Item_result cast_to_int_type () const { return result_type(); } static enum_field_types field_type_merge(enum_field_types, enum_field_types); static Item_result result_merge_type(enum_field_types); bool eq(Field *field) { return ptr == field->ptr && null_ptr == field->null_ptr; } @@ -1115,6 +1116,7 @@ public: } enum_field_types type() const { return FIELD_TYPE_STRING; } enum Item_result cmp_type () const { return INT_RESULT; } + enum Item_result cast_to_int_type () const { return INT_RESULT; } enum ha_base_keytype key_type() const; int store(const char *to,uint length,CHARSET_INFO *charset); int store(double nr); diff --git a/sql/hostname.cc b/sql/hostname.cc index c74d230bbcb..fe2fad6f3b2 100644 --- a/sql/hostname.cc +++ b/sql/hostname.cc @@ -177,7 +177,14 @@ my_string ip_to_hostname(struct in_addr *in, uint *errors) &tmp_errno))) { DBUG_PRINT("error",("gethostbyname_r returned %d",tmp_errno)); - add_wrong_ip(in); + /* + Don't cache responses when the DSN server is down, as otherwise + transient DNS failure may leave any number of clients (those + that attempted to connect during the outage) unable to connect + indefinitely. + */ + if (tmp_errno == HOST_NOT_FOUND || tmp_error == NO_DATA) + add_wrong_ip(in); my_gethostbyname_r_free(); DBUG_RETURN(0); } diff --git a/sql/item.h b/sql/item.h index d949095b455..d576fbbc60a 100644 --- a/sql/item.h +++ b/sql/item.h @@ -180,7 +180,8 @@ public: { return save_in_field(field, 1); } virtual bool send(Protocol *protocol, String *str); virtual bool eq(const Item *, bool binary_cmp) const; - virtual Item_result result_type () const { return REAL_RESULT; } + virtual Item_result result_type() const { return REAL_RESULT; } + virtual Item_result cast_to_int_type() const { return result_type(); } virtual enum_field_types field_type() const; virtual enum Type type() const =0; /* valXXX methods must return NULL or 0 or 0.0 if null_value is set. */ @@ -422,6 +423,10 @@ public: { return field->result_type(); } + Item_result cast_to_int_type() const + { + return field->cast_to_int_type(); + } enum_field_types field_type() const { return field->type(); diff --git a/sql/item_func.cc b/sql/item_func.cc index 2b38584fe23..1b80ef06251 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -582,6 +582,58 @@ void Item_func_signed::print(String *str) } +longlong Item_func_signed::val_int_from_str(int *error) +{ + char buff[MAX_FIELD_WIDTH], *end; + String tmp(buff,sizeof(buff), &my_charset_bin), *res; + longlong value; + + /* + For a string result, we must first get the string and then convert it + to a longlong + */ + + if (!(res= args[0]->val_str(&tmp))) + { + null_value= 1; + *error= 0; + return 0; + } + null_value= 0; + end= (char*) res->ptr()+ res->length(); + value= my_strtoll10(res->ptr(), &end, error); + if (*error > 0 || end != res->ptr()+ res->length()) + push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN, + ER_TRUNCATED_WRONG_VALUE, + ER(ER_TRUNCATED_WRONG_VALUE), "INTEGER", + res->c_ptr()); + return value; +} + + +longlong Item_func_signed::val_int() +{ + longlong value; + int error; + + if (args[0]->cast_to_int_type() != STRING_RESULT) + { + value= args[0]->val_int(); + null_value= args[0]->null_value; + return value; + } + + value= val_int_from_str(&error); + if (value < 0 && error == 0) + { + push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_UNKNOWN_ERROR, + "Cast to signed converted positive out-of-range integer to " + "it's negative complement"); + } + return value; +} + + void Item_func_unsigned::print(String *str) { str->append("cast(", 5); @@ -591,6 +643,27 @@ void Item_func_unsigned::print(String *str) } +longlong Item_func_unsigned::val_int() +{ + longlong value; + int error; + + if (args[0]->cast_to_int_type() != STRING_RESULT) + { + value= args[0]->val_int(); + null_value= args[0]->null_value; + return value; + } + + value= val_int_from_str(&error); + if (error < 0) + push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_UNKNOWN_ERROR, + "Cast to unsigned converted negative integer to it's " + "positive complement"); + return value; +} + + double Item_func_plus::val() { DBUG_ASSERT(fixed == 1); diff --git a/sql/item_func.h b/sql/item_func.h index 3a309f4ae99..288db3a148c 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -226,12 +226,8 @@ public: null_value= args[0]->null_value; return tmp; } - longlong val_int() - { - longlong tmp= args[0]->val_int(); - null_value= args[0]->null_value; - return tmp; - } + longlong val_int(); + longlong val_int_from_str(int *error); void fix_length_and_dec() { max_length=args[0]->max_length; unsigned_flag=0; } void print(String *str); @@ -245,6 +241,7 @@ public: const char *func_name() const { return "cast_as_unsigned"; } void fix_length_and_dec() { max_length=args[0]->max_length; unsigned_flag=1; } + longlong val_int(); void print(String *str); }; From 054463f975334e24853c26d6a1dfd1f3a2919dc1 Mon Sep 17 00:00:00 2001 From: "hf@deer.(none)" <> Date: Fri, 29 Apr 2005 20:23:02 +0500 Subject: [PATCH 46/51] Fix for #6553 and #8776 (no errors on bad spatial data) --- mysql-test/r/gis-rtree.result | 2 +- mysql-test/r/gis.result | 14 ++++++++++++-- mysql-test/t/gis-rtree.test | 2 +- mysql-test/t/gis.test | 16 ++++++++++++++-- sql/field.cc | 30 +++++++++++++++++++++++++++++- sql/field.h | 6 +++--- sql/item_geofunc.cc | 7 +++++-- sql/share/errmsg.txt | 2 ++ sql/spatial.cc | 2 ++ sql/spatial.h | 2 ++ sql/sql_base.cc | 5 +---- 11 files changed, 72 insertions(+), 16 deletions(-) diff --git a/mysql-test/r/gis-rtree.result b/mysql-test/r/gis-rtree.result index 0e558e47594..73cde35993e 100644 --- a/mysql-test/r/gis-rtree.result +++ b/mysql-test/r/gis-rtree.result @@ -801,5 +801,5 @@ CREATE TABLE t1 (st varchar(100)); INSERT INTO t1 VALUES ("Fake string"); CREATE TABLE t2 (geom GEOMETRY NOT NULL, SPATIAL KEY gk(geom)); INSERT INTO t2 SELECT GeomFromText(st) FROM t1; -ERROR HY000: Unknown error +ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field drop table t1, t2; diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result index 3b196a60d68..93216fe2003 100644 --- a/mysql-test/r/gis.result +++ b/mysql-test/r/gis.result @@ -461,9 +461,9 @@ Note 1003 select issimple(multipoint(point(3,6),point(4,10))) AS `issimple(Multi create table t1 (a geometry not null); insert into t1 values (GeomFromText('Point(1 2)')); insert into t1 values ('Garbage'); -ERROR HY000: Unknown error +ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field insert IGNORE into t1 values ('Garbage'); -ERROR HY000: Unknown error +ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field alter table t1 add spatial index(a); drop table t1; create table t1(a geometry not null, spatial index(a)); @@ -655,3 +655,13 @@ t1 where object_id=85984; object_id geometrytype(geo) ISSIMPLE(GEO) ASTEXT(centroid(geo)) 85984 MULTIPOLYGON 0 POINT(-114.87787186923 36.33101763469) drop table t1; +create table t1 (fl geometry); +insert into t1 values (1); +ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field +insert into t1 values (1.11); +ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field +insert into t1 values ("qwerty"); +ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field +insert into t1 values (pointfromtext('point(1,1)')); +ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field +drop table t1; diff --git a/mysql-test/t/gis-rtree.test b/mysql-test/t/gis-rtree.test index da59c6ae5e4..522f7a6f637 100644 --- a/mysql-test/t/gis-rtree.test +++ b/mysql-test/t/gis-rtree.test @@ -168,6 +168,6 @@ drop table t1; CREATE TABLE t1 (st varchar(100)); INSERT INTO t1 VALUES ("Fake string"); CREATE TABLE t2 (geom GEOMETRY NOT NULL, SPATIAL KEY gk(geom)); ---error 1105 +--error 1416 INSERT INTO t2 SELECT GeomFromText(st) FROM t1; drop table t1, t2; diff --git a/mysql-test/t/gis.test b/mysql-test/t/gis.test index 86c34eacbc5..b7071019e9d 100644 --- a/mysql-test/t/gis.test +++ b/mysql-test/t/gis.test @@ -165,9 +165,9 @@ explain extended select issimple(MultiPoint(Point(3, 6), Point(4, 10))), issimpl create table t1 (a geometry not null); insert into t1 values (GeomFromText('Point(1 2)')); --- error 1105 +-- error 1416 insert into t1 values ('Garbage'); --- error 1105 +-- error 1416 insert IGNORE into t1 values ('Garbage'); alter table t1 add spatial index(a); @@ -359,3 +359,15 @@ select object_id, geometrytype(geo), ISSIMPLE(GEO), ASTEXT(centroid(geo)) from t1 where object_id=85984; drop table t1; + +create table t1 (fl geometry); +--error 1416 +insert into t1 values (1); +--error 1416 +insert into t1 values (1.11); +--error 1416 +insert into t1 values ("qwerty"); +--error 1416 +insert into t1 values (pointfromtext('point(1,1)')); + +drop table t1; diff --git a/sql/field.cc b/sql/field.cc index 00f729d5b07..c59d9b63fca 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -7267,12 +7267,38 @@ void Field_geom::sql_type(String &res) const } +int Field_geom::store(double nr) +{ + my_message(ER_CANT_CREATE_GEOMETRY_OBJECT, + ER(ER_CANT_CREATE_GEOMETRY_OBJECT), MYF(0)); + return -1; +} + + +int Field_geom::store(longlong nr) +{ + my_message(ER_CANT_CREATE_GEOMETRY_OBJECT, + ER(ER_CANT_CREATE_GEOMETRY_OBJECT), MYF(0)); + return -1; +} + + +int Field_geom::store_decimal(const my_decimal *) +{ + my_message(ER_CANT_CREATE_GEOMETRY_OBJECT, + ER(ER_CANT_CREATE_GEOMETRY_OBJECT), MYF(0)); + return -1; +} + + int Field_geom::store(const char *from, uint length, CHARSET_INFO *cs) { if (!length) bzero(ptr, Field_blob::pack_length()); else { + if (from == Geometry::bad_geometry_data.ptr()) + goto err; // Check given WKB uint32 wkb_type; if (length < SRID_SIZE + WKB_HEADER_SIZE + SIZEOF_STORED_DOUBLE*2) @@ -7280,7 +7306,7 @@ int Field_geom::store(const char *from, uint length, CHARSET_INFO *cs) wkb_type= uint4korr(from + WKB_HEADER_SIZE); if (wkb_type < (uint32) Geometry::wkb_point || wkb_type > (uint32) Geometry::wkb_end) - return -1; + goto err; Field_blob::store_length(length); if (table->copy_blobs || length <= MAX_FIELD_WIDTH) { // Must make a copy @@ -7293,6 +7319,8 @@ int Field_geom::store(const char *from, uint length, CHARSET_INFO *cs) err: bzero(ptr, Field_blob::pack_length()); + my_message(ER_CANT_CREATE_GEOMETRY_OBJECT, + ER(ER_CANT_CREATE_GEOMETRY_OBJECT), MYF(0)); return -1; } diff --git a/sql/field.h b/sql/field.h index 22787850442..0f1cc0b95aa 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1189,9 +1189,9 @@ public: enum_field_types type() const { return FIELD_TYPE_GEOMETRY; } void sql_type(String &str) const; int store(const char *to, uint length, CHARSET_INFO *charset); - int store(double nr) { return 1; } - int store(longlong nr) { return 1; } - int store_decimal(const my_decimal *) { return 1; } + int store(double nr); + int store(longlong nr); + int store_decimal(const my_decimal *); void get_key_image(char *buff,uint length,imagetype type); }; #endif /*HAVE_SPATIAL*/ diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc index 1a8cb50081b..b9f2ec8a6ca 100644 --- a/sql/item_geofunc.cc +++ b/sql/item_geofunc.cc @@ -55,8 +55,11 @@ String *Item_func_geometry_from_text::val_str(String *str) return 0; str->length(0); str->q_append(srid); - if ((null_value= !Geometry::create_from_wkt(&buffer, &trs, str, 0))) - return 0; + if (!Geometry::create_from_wkt(&buffer, &trs, str, 0)) + /* We shouldn't return NULL here as NULL is a legal spatial object */ + /* Geometry::bad_spatial_data will produce error message beeing stored*/ + /* in GEOMETRY field */ + return &Geometry::bad_geometry_data; return str; } diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 3a311ff7917..050bbe86948 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -5344,3 +5344,5 @@ ER_SP_NOT_VAR_ARG 42000 eng "OUT or INOUT argument %d for routine %s is not a variable" ER_SP_NO_RETSET_IN_FUNC 0A000 eng "Not allowed to return a result set from a function" +ER_CANT_CREATE_GEOMETRY_OBJECT 22003 + eng "Cannot get geometry object from data you send to the GEOMETRY field" diff --git a/sql/spatial.cc b/sql/spatial.cc index bcfefd9dde8..427648850e4 100644 --- a/sql/spatial.cc +++ b/sql/spatial.cc @@ -22,6 +22,8 @@ /***************************** Gis_class_info *******************************/ +String Geometry::bad_geometry_data("Bad object", &my_charset_bin); + Geometry::Class_info *Geometry::ci_collection[Geometry::wkb_end+1]= { NULL, NULL, NULL, NULL, NULL, NULL, NULL diff --git a/sql/spatial.h b/sql/spatial.h index b96434831a1..438ec171a72 100644 --- a/sql/spatial.h +++ b/sql/spatial.h @@ -173,6 +173,8 @@ public: static void operator delete(void *ptr, void *buffer) {} + static String bad_geometry_data; + enum wkbType { wkb_point= 1, diff --git a/sql/sql_base.cc b/sql/sql_base.cc index d79811aa4e2..ade1fb96b96 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -3858,11 +3858,8 @@ fill_record(THD *thd, Field **ptr, List &values, bool ignore_errors) TABLE *table= field->table; if (field == table->next_number_field) table->auto_increment_field_not_null= TRUE; - if ((value->save_in_field(field, 0) < 0) && !ignore_errors) - { - my_message(ER_UNKNOWN_ERROR, ER(ER_UNKNOWN_ERROR), MYF(0)); + if (value->save_in_field(field, 0) == -1) DBUG_RETURN(TRUE); - } } DBUG_RETURN(thd->net.report_error); } From b11705a2b02677766d56f0d25575db14af66aca9 Mon Sep 17 00:00:00 2001 From: "evgen@moonbone.local" <> Date: Fri, 29 Apr 2005 21:19:39 +0400 Subject: [PATCH 47/51] Fix bug #9703 "Error 1032 with GROUP BY query and large tables" Reset old error if tmp table was successfully created. Test data is large and can be found in bug report along with test query. --- BitKeeper/etc/logging_ok | 2 ++ sql/sql_select.cc | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index e4de8c6ebf2..330d28daf52 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -45,6 +45,8 @@ dlenev@build.mysql.com dlenev@jabberwock.localdomain dlenev@mysql.com ejonore@mc03.ndb.mysql.com +evgen@moonbone.(none) +evgen@moonbone.local gbichot@quadita2.mysql.com gbichot@quadxeon.mysql.com georg@beethoven.local diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 36efe26dff9..96958db2cce 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -6891,6 +6891,11 @@ end_write_group(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), &join->tmp_table_param, error, 0)) DBUG_RETURN(-1); + /* + If table->file->write_row() was failed because of 'out of memory' + and tmp table succesfully created, reset error. + */ + error=0; } if (join->rollup.state != ROLLUP::STATE_NONE && error <= 0) { From 96aeab05d103093079b4decb97277bcd5c548e00 Mon Sep 17 00:00:00 2001 From: "sergefp@mysql.com" <> Date: Sat, 30 Apr 2005 01:05:15 +0400 Subject: [PATCH 48/51] Fix for BUG#10274: In Protocol_simple::store_long don't make any assumptions about relative sizes of int/long/longlong. --- sql/protocol.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/protocol.cc b/sql/protocol.cc index 485605ce8cd..91061426f04 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -810,7 +810,7 @@ bool Protocol_simple::store_long(longlong from) #endif char buff[20]; return net_store_data((char*) buff, - (uint) (int10_to_str((int)from,buff, (from <0)?-10:10)-buff)); + (uint) (int10_to_str((long int)from,buff, (from <0)?-10:10)-buff)); } From 129c604032af4b86f7bf23bb06f4223795f75b61 Mon Sep 17 00:00:00 2001 From: "monty@mysql.com" <> Date: Sat, 30 Apr 2005 03:14:42 +0300 Subject: [PATCH 49/51] Setting a variable to CAST(NULL as X) set the result type of the variable to X. (Bug #6598) --- mysql-test/r/bigint.result | 17 +++++++++++++++ mysql-test/r/user_var.result | 41 ++++++++++++++++++++++++++++++++++++ mysql-test/t/bigint.test | 10 +++++++++ mysql-test/t/user_var.test | 26 +++++++++++++++++++++++ sql/item_func.cc | 15 +++++++++---- sql/item_func.h | 1 + sql/unireg.cc | 7 ++++-- 7 files changed, 111 insertions(+), 6 deletions(-) diff --git a/mysql-test/r/bigint.result b/mysql-test/r/bigint.result index e372c307ba7..a0c8f317db2 100644 --- a/mysql-test/r/bigint.result +++ b/mysql-test/r/bigint.result @@ -128,3 +128,20 @@ t2.value64=t1.value64; value64 value32 value64 value32 9223372036854775807 2 9223372036854775807 4 drop table t1, t2; +create table t1 select 1 as 'a'; +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` bigint(1) NOT NULL default '0' +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +drop table t1; +create table t1 select 9223372036854775809 as 'a'; +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `a` bigint(19) unsigned NOT NULL default '0' +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +select * from t1; +a +9223372036854775809 +drop table t1; diff --git a/mysql-test/r/user_var.result b/mysql-test/r/user_var.result index 68eae111111..d9a647ce2c3 100644 --- a/mysql-test/r/user_var.result +++ b/mysql-test/r/user_var.result @@ -182,3 +182,44 @@ coercibility(@v1) coercibility(@v2) coercibility(@v3) coercibility(@v4) set session @honk=99; set one_shot @honk=99; ERROR HY000: The 'SET ONE_SHOT' syntax is reserved for purposes internal to the MySQL server +set @first_var= NULL; +create table t1 select @first_var; +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `@first_var` longblob +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +drop table t1; +set @first_var= cast(NULL as signed integer); +create table t1 select @first_var; +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `@first_var` bigint(20) default NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +drop table t1; +set @first_var= NULL; +create table t1 select @first_var; +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `@first_var` bigint(20) default NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +drop table t1; +set @first_var= concat(NULL); +create table t1 select @first_var; +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `@first_var` longblob +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +drop table t1; +set @first_var=1; +set @first_var= cast(NULL as CHAR); +create table t1 select @first_var; +show create table t1; +Table Create Table +t1 CREATE TABLE `t1` ( + `@first_var` longtext +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +drop table t1; diff --git a/mysql-test/t/bigint.test b/mysql-test/t/bigint.test index a26b78254e7..99c8a13d0b5 100644 --- a/mysql-test/t/bigint.test +++ b/mysql-test/t/bigint.test @@ -104,3 +104,13 @@ t2.value64=t1.value64; drop table t1, t2; +# +# Test of CREATE ... SELECT and unsigned integers +# +create table t1 select 1 as 'a'; +show create table t1; +drop table t1; +create table t1 select 9223372036854775809 as 'a'; +show create table t1; +select * from t1; +drop table t1; diff --git a/mysql-test/t/user_var.test b/mysql-test/t/user_var.test index ef360f2231d..b9d06558f34 100644 --- a/mysql-test/t/user_var.test +++ b/mysql-test/t/user_var.test @@ -119,3 +119,29 @@ select coercibility(@v1),coercibility(@v2),coercibility(@v3),coercibility(@v4); set session @honk=99; --error 1382 set one_shot @honk=99; + +# +# Bug #6598: problem with cast(NULL as signed integer); +# + +set @first_var= NULL; +create table t1 select @first_var; +show create table t1; +drop table t1; +set @first_var= cast(NULL as signed integer); +create table t1 select @first_var; +show create table t1; +drop table t1; +set @first_var= NULL; +create table t1 select @first_var; +show create table t1; +drop table t1; +set @first_var= concat(NULL); +create table t1 select @first_var; +show create table t1; +drop table t1; +set @first_var=1; +set @first_var= cast(NULL as CHAR); +create table t1 select @first_var; +show create table t1; +drop table t1; diff --git a/sql/item_func.cc b/sql/item_func.cc index fb21551e22f..6075f1f6bc3 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -3271,7 +3271,8 @@ bool Item_func_set_user_var::fix_fields(THD *thd, TABLE_LIST *tables, from the argument if the argument is NULL and the variable has previously been initialized. */ - if (!entry->collation.collation || !args[0]->null_value) + null_item= (args[0]->type() == NULL_ITEM); + if (!entry->collation.collation || !null_item) entry->collation.set(args[0]->collation.collation, DERIVATION_IMPLICIT); collation.set(entry->collation.collation, DERIVATION_IMPLICIT); cached_result_type= args[0]->result_type(); @@ -3315,8 +3316,8 @@ update_hash(user_var_entry *entry, bool set_null, void *ptr, uint length, char *pos= (char*) entry+ ALIGN_SIZE(sizeof(user_var_entry)); if (entry->value && entry->value != pos) my_free(entry->value,MYF(0)); - entry->value=0; - entry->length=0; + entry->value= 0; + entry->length= 0; } else { @@ -3355,9 +3356,9 @@ update_hash(user_var_entry *entry, bool set_null, void *ptr, uint length, if (type == DECIMAL_RESULT) ((my_decimal*)entry->value)->fix_buffer_pointer(); entry->length= length; - entry->type=type; entry->collation.set(cs, dv); } + entry->type=type; return 0; } @@ -3366,6 +3367,12 @@ bool Item_func_set_user_var::update_hash(void *ptr, uint length, Item_result type, CHARSET_INFO *cs, Derivation dv) { + /* + If we set a variable explicitely to NULL then keep the old + result type of the variable + */ + if ((null_value= args[0]->null_value) && null_item) + type= entry->type; // Don't change type of item if (::update_hash(entry, (null_value= args[0]->null_value), ptr, length, type, cs, dv)) { diff --git a/sql/item_func.h b/sql/item_func.h index 77b977fe778..3f45cad7dc3 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -1071,6 +1071,7 @@ class Item_func_set_user_var :public Item_func char buffer[MAX_FIELD_WIDTH]; String value; my_decimal decimal_buff; + bool null_item; union { longlong vint; diff --git a/sql/unireg.cc b/sql/unireg.cc index 929ca5c672e..95a383e0f01 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -685,6 +685,9 @@ static bool make_empty_rec(THD *thd, File file,enum db_type table_type, thd->count_cuted_fields= CHECK_FIELD_WARN; // To find wrong default values while ((field=it++)) { + /* + regfield don't have to be deleted as it's allocated with sql_alloc() + */ Field *regfield=make_field((char*) buff+field->offset,field->length, null_pos, null_count & 7, @@ -696,7 +699,8 @@ static bool make_empty_rec(THD *thd, File file,enum db_type table_type, field->interval, field->field_name, &table); - DBUG_ASSERT(regfield); + if (!regfield) + goto err; // End of memory if (!(field->flags & NOT_NULL_FLAG)) null_count++; @@ -730,7 +734,6 @@ static bool make_empty_rec(THD *thd, File file,enum db_type table_type, regfield->store(ER(ER_NO), (uint) strlen(ER(ER_NO)),system_charset_info); else regfield->reset(); - delete regfield; } /* Fill not used startpos */ From 6040b0abf64ea66f9394b038eba18f4a33d26e42 Mon Sep 17 00:00:00 2001 From: "konstantin@mysql.com" <> Date: Sat, 30 Apr 2005 09:54:35 +0400 Subject: [PATCH 50/51] A fix and a test case for Bug#9520 "SELECT DISTINCT crashes server with cursor". The patch refactors do_select/sub_select functions, which implement the nested loop algorithm, and reuses them to fetch rows for cursors as well. Pushing with view.test failing (--ps-protocol). --- sql/sql_prepare.cc | 2 +- sql/sql_select.cc | 742 ++++++++++++++++++++------------------ sql/sql_select.h | 18 +- tests/mysql_client_test.c | 54 +++ 4 files changed, 456 insertions(+), 360 deletions(-) diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 56d09d7c563..17c5f51f1e1 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -2223,7 +2223,7 @@ void mysql_stmt_fetch(THD *thd, char *packet, uint packet_length) my_pthread_setprio(pthread_self(), QUERY_PRIOR); thd->protocol= &thd->protocol_prep; // Switch to binary protocol - (void) stmt->cursor->fetch(num_rows); + stmt->cursor->fetch(num_rows); thd->protocol= &thd->protocol_simple; // Use normal protocol if (!(specialflag & SPECIAL_NO_PRIOR)) diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 9b93a92c6aa..49e77e1c2dd 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -114,17 +114,31 @@ static bool create_myisam_tmp_table(TABLE *table,TMP_TABLE_PARAM *param, static Next_select_func setup_end_select_func(JOIN *join); static int do_select(JOIN *join,List *fields,TABLE *tmp_table, Procedure *proc); -static int sub_select_cache(JOIN *join,JOIN_TAB *join_tab,bool end_of_records); -static int sub_select(JOIN *join,JOIN_TAB *join_tab,bool end_of_records); -static int flush_cached_records(JOIN *join,JOIN_TAB *join_tab,bool skip_last); -static int end_send(JOIN *join, JOIN_TAB *join_tab, bool end_of_records); -static int end_send_group(JOIN *join, JOIN_TAB *join_tab,bool end_of_records); -static int end_write(JOIN *join, JOIN_TAB *join_tab, bool end_of_records); -static int end_update(JOIN *join, JOIN_TAB *join_tab, bool end_of_records); -static int end_unique_update(JOIN *join,JOIN_TAB *join_tab, - bool end_of_records); -static int end_write_group(JOIN *join, JOIN_TAB *join_tab, - bool end_of_records); + +static enum_nested_loop_state +sub_select_cache(JOIN *join, JOIN_TAB *join_tab, bool end_of_records); +static enum_nested_loop_state +evaluate_join_record(JOIN *join, JOIN_TAB *join_tab, + int error, my_bool *report_error); +static enum_nested_loop_state +evaluate_null_complemented_join_record(JOIN *join, JOIN_TAB *join_tab); +static enum_nested_loop_state +sub_select(JOIN *join,JOIN_TAB *join_tab, bool end_of_records); +static enum_nested_loop_state +flush_cached_records(JOIN *join, JOIN_TAB *join_tab, bool skip_last); +static enum_nested_loop_state +end_send(JOIN *join, JOIN_TAB *join_tab, bool end_of_records); +static enum_nested_loop_state +end_send_group(JOIN *join, JOIN_TAB *join_tab, bool end_of_records); +static enum_nested_loop_state +end_write(JOIN *join, JOIN_TAB *join_tab, bool end_of_records); +static enum_nested_loop_state +end_update(JOIN *join, JOIN_TAB *join_tab, bool end_of_records); +static enum_nested_loop_state +end_unique_update(JOIN *join, JOIN_TAB *join_tab, bool end_of_records); +static enum_nested_loop_state +end_write_group(JOIN *join, JOIN_TAB *join_tab, bool end_of_records); + static int test_if_group_changed(List &list); static int join_read_const_table(JOIN_TAB *tab, POSITION *pos); static int join_read_system(JOIN_TAB *tab); @@ -1800,13 +1814,7 @@ Cursor::open(JOIN *join_arg) happen for the first table in join_tab list */ DBUG_ASSERT(join_tab->table->null_row == 0); - - /* - There is always at least one record in the table, as otherwise we - wouldn't have opened the cursor. Therefore a failure is the only - reason read_first_record can return not 0. - */ - DBUG_RETURN(join_tab->read_first_record(join_tab)); + DBUG_RETURN(0); } @@ -1816,97 +1824,36 @@ Cursor::open(JOIN *join_arg) PRECONDITION: Cursor is open RETURN VALUES: - -4 there are more rows, send_eof sent to the client - 0 no more rows, send_eof was sent to the client, cursor is closed - other fatal fetch error, cursor is closed (error is not reported) + none, this function will send error or OK to network if necessary. */ -int +void Cursor::fetch(ulong num_rows) { THD *thd= join->thd; JOIN_TAB *join_tab= join->join_tab + join->const_tables; - COND *on_expr= *join_tab->on_expr_ref; - COND *select_cond= join_tab->select_cond; - READ_RECORD *info= &join_tab->read_record; - int error= 0; + enum_nested_loop_state error= NESTED_LOOP_OK; /* save references to memory, allocated during fetch */ thd->set_n_backup_item_arena(this, &thd->stmt_backup); join->fetch_limit+= num_rows; - /* - Run while there are new rows in the first table; - For each row, satisfying ON and WHERE clauses (those parts of them which - can be evaluated early), call next_select. - */ - do - { - int no_more_rows; - join->examined_rows++; - - if (thd->killed) /* Aborted by user */ - { - my_message(ER_SERVER_SHUTDOWN, ER(ER_SERVER_SHUTDOWN), MYF(0)); - return -1; - } - - if (on_expr == 0 || on_expr->val_int()) - { - if (select_cond == 0 || select_cond->val_int()) - { - /* - TODO: call table->unlock_row() to unlock row failed selection, - when this feature will be used. - */ - error= join_tab->next_select(join, join_tab + 1, 0); - DBUG_ASSERT(error <= 0); - if (error) - { - /* real error or LIMIT/FETCH LIMIT worked */ - if (error == -4) - { - /* - FETCH LIMIT, read ahead one row, and close cursor - if there is no more rows XXX: to be fixed to support - non-equi-joins! - */ - if ((no_more_rows= info->read_record(info))) - error= no_more_rows > 0 ? -1: 0; - } - break; - } - } - } - /* read next row; break loop if there was an error */ - if ((no_more_rows= info->read_record(info))) - { - if (no_more_rows > 0) - error= -1; - else - { - enum { END_OF_RECORDS= 1 }; - error= join_tab->next_select(join, join_tab+1, (int) END_OF_RECORDS); - } - break; - } - } - while (thd->net.report_error == 0); - - if (thd->net.report_error) - error= -1; - - if (error == -3) /* LIMIT clause worked */ - error= 0; + error= sub_select(join, join_tab, 0); + if (error == NESTED_LOOP_OK || error == NESTED_LOOP_NO_MORE_ROWS) + error= sub_select(join,join_tab,1); + if (error == NESTED_LOOP_QUERY_LIMIT) + error= NESTED_LOOP_OK; /* select_limit used */ + if (error == NESTED_LOOP_CURSOR_LIMIT) + join->resume_nested_loop= TRUE; #ifdef USING_TRANSACTIONS ha_release_temporary_latches(thd); #endif thd->restore_backup_item_arena(this, &thd->stmt_backup); - if (error == -4) + if (error == NESTED_LOOP_CURSOR_LIMIT) { /* Fetch limit worked, possibly more rows are there */ thd->server_status|= SERVER_STATUS_CURSOR_EXISTS; @@ -1916,20 +1863,19 @@ Cursor::fetch(ulong num_rows) else { close(); - if (error == 0) + if (error == NESTED_LOOP_OK) { thd->server_status|= SERVER_STATUS_LAST_ROW_SENT; ::send_eof(thd); thd->server_status&= ~SERVER_STATUS_LAST_ROW_SENT; } - else + else if (error != NESTED_LOOP_KILLED) my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0)); /* free cursor memory */ free_items(free_list); free_list= 0; free_root(&main_mem_root, MYF(0)); } - return error; } @@ -8948,7 +8894,8 @@ static Next_select_func setup_end_select_func(JOIN *join) static int do_select(JOIN *join,List *fields,TABLE *table,Procedure *procedure) { - int error= 0; + int rc= 0; + enum_nested_loop_state error= NESTED_LOOP_OK; JOIN_TAB *join_tab; DBUG_ENTER("do_select"); @@ -8978,24 +8925,30 @@ do_select(JOIN *join,List *fields,TABLE *table,Procedure *procedure) if (!join->conds || join->conds->val_int()) { Next_select_func end_select= join->join_tab[join->tables-1].next_select; - if (!(error=(*end_select)(join,join_tab,0)) || error == -3) - error=(*end_select)(join,join_tab,1); + error= (*end_select)(join,join_tab,0); + if (error == NESTED_LOOP_OK || error == NESTED_LOOP_QUERY_LIMIT) + error= (*end_select)(join,join_tab,1); } else if (join->send_row_on_empty_set()) - error= join->result->send_data(*join->fields); + rc= join->result->send_data(*join->fields); } else { error= sub_select(join,join_tab,0); - if (error >= 0) + if (error == NESTED_LOOP_OK || error == NESTED_LOOP_NO_MORE_ROWS) error= sub_select(join,join_tab,1); - if (error == -3) - error= 0; /* select_limit used */ + if (error == NESTED_LOOP_QUERY_LIMIT) + error= NESTED_LOOP_OK; /* select_limit used */ } + if (error == NESTED_LOOP_NO_MORE_ROWS) + error= NESTED_LOOP_OK; - if (error >= 0) + if (error == NESTED_LOOP_OK) { - error=0; + /* + Sic: this branch works even if rc != 0, e.g. when + send_data above returns an error. + */ if (!table) // If sending data to client { /* @@ -9004,10 +8957,12 @@ do_select(JOIN *join,List *fields,TABLE *table,Procedure *procedure) */ join->join_free(0); // Unlock all cursors if (join->result->send_eof()) - error= 1; // Don't send error + rc= 1; // Don't send error } DBUG_PRINT("info",("%ld records output",join->send_records)); } + else + rc= -1; if (table) { int tmp, new_errno= 0; @@ -9025,40 +8980,42 @@ do_select(JOIN *join,List *fields,TABLE *table,Procedure *procedure) table->file->print_error(new_errno,MYF(0)); } #ifndef DBUG_OFF - if (error) + if (rc) { DBUG_PRINT("error",("Error: do_select() failed")); } #endif - DBUG_RETURN(join->thd->net.report_error ? -1 : error); + DBUG_RETURN(join->thd->net.report_error ? -1 : rc); } -static int +static enum_nested_loop_state sub_select_cache(JOIN *join,JOIN_TAB *join_tab,bool end_of_records) { - int error; + enum_nested_loop_state rc; if (end_of_records) { - if ((error=flush_cached_records(join,join_tab,FALSE)) < 0) - return error; /* purecov: inspected */ - return sub_select(join,join_tab,end_of_records); + rc= flush_cached_records(join,join_tab,FALSE); + if (rc == NESTED_LOOP_OK || rc == NESTED_LOOP_NO_MORE_ROWS) + rc= sub_select(join,join_tab,end_of_records); + return rc; } if (join->thd->killed) // If aborted by user { join->thd->send_kill_message(); - return -2; /* purecov: inspected */ + return NESTED_LOOP_KILLED; /* purecov: inspected */ } if (join_tab->use_quick != 2 || test_if_quick_select(join_tab) <= 0) { if (!store_record_in_cache(&join_tab->cache)) - return 0; // There is more room in cache + return NESTED_LOOP_OK; // There is more room in cache return flush_cached_records(join,join_tab,FALSE); } - if ((error=flush_cached_records(join,join_tab,TRUE)) < 0) - return error; /* purecov: inspected */ - return sub_select(join,join_tab,end_of_records); /* Use ordinary select */ + rc= flush_cached_records(join, join_tab, TRUE); + if (rc == NESTED_LOOP_OK || rc == NESTED_LOOP_NO_MORE_ROWS) + rc= sub_select(join, join_tab, end_of_records); + return rc; } /* @@ -9170,11 +9127,10 @@ sub_select_cache(JOIN *join,JOIN_TAB *join_tab,bool end_of_records) table of the embedding nested join, if any. RETURN - 0, if success - # of the error, otherwise + return one of enum_nested_loop_state, except NESTED_LOOP_NO_MORE_ROWS. */ -static int +static enum_nested_loop_state sub_select(JOIN *join,JOIN_TAB *join_tab,bool end_of_records) { join_tab->table->null_row=0; @@ -9182,206 +9138,258 @@ sub_select(JOIN *join,JOIN_TAB *join_tab,bool end_of_records) return (*join_tab->next_select)(join,join_tab+1,end_of_records); int error; - JOIN_TAB *first_unmatched; - JOIN_TAB *tab; - /* Cache variables for faster loop */ - COND *select_cond= join_tab->select_cond; + enum_nested_loop_state rc; my_bool *report_error= &(join->thd->net.report_error); + READ_RECORD *info= &join_tab->read_record; - join->return_tab= join_tab; - - if (join_tab->last_inner) + if (join->resume_nested_loop) { - /* join_tab is the first inner table for an outer join operation. */ - - /* Set initial state of guard variables for this table.*/ - join_tab->found=0; - join_tab->not_null_compl= 1; - - /* Set first_unmatched for the last inner table of this group */ - join_tab->last_inner->first_unmatched= join_tab; + /* If not the last table, plunge down the nested loop */ + if (join_tab < join->join_tab + join->tables - 1) + rc= (*join_tab->next_select)(join, join_tab + 1, 0); + else + { + join->resume_nested_loop= FALSE; + rc= NESTED_LOOP_OK; + } } - - if (!(error=(*join_tab->read_first_record)(join_tab))) + else { - bool not_exists_optimize= join_tab->table->reginfo.not_exists_optimize; - bool not_used_in_distinct=join_tab->not_used_in_distinct; - ha_rows found_records=join->found_records; - READ_RECORD *info= &join_tab->read_record; + join->return_tab= join_tab; + if (join_tab->last_inner) + { + /* join_tab is the first inner table for an outer join operation. */ + + /* Set initial state of guard variables for this table.*/ + join_tab->found=0; + join_tab->not_null_compl= 1; + + /* Set first_unmatched for the last inner table of this group */ + join_tab->last_inner->first_unmatched= join_tab; + } join->thd->row_count= 0; - do - { - if (join->thd->killed) // Aborted by user - { - join->thd->send_kill_message(); - return -2; /* purecov: inspected */ - } - DBUG_PRINT("info", ("select cond 0x%lx", (ulong)select_cond)); - if (!select_cond || select_cond->val_int()) - { - /* - There is no select condition or the attached pushed down - condition is true => a match is found. - */ - bool found= 1; - while (join_tab->first_unmatched && found) - { - /* - The while condition is always false if join_tab is not - the last inner join table of an outer join operation. - */ - first_unmatched= join_tab->first_unmatched; - /* - Mark that a match for current outer table is found. - This activates push down conditional predicates attached - to the all inner tables of the outer join. - */ - first_unmatched->found= 1; - for (tab= first_unmatched; tab <= join_tab; tab++) - { - /* Check all predicates that has just been activated. */ - /* - Actually all predicates non-guarded by first_unmatched->found - will be re-evaluated again. It could be fixed, but, probably, - it's not worth doing now. - */ - if (tab->select_cond && !tab->select_cond->val_int()) - { - /* The condition attached to table tab is false */ - if (tab == join_tab) - found= 0; - else - { - /* - Set a return point if rejected predicate is attached - not to the last table of the current nest level. - */ - join->return_tab= tab; - return 0; - } - } - } - /* - Check whether join_tab is not the last inner table - for another embedding outer join. - */ - if ((first_unmatched= first_unmatched->first_upper) && - first_unmatched->last_inner != join_tab) - first_unmatched= 0; - join_tab->first_unmatched= first_unmatched; - } - - /* - It was not just a return to lower loop level when one - of the newly activated predicates is evaluated as false - (See above join->return_tab= tab). - */ - join->examined_rows++; - join->thd->row_count++; - - if (found) - { - if (not_exists_optimize) - break; - /* A match from join_tab is found for the current partial join. */ - if ((error=(*join_tab->next_select)(join, join_tab+1, 0)) < 0) - return error; - if (join->return_tab < join_tab) - return 0; - /* - Test if this was a SELECT DISTINCT query on a table that - was not in the field list; In this case we can abort if - we found a row, as no new rows can be added to the result. - */ - if (not_used_in_distinct && found_records != join->found_records) - return 0; - } - else - info->file->unlock_row(); - } - else - { - /* - The condition pushed down to the table join_tab rejects all rows - with the beginning coinciding with the current partial join. - */ - join->examined_rows++; - join->thd->row_count++; - } - } while (!(error=info->read_record(info)) && !(*report_error)); + error= (*join_tab->read_first_record)(join_tab); + rc= evaluate_join_record(join, join_tab, error, report_error); } - if (error > 0 || (*report_error)) // Fatal error - return -1; - if (join_tab->last_inner && !join_tab->found) - { - /* - The table join_tab is the first inner table of a outer join operation - and no matches has been found for the current outer row. + while (rc == NESTED_LOOP_OK) + { + error= info->read_record(info); + rc= evaluate_join_record(join, join_tab, error, report_error); + } + + if (rc == NESTED_LOOP_NO_MORE_ROWS && + join_tab->last_inner && !join_tab->found) + rc= evaluate_null_complemented_join_record(join, join_tab); + + if (rc == NESTED_LOOP_NO_MORE_ROWS) + rc= NESTED_LOOP_OK; + return rc; +} + + +/* + Process one record of the nested loop join. + + DESCRIPTION + This function will evaluate parts of WHERE/ON clauses that are + applicable to the partial record on hand and in case of success + submit this record to the next level of the nested loop. +*/ + +static enum_nested_loop_state +evaluate_join_record(JOIN *join, JOIN_TAB *join_tab, + int error, my_bool *report_error) +{ + bool not_exists_optimize= join_tab->table->reginfo.not_exists_optimize; + bool not_used_in_distinct=join_tab->not_used_in_distinct; + ha_rows found_records=join->found_records; + COND *select_cond= join_tab->select_cond; + + if (error > 0 || (*report_error)) // Fatal error + return NESTED_LOOP_ERROR; + if (error < 0) + return NESTED_LOOP_NO_MORE_ROWS; + if (join->thd->killed) // Aborted by user + { + join->thd->send_kill_message(); + return NESTED_LOOP_KILLED; /* purecov: inspected */ + } + DBUG_PRINT("info", ("select cond 0x%lx", (ulong)select_cond)); + if (!select_cond || select_cond->val_int()) + { + /* + There is no select condition or the attached pushed down + condition is true => a match is found. */ - JOIN_TAB *last_inner_tab= join_tab->last_inner; - for ( ; join_tab <= last_inner_tab ; join_tab++) - { - /* Change the the values of guard predicate variables. */ - join_tab->found= 1; - join_tab->not_null_compl= 0; - /* The outer row is complemented by nulls for each inner tables */ - restore_record(join_tab->table,s->default_values); // Make empty record - mark_as_null_row(join_tab->table); // For group by without error - select_cond= join_tab->select_cond; - /* Check all attached conditions for inner table rows. */ - if (select_cond && !select_cond->val_int()) - return 0; - } - join_tab--; - /* - The row complemented by nulls might be the first row - of embedding outer joins. - If so, perform the same actions as in the code - for the first regular outer join row above. - */ - for ( ; ; ) + bool found= 1; + while (join_tab->first_unmatched && found) { - first_unmatched= join_tab->first_unmatched; + /* + The while condition is always false if join_tab is not + the last inner join table of an outer join operation. + */ + JOIN_TAB *first_unmatched= join_tab->first_unmatched; + /* + Mark that a match for current outer table is found. + This activates push down conditional predicates attached + to the all inner tables of the outer join. + */ + first_unmatched->found= 1; + for (JOIN_TAB *tab= first_unmatched; tab <= join_tab; tab++) + { + /* Check all predicates that has just been activated. */ + /* + Actually all predicates non-guarded by first_unmatched->found + will be re-evaluated again. It could be fixed, but, probably, + it's not worth doing now. + */ + if (tab->select_cond && !tab->select_cond->val_int()) + { + /* The condition attached to table tab is false */ + if (tab == join_tab) + found= 0; + else + { + /* + Set a return point if rejected predicate is attached + not to the last table of the current nest level. + */ + join->return_tab= tab; + return NESTED_LOOP_OK; + } + } + } + /* + Check whether join_tab is not the last inner table + for another embedding outer join. + */ if ((first_unmatched= first_unmatched->first_upper) && first_unmatched->last_inner != join_tab) first_unmatched= 0; join_tab->first_unmatched= first_unmatched; - if (!first_unmatched) - break; - first_unmatched->found= 1; - for (JOIN_TAB *tab= first_unmatched; tab <= join_tab; tab++) - { - if (tab->select_cond && !tab->select_cond->val_int()) - { - join->return_tab= tab; - return 0; - } - } } + /* - The row complemented by nulls satisfies all conditions - attached to inner tables. - Send the row complemented by nulls to be joined with the - remaining tables. - */ - if ((error=(*join_tab->next_select)(join, join_tab+1 ,0)) < 0) - return error; + It was not just a return to lower loop level when one + of the newly activated predicates is evaluated as false + (See above join->return_tab= tab). + */ + join->examined_rows++; + join->thd->row_count++; + + if (found) + { + enum enum_nested_loop_state rc; + if (not_exists_optimize) + return NESTED_LOOP_NO_MORE_ROWS; + /* A match from join_tab is found for the current partial join. */ + rc= (*join_tab->next_select)(join, join_tab+1, 0); + if (rc != NESTED_LOOP_OK && rc != NESTED_LOOP_NO_MORE_ROWS) + return rc; + if (join->return_tab < join_tab) + return NESTED_LOOP_OK; + /* + Test if this was a SELECT DISTINCT query on a table that + was not in the field list; In this case we can abort if + we found a row, as no new rows can be added to the result. + */ + if (not_used_in_distinct && found_records != join->found_records) + return NESTED_LOOP_OK; + } + else + join_tab->read_record.file->unlock_row(); } - return 0; + else + { + /* + The condition pushed down to the table join_tab rejects all rows + with the beginning coinciding with the current partial join. + */ + join->examined_rows++; + join->thd->row_count++; + } + return NESTED_LOOP_OK; } -static int +/* + DESCRIPTION + Construct a NULL complimented partial join record and feed it to the next + level of the nested loop. This function is used in case we have + an OUTER join and no matching record was found. +*/ + +static enum_nested_loop_state +evaluate_null_complemented_join_record(JOIN *join, JOIN_TAB *join_tab) +{ + /* + The table join_tab is the first inner table of a outer join operation + and no matches has been found for the current outer row. + */ + JOIN_TAB *last_inner_tab= join_tab->last_inner; + /* Cache variables for faster loop */ + COND *select_cond; + for ( ; join_tab <= last_inner_tab ; join_tab++) + { + /* Change the the values of guard predicate variables. */ + join_tab->found= 1; + join_tab->not_null_compl= 0; + /* The outer row is complemented by nulls for each inner tables */ + restore_record(join_tab->table,s->default_values); // Make empty record + mark_as_null_row(join_tab->table); // For group by without error + select_cond= join_tab->select_cond; + /* Check all attached conditions for inner table rows. */ + if (select_cond && !select_cond->val_int()) + return NESTED_LOOP_OK; + } + join_tab--; + /* + The row complemented by nulls might be the first row + of embedding outer joins. + If so, perform the same actions as in the code + for the first regular outer join row above. + */ + for ( ; ; ) + { + JOIN_TAB *first_unmatched= join_tab->first_unmatched; + if ((first_unmatched= first_unmatched->first_upper) && + first_unmatched->last_inner != join_tab) + first_unmatched= 0; + join_tab->first_unmatched= first_unmatched; + if (!first_unmatched) + break; + first_unmatched->found= 1; + for (JOIN_TAB *tab= first_unmatched; tab <= join_tab; tab++) + { + if (tab->select_cond && !tab->select_cond->val_int()) + { + join->return_tab= tab; + return NESTED_LOOP_OK; + } + } + } + /* + The row complemented by nulls satisfies all conditions + attached to inner tables. + Send the row complemented by nulls to be joined with the + remaining tables. + */ + return (*join_tab->next_select)(join, join_tab+1, 0); +} + + +static enum_nested_loop_state flush_cached_records(JOIN *join,JOIN_TAB *join_tab,bool skip_last) { + enum_nested_loop_state rc= NESTED_LOOP_OK; int error; READ_RECORD *info; if (!join_tab->cache.records) - return 0; /* Nothing to do */ + return NESTED_LOOP_OK; /* Nothing to do */ if (skip_last) (void) store_record_in_cache(&join_tab->cache); // Must save this for later if (join_tab->use_quick == 2) @@ -9396,7 +9404,7 @@ flush_cached_records(JOIN *join,JOIN_TAB *join_tab,bool skip_last) if ((error=join_init_read_record(join_tab))) { reset_cache_write(&join_tab->cache); - return -error; /* No records or error */ + return error < 0 ? NESTED_LOOP_NO_MORE_ROWS: NESTED_LOOP_ERROR; } for (JOIN_TAB *tmp=join->join_tab; tmp != join_tab ; tmp++) @@ -9411,11 +9419,11 @@ flush_cached_records(JOIN *join,JOIN_TAB *join_tab,bool skip_last) if (join->thd->killed) { join->thd->send_kill_message(); - return -2; // Aborted by user /* purecov: inspected */ + return NESTED_LOOP_KILLED; // Aborted by user /* purecov: inspected */ } SQL_SELECT *select=join_tab->select; - if (!error && (!join_tab->cache.select || - !join_tab->cache.select->skip_record())) + if (rc == NESTED_LOOP_OK && + (!join_tab->cache.select || !join_tab->cache.select->skip_record())) { uint i; reset_cache_read(&join_tab->cache); @@ -9423,11 +9431,14 @@ flush_cached_records(JOIN *join,JOIN_TAB *join_tab,bool skip_last) { read_cached_record(join_tab); if (!select || !select->skip_record()) - if ((error=(join_tab->next_select)(join,join_tab+1,0)) < 0) + { + rc= (join_tab->next_select)(join,join_tab+1,0); + if (rc != NESTED_LOOP_OK && rc != NESTED_LOOP_NO_MORE_ROWS) { reset_cache_write(&join_tab->cache); - return error; /* purecov: inspected */ + return rc; } + } } } } while (!(error=info->read_record(info))); @@ -9436,10 +9447,10 @@ flush_cached_records(JOIN *join,JOIN_TAB *join_tab,bool skip_last) read_cached_record(join_tab); // Restore current record reset_cache_write(&join_tab->cache); if (error > 0) // Fatal error - return -1; /* purecov: inspected */ + return NESTED_LOOP_ERROR; /* purecov: inspected */ for (JOIN_TAB *tmp2=join->join_tab; tmp2 != join_tab ; tmp2++) tmp2->table->status=tmp2->status; - return 0; + return NESTED_LOOP_OK; } @@ -9905,13 +9916,32 @@ join_read_next_same_or_null(READ_RECORD *info) /***************************************************************************** - The different end of select functions - These functions returns < 0 when end is reached, 0 on ok and > 0 if a - fatal error (like table corruption) was detected + DESCRIPTION + Functions that end one nested loop iteration. Different functions + are used to support GROUP BY clause and to redirect records + to a table (e.g. in case of SELECT into a temporary table) or to the + network client. + + RETURN VALUES + NESTED_LOOP_OK - the record has been successfully handled + NESTED_LOOP_ERROR - a fatal error (like table corruption) + was detected + NESTED_LOOP_KILLED - thread shutdown was requested while processing + the record + NESTED_LOOP_QUERY_LIMIT - the record has been successfully handled; + additionally, the nested loop produced the + number of rows specified in the LIMIT clause + for the query + NESTED_LOOP_CURSOR_LIMIT - the record has been successfully handled; + additionally, there is a cursor and the nested + loop algorithm produced the number of rows + that is specified for current cursor fetch + operation. + All return values except NESTED_LOOP_OK abort the nested loop. *****************************************************************************/ /* ARGSUSED */ -static int +static enum_nested_loop_state end_send(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), bool end_of_records) { @@ -9920,14 +9950,14 @@ end_send(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), { int error; if (join->having && join->having->val_int() == 0) - DBUG_RETURN(0); // Didn't match having + DBUG_RETURN(NESTED_LOOP_OK); // Didn't match having error=0; if (join->procedure) error=join->procedure->send_row(*join->fields); else if (join->do_send_rows) error=join->result->send_data(*join->fields); if (error) - DBUG_RETURN(-1); /* purecov: inspected */ + DBUG_RETURN(NESTED_LOOP_ERROR); /* purecov: inspected */ if (++join->send_records >= join->unit->select_limit_cnt && join->do_send_rows) { @@ -9961,10 +9991,10 @@ end_send(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), join->do_send_rows= 0; if (join->unit->fake_select_lex) join->unit->fake_select_lex->select_limit= HA_POS_ERROR; - DBUG_RETURN(0); + DBUG_RETURN(NESTED_LOOP_OK); } } - DBUG_RETURN(-3); // Abort nicely + DBUG_RETURN(NESTED_LOOP_QUERY_LIMIT); // Abort nicely } else if (join->send_records >= join->fetch_limit) { @@ -9972,20 +10002,20 @@ end_send(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), There is a server side cursor and all rows for this fetch request are sent. */ - DBUG_RETURN(-4); + DBUG_RETURN(NESTED_LOOP_CURSOR_LIMIT); } } else { if (join->procedure && join->procedure->end_of_records()) - DBUG_RETURN(-1); + DBUG_RETURN(NESTED_LOOP_ERROR); } - DBUG_RETURN(0); + DBUG_RETURN(NESTED_LOOP_OK); } /* ARGSUSED */ -static int +static enum_nested_loop_state end_send_group(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), bool end_of_records) { @@ -10037,14 +10067,14 @@ end_send_group(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), } } if (error > 0) - DBUG_RETURN(-1); /* purecov: inspected */ + DBUG_RETURN(NESTED_LOOP_ERROR); /* purecov: inspected */ if (end_of_records) - DBUG_RETURN(0); + DBUG_RETURN(NESTED_LOOP_OK); if (join->send_records >= join->unit->select_limit_cnt && join->do_send_rows) { if (!(join->select_options & OPTION_FOUND_ROWS)) - DBUG_RETURN(-3); // Abort nicely + DBUG_RETURN(NESTED_LOOP_QUERY_LIMIT); // Abort nicely join->do_send_rows=0; join->unit->select_limit_cnt = HA_POS_ERROR; } @@ -10054,14 +10084,14 @@ end_send_group(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), There is a server side cursor and all rows for this fetch request are sent. */ - DBUG_RETURN(-4); + DBUG_RETURN(NESTED_LOOP_CURSOR_LIMIT); } } } else { if (end_of_records) - DBUG_RETURN(0); + DBUG_RETURN(NESTED_LOOP_OK); join->first_record=1; VOID(test_if_group_changed(join->group_fields)); } @@ -10069,33 +10099,32 @@ end_send_group(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), { copy_fields(&join->tmp_table_param); if (init_sum_functions(join->sum_funcs, join->sum_funcs_end[idx+1])) - DBUG_RETURN(-1); + DBUG_RETURN(NESTED_LOOP_ERROR); if (join->procedure) join->procedure->add(); - DBUG_RETURN(0); + DBUG_RETURN(NESTED_LOOP_OK); } } if (update_sum_func(join->sum_funcs)) - DBUG_RETURN(-1); + DBUG_RETURN(NESTED_LOOP_ERROR); if (join->procedure) join->procedure->add(); - DBUG_RETURN(0); + DBUG_RETURN(NESTED_LOOP_OK); } /* ARGSUSED */ -static int +static enum_nested_loop_state end_write(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), bool end_of_records) { TABLE *table=join->tmp_table; - int error; DBUG_ENTER("end_write"); if (join->thd->killed) // Aborted by user { join->thd->send_kill_message(); - DBUG_RETURN(-2); /* purecov: inspected */ + DBUG_RETURN(NESTED_LOOP_KILLED); /* purecov: inspected */ } if (!end_of_records) { @@ -10120,6 +10149,7 @@ end_write(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), #endif if (!join->having || join->having->val_int()) { + int error; join->found_records++; if ((error=table->file->write_row(table->record[0]))) { @@ -10128,28 +10158,28 @@ end_write(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), goto end; if (create_myisam_from_heap(join->thd, table, &join->tmp_table_param, error,1)) - DBUG_RETURN(-1); // Not a table_is_full error + DBUG_RETURN(NESTED_LOOP_ERROR); // Not a table_is_full error table->s->uniques=0; // To ensure rows are the same } if (++join->send_records >= join->tmp_table_param.end_write_records && join->do_send_rows) { if (!(join->select_options & OPTION_FOUND_ROWS)) - DBUG_RETURN(-3); + DBUG_RETURN(NESTED_LOOP_QUERY_LIMIT); join->do_send_rows=0; join->unit->select_limit_cnt = HA_POS_ERROR; - DBUG_RETURN(0); + DBUG_RETURN(NESTED_LOOP_OK); } } } end: - DBUG_RETURN(0); + DBUG_RETURN(NESTED_LOOP_OK); } /* Group by searching after group record and updating it if possible */ /* ARGSUSED */ -static int +static enum_nested_loop_state end_update(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), bool end_of_records) { @@ -10159,11 +10189,11 @@ end_update(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), DBUG_ENTER("end_update"); if (end_of_records) - DBUG_RETURN(0); + DBUG_RETURN(NESTED_LOOP_OK); if (join->thd->killed) // Aborted by user { join->thd->send_kill_message(); - DBUG_RETURN(-2); /* purecov: inspected */ + DBUG_RETURN(NESTED_LOOP_KILLED); /* purecov: inspected */ } join->found_records++; @@ -10187,9 +10217,9 @@ end_update(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), table->record[0]))) { table->file->print_error(error,MYF(0)); /* purecov: inspected */ - DBUG_RETURN(-1); /* purecov: inspected */ + DBUG_RETURN(NESTED_LOOP_ERROR); /* purecov: inspected */ } - DBUG_RETURN(0); + DBUG_RETURN(NESTED_LOOP_OK); } /* @@ -10211,19 +10241,19 @@ end_update(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), { if (create_myisam_from_heap(join->thd, table, &join->tmp_table_param, error, 0)) - DBUG_RETURN(-1); // Not a table_is_full error + DBUG_RETURN(NESTED_LOOP_ERROR); // Not a table_is_full error /* Change method to update rows */ table->file->ha_index_init(0); join->join_tab[join->tables-1].next_select=end_unique_update; } join->send_records++; - DBUG_RETURN(0); + DBUG_RETURN(NESTED_LOOP_OK); } /* Like end_update, but this is done with unique constraints instead of keys */ -static int +static enum_nested_loop_state end_unique_update(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), bool end_of_records) { @@ -10232,11 +10262,11 @@ end_unique_update(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), DBUG_ENTER("end_unique_update"); if (end_of_records) - DBUG_RETURN(0); + DBUG_RETURN(NESTED_LOOP_OK); if (join->thd->killed) // Aborted by user { join->thd->send_kill_message(); - DBUG_RETURN(-2); /* purecov: inspected */ + DBUG_RETURN(NESTED_LOOP_KILLED); /* purecov: inspected */ } init_tmptable_sum_functions(join->sum_funcs); @@ -10250,12 +10280,12 @@ end_unique_update(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), if ((int) table->file->get_dup_key(error) < 0) { table->file->print_error(error,MYF(0)); /* purecov: inspected */ - DBUG_RETURN(-1); /* purecov: inspected */ + DBUG_RETURN(NESTED_LOOP_ERROR); /* purecov: inspected */ } if (table->file->rnd_pos(table->record[1],table->file->dupp_ref)) { table->file->print_error(error,MYF(0)); /* purecov: inspected */ - DBUG_RETURN(-1); /* purecov: inspected */ + DBUG_RETURN(NESTED_LOOP_ERROR); /* purecov: inspected */ } restore_record(table,record[1]); update_tmptable_sum_func(join->sum_funcs,table); @@ -10263,27 +10293,26 @@ end_unique_update(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), table->record[0]))) { table->file->print_error(error,MYF(0)); /* purecov: inspected */ - DBUG_RETURN(-1); /* purecov: inspected */ + DBUG_RETURN(NESTED_LOOP_ERROR); /* purecov: inspected */ } } - DBUG_RETURN(0); + DBUG_RETURN(NESTED_LOOP_OK); } /* ARGSUSED */ -static int +static enum_nested_loop_state end_write_group(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), bool end_of_records) { TABLE *table=join->tmp_table; - int error; int idx= -1; DBUG_ENTER("end_write_group"); if (join->thd->killed) { // Aborted by user join->thd->send_kill_message(); - DBUG_RETURN(-2); /* purecov: inspected */ + DBUG_RETURN(NESTED_LOOP_KILLED); /* purecov: inspected */ } if (!join->first_record || end_of_records || (idx=test_if_group_changed(join->group_fields)) >= 0) @@ -10302,28 +10331,27 @@ end_write_group(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), } copy_sum_funcs(join->sum_funcs, join->sum_funcs_end[send_group_parts]); - if (join->having && join->having->val_int() == 0) - error= -1; - else if ((error= table->file->write_row(table->record[0]))) + if (!join->having || join->having->val_int()) { - if (create_myisam_from_heap(join->thd, table, - &join->tmp_table_param, - error, 0)) - DBUG_RETURN(-1); + int error= table->file->write_row(table->record[0]); + if (error && create_myisam_from_heap(join->thd, table, + &join->tmp_table_param, + error, 0)) + DBUG_RETURN(NESTED_LOOP_ERROR); } if (join->rollup.state != ROLLUP::STATE_NONE) { if (join->rollup_write_data((uint) (idx+1), table)) - DBUG_RETURN(-1); + DBUG_RETURN(NESTED_LOOP_ERROR); } if (end_of_records) - DBUG_RETURN(0); + DBUG_RETURN(NESTED_LOOP_OK); } } else { if (end_of_records) - DBUG_RETURN(0); + DBUG_RETURN(NESTED_LOOP_OK); join->first_record=1; VOID(test_if_group_changed(join->group_fields)); } @@ -10332,17 +10360,17 @@ end_write_group(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)), copy_fields(&join->tmp_table_param); copy_funcs(join->tmp_table_param.items_to_copy); if (init_sum_functions(join->sum_funcs, join->sum_funcs_end[idx+1])) - DBUG_RETURN(-1); + DBUG_RETURN(NESTED_LOOP_ERROR); if (join->procedure) join->procedure->add(); - DBUG_RETURN(0); + DBUG_RETURN(NESTED_LOOP_OK); } } if (update_sum_func(join->sum_funcs)) - DBUG_RETURN(-1); + DBUG_RETURN(NESTED_LOOP_ERROR); if (join->procedure) join->procedure->add(); - DBUG_RETURN(0); + DBUG_RETURN(NESTED_LOOP_OK); } diff --git a/sql/sql_select.h b/sql/sql_select.h index c9a9b26d1b4..82efb62f7a3 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -91,7 +91,15 @@ enum join_type { JT_UNKNOWN,JT_SYSTEM,JT_CONST,JT_EQ_REF,JT_REF,JT_MAYBE_REF, class JOIN; -typedef int (*Next_select_func)(JOIN *,struct st_join_table *,bool); +enum enum_nested_loop_state +{ + NESTED_LOOP_KILLED= -2, NESTED_LOOP_ERROR= -1, + NESTED_LOOP_OK= 0, NESTED_LOOP_NO_MORE_ROWS= 1, + NESTED_LOOP_QUERY_LIMIT= 3, NESTED_LOOP_CURSOR_LIMIT= 4 +}; + +typedef enum_nested_loop_state +(*Next_select_func)(JOIN *, struct st_join_table *, bool); typedef int (*Read_record_func)(struct st_join_table *tab); @@ -162,6 +170,11 @@ class JOIN :public Sql_alloc uint send_group_parts; bool sort_and_group,first_record,full_join,group, no_field_update; bool do_send_rows; + /* + TRUE when we want to resume nested loop iterations when + fetching data from a cursor + */ + bool resume_nested_loop; table_map const_table_map,found_const_table_map,outer_join; ha_rows send_records,found_records,examined_rows,row_limit, select_limit; /* @@ -263,6 +276,7 @@ class JOIN :public Sql_alloc sort_and_group= 0; first_record= 0; do_send_rows= 1; + resume_nested_loop= FALSE; send_records= 0; found_records= 0; fetch_limit= HA_POS_ERROR; @@ -374,7 +388,7 @@ public: void reset_thd(THD *thd); int open(JOIN *join); - int fetch(ulong num_rows); + void fetch(ulong num_rows); void reset() { join= 0; } bool is_open() const { return join != 0; } void close(); diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 9b7c8281043..e5818449fcb 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -12854,6 +12854,59 @@ static void test_bug9159() myquery(rc); } + +/* Crash when opening a cursor to a query with DISTICNT and no key */ + +static void test_bug9520() +{ + MYSQL_STMT *stmt; + MYSQL_BIND bind[1]; + char a[6]; + ulong a_len; + int rc, row_count= 0; + + myheader("test_bug9520"); + + mysql_query(mysql, "drop table if exists t1"); + mysql_query(mysql, "create table t1 (a char(5), b char(5), c char(5)," + " primary key (a, b, c))"); + rc= mysql_query(mysql, "insert into t1 values ('x', 'y', 'z'), " + " ('a', 'b', 'c'), ('k', 'l', 'm')"); + myquery(rc); + + stmt= open_cursor("select distinct b from t1"); + + /* + Not crashes with: + stmt= open_cursor("select distinct a from t1"); + */ + + rc= mysql_stmt_execute(stmt); + check_execute(stmt, rc); + + bzero(bind, sizeof(bind)); + bind[0].buffer_type= MYSQL_TYPE_STRING; + bind[0].buffer= (char*) a; + bind[0].buffer_length= sizeof(a); + bind[0].length= &a_len; + + mysql_stmt_bind_result(stmt, bind); + + while (!(rc= mysql_stmt_fetch(stmt))) + row_count++; + + DIE_UNLESS(rc == MYSQL_NO_DATA); + + printf("Fetched %d rows\n", row_count); + DBUG_ASSERT(row_count == 3); + + mysql_stmt_close(stmt); + + rc= mysql_query(mysql, "drop table t1"); + myquery(rc); +} + + /* Read and parse arguments and MySQL options from my.cnf */ @@ -13079,6 +13132,7 @@ static struct my_tests_st my_tests[]= { { "test_bug8722", test_bug8722 }, { "test_bug8880", test_bug8880 }, { "test_bug9159", test_bug9159 }, + { "test_bug9520", test_bug9520 }, { 0, 0 } }; From e721ec37ff18526564d65b09390f6c60292287b3 Mon Sep 17 00:00:00 2001 From: "monty@mysql.com" <> Date: Sat, 30 Apr 2005 18:40:08 +0300 Subject: [PATCH 51/51] After merge fixes --- Makefile.am | 5 +++++ mysql-test/r/cast.result | 2 ++ 2 files changed, 7 insertions(+) diff --git a/Makefile.am b/Makefile.am index 78efd47b762..7905869f833 100644 --- a/Makefile.am +++ b/Makefile.am @@ -102,5 +102,10 @@ tags: test: cd mysql-test; ./mysql-test-run && ./mysql-test-run --ps-protocol +test-force: + cd mysql-test; \ + mysql-test-run --force ;\ + mysql-test-run --ps-protocol --force + # Don't update the files from bitkeeper %::SCCS/s.% diff --git a/mysql-test/r/cast.result b/mysql-test/r/cast.result index c5fa5d076cc..6dc608a9289 100644 --- a/mysql-test/r/cast.result +++ b/mysql-test/r/cast.result @@ -7,6 +7,8 @@ CAST(CAST(1-2 AS UNSIGNED) AS SIGNED INTEGER) select CAST('10 ' as unsigned integer); CAST('10 ' as unsigned integer) 10 +Warnings: +Warning 1292 Truncated incorrect INTEGER value: '10 ' select cast(-5 as unsigned) | 1, cast(-5 as unsigned) & -1; cast(-5 as unsigned) | 1 cast(-5 as unsigned) & -1 18446744073709551611 18446744073709551611