Commit graph

992 commits

Author SHA1 Message Date
unknown
faac0f1d1b ndb -
remove copy/paste method in NdbIndexOperation


storage/ndb/include/ndbapi/NdbIndexOperation.hpp:
  remove reduntant method
storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
  remove redundant method
2007-01-30 19:28:32 +01:00
unknown
1425684ee7 ndb - minor style fixes
storage/ndb/src/ndbapi/Ndb.cpp:
  Fix usage of correct types internally to ndbapi
storage/ndb/test/ndbapi/testBlobs.cpp:
  minor fixes to testBlobs
2007-01-30 19:26:40 +01:00
unknown
80db1a2198 ndb -
two small fixes for TC
    1) use static syntax
    2) fix attlen handling in unique index


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  1) use static syntax
  2) fix attlen handling in unique index
2007-01-30 04:14:07 +01:00
unknown
52d0dbd725 ndb - Fix so that node version is recomputed at node failure
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Fix so that node version is recomputed at node failure
2007-01-28 21:56:17 +01:00
unknown
8dca186c35 ndb - bug#25794
Fix read after delete (in same op)
  - lqh, handling of attrinfo
  - tup, setup read for disk/varchar


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Dont save ATTRINFO "also" for DELETE, even when getting it in separate signal
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Add disk flag to signature
    (for read after delete)
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Do setup read before read after delete
storage/ndb/test/ndbapi/testBasic.cpp:
  testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
  testcase
2007-01-23 19:27:55 +01:00
unknown
997f63503e ndb - bug#25286
- add some sanity check to marker/hash code to see that element isnt inserted twice into hashtable
    (if defined VM_TRACE or ERROR_INSERT)

  - allow REMOVE_MARKER_ORD to fail(dont find record) in release


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  add a bunch of sanity check ifdef#vmtrace of #error_insert
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  add a bunch of sanity check ifdef#vmtrace of #error_insert
2007-01-22 22:05:56 +01:00
unknown
734a3036e0 ndb - bug#25755
remove accidently left debug prinouts
2007-01-22 17:29:11 +01:00
unknown
d6ef8dd03a ndb - bug#25755
Make sure subscriber is removed from list when n_subscribers is decreased


storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Make sure subscriber is removed from list when n_subscribers is decreased
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
  Make sure subscriber is removed from list when n_subscribers is decreased
2007-01-22 17:25:49 +01:00
unknown
448edca9ac ndb - fix bug is NODE_VERSION_REP
Fix assertion in corner-case where signal isnt sent to any node


storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Fix corner-case where signal isnt sent to any node
2007-01-22 17:06:27 +01:00
unknown
b6c7fb39b2 ndb - Fix bug when sending NODE_VERSION_REP
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Fix bug when sending NODE_VERSION_REP
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Fix bug when sending NODE_VERSION_REP
2007-01-20 03:01:37 +01:00
unknown
4e055f3f3c ndb - bug#19645
fix some more sp100 hang cases


storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  let suma know of API_FAILREQ even if not connected, to handle startme/handover 
    problem
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  some error inserts
  + resend API_FAILREQ during handover
2007-01-19 17:01:52 +01:00
unknown
6d7c9d8641 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/common/util/ConfigValues.cpp:
  Auto merged
2007-01-19 15:00:49 +01:00
unknown
7b184fa9dc Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/include/portlib/NdbMem.h:
  Auto merged
storage/ndb/src/common/portlib/NdbMem.c:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Configuration.hpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  merge
2007-01-17 21:23:59 +01:00
unknown
1508bd490b ndb - bug#25636
additional fix after autotest
  dont send start_fragreq to temporary tables such as ordered indexes...


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  dont send START_FRAGREQ to temporary tables (such as ordered indexes)
2007-01-16 18:58:43 +01:00
unknown
9ec05de3df ndb - bug#25636
Fix DD problem during NR after 3 missed LCP's


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Send START_FRAGREQ also for fragments wo/ LCP
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  inform TUP that no LCP is restored (if no lcp is restored :-)
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  inform TUP that no LCP is restored (if no lcp is restored :-)
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  inform TUP that no LCP is restored (if no lcp is restored :-)
storage/ndb/src/kernel/blocks/pgman.cpp:
  Add error insert using dump
2007-01-15 21:03:39 +01:00
unknown
6226586c46 ndb - bug#25587
fix not aligned or non 32-bit values in "smart" scan


