Commit graph

212 commits

Author SHA1 Message Date
unknown
f401993dc8 ndb - remove extra ;
(in test framework)


storage/ndb/test/src/NDBT_Thread.cpp:
  remove extra ;
2007-10-08 15:58:08 +02:00
unknown
b86c73080f ndb - fix bug in old test prg(s)
fix SR1 and SR2


storage/ndb/test/ndbapi/testSystemRestart.cpp:
  fix SR1 and SR2
2007-10-08 15:07:58 +02:00
unknown
d1772b37bd ndb - bug#30975
add even more tests


storage/ndb/test/ndbapi/testSystemRestart.cpp:
  add more tests...
storage/ndb/test/run-test/daily-basic-tests.txt:
  add more tests
2007-09-29 11:10:12 +02:00
unknown
9e54eeee2e ndb - add new testcases/error insert bug#30975
(recommit for correct merge order)


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  new error code
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  add error inserts
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  add error insert
storage/ndb/src/kernel/blocks/pgman.cpp:
  add error inserts
storage/ndb/test/include/HugoTransactions.hpp:
  add 
  - loadTableStartFrom
  - scanUpdate with scanflags
  - fillTableStartFrom
storage/ndb/test/include/UtilTransactions.hpp:
  add
  - clearTable with scan flags
storage/ndb/test/ndbapi/testSystemRestart.cpp:
  add new testcases
storage/ndb/test/run-test/daily-basic-tests.txt:
  add new testcases
storage/ndb/test/src/HugoTransactions.cpp:
  add new functions
storage/ndb/test/src/UtilTransactions.cpp:
  add new functions
2007-09-28 09:58:56 +02:00
unknown
49fadd9893 ndb - threads and timings to hugo* pk ops
storage/ndb/test/include/HugoTransactions.hpp:
  threads and timings to hugo* pk ops
storage/ndb/test/include/NDBT_Thread.hpp:
  threads and timings to hugo* pk ops
storage/ndb/test/src/HugoTransactions.cpp:
  threads and timings to hugo* pk ops
storage/ndb/test/src/Makefile.am:
  threads and timings to hugo* pk ops
storage/ndb/test/src/NDBT_Thread.cpp:
  threads and timings to hugo* pk ops
storage/ndb/test/tools/hugoPkDelete.cpp:
  threads and timings to hugo* pk ops
storage/ndb/test/tools/hugoPkRead.cpp:
  threads and timings to hugo* pk ops
storage/ndb/test/tools/hugoPkUpdate.cpp:
  threads and timings to hugo* pk ops
2007-07-14 11:48:51 +03:00
unknown
0b4041f311 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge
2007-07-02 13:54:27 +02:00
unknown
e59c1f5dd4 bug#29099 - slow backup for disk data
- implement read ahead during disk data scan


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  maximum read ahead
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  maximum read ahead should not be larger than page buffer size
  maximum aslo set to 32 pages
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  read ahead for disk data scan
storage/ndb/src/kernel/blocks/pgman.cpp:
  set higher max_io_waits for read ahead
  round off upwards in page_buffer size
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  add null callback to be used for read ahead (no callback needed)
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  add null callback to be used for read ahead (no callback needed)
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  remove the debug trace, not needed any more
storage/ndb/test/tools/hugoFill.cpp:
  allow setting database in hugoFill
2007-06-14 16:10:13 +02:00
unknown
45cd100167 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca


storage/ndb/src/common/transporter/Packer.cpp:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  manual merge
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  manual merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  manual merge
2007-05-30 17:30:18 +02:00
unknown
4efc39f9aa Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
2007-05-29 07:20:32 +02:00
unknown
34cbf35e67 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/test/run-test/daily-basic-tests.txt:
  merge
2007-05-29 07:18:44 +02:00
unknown
7cbf613d6c Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  manual merge
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  manual merge
2007-05-28 16:06:34 +02:00
unknown
746ee8f83f Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/src/common/transporter/Packer.cpp:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge
2007-05-18 10:00:10 +02:00
unknown
efa9faf2b7 ndb - bug#20535
set null bits on delete+insert


storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  set null bits on delete+insert
storage/ndb/test/ndbapi/testBasic.cpp:
  set null bits on delete+insert
  20535
storage/ndb/test/run-test/daily-basic-tests.txt:
  testcase
2007-05-08 14:59:57 +02:00
unknown
2df58d26e8 ndb - force var part, part III
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Fix forceVarPart also for ordered indexes
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Add new table flag
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  set null ref in case of force var part
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  add varref also for force var part
storage/ndb/test/src/NDBT_Tables.cpp:
  "randomly" set forcevart on NDBT tables
2007-04-30 09:02:52 +02:00
unknown
7e42f6b430 remove compiler warning 2007-04-26 13:56:09 +02:00
unknown
3854e64310 WL#1190 preparatory work needed for compatability with future online add column
sql/ha_ndbcluster.cc:
  WL#1190 preparatory work needed for compatability with future online add column
  - make forcing of var part reference into ndb storage default, may be overridden by table setting ROW_FORMAT=FIXED
mysql-test/r/ndb_row_format.result:
  New BitKeeper file ``mysql-test/r/ndb_row_format.result''
