Commit graph

169 commits

Author SHA1 Message Date
unknown
f9bc24ef76 Fix for Bug #18413 Data usage for varsize columns are not correctly reported to mysqld 2006-07-03 17:09:32 +02:00
unknown
aef2cdd2ed Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  SCCS merged
2006-06-28 08:47:43 +02:00
unknown
6848be9cc2 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


mysql-test/mysql-test-run.sh:
  Auto merged
storage/ndb/include/kernel/signaldata/BackupContinueB.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/BackupImpl.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/BackupSignalData.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  manual merge
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  manual merge
storage/ndb/include/kernel/signaldata/LqhFrag.hpp:
  manual merge
storage/ndb/include/kernel/signaldata/TupFrag.hpp:
  manual merge
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  manual merge
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  manual merge
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  manual merge
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  manual merge
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  manual merge
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  manual merge
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  manual merge
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  manual merge
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  manual merge
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  manual merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  manual merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  manual merge
storage/ndb/tools/restore/Restore.cpp:
  manual merge
storage/ndb/tools/restore/Restore.hpp:
  manual merge
storage/ndb/tools/restore/consumer_restore.cpp:
  manual merge
2006-06-27 11:22:42 +02:00
unknown
90913a0364 ndb - bug#20053
make sure we can only drop files from correct file group


mysql-test/r/ndb_dd_ddl.result:
  add testcase
mysql-test/t/ndb_dd_ddl.test:
  add testcase
sql/ha_ndbcluster.cc:
  Make sure correct tablespace for dropping datafile
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Cleanup {data/undo}file get{tablespace/logfilegroup}
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Cleanup {data/undo}file get{tablespace/logfilegroup}
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Cleanup {data/undo}file get{tablespace/logfilegroup}
storage/ndb/tools/restore/consumer_restore.cpp:
  Cleanup {data/undo}file get{tablespace/logfilegroup}
2006-06-26 15:08:09 +02:00
unknown
d889c1a8bd Merge bk-internal:/home/bk/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint


BUILD/compile-dist:
  Auto merged
client/mysqltest.c:
  Auto merged
config/ac-macros/ssl.m4:
  Auto merged
include/config-win.h:
  Auto merged
include/my_base.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/group_min_max.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/rpl_insert_id_pk.result:
  Auto merged
mysql-test/r/rpl_ndb_multi_update3.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/r/rpl_ndb_sp006.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysys/my_clock.c:
  Auto merged
mysys/my_copy.c:
  Auto merged
mysys/my_create.c:
  Auto merged
mysys/my_dup.c:
  Auto merged
mysys/my_lib.c:
  Auto merged
mysys/my_open.c:
  Auto merged
mysys/my_redel.c:
  Auto merged
mysql-test/r/create.result:
  Manual merge
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/r/join_outer.result:
  Manual merge
mysql-test/t/func_group.test:
  Manual merge
mysql-test/t/group_min_max.test:
  Manual merge
mysql-test/t/innodb_mysql.test:
  Manual merge
2006-06-10 20:33:50 +02:00
unknown
d749d90528 Merge mysql.com:/space/pekka/ndb/version/my51
into  mysql.com:/space/pekka/ndb/version/my51-bug14509


mysql-test/r/ndb_basic.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
2006-05-25 16:20:34 +02:00
unknown
4f0bda6a60 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint


storage/ndb/tools/waiter.cpp:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Manual merge
mysql-test/mysql-test-run.pl:
  Manual merge
2006-05-19 17:19:57 +02:00
unknown
cddacf429e Make ndb_waiter poll the ndb_mgmd for status more often 2006-05-18 23:41:07 +02:00
unknown
60eb775c1d Merge mysql.com:/space/pekka/ndb/version/my50-bug14509
into  mysql.com:/space/pekka/ndb/version/my51-bug14509


storage/ndb/test/ndbapi/testDict.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge
storage/ndb/include/ndbapi/Ndb.hpp:
  SCCS merged
storage/ndb/src/ndbapi/Ndb.cpp:
  SCCS merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  use local, weird diff
2006-05-17 12:56:59 +02:00
unknown
1d83b61b97 Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
sql/ha_ndbcluster_binlog.cc:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
  - small correction of previous patch
storage/ndb/src/ndbapi/DictCache.cpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
  - cache not released properly
storage/ndb/tools/desc.cpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
  - added retry option so that ndb_desc can be used to wait for a table to be created
2006-05-17 08:34:48 +02:00
unknown
39ad30a46c Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/tools/waiter.cpp:
  Auto merged
2006-05-17 00:27:19 +02:00
unknown
02f31c55b3 Merge mysql.com:/space/pekka/ndb/version/my50-bug14509
into  mysql.com:/space/pekka/ndb/version/my51-bug14509


storage/ndb/include/ndbapi/Ndb.hpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  use local, weird diff
2006-05-16 13:13:50 +02:00
unknown
e44823ff7f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
mysql-test/t/disabled.def:
  Manual merge
2006-05-05 11:38:05 +03:00
unknown
1f89605e4b Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1


VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/heap_btree.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/ndb_blob.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/mysql_client_test.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
storage/heap/hp_delete.c:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/myisam/myisamlog.c:
  Auto merged
storage/ndb/include/kernel/signaldata/TcKeyReq.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbBlob.hpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
storage/ndb/tools/delete_all.cpp:
  Auto merged
VC++Files/libmysqld/libmysqld.vcproj:
  Use original file (my_user.c was already added in 5.1)
mysql-test/mysql-test-run.pl:
  Manual merge
sql/handler.h:
  Manual merge
sql/share/errmsg.txt:
  Align error messages with 5.0
sql/sql_table.cc:
  Manual merge
storage/ndb/src/ndbapi/NdbBlob.cpp:
  No changes
2006-05-04 15:58:30 +03:00
unknown
3feaf6e5eb Added verification test of on-line (non-copying) alter table 2006-04-27 15:13:21 +02:00
unknown
b784da0434 ndb -
Fix bootstrap/compile error


storage/ndb/tools/restore/restore_main.cpp:
  Fix bootstrap/compile error
2006-04-25 17:02:48 +02:00
unknown
5ea5685283 ndb_restore: more compatablitity checks 2006-04-25 17:02:46 +02:00
unknown
c717637227 Bug #19255 ndb: restore of ndb backup from different endian does not work
+ removed not needed --


mysql-test/mysql-test-run.pl:
  post merge fix
2006-04-21 15:36:10 +02:00
unknown
8e7d5f789a bug#18594 ndb_restore log boken in 5.1
- corrected previous patch
- read log entry variables out into explicit variables for siimpler code (and backwards compatability code)
2006-04-21 11:26:21 +02:00
unknown
7d259218f8 Bug#18594 ndb_restore log boken in 5.1
- added compatability with 5.0
- added test case for compatability with 5.0 and 5.1


mysql-test/std_data/ndb_backup50/BACKUP-1-0.1.Data:
  New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1-0.1.Data''
mysql-test/std_data/ndb_backup50/BACKUP-1-0.2.Data:
  New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1-0.2.Data''
mysql-test/std_data/ndb_backup50/BACKUP-1.1.log:
  New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1.1.log''
mysql-test/std_data/ndb_backup50/BACKUP-1.2.log:
  New BitKeeper file ``mysql-test/std_data/ndb_backup50/BACKUP-1.2.log''
mysql-test/std_data/ndb_backup51/BACKUP-1-0.1.Data:
  New BitKeeper file ``mysql-test/std_data/ndb_backup51/BACKUP-1-0.1.Data''
mysql-test/std_data/ndb_backup51/BACKUP-1-0.2.Data:
  New BitKeeper file ``mysql-test/std_data/ndb_backup51/BACKUP-1-0.2.Data''
2006-04-21 01:51:58 +02:00
unknown
214fcab9e2 BUG#18594 ndb_restore log boken in 5.1
- corrected log read after fragment id addition
2006-04-20 22:04:09 +02:00
unknown
b709511e40 Nuke all of the old_* directories in the ndb tree.
BitKeeper/deleted/.del-Makefile~6c2778d2bf4954a2:
  Delete: storage/ndb/src/old_files/client/Makefile
BitKeeper/deleted/.del-Extra.mk~eabbb28986ca817d:
  Delete: storage/ndb/src/old_files/client/odbc/Extra.mk
BitKeeper/deleted/.del-Makefile~9bc928a18aa88d66:
  Delete: storage/ndb/src/old_files/client/odbc/Makefile
BitKeeper/deleted/.del-NdbOdbc.cpp~aa491b06c9172d11:
  Delete: storage/ndb/src/old_files/client/odbc/NdbOdbc.cpp
BitKeeper/deleted/.del-NdbOdbc.def~cd3eed2c4a0121e9:
  Delete: storage/ndb/src/old_files/client/odbc/NdbOdbc.def
