mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
12441 commits 2784 branches 343 tags 1.6 GiB
Commit graph

12441 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
0aee1b0ad6 Merge mysql.com:/home/jonas/src/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1-ndb-jonas


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/Epilogue.mk_old:
  Auto merged
ndb/src/common/debugger/signaldata/Makefile_old:
  Auto merged
ndb/src/common/mgmcommon/Makefile_old:
  Auto merged
ndb/src/common/util/Makefile_old:
  Auto merged
ndb/src/kernel/Makefile_old:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/ndb-main/Main.cpp:
  Auto merged
ndb/src/kernel/ndb-main/Makefile_old:
  Auto merged
ndb/src/kernel/vm/Makefile_old:
  Auto merged
ndb/src/mgmapi/Makefile_old:
  Auto merged
ndb/src/mgmclient/Makefile_old:
  Auto merged
ndb/src/mgmsrv/Makefile_old:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
ndb/src/ndbapi/Makefile_old:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged
ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
ndb/test/ndbapi/testDict.cpp:
  Auto merged
ndb/test/ndbapi/testSystemRestart.cpp:
  Auto merged
ndb/test/ndbapi/testTimeout.cpp:
  Auto merged
ndb/test/src/Makefile_old:
  Auto merged
 2004-05-27 11:36:09 +02:00
unknown
489aa9be1c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 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
6cb6ddf39a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
 2004-05-27 10:26:56 +02:00
unknown
9933c7e7aa Makefile.am: 
changed install dir


ndb/test/run-test/Makefile.am:
  changed install dir
 2004-05-27 08:26:55 +00:00
unknown
9e833b2a7a ndb in mysql-test fix 2004-05-27 08:05:10 +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
34e7ad059a configure.in: 
makefix


configure.in:
  makefix
 2004-05-26 17:56:18 +00:00
unknown
709b1b8978 makefix 2004-05-26 17:51:58 +00:00
unknown
7c40ea2db3 Makefile.am: 
new file
 2004-05-26 17:21:38 +00:00
unknown
365ef56987 removed usage of replication 
ndb/src/mgmclient/CommandInterpreter.hpp:
  removed usage of global replication
 2004-05-26 16:34:55 +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
aacffd9dbb Bug#3847 2004-05-26 15:11:10 +02:00
unknown
3e24f16fb4 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-05-26 15:02:18 +02: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
5eea01a764 Small fix, addin order by to get predicatble output from select 
mysql-test/r/ndb_autodiscover.result:
  Added yet another order by to test.
mysql-test/t/ndb_autodiscover.test:
  Added yet another order by to test.
 2004-05-26 14:34:40 +02:00
unknown
259d8c4c13 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/magnus/mysql-4.1
 2004-05-26 14:29:53 +02:00
unknown
537ba1e125 Fix after running on a 4-node system. 
mysql-test/r/ndb_autodiscover.result:
  Removed one test that needs manual interaction
  Added order by in some places
mysql-test/t/ndb_autodiscover.test:
  Removed one test that needs manual interaction
  Added order by in some places
sql/ha_ndbcluster.cc:
  Using HA_WRONG_ASCII_ORDER to activate filesort on a not "sorted" ordered index.
 2004-05-26 14:22:49 +02:00
unknown
d887ce18a4 New file 2004-05-26 12:04:39 +02:00
unknown
55a6f70d1e New makefile 2004-05-26 11:56:32 +02:00
unknown
529074b604 New makefile 2004-05-26 11:53:58 +02:00
unknown
bac12e6776 Added file(s) 2004-05-26 11:49:12 +02:00
unknown
1a9eb476f1 WL1371 - Cleanup configuration handling 
WL1356 - Discless db node
WL1357 - sp 1-2
 2004-05-26 10:56:32 +02:00
unknown
3a675ff5f8 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-05-25 22:31:44 +02:00
unknown
39ace7f151 Bug#3882 2004-05-25 22:24:23 +02:00
unknown
a9b481d3cd merge with 4.0 to get Netware patches and fixes for libmysqld.dll 
configure.in:
  Auto merged
Build-tools/Do-compile:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqladmin.c:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
innobase/include/trx0roll.h:
  Auto merged
innobase/include/trx0trx.h:
  Auto merged
innobase/que/que0que.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/trx/trx0purge.c:
  Auto merged
