Commit graph

489 commits

Author SHA1 Message Date
unknown
8b925d43ab configure.in:
New collations were added.


configure.in:
  New collations were added.
2004-06-18 12:09:21 +05:00
unknown
41b0444ca8 hpux compile fixes 2004-06-17 21:06:21 +00:00
unknown
f7b1750659 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1


configure.in:
  Auto merged
2004-06-15 11:30:00 +00:00
unknown
4db0d3c008 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1


configure.in:
  Auto merged
2004-06-15 06:39:58 +00:00
unknown
42d9baf933 ndb fixes for make dist
mysql-test/ndb/ndbcluster.sh:
  Change mode to -rw-rw-r--
2004-06-15 08:14:20 +02:00
unknown
25e262a068 Remove docs from make for now.
Plan is to introduce --flag, but Tomas will do that later.
2004-06-14 09:53:59 +02:00
unknown
5aec1bfa28 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1


configure.in:
  Auto merged
2004-06-11 23:39:10 +00:00
unknown
e9242d685b merged
acinclude.m4:
  Auto merged
include/m_ctype.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-czech.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-uca.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
strings/ctype-win1250ch.c:
  Auto merged
2004-06-11 20:55:08 +02:00
unknown
387fb31040 fix for ndb compile problem on non gcc 2004-06-11 09:39:20 +00:00
unknown
86ab1dd2d6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1


acconfig.h:
  Auto merged
configure.in:
  Auto merged
2004-06-07 17:58:35 +02:00
unknown
895efc07ac Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
configure.in:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2004-06-05 10:43:22 -07:00
unknown
b929e7b6a4 do not create ndb Makefiles unless required 2004-06-05 09:22:11 +02:00
unknown
7942677020 moved ndb versioning to configure and fixed ndb docs make 2004-06-04 16:08:50 +02:00
unknown
7b2ccce167 automake ndb docs make
ndb/src/old_files/newtonapi/Makefile:
  mvdir
ndb/src/old_files/newtonapi/dba_binding.cpp:
  mvdir
ndb/src/old_files/newtonapi/dba_bulkread.cpp:
  mvdir
ndb/src/old_files/newtonapi/dba_config.cpp:
  mvdir
ndb/src/old_files/newtonapi/dba_dac.cpp:
  mvdir
ndb/src/old_files/newtonapi/dba_error.cpp:
  mvdir
ndb/src/old_files/newtonapi/dba_init.cpp:
  mvdir
ndb/src/old_files/newtonapi/dba_internal.hpp:
  mvdir
ndb/src/old_files/newtonapi/dba_process.cpp:
  mvdir
ndb/src/old_files/newtonapi/dba_process.hpp:
  mvdir
ndb/src/old_files/newtonapi/dba_schema.cpp:
  mvdir
ndb/src/old_files/rep/ExtSender.cpp:
  mvdir
ndb/src/old_files/rep/ExtSender.hpp:
  mvdir
ndb/src/old_files/rep/Makefile:
  mvdir
ndb/src/old_files/rep/NodeConnectInfo.hpp:
  mvdir
ndb/src/old_files/rep/README:
  mvdir
ndb/src/old_files/rep/RepApiInterpreter.cpp:
  mvdir
ndb/src/old_files/rep/RepApiInterpreter.hpp:
  mvdir
ndb/src/old_files/rep/RepApiService.cpp:
  mvdir
ndb/src/old_files/rep/RepApiService.hpp:
  mvdir
ndb/src/old_files/rep/RepCommandInterpreter.cpp:
  mvdir
ndb/src/old_files/rep/RepCommandInterpreter.hpp:
  mvdir
ndb/src/old_files/rep/RepComponents.cpp:
  mvdir
ndb/src/old_files/rep/RepComponents.hpp:
  mvdir
ndb/src/old_files/rep/RepMain.cpp:
  mvdir
ndb/src/old_files/rep/Requestor.cpp:
  mvdir
ndb/src/old_files/rep/Requestor.hpp:
  mvdir
ndb/src/old_files/rep/RequestorSubscriptions.cpp:
  mvdir
ndb/src/old_files/rep/SignalQueue.cpp:
  mvdir
ndb/src/old_files/rep/SignalQueue.hpp:
  mvdir
ndb/src/old_files/rep/TODO:
  mvdir
ndb/src/old_files/rep/adapters/AppNDB.cpp:
  mvdir
ndb/src/old_files/rep/adapters/AppNDB.hpp:
  mvdir
ndb/src/old_files/rep/adapters/ExtAPI.cpp:
  mvdir
ndb/src/old_files/rep/adapters/ExtAPI.hpp:
  mvdir
ndb/src/old_files/rep/dbug_hack.cpp:
  mvdir
ndb/src/old_files/rep/rep_version.hpp:
  mvdir
ndb/src/old_files/rep/adapters/ExtNDB.cpp:
  mvdir
ndb/src/old_files/rep/adapters/ExtNDB.hpp:
  mvdir
ndb/src/old_files/rep/adapters/Makefile:
  mvdir
ndb/src/old_files/rep/adapters/TableInfoPs.hpp:
  mvdir
ndb/src/old_files/rep/repapi/Makefile:
  mvdir
ndb/src/old_files/rep/repapi/repapi.cpp:
  mvdir
ndb/src/old_files/rep/repapi/repapi.h:
  mvdir
ndb/src/old_files/rep/state/Channel.cpp:
  mvdir
ndb/src/old_files/rep/state/Channel.hpp:
  mvdir
ndb/src/old_files/rep/state/Interval.cpp:
  mvdir
ndb/src/old_files/rep/state/Interval.hpp:
  mvdir
ndb/src/old_files/rep/state/Makefile:
  mvdir
ndb/src/old_files/rep/state/RepState.cpp:
  mvdir
ndb/src/old_files/rep/state/RepState.hpp:
  mvdir
ndb/src/old_files/rep/state/RepStateEvent.cpp:
  mvdir
ndb/src/old_files/rep/state/RepStateRequests.cpp:
  mvdir
ndb/src/old_files/rep/state/testInterval/Makefile:
  mvdir
ndb/src/old_files/rep/state/testInterval/testInterval.cpp:
  mvdir
ndb/src/old_files/rep/state/testRepState/Makefile:
  mvdir
ndb/src/old_files/rep/state/testRepState/testRequestor.cpp:
  mvdir
ndb/src/old_files/rep/state/testRepState/testRequestor.hpp:
  mvdir
ndb/src/old_files/rep/storage/GCIBuffer.cpp:
  mvdir
ndb/src/old_files/rep/storage/GCIBuffer.hpp:
  mvdir
ndb/src/old_files/rep/storage/GCIContainer.cpp:
  mvdir
ndb/src/old_files/rep/storage/GCIContainer.hpp:
  mvdir
ndb/src/old_files/rep/storage/GCIContainerPS.cpp:
  mvdir
ndb/src/old_files/rep/storage/GCIContainerPS.hpp:
  mvdir
ndb/src/old_files/rep/storage/GCIPage.cpp:
  mvdir
ndb/src/old_files/rep/storage/GCIPage.hpp:
  mvdir
ndb/src/old_files/rep/storage/LogRecord.hpp:
  mvdir
ndb/src/old_files/rep/storage/Makefile:
  mvdir
ndb/src/old_files/rep/storage/NodeConnectInfo.hpp:
  mvdir
ndb/src/old_files/rep/storage/NodeGroup.cpp:
  mvdir
ndb/src/old_files/rep/storage/NodeGroup.hpp:
  mvdir
ndb/src/old_files/rep/storage/NodeGroupInfo.cpp:
  mvdir
ndb/src/old_files/rep/storage/NodeGroupInfo.hpp:
  mvdir
ndb/src/old_files/rep/transfer/Makefile:
  mvdir
ndb/src/old_files/rep/transfer/TransPS.cpp:
  mvdir
ndb/src/old_files/rep/transfer/TransPS.hpp:
  mvdir
ndb/src/old_files/rep/transfer/TransSS.cpp:
  mvdir
ndb/src/old_files/rep/transfer/TransSS.hpp:
  mvdir
ndb/src/old_files/rep/transfer/TransSSSubscriptions.cpp:
  mvdir
ndb/src/old_files/client/Makefile:
  mvdir
ndb/src/old_files/client/odbc/Extra.mk:
  mvdir
ndb/src/old_files/client/odbc/Makefile:
  mvdir
ndb/src/old_files/client/odbc/NdbOdbc.cpp:
  mvdir
ndb/src/old_files/client/odbc/NdbOdbc.def:
  mvdir