BitKeeper/deleted/.del-CodeGen.cpp~170c83c0765b9160:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/CodeGen.cpp
BitKeeper/deleted/.del-CodeGen.hpp~738f834f80cceba8:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/CodeGen.hpp
BitKeeper/deleted/.del-Code_base.cpp~96f8ceaac8138bfe:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_base.cpp
BitKeeper/deleted/.del-Code_base.hpp~794baaed32588409:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_base.hpp
BitKeeper/deleted/.del-Code_column.cpp~5dd0e5c1215bd8bf:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_column.cpp
BitKeeper/deleted/.del-Code_column.hpp~5d5816d1c496e588:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_column.hpp
BitKeeper/deleted/.del-Code_comp_op.cpp~6ab02cc3b1e08985:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_comp_op.cpp
BitKeeper/deleted/.del-Code_comp_op.hpp~37cf1e4cee3a6bf1:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_comp_op.hpp
BitKeeper/deleted/.del-Code_create_index.cpp~d1f95c5917afab9:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_create_index.cpp
BitKeeper/deleted/.del-Code_create_index.hpp~12bcb33350fc35c1:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_create_index.hpp
BitKeeper/deleted/.del-Code_create_row.cpp~33f73454f8ddf2d5:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_create_row.cpp
BitKeeper/deleted/.del-Code_create_row.hpp~38cb00cc1baa9ee7:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_create_row.hpp
BitKeeper/deleted/.del-Code_create_table.cpp~c25e7cc06414a927:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_create_table.cpp
BitKeeper/deleted/.del-Code_create_table.hpp~9648f467f3f0418e:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_create_table.hpp
BitKeeper/deleted/.del-Code_data_type.cpp~9e46a7ef85345d4:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_data_type.cpp
BitKeeper/deleted/.del-Code_data_type.hpp~5e8928968d3c0107:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_data_type.hpp
BitKeeper/deleted/.del-Code_ddl.cpp~c38ee5368efaf688:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_ddl.cpp
BitKeeper/deleted/.del-Code_ddl.hpp~75482ddd87b65036:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_ddl.hpp
BitKeeper/deleted/.del-Code_ddl_column.cpp~c524862773dd9f38:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_column.cpp
BitKeeper/deleted/.del-Code_ddl_column.hpp~c9e534e381b21599:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_column.hpp
BitKeeper/deleted/.del-Code_ddl_constr.cpp~80ae32f83a6c2f00:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_constr.cpp
BitKeeper/deleted/.del-Code_ddl_constr.hpp~bca16806c57bc97e:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_constr.hpp
BitKeeper/deleted/.del-Code_ddl_row.cpp~ec2fbc3b8ab08a52:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_row.cpp
BitKeeper/deleted/.del-Code_ddl_row.hpp~c18a43b3770ad25a:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_ddl_row.hpp
BitKeeper/deleted/.del-Code_delete.cpp~feac77b440d04327:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_delete.cpp
BitKeeper/deleted/.del-Code_delete.hpp~c852ee069a761aab:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_delete.hpp
BitKeeper/deleted/.del-Code_delete_index.cpp~17ed96eca90fe4e7:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_delete_index.cpp
BitKeeper/deleted/.del-Code_delete_index.hpp~18a9bb119b04636:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_delete_index.hpp
BitKeeper/deleted/.del-Code_delete_lookup.cpp~1a3728f8c896684:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_delete_lookup.cpp
BitKeeper/deleted/.del-Code_delete_lookup.hpp~1be71525ed9ee69:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_delete_lookup.hpp
BitKeeper/deleted/.del-Code_delete_scan.cpp~b040ad7670c24eb5:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_delete_scan.cpp
BitKeeper/deleted/.del-Code_delete_scan.hpp~b9a11b4ec895d159:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_delete_scan.hpp
BitKeeper/deleted/.del-Code_dml.cpp~6826ad60f0f566e7:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_dml.cpp
BitKeeper/deleted/.del-Code_dml.hpp~8fdbf19ad3174ca2:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_dml.hpp
BitKeeper/deleted/.del-Code_dml_column.cpp~b71ce6186edf1655:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_dml_column.cpp
BitKeeper/deleted/.del-Code_dml_column.hpp~a843b3418b30b7a3:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_dml_column.hpp
BitKeeper/deleted/.del-Code_dml_row.cpp~17c791507b36cc06:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_dml_row.cpp
BitKeeper/deleted/.del-Code_dml_row.hpp~33c4cffdd238728d:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_dml_row.hpp
BitKeeper/deleted/.del-Code_drop_index.cpp~fc5cab67ae58d9f6:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_drop_index.cpp
BitKeeper/deleted/.del-Code_drop_index.hpp~377c9eb280ec2ee2:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_drop_index.hpp
BitKeeper/deleted/.del-Code_drop_table.cpp~9637d93efa68996a:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_drop_table.cpp
BitKeeper/deleted/.del-Code_drop_table.hpp~d671379125e4bbbe:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_drop_table.hpp
BitKeeper/deleted/.del-Code_expr.cpp~fafd271880c70cf3:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr.cpp
BitKeeper/deleted/.del-Code_expr.hpp~9e8243e99e0ec84:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr.hpp
BitKeeper/deleted/.del-Code_expr_column.cpp~4c4fbcd5741cc8cf:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr_column.cpp
BitKeeper/deleted/.del-Code_expr_column.hpp~9c4cbbdf432dc475:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr_column.hpp
BitKeeper/deleted/.del-Code_expr_const.cpp~bdb29dcd94ac5e73:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr_const.cpp
BitKeeper/deleted/.del-Code_expr_const.hpp~9c8789cff376b832:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr_const.hpp
BitKeeper/deleted/.del-Code_expr_conv.cpp~d252fbfe8ef55fff:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr_conv.cpp
BitKeeper/deleted/.del-Code_expr_conv.hpp~5cbea39eecb92a43:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr_conv.hpp
BitKeeper/deleted/.del-Code_expr_func.cpp~5d3996f062fa3f52:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr_func.cpp
BitKeeper/deleted/.del-Code_expr_func.hpp~22aee1e4f92c49b9:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr_func.hpp
BitKeeper/deleted/.del-Code_expr_op.cpp~e1aaa0244f2efa4:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr_op.cpp
BitKeeper/deleted/.del-Code_expr_op.hpp~4eb8c02dd0602f:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr_op.hpp
BitKeeper/deleted/.del-Code_expr_param.cpp~a5e94ee7c5821611:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr_param.cpp
BitKeeper/deleted/.del-Code_expr_param.hpp~ec441ad8ef21aa2b:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr_param.hpp
BitKeeper/deleted/.del-Code_expr_row.cpp~bc73d8f9c681d418:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr_row.cpp
BitKeeper/deleted/.del-Code_expr_row.hpp~c541c49ea8c0c4f2:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_expr_row.hpp
BitKeeper/deleted/.del-Code_idx_column.cpp~7d4d074ce5daea0a:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_idx_column.cpp
BitKeeper/deleted/.del-Code_idx_column.hpp~caabaafa34722be7:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_idx_column.hpp
BitKeeper/deleted/.del-Code_insert.cpp~7d0ef7cc8f657fd5:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_insert.cpp
BitKeeper/deleted/.del-Code_insert.hpp~cc96fa9b81169471:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_insert.hpp
BitKeeper/deleted/.del-Code_pred.cpp~56faa755aa42ddfa:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_pred.cpp
BitKeeper/deleted/.del-Code_pred.hpp~eada43753e8b1e6c:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_pred.hpp
BitKeeper/deleted/.del-Code_pred_op.cpp~47d693dde1a6d907:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_pred_op.cpp
BitKeeper/deleted/.del-Code_pred_op.hpp~b42256983d2bda7b:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_pred_op.hpp
BitKeeper/deleted/.del-Code_query.cpp~4ac293821c9b4602:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query.cpp
BitKeeper/deleted/.del-Code_query.hpp~f86fbd9a108206c0:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query.hpp
BitKeeper/deleted/.del-Code_query_count.cpp~9fa96a57d2dde660:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_count.cpp
BitKeeper/deleted/.del-Code_query_count.hpp~bdbe6e4734abc0c5:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_count.hpp
BitKeeper/deleted/.del-Code_query_distinct.cpp~3ba18528aa67b9dd:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_distinct.cpp
BitKeeper/deleted/.del-Code_query_distinct.hpp~c12b2b7ff6b2e7b3:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_distinct.hpp
BitKeeper/deleted/.del-Code_query_filter.cpp~a3d067d5d8fb40c:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_filter.cpp
BitKeeper/deleted/.del-Code_query_filter.hpp~d0a341f2e40f0183:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_filter.hpp
BitKeeper/deleted/.del-Code_query_group.cpp~4443c844308f9a98:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_group.cpp
BitKeeper/deleted/.del-Code_query_group.hpp~ba4691be942c6e2a:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_group.hpp
BitKeeper/deleted/.del-Code_query_index.cpp~f0312c9e2f22daf6:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_index.cpp
BitKeeper/deleted/.del-Code_query_index.hpp~6baaf1abbb704bb1:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_index.hpp
BitKeeper/deleted/.del-Code_query_join.cpp~36e07422c67d6838:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_join.cpp
BitKeeper/deleted/.del-Code_query_join.hpp~c4d17d18c4e3b4a0:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_join.hpp
BitKeeper/deleted/.del-Code_query_lookup.cpp~3d80e3ddbdae531d:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_lookup.cpp
BitKeeper/deleted/.del-Code_query_lookup.hpp~73332533e5196630:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_lookup.hpp
BitKeeper/deleted/.del-Code_query_project.cpp~ebc22f71bb7ec98c:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_project.cpp
BitKeeper/deleted/.del-Code_query_project.hpp~2734cdf1f907e0a4:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_project.hpp
BitKeeper/deleted/.del-Code_query_range.cpp~62ddafd2d17063cc:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_range.cpp
BitKeeper/deleted/.del-Code_query_range.hpp~81546843616efefa:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_range.hpp
BitKeeper/deleted/.del-Code_query_repeat.cpp~ce8f2a065897d6e3:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_repeat.cpp
BitKeeper/deleted/.del-Code_query_repeat.hpp~c20e10d0db9ad53c:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_repeat.hpp
BitKeeper/deleted/.del-Code_query_scan.cpp~855e56d6f56de938:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_scan.cpp
BitKeeper/deleted/.del-Code_query_scan.hpp~b93c277da5b2509b:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_scan.hpp
BitKeeper/deleted/.del-Code_query_sort.cpp~c08fc07f739de097:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_sort.cpp
BitKeeper/deleted/.del-Code_query_sort.hpp~84edb5e128eda962:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_sort.hpp
BitKeeper/deleted/.del-Code_query_sys.cpp~1d6a4a1cec789001:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_sys.cpp
BitKeeper/deleted/.del-Code_query_sys.hpp~f5182823da25f097:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_query_sys.hpp
BitKeeper/deleted/.del-Code_root.cpp~4c26a01ced583e41:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_root.cpp
BitKeeper/deleted/.del-Code_root.hpp~de1fd878505d9e26:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_root.hpp
BitKeeper/deleted/.del-Code_select.cpp~75b2a39f282d8ef5:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_select.cpp
BitKeeper/deleted/.del-Code_select.hpp~f9fadc322d78033a:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_select.hpp
BitKeeper/deleted/.del-Code_set_row.cpp~1bda7e6f86f18aef:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_set_row.cpp
BitKeeper/deleted/.del-Code_set_row.hpp~32ac3de384b91229:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_set_row.hpp
BitKeeper/deleted/.del-Code_stmt.cpp~c0e9903aa90df90b:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_stmt.cpp
BitKeeper/deleted/.del-Code_stmt.hpp~fab11fc487e74d05:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_stmt.hpp
BitKeeper/deleted/.del-Code_table.cpp~c46b7a6e2ecf4f61:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_table.cpp
BitKeeper/deleted/.del-Code_table.hpp~a48d57a0375a6d56:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_table.hpp
BitKeeper/deleted/.del-Code_table_list.cpp~40948eccedfae7bb:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_table_list.cpp
BitKeeper/deleted/.del-Code_table_list.hpp~c1e880e9949d3a:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_table_list.hpp
BitKeeper/deleted/.del-Code_update.cpp~ed36f4a7a928a91b:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_update.cpp
BitKeeper/deleted/.del-Code_update.hpp~c1de760c7b580b0c:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_update.hpp
BitKeeper/deleted/.del-Code_update_index.cpp~a0c6ad33ffbbc00e:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_update_index.cpp
BitKeeper/deleted/.del-Code_update_index.hpp~b57bbe5c8d927df9:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_update_index.hpp
BitKeeper/deleted/.del-Code_update_lookup.cpp~3491782088e97384:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_update_lookup.cpp
BitKeeper/deleted/.del-Code_update_lookup.hpp~ee335822c3496863:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_update_lookup.hpp
BitKeeper/deleted/.del-Code_update_scan.cpp~35e5b7d4619b3e09:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_update_scan.cpp
BitKeeper/deleted/.del-Code_update_scan.hpp~287f193ad48fbefd:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Code_update_scan.hpp
BitKeeper/deleted/.del-Makefile~420b8378d374f069:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/Makefile
BitKeeper/deleted/.del-SimpleGram.ypp~6301cedf92524710:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/SimpleGram.ypp
BitKeeper/deleted/.del-SimpleParser.cpp~549f93e2a7fd01b5:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/SimpleParser.cpp
BitKeeper/deleted/.del-SimpleParser.hpp~4fdff7ee3839efc4:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/SimpleParser.hpp
BitKeeper/deleted/.del-SimpleScan.lpp~e11862b97fe39faf:
  Delete: storage/ndb/src/old_files/client/odbc/codegen/SimpleScan.lpp
BitKeeper/deleted/.del-AttrArea.cpp~1570da617a1a6c4b:
  Delete: storage/ndb/src/old_files/client/odbc/common/AttrArea.cpp
BitKeeper/deleted/.del-AttrArea.hpp~f3d78ccd37af4e6:
  Delete: storage/ndb/src/old_files/client/odbc/common/AttrArea.hpp
BitKeeper/deleted/.del-CodeTree.cpp~1a4912632b0a61ee:
  Delete: storage/ndb/src/old_files/client/odbc/common/CodeTree.cpp
BitKeeper/deleted/.del-CodeTree.hpp~dcb603cce390eafa:
  Delete: storage/ndb/src/old_files/client/odbc/common/CodeTree.hpp
BitKeeper/deleted/.del-ConnArea.cpp~103182cf445f0bc3:
  Delete: storage/ndb/src/old_files/client/odbc/common/ConnArea.cpp
BitKeeper/deleted/.del-ConnArea.hpp~ffe99deedf7dc1ee:
  Delete: storage/ndb/src/old_files/client/odbc/common/ConnArea.hpp
BitKeeper/deleted/.del-Ctx.cpp~ce1c13ba8a312eba:
  Delete: storage/ndb/src/old_files/client/odbc/common/Ctx.cpp
BitKeeper/deleted/.del-Ctx.hpp~bc88aba55ab71063:
  Delete: storage/ndb/src/old_files/client/odbc/common/Ctx.hpp
BitKeeper/deleted/.del-DataField.cpp~6bb1fe1cb971c8f9:
  Delete: storage/ndb/src/old_files/client/odbc/common/DataField.cpp
BitKeeper/deleted/.del-DataField.hpp~d324898a9a86463d:
  Delete: storage/ndb/src/old_files/client/odbc/common/DataField.hpp
BitKeeper/deleted/.del-DataRow.cpp~8764a23cee4f9481:
  Delete: storage/ndb/src/old_files/client/odbc/common/DataRow.cpp
BitKeeper/deleted/.del-DataRow.hpp~66a65eee1a1b2f23:
  Delete: storage/ndb/src/old_files/client/odbc/common/DataRow.hpp
BitKeeper/deleted/.del-DataType.cpp~29b8ddd51fdd3a2f:
  Delete: storage/ndb/src/old_files/client/odbc/common/DataType.cpp
BitKeeper/deleted/.del-DataType.hpp~adef26bc1dc940eb:
  Delete: storage/ndb/src/old_files/client/odbc/common/DataType.hpp
BitKeeper/deleted/.del-DescArea.cpp~aab4edd7e336acdd:
  Delete: storage/ndb/src/old_files/client/odbc/common/DescArea.cpp
BitKeeper/deleted/.del-DescArea.hpp~20ba9b6484762f0f:
  Delete: storage/ndb/src/old_files/client/odbc/common/DescArea.hpp
BitKeeper/deleted/.del-DiagArea.cpp~e3662d8977947e67:
  Delete: storage/ndb/src/old_files/client/odbc/common/DiagArea.cpp
BitKeeper/deleted/.del-DiagArea.hpp~1c6595b5fac06eb2:
  Delete: storage/ndb/src/old_files/client/odbc/common/DiagArea.hpp
BitKeeper/deleted/.del-Makefile~8505f6b38fe5c219:
  Delete: storage/ndb/src/old_files/client/odbc/common/Makefile
BitKeeper/deleted/.del-OdbcData.cpp~e557009c1ed1e017:
  Delete: storage/ndb/src/old_files/client/odbc/common/OdbcData.cpp
BitKeeper/deleted/.del-OdbcData.hpp~2125814c1293c0b3:
  Delete: storage/ndb/src/old_files/client/odbc/common/OdbcData.hpp
BitKeeper/deleted/.del-ResultArea.cpp~8bcc2a2d9a98b9b0:
  Delete: storage/ndb/src/old_files/client/odbc/common/ResultArea.cpp
BitKeeper/deleted/.del-ResultArea.hpp~8d4646b94be475d1:
  Delete: storage/ndb/src/old_files/client/odbc/common/ResultArea.hpp
BitKeeper/deleted/.del-Sqlstate.cpp~b844144af963c22c:
  Delete: storage/ndb/src/old_files/client/odbc/common/Sqlstate.cpp
BitKeeper/deleted/.del-Sqlstate.hpp~60006ee1c27c6e5:
  Delete: storage/ndb/src/old_files/client/odbc/common/Sqlstate.hpp
BitKeeper/deleted/.del-StmtArea.cpp~5c5f8613156e06b2:
  Delete: storage/ndb/src/old_files/client/odbc/common/StmtArea.cpp
BitKeeper/deleted/.del-StmtArea.hpp~9662e56ae164eb7f:
  Delete: storage/ndb/src/old_files/client/odbc/common/StmtArea.hpp
BitKeeper/deleted/.del-StmtInfo.cpp~54ee4040e5807214:
  Delete: storage/ndb/src/old_files/client/odbc/common/StmtInfo.cpp
BitKeeper/deleted/.del-DictCatalog.cpp~9804b0ff3eac2f8:
  Delete: storage/ndb/src/old_files/client/odbc/dictionary/DictCatalog.cpp
BitKeeper/deleted/.del-DictCatalog.hpp~cace2fb2f6bb65e5:
  Delete: storage/ndb/src/old_files/client/odbc/dictionary/DictCatalog.hpp
BitKeeper/deleted/.del-StmtInfo.hpp~6698d657391692fc:
  Delete: storage/ndb/src/old_files/client/odbc/common/StmtInfo.hpp
BitKeeper/deleted/.del-common.cpp~4792b9ecddd99482:
  Delete: storage/ndb/src/old_files/client/odbc/common/common.cpp
BitKeeper/deleted/.del-common.hpp~25369fa6c80eff53:
  Delete: storage/ndb/src/old_files/client/odbc/common/common.hpp
BitKeeper/deleted/.del-DictColumn.cpp~b69d90c53e5b618:
  Delete: storage/ndb/src/old_files/client/odbc/dictionary/DictColumn.cpp
BitKeeper/deleted/.del-DictColumn.hpp~c2da1b7bd0408bd1:
  Delete: storage/ndb/src/old_files/client/odbc/dictionary/DictColumn.hpp
BitKeeper/deleted/.del-DictIndex.cpp~a456d3039e6a39e3:
  Delete: storage/ndb/src/old_files/client/odbc/dictionary/DictIndex.cpp
BitKeeper/deleted/.del-DictIndex.hpp~f53b91a41bb96663:
  Delete: storage/ndb/src/old_files/client/odbc/dictionary/DictIndex.hpp
BitKeeper/deleted/.del-DictSchema.cpp~639403c84a47dfdd:
  Delete: storage/ndb/src/old_files/client/odbc/dictionary/DictSchema.cpp
BitKeeper/deleted/.del-DictSchema.hpp~5aa7dc8ade17e94c:
  Delete: storage/ndb/src/old_files/client/odbc/dictionary/DictSchema.hpp
BitKeeper/deleted/.del-DictSys.cpp~fb89465b10c32bb0:
  Delete: storage/ndb/src/old_files/client/odbc/dictionary/DictSys.cpp
BitKeeper/deleted/.del-DictSys.hpp~76583ba8aa88fd6f:
  Delete: storage/ndb/src/old_files/client/odbc/dictionary/DictSys.hpp
BitKeeper/deleted/.del-DictTable.cpp~8f4a9ee5a8038f87:
  Delete: storage/ndb/src/old_files/client/odbc/dictionary/DictTable.cpp
BitKeeper/deleted/.del-DictTable.hpp~cf99a9ac3dd49206:
  Delete: storage/ndb/src/old_files/client/odbc/dictionary/DictTable.hpp
BitKeeper/deleted/.del-Makefile~4c1a6148787bdc2f:
  Delete: storage/ndb/src/old_files/client/odbc/dictionary/Makefile