innobase/trx/trx0roll.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/usr/usr0sess.c:
  Auto merged
isam/isamchk.c:
  Auto merged
myisam/myisam_ftdump.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_getopt.c:
  Auto merged
mysys/my_init.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
netware/Makefile.am:
  Auto merged
netware/init_db.sql:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
tools/mysqlmanager.c:
  Auto merged
VC++Files/dbug/dbug.dsp:
  Auto merged
VC++Files/heap/heap.dsp:
  Auto merged
VC++Files/isam/isam.dsp:
  Auto merged
VC++Files/libmysql/libmysql.dsp:
  Auto merged
VC++Files/myisam/myisam.dsp:
  Auto merged
VC++Files/myisammrg/myisammrg.dsp:
  Auto merged
VC++Files/mysys/mysys.dsp:
  Auto merged
VC++Files/libmysqld/libmysqld.dsp:
  merge
client/mysqlbinlog.cc:
  merge
extra/perror.c:
  merge
include/mysql_com.h:
  merge
libmysqld/Makefile.am:
  merge
netware/BUILD/mwenv:
  merge
sql/mysqld.cc:
  merge
 2004-05-25 22:54:00 +03:00
unknown
a3d0ce6bc6 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/tmp/skr99/mysql-4.0
 2004-05-25 22:38:43 +03:00
unknown
84fbc276f1 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0 
into deer.(none):/home/hf/work/mysql-4.0
 2004-05-26 00:38:42 +05:00
unknown
19a78ceac8 Proposed fix for bug #3818 (libmysqld.dll leads to program's crash) 
configurations added to build the libraries with USE_TLS flag to be
used for libmysqld


VC++Files/dbug/dbug.dsp:
  TLS_DEBUG configuration added
VC++Files/heap/heap.dsp:
  TLS and TLS_DEBUG configurations added
VC++Files/isam/isam.dsp:
  TLS and TLS_DEBUG configurations added
VC++Files/libmysql/libmysql.dsp:
  MYSQL_CLIENT define enabled
VC++Files/libmysqld/libmysqld.dsp:
  using of _tls libraries added
VC++Files/myisam/myisam.dsp:
  TLS and TLS_DEBUG configurations added
VC++Files/myisammrg/myisammrg.dsp:
  TLS and TLS_DEBUG configurations added
VC++Files/mysys/mysys.dsp:
  TLS and TLS_DEBUG configurations added
include/mysql_com.h:
  __declspec(dllimport) seems to be necessary when one uses .dll
  on Windows
 2004-05-26 00:27:00 +05:00
unknown
de5edbf8db Remove not needed sql_olap.cc from Makefile.am 
VC++Files/comp_err/comp_err.dsp:
  removed not needed library
libmysqld/Makefile.am:
  Remove not needed sql_olap.cc
 2004-05-25 22:08:59 +03:00
unknown
b287ca53d0 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/tmp/skr99/mysql-4.0


client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
myisam/myisam_ftdump.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
 2004-05-25 22:01:50 +03:00
unknown
b3851363ba Added patches from Novell 
Build-tools/Do-compile:
  Fixed indentation
configure.in:
  Added patches from Novell
  Added C_EXTRA_FLAGS as an easy way to pass flags to both CFLAGS and CXXFLAGS
extra/perror.c:
  Fixed error number reporting to not report 'Unknown error'
include/my_global.h:
  Defines to make NETWARE patches cleaner
include/thr_alarm.h:
  Fixed wrong macro
netware/mysql_install_db.c:
  Indentation fix
 2004-05-25 22:00:14 +03:00
unknown
b2882fd4f5 InnoDB cleanup and possible bug-fix: Remove srv0que 
BitKeeper/deleted/.del-srv0que.c~d1feebb77b5a9b96:
  Delete: innobase/srv/srv0que.c
innobase/srv/Makefile.am:
  Remove srv0que.c
BitKeeper/deleted/.del-srv0que.h~f12ecb4b5afe203e:
  Delete: innobase/include/srv0que.h
innobase/include/Makefile.am:
  Remove srv0que.c
innobase/include/que0que.h:
  Remove unnecessary function que_fork_error_handle()
  que_thr_end_wait(): Remove output parameter next_thr; return it