ndb/src/old_files/client/odbc/codegen/CodeGen.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/CodeGen.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_base.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_base.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_column.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_column.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_comp_op.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_comp_op.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_create_index.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_create_index.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_create_row.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_create_row.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_create_table.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_create_table.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_data_type.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_data_type.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_ddl.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_ddl.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_ddl_column.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_ddl_column.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_ddl_constr.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_ddl_constr.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_ddl_row.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_ddl_row.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_delete.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_delete.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_delete_index.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_delete_index.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_delete_lookup.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_delete_lookup.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_delete_scan.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_delete_scan.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_dml.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_dml.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_dml_column.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_dml_column.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_dml_row.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_dml_row.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_drop_index.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_drop_index.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_drop_table.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_drop_table.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr_column.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr_column.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr_const.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr_const.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr_conv.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr_conv.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr_func.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr_func.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr_op.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr_op.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr_param.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr_param.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr_row.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_expr_row.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_idx_column.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_idx_column.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_insert.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_insert.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_pred.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_pred.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_pred_op.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_pred_op.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_count.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_count.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_distinct.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_distinct.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_filter.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_filter.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_group.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_group.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_index.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_index.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_join.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_join.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_lookup.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_lookup.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_project.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_project.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_range.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_range.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_repeat.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_repeat.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_scan.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_scan.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_sort.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_sort.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_sys.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_query_sys.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_root.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_root.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_select.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_select.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_set_row.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_set_row.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_stmt.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_stmt.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_table.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_table.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_table_list.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_table_list.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_update.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_update.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_update_index.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_update_index.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_update_lookup.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_update_lookup.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_update_scan.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Code_update_scan.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/Makefile:
  mvdir
ndb/src/old_files/client/odbc/codegen/SimpleGram.ypp:
  mvdir
ndb/src/old_files/client/odbc/codegen/SimpleParser.cpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/SimpleParser.hpp:
  mvdir
ndb/src/old_files/client/odbc/codegen/SimpleScan.lpp:
  mvdir
ndb/src/old_files/client/odbc/common/AttrArea.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/AttrArea.hpp:
  mvdir
ndb/src/old_files/client/odbc/common/CodeTree.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/CodeTree.hpp:
  mvdir
ndb/src/old_files/client/odbc/common/ConnArea.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/ConnArea.hpp:
  mvdir
ndb/src/old_files/client/odbc/common/Ctx.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/Ctx.hpp:
  mvdir
ndb/src/old_files/client/odbc/common/DataField.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/DataField.hpp:
  mvdir
ndb/src/old_files/client/odbc/common/DataRow.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/DataRow.hpp:
  mvdir
ndb/src/old_files/client/odbc/common/DataType.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/DataType.hpp:
  mvdir
ndb/src/old_files/client/odbc/common/DescArea.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/DescArea.hpp:
  mvdir
ndb/src/old_files/client/odbc/common/DiagArea.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/DiagArea.hpp:
  mvdir
ndb/src/old_files/client/odbc/common/Makefile:
  mvdir
ndb/src/old_files/client/odbc/common/OdbcData.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/OdbcData.hpp:
  mvdir
ndb/src/old_files/client/odbc/common/ResultArea.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/ResultArea.hpp:
  mvdir
ndb/src/old_files/client/odbc/common/Sqlstate.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/Sqlstate.hpp:
  mvdir
ndb/src/old_files/client/odbc/common/StmtArea.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/StmtArea.hpp:
  mvdir
ndb/src/old_files/client/odbc/common/StmtInfo.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/StmtInfo.hpp:
  mvdir
ndb/src/old_files/client/odbc/common/common.cpp:
  mvdir
ndb/src/old_files/client/odbc/common/common.hpp:
  mvdir
ndb/src/old_files/client/odbc/dictionary/DictCatalog.cpp:
  mvdir
ndb/src/old_files/client/odbc/dictionary/DictCatalog.hpp:
  mvdir
ndb/src/old_files/client/odbc/dictionary/DictColumn.cpp:
  mvdir
ndb/src/old_files/client/odbc/dictionary/DictColumn.hpp:
  mvdir
ndb/src/old_files/client/odbc/dictionary/DictIndex.cpp:
  mvdir
ndb/src/old_files/client/odbc/dictionary/DictIndex.hpp:
  mvdir
ndb/src/old_files/client/odbc/dictionary/DictSchema.cpp:
  mvdir
ndb/src/old_files/client/odbc/dictionary/DictSchema.hpp:
  mvdir
ndb/src/old_files/client/odbc/dictionary/DictSys.cpp:
  mvdir
ndb/src/old_files/client/odbc/dictionary/DictSys.hpp:
  mvdir
ndb/src/old_files/client/odbc/dictionary/DictTable.cpp:
  mvdir
ndb/src/old_files/client/odbc/dictionary/DictTable.hpp:
  mvdir
ndb/src/old_files/client/odbc/dictionary/Makefile:
  mvdir
ndb/src/old_files/client/odbc/docs/class.fig:
  mvdir
ndb/src/old_files/client/odbc/docs/descfield.pl:
  mvdir
ndb/src/old_files/client/odbc/docs/diag.txt:
  mvdir
ndb/src/old_files/client/odbc/docs/getinfo.pl:
  mvdir
ndb/src/old_files/client/odbc/docs/gettypeinfo.pl:
  mvdir
ndb/src/old_files/client/odbc/docs/handleattr.pl:
  mvdir
ndb/src/old_files/client/odbc/docs/main.hpp:
  mvdir
ndb/src/old_files/client/odbc/docs/ndbodbc.html:
  mvdir
ndb/src/old_files/client/odbc/docs/select.fig:
  mvdir
ndb/src/old_files/client/odbc/docs/systables.pl:
  mvdir
ndb/src/old_files/client/odbc/docs/type.txt:
  mvdir
ndb/src/old_files/client/odbc/driver/Func.data:
  mvdir
ndb/src/old_files/client/odbc/driver/Func.pl:
  mvdir
ndb/src/old_files/client/odbc/driver/Makefile:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLAllocConnect.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLAllocEnv.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLAllocHandle.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLAllocHandleStd.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLAllocStmt.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLBindCol.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLBindParam.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLBindParameter.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLBrowseConnect.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLBulkOperations.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLCancel.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLCloseCursor.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLColAttribute.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLColAttributes.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLColumnPrivileges.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLColumns.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLConnect.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLCopyDesc.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLDataSources.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLDescribeCol.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLDescribeParam.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLDisconnect.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLDriverConnect.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLDrivers.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLEndTran.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLError.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLExecDirect.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLExecute.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLExtendedFetch.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLFetch.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLFetchScroll.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLForeignKeys.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLFreeConnect.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLFreeEnv.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLFreeHandle.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLFreeStmt.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLGetConnectAttr.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLGetConnectOption.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLGetCursorName.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLGetData.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLGetDescField.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLGetDescRec.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLGetDiagField.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLGetDiagRec.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLGetEnvAttr.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLGetFunctions.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLGetInfo.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLGetStmtAttr.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLGetStmtOption.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLGetTypeInfo.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLMoreResults.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLNativeSql.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLNumParams.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLNumResultCols.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLParamData.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLParamOptions.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLPrepare.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLPrimaryKeys.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLProcedureColumns.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLProcedures.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLPutData.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLRowCount.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLSetConnectAttr.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLSetConnectOption.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLSetCursorName.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLSetDescField.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLSetDescRec.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLSetEnvAttr.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLSetParam.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLSetPos.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLSetScrollOptions.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLSetStmtAttr.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLSetStmtOption.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLSpecialColumns.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLStatistics.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLTablePrivileges.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLTables.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/SQLTransact.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/driver.cpp:
  mvdir
ndb/src/old_files/client/odbc/driver/driver.hpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_comp_op.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_create_index.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_create_table.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_delete_index.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_delete_lookup.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_delete_scan.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_drop_index.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_drop_table.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_expr_conv.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_expr_func.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_expr_op.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_insert.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_pred_op.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_query_index.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_query_lookup.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_query_range.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_query_scan.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_query_sys.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_update_index.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_update_lookup.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Exec_update_scan.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Executor.cpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Executor.hpp:
  mvdir
ndb/src/old_files/client/odbc/executor/Makefile:
  mvdir
ndb/src/old_files/client/odbc/handles/AttrDbc.cpp:
  mvdir
ndb/src/old_files/client/odbc/handles/AttrEnv.cpp:
  mvdir
ndb/src/old_files/client/odbc/handles/AttrRoot.cpp:
  mvdir
ndb/src/old_files/client/odbc/handles/AttrStmt.cpp:
  mvdir
ndb/src/old_files/client/odbc/handles/DescSpec.cpp:
  mvdir
ndb/src/old_files/client/odbc/handles/FuncTab.cpp:
  mvdir
ndb/src/old_files/client/odbc/handles/HandleBase.cpp:
  mvdir
ndb/src/old_files/client/odbc/handles/HandleBase.hpp:
  mvdir
ndb/src/old_files/client/odbc/handles/HandleDbc.cpp:
  mvdir
ndb/src/old_files/client/odbc/handles/HandleDbc.hpp:
  mvdir