BitKeeper/deleted/.del-class.fig~c0754ccad74d380a:
  Delete: storage/ndb/src/old_files/client/odbc/docs/class.fig
BitKeeper/deleted/.del-descfield.pl~e0bd59c2824824cc:
  Delete: storage/ndb/src/old_files/client/odbc/docs/descfield.pl
BitKeeper/deleted/.del-diag.txt~b66a7e227391335f:
  Delete: storage/ndb/src/old_files/client/odbc/docs/diag.txt
BitKeeper/deleted/.del-getinfo.pl~2142ecf1567a66f6:
  Delete: storage/ndb/src/old_files/client/odbc/docs/getinfo.pl
BitKeeper/deleted/.del-gettypeinfo.pl~2ea4c0589eac4e73:
  Delete: storage/ndb/src/old_files/client/odbc/docs/gettypeinfo.pl
BitKeeper/deleted/.del-handleattr.pl~b0c2a2901b68342e:
  Delete: storage/ndb/src/old_files/client/odbc/docs/handleattr.pl
BitKeeper/deleted/.del-main.hpp~7b15eb7ffad488a0:
  Delete: storage/ndb/src/old_files/client/odbc/docs/main.hpp
BitKeeper/deleted/.del-ndbodbc.html~a2f14fdd978b62cc:
  Delete: storage/ndb/src/old_files/client/odbc/docs/ndbodbc.html
BitKeeper/deleted/.del-select.fig~34f5222b5012e1d7:
  Delete: storage/ndb/src/old_files/client/odbc/docs/select.fig
BitKeeper/deleted/.del-Func.data~9e75f15d921063f3:
  Delete: storage/ndb/src/old_files/client/odbc/driver/Func.data
BitKeeper/deleted/.del-Func.pl~aefb901bc3941d32:
  Delete: storage/ndb/src/old_files/client/odbc/driver/Func.pl
BitKeeper/deleted/.del-systables.pl~1fa2191648bdb629:
  Delete: storage/ndb/src/old_files/client/odbc/docs/systables.pl
BitKeeper/deleted/.del-type.txt~feec700c81f5095f:
  Delete: storage/ndb/src/old_files/client/odbc/docs/type.txt
BitKeeper/deleted/.del-Makefile~80d21270fc3ad931:
  Delete: storage/ndb/src/old_files/client/odbc/driver/Makefile
BitKeeper/deleted/.del-SQLAllocConnect.cpp~246af836b028d810:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLAllocConnect.cpp
BitKeeper/deleted/.del-SQLAllocEnv.cpp~eaf36cf2285ec2ac:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLAllocEnv.cpp
BitKeeper/deleted/.del-SQLAllocHandle.cpp~c0921921e84d1a10:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLAllocHandle.cpp
BitKeeper/deleted/.del-SQLAllocHandleStd.cpp~7d145f6e3640d913:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLAllocHandleStd.cpp
BitKeeper/deleted/.del-SQLAllocStmt.cpp~362331ef456ec879:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLAllocStmt.cpp
BitKeeper/deleted/.del-SQLBindCol.cpp~fec3a78088d4951d:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLBindCol.cpp
BitKeeper/deleted/.del-SQLBindParam.cpp~a50b619a23efaab:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLBindParam.cpp
BitKeeper/deleted/.del-SQLBindParameter.cpp~533b1992496e2775:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLBindParameter.cpp
BitKeeper/deleted/.del-SQLBrowseConnect.cpp~120b61a1ff6edee3:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLBrowseConnect.cpp
BitKeeper/deleted/.del-SQLBulkOperations.cpp~7a96be04250a388:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLBulkOperations.cpp
BitKeeper/deleted/.del-SQLCancel.cpp~27eab683f6fa6ec6:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLCancel.cpp
BitKeeper/deleted/.del-SQLCloseCursor.cpp~6cbf193aadaf1058:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLCloseCursor.cpp
BitKeeper/deleted/.del-SQLColAttribute.cpp~f2c858b16a9360d:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLColAttribute.cpp
BitKeeper/deleted/.del-SQLColAttributes.cpp~d4007908ee1309d:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLColAttributes.cpp
BitKeeper/deleted/.del-SQLColumnPrivileges.cpp~39a3020da4c3485b:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLColumnPrivileges.cpp
BitKeeper/deleted/.del-SQLColumns.cpp~1c31107df60bb544:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLColumns.cpp
BitKeeper/deleted/.del-SQLConnect.cpp~868e02a519b72743:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLConnect.cpp
BitKeeper/deleted/.del-SQLCopyDesc.cpp~286522b25a029761:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLCopyDesc.cpp
BitKeeper/deleted/.del-SQLDataSources.cpp~12792108aac5b2ca:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLDataSources.cpp
BitKeeper/deleted/.del-SQLDescribeCol.cpp~1d1faafbcd3ecb3c:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLDescribeCol.cpp
BitKeeper/deleted/.del-SQLDescribeParam.cpp~70b016fa795ed275:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLDescribeParam.cpp
BitKeeper/deleted/.del-SQLDisconnect.cpp~9fb4c3d7a84db50a:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLDisconnect.cpp
BitKeeper/deleted/.del-SQLDriverConnect.cpp~8dad42af7d17a9d9:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLDriverConnect.cpp
BitKeeper/deleted/.del-SQLDrivers.cpp~400e7453e70f6e99:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLDrivers.cpp
BitKeeper/deleted/.del-SQLEndTran.cpp~c37cce04cc303c01:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLEndTran.cpp
BitKeeper/deleted/.del-SQLError.cpp~593b81885c15187b:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLError.cpp
BitKeeper/deleted/.del-SQLExecDirect.cpp~5e6274e76315339d:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLExecDirect.cpp
BitKeeper/deleted/.del-SQLExecute.cpp~1692a85f8639f71:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLExecute.cpp
BitKeeper/deleted/.del-SQLExtendedFetch.cpp~8b9d604580a83cfd:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLExtendedFetch.cpp
BitKeeper/deleted/.del-SQLFetch.cpp~fa1606aa2dd901db:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLFetch.cpp
BitKeeper/deleted/.del-SQLFetchScroll.cpp~cdb16803511963a1:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLFetchScroll.cpp
BitKeeper/deleted/.del-SQLForeignKeys.cpp~4b8a9af2f6bf92cb:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLForeignKeys.cpp
BitKeeper/deleted/.del-SQLFreeConnect.cpp~92359420501ebc5b:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLFreeConnect.cpp
BitKeeper/deleted/.del-SQLFreeEnv.cpp~64f1776817464807:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLFreeEnv.cpp
BitKeeper/deleted/.del-SQLFreeHandle.cpp~2dc029edf912c2d:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLFreeHandle.cpp
BitKeeper/deleted/.del-SQLFreeStmt.cpp~8f8cb0a43c02a67:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLFreeStmt.cpp
BitKeeper/deleted/.del-SQLGetConnectAttr.cpp~b29ff18aeedd8966:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLGetConnectAttr.cpp
BitKeeper/deleted/.del-SQLGetConnectOption.cpp~3e0bc4e1af95c682:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLGetConnectOption.cpp
BitKeeper/deleted/.del-SQLGetCursorName.cpp~8266b920671b6d01:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLGetCursorName.cpp
BitKeeper/deleted/.del-SQLGetData.cpp~3d837348460c219d:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLGetData.cpp
BitKeeper/deleted/.del-SQLGetDescField.cpp~62828192a7d1d954:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLGetDescField.cpp
BitKeeper/deleted/.del-SQLGetDescRec.cpp~f54cc69bcd1238ad:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLGetDescRec.cpp
BitKeeper/deleted/.del-SQLGetDiagField.cpp~673e1ea0f9d5121f:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLGetDiagField.cpp
BitKeeper/deleted/.del-SQLGetDiagRec.cpp~bea0f68f5b940ab8:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLGetDiagRec.cpp
BitKeeper/deleted/.del-SQLGetEnvAttr.cpp~e742277d8bdf234d:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLGetEnvAttr.cpp
BitKeeper/deleted/.del-SQLGetFunctions.cpp~72de050fbfb4a9bb:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLGetFunctions.cpp
BitKeeper/deleted/.del-SQLGetInfo.cpp~e4e09d6bedbf02b1:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLGetInfo.cpp
BitKeeper/deleted/.del-SQLGetStmtAttr.cpp~de7dabc8c2acea7:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLGetStmtAttr.cpp
BitKeeper/deleted/.del-SQLGetStmtOption.cpp~2ff900ebdd167077:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLGetStmtOption.cpp
BitKeeper/deleted/.del-SQLGetTypeInfo.cpp~333196b07473dff6:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLGetTypeInfo.cpp
BitKeeper/deleted/.del-SQLMoreResults.cpp~483d94cb57379e81:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLMoreResults.cpp
BitKeeper/deleted/.del-SQLNativeSql.cpp~eeae6067f4a85c:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLNativeSql.cpp
BitKeeper/deleted/.del-SQLNumParams.cpp~8921304c3bcf4835:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLNumParams.cpp
BitKeeper/deleted/.del-SQLNumResultCols.cpp~4d2b6527ffe81059:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLNumResultCols.cpp
BitKeeper/deleted/.del-SQLParamData.cpp~163b046513f1e4ae:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLParamData.cpp
BitKeeper/deleted/.del-SQLParamOptions.cpp~bdcbccb961fff044:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLParamOptions.cpp
BitKeeper/deleted/.del-SQLPrepare.cpp~1d339fe24888087:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLPrepare.cpp
BitKeeper/deleted/.del-SQLPrimaryKeys.cpp~5d7b2a0ae08a267:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLPrimaryKeys.cpp
BitKeeper/deleted/.del-SQLProcedureColumns.cpp~c7a0535e9f50ff39:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLProcedureColumns.cpp
BitKeeper/deleted/.del-SQLProcedures.cpp~c59d025b22e2d1a6:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLProcedures.cpp
BitKeeper/deleted/.del-SQLPutData.cpp~9dbf69ea9d369dbd:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLPutData.cpp
BitKeeper/deleted/.del-SQLRowCount.cpp~d4ac5b273afdb154:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLRowCount.cpp
BitKeeper/deleted/.del-SQLSetConnectAttr.cpp~c2c520c34c41bd88:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLSetConnectAttr.cpp
BitKeeper/deleted/.del-SQLSetConnectOption.cpp~dadc980d9f9cad1b:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLSetConnectOption.cpp
BitKeeper/deleted/.del-SQLSetCursorName.cpp~ccfc33dd2cf6abeb:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLSetCursorName.cpp
BitKeeper/deleted/.del-SQLSetDescField.cpp~c4db694d1b9e8f77:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLSetDescField.cpp
BitKeeper/deleted/.del-SQLSetDescRec.cpp~f8dd72467d5012ab:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLSetDescRec.cpp
BitKeeper/deleted/.del-SQLSetEnvAttr.cpp~7b50aeae6228c2db:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLSetEnvAttr.cpp
BitKeeper/deleted/.del-SQLSetParam.cpp~e0dd2d5e8d3ec450:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLSetParam.cpp
BitKeeper/deleted/.del-SQLSetPos.cpp~39a3e69960041aa7:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLSetPos.cpp
BitKeeper/deleted/.del-SQLSetScrollOptions.cpp~6f8250379bb0cac8:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLSetScrollOptions.cpp
BitKeeper/deleted/.del-SQLSetStmtAttr.cpp~e99b7e6025a1ae1f:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLSetStmtAttr.cpp
BitKeeper/deleted/.del-SQLSetStmtOption.cpp~87af3125a48c27fa:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLSetStmtOption.cpp
BitKeeper/deleted/.del-SQLSpecialColumns.cpp~1877b4c368825de5:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLSpecialColumns.cpp
BitKeeper/deleted/.del-SQLStatistics.cpp~87e0359f237aa66a:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLStatistics.cpp
BitKeeper/deleted/.del-SQLTablePrivileges.cpp~fa16ea0fffa4edeb:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLTablePrivileges.cpp
BitKeeper/deleted/.del-SQLTables.cpp~c8b201068baec393:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLTables.cpp
BitKeeper/deleted/.del-SQLTransact.cpp~eb33c2f66ee85738:
  Delete: storage/ndb/src/old_files/client/odbc/driver/SQLTransact.cpp
BitKeeper/deleted/.del-Exec_comp_op.cpp~eacbd7512b32d68b:
  Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_comp_op.cpp
BitKeeper/deleted/.del-Exec_create_index.cpp~c6b8e670198adfa9:
  Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_create_index.cpp
BitKeeper/deleted/.del-driver.cpp~f8f1eeec35b08f18:
  Delete: storage/ndb/src/old_files/client/odbc/driver/driver.cpp
BitKeeper/deleted/.del-driver.hpp~f108f4eef34ec8ea:
  Delete: storage/ndb/src/old_files/client/odbc/driver/driver.hpp
BitKeeper/deleted/.del-Exec_create_table.cpp~76904d417bc0a59a:
  Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_create_table.cpp
BitKeeper/deleted/.del-Exec_delete_index.cpp~1ffe5af6eb160a68:
  Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_delete_index.cpp
BitKeeper/deleted/.del-Exec_delete_lookup.cpp~5d24028ce16b6623:
  Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_delete_lookup.cpp
BitKeeper/deleted/.del-Exec_delete_scan.cpp~810aa4058f73c941:
  Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_delete_scan.cpp
BitKeeper/deleted/.del-Exec_drop_index.cpp~3a3871ec6ee48c28:
  Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_drop_index.cpp
BitKeeper/deleted/.del-Exec_drop_table.cpp~639a2faba4da14f4:
  Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_drop_table.cpp
BitKeeper/deleted/.del-Exec_expr_conv.cpp~b5452bd4fbd7c945:
  Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_expr_conv.cpp
BitKeeper/deleted/.del-Exec_expr_func.cpp~c78ab0e67d54f38c:
  Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_expr_func.cpp
BitKeeper/deleted/.del-Exec_expr_op.cpp~5e341b2e63495ba4:
  Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_expr_op.cpp
BitKeeper/deleted/.del-Exec_insert.cpp~71dd4bf2fb913f2e:
  Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_insert.cpp
BitKeeper/deleted/.del-Exec_pred_op.cpp~ebe7b65ba81e5185:
  Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_pred_op.cpp
BitKeeper/deleted/.del-Exec_query_index.cpp~4cada676fa178001:
  Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_query_index.cpp
BitKeeper/deleted/.del-Exec_query_lookup.cpp~79dfe29b088d832:
  Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_query_lookup.cpp
BitKeeper/deleted/.del-Exec_query_range.cpp~7c4e148e81a292d6:
  Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_query_range.cpp
BitKeeper/deleted/.del-Exec_query_scan.cpp~7c66194f7f93346f:
  Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_query_scan.cpp
BitKeeper/deleted/.del-Exec_query_sys.cpp~d66abe07cd519163:
  Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_query_sys.cpp
BitKeeper/deleted/.del-Exec_update_index.cpp~86140a945f790890:
  Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_update_index.cpp
BitKeeper/deleted/.del-Exec_update_lookup.cpp~b7a7387620cf42ab:
  Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_update_lookup.cpp