innobase/include/trx0roll.h:
  trx_rollback(), trx_finish_rollback_off_kernel():
  Remove output parameter next_thr; return it instead
innobase/include/trx0trx.h:
  trx_sig_send(), trx_sig_reply(), trx_sig_start_handle():
  Remove output parameter next_thr; return it instead
innobase/include/usr0sess.h:
  Remove sess->state and its literals SESS_ACTIVE and SESS_ERROR
innobase/que/que0que.c:
  Remove unnecessary function que_fork_error_handle()
  que_thr_end_wait(): Remove output parameter next_thr; return it
  Remove references to srv0que.c
innobase/srv/srv0srv.c:
  Remove unnecessary #include "srv0que.h"
innobase/trx/trx0purge.c:
  Remove unneeded references to srv0que.c
innobase/trx/trx0roll.c:
  Many functions: Remove output parameter next_thr; return it instead
  Remove references to srv0que.c
innobase/trx/trx0trx.c:
  Many functions: Remove output parameter next_thr; return it instead
  Remove references to srv0que.c
  Remove references to SESS_ERROR
innobase/usr/usr0sess.c:
  Remove sess->state
 2004-05-25 20:12:09 +03:00
unknown
7c5cc74e2a Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-25 19:51:15 +03:00
unknown
cde39f5e6b changed comment for LONG_DATA_COMMAND 2004-05-25 19:52:05 +04:00
unknown
5e53268b69 updated configure for automake in ndb tree 2004-05-25 15:22:57 +00:00
unknown
cfa036a44e Merge poseidon.(none):/home/tomas/mysql-4.1-ndb 
into poseidon.(none):/home/tomas/mysql-4.1-ndb-make
 2004-05-25 15:20:45 +00:00
unknown
0da2710c45 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-25 16:02:18 +03:00
unknown
5e0df34b61 Merge with 4.0 to get fixes for project files 2004-05-25 16:01:37 +03:00
unknown
137af9003d Fixed VC++ project files 
VC++Files/copy_mysql_files.bat:
  Added /Y to avoid questions
  Fixed wrong path for copying data files
VC++Files/sql/mysqld.dsp:
  Added missing compiler option
 2004-05-25 15:53:29 +03:00
unknown
5a99542962 Corrected index_flags returned when index are created with USING HASH 
Updated ndb_ test cases 


mysql-test/r/ndb_autodiscover.result:
  Updated to new output of error message
mysql-test/r/ndb_basic.result:
  Added som order by to sort the result correctly before comparing
mysql-test/r/ndb_index_unique.result:
  Added test for USING HASH combined with PRIMARY KEY and UNIQUE index
mysql-test/t/ndb_autodiscover.test:
  Correctede error case
mysql-test/t/ndb_basic.test:
  Added som order by
mysql-test/t/ndb_index_unique.test:
  Added test for USING HASH combined with PRIMARY KEY and UNIQUE index
sql/ha_ndbcluster.cc:
  Added the index flag HA_ONLY_WHOLE_INDEX if index is created with USING HASH.
 2004-05-25 14:40:51 +02:00
unknown
b33991e69f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
 2004-05-25 14:40:21 +02:00
unknown
8ee5b216a1 Preparation for user-defined Unicode collations: 
weights data now comes from a static variables
but from the charset structure.
 2004-05-25 17:40:20 +05:00
unknown
f799dca8d0 Intermediary commit: Removed some old Makefiles and introduces Makefile.am 
ndb/src/Makefile_old:
  Rename: ndb/src/Makefile -> ndb/src/Makefile_old
ndb/src/common/Makefile_old:
  Rename: ndb/src/common/Makefile -> ndb/src/common/Makefile_old
ndb/src/common/portlib/Makefile_old:
  Rename: ndb/src/common/portlib/Makefile -> ndb/src/common/portlib/Makefile_old
ndb/src/common/portlib/unix/Makefile_old:
  Rename: ndb/src/common/portlib/unix/Makefile -> ndb/src/common/portlib/unix/Makefile_old
ndb/src/common/debugger/Makefile_old:
  Rename: ndb/src/common/debugger/Makefile -> ndb/src/common/debugger/Makefile_old
ndb/src/common/logger/Makefile_old:
  Rename: ndb/src/common/logger/Makefile -> ndb/src/common/logger/Makefile_old
