Below is the list of changes that have just been committed into a local
5.1 repository of mysqldev. When mysqldev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.1822 05/04/27 23:37:47 tulin@stripped +105 -0
merge
configure.in
1.260 05/04/27 23:37:42 tulin@stripped +0 -1
merge
storage/ndb/test/src/NDBT_Test.cpp
1.26 05/04/27 23:33:00 tulin@stripped +0 -0
Auto merged
storage/ndb/test/src/HugoTransactions.cpp
1.28 05/04/27 23:33:00 tulin@stripped +0 -0
Auto merged
storage/ndb/test/src/HugoOperations.cpp
1.21 05/04/27 23:33:00 tulin@stripped +0 -0
Auto merged
storage/ndb/test/run-test/daily-devel-tests.txt
1.24 05/04/27 23:33:00 tulin@stripped +0 -0
Auto merged
storage/ndb/test/ndbapi/test_event_multi_table.cpp
1.7 05/04/27 23:33:00 tulin@stripped +0 -0
Auto merged
storage/ndb/test/ndbapi/test_event.cpp
1.13 05/04/27 23:33:00 tulin@stripped +0 -0
Auto merged
storage/ndb/test/ndbapi/testScanPerf.cpp
1.18 05/04/27 23:33:00 tulin@stripped +0 -0
Auto merged
storage/ndb/test/ndbapi/testScan.cpp
1.18 05/04/27 23:33:00 tulin@stripped +0 -0
Auto merged
storage/ndb/test/ndbapi/testOIBasic.cpp
1.42 05/04/27 23:33:00 tulin@stripped +0 -0
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp
1.15 05/04/27 23:33:00 tulin@stripped +0 -0
Auto merged
storage/ndb/test/ndbapi/testDict.cpp
1.22 05/04/27 23:33:00 tulin@stripped +0 -0
Auto merged
storage/ndb/test/ndbapi/Makefile.am
1.24 05/04/27 23:33:00 tulin@stripped +0 -0
Auto merged
storage/ndb/test/include/NDBT_Test.hpp
1.14 05/04/27 23:33:00 tulin@stripped +0 -0
Auto merged
storage/ndb/test/include/HugoTransactions.hpp
1.11 05/04/27 23:33:00 tulin@stripped +0 -0
Auto merged
storage/ndb/test/include/HugoOperations.hpp
1.14 05/04/27 23:33:00 tulin@stripped +0 -0
Auto merged
storage/ndb/src/ndbapi/ndberror.c
1.36 05/04/27 23:33:00 tulin@stripped +0 -0
Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp
1.5 05/04/27 23:33:00 tulin@stripped +0 -0
Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp
1.32 05/04/27 23:33:00 tulin@stripped +0 -0
Auto merged
storage/ndb/src/ndbapi/ObjectMap.hpp
1.11 05/04/27 23:33:00 tulin@stripped +0 -0
Auto merged
storage/ndb/src/ndbapi/Ndbinit.cpp
1.33 05/04/27 23:32:59 tulin@stripped +0 -0
Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp
1.42 05/04/27 23:32:59 tulin@stripped +0 -0
Auto merged
storage/ndb/src/ndbapi/Ndberr.cpp
1.13 05/04/27 23:32:59 tulin@stripped +0 -0
Auto merged
storage/ndb/src/ndbapi/NdbWaiter.hpp
1.4 05/04/27 23:32:59 tulin@stripped +0 -0
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp
1.46 05/04/27 23:32:59 tulin@stripped +0 -0
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp
1.68 05/04/27 23:32:59 tulin@stripped +0 -0
Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp
1.11 05/04/27 23:32:59 tulin@stripped +0 -0
Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
1.21 05/04/27 23:32:59 tulin@stripped +0 -0
Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
1.41 05/04/27 23:32:59 tulin@stripped +0 -0
Auto merged
storage/ndb/src/ndbapi/NdbEventOperation.cpp
1.16 05/04/27 23:32:59 tulin@stripped +0 -0
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
1.38 05/04/27 23:32:59 tulin@stripped +0 -0
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
1.84 05/04/27 23:32:59 tulin@stripped +0 -0
Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp
1.38 05/04/27 23:32:59 tulin@stripped +0 -0
Auto merged
storage/ndb/src/ndbapi/Ndb.cpp
1.57 05/04/27 23:32:59 tulin@stripped +0 -0
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp
1.78 05/04/27 23:32:59 tulin@stripped +0 -0
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp
1.52 05/04/27 23:32:59 tulin@stripped +0 -0
Auto merged
storage/ndb/src/kernel/vm/Makefile.am
1.8 05/04/27 23:32:59 tulin@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/trix/Trix.hpp
1.6 05/04/27 23:32:59 tulin@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/trix/Trix.cpp
1.11 05/04/27 23:32:59 tulin@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/suma/SumaInit.cpp
1.13 05/04/27 23:32:59 tulin@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.hpp
1.13 05/04/27 23:32:59 tulin@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp
1.33 05/04/27 23:32:58 tulin@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
1.16 05/04/27 23:32:58 tulin@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp
1.5 05/04/27 23:32:58 tulin@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
1.17 05/04/27 23:32:58 tulin@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/dbtup/Makefile.am
1.6 05/04/27 23:32:58 tulin@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
1.10 05/04/27 23:32:58 tulin@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
1.15 05/04/27 23:32:58 tulin@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
1.17 05/04/27 23:32:58 tulin@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
1.26 05/04/27 23:32:58 tulin@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
1.77 05/04/27 23:32:58 tulin@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
1.69 05/04/27 23:32:58 tulin@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
1.35 05/04/27 23:32:57 tulin@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
1.28 05/04/27 23:32:57 tulin@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp
1.8 05/04/27 23:32:57 tulin@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp
1.3 05/04/27 23:32:57 tulin@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
1.15 05/04/27 23:32:57 tulin@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
1.49 05/04/27 23:32:57 tulin@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
1.51 05/04/27 23:32:57 tulin@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
1.14 05/04/27 23:32:57 tulin@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
1.22 05/04/27 23:32:57 tulin@stripped +0 -0
Auto merged
storage/ndb/src/kernel/blocks/Makefile.am
1.5 05/04/27 23:32:57 tulin@stripped +0 -0
Auto merged
storage/ndb/src/kernel/SimBlockList.cpp
1.8 05/04/27 23:32:57 tulin@stripped +0 -0
Auto merged
storage/ndb/src/kernel/Makefile.am
1.13 05/04/27 23:32:57 tulin@stripped +0 -0
Auto merged
storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp
1.5 05/04/27 23:32:57 tulin@stripped +0 -0
Auto merged
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp
1.10 05/04/27 23:32:57 tulin@stripped +0 -0
Auto merged
storage/ndb/src/common/debugger/signaldata/ScanTab.cpp
1.16 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
storage/ndb/src/common/debugger/SignalLoggerManager.cpp
1.8 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
storage/ndb/src/common/debugger/Makefile.am
1.7 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp
1.24 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
storage/ndb/src/common/debugger/BlockNames.cpp
1.4 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp
1.43 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp
1.34 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp
1.19 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
storage/ndb/include/ndbapi/NdbEventOperation.hpp
1.24 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp
1.54 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
storage/ndb/include/ndbapi/Ndb.hpp
1.48 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
storage/ndb/include/kernel/signaldata/TcCommit.hpp
1.5 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
storage/ndb/include/kernel/signaldata/SumaImpl.hpp
1.8 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
storage/ndb/include/kernel/signaldata/ScanTab.hpp
1.15 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
storage/ndb/include/kernel/signaldata/ScanFrag.hpp
1.11 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
storage/ndb/include/kernel/signaldata/NextScan.hpp
1.4 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
storage/ndb/include/kernel/signaldata/DropTab.hpp
1.5 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
storage/ndb/include/kernel/signaldata/CreateTab.hpp
1.4 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
storage/ndb/include/kernel/signaldata/CreateEvnt.hpp
1.11 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
storage/ndb/include/kernel/signaldata/AlterTab.hpp
1.4 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
storage/ndb/include/kernel/signaldata/AccScan.hpp
1.6 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
storage/ndb/include/kernel/ndb_limits.h
1.16 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h
1.11 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
storage/ndb/include/kernel/BlockNumbers.h
1.6 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
storage/ndb/include/debugger/SignalLoggerManager.hpp
1.7 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
storage/ndb/include/debugger/EventLogger.hpp
1.12 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
sql/lock.cc
1.66 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
sql/Makefile.am
1.110 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
mysql-test/mysql-test-run.sh
1.264 05/04/27 23:32:56 tulin@stripped +0 -0
Auto merged
BitKeeper/deleted/.del-grep_systab_test.cpp~c7305578bec8cb62
1.3 05/04/27 23:32:55 tulin@stripped +0 -0
Auto merged
BitKeeper/deleted/.del-grep_systab_test.cpp~c7305578bec8cb62
1.1.1.2 05/04/27 23:32:55 tulin@stripped +0 -0
Merge rename: storage/ndb/src/kernel/blocks/grep/systab_test/grep_systab_test.cpp -> BitKeeper/deleted/.del-grep_systab_test.cpp~c7305578bec8cb62
BitKeeper/deleted/.del-RepImpl.hpp~718bc7d7cc8e59ba
1.6 05/04/27 23:32:55 tulin@stripped +0 -0
Auto merged
BitKeeper/deleted/.del-Makefile~b293ae88e4394490
1.3 05/04/27 23:32:55 tulin@stripped +0 -0
Auto merged
BitKeeper/deleted/.del-Makefile.am~f73be89578d3b6cc
1.6 05/04/27 23:32:55 tulin@stripped +0 -0
Auto merged
BitKeeper/deleted/.del-GrepInit.cpp~df28ab3a892455fd
1.6 05/04/27 23:32:55 tulin@stripped +0 -0
Auto merged
BitKeeper/deleted/.del-GrepImpl.hpp~9e70d3f41d9828aa
1.5 05/04/27 23:32:55 tulin@stripped +0 -0
Auto merged
BitKeeper/deleted/.del-GrepError.hpp~892e168f99ab996a
1.7 05/04/27 23:32:55 tulin@stripped +0 -0
Auto merged
BitKeeper/deleted/.del-GrepError.cpp~8933d65053892508
1.6 05/04/27 23:32:55 tulin@stripped +0 -0
Auto merged
BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387
1.6 05/04/27 23:32:55 tulin@stripped +0 -0
Auto merged
BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667
1.9 05/04/27 23:32:55 tulin@stripped +0 -0
Auto merged
BitKeeper/deleted/.del-Makefile~b293ae88e4394490
1.1.1.2 05/04/27 23:32:53 tulin@stripped +0 -0
Merge rename: storage/ndb/src/kernel/blocks/grep/systab_test/Makefile -> BitKeeper/deleted/.del-Makefile~b293ae88e4394490
BitKeeper/deleted/.del-Makefile.am~f73be89578d3b6cc
1.3.1.3 05/04/27 23:32:52 tulin@stripped +0 -0
Merge rename: storage/ndb/src/kernel/blocks/grep/Makefile.am -> BitKeeper/deleted/.del-Makefile.am~f73be89578d3b6cc
BitKeeper/deleted/.del-GrepInit.cpp~df28ab3a892455fd
1.4.1.2 05/04/27 23:32:48 tulin@stripped +0 -0
Merge rename: storage/ndb/src/kernel/blocks/grep/GrepInit.cpp -> BitKeeper/deleted/.del-GrepInit.cpp~df28ab3a892455fd
BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387
1.4.1.2 05/04/27 23:32:48 tulin@stripped +0 -0
Merge rename: storage/ndb/src/kernel/blocks/grep/Grep.hpp -> BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387
BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667
1.6.1.2 05/04/27 23:32:47 tulin@stripped +0 -0
Merge rename: storage/ndb/src/kernel/blocks/grep/Grep.cpp -> BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667
BitKeeper/deleted/.del-GrepError.cpp~8933d65053892508
1.2.1.2 05/04/27 23:32:46 tulin@stripped +0 -0
Merge rename: storage/ndb/src/common/debugger/GrepError.cpp -> BitKeeper/deleted/.del-GrepError.cpp~8933d65053892508
BitKeeper/deleted/.del-RepImpl.hpp~718bc7d7cc8e59ba
1.2.1.2 05/04/27 23:32:45 tulin@stripped +0 -0
Merge rename: storage/ndb/include/kernel/signaldata/RepImpl.hpp -> BitKeeper/deleted/.del-RepImpl.hpp~718bc7d7cc8e59ba
BitKeeper/deleted/.del-GrepImpl.hpp~9e70d3f41d9828aa
1.1.1.2 05/04/27 23:32:44 tulin@stripped +0 -0
Merge rename: storage/ndb/include/kernel/signaldata/GrepImpl.hpp -> BitKeeper/deleted/.del-GrepImpl.hpp~9e70d3f41d9828aa
BitKeeper/deleted/.del-GrepError.hpp~892e168f99ab996a
1.2.1.2 05/04/27 23:32:42 tulin@stripped +0 -0
Merge rename: storage/ndb/include/debugger/GrepError.hpp -> BitKeeper/deleted/.del-GrepError.hpp~892e168f99ab996a
storage/ndb/test/src/NDBT_Test.cpp
1.25 05/04/27 23:30:30 tulin@stripped +0 -0
Merge rename: ndb/test/src/NDBT_Test.cpp -> storage/ndb/test/src/NDBT_Test.cpp
storage/ndb/test/src/HugoTransactions.cpp
1.27 05/04/27 23:30:30 tulin@stripped +0 -0
Merge rename: ndb/test/src/HugoTransactions.cpp -> storage/ndb/test/src/HugoTransactions.cpp
storage/ndb/test/src/HugoOperations.cpp
1.20 05/04/27 23:30:30 tulin@stripped +0 -0
Merge rename: ndb/test/src/HugoOperations.cpp -> storage/ndb/test/src/HugoOperations.cpp
storage/ndb/test/run-test/daily-devel-tests.txt
1.23 05/04/27 23:30:30 tulin@stripped +0 -0
Merge rename: ndb/test/run-test/daily-devel-tests.txt -> storage/ndb/test/run-test/daily-devel-tests.txt
storage/ndb/test/ndbapi/test_event_multi_table.cpp
1.6 05/04/27 23:30:30 tulin@stripped +0 -0
Merge rename: ndb/test/ndbapi/test_event_multi_table.cpp -> storage/ndb/test/ndbapi/test_event_multi_table.cpp
storage/ndb/test/ndbapi/test_event.cpp
1.12 05/04/27 23:30:30 tulin@stripped +0 -0
Merge rename: ndb/test/ndbapi/test_event.cpp -> storage/ndb/test/ndbapi/test_event.cpp
storage/ndb/test/ndbapi/testScanPerf.cpp
1.17 05/04/27 23:30:30 tulin@stripped +0 -0
Merge rename: ndb/test/ndbapi/testScanPerf.cpp -> storage/ndb/test/ndbapi/testScanPerf.cpp
storage/ndb/test/ndbapi/testScan.cpp
1.17 05/04/27 23:30:30 tulin@stripped +0 -0
Merge rename: ndb/test/ndbapi/testScan.cpp -> storage/ndb/test/ndbapi/testScan.cpp
storage/ndb/test/ndbapi/testOIBasic.cpp
1.41 05/04/27 23:30:30 tulin@stripped +0 -0
Merge rename: ndb/test/ndbapi/testOIBasic.cpp -> storage/ndb/test/ndbapi/testOIBasic.cpp
storage/ndb/test/ndbapi/testNodeRestart.cpp
1.14 05/04/27 23:30:30 tulin@stripped +0 -0
Merge rename: ndb/test/ndbapi/testNodeRestart.cpp -> storage/ndb/test/ndbapi/testNodeRestart.cpp
storage/ndb/test/ndbapi/testDict.cpp
1.20.1.2 05/04/27 23:30:30 tulin@stripped +0 -0
Merge rename: ndb/test/ndbapi/testDict.cpp -> storage/ndb/test/ndbapi/testDict.cpp
storage/ndb/test/ndbapi/Makefile.am
1.23 05/04/27 23:30:30 tulin@stripped +0 -0
Merge rename: ndb/test/ndbapi/Makefile.am -> storage/ndb/test/ndbapi/Makefile.am
storage/ndb/test/include/NDBT_Test.hpp
1.13 05/04/27 23:30:29 tulin@stripped +0 -0
Merge rename: ndb/test/include/NDBT_Test.hpp -> storage/ndb/test/include/NDBT_Test.hpp
storage/ndb/test/include/HugoTransactions.hpp
1.10 05/04/27 23:30:29 tulin@stripped +0 -0
Merge rename: ndb/test/include/HugoTransactions.hpp -> storage/ndb/test/include/HugoTransactions.hpp
storage/ndb/test/include/HugoOperations.hpp
1.13 05/04/27 23:30:29 tulin@stripped +0 -0
Merge rename: ndb/test/include/HugoOperations.hpp -> storage/ndb/test/include/HugoOperations.hpp
storage/ndb/src/ndbapi/ndberror.c
1.35 05/04/27 23:30:29 tulin@stripped +0 -0
Merge rename: ndb/src/ndbapi/ndberror.c -> storage/ndb/src/ndbapi/ndberror.c
storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp
1.4 05/04/27 23:30:29 tulin@stripped +0 -0
Merge rename: ndb/src/ndbapi/ndb_cluster_connection_impl.hpp -> storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp
1.31 05/04/27 23:30:29 tulin@stripped +0 -0
Merge rename: ndb/src/ndbapi/ndb_cluster_connection.cpp -> storage/ndb/src/ndbapi/ndb_cluster_connection.cpp
storage/ndb/src/ndbapi/ObjectMap.hpp
1.10 05/04/27 23:30:29 tulin@stripped +0 -0
Merge rename: ndb/src/ndbapi/ObjectMap.hpp -> storage/ndb/src/ndbapi/ObjectMap.hpp
storage/ndb/src/ndbapi/Ndbinit.cpp
1.32 05/04/27 23:30:29 tulin@stripped +0 -0
Merge rename: ndb/src/ndbapi/Ndbinit.cpp -> storage/ndb/src/ndbapi/Ndbinit.cpp
storage/ndb/src/ndbapi/Ndbif.cpp
1.41 05/04/27 23:30:29 tulin@stripped +0 -0
Merge rename: ndb/src/ndbapi/Ndbif.cpp -> storage/ndb/src/ndbapi/Ndbif.cpp
storage/ndb/src/ndbapi/Ndberr.cpp
1.11.1.2 05/04/27 23:30:29 tulin@stripped +0 -0
Merge rename: ndb/src/ndbapi/Ndberr.cpp -> storage/ndb/src/ndbapi/Ndberr.cpp
storage/ndb/src/ndbapi/NdbWaiter.hpp
1.3 05/04/27 23:30:29 tulin@stripped +0 -0
Merge rename: ndb/src/ndbapi/NdbWaiter.hpp -> storage/ndb/src/ndbapi/NdbWaiter.hpp
storage/ndb/src/ndbapi/NdbTransaction.cpp
1.45 05/04/27 23:30:29 tulin@stripped +0 -0
Merge rename: ndb/src/ndbapi/NdbTransaction.cpp -> storage/ndb/src/ndbapi/NdbTransaction.cpp
storage/ndb/src/ndbapi/NdbScanOperation.cpp
1.67 05/04/27 23:30:29 tulin@stripped +0 -0
Merge rename: ndb/src/ndbapi/NdbScanOperation.cpp -> storage/ndb/src/ndbapi/NdbScanOperation.cpp
storage/ndb/src/ndbapi/NdbImpl.hpp
1.10 05/04/27 23:30:29 tulin@stripped +0 -0
Merge rename: ndb/src/ndbapi/NdbImpl.hpp -> storage/ndb/src/ndbapi/NdbImpl.hpp
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
1.20 05/04/27 23:30:29 tulin@stripped +0 -0
Merge rename: ndb/src/ndbapi/NdbEventOperationImpl.hpp -> storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
1.40 05/04/27 23:30:29 tulin@stripped +0 -0
Merge rename: ndb/src/ndbapi/NdbEventOperationImpl.cpp -> storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
storage/ndb/src/ndbapi/NdbEventOperation.cpp
1.15 05/04/27 23:30:29 tulin@stripped +0 -0
Merge rename: ndb/src/ndbapi/NdbEventOperation.cpp -> storage/ndb/src/ndbapi/NdbEventOperation.cpp
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
1.37 05/04/27 23:30:29 tulin@stripped +0 -0
Merge rename: ndb/src/ndbapi/NdbDictionaryImpl.hpp -> storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
1.83 05/04/27 23:30:29 tulin@stripped +0 -0
Merge rename: ndb/src/ndbapi/NdbDictionaryImpl.cpp -> storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
storage/ndb/src/ndbapi/NdbDictionary.cpp
1.37 05/04/27 23:30:29 tulin@stripped +0 -0
Merge rename: ndb/src/ndbapi/NdbDictionary.cpp -> storage/ndb/src/ndbapi/NdbDictionary.cpp
storage/ndb/src/ndbapi/Ndb.cpp
1.56 05/04/27 23:30:29 tulin@stripped +0 -0
Merge rename: ndb/src/ndbapi/Ndb.cpp -> storage/ndb/src/ndbapi/Ndb.cpp
storage/ndb/src/mgmsrv/MgmtSrvr.cpp
1.77 05/04/27 23:30:28 tulin@stripped +0 -0
Merge rename: ndb/src/mgmsrv/MgmtSrvr.cpp -> storage/ndb/src/mgmsrv/MgmtSrvr.cpp
storage/ndb/src/mgmclient/CommandInterpreter.cpp
1.51 05/04/27 23:30:28 tulin@stripped +0 -0
Merge rename: ndb/src/mgmclient/CommandInterpreter.cpp -> storage/ndb/src/mgmclient/CommandInterpreter.cpp
storage/ndb/src/kernel/vm/Makefile.am
1.7 05/04/27 23:30:28 tulin@stripped +0 -0
Merge rename: ndb/src/kernel/vm/Makefile.am -> storage/ndb/src/kernel/vm/Makefile.am
storage/ndb/src/kernel/blocks/trix/Trix.hpp
1.5 05/04/27 23:30:28 tulin@stripped +0 -0
Merge rename: ndb/src/kernel/blocks/trix/Trix.hpp -> storage/ndb/src/kernel/blocks/trix/Trix.hpp
storage/ndb/src/kernel/blocks/trix/Trix.cpp
1.10 05/04/27 23:30:28 tulin@stripped +0 -0
Merge rename: ndb/src/kernel/blocks/trix/Trix.cpp -> storage/ndb/src/kernel/blocks/trix/Trix.cpp
storage/ndb/src/kernel/blocks/suma/SumaInit.cpp
1.12 05/04/27 23:30:28 tulin@stripped +0 -0
Merge rename: ndb/src/kernel/blocks/suma/SumaInit.cpp -> storage/ndb/src/kernel/blocks/suma/SumaInit.cpp
storage/ndb/src/kernel/blocks/suma/Suma.hpp
1.12 05/04/27 23:30:28 tulin@stripped +0 -0
Merge rename: ndb/src/kernel/blocks/suma/Suma.hpp -> storage/ndb/src/kernel/blocks/suma/Suma.hpp
storage/ndb/src/kernel/blocks/suma/Suma.cpp
1.32 05/04/27 23:30:28 tulin@stripped +0 -0
Merge rename: ndb/src/kernel/blocks/suma/Suma.cpp -> storage/ndb/src/kernel/blocks/suma/Suma.cpp
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
1.15 05/04/27 23:30:28 tulin@stripped +0 -0
Merge rename: ndb/src/kernel/blocks/qmgr/QmgrMain.cpp -> storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp
1.4 05/04/27 23:30:28 tulin@stripped +0 -0
Merge rename: ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp -> storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
1.16 05/04/27 23:30:28 tulin@stripped +0 -0
Merge rename: ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp -> storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
storage/ndb/src/kernel/blocks/dbtup/Makefile.am
1.5 05/04/27 23:30:28 tulin@stripped +0 -0
Merge rename: ndb/src/kernel/blocks/dbtup/Makefile.am -> storage/ndb/src/kernel/blocks/dbtup/Makefile.am
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
1.9 05/04/27 23:30:28 tulin@stripped +0 -0
Merge rename: ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp -> storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
1.14 05/04/27 23:30:28 tulin@stripped +0 -0
Merge rename: ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp -> storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
1.16 05/04/27 23:30:28 tulin@stripped +0 -0
Merge rename: ndb/src/kernel/blocks/dbtup/DbtupGen.cpp -> storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
1.25 05/04/27 23:30:28 tulin@stripped +0 -0
Merge rename: ndb/src/kernel/blocks/dbtup/Dbtup.hpp -> storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
1.76 05/04/27 23:30:28 tulin@stripped +0 -0
Merge rename: ndb/src/kernel/blocks/dbtc/DbtcMain.cpp -> storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
1.68 05/04/27 23:30:28 tulin@stripped +0 -0
Merge rename: ndb/src/kernel/blocks/dblqh/DblqhMain.cpp -> storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
1.34 05/04/27 23:30:28 tulin@stripped +0 -0
Merge rename: ndb/src/kernel/blocks/dblqh/Dblqh.hpp -> storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
1.27 05/04/27 23:30:28 tulin@stripped +0 -0
Merge rename: ndb/src/kernel/blocks/dbdih/DbdihMain.cpp -> storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp
1.6.1.3 05/04/27 23:30:28 tulin@stripped +0 -0
Merge rename: ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp -> storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp
storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp
1.1.1.3 05/04/27 23:30:28 tulin@stripped +0 -0
Merge rename: ndb/src/kernel/blocks/dbdict/SchemaFile.hpp -> storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
1.14 05/04/27 23:30:28 tulin@stripped +0 -0
Merge rename: ndb/src/kernel/blocks/dbdict/Dbdict.hpp -> storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
1.48 05/04/27 23:30:27 tulin@stripped +0 -0
Merge rename: ndb/src/kernel/blocks/dbdict/Dbdict.cpp -> storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
1.50 05/04/27 23:30:27 tulin@stripped +0 -0
Merge rename: ndb/src/kernel/blocks/dbacc/DbaccMain.cpp -> storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
1.13 05/04/27 23:30:27 tulin@stripped +0 -0
Merge rename: ndb/src/kernel/blocks/dbacc/DbaccInit.cpp -> storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
1.21 05/04/27 23:30:27 tulin@stripped +0 -0
Merge rename: ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp -> storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
storage/ndb/src/kernel/blocks/Makefile.am
1.4 05/04/27 23:30:27 tulin@stripped +0 -0
Merge rename: ndb/src/kernel/blocks/Makefile.am -> storage/ndb/src/kernel/blocks/Makefile.am
storage/ndb/src/kernel/SimBlockList.cpp
1.7 05/04/27 23:30:27 tulin@stripped +0 -0
Merge rename: ndb/src/kernel/SimBlockList.cpp -> storage/ndb/src/kernel/SimBlockList.cpp
storage/ndb/src/kernel/Makefile.am
1.12 05/04/27 23:30:27 tulin@stripped +0 -0
Merge rename: ndb/src/kernel/Makefile.am -> storage/ndb/src/kernel/Makefile.am
storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp
1.4 05/04/27 23:30:27 tulin@stripped +0 -0
Merge rename: ndb/src/common/debugger/signaldata/SumaImpl.cpp -> storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp
1.9 05/04/27 23:30:27 tulin@stripped +0 -0
Merge rename: ndb/src/common/debugger/signaldata/SignalNames.cpp -> storage/ndb/src/common/debugger/signaldata/SignalNames.cpp
storage/ndb/src/common/debugger/signaldata/ScanTab.cpp
1.15 05/04/27 23:30:27 tulin@stripped +0 -0
Merge rename: ndb/src/common/debugger/signaldata/ScanTab.cpp -> storage/ndb/src/common/debugger/signaldata/ScanTab.cpp
storage/ndb/src/common/debugger/SignalLoggerManager.cpp
1.6.1.2 05/04/27 23:30:27 tulin@stripped +0 -0
Merge rename: ndb/src/common/debugger/SignalLoggerManager.cpp -> storage/ndb/src/common/debugger/SignalLoggerManager.cpp
storage/ndb/src/common/debugger/Makefile.am
1.6 05/04/27 23:30:27 tulin@stripped +0 -0
Merge rename: ndb/src/common/debugger/Makefile.am -> storage/ndb/src/common/debugger/Makefile.am
storage/ndb/src/common/debugger/EventLogger.cpp
1.23 05/04/27 23:30:27 tulin@stripped +0 -0
Merge rename: ndb/src/common/debugger/EventLogger.cpp -> storage/ndb/src/common/debugger/EventLogger.cpp
storage/ndb/src/common/debugger/BlockNames.cpp
1.3 05/04/27 23:30:27 tulin@stripped +0 -0
Merge rename: ndb/src/common/debugger/BlockNames.cpp -> storage/ndb/src/common/debugger/BlockNames.cpp
storage/ndb/include/ndbapi/NdbTransaction.hpp
1.42 05/04/27 23:30:27 tulin@stripped +0 -0
Merge rename: ndb/include/ndbapi/NdbTransaction.hpp -> storage/ndb/include/ndbapi/NdbTransaction.hpp
storage/ndb/include/ndbapi/NdbScanOperation.hpp
1.33 05/04/27 23:30:27 tulin@stripped +0 -0
Merge rename: ndb/include/ndbapi/NdbScanOperation.hpp -> storage/ndb/include/ndbapi/NdbScanOperation.hpp
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp
1.18 05/04/27 23:30:27 tulin@stripped +0 -0
Merge rename: ndb/include/ndbapi/NdbIndexScanOperation.hpp -> storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp
storage/ndb/include/ndbapi/NdbEventOperation.hpp
1.23 05/04/27 23:30:27 tulin@stripped +0 -0
Merge rename: ndb/include/ndbapi/NdbEventOperation.hpp -> storage/ndb/include/ndbapi/NdbEventOperation.hpp
storage/ndb/include/ndbapi/NdbDictionary.hpp
1.53 05/04/27 23:30:27 tulin@stripped +0 -0
Merge rename: ndb/include/ndbapi/NdbDictionary.hpp -> storage/ndb/include/ndbapi/NdbDictionary.hpp
storage/ndb/include/ndbapi/Ndb.hpp
1.47 05/04/27 23:30:27 tulin@stripped +0 -0
Merge rename: ndb/include/ndbapi/Ndb.hpp -> storage/ndb/include/ndbapi/Ndb.hpp
storage/ndb/include/kernel/signaldata/TcCommit.hpp
1.3.1.3 05/04/27 23:30:27 tulin@stripped +0 -0
Merge rename: ndb/include/kernel/signaldata/TcCommit.hpp -> storage/ndb/include/kernel/signaldata/TcCommit.hpp
storage/ndb/include/kernel/signaldata/SumaImpl.hpp
1.7 05/04/27 23:30:27 tulin@stripped +0 -0
Merge rename: ndb/include/kernel/signaldata/SumaImpl.hpp -> storage/ndb/include/kernel/signaldata/SumaImpl.hpp
storage/ndb/include/kernel/signaldata/ScanTab.hpp
1.14 05/04/27 23:30:26 tulin@stripped +0 -0
Merge rename: ndb/include/kernel/signaldata/ScanTab.hpp -> storage/ndb/include/kernel/signaldata/ScanTab.hpp
storage/ndb/include/kernel/signaldata/ScanFrag.hpp
1.10 05/04/27 23:30:26 tulin@stripped +0 -0
Merge rename: ndb/include/kernel/signaldata/ScanFrag.hpp -> storage/ndb/include/kernel/signaldata/ScanFrag.hpp
storage/ndb/include/kernel/signaldata/NextScan.hpp
1.3 05/04/27 23:30:26 tulin@stripped +0 -0
Merge rename: ndb/include/kernel/signaldata/NextScan.hpp -> storage/ndb/include/kernel/signaldata/NextScan.hpp
storage/ndb/include/kernel/signaldata/DropTab.hpp
1.4 05/04/27 23:30:26 tulin@stripped +0 -0
Merge rename: ndb/include/kernel/signaldata/DropTab.hpp -> storage/ndb/include/kernel/signaldata/DropTab.hpp
storage/ndb/include/kernel/signaldata/CreateTab.hpp
1.3 05/04/27 23:30:26 tulin@stripped +0 -0
Merge rename: ndb/include/kernel/signaldata/CreateTab.hpp -> storage/ndb/include/kernel/signaldata/CreateTab.hpp
storage/ndb/include/kernel/signaldata/CreateEvnt.hpp
1.10 05/04/27 23:30:26 tulin@stripped +0 -0
Merge rename: ndb/include/kernel/signaldata/CreateEvnt.hpp -> storage/ndb/include/kernel/signaldata/CreateEvnt.hpp
storage/ndb/include/kernel/signaldata/AlterTab.hpp
1.3 05/04/27 23:30:26 tulin@stripped +0 -0
Merge rename: ndb/include/kernel/signaldata/AlterTab.hpp -> storage/ndb/include/kernel/signaldata/AlterTab.hpp
storage/ndb/include/kernel/signaldata/AccScan.hpp
1.5 05/04/27 23:30:26 tulin@stripped +0 -0
Merge rename: ndb/include/kernel/signaldata/AccScan.hpp -> storage/ndb/include/kernel/signaldata/AccScan.hpp
storage/ndb/include/kernel/ndb_limits.h
1.14.1.2 05/04/27 23:30:26 tulin@stripped +0 -0
Merge rename: ndb/include/kernel/ndb_limits.h -> storage/ndb/include/kernel/ndb_limits.h
storage/ndb/include/kernel/GlobalSignalNumbers.h
1.10 05/04/27 23:30:26 tulin@stripped +0 -0
Merge rename: ndb/include/kernel/GlobalSignalNumbers.h -> storage/ndb/include/kernel/GlobalSignalNumbers.h
storage/ndb/include/kernel/BlockNumbers.h
1.5 05/04/27 23:30:26 tulin@stripped +0 -0
Merge rename: ndb/include/kernel/BlockNumbers.h -> storage/ndb/include/kernel/BlockNumbers.h
storage/ndb/include/debugger/SignalLoggerManager.hpp
1.5.1.2 05/04/27 23:30:26 tulin@stripped +0 -0
Merge rename: ndb/include/debugger/SignalLoggerManager.hpp -> storage/ndb/include/debugger/SignalLoggerManager.hpp
storage/ndb/include/debugger/EventLogger.hpp
1.11 05/04/27 23:30:26 tulin@stripped +0 -0
Merge rename: ndb/include/debugger/EventLogger.hpp -> storage/ndb/include/debugger/EventLogger.hpp
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: tulin
# Host: production.mysql.com
# Root: /data0/mysqldev/tomas/mysql-5.1-wl2325/RESYNC
--- 1.259/configure.in 2005-04-25 23:50:51 +02:00
+++ 1.260/configure.in 2005-04-27 23:37:42 +02:00
@@ -2462,7 +2462,7 @@
if test X"$have_berkeley_db" != Xyes; then
# we must build berkeley db from source
sql_server_dirs="$sql_server_dirs $have_berkeley_db"
- AC_CONFIG_FILES(bdb/Makefile)
+ AC_CONFIG_FILES(storage/bdb/Makefile)
echo "CONFIGURING FOR BERKELEY DB"
bdb_conf_flags="--disable-shared"
@@ -2488,8 +2488,10 @@
rel_srcdir=
case "$srcdir" in
/* ) rel_srcdir="$srcdir" ;;
- * ) rel_srcdir="../../$srcdir" ;;
+ * ) rel_srcdir="../../../$srcdir" ;;
esac
+ echo $bdb/build_unix
+ echo $rel_srcdir/$bdb/dist/configure
(cd $bdb/build_unix && \
sh $rel_srcdir/$bdb/dist/configure $bdb_conf_flags) || \
AC_MSG_ERROR([could not configure Berkeley DB])
@@ -2502,12 +2504,12 @@
else
if test -d bdb; then :
else
- mkdir bdb && mkdir bdb/build_unix
+ mkdir storage/bdb && mkdir storage/bdb/build_unix
fi
- if test -r bdb/build_unix/db.h; then :
+ if test -r storage/bdb/build_unix/db.h; then :
else
- cat <<EOF > bdb/build_unix/db.h
+ cat <<EOF > storage/bdb/build_unix/db.h
This file is a placeholder to fool make. The way that automake
and GNU make work together causes some files to depend on this
@@ -2530,8 +2532,8 @@
if test X"$have_innodb" = Xyes
then
innodb_conf_flags=""
- sql_server_dirs="$sql_server_dirs innobase"
- AC_CONFIG_SUBDIRS(innobase)
+ sql_server_dirs="$sql_server_dirs storage/innobase"
+ AC_CONFIG_SUBDIRS(storage/innobase)
fi
case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_prog_gcc-$have_ndbcluster in
@@ -2553,12 +2555,12 @@
echo
exit 1
fi
- sql_server_dirs="$sql_server_dirs ndb"
+ sql_server_dirs="$sql_server_dirs storage/ndb"
fi
#
# END of configuration for optional table handlers
#
- sql_server_dirs="$sql_server_dirs myisam myisammrg heap vio sql"
+ sql_server_dirs="$sql_server_dirs storage/myisam storage/myisammrg storage/heap vio sql"
fi
@@ -2691,50 +2693,52 @@
AC_SUBST([NDB_SIZEOF_LONG])
AC_SUBST([NDB_SIZEOF_LONG_LONG])
-AC_CONFIG_FILES(ndb/Makefile ndb/include/Makefile dnl
- ndb/src/Makefile ndb/src/common/Makefile dnl
- ndb/docs/Makefile dnl
- ndb/tools/Makefile dnl
- ndb/src/common/debugger/Makefile dnl
- ndb/src/common/debugger/signaldata/Makefile dnl
- ndb/src/common/portlib/Makefile dnl
- ndb/src/common/util/Makefile dnl
- ndb/src/common/logger/Makefile dnl
- ndb/src/common/transporter/Makefile dnl
- ndb/src/common/mgmcommon/Makefile dnl
- ndb/src/kernel/Makefile dnl
- ndb/src/kernel/error/Makefile dnl
- ndb/src/kernel/blocks/Makefile dnl
- ndb/src/kernel/blocks/cmvmi/Makefile dnl
- ndb/src/kernel/blocks/dbacc/Makefile dnl
- ndb/src/kernel/blocks/dbdict/Makefile dnl
- ndb/src/kernel/blocks/dbdih/Makefile dnl
- ndb/src/kernel/blocks/dblqh/Makefile dnl
- ndb/src/kernel/blocks/dbtc/Makefile dnl
- ndb/src/kernel/blocks/dbtup/Makefile dnl
- ndb/src/kernel/blocks/ndbfs/Makefile dnl
- ndb/src/kernel/blocks/ndbcntr/Makefile dnl
- ndb/src/kernel/blocks/qmgr/Makefile dnl
- ndb/src/kernel/blocks/trix/Makefile dnl
- ndb/src/kernel/blocks/backup/Makefile dnl
- ndb/src/kernel/blocks/dbutil/Makefile dnl
- ndb/src/kernel/blocks/suma/Makefile dnl
- ndb/src/kernel/blocks/dbtux/Makefile dnl
- ndb/src/kernel/vm/Makefile dnl
- ndb/src/mgmapi/Makefile dnl
- ndb/src/ndbapi/Makefile dnl
- ndb/src/mgmsrv/Makefile dnl
- ndb/src/mgmclient/Makefile dnl
- ndb/src/cw/Makefile dnl
- ndb/src/cw/cpcd/Makefile dnl
- ndb/test/Makefile dnl
- ndb/test/src/Makefile dnl
- ndb/test/ndbapi/Makefile dnl
- ndb/test/ndbapi/bank/Makefile dnl
- ndb/test/tools/Makefile dnl
- ndb/test/run-test/Makefile mysql-test/ndb/Makefile dnl
- ndb/include/ndb_version.h ndb/include/ndb_global.h dnl
- ndb/include/ndb_types.h dnl
+AC_CONFIG_FILES(storage/ndb/Makefile storage/ndb/include/Makefile dnl
+ storage/ndb/src/Makefile storage/ndb/src/common/Makefile dnl
+ storage/ndb/docs/Makefile dnl
+ storage/ndb/tools/Makefile dnl
+ storage/ndb/src/common/debugger/Makefile dnl
+ storage/ndb/src/common/debugger/signaldata/Makefile dnl
+ storage/ndb/src/common/portlib/Makefile dnl
+ storage/ndb/src/common/util/Makefile dnl
+ storage/ndb/src/common/logger/Makefile dnl
+ storage/ndb/src/common/transporter/Makefile dnl
+ storage/ndb/src/common/mgmcommon/Makefile dnl
+ storage/ndb/src/kernel/Makefile dnl
+ storage/ndb/src/kernel/error/Makefile dnl
+ storage/ndb/src/kernel/blocks/Makefile dnl
+ storage/ndb/src/kernel/blocks/cmvmi/Makefile dnl
+ storage/ndb/src/kernel/blocks/dbacc/Makefile dnl
+ storage/ndb/src/kernel/blocks/dbdict/Makefile dnl
+ storage/ndb/src/kernel/blocks/dbdih/Makefile dnl
+ storage/ndb/src/kernel/blocks/dblqh/Makefile dnl
+ storage/ndb/src/kernel/blocks/dbtc/Makefile dnl
+ storage/ndb/src/kernel/blocks/dbtup/Makefile dnl
+ storage/ndb/src/kernel/blocks/ndbfs/Makefile dnl
+ storage/ndb/src/kernel/blocks/ndbcntr/Makefile dnl
+ storage/ndb/src/kernel/blocks/qmgr/Makefile dnl
+ storage/ndb/src/kernel/blocks/trix/Makefile dnl
+ storage/ndb/src/kernel/blocks/backup/Makefile dnl
+ storage/ndb/src/kernel/blocks/dbutil/Makefile dnl
+ storage/ndb/src/kernel/blocks/suma/Makefile dnl
+ storage/ndb/src/kernel/blocks/dbtux/Makefile dnl
+ storage/ndb/src/kernel/vm/Makefile dnl
+ storage/ndb/src/mgmapi/Makefile dnl
+ storage/ndb/src/ndbapi/Makefile dnl
+ storage/ndb/src/mgmsrv/Makefile dnl
+ storage/ndb/src/mgmclient/Makefile dnl
+ storage/ndb/src/cw/Makefile dnl
+ storage/ndb/src/cw/cpcd/Makefile dnl
+ storage/ndb/test/Makefile dnl
+ storage/ndb/test/src/Makefile dnl
+ storage/ndb/test/ndbapi/Makefile dnl
+ storage/ndb/test/ndbapi/bank/Makefile dnl
+ storage/ndb/test/tools/Makefile dnl
+ storage/ndb/test/run-test/Makefile dnl
+ storage/ndb/include/ndb_version.h dnl
+ storage/ndb/include/ndb_global.h dnl
+ storage/ndb/include/ndb_types.h dnl
+ mysql-test/ndb/Makefile dnl
)
fi
@@ -2742,8 +2746,8 @@
# Output results
AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
- strings/Makefile regex/Makefile heap/Makefile dnl
- myisam/Makefile myisammrg/Makefile dnl
+ strings/Makefile regex/Makefile storage/Makefile storage/heap/Makefile dnl
+ storage/myisam/Makefile storage/myisammrg/Makefile dnl
os2/Makefile os2/include/Makefile os2/include/sys/Makefile dnl
man/Makefile BUILD/Makefile vio/Makefile dnl
libmysql_r/Makefile libmysqld/Makefile libmysqld/examples/Makefile dnl
--- 1.263/mysql-test/mysql-test-run.sh 2005-04-22 17:26:52 +02:00
+++ 1.264/mysql-test/mysql-test-run.sh 2005-04-27 23:32:56 +02:00
@@ -601,8 +601,8 @@
CHARSETSDIR="$BASEDIR/sql/share/charsets"
INSTALL_DB="./install_test_db"
MYSQL_FIX_SYSTEM_TABLES="$BASEDIR/scripts/mysql_fix_privilege_tables"
- NDB_TOOLS_DIR="$BASEDIR/ndb/tools"
- NDB_MGM="$BASEDIR/ndb/src/mgmclient/ndb_mgm"
+ NDB_TOOLS_DIR="$BASEDIR/storage/ndb/tools"
+ NDB_MGM="$BASEDIR/storage/ndb/src/mgmclient/ndb_mgm"
if [ -n "$USE_PURIFY" ] ; then
PSUP="$MYSQL_TEST_DIR/purify.suppress"
--- 1.109/sql/Makefile.am 2005-04-25 22:18:04 +02:00
+++ 1.110/sql/Makefile.am 2005-04-27 23:32:56 +02:00
@@ -29,9 +29,9 @@
noinst_PROGRAMS = gen_lex_hash
bin_PROGRAMS = mysql_tzinfo_to_sql
gen_lex_hash_LDFLAGS = @NOINST_LDFLAGS@
-LDADD = $(top_builddir)/myisam/libmyisam.a \
- $(top_builddir)/myisammrg/libmyisammrg.a \
- $(top_builddir)/heap/libheap.a \
+LDADD = $(top_builddir)/storage/myisam/libmyisam.a \
+ $(top_builddir)/storage/myisammrg/libmyisammrg.a \
+ $(top_builddir)/storage/heap/libheap.a \
$(top_builddir)/vio/libvio.a \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/dbug/libdbug.a \
--- 1.65/sql/lock.cc 2005-04-20 13:32:15 +02:00
+++ 1.66/sql/lock.cc 2005-04-27 23:32:56 +02:00
@@ -72,7 +72,7 @@
#ifndef MASTER
#include "../srclib/myisammrg/myrg_def.h"
#else
-#include "../myisammrg/myrg_def.h"
+#include "../storage/myisammrg/myrg_def.h"
#endif
static MYSQL_LOCK *get_lock_data(THD *thd, TABLE **table,uint count,
--- 1.2.1.1/storage/ndb/include/debugger/GrepError.hpp 2005-04-08 02:43:49 +02:00
+++ 1.7/BitKeeper/deleted/.del-GrepError.hpp~892e168f99ab996a 2005-04-27 23:32:55 +02:00
@@ -50,7 +50,7 @@
CHANNEL_NOT_STOPPABLE,
// subscriber releated 20 - 30
- SUBSCRIBER_NOT_FOUND = 20,
+ SUBSCRIBER_NOT_FOUND = 1407,
//SUMA specific 400 - 600
SELECTED_TABLE_NOT_FOUND = 400,
--- 1.1.1.1/storage/ndb/include/kernel/signaldata/GrepImpl.hpp 2005-04-08 02:43:51 +02:00
+++ 1.5/BitKeeper/deleted/.del-GrepImpl.hpp~9e70d3f41d9828aa 2005-04-27 23:32:55 +02:00
@@ -17,8 +17,8 @@
#ifndef GREP_IMPL_HPP
#define GREP_IMPL_HPP
-#include "SignalData.hpp"
-#include <GrepError.hpp>
+#include <signaldata/SignalData.hpp>
+#include "GrepError.hpp"
#include <NodeBitmask.hpp>
--- 1.2.1.1/storage/ndb/include/kernel/signaldata/RepImpl.hpp 2005-04-08 02:43:51 +02:00
+++ 1.6/BitKeeper/deleted/.del-RepImpl.hpp~718bc7d7cc8e59ba 2005-04-27 23:32:55 +02:00
@@ -17,10 +17,10 @@
#ifndef REP_IMPL_HPP
#define REP_IMPL_HPP
-#include "SignalData.hpp"
+#include <signaldata/SignalData.hpp>
#include <NodeBitmask.hpp>
#include <ndb_limits.h>
-#include <debugger/GrepError.hpp>
+#include "GrepError.hpp"
/**
* RecordType
--- 1.2.1.1/storage/ndb/src/common/debugger/GrepError.cpp 2005-04-08 02:43:55 +02:00
+++ 1.6/BitKeeper/deleted/.del-GrepError.cpp~8933d65053892508 2005-04-27 23:32:55 +02:00
@@ -19,8 +19,8 @@
/**
* Error descriptions.
*/
-
const GrepError::ErrorDescription GrepError::errorDescriptions[] = {
+#if 0
{ GrepError::GE_NO_ERROR,
"No error" },
{ GrepError::SUBSCRIPTION_ID_NOMEM,
@@ -104,6 +104,7 @@
{ GrepError::NOT_YET_IMPLEMENTED,
"Command or event not yet implemented."}
+#endif
};
--- 1.6.1.1/storage/ndb/src/kernel/blocks/grep/Grep.cpp 2005-04-08 02:44:05 +02:00
+++ 1.9/BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667 2005-04-27 23:32:55 +02:00
@@ -23,8 +23,8 @@
#include <signaldata/NodeFailRep.hpp>
#include <signaldata/ReadNodesConf.hpp>
#include <signaldata/CheckNodeGroups.hpp>
-#include <signaldata/GrepImpl.hpp>
-#include <signaldata/RepImpl.hpp>
+#include <GrepImpl.hpp>
+#include <RepImpl.hpp>
#include <signaldata/EventReport.hpp>
#include <signaldata/DictTabInfo.hpp>
#include <signaldata/GetTabInfo.hpp>
--- 1.5/ndb/src/common/debugger/Makefile.am 2005-03-21 21:59:41 +01:00
+++ 1.7/storage/ndb/src/common/debugger/Makefile.am 2005-04-27 23:32:56 +02:00
@@ -4,8 +4,8 @@
libtrace_la_SOURCES = SignalLoggerManager.cpp DebuggerNames.cpp BlockNames.cpp EventLogger.cpp
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_kernel.mk.am
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
@@ -13,13 +13,13 @@
windoze-dsp: libtrace.dsp
libtrace.dsp: Makefile \
- $(top_srcdir)/ndb/config/win-lib.am \
- $(top_srcdir)/ndb/config/win-name \
- $(top_srcdir)/ndb/config/win-includes \
- $(top_srcdir)/ndb/config/win-sources \
- $(top_srcdir)/ndb/config/win-libraries
- cat $(top_srcdir)/ndb/config/win-lib.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
- @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(libtrace_la_SOURCES)
- @$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
+ $(top_srcdir)/storage/ndb/config/win-lib.am \
+ $(top_srcdir)/storage/ndb/config/win-name \
+ $(top_srcdir)/storage/ndb/config/win-includes \
+ $(top_srcdir)/storage/ndb/config/win-sources \
+ $(top_srcdir)/storage/ndb/config/win-libraries
+ cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+ @$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-sources $@ $(libtrace_la_SOURCES)
+ @$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
--- 1.11/ndb/src/kernel/Makefile.am 2005-04-05 18:18:05 +02:00
+++ 1.13/storage/ndb/src/kernel/Makefile.am 2005-04-27 23:32:57 +02:00
@@ -1,12 +1,12 @@
SUBDIRS = error blocks vm
-include $(top_srcdir)/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/common.mk.am
ndbbin_PROGRAMS = ndbd
ndbd_SOURCES = main.cpp SimBlockList.cpp
-include $(top_srcdir)/ndb/config/type_kernel.mk.am
+include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
INCLUDES += \
-Iblocks/cmvmi \
@@ -43,14 +43,14 @@
blocks/dbtux/libdbtux.a \
vm/libkernel.a \
error/liberror.a \
- $(top_builddir)/ndb/src/common/transporter/libtransporter.la \
- $(top_builddir)/ndb/src/common/debugger/libtrace.la \
- $(top_builddir)/ndb/src/common/debugger/signaldata/libsignaldataprint.la \
- $(top_builddir)/ndb/src/common/logger/liblogger.la \
- $(top_builddir)/ndb/src/common/mgmcommon/libmgmsrvcommon.la \
- $(top_builddir)/ndb/src/mgmapi/libmgmapi.la \
- $(top_builddir)/ndb/src/common/portlib/libportlib.la \
- $(top_builddir)/ndb/src/common/util/libgeneral.la \
+ $(top_builddir)/storage/ndb/src/common/transporter/libtransporter.la \
+ $(top_builddir)/storage/ndb/src/common/debugger/libtrace.la \
+ $(top_builddir)/storage/ndb/src/common/debugger/signaldata/libsignaldataprint.la \
+ $(top_builddir)/storage/ndb/src/common/logger/liblogger.la \
+ $(top_builddir)/storage/ndb/src/common/mgmcommon/libmgmsrvcommon.la \
+ $(top_builddir)/storage/ndb/src/mgmapi/libmgmapi.la \
+ $(top_builddir)/storage/ndb/src/common/portlib/libportlib.la \
+ $(top_builddir)/storage/ndb/src/common/util/libgeneral.la \
$(top_builddir)/dbug/libdbug.a \
$(top_builddir)/mysys/libmysys.a \
$(top_builddir)/strings/libmystrings.a @NDB_SCI_LIBS@
@@ -60,14 +60,14 @@
windoze-dsp: ndbd.dsp
-ndbd.dsp: Makefile \
- $(top_srcdir)/ndb/config/win-prg.am \
- $(top_srcdir)/ndb/config/win-name \
- $(top_srcdir)/ndb/config/win-includes \
- $(top_srcdir)/ndb/config/win-sources \
- $(top_srcdir)/ndb/config/win-libraries
- cat $(top_srcdir)/ndb/config/win-prg.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ $(ndbbin_PROGRAMS)
- @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(ndbd_SOURCES)
- @$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
+storage/ndbd.dsp: Makefile \
+ $(top_srcdir)/storage/ndb/config/win-prg.am \
+ $(top_srcdir)/storage/ndb/config/win-name \
+ $(top_srcdir)/storage/ndb/config/win-includes \
+ $(top_srcdir)/storage/ndb/config/win-sources \
+ $(top_srcdir)/storage/ndb/config/win-libraries
+ cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+ @$(top_srcdir)/storage/ndb/config/win-name $@ $(ndbbin_PROGRAMS)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-sources $@ $(ndbd_SOURCES)
+ @$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
--- 1.4/ndb/src/kernel/blocks/dbtup/Makefile.am 2005-04-07 11:14:30 +02:00
+++ 1.6/storage/ndb/src/kernel/blocks/dbtup/Makefile.am 2005-04-27 23:32:58 +02:00
@@ -21,8 +21,8 @@
DbtupScan.cpp \
DbtupDebug.cpp
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_kernel.mk.am
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
@@ -30,13 +30,13 @@
windoze-dsp: libdbtup.dsp
libdbtup.dsp: Makefile \
- $(top_srcdir)/ndb/config/win-lib.am \
- $(top_srcdir)/ndb/config/win-name \
- $(top_srcdir)/ndb/config/win-includes \
- $(top_srcdir)/ndb/config/win-sources \
- $(top_srcdir)/ndb/config/win-libraries
- cat $(top_srcdir)/ndb/config/win-lib.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
- @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(libdbtup_a_SOURCES)
- @$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
+ $(top_srcdir)/storage/ndb/config/win-lib.am \
+ $(top_srcdir)/storage/ndb/config/win-name \
+ $(top_srcdir)/storage/ndb/config/win-includes \
+ $(top_srcdir)/storage/ndb/config/win-sources \
+ $(top_srcdir)/storage/ndb/config/win-libraries
+ cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+ @$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-sources $@ $(libdbtup_a_SOURCES)
+ @$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
--- 1.3.1.2/storage/ndb/src/kernel/blocks/grep/Makefile.am 2005-04-27 04:04:32 +02:00
+++ 1.6/BitKeeper/deleted/.del-Makefile.am~f73be89578d3b6cc 2005-04-27 23:32:55 +02:00
@@ -1,6 +1,6 @@
noinst_LIBRARIES = libgrep.a
-libgrep_a_SOURCES = Grep.cpp GrepInit.cpp
+libgrep_a_SOURCES = Grep.cpp GrepInit.cpp GrepError.cpp
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
--- 1.6/ndb/src/kernel/vm/Makefile.am 2005-03-21 12:00:32 +01:00
+++ 1.8/storage/ndb/src/kernel/vm/Makefile.am 2005-04-27 23:32:59 +02:00
@@ -21,10 +21,10 @@
Mutex.cpp SafeCounter.cpp \
SuperPool.cpp
-INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmapi
+INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/mgmapi
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_kernel.mk.am
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
# Don't update the files from bitkeeper
%::SCCS/s.%
@@ -32,13 +32,13 @@
windoze-dsp: libkernel.dsp
libkernel.dsp: Makefile \
- $(top_srcdir)/ndb/config/win-lib.am \
- $(top_srcdir)/ndb/config/win-name \
- $(top_srcdir)/ndb/config/win-includes \
- $(top_srcdir)/ndb/config/win-sources \
- $(top_srcdir)/ndb/config/win-libraries
- cat $(top_srcdir)/ndb/config/win-lib.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ $(noinst_LIBRARIES)
- @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(libkernel_a_SOURCES)
- @$(top_srcdir)/ndb/config/win-libraries $@ LIB $(LDADD)
+ $(top_srcdir)/storage/ndb/config/win-lib.am \
+ $(top_srcdir)/storage/ndb/config/win-name \
+ $(top_srcdir)/storage/ndb/config/win-includes \
+ $(top_srcdir)/storage/ndb/config/win-sources \
+ $(top_srcdir)/storage/ndb/config/win-libraries
+ cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
+ @$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LIBRARIES)
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-sources $@ $(libkernel_a_SOURCES)
+ @$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
--- 1.22/ndb/test/ndbapi/Makefile.am 2005-04-25 23:50:53 +02:00
+++ 1.24/storage/ndb/test/ndbapi/Makefile.am 2005-04-27 23:33:00 +02:00
@@ -77,10 +77,10 @@
DbCreate_SOURCES = bench/mainPopulate.cpp bench/dbPopulate.cpp bench/userInterface.cpp bench/dbPopulate.h bench/userInterface.h bench/testData.h bench/testDefinitions.h bench/ndb_schema.hpp bench/ndb_error.hpp
DbAsyncGenerator_SOURCES = bench/mainAsyncGenerator.cpp bench/asyncGenerator.cpp bench/ndb_async2.cpp bench/dbGenerator.h bench/macros.h bench/userInterface.h bench/testData.h bench/testDefinitions.h bench/ndb_schema.hpp bench/ndb_error.hpp
-INCLUDES_LOC = -I$(top_srcdir)/ndb/include/kernel
+INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/include/kernel
-include $(top_srcdir)/ndb/config/common.mk.am
-include $(top_srcdir)/ndb/config/type_ndbapitest.mk.am
+include $(top_srcdir)/storage/ndb/config/common.mk.am
+include $(top_srcdir)/storage/ndb/config/type_ndbapitest.mk.am
##testDict_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
##testIndex_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel
@@ -97,61 +97,61 @@
testScan.dsp
flexBench.dsp: Makefile \
- $(top_srcdir)/ndb/config/win-prg.am \
- $(top_srcdir)/ndb/config/win-name \
- $(top_srcdir)/ndb/config/win-includes \
- $(top_srcdir)/ndb/config/win-sources \
- $(top_srcdir)/ndb/config/win-libraries
- cat $(top_srcdir)/ndb/config/win-prg.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ flexBench
- @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(flexBench_SOURCES)
- @$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
+ $(top_srcdir)/storage/ndb/config/win-prg.am \
+ $(top_srcdir)/storage/ndb/config/win-name \
+ $(top_srcdir)/storage/ndb/config/win-includes \
+ $(top_srcdir)/storage/ndb/config/win-sources \
+ $(top_srcdir)/storage/ndb/config/win-libraries
+ cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+ @$(top_srcdir)/storage/ndb/config/win-name $@ flexBench
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-sources $@ $(flexBench_SOURCES)
+ @$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
testBasic.dsp: Makefile \
- $(top_srcdir)/ndb/config/win-prg.am \
- $(top_srcdir)/ndb/config/win-name \
- $(top_srcdir)/ndb/config/win-includes \
- $(top_srcdir)/ndb/config/win-sources \
- $(top_srcdir)/ndb/config/win-libraries
- cat $(top_srcdir)/ndb/config/win-prg.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ testBasic
- @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(testBasic_SOURCES)
- @$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
+ $(top_srcdir)/storage/ndb/config/win-prg.am \
+ $(top_srcdir)/storage/ndb/config/win-name \
+ $(top_srcdir)/storage/ndb/config/win-includes \
+ $(top_srcdir)/storage/ndb/config/win-sources \
+ $(top_srcdir)/storage/ndb/config/win-libraries
+ cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+ @$(top_srcdir)/storage/ndb/config/win-name $@ testBasic
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-sources $@ $(testBasic_SOURCES)
+ @$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
testOIBasic.dsp: Makefile \
- $(top_srcdir)/ndb/config/win-prg.am \
- $(top_srcdir)/ndb/config/win-name \
- $(top_srcdir)/ndb/config/win-includes \
- $(top_srcdir)/ndb/config/win-sources \
- $(top_srcdir)/ndb/config/win-libraries
- cat $(top_srcdir)/ndb/config/win-prg.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ testOIBasic
- @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(testOIBasic_SOURCES)
- @$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
+ $(top_srcdir)/storage/ndb/config/win-prg.am \
+ $(top_srcdir)/storage/ndb/config/win-name \
+ $(top_srcdir)/storage/ndb/config/win-includes \
+ $(top_srcdir)/storage/ndb/config/win-sources \
+ $(top_srcdir)/storage/ndb/config/win-libraries
+ cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+ @$(top_srcdir)/storage/ndb/config/win-name $@ testOIBasic
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-sources $@ $(testOIBasic_SOURCES)
+ @$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
testBlobs.dsp: Makefile \
- $(top_srcdir)/ndb/config/win-prg.am \
- $(top_srcdir)/ndb/config/win-name \
- $(top_srcdir)/ndb/config/win-includes \
- $(top_srcdir)/ndb/config/win-sources \
- $(top_srcdir)/ndb/config/win-libraries
- cat $(top_srcdir)/ndb/config/win-prg.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ testBlobs
- @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(testBlobs_SOURCES)
- @$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
+ $(top_srcdir)/storage/ndb/config/win-prg.am \
+ $(top_srcdir)/storage/ndb/config/win-name \
+ $(top_srcdir)/storage/ndb/config/win-includes \
+ $(top_srcdir)/storage/ndb/config/win-sources \
+ $(top_srcdir)/storage/ndb/config/win-libraries
+ cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+ @$(top_srcdir)/storage/ndb/config/win-name $@ testBlobs
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-sources $@ $(testBlobs_SOURCES)
+ @$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
testScan.dsp: Makefile \
- $(top_srcdir)/ndb/config/win-prg.am \
- $(top_srcdir)/ndb/config/win-name \
- $(top_srcdir)/ndb/config/win-includes \
- $(top_srcdir)/ndb/config/win-sources \
- $(top_srcdir)/ndb/config/win-libraries
- cat $(top_srcdir)/ndb/config/win-prg.am > $@
- @$(top_srcdir)/ndb/config/win-name $@ testScan
- @$(top_srcdir)/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/ndb/config/win-sources $@ $(testScan_SOURCES)
- @$(top_srcdir)/ndb/config/win-libraries $@ LINK $(LDADD)
+ $(top_srcdir)/storage/ndb/config/win-prg.am \
+ $(top_srcdir)/storage/ndb/config/win-name \
+ $(top_srcdir)/storage/ndb/config/win-includes \
+ $(top_srcdir)/storage/ndb/config/win-sources \
+ $(top_srcdir)/storage/ndb/config/win-libraries
+ cat $(top_srcdir)/storage/ndb/config/win-prg.am > $@
+ @$(top_srcdir)/storage/ndb/config/win-name $@ testScan
+ @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
+ @$(top_srcdir)/storage/ndb/config/win-sources $@ $(testScan_SOURCES)
+ @$(top_srcdir)/storage/ndb/config/win-libraries $@ LINK $(LDADD)
| Thread |
|---|
| • bk commit into 5.1 tree (tulin:1.1822) | tomas | 27 Apr |