BitKeeper/deleted/.del-Exec_update_scan.cpp~2285c72106cffe0:
  Delete: storage/ndb/src/old_files/client/odbc/executor/Exec_update_scan.cpp
BitKeeper/deleted/.del-Executor.cpp~ccb54cc8ffe18bae:
  Delete: storage/ndb/src/old_files/client/odbc/executor/Executor.cpp
BitKeeper/deleted/.del-Executor.hpp~c94d916ae5af2506:
  Delete: storage/ndb/src/old_files/client/odbc/executor/Executor.hpp
BitKeeper/deleted/.del-AttrDbc.cpp~24a034fbb22cdb23:
  Delete: storage/ndb/src/old_files/client/odbc/handles/AttrDbc.cpp
BitKeeper/deleted/.del-AttrEnv.cpp~7d74bcba78e149d0:
  Delete: storage/ndb/src/old_files/client/odbc/handles/AttrEnv.cpp
BitKeeper/deleted/.del-AttrRoot.cpp~5def5d7e228eedf0:
  Delete: storage/ndb/src/old_files/client/odbc/handles/AttrRoot.cpp
BitKeeper/deleted/.del-Makefile~a08f437558c2d3b4:
  Delete: storage/ndb/src/old_files/client/odbc/executor/Makefile
BitKeeper/deleted/.del-AttrStmt.cpp~5363ba63b35ff8f4:
  Delete: storage/ndb/src/old_files/client/odbc/handles/AttrStmt.cpp
BitKeeper/deleted/.del-DescSpec.cpp~cd50c1c855f1905:
  Delete: storage/ndb/src/old_files/client/odbc/handles/DescSpec.cpp
BitKeeper/deleted/.del-FuncTab.cpp~e77abea11a532708:
  Delete: storage/ndb/src/old_files/client/odbc/handles/FuncTab.cpp
BitKeeper/deleted/.del-HandleBase.cpp~2ba63dce2dfec07b:
  Delete: storage/ndb/src/old_files/client/odbc/handles/HandleBase.cpp
BitKeeper/deleted/.del-HandleBase.hpp~8cf9a1e94d272328:
  Delete: storage/ndb/src/old_files/client/odbc/handles/HandleBase.hpp
BitKeeper/deleted/.del-HandleDbc.cpp~2a79fea6477b2c63:
  Delete: storage/ndb/src/old_files/client/odbc/handles/HandleDbc.cpp
BitKeeper/deleted/.del-HandleDbc.hpp~9abc692ac6b0abb3:
  Delete: storage/ndb/src/old_files/client/odbc/handles/HandleDbc.hpp
BitKeeper/deleted/.del-HandleDesc.cpp~e77eb1d73d171a98:
  Delete: storage/ndb/src/old_files/client/odbc/handles/HandleDesc.cpp
BitKeeper/deleted/.del-HandleDesc.hpp~553aeb842b3da88e:
  Delete: storage/ndb/src/old_files/client/odbc/handles/HandleDesc.hpp
BitKeeper/deleted/.del-HandleEnv.cpp~6b96fc6b188f252b:
  Delete: storage/ndb/src/old_files/client/odbc/handles/HandleEnv.cpp
BitKeeper/deleted/.del-HandleEnv.hpp~572a7b4af6816f8b:
  Delete: storage/ndb/src/old_files/client/odbc/handles/HandleEnv.hpp
BitKeeper/deleted/.del-HandleRoot.cpp~aa5044f74554fa9c:
  Delete: storage/ndb/src/old_files/client/odbc/handles/HandleRoot.cpp
BitKeeper/deleted/.del-HandleRoot.hpp~2fcfca742c13cfb3:
  Delete: storage/ndb/src/old_files/client/odbc/handles/HandleRoot.hpp
BitKeeper/deleted/.del-HandleStmt.cpp~782f96bda9eaf13c:
  Delete: storage/ndb/src/old_files/client/odbc/handles/HandleStmt.cpp
BitKeeper/deleted/.del-HandleStmt.hpp~6508fc97f3c772e1:
  Delete: storage/ndb/src/old_files/client/odbc/handles/HandleStmt.hpp
BitKeeper/deleted/.del-InfoTab.cpp~f89104b9c6fe7489:
  Delete: storage/ndb/src/old_files/client/odbc/handles/InfoTab.cpp
BitKeeper/deleted/.del-Makefile~3d8d1529ad26ce76:
  Delete: storage/ndb/src/old_files/client/odbc/handles/Makefile
BitKeeper/deleted/.del-PoolNdb.cpp~793fa032699b7d98:
  Delete: storage/ndb/src/old_files/client/odbc/handles/PoolNdb.cpp
BitKeeper/deleted/.del-PoolNdb.hpp~db9e1a04d2fe705d:
  Delete: storage/ndb/src/old_files/client/odbc/handles/PoolNdb.hpp
BitKeeper/deleted/.del-handles.hpp~bfe0b6a7a95ac142:
  Delete: storage/ndb/src/old_files/client/odbc/handles/handles.hpp
BitKeeper/deleted/.del-Makefile~4b92d5e5b416dd0:
  Delete: storage/ndb/src/old_files/ndbbaseclient/Makefile
BitKeeper/deleted/.del-Makefile~f993f3afae0d4308:
  Delete: storage/ndb/src/old_files/ndbclient/Makefile
BitKeeper/deleted/.del-ndbbaseclient_dummy.cpp~daee9eb6acbc94:
  Delete: storage/ndb/src/old_files/ndbbaseclient/ndbbaseclient_dummy.cpp
BitKeeper/deleted/.del-ndbclient_dummy.cpp~73154070f5d0bfbf:
  Delete: storage/ndb/src/old_files/ndbclient/ndbclient_dummy.cpp
BitKeeper/deleted/.del-Makefile~bcbd9a7282094cc:
  Delete: storage/ndb/src/old_files/newtonapi/Makefile
BitKeeper/deleted/.del-dba_binding.cpp~dcc4fb57f9ab6cba:
  Delete: storage/ndb/src/old_files/newtonapi/dba_binding.cpp
BitKeeper/deleted/.del-dba_bulkread.cpp~4ddfe02a93d2ba11:
  Delete: storage/ndb/src/old_files/newtonapi/dba_bulkread.cpp
BitKeeper/deleted/.del-dba_config.cpp~38acf2ad3a932420:
  Delete: storage/ndb/src/old_files/newtonapi/dba_config.cpp
BitKeeper/deleted/.del-dba_dac.cpp~4615e3d0d8a15bff:
  Delete: storage/ndb/src/old_files/newtonapi/dba_dac.cpp
BitKeeper/deleted/.del-dba_error.cpp~a58b4a1628a2d4b9:
  Delete: storage/ndb/src/old_files/newtonapi/dba_error.cpp
BitKeeper/deleted/.del-dba_init.cpp~80da7e3fa0775346:
  Delete: storage/ndb/src/old_files/newtonapi/dba_init.cpp
BitKeeper/deleted/.del-dba_internal.hpp~54884404e30c8823:
  Delete: storage/ndb/src/old_files/newtonapi/dba_internal.hpp
BitKeeper/deleted/.del-dba_process.cpp~509e54294bc7efd2:
  Delete: storage/ndb/src/old_files/newtonapi/dba_process.cpp
BitKeeper/deleted/.del-ExtSender.cpp~1851d559cfddae43:
  Delete: storage/ndb/src/old_files/rep/ExtSender.cpp
BitKeeper/deleted/.del-ExtSender.hpp~10ae62ec85ee6692:
  Delete: storage/ndb/src/old_files/rep/ExtSender.hpp
BitKeeper/deleted/.del-dba_process.hpp~f0ddefb3b2d6a662:
  Delete: storage/ndb/src/old_files/newtonapi/dba_process.hpp
BitKeeper/deleted/.del-dba_schema.cpp~1c3b8399853c108:
  Delete: storage/ndb/src/old_files/newtonapi/dba_schema.cpp
BitKeeper/deleted/.del-Makefile~954f853c2d812c2c:
  Delete: storage/ndb/src/old_files/rep/Makefile
BitKeeper/deleted/.del-NodeConnectInfo.hpp~9c4318dd55f3f84:
  Delete: storage/ndb/src/old_files/rep/NodeConnectInfo.hpp
BitKeeper/deleted/.del-README~6939b06d192a6b99:
  Delete: storage/ndb/src/old_files/rep/README
BitKeeper/deleted/.del-RepApiInterpreter.cpp~8ba561cb831ae353:
  Delete: storage/ndb/src/old_files/rep/RepApiInterpreter.cpp
BitKeeper/deleted/.del-RepApiInterpreter.hpp~31be5af2ba72d263:
  Delete: storage/ndb/src/old_files/rep/RepApiInterpreter.hpp
BitKeeper/deleted/.del-RepApiService.cpp~93d4005333167a0f:
  Delete: storage/ndb/src/old_files/rep/RepApiService.cpp
BitKeeper/deleted/.del-RepApiService.hpp~42f5ffb7e3baa54e:
  Delete: storage/ndb/src/old_files/rep/RepApiService.hpp
BitKeeper/deleted/.del-RepCommandInterpreter.cpp~f661a8ff312213f8:
  Delete: storage/ndb/src/old_files/rep/RepCommandInterpreter.cpp
BitKeeper/deleted/.del-RepCommandInterpreter.hpp~fb6f22895e8c8679:
  Delete: storage/ndb/src/old_files/rep/RepCommandInterpreter.hpp
BitKeeper/deleted/.del-RepComponents.cpp~fb067aee8e5a4a1f:
  Delete: storage/ndb/src/old_files/rep/RepComponents.cpp
BitKeeper/deleted/.del-RepComponents.hpp~9e632beac4f8bbf8:
  Delete: storage/ndb/src/old_files/rep/RepComponents.hpp
BitKeeper/deleted/.del-RepMain.cpp~de79cb7b6f3acd18:
  Delete: storage/ndb/src/old_files/rep/RepMain.cpp
BitKeeper/deleted/.del-Requestor.cpp~c653fa987f84ce43:
  Delete: storage/ndb/src/old_files/rep/Requestor.cpp
BitKeeper/deleted/.del-Requestor.hpp~a499054c9a128dbd:
  Delete: storage/ndb/src/old_files/rep/Requestor.hpp
BitKeeper/deleted/.del-RequestorSubscriptions.cpp~f0643f7cc9aa9654:
  Delete: storage/ndb/src/old_files/rep/RequestorSubscriptions.cpp
BitKeeper/deleted/.del-SignalQueue.cpp~6d32d876acc1a598:
  Delete: storage/ndb/src/old_files/rep/SignalQueue.cpp
BitKeeper/deleted/.del-AppNDB.cpp~1db5eafacdeda3b7:
  Delete: storage/ndb/src/old_files/rep/adapters/AppNDB.cpp
BitKeeper/deleted/.del-SignalQueue.hpp~b92204ff36f399d1:
  Delete: storage/ndb/src/old_files/rep/SignalQueue.hpp
BitKeeper/deleted/.del-TODO~187896dd2e5dfd02:
  Delete: storage/ndb/src/old_files/rep/TODO
BitKeeper/deleted/.del-dbug_hack.cpp~f090906a24103f0:
  Delete: storage/ndb/src/old_files/rep/dbug_hack.cpp
BitKeeper/deleted/.del-rep_version.hpp~82a23fe4dbb13cab:
  Delete: storage/ndb/src/old_files/rep/rep_version.hpp
BitKeeper/deleted/.del-AppNDB.hpp~2c3081224b4ff75f:
  Delete: storage/ndb/src/old_files/rep/adapters/AppNDB.hpp
BitKeeper/deleted/.del-ExtAPI.cpp~d98f38669b10ca97:
  Delete: storage/ndb/src/old_files/rep/adapters/ExtAPI.cpp
BitKeeper/deleted/.del-ExtAPI.hpp~32bcb96bcd2d60c:
  Delete: storage/ndb/src/old_files/rep/adapters/ExtAPI.hpp
BitKeeper/deleted/.del-ExtNDB.cpp~38cccb80529c02c6:
  Delete: storage/ndb/src/old_files/rep/adapters/ExtNDB.cpp
BitKeeper/deleted/.del-ExtNDB.hpp~ee245e7e2c707685:
  Delete: storage/ndb/src/old_files/rep/adapters/ExtNDB.hpp
BitKeeper/deleted/.del-Makefile~25c4b35b84d945b4:
  Delete: storage/ndb/src/old_files/rep/repapi/Makefile
BitKeeper/deleted/.del-Makefile~bcb9d87fd69a7911:
  Delete: storage/ndb/src/old_files/rep/adapters/Makefile
BitKeeper/deleted/.del-TableInfoPs.hpp~56b1f8f75fe7cb1c:
  Delete: storage/ndb/src/old_files/rep/adapters/TableInfoPs.hpp
BitKeeper/deleted/.del-Channel.cpp~1d5f62245962b839:
  Delete: storage/ndb/src/old_files/rep/state/Channel.cpp
BitKeeper/deleted/.del-Channel.hpp~71c1d63ef4b2cbfe:
  Delete: storage/ndb/src/old_files/rep/state/Channel.hpp
BitKeeper/deleted/.del-repapi.cpp~82b9b00c67cfdcf7:
  Delete: storage/ndb/src/old_files/rep/repapi/repapi.cpp
BitKeeper/deleted/.del-repapi.h~6f8cf6b53a86a5ae:
  Delete: storage/ndb/src/old_files/rep/repapi/repapi.h
BitKeeper/deleted/.del-Interval.cpp~3d079ca9cc21124d:
  Delete: storage/ndb/src/old_files/rep/state/Interval.cpp
BitKeeper/deleted/.del-Interval.hpp~85aa46fc419bb109:
  Delete: storage/ndb/src/old_files/rep/state/Interval.hpp
BitKeeper/deleted/.del-Makefile~6a9cedaeedcc4650:
  Delete: storage/ndb/src/old_files/rep/state/Makefile
BitKeeper/deleted/.del-RepState.cpp~3d60b0a46e9477c1:
  Delete: storage/ndb/src/old_files/rep/state/RepState.cpp
BitKeeper/deleted/.del-Makefile~e33e587a7947ac36:
  Delete: storage/ndb/src/old_files/rep/state/testInterval/Makefile
BitKeeper/deleted/.del-RepState.hpp~94d7c472c8a7367:
  Delete: storage/ndb/src/old_files/rep/state/RepState.hpp
BitKeeper/deleted/.del-RepStateEvent.cpp~f51d7eb7b7aca0b:
  Delete: storage/ndb/src/old_files/rep/state/RepStateEvent.cpp
BitKeeper/deleted/.del-RepStateRequests.cpp~393882166df6929:
  Delete: storage/ndb/src/old_files/rep/state/RepStateRequests.cpp
BitKeeper/deleted/.del-Makefile~f5a6d9415d7e0977:
  Delete: storage/ndb/src/old_files/rep/state/testRepState/Makefile
BitKeeper/deleted/.del-testInterval.cpp~993f4118f616e80:
  Delete: storage/ndb/src/old_files/rep/state/testInterval/testInterval.cpp
BitKeeper/deleted/.del-testRequestor.cpp~4a943fae5be63c79:
  Delete: storage/ndb/src/old_files/rep/state/testRepState/testRequestor.cpp