ndb/src/common/util/Makefile_old:
  Rename: ndb/src/common/util/Makefile -> ndb/src/common/util/Makefile_old
ndb/src/common/mgmcommon/Makefile_old:
  Rename: ndb/src/common/mgmcommon/Makefile -> ndb/src/common/mgmcommon/Makefile_old
ndb/src/common/transporter/Makefile_old:
  Rename: ndb/src/common/transporter/Makefile -> ndb/src/common/transporter/Makefile_old
ndb/src/kernel/Makefile_old:
  Rename: ndb/src/kernel/Makefile -> ndb/src/kernel/Makefile_old
ndb/src/kernel/error/Makefile_old:
  Rename: ndb/src/kernel/error/Makefile -> ndb/src/kernel/error/Makefile_old
ndb/src/kernel/blocks/Makefile_old:
  Rename: ndb/src/kernel/blocks/Makefile -> ndb/src/kernel/blocks/Makefile_old
ndb/src/kernel/blocks/cmvmi/Makefile_old:
  Rename: ndb/src/kernel/blocks/cmvmi/Makefile -> ndb/src/kernel/blocks/cmvmi/Makefile_old
ndb/src/kernel/blocks/dbacc/Makefile_old:
  Rename: ndb/src/kernel/blocks/dbacc/Makefile -> ndb/src/kernel/blocks/dbacc/Makefile_old
ndb/src/kernel/blocks/dbdict/Makefile_old:
  Rename: ndb/src/kernel/blocks/dbdict/Makefile -> ndb/src/kernel/blocks/dbdict/Makefile_old
ndb/src/kernel/blocks/dbdih/Makefile_old:
  Rename: ndb/src/kernel/blocks/dbdih/Makefile -> ndb/src/kernel/blocks/dbdih/Makefile_old
ndb/src/kernel/blocks/dblqh/Makefile_old:
  Rename: ndb/src/kernel/blocks/dblqh/Makefile -> ndb/src/kernel/blocks/dblqh/Makefile_old
ndb/src/kernel/blocks/dbtc/Makefile_old:
  Rename: ndb/src/kernel/blocks/dbtc/Makefile -> ndb/src/kernel/blocks/dbtc/Makefile_old
ndb/src/kernel/blocks/dbtup/Makefile_old:
  Rename: ndb/src/kernel/blocks/dbtup/Makefile -> ndb/src/kernel/blocks/dbtup/Makefile_old
ndb/src/kernel/blocks/ndbfs/Makefile_old:
  Rename: ndb/src/kernel/blocks/ndbfs/Makefile -> ndb/src/kernel/blocks/ndbfs/Makefile_old
ndb/src/kernel/blocks/ndbcntr/Makefile_old:
  Rename: ndb/src/kernel/blocks/ndbcntr/Makefile -> ndb/src/kernel/blocks/ndbcntr/Makefile_old
ndb/src/kernel/blocks/qmgr/Makefile_old:
  Rename: ndb/src/kernel/blocks/qmgr/Makefile -> ndb/src/kernel/blocks/qmgr/Makefile_old
ndb/src/kernel/blocks/trix/Makefile_old:
  Rename: ndb/src/kernel/blocks/trix/Makefile -> ndb/src/kernel/blocks/trix/Makefile_old
ndb/src/kernel/blocks/backup/Makefile_old:
  Rename: ndb/src/kernel/blocks/backup/Makefile -> ndb/src/kernel/blocks/backup/Makefile_old
ndb/src/kernel/blocks/dbutil/Makefile_old:
  Rename: ndb/src/kernel/blocks/dbutil/Makefile -> ndb/src/kernel/blocks/dbutil/Makefile_old
ndb/src/kernel/blocks/suma/Makefile_old:
  Rename: ndb/src/kernel/blocks/suma/Makefile -> ndb/src/kernel/blocks/suma/Makefile_old
ndb/src/kernel/blocks/grep/Makefile_old:
  Rename: ndb/src/kernel/blocks/grep/Makefile -> ndb/src/kernel/blocks/grep/Makefile_old
ndb/src/kernel/blocks/dbtux/Makefile_old:
  Rename: ndb/src/kernel/blocks/dbtux/Makefile -> ndb/src/kernel/blocks/dbtux/Makefile_old
ndb/src/kernel/vm/Makefile_old:
  Rename: ndb/src/kernel/vm/Makefile -> ndb/src/kernel/vm/Makefile_old