ndb/src/old_files/client/odbc/handles/HandleDesc.cpp:
  mvdir
ndb/src/old_files/client/odbc/handles/HandleDesc.hpp:
  mvdir
ndb/src/old_files/client/odbc/handles/HandleEnv.cpp:
  mvdir
ndb/src/old_files/client/odbc/handles/HandleEnv.hpp:
  mvdir
ndb/src/old_files/client/odbc/handles/HandleRoot.cpp:
  mvdir
ndb/src/old_files/client/odbc/handles/HandleRoot.hpp:
  mvdir
ndb/src/old_files/client/odbc/handles/HandleStmt.cpp:
  mvdir
ndb/src/old_files/client/odbc/handles/HandleStmt.hpp:
  mvdir
ndb/src/old_files/client/odbc/handles/InfoTab.cpp:
  mvdir
ndb/src/old_files/client/odbc/handles/Makefile:
  mvdir
ndb/src/old_files/client/odbc/handles/PoolNdb.cpp:
  mvdir
ndb/src/old_files/client/odbc/handles/PoolNdb.hpp:
  mvdir
ndb/src/old_files/client/odbc/handles/handles.hpp:
  mvdir
configure.in:
  added search for doxygen
ndb/docs/Makefile.am:
  automake docs make
ndb/docs/doxygen/postdoxy.pl:
  changed start of perl
ndb/docs/doxygen/predoxy.pl:
  changed start of perl
2004-06-04 14:08:16 +00:00
unknown
f633f2d4b7 ndb make updates
ndb/src/common/portlib/NdbCondition.c:
  Rename: ndb/src/common/portlib/unix/NdbCondition.c -> ndb/src/common/portlib/NdbCondition.c
ndb/src/common/portlib/NdbDaemon.c:
  Rename: ndb/src/common/portlib/unix/NdbDaemon.c -> ndb/src/common/portlib/NdbDaemon.c
ndb/src/common/portlib/NdbEnv.c:
  Rename: ndb/src/common/portlib/unix/NdbEnv.c -> ndb/src/common/portlib/NdbEnv.c
ndb/src/common/portlib/NdbHost.c:
  Rename: ndb/src/common/portlib/unix/NdbHost.c -> ndb/src/common/portlib/NdbHost.c
ndb/src/common/portlib/NdbMem.c:
  Rename: ndb/src/common/portlib/unix/NdbMem.c -> ndb/src/common/portlib/NdbMem.c
ndb/src/common/portlib/NdbMutex.c:
  Rename: ndb/src/common/portlib/unix/NdbMutex.c -> ndb/src/common/portlib/NdbMutex.c
ndb/src/common/portlib/NdbSleep.c:
  Rename: ndb/src/common/portlib/unix/NdbSleep.c -> ndb/src/common/portlib/NdbSleep.c
ndb/src/common/portlib/NdbTCP.c:
  Rename: ndb/src/common/portlib/unix/NdbTCP.c -> ndb/src/common/portlib/NdbTCP.c
ndb/src/common/portlib/NdbThread.c:
  Rename: ndb/src/common/portlib/unix/NdbThread.c -> ndb/src/common/portlib/NdbThread.c
ndb/src/common/portlib/NdbTick.c:
  Rename: ndb/src/common/portlib/unix/NdbTick.c -> ndb/src/common/portlib/NdbTick.c
BitKeeper/deleted/.del-Makefile.am~4d9c81a4353f3ee8:
  Delete: ndb/src/common/portlib/unix/Makefile.am
ndb/src/common/portlib/old_dirs/unix/Makefile_old:
  mvdir
ndb/src/common/portlib/old_dirs/win32/Makefile:
  mvdir
ndb/src/common/portlib/old_dirs/win32/NdbCondition.c:
  mvdir
ndb/src/common/portlib/old_dirs/win32/NdbDaemon.c:
  mvdir
ndb/src/common/portlib/old_dirs/win32/NdbEnv.c:
  mvdir
ndb/src/common/portlib/old_dirs/win32/NdbHost.c:
  mvdir
ndb/src/common/portlib/old_dirs/win32/NdbMem.c:
  mvdir
ndb/src/common/portlib/old_dirs/win32/NdbMutex.c:
  mvdir
ndb/src/common/portlib/old_dirs/win32/NdbSleep.c:
  mvdir
ndb/src/common/portlib/old_dirs/win32/NdbTCP.c:
  mvdir
ndb/src/common/portlib/old_dirs/win32/NdbThread.c:
  mvdir
ndb/src/common/portlib/old_dirs/win32/NdbTick.c:
  mvdir
ndb/src/common/portlib/old_dirs/ose/Makefile:
  mvdir
ndb/src/common/portlib/old_dirs/ose/NdbCondition.c:
  mvdir
ndb/src/common/portlib/old_dirs/ose/NdbConditionOSE.h:
  mvdir
ndb/src/common/portlib/old_dirs/ose/NdbEnv.c:
  mvdir
ndb/src/common/portlib/old_dirs/ose/NdbHost.c:
  mvdir
ndb/src/common/portlib/old_dirs/ose/NdbMem.c:
  mvdir
ndb/src/common/portlib/old_dirs/ose/NdbMem_SoftOse.cpp:
  mvdir
ndb/src/common/portlib/old_dirs/ose/NdbMutex.c:
  mvdir
ndb/src/common/portlib/old_dirs/ose/NdbOut.cpp:
  mvdir
ndb/src/common/portlib/old_dirs/ose/NdbSleep.c:
  mvdir
ndb/src/common/portlib/old_dirs/ose/NdbTCP.c:
  mvdir
ndb/src/common/portlib/old_dirs/ose/NdbThread.c:
  mvdir
ndb/src/common/portlib/old_dirs/ose/NdbTick.c:
  mvdir
ndb/src/common/portlib/memtest.c:
  Rename: ndb/src/common/portlib/memtest/memtest.c -> ndb/src/common/portlib/memtest.c
ndb/src/common/portlib/munmaptest.cpp:
  Rename: ndb/src/common/portlib/memtest/munmaptest/munmaptest.cpp -> ndb/src/common/portlib/munmaptest.cpp
ndb/src/common/portlib/mmslist.cpp:
  Rename: ndb/src/common/portlib/mmstest/mmslist.cpp -> ndb/src/common/portlib/mmslist.cpp
ndb/src/common/portlib/mmstest.cpp:
  Rename: ndb/src/common/portlib/mmstest/mmstest.cpp -> ndb/src/common/portlib/mmstest.cpp
ndb/src/common/portlib/old_dirs/memtest/Makefile:
  mvdir
ndb/src/common/portlib/old_dirs/memtest/munmaptest/Makefile:
  mvdir
ndb/src/common/portlib/NdbPortLibTest.cpp:
  Rename: ndb/src/common/portlib/test/NdbPortLibTest.cpp -> ndb/src/common/portlib/NdbPortLibTest.cpp
ndb/src/common/portlib/old_dirs/test/Makefile:
  mvdir
2004-06-03 18:25:46 +00:00
unknown
e99795cc98 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test


configure.in:
  Auto merged
2004-06-03 13:15:55 +02:00
unknown
13047f4521 Makefile.am:
local flag in ndbapi to set -O2 since problems occur with -O3
pc.hpp, Emulator.hpp, Emulator.cpp, ErrorReporter.cpp:
  USE_EMULATED_JAM -> !NO_EMULATED_JAM
ErrorReporter.hpp:
  removed NDEBUG and removed THREAD_ASSERT
Dbdict.cpp:
  NDB_DEBUG -> VM_TRACE
configure.in:
  cleaned up ndb CXX flags and added optional flag possibility


configure.in:
  cleaned up ndb CXX flags and added optional flag possibility
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  NDB_DEBUG -> VM_TRACE
ndb/src/kernel/error/ErrorReporter.cpp:
  USE_EMULATED_JAM -> !NO_EMULATED_JAM
ndb/src/kernel/error/ErrorReporter.hpp:
  removed NDEBUG and removed THREAD_ASSERT
ndb/src/kernel/vm/Emulator.cpp:
  USE_EMULATED_JAM -> !NO_EMULATED_JAM
ndb/src/kernel/vm/Emulator.hpp:
  USE_EMULATED_JAM -> !NO_EMULATED_JAM
ndb/src/kernel/vm/pc.hpp:
  USE_EMULATED_JAM -> !NO_EMULATED_JAM
ndb/src/ndbapi/Makefile.am:
  local flag in ndbapi to set -O2 since problems occur with -O3
2004-06-03 13:15:54 +02:00
unknown
ed8e2efa7f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-ndb


configure.in:
  Auto merged
2004-06-02 00:56:59 +00:00
unknown
cf7719793b several ndb make changes, see respective file
ndb/src/kernel/Main.cpp:
  Rename: ndb/src/kernel/ndb-main/Main.cpp -> ndb/src/kernel/Main.cpp