BitKeeper/deleted/.del-testRequestor.hpp~583208c83ff5b554:
  Delete: storage/ndb/src/old_files/rep/state/testRepState/testRequestor.hpp
BitKeeper/deleted/.del-GCIBuffer.cpp~6e8c6f38ab63d1d6:
  Delete: storage/ndb/src/old_files/rep/storage/GCIBuffer.cpp
BitKeeper/deleted/.del-GCIBuffer.hpp~703e2016a7ec616f:
  Delete: storage/ndb/src/old_files/rep/storage/GCIBuffer.hpp
BitKeeper/deleted/.del-GCIContainer.cpp~9c53acd16fc5ac74:
  Delete: storage/ndb/src/old_files/rep/storage/GCIContainer.cpp
BitKeeper/deleted/.del-GCIContainer.hpp~ac28cea9114659fd:
  Delete: storage/ndb/src/old_files/rep/storage/GCIContainer.hpp
BitKeeper/deleted/.del-GCIContainerPS.cpp~116168903a2c617a:
  Delete: storage/ndb/src/old_files/rep/storage/GCIContainerPS.cpp
BitKeeper/deleted/.del-GCIContainerPS.hpp~9a801ffe939e192e:
  Delete: storage/ndb/src/old_files/rep/storage/GCIContainerPS.hpp
BitKeeper/deleted/.del-GCIPage.cpp~42fa918fbf36828a:
  Delete: storage/ndb/src/old_files/rep/storage/GCIPage.cpp
BitKeeper/deleted/.del-GCIPage.hpp~4197e2278326515e:
  Delete: storage/ndb/src/old_files/rep/storage/GCIPage.hpp
BitKeeper/deleted/.del-LogRecord.hpp~11644fe7c5f5d36:
  Delete: storage/ndb/src/old_files/rep/storage/LogRecord.hpp
BitKeeper/deleted/.del-Makefile~a955d34726662aba:
  Delete: storage/ndb/src/old_files/rep/storage/Makefile
BitKeeper/deleted/.del-NodeConnectInfo.hpp~35a7682fd9dba464:
  Delete: storage/ndb/src/old_files/rep/storage/NodeConnectInfo.hpp
BitKeeper/deleted/.del-NodeGroup.cpp~adebbefb11cd1670:
  Delete: storage/ndb/src/old_files/rep/storage/NodeGroup.cpp
BitKeeper/deleted/.del-NodeGroup.hpp~3fcddc2da5d10e45:
  Delete: storage/ndb/src/old_files/rep/storage/NodeGroup.hpp
BitKeeper/deleted/.del-Makefile~6b43df78ea480db1:
  Delete: storage/ndb/src/old_files/rep/transfer/Makefile
BitKeeper/deleted/.del-NodeGroupInfo.cpp~b1130e3c42777658:
  Delete: storage/ndb/src/old_files/rep/storage/NodeGroupInfo.cpp
BitKeeper/deleted/.del-NodeGroupInfo.hpp~7fd3b74f4b59a503:
  Delete: storage/ndb/src/old_files/rep/storage/NodeGroupInfo.hpp
BitKeeper/deleted/.del-TransPS.cpp~7a88ca746987ac10:
  Delete: storage/ndb/src/old_files/rep/transfer/TransPS.cpp
BitKeeper/deleted/.del-TransPS.hpp~846b26eaa80632a1:
  Delete: storage/ndb/src/old_files/rep/transfer/TransPS.hpp
BitKeeper/deleted/.del-TransSS.cpp~8f12a062b240eecf:
  Delete: storage/ndb/src/old_files/rep/transfer/TransSS.cpp
BitKeeper/deleted/.del-TransSS.hpp~7718b5e4ce9a4007:
  Delete: storage/ndb/src/old_files/rep/transfer/TransSS.hpp
BitKeeper/deleted/.del-TransSSSubscriptions.cpp~6bc55e474f33e023:
  Delete: storage/ndb/src/old_files/rep/transfer/TransSSSubscriptions.cpp
BitKeeper/deleted/.del-Makefile~4cef97177c0cd8d1:
  Delete: storage/ndb/test/ndbapi/old_dirs/acid2/Makefile
BitKeeper/deleted/.del-Makefile~5823323f9308952b:
  Delete: storage/ndb/test/ndbapi/old_dirs/acid/Makefile
BitKeeper/deleted/.del-Makefile~53e91df162e177a4:
  Delete: storage/ndb/test/ndbapi/old_dirs/bulk_copy/Makefile
BitKeeper/deleted/.del-Makefile~d86129c4e794eaaf:
  Delete: storage/ndb/test/ndbapi/old_dirs/basicAsynch/Makefile
BitKeeper/deleted/.del-TraceNdbApi.hpp~7a7f0ae5b70358bc:
  Delete: storage/ndb/test/ndbapi/old_dirs/acid2/TraceNdbApi.hpp
BitKeeper/deleted/.del-VerifyNdbApi.hpp~f417f78f7cd05935:
  Delete: storage/ndb/test/ndbapi/old_dirs/acid2/VerifyNdbApi.hpp
BitKeeper/deleted/.del-Makefile~15b0005e7dc1fbf8:
  Delete: storage/ndb/test/ndbapi/old_dirs/flexAsynch/Makefile
BitKeeper/deleted/.del-Makefile~1bcf05f0a26d7d6f:
  Delete: storage/ndb/test/ndbapi/old_dirs/create_tab/Makefile
BitKeeper/deleted/.del-Makefile~8ede26305d647424:
  Delete: storage/ndb/test/ndbapi/old_dirs/create_all_tabs/Makefile
BitKeeper/deleted/.del-Makefile~e4f93944b8c44f09:
  Delete: storage/ndb/test/ndbapi/old_dirs/drop_all_tabs/Makefile
BitKeeper/deleted/.del-Makefile.am~ae6c03d81bf83c09:
  Delete: storage/ndb/test/ndbapi/old_dirs/flexBench/Makefile.am
BitKeeper/deleted/.del-Makefile~99efd87dd2a67e6:
  Delete: storage/ndb/test/ndbapi/old_dirs/flexHammer/Makefile
BitKeeper/deleted/.del-README~d85a7f1125dc7a50:
  Delete: storage/ndb/test/ndbapi/old_dirs/flexHammer/README
BitKeeper/deleted/.del-ndbplot.pl~ef4de5b461b880c1:
  Delete: storage/ndb/test/ndbapi/old_dirs/flexBench/ndbplot.pl
BitKeeper/deleted/.del-Makefile~c05a674b968916ec:
  Delete: storage/ndb/test/ndbapi/old_dirs/flexTT/Makefile
BitKeeper/deleted/.del-Makefile~d36727b854d37c9:
  Delete: storage/ndb/test/ndbapi/old_dirs/flexScan/Makefile
BitKeeper/deleted/.del-README~a6f5f72344539aae:
  Delete: storage/ndb/test/ndbapi/old_dirs/flexScan/README
BitKeeper/deleted/.del-Makefile~d254d59f274b1d3:
  Delete: storage/ndb/test/ndbapi/old_dirs/flex_bench_mysql/Makefile
BitKeeper/deleted/.del-Makefile~d280c4556dcab9cd:
  Delete: storage/ndb/test/ndbapi/old_dirs/flexTimedAsynch/Makefile
BitKeeper/deleted/.del-Makefile~7cd666ff39dc1c5d:
  Delete: storage/ndb/test/ndbapi/old_dirs/indexTest2/Makefile
BitKeeper/deleted/.del-Makefile~837866d85a01b2c:
  Delete: storage/ndb/test/ndbapi/old_dirs/indexTest/Makefile
BitKeeper/deleted/.del-Makefile~b384a346d7cc0f3c:
  Delete: storage/ndb/test/ndbapi/old_dirs/interpreterInTup/Makefile
BitKeeper/deleted/.del-Makefile~b77f2b2aa6db29a7:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/Makefile
BitKeeper/deleted/.del-Makefile~607887f555e1a07f:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/Makefile
BitKeeper/deleted/.del-Makefile~fe3f7192bcd1e342:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/generator/Makefile
BitKeeper/deleted/.del-dbGenerator.h~63f1aeb98260bcb7:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/dbGenerator.h
BitKeeper/deleted/.del-testData.h~898b71d7c639319e:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/testData.h
BitKeeper/deleted/.del-Makefile~16dd9625cf816bed:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/Makefile
BitKeeper/deleted/.del-macros.h~742871fab0681964:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/macros.h
BitKeeper/deleted/.del-ndb_error.hpp~45a2fef922beae3:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/ndb_error.hpp
BitKeeper/deleted/.del-userInterface.h~49139f029bbdaabc:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/userInterface.h
BitKeeper/deleted/.del-.empty~9401b7f68791202e:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/lib/.empty
BitKeeper/deleted/.del-.empty~f804b62cd167f0b3:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/bin/.empty
BitKeeper/deleted/.del-ndb_schema.hpp~de9c21185d6bfe4e:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/include/ndb_schema.hpp
BitKeeper/deleted/.del-testDefinitions.h~f18a4553579a3725:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/include/testDefinitions.h
BitKeeper/deleted/.del-Makefile~28e0b82e1322e47:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/script/Makefile
BitKeeper/deleted/.del-async-lmc-bench-l-p10.sh~8f06283d361eec9e:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-l-p10.sh
BitKeeper/deleted/.del-async-lmc-bench-l.sh~9b204c8488dfdb86:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-l.sh
BitKeeper/deleted/.del-async-lmc-bench-p10.sh~45cfc4a130b43f6a:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-p10.sh
BitKeeper/deleted/.del-Makefile~a3e9f0384cf8455d:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/Makefile
BitKeeper/deleted/.del-README~3c1d85ad9efb4a23:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/README
BitKeeper/deleted/.del-async-lmc-bench.sh~40ca1b63e69d2bdd:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench.sh
BitKeeper/deleted/.del-makevars.linux~9a7c7e0df35184fa:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/makevars.linux
BitKeeper/deleted/.del-Makefile~e5ecf4cfa15f5316:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/Makefile
BitKeeper/deleted/.del-dbGenerator.c~7509c19f70cad0bf:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/dbGenerator.c
BitKeeper/deleted/.del-dbGenerator.h~e1aaa6725999d458:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/dbGenerator.h
BitKeeper/deleted/.del-mainGenerator.c~2d1c8016f72b2517:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/mainGenerator.c
BitKeeper/deleted/.del-makevars.sparc~42a7f929ba44ea5:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/makevars.sparc
BitKeeper/deleted/.del-Makefile~c3c3d76f731f62:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/Makefile
BitKeeper/deleted/.del-testData.h~696038ea2623a90b:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/include/testData.h
BitKeeper/deleted/.del-userInterface.h~1f76ad2f28b283fd:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/include/userInterface.h
BitKeeper/deleted/.del-Makefile~548d94b487507bbf:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/Makefile
BitKeeper/deleted/.del-dbPopulate.c~5dcff1c99783d83b:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/dbPopulate.c
BitKeeper/deleted/.del-dbPopulate.h~229a894b59d4da73:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/dbPopulate.h
BitKeeper/deleted/.del-mainPopulate.c~37def9a44980b8ec:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/mainPopulate.c
BitKeeper/deleted/.del-localDbPrepare.c~33a2c46afc8fac9a:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/localDbPrepare.c
BitKeeper/deleted/.del-macros.h~58097d584e29b5df:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/macros.h
BitKeeper/deleted/.del-ndb_error.hpp~24468bb7f20a0b41:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/ndb_error.hpp
BitKeeper/deleted/.del-userHandle.h~ec22dc7a7ed2f81b:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userHandle.h
BitKeeper/deleted/.del-Makefile~b6d0cd4d8c9d339b:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/Makefile
BitKeeper/deleted/.del-userHandle.h~3275bb415e1ca2c2:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userHandle.h
BitKeeper/deleted/.del-userInterface.cpp~82ee612ab14b3d48:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userInterface.cpp
BitKeeper/deleted/.del-userTransaction.c~438012ecc761b776:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userTransaction.c
BitKeeper/deleted/.del-Makefile~6a739ef75a821406:
  Delete: storage/ndb/test/ndbapi/old_dirs/restarter2/Makefile
BitKeeper/deleted/.del-Makefile~c4a8d15a64d73ee8:
  Delete: storage/ndb/test/ndbapi/old_dirs/restarter/Makefile
BitKeeper/deleted/.del-userInterface.c~92a20032f7d1e91:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userInterface.c
BitKeeper/deleted/.del-userTransaction.c~f50661b4f54b0bdd:
  Delete: storage/ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userTransaction.c
BitKeeper/deleted/.del-Makefile~23f3806c8505ea8f:
  Delete: storage/ndb/test/ndbapi/old_dirs/ronja/initronja/Makefile
BitKeeper/deleted/.del-Makefile~2fdd0e2bfef9eab7:
  Delete: storage/ndb/test/ndbapi/old_dirs/ronja/benchronja/Makefile
BitKeeper/deleted/.del-Makefile~d19ef6b3a02430e7:
  Delete: storage/ndb/test/ndbapi/old_dirs/restarts/Makefile
BitKeeper/deleted/.del-Makefile~edc1824919a8e593:
  Delete: storage/ndb/test/ndbapi/old_dirs/ronja/Makefile
BitKeeper/deleted/.del-Makefile~7246dc45283fec4f:
  Delete: storage/ndb/test/ndbapi/old_dirs/testBasic/Makefile
BitKeeper/deleted/.del-Makefile~8f8a72ead5c0dcbe:
  Delete: storage/ndb/test/ndbapi/old_dirs/testBackup/Makefile
BitKeeper/deleted/.del-Makefile~a8998c89d7ad17d0:
  Delete: storage/ndb/test/ndbapi/old_dirs/telco/Makefile
BitKeeper/deleted/.del-readme~2bb11c8fe8e713de:
  Delete: storage/ndb/test/ndbapi/old_dirs/telco/readme
BitKeeper/deleted/.del-Makefile~11a681d847711b20:
  Delete: storage/ndb/test/ndbapi/old_dirs/testDataBuffers/Makefile
BitKeeper/deleted/.del-Makefile~7b08d94bc77f36b5:
  Delete: storage/ndb/test/ndbapi/old_dirs/testDict/Makefile
BitKeeper/deleted/.del-Makefile~c72222538e5e4e48:
  Delete: storage/ndb/test/ndbapi/old_dirs/testBlobs/Makefile
BitKeeper/deleted/.del-Makefile~13237b5015038e7b:
  Delete: storage/ndb/test/ndbapi/old_dirs/testGrep/Makefile
BitKeeper/deleted/.del-Makefile~1e91adbf308b09:
  Delete: storage/ndb/test/ndbapi/old_dirs/testGrep/verify/Makefile
BitKeeper/deleted/.del-Makefile~348a4f3067115b99:
  Delete: storage/ndb/test/ndbapi/old_dirs/testIndex/Makefile
BitKeeper/deleted/.del-Makefile~4da89995b201a972:
  Delete: storage/ndb/test/ndbapi/old_dirs/testInterpreter/Makefile