mysql-test/r/ndb_partition_key.result:
  testcase
mysql-test/t/ndb_partition_key.test:
  ndb - bug
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Fix unaligned or non-32-bit values in "smart scan"
2007-01-12 15:48:47 +01:00
unknown
7989949648 fix merge error 2007-01-11 21:06:36 +01:00
unknown
d84d59b7af Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge
2007-01-11 21:02:38 +01:00
unknown
e5eee3fa11 ndb - bug#25468
handle partially transfered LCP_FRAG_REP after node failure
  recommit to 51-work


storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  handle partially transfered LCP_FRAG_REP after node failure
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  handle partially transfered LCP_FRAG_REP after node failure
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
  testcase
2007-01-10 20:50:19 +01:00
unknown
f0b5082569 ndb - bug#25329
extra sledge hammer, (real 51)
  use dicklock to prevent SUB_START_REQ during node recovery


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  use dicklock to prevent SUB_START_REQ during node recovery
2007-01-04 11:13:19 +01:00
unknown
db00700394 ndb - recommit extra version info to real-51
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  add extra version info to main clone
storage/ndb/include/kernel/NodeInfo.hpp:
  add extra version info to main clone
storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp:
  add extra version info to main clone
storage/ndb/include/ndb_version.h.in:
  add extra version info to main clone
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  add extra version info to main clone
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  add extra version info to main clone
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  add extra version info to main clone
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  add extra version info to main clone
storage/ndb/src/kernel/vm/GlobalData.hpp:
  add extra version info to main clone
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  add extra version info to main clone
2007-01-04 10:59:12 +01:00
unknown
3f8ab08bd3 ndb - bug#25329
Fix most obvious error in dict/suma error handling of events


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Fix most obvious error in dict/suma error handling of events
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Fix most obvious error in dict/suma error handling of events
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Fix most obvious error in dict/suma error handling of events
storage/ndb/src/kernel/blocks/suma/SumaInit.cpp:
  Fix most obvious error in dict/suma error handling of events
2007-01-04 10:03:11 +01:00
unknown
61fd9c3b46 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  merge
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  merge
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge
2007-01-03 06:47:23 +01:00
unknown
c632e93e61 merge fix 2006-12-15 17:12:41 +01:00
unknown
c5301c5ac2 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
storage/ndb/test/ndbapi/testIndex.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/ndbapi/testBasic.cpp:
  merge
2006-12-15 16:57:43 +01:00
unknown
f62bab2241 ndb - bug#24949
make sure not too poll to long, in case of hb-failure of last db-node


storage/ndb/src/ndbapi/Ndbif.cpp:
  Make sure not to poll too long
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Make sure not to poll too long
2006-12-12 16:21:06 +01:00
unknown
5a6e23bcfa ndb - bug#25001
make sure DISK flag is set on DATA column for blob table


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  maek sure DISK flag is set on DATA column fro blob table
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  maek sure DISK flag is set on DATA column fro blob table
2006-12-12 13:09:20 +01:00
unknown
bbb256769a ndb - style
split assignment into 2 lines


storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  remove bad assignment
2006-12-12 13:07:22 +01:00
unknown
231483d90f ndb - bug#24664
Fix in bug fix, make sure LCP_SKIP is only used for inserts...


storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Make sure LCP_SKIP is only used for inserts
2006-12-11 16:18:34 +01:00
unknown
0372d3b0a4 ndb - bug#24917
storage/ndb/src/kernel/blocks/lgman.cpp:
  Hande LCP= 0 specially
2006-12-08 17:21:29 +01:00
unknown
eff21a028d ndb - bug#24914
Fix start transaction with hint from ndbapi


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Fix fragments array for API
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Fix fragments array for API
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Fix fragments array for API
2006-12-08 16:15:59 +01:00
unknown
3806777d8b ndb - bug#21948
Fix bug in previous changeset...causing SR problems with disk


storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  fix some more strict-aliasing problems
storage/ndb/src/kernel/blocks/tsman.cpp:
  Fix newly introduced bug
2006-12-08 10:24:48 +01:00
unknown
dcc08d2d70 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
storage/ndb/src/kernel/blocks/lgman.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
2006-12-07 15:25:40 +01:00
unknown
1121ca8f29 ndb - bug#21948 & bug#17605
fix alloc/free extent in undo log
  allow extent to be reused once a lcp is finished (instead of when next lcp starts)