ndb/src/kernel/ndb-main/Makefile_old:
  Rename: ndb/src/kernel/ndb-main/Makefile -> ndb/src/kernel/ndb-main/Makefile_old
ndb/src/ndbapi/Makefile_old:
  Rename: ndb/src/ndbapi/Makefile -> ndb/src/ndbapi/Makefile_old
ndb/src/common/debugger/signaldata/Makefile_old:
  Rename: ndb/src/common/debugger/signaldata/Makefile -> ndb/src/common/debugger/signaldata/Makefile_old
ndb/src/mgmapi/Makefile_old:
  Rename: ndb/src/mgmapi/Makefile -> ndb/src/mgmapi/Makefile_old
ndb/src/mgmsrv/Makefile_old:
  Rename: ndb/src/mgmsrv/Makefile -> ndb/src/mgmsrv/Makefile_old
ndb/src/mgmclient/Makefile_old:
  Rename: ndb/src/mgmclient/Makefile -> ndb/src/mgmclient/Makefile_old
ndb/Makefile_old:
  Rename: ndb/Makefile -> ndb/Makefile_old
ndb/src/cw/Makefile_old:
  Rename: ndb/src/cw/Makefile -> ndb/src/cw/Makefile_old
ndb/src/cw/cpcd/Makefile_old:
  Rename: ndb/src/cw/cpcd/Makefile -> ndb/src/cw/cpcd/Makefile_old
ndb/test/Makefile_old:
  Rename: ndb/test/Makefile -> ndb/test/Makefile_old
ndb/test/src/Makefile_old:
  Rename: ndb/test/src/Makefile -> ndb/test/src/Makefile_old
ndb/src/common/editline/Makefile_old:
  Rename: ndb/src/common/editline/Makefile -> ndb/src/common/editline/Makefile_old
ndb/configure_old:
  Rename: ndb/configure -> ndb/configure_old
ndb/test/tools/Makefile_old:
  Rename: ndb/test/tools/Makefile -> ndb/test/tools/Makefile_old
ndb/test/run-test/Makefile_old:
  Rename: ndb/test/run-test/Makefile -> ndb/test/run-test/Makefile_old
ndb/Epilogue.mk_old:
  Rename: ndb/Epilogue.mk -> ndb/Epilogue.mk_old
ndb/src/kernel/blocks/backup/restore/Makefile_old:
  Rename: ndb/src/kernel/blocks/backup/restore/Makefile -> ndb/src/kernel/blocks/backup/restore/Makefile_old
ndb/config/Makefile.am_old:
  Rename: ndb/config/Makefile.am -> ndb/config/Makefile.am_old
ndb/config/GuessConfig.sh_old:
  Rename: ndb/config/GuessConfig.sh -> ndb/config/GuessConfig.sh_old
ndb/test/ndbapi/Makefile_old:
  Rename: ndb/test/ndbapi/Makefile.am -> ndb/test/ndbapi/Makefile_old
ndb/test/ndbapi/flexBench/Makefile_old:
  Rename: ndb/test/ndbapi/flexBench/Makefile.am -> ndb/test/ndbapi/flexBench/Makefile_old
 2004-05-25 11:09:11 +00:00
unknown
349062d6f5 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
 2004-05-25 13:07:06 +02:00
unknown
6c09db2747 sql_string.h: 
Not used code.
  ,
sql_string.cc:
  Not used code.


sql/sql_string.cc:
  Not used code.
sql/sql_string.h:
  Not used code.
  ,
 2004-05-25 16:05:33 +05:00
unknown
9983aed876 1. Some optimization when conversion is not needed. 
2. One now must pass length argument into append(const char *str, uint length),
length is not calculated internally anymore.
 2004-05-25 15:54:03 +05:00
unknown
b7e8f418c2 Removed references to BDB and InnoDB from 'classic' release 
VC++Files/mysqldemb/mysqldemb.dsp:
  Removed references to BDB and InnoDB from 'classic'
VC++Files/sql/mysqld.dsp:
  Removed references to BDB and InnoDB from 'classic'
 2004-05-25 13:26:24 +03:00
unknown
4cb7f4944d Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/magnus/mysql-4.1


sql/handler.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
 2004-05-25 12:25:22 +02:00