BitKeeper/deleted/.del-Makefile~664fcd5e178e659a:
  Delete: storage/ndb/test/ndbapi/old_dirs/testNodeRestart/Makefile
BitKeeper/deleted/.del-Makefile~79ba0e5994952ae9:
  Delete: storage/ndb/test/ndbapi/old_dirs/testNdbApi/Makefile
BitKeeper/deleted/.del-Makefile~b76c5fcf57c53a58:
  Delete: storage/ndb/test/ndbapi/old_dirs/testOIBasic/Makefile
BitKeeper/deleted/.del-Makefile~b90fa88b1071a3f3:
  Delete: storage/ndb/test/ndbapi/old_dirs/testMgm/Makefile
BitKeeper/deleted/.del-Makefile~3a1d081f812432e3:
  Delete: storage/ndb/test/ndbapi/old_dirs/testRestartGci/Makefile
BitKeeper/deleted/.del-Makefile~3e916b320b0dc88:
  Delete: storage/ndb/test/ndbapi/old_dirs/testOrderedIndex/Makefile
BitKeeper/deleted/.del-Makefile~c9fac39964fe2f77:
  Delete: storage/ndb/test/ndbapi/old_dirs/testOperations/Makefile
BitKeeper/deleted/.del-times.txt~76ffa76ca8708af1:
  Delete: storage/ndb/test/ndbapi/old_dirs/testOIBasic/times.txt
BitKeeper/deleted/.del-Makefile~8ec0ddece8d8bd18:
  Delete: storage/ndb/test/ndbapi/old_dirs/testScanInterpreter/Makefile
BitKeeper/deleted/.del-Makefile~b3c2cd57699a958c:
  Delete: storage/ndb/test/ndbapi/old_dirs/testSystemRestart/Makefile
BitKeeper/deleted/.del-Makefile~c6f264b16640c32b:
  Delete: storage/ndb/test/ndbapi/old_dirs/testScan/Makefile
BitKeeper/deleted/.del-Makefile~f5c05697b5c6a926:
  Delete: storage/ndb/test/ndbapi/old_dirs/testTimeout/Makefile
BitKeeper/deleted/.del-Makefile~2e74033e6077aa3a:
  Delete: storage/ndb/test/ndbapi/old_dirs/testTransactions/Makefile
BitKeeper/deleted/.del-Makefile~91dad370d76274be:
  Delete: storage/ndb/test/ndbapi/old_dirs/vw_test/Makefile
BitKeeper/deleted/.del-Makefile~ddc74468722656bb:
  Delete: storage/ndb/test/ndbapi/old_dirs/test_event/Makefile
BitKeeper/deleted/.del-bcd.h~81fbfcc1530534da:
  Delete: storage/ndb/test/ndbapi/old_dirs/vw_test/bcd.h
BitKeeper/deleted/.del-client_start~1ecfaed180a75edd:
  Delete: storage/ndb/test/ndbapi/old_dirs/vw_test/script/client_start
BitKeeper/deleted/.del-utv.h~f64af026b9705ebb:
  Delete: storage/ndb/test/ndbapi/old_dirs/vw_test/utv.h
BitKeeper/deleted/.del-vcdrfunc.h~85803875180684cd:
  Delete: storage/ndb/test/ndbapi/old_dirs/vw_test/vcdrfunc.h
BitKeeper/deleted/.del-Makefile~ae168985806f34e8:
  Delete: storage/ndb/src/common/portlib/old_dirs/ose/Makefile
BitKeeper/deleted/.del-Makefile~b50f189dfbc87d8a:
  Delete: storage/ndb/src/common/portlib/old_dirs/memtest/munmaptest/Makefile
BitKeeper/deleted/.del-Makefile~dcc8c444bf25ce41:
  Delete: storage/ndb/src/common/portlib/old_dirs/memtest/Makefile
BitKeeper/deleted/.del-NdbCondition.c~ee56562abdd718cf:
  Delete: storage/ndb/src/common/portlib/old_dirs/ose/NdbCondition.c
BitKeeper/deleted/.del-NdbConditionOSE.h~455dd2c29c2e6344:
  Delete: storage/ndb/src/common/portlib/old_dirs/ose/NdbConditionOSE.h
BitKeeper/deleted/.del-NdbEnv.c~bb6fe7572d45288a:
  Delete: storage/ndb/src/common/portlib/old_dirs/ose/NdbEnv.c
BitKeeper/deleted/.del-NdbHost.c~cf18d6b3c825180c:
  Delete: storage/ndb/src/common/portlib/old_dirs/ose/NdbHost.c
BitKeeper/deleted/.del-NdbMem.c~6c2b317c1ce230ab:
  Delete: storage/ndb/src/common/portlib/old_dirs/ose/NdbMem.c
BitKeeper/deleted/.del-NdbMem_SoftOse.cpp~9c61e311ec168d44:
  Delete: storage/ndb/src/common/portlib/old_dirs/ose/NdbMem_SoftOse.cpp
BitKeeper/deleted/.del-NdbMutex.c~f4bdd19be08b84ab:
  Delete: storage/ndb/src/common/portlib/old_dirs/ose/NdbMutex.c
BitKeeper/deleted/.del-NdbOut.cpp~8caa99a0d729540c:
  Delete: storage/ndb/src/common/portlib/old_dirs/ose/NdbOut.cpp
BitKeeper/deleted/.del-NdbSleep.c~b88fbc5b140de10d:
  Delete: storage/ndb/src/common/portlib/old_dirs/ose/NdbSleep.c
BitKeeper/deleted/.del-NdbTCP.c~1e9f416992352f6d:
  Delete: storage/ndb/src/common/portlib/old_dirs/ose/NdbTCP.c
BitKeeper/deleted/.del-NdbThread.c~fe71a67b5c3a4724:
  Delete: storage/ndb/src/common/portlib/old_dirs/ose/NdbThread.c
BitKeeper/deleted/.del-NdbTick.c~b76feba2cf1493d1:
  Delete: storage/ndb/src/common/portlib/old_dirs/ose/NdbTick.c
BitKeeper/deleted/.del-Makefile~aa96712c481bc8e:
  Delete: storage/ndb/src/common/portlib/old_dirs/win32/Makefile
BitKeeper/deleted/.del-Makefile~d04b4a185b6e1071:
  Delete: storage/ndb/src/common/portlib/old_dirs/test/Makefile
BitKeeper/deleted/.del-NdbCondition.c~ad83464328ab37af:
  Delete: storage/ndb/src/common/portlib/old_dirs/win32/NdbCondition.c
BitKeeper/deleted/.del-NdbDaemon.c~3b8101f376b28df:
  Delete: storage/ndb/src/common/portlib/old_dirs/win32/NdbDaemon.c
BitKeeper/deleted/.del-NdbEnv.c~207f9ce9754c9e8a:
  Delete: storage/ndb/src/common/portlib/old_dirs/win32/NdbEnv.c
BitKeeper/deleted/.del-NdbHost.c~2c29816c77396d7b:
  Delete: storage/ndb/src/common/portlib/old_dirs/win32/NdbHost.c
BitKeeper/deleted/.del-NdbMem.c~6285b159985d46da:
  Delete: storage/ndb/src/common/portlib/old_dirs/win32/NdbMem.c
BitKeeper/deleted/.del-NdbMutex.c~768131269bccca10:
  Delete: storage/ndb/src/common/portlib/old_dirs/win32/NdbMutex.c
BitKeeper/deleted/.del-NdbSleep.c~b643ea3e7103eb62:
  Delete: storage/ndb/src/common/portlib/old_dirs/win32/NdbSleep.c
BitKeeper/deleted/.del-NdbTCP.c~b09cdcbef3ea2c57:
  Delete: storage/ndb/src/common/portlib/old_dirs/win32/NdbTCP.c
BitKeeper/deleted/.del-NdbThread.c~2fe1fa5f47801772:
  Delete: storage/ndb/src/common/portlib/old_dirs/win32/NdbThread.c
BitKeeper/deleted/.del-NdbTick.c~aa6385567216509d:
  Delete: storage/ndb/src/common/portlib/old_dirs/win32/NdbTick.c
BitKeeper/deleted/.del-Makefile~62207a82b90e653:
  Delete: storage/ndb/test/tools/old_dirs/hugoCalculator/Makefile
BitKeeper/deleted/.del-Makefile~54e6a2262bbe162a:
  Delete: storage/ndb/test/tools/old_dirs/hugoLockRecords/Makefile
BitKeeper/deleted/.del-Makefile~79e81dfed9112c7:
  Delete: storage/ndb/test/tools/old_dirs/hugoLoad/Makefile
BitKeeper/deleted/.del-Makefile~c2b94348137b633a:
  Delete: storage/ndb/test/tools/old_dirs/hugoPkDelete/Makefile
BitKeeper/deleted/.del-Makefile~f90065821a932b3f:
  Delete: storage/ndb/test/tools/old_dirs/hugoFill/Makefile
BitKeeper/deleted/.del-Makefile~3ae1e42a4d7b1d6a:
  Delete: storage/ndb/test/tools/old_dirs/hugoPkRead/Makefile
BitKeeper/deleted/.del-Makefile~89557cc224193d4:
  Delete: storage/ndb/test/tools/old_dirs/hugoPkReadRecord/Makefile
BitKeeper/deleted/.del-Makefile~a6a5bd72a2311773:
  Delete: storage/ndb/test/tools/old_dirs/hugoScanRead/Makefile
BitKeeper/deleted/.del-Makefile~e918384f46b2aef0:
  Delete: storage/ndb/test/tools/old_dirs/hugoPkUpdate/Makefile
BitKeeper/deleted/.del-Makefile~2a7bcc03f802d4f:
  Delete: storage/ndb/test/tools/old_dirs/hugoScanUpdate/Makefile
BitKeeper/deleted/.del-Makefile~2f05dedf982dcd9:
  Delete: storage/ndb/test/tools/old_dirs/transproxy/Makefile
BitKeeper/deleted/.del-Makefile~b9e514baf06145d5:
  Delete: storage/ndb/test/tools/old_dirs/restart/Makefile
BitKeeper/deleted/.del-Makefile~f1d6329f42d0922d:
  Delete: storage/ndb/test/tools/old_dirs/verify_index/Makefile
BitKeeper/deleted/.del-waiter.cpp~b188e4bfddf2cf98:
  Delete: storage/ndb/test/tools/old_dirs/waiter/waiter.cpp
BitKeeper/deleted/.del-Makefile~65110e0a5cb381:
  Delete: storage/ndb/tools/old_dirs/copy_tab/Makefile
BitKeeper/deleted/.del-Makefile~6dbecfdfc2878bb3:
  Delete: storage/ndb/tools/old_dirs/cpcc/Makefile
BitKeeper/deleted/.del-Makefile~77a4d0f4c11f13b5:
  Delete: storage/ndb/tools/old_dirs/create_index/Makefile
BitKeeper/deleted/.del-Makefile~57f187037bf9e65d:
  Delete: storage/ndb/tools/old_dirs/desc/Makefile
BitKeeper/deleted/.del-Makefile~b25e897a378dd139:
  Delete: storage/ndb/tools/old_dirs/delete_all/Makefile
BitKeeper/deleted/.del-Makefile~1b4547a47a5607:
  Delete: storage/ndb/tools/old_dirs/drop_index/Makefile
BitKeeper/deleted/.del-Makefile~62140e0b68eb516c:
  Delete: storage/ndb/tools/old_dirs/drop_tab/Makefile
BitKeeper/deleted/.del-Makefile~b95bfed632918157:
  Delete: storage/ndb/tools/old_dirs/list_tables/Makefile
BitKeeper/deleted/.del-Makefile.PL~81be90388548652f:
  Delete: storage/ndb/tools/old_dirs/ndbnet/Makefile.PL
BitKeeper/deleted/.del-ndbnet.pl~8f8f1b18f0458269:
  Delete: storage/ndb/tools/old_dirs/ndbnet/ndbnet.pl
BitKeeper/deleted/.del-ndbnetd.pl~e44f1cfe7e8bbe14:
  Delete: storage/ndb/tools/old_dirs/ndbnet/ndbnetd.pl
BitKeeper/deleted/.del-Base.pm~50a6f0d38fa1a57c:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Base.pm
BitKeeper/deleted/.del-ndbrun~5db549d7436ac81b:
  Delete: storage/ndb/tools/old_dirs/ndbnet/ndbrun
BitKeeper/deleted/.del-Client.pm~45adb527c5cfdaf6:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Client.pm
BitKeeper/deleted/.del-Command.pm~a20dff1bfd06ea7a:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Command.pm
BitKeeper/deleted/.del-Config.pm~24456d4beba19604:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Config.pm
BitKeeper/deleted/.del-Database.pm~cc02e455b02c557:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Database.pm
BitKeeper/deleted/.del-Env.pm~ffeca4ab253818c3:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Env.pm
BitKeeper/deleted/.del-Node.pm~276106bf4000fe2b:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Node.pm
BitKeeper/deleted/.del-NodeApi.pm~3abf1d7bc947d3d0:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeApi.pm
BitKeeper/deleted/.del-NodeDb.pm~9e3055381da679ce:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeDb.pm
BitKeeper/deleted/.del-NodeMgmt.pm~5123fbffcfce73cb:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeMgmt.pm
BitKeeper/deleted/.del-Server.pm~70208c964371fd4d:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Server.pm
BitKeeper/deleted/.del-ServerINET.pm~fc72d28fedd17795:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/ServerINET.pm
BitKeeper/deleted/.del-ServerUNIX.pm~ad3e25435fceb8d0:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net/ServerUNIX.pm
BitKeeper/deleted/.del-Base.pm~dd382c9eec2c38b1:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Base.pm
BitKeeper/deleted/.del-Database.pm~ec533cd5dd6a54a2:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Database.pm
BitKeeper/deleted/.del-Env.pm~a343841fae6d0514:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Env.pm
BitKeeper/deleted/.del-Net.pm~425c84165071d5f6:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Net.pm
BitKeeper/deleted/.del-Node.pm~339139ded5fcf795:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Node.pm
BitKeeper/deleted/.del-Run.pm~9b414f2b4b76a4da:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Run.pm
BitKeeper/deleted/.del-Base.pm~f39906f304e8a49:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Base.pm
BitKeeper/deleted/.del-Util.pm~9be64f1195ec502d:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util.pm
BitKeeper/deleted/.del-Dir.pm~4cbe8dd8c57149a7:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Dir.pm
BitKeeper/deleted/.del-Event.pm~f445c1c094f57cf:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Event.pm
BitKeeper/deleted/.del-File.pm~48da8e977f39bf7:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/File.pm
BitKeeper/deleted/.del-IO.pm~6c6a63ce63fe2ee5:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/IO.pm
BitKeeper/deleted/.del-Lock.pm~366e56786358b3d8:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Lock.pm
BitKeeper/deleted/.del-Log.pm~e0da9468a6f9213a:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Log.pm
BitKeeper/deleted/.del-Socket.pm~371ccd6c5a818fa0:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Socket.pm
BitKeeper/deleted/.del-SocketINET.pm~db8a45b1360b69f2:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/SocketINET.pm
BitKeeper/deleted/.del-SocketUNIX.pm~9ffab2ada7f61530:
  Delete: storage/ndb/tools/old_dirs/ndbnet/lib/NDB/Util/SocketUNIX.pm