ndb/src/kernel/SimBlockList.cpp:
  Rename: ndb/src/kernel/ndb-main/SimBlockList.cpp -> ndb/src/kernel/SimBlockList.cpp
BitKeeper/deleted/.del-Makefile.am~dbb6038d7163a54d:
  Delete: ndb/src/kernel/ndb-main/Makefile.am
BitKeeper/deleted/.del-Makefile_old~1f37e763ba5d06d0:
  Delete: ndb/src/kernel/ndb-main/Makefile_old
ndb/old_files/BinDist.sh:
  Rename: ndb/BinDist.sh -> ndb/old_files/BinDist.sh
ndb/old_files/Defs.mk:
  Rename: ndb/Defs.mk -> ndb/old_files/Defs.mk
ndb/old_files/Makefile:
  Rename: ndb/Makefile_old -> ndb/old_files/Makefile
ndb/old_files/SrcDist.sh:
  Rename: ndb/SrcDist.sh -> ndb/old_files/SrcDist.sh
ndb/old_files/configure:
  Rename: ndb/configure_old -> ndb/old_files/configure
ndb/old_files/Epilogue.mk:
  Rename: ndb/Epilogue.mk_old -> ndb/old_files/Epilogue.mk
ndb/config/old_files/Defs.DEBUG.mk:
  Rename: ndb/config/Defs.DEBUG.mk -> ndb/config/old_files/Defs.DEBUG.mk
ndb/config/old_files/Defs.HPUX.HPPA.GCC.mk:
  Rename: ndb/config/Defs.HPUX.HPPA.GCC.mk -> ndb/config/old_files/Defs.HPUX.HPPA.GCC.mk
ndb/config/old_files/Defs.IBMAIX.POWERPC.GCC.mk:
  Rename: ndb/config/Defs.IBMAIX.POWERPC.GCC.mk -> ndb/config/old_files/Defs.IBMAIX.POWERPC.GCC.mk
ndb/config/old_files/Defs.LINUX.x86.GCC.mk:
  Rename: ndb/config/Defs.LINUX.x86.GCC.mk -> ndb/config/old_files/Defs.LINUX.x86.GCC.mk
ndb/config/old_files/Defs.LINUX.x86.ICC.mk:
  Rename: ndb/config/Defs.LINUX.x86.ICC.mk -> ndb/config/old_files/Defs.LINUX.x86.ICC.mk
ndb/config/old_files/Defs.LINUX.x86_64.GCC.mk:
  Rename: ndb/config/Defs.LINUX.x86_64.GCC.mk -> ndb/config/old_files/Defs.LINUX.x86_64.GCC.mk
ndb/config/old_files/Defs.MACOSX.POWERPC.GCC.mk:
  Rename: ndb/config/Defs.MACOSX.POWERPC.GCC.mk -> ndb/config/old_files/Defs.MACOSX.POWERPC.GCC.mk
ndb/config/old_files/Defs.OSE.PPC750.DIAB.mk:
  Rename: ndb/config/Defs.OSE.PPC750.DIAB.mk -> ndb/config/old_files/Defs.OSE.PPC750.DIAB.mk
ndb/config/old_files/Defs.RELEASE.mk:
  Rename: ndb/config/Defs.RELEASE.mk -> ndb/config/old_files/Defs.RELEASE.mk
ndb/config/old_files/Defs.RELEASE_TRACE.mk:
  Rename: ndb/config/Defs.RELEASE_TRACE.mk -> ndb/config/old_files/Defs.RELEASE_TRACE.mk
ndb/config/old_files/Defs.SIMCELLO.SOFTOSE.GCC.mk:
  Rename: ndb/config/Defs.SIMCELLO.SOFTOSE.GCC.mk -> ndb/config/old_files/Defs.SIMCELLO.SOFTOSE.GCC.mk
ndb/config/old_files/Defs.SOFTOSE.SPARC.GCC.mk:
  Rename: ndb/config/Defs.SOFTOSE.SPARC.GCC.mk -> ndb/config/old_files/Defs.SOFTOSE.SPARC.GCC.mk
ndb/config/old_files/Defs.SOLARIS.SPARC.FORTE6.mk:
  Rename: ndb/config/Defs.SOLARIS.SPARC.FORTE6.mk -> ndb/config/old_files/Defs.SOLARIS.SPARC.FORTE6.mk
ndb/config/old_files/Defs.SOLARIS.SPARC.GCC.mk:
  Rename: ndb/config/Defs.SOLARIS.SPARC.GCC.mk -> ndb/config/old_files/Defs.SOLARIS.SPARC.GCC.mk
ndb/config/old_files/Defs.SOLARIS.SPARC_64.GCC.mk:
  Rename: ndb/config/Defs.SOLARIS.SPARC_64.GCC.mk -> ndb/config/old_files/Defs.SOLARIS.SPARC_64.GCC.mk
ndb/config/old_files/Defs.SOLARIS6.SPARC.GCC.mk:
  Rename: ndb/config/Defs.SOLARIS6.SPARC.GCC.mk -> ndb/config/old_files/Defs.SOLARIS6.SPARC.GCC.mk
ndb/config/old_files/Defs.TRU64X.ALPHA.GCC.mk:
  Rename: ndb/config/Defs.TRU64X.ALPHA.GCC.mk -> ndb/config/old_files/Defs.TRU64X.ALPHA.GCC.mk
ndb/config/old_files/Defs.WIN32.x86.VC7.mk:
  Rename: ndb/config/Defs.WIN32.x86.VC7.mk -> ndb/config/old_files/Defs.WIN32.x86.VC7.mk
ndb/config/old_files/acinclude.m4:
  Rename: ndb/config/acinclude.m4 -> ndb/config/old_files/acinclude.m4
ndb/config/old_files/Makefile.am:
  Rename: ndb/config/Makefile.am_old -> ndb/config/old_files/Makefile.am
ndb/config/old_files/GuessConfig.sh:
  Rename: ndb/config/GuessConfig.sh_old -> ndb/config/old_files/GuessConfig.sh
ndb/config/old_files/configure.in:
  Rename: ndb/config/configure.in -> ndb/config/old_files/configure.in
ndb/config/old_files/config.h.in:
  Rename: ndb/config/config.h.in -> ndb/config/old_files/config.h.in
ndb/old_files/README:
  Rename: ndb/README -> ndb/old_files/README
ndb/old_files/mysqlclusterenv.sh:
  Rename: ndb/mysqlclusterenv.sh -> ndb/old_files/mysqlclusterenv.sh
ndb/old_files/env.sh:
  Rename: ndb/env.sh -> ndb/old_files/env.sh
BitKeeper/deleted/.del-Makefile~650473b0dabb331b:
  Delete: ndb/src/scripts/Makefile
ndb/src/old_files/ndbbaseclient/Makefile:
  mvdir
ndb/src/old_files/ndbbaseclient/ndbbaseclient_dummy.cpp:
  mvdir
ndb/src/old_files/ndbclient/Makefile:
  mvdir
ndb/src/old_files/ndbclient/ndbclient_dummy.cpp:
  mvdir
ndb/src/old_files/Makefile:
  Rename: ndb/src/Makefile_old -> ndb/src/old_files/Makefile
acinclude.m4:
  added ndb configure options
configure.in:
  moved lots of stuff for ndb over to Makefile.ams and added some config opt for ndb
mysql-test/ndb/install_ndbcluster.sh:
  adopt to new ndb install
mysql-test/ndb/stop_ndbcluster.sh:
  adopt to new ndb install
ndb/Makefile.am:
  moved some things to include/Makefile.am
ndb/config/common.mk.am:
  moved some things from configure.in
ndb/config/type_kernel.mk.am:
  moved some things from configure.in
ndb/config/type_mgmapiclient.mk.am:
  moved some things from configure.in
ndb/config/type_ndbapi.mk.am:
  moved some things from configure.in
ndb/config/type_ndbapiclient.mk.am:
  moved some things from configure.in
ndb/config/type_ndbapitest.mk.am:
  moved some things from configure.in
ndb/config/type_ndbapitools.mk.am:
  moved some things from configure.in
ndb/config/type_util.mk.am:
  moved some things from configure.in
ndb/src/Makefile.am:
  .
ndb/src/common/portlib/Makefile.am:
  fix for make distdir
ndb/src/cw/cpcd/Makefile.am:
  added configurable ldflags
ndb/src/kernel/Makefile.am:
  moved up ndb-main one level
ndb/src/kernel/blocks/backup/restore/Makefile.am:
  added configurable ldflags
ndb/src/kernel/blocks/suma/Makefile.am:
  fixed error
ndb/src/kernel/error/Makefile.am:
  fix error
ndb/src/kernel/vm/Makefile.am:
  fix error
ndb/src/mgmapi/Makefile.am:
  removed libMGM_API