storage/ndb/include/kernel/signaldata/Extent.hpp:
  Add lsn to alloc extent
storage/ndb/src/kernel/blocks/diskpage.hpp:
  Add (unused) undo entries for drop table, and alloc/free extent
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Notify TSMAN of both start and stop of LCP
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  1) Add unused undo entries for drop table, alloc/free extent
  2) handle create_table better (correct?) in undo log
  3) fix some typos/style
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  1) Add unused undo entries for drop table, alloc/free extent
  2) handle create_table better (correct?) in undo log
  3) fix some typos/style
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  fix style
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  fix typo/style
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Make sure regFragPtr.p->m_logfile_group_id = RNIL is applicable
storage/ndb/src/kernel/blocks/lgman.cpp:
  Add m_logfile_group_id to log callback
storage/ndb/src/kernel/blocks/print_file.cpp:
  Add (unused) undo entries for drop table, and alloc/free extent
storage/ndb/src/kernel/blocks/tsman.cpp:
  1) change so that LCP limit on resuse of extent is only for duration of lcp
  2) refactor so lookup_extent is put into subroutine
storage/ndb/src/kernel/blocks/tsman.hpp:
  refactor so lookup_extent is put into subroutine
2006-12-07 15:25:02 +01:00
unknown
ca9673284f ndb - add support for periodic mem-reporting
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Add new config paramemter
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  add support for periodic mem-reporting
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  add support for periodic mem-reporting
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  add support for periodic mem-reporting
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  add support for periodic mem-reporting
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  add support for periodic mem-reporting
2006-12-06 14:38:32 +01:00
unknown
3ef5e410d7 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
2006-12-06 13:28:13 +01:00
unknown
11964cdfba Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
2006-12-06 13:10:00 +01:00
unknown
ea9bb5db59 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
2006-12-05 22:45:17 +01:00
unknown
4e24154eee ndb - bug#24664
1) run lcp snapshot for both MM and DD tables (so I dont have to change restore to use WRITE)
  2) fix >= and > bug in lcp skip/keep handling
  3) very cool test prog for this :-)


storage/ndb/include/kernel/signaldata/BackupContinueB.hpp:
  Add new error insert
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Add new error insert
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Add new error insert
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  1) get >= and > correct for lcp keep/skip
  2) always run lcp snapshot impl. (previously only for dd tables)
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  1) get >= and > correct for lcp keep/skip
  2) always run lcp snapshot impl. (previously only for dd tables)
storage/ndb/test/ndbapi/testSystemRestart.cpp:
  add testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
  add testcase
2006-12-05 15:10:56 +01:00
unknown
7f113e91a5 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


mysql-test/r/ndb_update.result:
  Auto merged
mysql-test/r/type_varchar.result:
  Auto merged
mysql-test/t/type_varchar.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
storage/ndb/src/common/util/socket_io.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
storage/ndb/src/common/util/File.cpp:
  Merge
storage/ndb/src/common/util/InputStream.cpp:
  Merge
2006-12-05 09:38:12 +01:00
unknown
61956dd5fe ndb - bug#24166
SR crash if table with disk with hidden primary key...


storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  fix bug 24166
2006-12-04 10:06:51 +01:00
unknown
2a2f219c02 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


configure.in:
  Auto merged
client/mysqldump.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/ndb/include/util/OutputStream.hpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
2006-12-01 21:12:13 +01:00
unknown
a47ef7fcb2 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
2006-12-01 16:44:50 +01:00
unknown
08f598a144 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
2006-12-01 16:37:13 +01:00
unknown
85b58cb43b Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema 2006-12-01 15:49:07 +01:00
unknown
10a497a623 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
2006-12-01 14:06:15 +01:00
unknown
3a7bb77df5 ndb - bug#24655
Handle events "differently" so that dict doesnt get lock too often


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Handle event separatly as they dont set block_state :-(
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Handle event separatly as they dont set block_state :-(
storage/ndb/src/kernel/vm/KeyTable2.hpp:
  Handle event separatly as they dont set block_state :-(
2006-12-01 14:04:06 +01:00
unknown
cca1a6a43e Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
2006-12-01 13:58:24 +01:00
unknown
2b1df53702 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
2006-12-01 11:32:52 +01:00
unknown
fae72af5aa Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
2006-12-01 11:25:08 +01:00