BitKeeper/deleted/.del-Makefile~b15469c2fbde2dec:
  Delete: storage/ndb/tools/old_dirs/ndbsql/Makefile
BitKeeper/deleted/.del-Makefile~3d1cd223b42a8fa0:
  Delete: storage/ndb/tools/old_dirs/select_count/Makefile
BitKeeper/deleted/.del-Makefile~62f516a16a0cf773:
  Delete: storage/ndb/tools/old_dirs/select_all/Makefile
BitKeeper/deleted/.del-CounterViewer.java~e83264ff6a5be97:
  Delete: storage/ndb/tools/old_dirs/src/counterviewer/CounterViewer.java
storage/ndb/Makefile.am:
  Remove reference to old_files directory
2006-04-18 12:12:46 -07:00
unknown
707980605d Added --p for producing output parsable by LOAD TABLE INFILE 2006-04-11 14:09:04 +02:00
unknown
a318cc7c03 Merge
storage/ndb/tools/Makefile.am:
  Auto merged
2006-03-30 22:10:48 +02:00
unknown
0b098ca262 Merge mysql.com:/opt/local/work/tmp_merge
into  mysql.com:/opt/local/work/mysql-5.1-merge


mysql-test/r/loaddata.result:
  Auto merged
mysql-test/r/ndb_read_multi_range.result:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged
mysql-test/t/ndb_read_multi_range.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
storage/ndb/tools/Makefile.am:
  Auto merged
2006-03-30 18:43:42 +04:00
unknown
b70b75567a Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


mysql-test/lib/mtr_timer.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/StartPerm.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TcContinueB.hpp:
  Auto merged
storage/ndb/include/mgmapi/ndbd_exit_codes.h:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
  Auto merged
storage/ndb/src/kernel/vm/TransporterCallback.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
storage/ndb/test/include/NdbRestarter.hpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/ndbapi/testSystemRestart.cpp:
  Auto merged
storage/ndb/test/ndbapi/testTimeout.cpp:
  Auto merged
storage/ndb/test/run-test/conf-daily-devel-ndbmaster.txt:
  Auto merged
storage/ndb/test/run-test/conf-dl145a.txt:
  Auto merged
storage/ndb/test/run-test/conf-ndbmaster.txt:
  Auto merged
storage/ndb/test/run-test/ndb-autotest.sh:
  Auto merged
storage/ndb/test/src/NdbRestarter.cpp:
  Auto merged
storage/ndb/test/run-test/conf-shark.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  merge
storage/ndb/src/ndbapi/TransporterFacade.hpp:
  merge
storage/ndb/test/run-test/Makefile.am:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge
storage/ndb/tools/desc.cpp:
  merge
2006-03-24 07:43:55 +01:00
unknown
8bc7214f2b ndb - bug#17813 schema.query => blob
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  ER_ALL: omit unchanged blob inlines
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  ER_ALL: omit unchanged blob inlines
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  ER_ALL: omit unchanged blob inlines
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  ER_ALL: omit unchanged blob inlines
storage/ndb/src/ndbapi/NdbBlob.cpp:
  atNextEvent: ignore non-data event
sql/ha_ndbcluster_binlog.cc:
  schema.query => blob
storage/ndb/tools/restore/Restore.cpp:
  allow 'system tables' to have blob attrs
storage/ndb/tools/restore/Restore.hpp:
  allow 'system tables' to have blob attrs
storage/ndb/tools/restore/restore_main.cpp:
  allow 'system tables' to have blob attrs
2006-03-23 04:59:14 +01:00
unknown
13a81d455f Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-02-21 05:08:18 +01:00
unknown
449cc2400b ndb - fix event created by ndb_restore bug#17045 (not really)
mysql-test/t/disabled.def:
  leave ndb_dd_backuprestore disabled until *.result corrected
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  error code was clobbered
storage/ndb/tools/restore/consumer_restore.cpp:
  surprise - ndb_restore creates events
2006-02-21 02:27:23 +01:00
unknown
2a4ca93d8e Merge perch.ndb.mysql.com:/home/jonas/src/51-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2006-02-20 08:40:24 +01:00
unknown
9b55f51a11 bug#17183
ndb_restore in 5.1.6 with files from < 5.1.3


storage/ndb/tools/restore/Restore.cpp:
  Fix backward compatible...
2006-02-14 11:48:15 +01:00
unknown
43dab66aaf forgot to commit in prev patch 2006-02-13 17:07:13 +01:00
unknown
67e16225ec manual merge
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/include/ndbapi/ndb_cluster_connection.hpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
2006-02-13 14:25:31 +01:00
unknown
d7becbc2c8 Merge mysql.com:/home/kostja/mysql/mysql-5.0-root
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


BitKeeper/deleted/.del-ndb_load.result:
  Delete: mysql-test/r/ndb_load.result
BitKeeper/deleted/.del-ndb_load.test:
  Delete: mysql-test/t/ndb_load.test
extra/perror.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/ndb_blob.result:
  Auto merged
mysql-test/r/sp-code.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/sp-destruct.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Auto merged
storage/ndb/src/kernel/main.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
storage/ndb/tools/delete_all.cpp:
  Auto merged
mysql-test/t/disabled.def:
  Manual merge.
2006-02-09 13:35:59 +03:00
unknown
756e8015ad Merge perch.ndb.mysql.com:/home/jonas/src/51-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


sql/ha_ndbcluster.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Auto merged
storage/ndb/test/ndbapi/test_event.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  SCCS merged
2006-02-06 21:31:34 +01:00
unknown
62985d2eaf bug#16873 -
Print creating of dd objects during ndb_restore


storage/ndb/tools/restore/consumer_restore.cpp:
  Print creating of dd objects
2006-02-06 10:07:15 +01:00
unknown
d297a221fe Merge mysql.com:/home/kostja/mysql/tmp_merge
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


BitKeeper/etc/ignore:
  auto-union
configure.in:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/ndb/ndbcluster.sh:
  Auto merged
mysql-test/r/rpl_sp.result:
  Auto merged
mysql-test/r/sp-error.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/rpl_sp.test:
  Auto merged
mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/myisam/ft_update.c:
  Auto merged
storage/ndb/include/logger/LogHandler.hpp:
  Auto merged
storage/ndb/include/logger/Logger.hpp:
  Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/include/mgmcommon/ConfigRetriever.hpp:
  Auto merged
storage/ndb/src/common/logger/FileLogHandler.cpp:
  Auto merged
storage/ndb/src/common/logger/LogHandler.cpp:
  Auto merged
storage/ndb/src/common/logger/Logger.cpp:
  Auto merged
storage/ndb/src/common/logger/SysLogHandler.cpp:
  Auto merged
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
storage/ndb/src/common/util/SocketServer.cpp:
  Auto merged
storage/ndb/src/kernel/main.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.hpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
  Auto merged
storage/ndb/src/mgmsrv/main.cpp:
  Auto merged
storage/ndb/tools/ndb_size.pl:
  Auto merged
zlib/Makefile.am:
  Auto merged
mysql-test/r/information_schema.result:
  SCCS merged
mysql-test/t/information_schema.test:
  Manual merge.
sql/ha_archive.cc:
  Manual merge.
sql/share/errmsg.txt:
  SCCS merged
tests/mysql_client_test.c:
  Manual merge.
2006-02-02 23:27:06 +03:00
unknown
1f197d6af6 Merge localhost:src/51-new
into  eel.(none):/home/jonas/src/mysql-5.1-new


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  SCCS merged
2006-02-02 20:18:50 +01:00
unknown
5bc7f5f94c ndb dd
Fix SR bug that extent pages was scanned before undo was run
  Fix bug wrt page flushing/tsman and tup's dirty page list


storage/ndb/include/kernel/signaldata/PgmanContinueB.hpp:
  Fix dd SR + dd free space bugs
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  remove some unused code
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Add LCP_PREPARE to pgman
  Change order between TSMAN/LGMAN START_RECREQ
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Fix dd SR + dd free space bugs
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Fix dd SR + dd free space bugs
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  Fix dd SR + dd free space bugs
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Fix dd SR + dd free space bugs
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Fix dd SR + dd free space bugs
storage/ndb/src/kernel/blocks/diskpage.hpp:
  Fix dd SR + dd free space bugs
storage/ndb/src/kernel/blocks/lgman.cpp:
  Fix dd SR + dd free space bugs
storage/ndb/src/kernel/blocks/pgman.cpp:
  Fix dd SR + dd free space bugs
storage/ndb/src/kernel/blocks/pgman.hpp:
  Fix dd SR + dd free space bugs
storage/ndb/src/kernel/blocks/tsman.cpp:
  Fix dd SR + dd free space bugs
storage/ndb/src/kernel/blocks/tsman.hpp:
  Fix dd SR + dd free space bugs
storage/ndb/src/kernel/vm/DLFifoList.hpp:
  Fix dd SR + dd free space bugs
storage/ndb/test/tools/hugoLoad.cpp:
  Fix dd SR + dd free space bugs
storage/ndb/tools/delete_all.cpp:
  Fix dd SR + dd free space bugs
2006-02-02 12:23:23 +01:00
unknown
9796f9c960 MySQL Bugs: #16466: DD: SHOW CREATE TABLE does not show TABLESPACE table_space1 STORAGE DISK 2006-02-01 11:56:20 +01:00
unknown
ea67b28c5b WL #2747: After push fixes
mysql-test/ndb/ndbcluster.sh:
  Upgraded DataMemory to 20M so that ndb_restore tests fit in memory
mysql-test/r/ndb_config.result:
  Upgraded DataMemory to 20M so that ndb_restore tests fit in memory
mysql-test/r/ndb_restore.result:
  Added check that no extra objects exist before starting
  Added printout from erronous node group map
mysql-test/t/disabled.def:
  Activated ndb_restore again
mysql-test/t/ndb_restore.test:
  Added new test cases and handling of error case for node group maps
storage/ndb/tools/restore/consumer_restore.cpp:
  Removed debug printouts
storage/ndb/tools/restore/restore_main.cpp:
  Removed debug printouts
  ndbout => info
  some ndbout => err
  and yet others
  ndbout => debug
2006-01-19 13:32:58 -05:00
unknown
35137c3d91 fix my_compress/zlib link error 2006-01-17 18:35:15 +01:00
unknown
6aa4cded53 fix compile error 2006-01-17 18:35:11 +01:00
unknown
6f83ed91f3 WL #2747: Fix such that backup and restore works for user defined
partitioned tables in NDB


include/my_sys.h:
  Move packfrm and unpackfrm to mysys
mysql-test/r/ndb_restore.result:
  New test cases
mysql-test/t/ndb_restore.test:
  New test cases
mysys/my_compress.c:
  Moved packfrm and unpackfrm to mysys
sql/ha_ndbcluster.cc:
  Set value of partition function in hidden field for user defined
  partitioning in NDB to handle restore and later on-line reorganize
  of partitions
  To save space value of those functions are limited to 32 bits
sql/ha_partition.cc:
  Use new get_partition_id interface
sql/handler.h:
  Use new get_partition_id interface
sql/mysql_priv.h:
  Moved to mysys
sql/mysqld.cc:
  Minor
sql/opt_range.cc:
  New get_partition_id interface
sql/sql_partition.cc:
  New get_partition_id interface
  Fix error checks of specification of engines in ALTER TABLE
  Moved packfrm and unpackfrm to mysys
sql/sql_table.cc:
  Fixed debug printouts
storage/ndb/include/kernel/ndb_limits.h:
  New constant
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  New table description item
storage/ndb/include/ndb_version.h.in:
  New version specific constant
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  New item in table descriptions
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  New item in table descriptions
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Write fragment id in backup's log entry
storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp:
  Write fragment id in backup's log entry
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  New item in table description
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  New item in table description
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Moved constant
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  New item in table description
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  New item in table description
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  New item in table description
storage/ndb/tools/Makefile.am:
  Compress library needed for ndb_restore
storage/ndb/tools/restore/Restore.cpp:
  Handle fragment id and also handle backups from older versions
storage/ndb/tools/restore/Restore.hpp:
  Use fragment id
storage/ndb/tools/restore/consumer.hpp:
  Use fragment id
storage/ndb/tools/restore/consumer_printer.cpp:
  Use fragment id
storage/ndb/tools/restore/consumer_printer.hpp:
  Use fragment id
storage/ndb/tools/restore/consumer_restore.cpp:
  Code to map node groups if new cluster has different set of
  node groups from original cluster
  Very simple search and replace parser of partition syntax in frm file
  Fix settings of partition id properly using fragment id and hidden
  field in tables
storage/ndb/tools/restore/consumer_restore.hpp:
  Changed function headers and new one for mapping node groups
storage/ndb/tools/restore/consumer_restorem.cpp:
  Use fragment id
storage/ndb/tools/restore/restore_main.cpp:
  New parameter to set node group map, parser for this parameter
2006-01-17 09:25:12 +01:00
unknown
19bbb7cc85 WL #2604: Partition Management
Optimised version of ADD/DROP/REORGANIZE partitions for
non-NDB storage engines.
New syntax to handle REBUILD/OPTIMIZE/ANALYZE/CHECK/REPAIR partitions
Quite a few bug fixes


include/thr_lock.h:
  New method to downgrade locks from TL_WRITE_ONLY
  Possibility to upgrade lock while aborting locks
mysql-test/r/ndb_autodiscover.result:
  Fix for lowercase and that all NDB tables are now partitioned
mysql-test/r/ndb_bitfield.result:
  Fix for lowercase and that all NDB tables are now partitioned
mysql-test/r/ndb_gis.result:
  Fix for lowercase and that all NDB tables are now partitioned
mysql-test/r/ndb_partition_key.result:
  New test case
mysql-test/r/partition.result:
  New test case
mysql-test/r/partition_error.result:
  New test case
mysql-test/r/partition_mgm_err.result:
  Fix of test case results
mysql-test/t/disabled.def:
  partition_03ndb still has bug
mysql-test/t/ndb_partition_key.test:
  New test cases for new functionality and bugs
mysql-test/t/partition.test:
  New test cases for new functionality and bugs
mysql-test/t/partition_error.test:
  New test cases for new functionality and bugs
mysql-test/t/partition_mgm_err.test:
  New test cases for new functionality and bugs
mysys/thr_lock.c:
  New method to downgrade TL_WRITE_ONLY locks
  Possibility to specify if locks are to be upgraded at abort locks
sql/ha_archive.cc:
  New handlerton methods
sql/ha_berkeley.cc:
  New handlerton methods
sql/ha_blackhole.cc:
  New handlerton methods
sql/ha_federated.cc:
  New handlerton methods
sql/ha_heap.cc:
  New handlerton methods
sql/ha_innodb.cc:
  New handlerton methods
sql/ha_myisam.cc:
  New handlerton methods
sql/ha_myisammrg.cc:
  New handlerton methods