ndb/src/mgmclient/Makefile.am:
  added configurable ldflags
ndb/src/mgmsrv/Makefile.am:
  added configurable ldflags
ndb/src/ndbapi/Makefile.am:
  removed libNDB_API
ndb/test/Makefile.am:
  added optional build of ndbapi tests
ndb/tools/Makefile.am:
  added configurable ldflags
ndb/include/Makefile.am:
  fixed missing .h files in make distdir
scripts/make_binary_distribution.sh:
  updated for ndb and new make
2004-06-02 00:54:58 +00:00
unknown
5bf17d04f5 Merge with 4.0 to get fixes for netware
client/mysqltest.c:
  Auto merged
include/mysql.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/README:
  Auto merged
mysql-test/r/select_found.result:
  Auto merged
mysql-test/t/select_found.test:
  Auto merged
mysys/mf_wcomp.c:
  Auto merged
mysys/mf_wfile.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
configure.in:
  Get changes for netware
include/my_sys.h:
  Use local file
innobase/include/os0file.h:
  auto merge
innobase/os/os0file.c:
  auto merge
sql/mysqld.cc:
  auto merge
sql/sql_acl.cc:
  indentation change
sql/sql_acl.h:
  use local file
sql/sql_class.h:
  auto merge
sql/sql_db.cc:
  use local file
sql/sql_parse.cc:
  use local file
sql/sql_select.cc:
  Merge
sql/sql_show.cc:
  use local file
2004-06-02 00:09:14 +03:00
unknown
215248f73e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test


acconfig.h:
  Auto merged
configure.in:
  Auto merged