mysql-test/t/ndb_row_format.test:
  New BitKeeper file ``mysql-test/t/ndb_row_format.test''
2007-04-26 13:36:51 +02:00
unknown
a8fef66872 Merge bk-internal:/home/bk/mysql-5.1-telco-gca
into  ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca


storage/ndb/test/include/HugoOperations.hpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/src/HugoOperations.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBasic.cpp:
  SCCS merged
2007-04-25 20:45:48 +02:00
unknown
7f48dfa007 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/test/tools/Makefile.am:
  merge
2007-04-25 18:02:40 +02:00
unknown
88a10dbaf3 Merge ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca-bug28073
into  ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca


storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
2007-04-25 15:21:05 +02:00
unknown
4ea948c5c9 Merge ymer.(none):/usr/local/mysql/mysql-5.0-telco-gca
into  ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca


storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Manual merge.
2007-04-25 15:18:34 +02:00
unknown
ca532914fd BUG#28073: Infinite loop in lock queue.
In a certain code path the NDBD could loop infinitely in the lock queue.


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Fix infinite loop.
storage/ndb/test/include/HugoOperations.hpp:
  Add optional hinting of TC for new transactions.
storage/ndb/test/ndbapi/testBasic.cpp:
  Add test case.
storage/ndb/test/run-test/daily-basic-tests.txt:
  Add test case.
storage/ndb/test/src/HugoOperations.cpp:
  Add optional hinting of TC for new transactions.
2007-04-25 14:38:05 +02:00
unknown
21fe947986 new ndb tool to measure replication latency
BitKeeper/etc/ignore:
  Added storage/ndb/test/tools/rep_latency storage/ndb/test/ndbapi/testIndexStat storage/ndb/test/ndbapi/testInterpreter storage/ndb/ndbapi-examples/mgmapi_logevent/mgmapi_logevent storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2 storage/ndb/ndbapi-examples/ndbapi_async/ndbapi_async storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1 storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event storage/ndb/ndbapi-examples/ndbapi_retries/ndbapi_retries storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple storage/ndb/ndbapi-examples/ndbapi_simple_dual/ndbapi_simple_dual storage/ndb/ndbapi-examples/ndbapi_simple_index/ndbapi_simple_index to the ignore list
storage/ndb/test/tools/rep_latency.cpp:
  New BitKeeper file ``storage/ndb/test/tools/rep_latency.cpp''
2007-04-23 20:27:43 +02:00
unknown
e8e7b7c0b4 simple extend of listen_event to do apply on remote cluster 2007-04-23 19:18:46 +02:00
unknown
42c844592e ndb -
add new functions for (easier) using NdbRestarter


storage/ndb/test/include/NdbRestarter.hpp:
  add new functions for (easier) using NdbRestarter
2007-04-23 15:48:06 +02:00
unknown
e14bcb8ada ndb -
add (auto) testcase for bug#28023


storage/ndb/test/ndbapi/testNodeRestart.cpp:
  add testcase for bug#28023
storage/ndb/test/run-test/daily-basic-tests.txt:
  add testcase for bug#28023
2007-04-23 15:38:06 +02:00
unknown
80b532e20e ndb - bug#27756
make sure that copy tuple is released in all cases


storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  make sure that copy tuple is released in all cases
storage/ndb/test/run-test/daily-basic-tests.txt:
  add testcase
2007-04-12 15:55:39 +02:00
unknown
52295cea53 ndb - bug#27756
testcase only
  new pseudo column NDB$COPY_ROWID


storage/ndb/include/kernel/AttributeHeader.hpp:
  Add new pseudo column for reading location of copy tuple
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Add new pseudo column for reading location of copy tuple
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Add new pseudo column for reading location of copy tuple
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Add new pseudo column for reading location of copy tuple
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Add new pseudo column for reading location of copy tuple
storage/ndb/test/ndbapi/testBasic.cpp:
  add testcase for bug#27756
2007-04-12 11:47:38 +02:00
unknown
01d6b13c8b ndb - hugo - add new method for setting primary key(s)
storage/ndb/test/include/HugoOperations.hpp:
  Add method for setting of primary key
storage/ndb/test/src/HugoAsynchTransactions.cpp:
  Add method for setting of primary key
storage/ndb/test/src/HugoOperations.cpp:
  Add method for setting of primary key
storage/ndb/test/src/HugoTransactions.cpp:
  Add method for setting of primary key
2007-04-12 11:43:56 +02:00
unknown
05285a62ae ndb -
add event log listener test tool


storage/ndb/test/tools/Makefile.am:
  add event log listener test tool
storage/ndb/test/tools/log_listner.cpp:
  New BitKeeper file ``storage/ndb/test/tools/log_listner.cpp''
2007-04-10 10:27:02 +02:00
unknown
59ce334d45 ndb -
reformat code a bit to be more compiler friendly


storage/ndb/test/src/NdbRestarts.cpp:
  more verbosity
