Commit graph

1285 commits

Author SHA1 Message Date
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
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
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
unknown
b642e26827 ndb - bug#24717
fixes to testprogram to test new impl. in 5.1


storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  move tsman dumps
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  add more support for connection handling using dumps
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  port testprogram to 5.1 to avoid "extra" safety net in LQH
2006-12-01 11:08:53 +01:00
unknown
9a22200e42 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/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge
2006-12-01 10:33:28 +01:00
unknown
1360c57854 ndb -
fix merge error


storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  fix merge error
2006-12-01 10:29:45 +01:00
unknown
aeb2d45777 ndb - bug#24717
5.1 version
  remove 5.0 version
  add general routing signal
  send tckeyref routed if needed...


storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Add general routing signal
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Add general routing signal
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  send TCKEYREF routed if needed
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  add general routing 
  remove node started state
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  add general routing 
  remove node started state
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  add general routing 
  remove node started state
  remove "avoid sending committed read to early" as it now should be handled correctly
storage/ndb/include/kernel/signaldata/RouteOrd.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/RouteOrd.hpp''
2006-12-01 09:37:17 +01:00
unknown
e958b49e8d 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/NdbSqlUtil.cpp:
  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/dbdih/DbdihMain.cpp:
  Auto merged
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/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  merge
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  merge
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  merge
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  merge
storage/ndb/src/ndbapi/ndberror.c:
  merge
2006-12-01 09:14:12 +01:00
unknown
bfc5a0cc42 ndb - bug#24476
Fix typo that yeilded rare crash in ACC


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  fix typo, where elementptr was sent as elementheader
  yeilded very rare crashes as only 1 bit is checked
    and it's only checked under certatin rare circumstances
2006-12-01 08:54:28 +01:00
unknown
c6911d6f71 ndb - bug#24105
Handle not started nodes correctly (for X restart)
  i.e dont wait for NF_COMPLETEREP
      but settle with NODEFAIL_REP


storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Handle not started nodes correctly
  i.e dont wait for NF_COMPLETEREP
      but settle with NODEFAIL_REP
2006-11-29 13:10:14 +01:00
unknown
5c1f4b6452 ndb - bug#24544
fix so backup message is printed even in case of "ndb_mgm -e"


storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
  fix backup printer
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Fix so that backup message is printed even if "ndb_mgm -e"
storage/ndb/src/ndbapi/SignalSender.cpp:
  move method into TransporterFacade to enable API_TRACE
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  move method into TransporterFacade to enable API_TRACE
2006-11-28 15:11:13 +01:00
unknown
94069b1ddf ndb - bug#24543
Resend if master dies during alloc node id


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Add new error code
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Add new error code
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Make sure to resend if master died
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  add testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
  add testcase
2006-11-23 14:34:24 +01:00
unknown
9f8d2e5b14 ndb - no bugs number
1) Make sure not to read uninitialized data in unique index code
      harmless (atleast before dynattr)
  2) Dont update p_latest_trans_gci
      for dirty unique index lookup
  


storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Make sure not to read uninitialized data in unique index code
    harmless (atleast before dynattr)
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Dont update p_latest_trans_gci
    for dirty unique index lookup
2006-11-21 14:23:42 +01:00
unknown
d7cc8d4022 ndb - bug#24331
Make sure LCP scan record is correct initialized


storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Init ScanOp
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  And set correct pointers...
2006-11-21 14:21:11 +01:00
unknown
32510f6289 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/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/ndbapi/testScan.cpp:
  merge
2006-11-21 14:18:52 +01:00
unknown
8c806e5cf1 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/socket_io.cpp:
  Auto merged
storage/ndb/src/common/util/InputStream.cpp:
  merge
2006-11-21 11:59:21 +01:00
unknown
32034246f4 ndb - bug#24039
Make sure index scan does not commitDelete


mysql-test/r/ndb_index_ordered.result:
  testcase
mysql-test/t/ndb_index_ordered.test:
  testcase
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Make sure index scan does not commitDelete
2006-11-07 13:59:14 +01:00
unknown
ed7eb26a67 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
storage/ndb/src/common/util/socket_io.cpp:
  merge
2006-11-06 15:09:58 +01:00
unknown
2318f1bf03 ndb -
revert fix bug#21052 as it's wrong, and induces bus-error on node crashes


storage/ndb/src/mgmsrv/Services.cpp:
  revert fix bug#21052 as it's wrong, and induces bus-error on node crashes
2006-10-22 08:24:31 +02:00
unknown
d747f61072 merge 2006-10-20 16:26:40 +02:00
unknown
f4326d0215 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/include/kernel/ndb_limits.h:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  merge
2006-10-20 16:25:14 +02:00
unknown
53b1792e17 ndb - bug#23494
Fix bug in restore with table with many columns, Compute size of databuffer pool correctly
2006-10-20 14:37:34 +02:00
unknown
d54d43b61c ndb -
Add better error message if getting error in RESTORE
2006-10-20 14:36:39 +02:00
unknown
8744989469 merge 2006-10-20 14:35:22 +02:00
unknown
30c8b7bd17 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
2006-10-20 14:31:39 +02:00
unknown
f0fb0d17c2 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
2006-10-19 11:23:34 +02:00
unknown
b8812c85db ndb - add temporary tables to hugo
and use it for testOperations/testTransactions


storage/ndb/test/include/NDBT_Test.hpp:
  Add support for temporary tables in hugo
storage/ndb/test/ndbapi/testOperations.cpp:
  Make testOperations use temporary tables
storage/ndb/test/ndbapi/testTransactions.cpp:
  Make testTransactions use temporary tables