sql/ha_ndbcluster.cc:
  New handlerton methods
  Moved out packfrm and unpackfrm methods
  Adapted many parts to use table_share instead of table->s
  Ensured that .ndb file uses filename and not tablename
  according to new encoding of names (WL 1324)
  All NDB tables are partitioned and set up partition info
  Fixed such that tablenames use tablenames and not filenames in NDB
  NDB uses auto partitioning for ENGINE=NDB tables
  Warning for very large tables
  Set RANGE data
  Set LIST data
  New method to set-up partition info
  Set Default number of partitions flag
  Set linear hash flag
  Set node group array
  Set number of fragments
  Set max rows
  Set tablespace names
  New method to get number of partitions of table to use at open table
sql/ha_ndbcluster.h:
  Removed partition_flags and alter_table_flags from handler class
  A couple of new and changed method headers
sql/ha_ndbcluster_binlog.cc:
  Use new method headers
sql/ha_partition.cc:
  New handlerton methods
  Lots of new function headers
  Use #P# as separator between table name and partition name and
  #SP# as separator between partition name and subpartition name
  Use filename encoding for files both of table name part and of
  partition name parts
  New method to drop partitions based on partition state
  New method to rename partitions based on partition state
  New methods to optimize, analyze, check and repair partitions
  New methods to optimize, analyze, check and repair table
  Helper method to create new partition, open it and external lock
  it, not needed to lock it internally since no one else knows about
  it yet.
  Cleanup method at error for new partitions
  New methods to perform bulk of work at ADD/REORGANIZE partitions
  (change_partitions, copy_partitions)
sql/ha_partition.h:
  New methods and variables
  A few dropped ones and a few changed ones
sql/handler.cc:
  Handlerton interface changes
  New flag to open_table_from_share
sql/handler.h:
  New alter_table_flags
  New partition flags
  New partition states
  More states for default handling
  Lots of new, dropped and changed interfaces
sql/lex.h:
  Added REBUILD and changed name of REORGANISE to REORGANIZE
sql/lock.cc:
  Method to downgrade locks
  Able to specify if locks upgraded on abort locks
sql/log.cc:
  New handlerton methods
sql/mysql_priv.h:
  Lots of new interfaces
sql/share/errmsg.txt:
  Lots of new, dropped and changed error messages
sql/sql_base.cc:
  Adapted to new method headers
  New method to abort and upgrade lock
  New method to close open tables and downgrade lock
  New method to wait for completed table
sql/sql_lex.h:
  New flags
sql/sql_partition.cc:
  Return int instead of bool in get_partition_id
  More defaults handling
  Make use of new mem_alloc_error method
  More work on function headers
  Changes to generate partition syntax to cater for intermediate
  partition states
  Lots of new code with large comments describing new features for
  Partition Management:
  ADD/DROP/REORGANIZE/OPTIMIZE/ANALYZE/CHECK/REPAIR partitions
sql/sql_show.cc:
  Minors
sql/sql_table.cc:
  Moved a couple of methods
  New methods to copy create lists and key lists
  for use with mysql_prepare_table
  New method to write frm file
  New handling of handlers with auto partitioning
  Fix CREATE TABLE LIKE
  Moved code for ADD/DROP/REORGANIZE partitions
  Use handlerton method for alter_table_flags
sql/sql_yacc.yy:
  More memory alloc error checks
  New syntax for REBUILD, ANALYZE, CHECK, OPTIMIZE, REPAIR partitions
sql/table.cc:
  Fix length of extra part to be 4 bytes
  Partition state introduced in frm file
sql/table.h:
  Partition state introduced
sql/unireg.cc:
  Partition state introduced
  Default partition
storage/csv/ha_tina.cc:
  New handlerton methods
storage/example/ha_example.cc:
  New handlerton methods
storage/ndb/include/kernel/ndb_limits.h:
  RANGE DATA
storage/ndb/include/kernel/signaldata/AlterTable.hpp:
  New interfaces in ALTER TABLE towards NDB kernel
storage/ndb/include/kernel/signaldata/DiAddTab.hpp:
  New section
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Lots of new parts of table description
storage/ndb/include/kernel/signaldata/LqhFrag.hpp:
  tablespace id specified in LQHFRAGREQ
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Lots of new methods in NDB dictionary
storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  Lots of new variables in table description
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Lots of new variables in table description
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Lots of new variables in table description
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  New error insertion
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  a few extra jam's
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Changes to definition of blob tables
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Lots of new stuff in NDB dictionary
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Lots of new stuff in NDB dictionary
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Lots of new stuff in NDB dictionary
storage/ndb/test/ndbapi/test_event.cpp:
  removed use of methods no longer in existence
storage/ndb/tools/restore/Restore.cpp:
  Renamed variable
2006-01-17 08:40:00 +01:00
unknown
4c798b42d3 wl2325 wl2324
mysql-test/include/have_ndb_extra.inc:
  New BitKeeper file ``mysql-test/include/have_ndb_extra.inc''
mysql-test/include/not_ndb.inc:
  New BitKeeper file ``mysql-test/include/not_ndb.inc''
mysql-test/r/have_ndb_extra.require:
  New BitKeeper file ``mysql-test/r/have_ndb_extra.require''
mysql-test/r/ndb_alter_table_row.result:
  New BitKeeper file ``mysql-test/r/ndb_alter_table_row.result''
mysql-test/r/ndb_alter_table_stm.result:
  New BitKeeper file ``mysql-test/r/ndb_alter_table_stm.result''
mysql-test/r/ndb_binlog_basic.result:
  New BitKeeper file ``mysql-test/r/ndb_binlog_basic.result''
mysql-test/r/ndb_binlog_multi.result:
  New BitKeeper file ``mysql-test/r/ndb_binlog_multi.result''
mysql-test/r/ndb_multi_row.result:
  New BitKeeper file ``mysql-test/r/ndb_multi_row.result''
mysql-test/r/not_ndb.require:
  New BitKeeper file ``mysql-test/r/not_ndb.require''
mysql-test/r/rpl_ndb_bank.result:
  New BitKeeper file ``mysql-test/r/rpl_ndb_bank.result''
mysql-test/r/rpl_ndb_basic.result:
  New BitKeeper file ``mysql-test/r/rpl_ndb_basic.result''
mysql-test/r/rpl_ndb_disk.result:
  New BitKeeper file ``mysql-test/r/rpl_ndb_disk.result''
mysql-test/r/rpl_ndb_idempotent.result:
  New BitKeeper file ``mysql-test/r/rpl_ndb_idempotent.result''
mysql-test/r/rpl_ndb_load.result:
  New BitKeeper file ``mysql-test/r/rpl_ndb_load.result''
mysql-test/r/rpl_ndb_multi.result:
  New BitKeeper file ``mysql-test/r/rpl_ndb_multi.result''
mysql-test/r/rpl_ndb_sync.result:
  New BitKeeper file ``mysql-test/r/rpl_ndb_sync.result''
mysql-test/r/rpl_row_basic_7ndb.result:
  New BitKeeper file ``mysql-test/r/rpl_row_basic_7ndb.result''
mysql-test/t/ndb_alter_table_row.test:
  New BitKeeper file ``mysql-test/t/ndb_alter_table_row.test''
mysql-test/t/ndb_alter_table_stm.test:
  New BitKeeper file ``mysql-test/t/ndb_alter_table_stm.test''
mysql-test/t/ndb_binlog_basic.test:
  New BitKeeper file ``mysql-test/t/ndb_binlog_basic.test''
mysql-test/t/ndb_binlog_multi.test:
  New BitKeeper file ``mysql-test/t/ndb_binlog_multi.test''
mysql-test/t/ndb_multi_row.test:
  New BitKeeper file ``mysql-test/t/ndb_multi_row.test''
mysql-test/t/rpl_ndb_bank.test:
  New BitKeeper file ``mysql-test/t/rpl_ndb_bank.test''
mysql-test/t/rpl_ndb_basic.test:
  New BitKeeper file ``mysql-test/t/rpl_ndb_basic.test''
mysql-test/t/rpl_ndb_disk.test:
  New BitKeeper file ``mysql-test/t/rpl_ndb_disk.test''
mysql-test/t/rpl_ndb_idempotent.test:
  New BitKeeper file ``mysql-test/t/rpl_ndb_idempotent.test''
mysql-test/t/rpl_ndb_load.test:
  New BitKeeper file ``mysql-test/t/rpl_ndb_load.test''
mysql-test/t/rpl_ndb_multi.test:
  New BitKeeper file ``mysql-test/t/rpl_ndb_multi.test''
mysql-test/t/rpl_ndb_sync.test:
  New BitKeeper file ``mysql-test/t/rpl_ndb_sync.test''
mysql-test/t/rpl_row_basic_7ndb.test:
  New BitKeeper file ``mysql-test/t/rpl_row_basic_7ndb.test''
sql/ha_ndbcluster_binlog.cc:
  New BitKeeper file ``sql/ha_ndbcluster_binlog.cc''
sql/ha_ndbcluster_binlog.h:
  New BitKeeper file ``sql/ha_ndbcluster_binlog.h''
sql/ha_ndbcluster_tables.h:
  New BitKeeper file ``sql/ha_ndbcluster_tables.h''
sql/rpl_injector.cc:
  New BitKeeper file ``sql/rpl_injector.cc''
sql/rpl_injector.h:
  New BitKeeper file ``sql/rpl_injector.h''
storage/ndb/include/kernel/signaldata/DihFragCount.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/DihFragCount.hpp''
2006-01-12 19:51:02 +01:00
unknown
641ce5e97e wl2723 - ndb opt. nr
mysql-test/t/rpl_multi_engine.test:
  merge fix
libmysqld/sql_tablespace.cc:
  New BitKeeper file ``libmysqld/sql_tablespace.cc''
mysql-test/r/ndb_basic_disk.result:
  New BitKeeper file ``mysql-test/r/ndb_basic_disk.result''
mysql-test/t/ndb_basic_disk.test:
  New BitKeeper file ``mysql-test/t/ndb_basic_disk.test''
sql/sql_tablespace.cc:
  New BitKeeper file ``sql/sql_tablespace.cc''
storage/ndb/src/kernel/blocks/OptNR.txt:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/OptNR.txt''
storage/ndb/src/kernel/vm/mem.txt:
  New BitKeeper file ``storage/ndb/src/kernel/vm/mem.txt''
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp''
storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp''
storage/ndb/tools/ndb_error_reporter:
  New BitKeeper file ``storage/ndb/tools/ndb_error_reporter''
2006-01-11 11:35:25 +01:00
unknown
eff9369d10 Merge mysql.com:/home/dlenev/src/mysql-5.0-bg14836
into  mysql.com:/home/dlenev/src/mysql-5.1-merges


mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/tools/ndb_size.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Manual merge.
mysql-test/t/information_schema.test:
  Manual merge.
sql/sql_trigger.cc:
  Manual merge.
2005-12-24 20:13:51 +03:00
unknown
380690316f Merge mysql.com:/home/mysql_src/mysql-5.0-van
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0
(2nd try; Pekka kindly accepted to fix storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
and storage/ndb/src/kernel/vm/SimulatedBlock.cpp after I push).


configure.in:
  Auto merged
mysql-test/r/ndb_charset.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
mysys/base64.c:
  Auto merged
sql/ha_archive.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/myisam/ft_parser.c:
  Auto merged
storage/ndb/include/kernel/AttributeDescriptor.hpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
storage/ndb/tools/ndb_size.pl:
  Auto merged
storage/ndb/tools/ndb_size.tmpl:
  Auto merged
mysql-test/t/disabled.def:
  merge
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  used "ul", Pekka said he'll fix
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  used "ul", Pekka said he'll fix
2005-11-19 10:43:28 +01:00
unknown
ee740746af Import ndb varsize
BitKeeper/deleted/.del-MetaData.cpp~146ae9865dd35829:
  Delete: storage/ndb/src/kernel/vm/MetaData.cpp
BitKeeper/deleted/.del-MetaData.hpp~538342afcd8ac53c:
  Delete: storage/ndb/src/kernel/vm/MetaData.hpp
BitKeeper/deleted/.del-DbtupLCP.cpp~855b1ed3fbc86a42:
  Delete: storage/ndb/src/kernel/blocks/dbtup/DbtupLCP.cpp
BitKeeper/deleted/.del-DbtupSystemRestart.cpp~15b54d7e4e75d2d:
  Delete: storage/ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp
BitKeeper/deleted/.del-DbtupUndoLog.cpp~5a2ef6e86b1404e9:
  Delete: storage/ndb/src/kernel/blocks/dbtup/DbtupUndoLog.cpp
storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp''
storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp''
storage/ndb/include/kernel/signaldata/CreateObj.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/CreateObj.hpp''
storage/ndb/include/kernel/signaldata/DictObjOp.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/DictObjOp.hpp''
storage/ndb/include/kernel/signaldata/DropFilegroup.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/DropFilegroup.hpp''
storage/ndb/include/kernel/signaldata/DropFilegroupImpl.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/DropFilegroupImpl.hpp''
storage/ndb/include/kernel/signaldata/DropObj.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/DropObj.hpp''
storage/ndb/include/kernel/signaldata/Extent.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/Extent.hpp''
storage/ndb/include/kernel/signaldata/LgmanContinueB.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/LgmanContinueB.hpp''
storage/ndb/include/kernel/signaldata/PgmanContinueB.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/PgmanContinueB.hpp''
storage/ndb/include/kernel/signaldata/RestoreContinueB.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/RestoreContinueB.hpp''
storage/ndb/include/kernel/signaldata/RestoreImpl.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/RestoreImpl.hpp''
storage/ndb/include/kernel/signaldata/TsmanContinueB.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/TsmanContinueB.hpp''
storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp''
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp''
storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp''
storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp''
storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.hpp''
storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp''
storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp''
storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp''
storage/ndb/src/kernel/blocks/diskpage.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/diskpage.cpp''
storage/ndb/src/kernel/blocks/diskpage.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/diskpage.hpp''
storage/ndb/src/kernel/blocks/lgman.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/lgman.cpp''
storage/ndb/src/kernel/blocks/lgman.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/lgman.hpp''
storage/ndb/src/kernel/blocks/pgman.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/pgman.cpp''
storage/ndb/src/kernel/blocks/pgman.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/pgman.hpp''
storage/ndb/src/kernel/blocks/print_file.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/print_file.cpp''
storage/ndb/src/kernel/blocks/restore.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/restore.cpp''
storage/ndb/src/kernel/blocks/restore.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/restore.hpp''
storage/ndb/src/kernel/blocks/tsman.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/tsman.cpp''
storage/ndb/src/kernel/blocks/tsman.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/blocks/tsman.hpp''
storage/ndb/src/kernel/vm/DLCFifoList.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/DLCFifoList.hpp''
storage/ndb/src/kernel/vm/DLCHashTable.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/DLCHashTable.hpp''
storage/ndb/src/kernel/vm/KeyTable2Ref.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/KeyTable2Ref.hpp''
storage/ndb/src/kernel/vm/Rope.cpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/Rope.cpp''
storage/ndb/src/kernel/vm/Rope.hpp:
  New BitKeeper file ``storage/ndb/src/kernel/vm/Rope.hpp''
2005-11-07 12:19:28 +01:00