2007-03-27 16:15:22 +02:00
unknown
6da1cec052 ndb - bug#27466 nf during nr can leave cluster in inconsistent state (recommit in 5.1)
Fix race condition between NODE_FAILREP and local INCL_NODEREQ loop
    Also retry on ZNODE_START_DISALLOWED_ERROR



storage/ndb/include/kernel/signaldata/StartPerm.hpp:
  Move error code
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  new error code
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Move error code
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
      1) retry also on ZNODE_START_DISALLOWED_ERROR
      2) Change if() else in INCL_NODECONF to for-loop instead
      3) (last but not least) fix bug, that could cause different block withing same node to have different opinion about node status
         solution is to check if node is still alive before sening next local INCL_NODEREQ
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
      Add error insert to allow node to die during INCL_NODEREQ
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
      1) let suma be well behaved (i.e reply to INCL_NODEREQ)
      2) Add dump to print c_connceted_nodes/c_subscriber_nodes (8010)
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  new testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
  new testcase
2007-03-27 14:27:43 +02:00
unknown
c2bb8446bc ndb - fix test prg 2007-03-22 11:17:57 +01:00
unknown
d0942af8e0 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
2007-03-20 16:32:11 +01:00
unknown
7856482c4f ndb - test_event
Fix compile error with gcc4


storage/ndb/test/ndbapi/test_event.cpp:
  Fix compile error with gcc4
2007-03-19 14:51:17 +01:00
unknown
75bd09a665 ndb - bug#20185
Fix race in testprg...causing random TC crashes


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  remove incorrect work-around
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Fix race in testprg...causing random TC crashes
2007-03-19 12:31:23 +01:00
unknown
fbb955d725 ndb - autotest
increase some timeouts...


storage/ndb/test/run-test/daily-devel-tests.txt:
  increase timeouts...
2007-03-19 11:13:10 +01:00
unknown
c0f28669cb ndb - bug#27169
Fix bug in SUMA::resend_bucket which could cause mysqld to crash


storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Remove *len* part from sz,
    or an extra word will be sent (sometimes) which will cause event-api barf
storage/ndb/test/ndbapi/test_event.cpp:
  test prg for bug#27169
storage/ndb/test/run-test/daily-basic-tests.txt:
  test prg for bug#27169
2007-03-15 13:30:42 +01:00
unknown
442595da47 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/test/src/UtilTransactions.cpp:
  Auto merged
2007-03-15 11:06:01 +01:00
unknown
44e5052f76 ndb -
fix test_event -n EventOperationApplier


storage/ndb/test/ndbapi/test_event.cpp:
  fix potential race
storage/ndb/test/src/HugoCalculator.cpp:
  genrate longer varsize keys
2007-03-15 07:08:15 +01:00
unknown
ee05abd661 ndb - bug#27005
Handle API failure during resend
    API failure could cause release of table object, which will make resend crash
      when dereferencing table object
      
    Solution, use table_id+hash+schemaversion instead of *raw* pointer in resend



storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Handle API failure during resend
  API failure could cause release of table object, which will make resend crash
    when dereferencing table object
        
  Solution, use table_id+hash+schemaversion instead of *raw* pointer in resend
storage/ndb/test/tools/listen.cpp:
  add new events
2007-03-14 15:37:47 +01:00
unknown
10f55b029e ndb - bug#27003
merge to 5.1, adopt testprg to optimized node recovery


storage/ndb/include/kernel/signaldata/LqhKey.hpp:
  Add Restore as friend
storage/ndb/src/kernel/blocks/restore.cpp:
  Give proper error message on LQHKEYREF
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  post merge fix, adopt to optimized node recovery...
2007-03-13 12:38:47 +01:00
unknown
ecaf9b73ff Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  merge
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  merge
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  merge
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
2007-03-13 12:07:33 +01:00
unknown
a50426e12b Merge localhost:/home/jonas/src/51-work
into  eel.(none):/home/jonas/src/51-work
2007-02-21 16:44:39 +01:00
unknown
e6db379e46 ndb -
write testcase for bug#26450...
  no solution however...


storage/ndb/test/ndbapi/testNodeRestart.cpp:
  write testcase for bug#26450...
  no solution however...
2007-02-20 20:33:53 +01:00
unknown
41b7a60df4 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/test/ndbapi/testBitfield.cpp:
  Auto merged
2007-02-20 00:58:25 +01:00
unknown
70a9812d8a Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/test/ndbapi/testBitfield.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge
2007-02-19 22:53:17 +01:00
unknown
cb3b2a36be Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/test/src/NdbRestarter.cpp:
  Auto merged
storage/ndb/test/include/NdbRestarter.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  merge
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  merge
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  merge
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge
2007-02-19 21:19:21 +01:00
unknown
a9fa137dfa Changed Dictionary::Table::setTablespace/getTablespace to setTablespaceName/getTablespaceName 2007-01-16 09:19:41 +01:00
unknown
f3488d3a69 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/include/kernel/NodeInfo.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Auto merged
storage/ndb/include/ndb_version.h.in:
  Auto merged
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/SumaInit.cpp:
  Auto merged
storage/ndb/src/kernel/vm/GlobalData.hpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
2007-01-11 21:13:17 +01:00
unknown
7989949648 fix merge error 2007-01-11 21:06:36 +01:00