storage/ndb/test/src/NDBT_Tables.cpp:
  Add support for temporary tables in hugo
storage/ndb/test/src/NDBT_Test.cpp:
  Add support for temporary tables in hugo
2006-10-19 11:20:04 +02:00
unknown
e4a398f1d3 ndb - bug#22672
fix another incorrect assertion


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  clear m_transaction_nodes.clear()
  to avoid asserion in debug-compiled in releaseApiCon
2006-10-19 11:18:04 +02:00
unknown
a1fa0ed49b ndb - fix incorrect assertion
Dont assert when getting gci=0 in read only transaction


storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Dont assert when getting gci=0 in read only transaction
2006-10-19 10:43:25 +02:00
unknown
fdfabb82b0 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
sql/ha_ndbcluster.cc:
  merge
2006-10-19 10:29:52 +02:00
unknown
591f3194cf ndb - bug#23430
make sure not to release log buffer twice (or several times) in case of abort of multi update


storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  make sure not to release log buffer twice (or several times) in case of abort of multi update
2006-10-18 20:54:25 +02:00
unknown
245848081c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge
2006-10-18 22:23:14 +10:00
unknown
9910031cbe Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge


BitKeeper/deleted/.del-ha_berkeley.cc:
  Auto merged
BitKeeper/deleted/.del-ha_berkeley.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
storage/blackhole/ha_blackhole.cc:
  Auto merged
storage/blackhole/ha_blackhole.h:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/csv/ha_tina.h:
  Auto merged
storage/example/ha_example.cc:
  Auto merged
storage/example/ha_example.h:
  Auto merged
storage/federated/ha_federated.cc:
  Auto merged
storage/federated/ha_federated.h:
  Auto merged
storage/heap/ha_heap.cc:
  Auto merged
storage/heap/ha_heap.h:
  Auto merged
storage/myisam/ha_myisam.h:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/include/ndb_version.h.in:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  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/Configuration.cpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmclient/main.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
storage/ndb/tools/restore/restore_main.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  merge
sql/ha_ndbcluster.h:
  merge
sql/handler.h:
  merge
sql/sql_delete.cc:
  merge
storage/archive/ha_archive.h:
  merge
storage/innobase/handler/ha_innodb.cc:
  merge
storage/innobase/handler/ha_innodb.h:
  merge
storage/myisam/ha_myisam.cc:
  merge
storage/myisammrg/ha_myisammrg.h:
  merge
2006-10-18 18:51:39 +10:00
unknown
c2e8969a8a Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug21253
2006-10-18 18:41:43 +10:00
unknown
7968c44c0e Bug #19148 Backup causes cluster down if _really_ early abort happens
Early abort, failing to allocate buffers, would go down the abort track and
 end up trying to sendDropTriggers (as the standard stop backup does). 
However, it is possible to not have any tables yet defined in the backup 
(due to allocating buffers is before this). Simple check in sendDropTrig 
(and continue to next step). Files may be open, so we continue to close them.

Also updated ERROR_Codes (and added one to test this bug).


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  update BACKUP error insert codes to reflect current reality.
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Allow for early abort when no tables have been included in backup.
  
  Allow for abort when file records have been seized but not yet allocated
  to specific uses (is the case when buffer allocation fails)
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  initialize BackupRecord file Ptrs
storage/ndb/test/src/NdbBackup.cpp:
  Add extra failure codes for buffer allocation failure in backup
2006-10-18 18:19:16 +10:00
unknown
afc81b7e37 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug21191
2006-10-16 11:44:53 +02:00
unknown
4154eb9abe BUG#21253 NdbApi.h should not include my_config.h
config/ac-macros/ha_ndbcluster.m4:
  re-introduce NDB_SIZEOF substitutions to prevent NdbApi depending on my_config
  which causes problems for autotools enabled ndbapi programs
storage/ndb/include/ndb_types.h.in:
  remove dependency on my_config.h that was causing problems for ndbapi programs
  using autoconf
2006-10-16 17:01:01 +10:00
unknown
44520da500 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug21191


sql/mysqld.cc:
  Auto merged
2006-10-15 12:11:52 +02:00
unknown
405c3c9abd DictTabInfo.cpp:
Fix for bug#23169 - memset param switching


storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  Fix for bug#23169 - memset param switching
2006-10-14 00:42:39 +02:00
unknown
3511385c1a fix merge problem 2006-10-13 13:54:47 +02:00
unknown
1b7ac27397 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  merge
2006-10-13 12:13:09 +02:00
unknown
2e3ee93de9 Merge willster.(none):/home/stewart/Documents/MySQL/5.1/main
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
2006-10-13 15:12:57 +10:00
unknown
38edc8ad72 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/dbdih/DbdihMain.cpp:
  Auto merged
2006-10-12 19:01:15 +02:00
unknown
38910a8637 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
2006-10-12 18:58:52 +02:00
unknown
4d0b243578 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/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  merge
2006-10-12 14:09:03 +02:00
unknown
e1f52e72a6 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
2006-10-11 05:16:50 +02:00
unknown
c34940a078 Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge


include/my_sys.h:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
2006-10-10 21:59:23 +02:00
unknown
ef0ee7642a 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/tools/restore/restore_main.cpp:
  Auto merged
2006-10-10 15:27:47 +02:00
unknown
ff604cb77c ndb -
ndb_restore Return OK even if temporary errors
    (otherwise mysql-test-run/ndb_restore can fail on really slow machines)


storage/ndb/tools/restore/restore_main.cpp:
  Return OK even if temporary errors
2006-10-10 15:26:39 +02:00