2004-06-01 22:39:40 +02:00
unknown
010fffc2f7 Updated version number
Portability fix for netware. (We can't use TRY_RUN when cross compiling)
2004-06-01 23:34:47 +03:00
unknown
ebdc88c4f9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


configure.in:
  Auto merged
2004-06-01 22:30:03 +03:00
unknown
3d6c17865d Update version number
Fixed serbian error messages
Fix for windows regarding changed variable name


configure.in:
  Update version number
  Added serbian error messages
libmysqld/libmysqld.def:
  Fix changed variable names
mysql-test/t/func_gconcat.test:
  remove some \r
sql/share/serbian/errmsg.txt:
  Added missing error messages
2004-06-01 22:29:46 +03:00
unknown
7787dec672 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.ftr


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
2004-06-01 22:37:39 +05:00
unknown
c91972c29a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test


configure.in:
  Auto merged
ndb/src/kernel/blocks/backup/restore/Restore.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2004-06-01 18:05:43 +02:00
unknown
0bfc8c57ca various ndb make changes, see respective file
BitKeeper/deleted/.del-Makefile.am~d4e228ebd21fc066:
  Delete: ndb/include/Makefile.am
acinclude.m4:
  static linking of ndbclient into mysqld
configure.in:
  removed ndb/include/Makefile.am + fixed conditional compile of ndb shm, sci
ndb/Makefile.am:
  dist-hook for make distdir in ndb
ndb/config/type_ndbapitest.mk.am:
  use of libndbclient.so in testprograms
ndb/config/type_ndbapitools.mk.am:
  static linking to binary distributed ndb tools
ndb/src/Makefile.am:
  enable libndbclient.so
ndb/src/common/transporter/Makefile.am:
  added support for optional inclusion of shared mem and sci in ndb transporter
ndb/tools/Makefile.am:
  new type for tools which should be statically linked with libndbclient
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-06-01 11:19:40 +00:00
unknown
ba0a7c4694 AC_MAINTAINER_MODE removed: now MySQL is always configured in maintainer
mode and one should expect better dependencies tracking.
2004-05-31 17:02:18 +04:00
unknown
915fd0310b added shared mem + sci options for ndb
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-05-28 09:22:27 +00:00
unknown
9061fbc8e5 New patch to ensure that InnoDB gets values for CFLAGS and CXXFLAGS
sql/handler.h:
  Remove compiler warnings
2004-05-28 10:41:38 +03:00
unknown
36c291181f Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb-jonas


configure.in:
  Auto merged
2004-05-28 07:08:15 +02:00
unknown
9bd34fd5b7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb


configure.in:
  Auto merged
2004-05-28 07:04:07 +02:00
unknown
128a53d327 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test


configure.in:
  Auto merged
2004-05-28 03:24:29 +02:00
unknown
6645955abf merge with 4.0 to get fix for hpux
configure.in:
  Auto merged
innobase/os/os0file.c:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysql-test/r/variables.result:
  merge fix
2004-05-28 02:04:07 +03:00
unknown
d1306dfa9d Portability fix for HPUX
configure.in:
  Ensure that innodb gets system specific CFLAGS and CXXFLAGS
innobase/os/os0file.c:
  Don't use pread/pwrite on systems where these are not working.
  This fixes a bug on HPUX, where InnoDB didn't create the ibdata1 file correctly.
2004-05-28 02:00:34 +03:00
unknown
d97a303fb1 Use ndbclient more
configure.in:
  Include mgmapi
ndb/config/type_ndbapi.mk.am:
  remove LDADD from type
ndb/config/type_util.mk.am:
  remove LDADD from type
ndb/src/cw/cpcd/Makefile.am:
  LDADD ndbclient
ndb/src/kernel/ndb-main/Makefile.am:
  Fix LDADD
ndb/src/mgmclient/Makefile.am:
  LDADD ndbclient
ndb/src/mgmsrv/Makefile.am:
  LDADD ndbclient
ndb/test/run-test/Makefile.am:
  LDADD ndbclient
2004-05-27 21:03:05 +02:00
unknown
10f04d1974 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb-jonas


configure.in:
  Auto merged
ndb/src/mgmapi/Makefile.am:
  Auto merged
ndb/src/ndbapi/Makefile.am:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
2004-05-27 19:58:19 +02:00
unknown
29f3f5335d ndb fixes see files
acconfig.h:
  added switched for shm sci in ndb
acinclude.m4:
  added switched for shm sci in ndb
configure.in:
  added dependency for ndblibs to mysql server
ndb/src/common/transporter/Makefile.am:
  small fix
ndb/src/common/transporter/Transporter.hpp:
  ndb_global for sci and shm defines
2004-05-27 16:28:41 +00:00
unknown
6926eeeec0 Add mgmapi
configure.in:
  Added include of mgmapi
ndb/src/common/debugger/signaldata/Makefile.am:
  New files
ndb/src/common/util/Makefile.am:
  Add files
ndb/src/kernel/ndb-main/Makefile.am:
  Use mgmapi
ndb/src/kernel/vm/Makefile.am:
  Use mgmapi
ndb/src/mgmapi/Makefile.am:
  new files
ndb/src/mgmclient/Makefile.am:
  use mgmapi
ndb/src/mgmsrv/Makefile.am:
  use mgmapi
2004-05-27 15:20:38 +02:00
unknown
b566dae278 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.ftr


configure.in:
  Auto merged
include/my_global.h:
  Auto merged
2004-05-27 17:37:47 +05:00
unknown
94fc67f54f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
2004-05-27 11:36:08 +02:00
unknown
daaa3def14 configure.in:
automake verion problem


configure.in:
  automake verion problem
2004-05-27 09:36:07 +00:00
unknown
c41b0e48c9 several ndb automake changes, see respective file
ndb/tools/waiter.cpp:
  Rename: ndb/test/tools/waiter.cpp -> ndb/tools/waiter.cpp
configure.in:
  added install dirs for ndb
ndb/Makefile.am:
  ndb headers for install
ndb/config/common.mk.am:
  DEFS_LOC in ndb make
ndb/config/type_ndbapi.mk.am:
  added LDADD=libNDB_API.la default for type_ndbapi
ndb/src/cw/cpcd/Makefile.am:
  changes install dir
ndb/src/kernel/blocks/backup/restore/Makefile.am:
  changes install dir
ndb/src/kernel/ndb-main/Makefile.am:
  changes install dir
ndb/src/mgmapi/Makefile.am:
  changes install dir
ndb/src/mgmclient/Makefile.am:
  changes install dir
ndb/src/mgmsrv/Makefile.am:
  changes install dir
ndb/src/ndbapi/Makefile.am:
  changes install dir
ndb/test/ndbapi/Makefile.am:
  changes install dir
ndb/test/ndbapi/bank/Makefile.am:
  changes install dir
ndb/test/tools/Makefile.am:
  changes install dir
mysql-test/ndb/install_ndbcluster.sh:
  new
mysql-test/ndb/stop_ndbcluster.sh:
  new
ndb/tools/Makefile.am:
  changes install dir
2004-05-27 07:04:45 +00:00
unknown
d000ea9c4d Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1
Makefile.am:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
netware/Makefile.am:
  Auto merged
2004-05-27 02:51:28 +03:00
unknown
1d03d1629d netware files should always be in 'make dist'
use opt_net_buffer_length instead of net_buffer_length


Makefile.am:
  netware files should always be in 'make dist'
client/mysqldump.c:
  use opt_net_buffer_length instead of net_buffer_length
configure.in:
  netware files should always be in 'make dist'
netware/Makefile.am:
  netware files should always be in 'make dist'
2004-05-27 02:47:04 +03:00
unknown
34e7ad059a configure.in:
makefix


configure.in:
  makefix
2004-05-26 17:56:18 +00:00
unknown
5790e2b34f Merge poseidon.(none):/home/tomas/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb-make


configure.in:
  Auto merged
ndb/src/Makefile_old:
  Auto merged
ndb/test/ndbapi/acid.cpp:
  Auto merged
ndb/test/ndbapi/flexAsynch.cpp:
  Auto merged
ndb/test/ndbapi/flexHammer.cpp:
  Auto merged
ndb/test/ndbapi/flexTT.cpp:
  Auto merged
ndb/test/ndbapi/initronja.cpp:
  Auto merged
ndb/test/ndbapi/interpreterInTup.cpp:
  Auto merged
ndb/test/ndbapi/msa.cpp:
  Auto merged
ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userInterface.cpp:
  Auto merged
ndb/test/ndbapi/testDataBuffers.cpp:
  Auto merged
ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
ndb/test/ndbapi/testRestartGci.cpp:
  Auto merged
ndb/test/ndbapi/testScan.cpp:
  Auto merged
ndb/tools/desc.cpp:
  Auto merged
ndb/test/ndbapi/flexScan.cpp:
  Auto merged
2004-05-26 16:02:21 +00:00
unknown
abee640f44 neww ndb automake
ndb/test/tools/hugoCalculator.cpp:
  Rename: ndb/test/tools/hugoCalculator/hugoCalculator.cpp -> ndb/test/tools/hugoCalculator.cpp
ndb/test/tools/hugoLoad.cpp:
  Rename: ndb/test/tools/hugoLoad/hugoLoad.cpp -> ndb/test/tools/hugoLoad.cpp
ndb/test/tools/hugoFill.cpp:
  Rename: ndb/test/tools/hugoFill/hugoFill.cpp -> ndb/test/tools/hugoFill.cpp
ndb/test/tools/hugoLockRecords.cpp:
  Rename: ndb/test/tools/hugoLockRecords/hugoLockRecords.cpp -> ndb/test/tools/hugoLockRecords.cpp
ndb/test/tools/hugoPkRead.cpp:
  Rename: ndb/test/tools/hugoPkRead/hugoPkRead.cpp -> ndb/test/tools/hugoPkRead.cpp
ndb/test/tools/hugoPkReadRecord.cpp:
  Rename: ndb/test/tools/hugoPkReadRecord/hugoPkReadRecord.cpp -> ndb/test/tools/hugoPkReadRecord.cpp
ndb/test/tools/hugoScanRead.cpp:
  Rename: ndb/test/tools/hugoScanRead/hugoScanRead.cpp -> ndb/test/tools/hugoScanRead.cpp
ndb/test/tools/restart.cpp:
  Rename: ndb/test/tools/restart/restart.cpp -> ndb/test/tools/restart.cpp
ndb/test/ndbapi/TraceNdbApi.cpp:
  Rename: ndb/test/ndbapi/acid2/TraceNdbApi.cpp -> ndb/test/ndbapi/TraceNdbApi.cpp
ndb/test/ndbapi/VerifyNdbApi.cpp:
  Rename: ndb/test/ndbapi/acid2/VerifyNdbApi.cpp -> ndb/test/ndbapi/VerifyNdbApi.cpp
ndb/test/ndbapi/acid.cpp:
  Rename: ndb/test/ndbapi/acid/acid.cpp -> ndb/test/ndbapi/acid.cpp
ndb/test/ndbapi/acid2.cpp:
  Rename: ndb/test/ndbapi/acid2/acid2.cpp -> ndb/test/ndbapi/acid2.cpp
ndb/test/ndbapi/bulk_copy.cpp:
  Rename: ndb/test/ndbapi/bulk_copy/bulk_copy.cpp -> ndb/test/ndbapi/bulk_copy.cpp
ndb/test/ndbapi/celloDb.cpp:
  Rename: ndb/test/ndbapi/cello-sessionDb/celloDb.cpp -> ndb/test/ndbapi/celloDb.cpp
ndb/test/ndbapi/create_all_tabs.cpp:
  Rename: ndb/test/ndbapi/create_all_tabs/create_all_tabs.cpp -> ndb/test/ndbapi/create_all_tabs.cpp
ndb/test/ndbapi/create_tab.cpp:
  Rename: ndb/test/ndbapi/create_tab/create_tab.cpp -> ndb/test/ndbapi/create_tab.cpp
ndb/test/ndbapi/drop_all_tabs.cpp:
  Rename: ndb/test/ndbapi/drop_all_tabs/drop_all_tabs.cpp -> ndb/test/ndbapi/drop_all_tabs.cpp
ndb/test/ndbapi/flexAsynch.cpp:
  Rename: ndb/test/ndbapi/flexAsynch/flexAsynch.cpp -> ndb/test/ndbapi/flexAsynch.cpp
ndb/test/ndbapi/flexBench.cpp:
  Rename: ndb/test/ndbapi/flexBench/flexBench.cpp -> ndb/test/ndbapi/flexBench.cpp
ndb/test/ndbapi/flexHammer.cpp:
  Rename: ndb/test/ndbapi/flexHammer/flexHammer.cpp -> ndb/test/ndbapi/flexHammer.cpp
ndb/test/ndbapi/flexScan.cpp:
  Rename: ndb/test/ndbapi/flexScan/flexScan.cpp -> ndb/test/ndbapi/flexScan.cpp
ndb/test/ndbapi/flexTT.cpp:
  Rename: ndb/test/ndbapi/flexTT/flexTT.cpp -> ndb/test/ndbapi/flexTT.cpp
ndb/test/ndbapi/flexTimedAsynch.cpp:
  Rename: ndb/test/ndbapi/flexTimedAsynch/flexTimedAsynch.cpp -> ndb/test/ndbapi/flexTimedAsynch.cpp
ndb/test/ndbapi/flex_bench_mysql.cpp:
  Rename: ndb/test/ndbapi/flex_bench_mysql/flex_bench_mysql.cpp -> ndb/test/ndbapi/flex_bench_mysql.cpp
ndb/test/ndbapi/index.cpp:
  Rename: ndb/test/ndbapi/indexTest/index.cpp -> ndb/test/ndbapi/index.cpp
ndb/test/ndbapi/asyncGenerator.cpp:
  Rename: ndb/test/ndbapi/lmc-bench/async-src/generator/asyncGenerator.cpp -> ndb/test/ndbapi/asyncGenerator.cpp
ndb/test/ndbapi/index2.cpp:
  Rename: ndb/test/ndbapi/indexTest2/index2.cpp -> ndb/test/ndbapi/index2.cpp
ndb/test/ndbapi/interpreterInTup.cpp:
  Rename: ndb/test/ndbapi/interpreterInTup/interpreterInTup.cpp -> ndb/test/ndbapi/interpreterInTup.cpp
ndb/test/ndbapi/mainAsyncGenerator.cpp:
  Rename: ndb/test/ndbapi/lmc-bench/async-src/generator/mainAsyncGenerator.cpp -> ndb/test/ndbapi/mainAsyncGenerator.cpp
ndb/test/ndbapi/ndb_async1.cpp:
  Rename: ndb/test/ndbapi/lmc-bench/async-src/user/ndb_async1.cpp -> ndb/test/ndbapi/ndb_async1.cpp
ndb/test/ndbapi/ndb_async2.cpp:
  Rename: ndb/test/ndbapi/lmc-bench/async-src/user/ndb_async2.cpp -> ndb/test/ndbapi/ndb_async2.cpp
ndb/test/ndbapi/ndb_user_populate.cpp:
  Rename: ndb/test/ndbapi/lmc-bench/src/user/ndb_user_populate.cpp -> ndb/test/ndbapi/ndb_user_populate.cpp
ndb/test/ndbapi/ndb_user_transaction.cpp:
  Rename: ndb/test/ndbapi/lmc-bench/src/user/ndb_user_transaction.cpp -> ndb/test/ndbapi/ndb_user_transaction.cpp
ndb/test/ndbapi/ndb_user_transaction2.cpp:
  Rename: ndb/test/ndbapi/lmc-bench/src/user/ndb_user_transaction2.cpp -> ndb/test/ndbapi/ndb_user_transaction2.cpp
ndb/test/ndbapi/ndb_user_transaction3.cpp:
  Rename: ndb/test/ndbapi/lmc-bench/src/user/ndb_user_transaction3.cpp -> ndb/test/ndbapi/ndb_user_transaction3.cpp
ndb/test/ndbapi/userInterface.cpp:
  Rename: ndb/test/ndbapi/lmc-bench/async-src/user/userInterface.cpp -> ndb/test/ndbapi/userInterface.cpp
ndb/test/ndbapi/benchronja.cpp:
  Rename: ndb/test/ndbapi/ronja/benchronja/benchronja.cpp -> ndb/test/ndbapi/benchronja.cpp
ndb/test/ndbapi/ndb_user_transaction4.cpp:
  Rename: ndb/test/ndbapi/lmc-bench/src/user/ndb_user_transaction4.cpp -> ndb/test/ndbapi/ndb_user_transaction4.cpp
ndb/test/ndbapi/ndb_user_transaction5.cpp:
  Rename: ndb/test/ndbapi/lmc-bench/src/user/ndb_user_transaction5.cpp -> ndb/test/ndbapi/ndb_user_transaction5.cpp
ndb/test/ndbapi/ndb_user_transaction6.cpp:
  Rename: ndb/test/ndbapi/lmc-bench/src/user/ndb_user_transaction6.cpp -> ndb/test/ndbapi/ndb_user_transaction6.cpp
ndb/test/ndbapi/restarter.cpp:
  Rename: ndb/test/ndbapi/restarter/restarter.cpp -> ndb/test/ndbapi/restarter.cpp
ndb/test/ndbapi/restarter2.cpp:
  Rename: ndb/test/ndbapi/restarter2/restarter2.cpp -> ndb/test/ndbapi/restarter2.cpp
ndb/test/ndbapi/restarts.cpp:
  Rename: ndb/test/ndbapi/restarts/restarts.cpp -> ndb/test/ndbapi/restarts.cpp
ndb/test/ndbapi/InsertRecs.cpp:
  Rename: ndb/test/ndbapi/telco/InsertRecs.cpp -> ndb/test/ndbapi/InsertRecs.cpp
ndb/test/ndbapi/adoInsertRecs.cpp:
  Rename: ndb/test/ndbapi/telco/adoInsertRecs.cpp -> ndb/test/ndbapi/adoInsertRecs.cpp
ndb/test/ndbapi/initronja.cpp:
  Rename: ndb/test/ndbapi/ronja/initronja/initronja.cpp -> ndb/test/ndbapi/initronja.cpp
ndb/test/ndbapi/msa.cpp:
  Rename: ndb/test/ndbapi/telco/msa.cpp -> ndb/test/ndbapi/msa.cpp
ndb/test/ndbapi/testBasic.cpp:
  Rename: ndb/test/ndbapi/testBasic/testBasic.cpp -> ndb/test/ndbapi/testBasic.cpp
ndb/test/ndbapi/testDataBuffers.cpp:
  Rename: ndb/test/ndbapi/testDataBuffers/testDataBuffers.cpp -> ndb/test/ndbapi/testDataBuffers.cpp
ndb/test/ndbapi/testDict.cpp:
  Rename: ndb/test/ndbapi/testDict/testDict.cpp -> ndb/test/ndbapi/testDict.cpp
ndb/test/ndbapi/testGrep.cpp:
  Rename: ndb/test/ndbapi/testGrep/testGrep.cpp -> ndb/test/ndbapi/testGrep.cpp
ndb/test/ndbapi/testGrepVerify.cpp:
  Rename: ndb/test/ndbapi/testGrep/verify/testGrepVerify.cpp -> ndb/test/ndbapi/testGrepVerify.cpp
ndb/test/ndbapi/testIndex.cpp:
  Rename: ndb/test/ndbapi/testIndex/testIndex.cpp -> ndb/test/ndbapi/testIndex.cpp
ndb/test/ndbapi/testInterpreter.cpp:
  Rename: ndb/test/ndbapi/testInterpreter/testInterpreter.cpp -> ndb/test/ndbapi/testInterpreter.cpp
ndb/test/ndbapi/testMgm.cpp:
  Rename: ndb/test/ndbapi/testMgm/testMgm.cpp -> ndb/test/ndbapi/testMgm.cpp
ndb/test/ndbapi/testNdbApi.cpp:
  Rename: ndb/test/ndbapi/testNdbApi/testNdbApi.cpp -> ndb/test/ndbapi/testNdbApi.cpp
ndb/test/ndbapi/testNodeRestart.cpp:
  Rename: ndb/test/ndbapi/testNodeRestart/testNodeRestart.cpp -> ndb/test/ndbapi/testNodeRestart.cpp
ndb/test/ndbapi/testOIBasic.cpp:
  Rename: ndb/test/ndbapi/testOIBasic/testOIBasic.cpp -> ndb/test/ndbapi/testOIBasic.cpp
ndb/test/ndbapi/testOperations.cpp:
  Rename: ndb/test/ndbapi/testOperations/testOperations.cpp -> ndb/test/ndbapi/testOperations.cpp
ndb/test/ndbapi/testOrderedIndex.cpp:
  Rename: ndb/test/ndbapi/testOrderedIndex/testOrderedIndex.cpp -> ndb/test/ndbapi/testOrderedIndex.cpp
ndb/test/ndbapi/testRestartGci.cpp:
  Rename: ndb/test/ndbapi/testRestartGci/testRestartGci.cpp -> ndb/test/ndbapi/testRestartGci.cpp
ndb/test/ndbapi/testScan.cpp:
  Rename: ndb/test/ndbapi/testScan/testScan.cpp -> ndb/test/ndbapi/testScan.cpp
ndb/test/ndbapi/testScanInterpreter.cpp:
  Rename: ndb/test/ndbapi/testScanInterpreter/testScanInterpreter.cpp -> ndb/test/ndbapi/testScanInterpreter.cpp
ndb/test/ndbapi/testSystemRestart.cpp:
  Rename: ndb/test/ndbapi/testSystemRestart/testSystemRestart.cpp -> ndb/test/ndbapi/testSystemRestart.cpp
ndb/test/ndbapi/testTimeout.cpp:
  Rename: ndb/test/ndbapi/testTimeout/testTimeout.cpp -> ndb/test/ndbapi/testTimeout.cpp
ndb/test/ndbapi/cdrserver.cpp:
  Rename: ndb/test/ndbapi/vw_test/cdrserver.cpp -> ndb/test/ndbapi/cdrserver.cpp
ndb/test/ndbapi/size.cpp:
  Rename: ndb/test/ndbapi/vw_test/size.cpp -> ndb/test/ndbapi/size.cpp
ndb/test/ndbapi/testTransactions.cpp:
  Rename: ndb/test/ndbapi/testTransactions/testTransactions.cpp -> ndb/test/ndbapi/testTransactions.cpp
ndb/test/ndbapi/test_event.cpp:
  Rename: ndb/test/ndbapi/test_event/test_event.cpp -> ndb/test/ndbapi/test_event.cpp
ndb/tools/delete_all.cpp:
  Rename: ndb/tools/delete_all/delete_all.cpp -> ndb/tools/delete_all.cpp
ndb/tools/desc.cpp:
  Rename: ndb/tools/desc/desc.cpp -> ndb/tools/desc.cpp
ndb/tools/drop_index.cpp:
  Rename: ndb/tools/drop_index/drop_index.cpp -> ndb/tools/drop_index.cpp
ndb/tools/drop_tab.cpp:
  Rename: ndb/tools/drop_tab/drop_tab.cpp -> ndb/tools/drop_tab.cpp
ndb/tools/listTables.cpp:
  Rename: ndb/tools/list_tables/listTables.cpp -> ndb/tools/listTables.cpp
ndb/tools/ndbsql.cpp:
  Rename: ndb/tools/ndbsql/ndbsql.cpp -> ndb/tools/ndbsql.cpp
ndb/tools/select_all.cpp:
  Rename: ndb/tools/select_all/select_all.cpp -> ndb/tools/select_all.cpp
ndb/tools/select_count.cpp:
  Rename: ndb/tools/select_count/select_count.cpp -> ndb/tools/select_count.cpp
ndb/test/tools/hugoScanUpdate.cpp:
  Rename: ndb/test/tools/hugoScanUpd.cpp -> ndb/test/tools/hugoScanUpdate.cpp
ndb/test/tools/hugoPkUpdate.cpp:
  Rename: ndb/test/tools/hugoPkUpd.cpp -> ndb/test/tools/hugoPkUpdate.cpp
ndb/test/tools/hugoPkDelete.cpp:
  Rename: ndb/test/tools/hugoPkDel.cpp -> ndb/test/tools/hugoPkDelete.cpp
ndb/tools/Makefile_old:
  Rename: ndb/tools/Makefile -> ndb/tools/Makefile_old
ndb/test/tools/transproxy.cpp:
  Rename: ndb/tools/transproxy.cpp -> ndb/test/tools/transproxy.cpp
ndb/test/tools/verify_index.cpp:
  Rename: ndb/tools/verify_index.cpp -> ndb/test/tools/verify_index.cpp
ndb/test/tools/copy_tab.cpp:
  Rename: ndb/tools/copy_tab.cpp -> ndb/test/tools/copy_tab.cpp
ndb/test/tools/cpcc.cpp:
  Rename: ndb/tools/cpcc.cpp -> ndb/test/tools/cpcc.cpp
ndb/test/tools/create_index.cpp:
  Rename: ndb/tools/create_index.cpp -> ndb/test/tools/create_index.cpp
ndb/test/tools/old_dirs/waiter/Makefile_old:
  mvdir
ndb/test/tools/old_dirs/waiter/waiter.cpp:
  mvdir
ndb/test/tools/old_dirs/restart/Makefile:
  mvdir
ndb/test/tools/old_dirs/hugoScanUpdate/Makefile:
  mvdir
ndb/test/tools/old_dirs/hugoScanRead/Makefile:
  mvdir
ndb/test/tools/old_dirs/hugoPkUpdate/Makefile:
  mvdir
ndb/test/tools/old_dirs/hugoPkReadRecord/Makefile:
  mvdir
ndb/test/tools/old_dirs/hugoPkRead/Makefile:
  mvdir
ndb/test/tools/old_dirs/hugoPkDelete/Makefile:
  mvdir
ndb/test/tools/old_dirs/hugoLockRecords/Makefile:
  mvdir
ndb/test/tools/old_dirs/hugoLoad/Makefile:
  mvdir
ndb/test/tools/old_dirs/hugoFill/Makefile:
  mvdir
ndb/test/tools/old_dirs/hugoCalculator/Makefile:
  mvdir
ndb/tools/old_dirs/copy_tab/Makefile:
  mvdir
ndb/tools/old_dirs/cpcc/Makefile:
  mvdir
ndb/tools/old_dirs/create_index/Makefile:
  mvdir
ndb/tools/old_dirs/delete_all/Makefile:
  mvdir
ndb/tools/old_dirs/desc/Makefile:
  mvdir
ndb/tools/old_dirs/drop_index/Makefile:
  mvdir
ndb/tools/old_dirs/drop_tab/Makefile:
  mvdir
ndb/tools/old_dirs/list_tables/Makefile:
  mvdir
ndb/tools/old_dirs/select_all/Makefile:
  mvdir
ndb/tools/old_dirs/select_count/Makefile:
  mvdir
ndb/test/tools/old_dirs/transproxy/Makefile:
  mvdir
ndb/test/tools/old_dirs/verify_index/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/flexTT/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/flexTimedAsynch/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/flexHammer/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/flexHammer/README:
  mvdir
ndb/test/ndbapi/old_dirs/flexBench/Makefile.am:
  mvdir
ndb/test/ndbapi/old_dirs/flexBench/Makefile_old:
  mvdir
ndb/test/ndbapi/old_dirs/flexBench/ndbplot.pl:
  mvdir
ndb/test/ndbapi/old_dirs/flexAsynch/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/drop_all_tabs/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/create_tab/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/testOIBasic/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/testOIBasic/times.txt:
  mvdir
ndb/test/ndbapi/old_dirs/testNodeRestart/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/testOperations/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/testBlobs/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/testBackup/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/testDict/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/test_event/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/testTransactions/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/testTimeout/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/testSystemRestart/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/testScanInterpreter/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/testDataBuffers/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/testIndex/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/testMgm/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/restarter/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/flexScan/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/flexScan/README:
  mvdir
ndb/test/ndbapi/old_dirs/testRestartGci/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/flex_bench_mysql/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/indexTest/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/indexTest2/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/testBasic/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/basicAsynch/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/create_all_tabs/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/testNdbApi/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/testOrderedIndex/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/restarter2/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/telco/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/telco/readme:
  mvdir
ndb/test/ndbapi/old_dirs/acid/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/acid2/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/acid2/TraceNdbApi.hpp:
  mvdir
ndb/test/ndbapi/old_dirs/acid2/VerifyNdbApi.hpp:
  mvdir
ndb/test/ndbapi/old_dirs/interpreterInTup/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/ronja/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/ronja/benchronja/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/ronja/initronja/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/testScan/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/vw_test/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/vw_test/bcd.h:
  mvdir
ndb/test/ndbapi/old_dirs/vw_test/utv.h:
  mvdir
ndb/test/ndbapi/old_dirs/vw_test/vcdrfunc.h:
  mvdir
ndb/test/ndbapi/old_dirs/vw_test/script/client_start:
  mvdir
ndb/test/ndbapi/old_dirs/testGrep/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/testGrep/verify/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/testInterpreter/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/restarts/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/bulk_copy/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/async-src/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/async-src/generator/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/dbGenerator.h:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/testData.h:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/async-src/include/userInterface.h:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/macros.h:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/async-src/user/ndb_error.hpp:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/bin/.empty:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/include/ndb_schema.hpp:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/include/testDefinitions.h:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/lib/.empty:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/script/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-l-p10.sh:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-l.sh:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench-p10.sh:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/script/async-lmc-bench.sh:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/src/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/src/README:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/dbGenerator.c:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/src/makevars.linux:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/src/makevars.sparc:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/dbGenerator.h:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/src/generator/mainGenerator.c:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/src/include/testData.h:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/src/include/userInterface.h:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/dbPopulate.c:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/dbPopulate.h:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/src/populator/mainPopulate.c:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/src/user/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/src/user/localDbPrepare.c:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/src/user/macros.h:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/src/user/ndb_error.hpp:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/Makefile:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userHandle.h:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userInterface.c:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/src/user/old/userTransaction.c:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userHandle.h:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userInterface.cpp:
  mvdir
ndb/test/ndbapi/old_dirs/lmc-bench/src/user/userTransaction.c:
  mvdir
ndb/test/ndbapi/testBasicAsynch.cpp:
  Change mode to -rw-rw-r--
ndb/tools/old_dirs/ndbnet/Makefile.PL:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Net.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Base.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Client.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Command.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Config.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Run.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Util.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/ndbnet.pl:
  mvdir
ndb/tools/old_dirs/ndbnet/ndbnetd.pl:
  mvdir
ndb/tools/old_dirs/ndbnet/ndbrun:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Database.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Env.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Node.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeApi.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeDb.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Net/NodeMgmt.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Net/Server.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Net/ServerINET.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Net/ServerUNIX.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Base.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Database.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Env.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Run/Node.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Base.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Dir.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Event.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Util/File.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Util/IO.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Lock.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Log.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Util/Socket.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Util/SocketINET.pm:
  mvdir
ndb/tools/old_dirs/ndbnet/lib/NDB/Util/SocketUNIX.pm:
  mvdir
ndb/tools/old_dirs/ndbsql/Makefile:
  mvdir
ndb/tools/old_dirs/src/counterviewer/CounterViewer.java:
  mvdir
ndb/test/ndbapi/bank/Bank.hpp:
  mvdir
ndb/test/ndbapi/bank/Makefile_old:
  Rename: ndb/test/ndbapi/bank/Makefile -> ndb/test/ndbapi/bank/Makefile_old
ndb/test/ndbapi/bank/old_dirs/bankCreator/Makefile:
  mvdir
ndb/test/ndbapi/bank/old_dirs/bankSumAccounts/Makefile:
  mvdir
ndb/test/ndbapi/bank/old_dirs/bankMakeGL/Makefile:
  mvdir
ndb/test/ndbapi/bank/old_dirs/bankTimer/Makefile:
  mvdir
ndb/test/ndbapi/bank/old_dirs/bankValidateAllGLs/Makefile:
  mvdir
ndb/test/ndbapi/bank/old_dirs/bankTransactionMaker/Makefile:
  mvdir
ndb/test/ndbapi/bank/old_dirs/src/Makefile:
  mvdir
ndb/test/ndbapi/bank/old_dirs/testBank/Makefile:
  mvdir
ndb/test/ndbapi/ScanFilter.hpp:
  Rename: ndb/test/ndbapi/old_dirs/testScanInterpreter/ScanFilter.hpp -> ndb/test/ndbapi/ScanFilter.hpp
ndb/test/ndbapi/ScanInterpretTest.hpp:
  Rename: ndb/test/ndbapi/old_dirs/testScanInterpreter/ScanInterpretTest.hpp -> ndb/test/ndbapi/ScanInterpretTest.hpp
ndb/test/ndbapi/ScanFunctions.hpp:
  Rename: ndb/test/ndbapi/old_dirs/testScan/ScanFunctions.hpp -> ndb/test/ndbapi/ScanFunctions.hpp
2004-05-26 15:36:55 +00:00
unknown
4cfa10deaf Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test


configure.in:
  Auto merged
ndb/src/kernel/ndb-main/Main.cpp:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
2004-05-26 14:34:41 +02:00
unknown
1ceef15c40 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2004-05-25 14:53:55 -07:00