Commit graph

3085 commits

Author SHA1 Message Date
unknown
beb24fbdeb Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2006-09-01 10:32:12 +02:00
unknown
efeafb2536 Fix for BUG#21345, Error in cluster logfile rotation.
Fixed the cluster logfile rotation code, let the cluster logfile be renamed correctly when the main logfile exceeds the configured maximum size.


ndb/include/util/File.hpp:
  Fix for BUG#21345, Error in cluster logfile rotation.
ndb/src/common/logger/FileLogHandler.cpp:
  Fix for BUG#21345, Error in cluster logfile rotation.
ndb/src/common/util/File.cpp:
  Fix for BUG#21345, Error in cluster logfile rotation.
2006-09-01 15:32:40 +08:00
unknown
0afd6f1a3b Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-ndb-bj
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-21345
2006-09-01 10:05:55 +08:00
unknown
20dbceb616 make DNS based hostname queries work (bug #17582) 2006-08-30 20:45:43 +02:00
unknown
49d46e0cc0 merge from ndb-5.0-ndb and ndb-5.0-ndb-bj
ndb/src/mgmclient/CommandInterpreter.cpp:
  connect() function adds a parameter in CommandInterpreter.cpp.
2006-08-29 13:31:29 +08:00
unknown
25968b7bd2 BUG#19873 Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0-ndb-bj
into  dev3-127.(none):/mnt/mysql/home/ngb/bug19873


ndb/src/mgmclient/CommandInterpreter.cpp:
  ndb_mgm can automatically reconnect to the ndb_mgmd after ndb_mgmd restarted.
  and this commit fixes probable mem leak
2006-08-29 11:22:02 +08:00
unknown
fd1b3e91ca Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0-ndb-bj


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
2006-08-29 10:59:43 +08:00
unknown
4adef258f3 Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-4.1/bug-21345
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-21345


ndb/include/util/File.hpp:
  Auto merged
ndb/src/common/util/File.cpp:
  Auto merged
2006-08-29 10:41:07 +08:00
unknown
458cc4b9ac Fix for bug #21345: Error in cluster logfile rotation.
Fixed the cluster logfile rotation code, let the cluster log file be renamed correctly when the main log file exceeds the configured maximum size.


ndb/include/util/File.hpp:
  Fix for bug #21345: Error in cluster logfile rotation.
ndb/src/common/logger/FileLogHandler.cpp:
  Fix for bug #21345: Error in cluster logfile rotation.
ndb/src/common/util/File.cpp:
  Fix for bug #21345: Error in cluster logfile rotation.
2006-08-29 09:55:07 +08:00
unknown
a8e10dde7a Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/mysql-5.0-ndb-bj


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
2006-08-28 16:18:48 +00:00
unknown
b931e3ebad ndb - bug#21615
Improve error message when detecting corrupted REDO log


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Improve error message when detecting corrupted REDO log
2006-08-28 10:26:21 +02:00
unknown
84f393f7cc Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
2006-08-24 07:18:04 +02:00
unknown
5d82bec5b8 ndb - bug#21800
read TransactionDeadlockTimeout (for scans) to cater for insane settings


ndb/src/ndbapi/NdbScanOperation.cpp:
  read TransactionDeadlockTimeout to cater for insane settings
2006-08-24 07:14:46 +02:00
unknown
c251e8a864 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2006-08-23 11:00:29 +02:00
unknown
91c28dafb9 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-bug21017
2006-08-22 14:58:38 +02:00
unknown
1c031c9b48 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb
2006-08-22 11:11:20 +02:00
unknown
74aca9aa6e ndb - bug#18781 bug#21017 bug#21050 : block index ops during NR + fix asserts
ndb/src/kernel/vm/DLHashTable2.hpp:
  add isEmpty for use in DICT
ndb/test/include/NDBT_Tables.hpp:
  getIndexes - return index cols of standard test table
ndb/test/src/NDBT_Tables.cpp:
  getIndexes - return index cols of standard test table
ndb/test/ndbapi/testDict.cpp:
  bug#21017: index create/drop during NR
ndb/include/kernel/signaldata/CreateIndx.hpp:
  add 711
ndb/include/kernel/signaldata/DropIndx.hpp:
  add 711
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  block index create/drop during NR.
  fix 2 ndbrequires by checking exact schema op types
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  block index create/drop during NR.
  fix 2 ndbrequires by checking exact schema op types
2006-08-18 09:56:52 +02:00
unknown
91548a19d2 BUG#19620 ndb_mgm help needs help
ndb/src/mgmclient/CommandInterpreter.cpp:
  help information more canonical
2006-08-16 17:48:49 +08:00
unknown
b7ff02a5f7 Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0-ndb-bj
into  dev3-127.(none):/mnt/mysql/home/ngb/bug19620


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
2006-08-16 17:48:45 +08:00
unknown
2bc3096111 Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21052


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
2006-08-16 09:48:43 +00:00
unknown
3cca8f5b4c BUG#19873 Running any command in ndb_mgm can automatically reconnect the server after restarting the ndb_mgmd.
connect command in the ndb_mgm can connect or reconnect the management server successfully


ndb/src/mgmclient/CommandInterpreter.cpp:
  1.After restarting the ndb_mgmd, running any command in ndb_mgm will automatically reconnect the server firstly.
  2.The connect command in the ndb_mgm can connect or reconnect the management server successfully.
2006-08-16 16:02:13 +08:00
unknown
105ed9dec3 BUG#21671 memory leak for mgmapi event listeners
fixes the following valgrind warning (when running ndb_mgm under valgrind,
or, indeed any other mgmapi program listening to events):

==23291== 190 (20 direct, 170 indirect) bytes in 1 blocks are definitely lost in loss record 13 of 22
==23291==    at 0x401C895: operator new(unsigned) (vg_replace_malloc.c:163)
==23291==    by 0x8075300: ParserImpl::run(Parser<ParserImpl::Dummy>::Context*, Properties const**, bool volatile*) const (Parser.cpp:178)
==23291==    by 0x806D09B: Parser<ParserDummy>::parse(Parser<ParserDummy>::Context&, ParserDummy&) (Parser.hpp:219)
==23291==    by 0x80671C4: ndb_mgm_call(ndb_mgm_handle*, ParserRow<ParserDummy> const*, char const*, Properties const*) (mgmapi.cpp:355)
==23291==    by 0x806AB79: ndb_mgm_listen_event_internal(ndb_mgm_handle*, int const*, int) (mgmapi.cpp:1419)
==23291==    by 0x806AC1F: ndb_mgm_listen_event (mgmapi.cpp:1434)
==23291==    by 0x805EB5D: event_thread_run(void*) (CommandInterpreter.cpp:467)
==23291==    by 0x806F70A: ndb_thread_wrapper (NdbThread.c:68)
==23291==    by 0x4042340: start_thread (in /lib/tls/i686/cmov/libpthread-2.3.6.so)
==23291==    by 0x429D4ED: clone (in /lib/tls/i686/cmov/libc-2.3.6.so)


ndb/src/mgmapi/mgmapi.cpp:
  fix memory leak for mgmapi event listeners (1 per connect)
  
  (missing delete of reply Properties object returned by ndb_mgm_call)
2006-08-16 14:39:27 +08:00
unknown
60a0e3d0dd BUG#21670 memory leak in ndb_mgm -e show
fix the following valgrind warning when running ndb_mgm -e show (leak only in client)

==20398== 14,596 (11,936 direct, 2,660 indirect) bytes in 4 blocks are definitely lost in loss record 24 of 25
==20398==    at 0x401C4A1: malloc (vg_replace_malloc.c:149)
==20398==    by 0x80797A3: ConfigValuesFactory::create(unsigned, unsigned) (ConfigValues.cpp:309)
==20398==    by 0x8079F03: ConfigValuesFactory::expand(unsigned, unsigned) (ConfigValues.cpp:325)
==20398==    by 0x8079967: ConfigValuesFactory::put(ConfigValues::Entry const&) (ConfigValues.cpp:414)
==20398==    by 0x807A7B6: ConfigValuesFactory::unpack(void const*, unsigned) (ConfigValues.cpp:701)
==20398==    by 0x806CB9D: ConfigValuesFactory::unpack(UtilBuffer const&) (ConfigValues.hpp:252)
==20398==    by 0x8069160: ndb_mgm_get_configuration (mgmapi.cpp:1941)
==20398==    by 0x8060661: CommandInterpreter::executeShow(char*) (CommandInterpreter.cpp:1242)
==20398==    by 0x8063966: CommandInterpreter::execute_impl(char const*) (CommandInterpreter.cpp:715)
==20398==    by 0x8064040: CommandInterpreter::execute(char const*, int, int*) (CommandInterpreter.cpp:625)
==20398==    by 0x8064189: Ndb_mgmclient::execute(char const*, int, int*) (CommandInterpreter.cpp:203)
==20398==    by 0x805E56C: read_and_execute(int) (main.cpp:124)
==20398==    by 0x805E754: main (main.cpp:162)
==20398==


ndb/src/mgmclient/CommandInterpreter.cpp:
  correctly free (destroy) the configuration fetched for show
2006-08-16 14:33:31 +08:00
unknown
3d3641a86a BUG#21052 Modify error message when backup is aborted
ndb/src/mgmclient/CommandInterpreter.cpp:
  Modify error message from "Start of backup failed" to "Backup failed" when backup is aborted
ndb/src/mgmsrv/Services.cpp:
  Append error message when error event occour
ndb/src/ndbapi/ndberror.c:
  Mofidy error message from "Backup aborted by applicaton" to "Backup aborted by user request"
2006-08-15 18:32:50 +00:00
unknown
1fca354904 Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/mysql-5.0-ndb-bj


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
2006-08-15 18:12:49 +00:00
unknown
0c3b40800b BUG#19620 ndb_mgm help needs help
ndb/src/mgmclient/CommandInterpreter.cpp:
  Help command has added for each command inside the ndb_mgm.
2006-08-15 21:01:50 +08:00
unknown
1722438c56 Bug#19047, not start the event thread when ndb_mgm is running in executing (-e) thread.
ndb/src/mgmclient/CommandInterpreter.cpp:
  Not start event thread when ndb_mgm client is running in executing (-e) mode.
ndb/src/mgmclient/main.cpp:
  Not start event thread when ndb_mgm is runing in executing (-e) mode.
ndb/src/mgmclient/ndb_mgmclient.hpp:
  Not start event thread when ndb_mgm is running in executing (-e) mode.
2006-08-15 20:26:47 +08:00
unknown
115eb7df2e Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0


mysql-test/r/ndb_lock.result:
  Auto merged
mysql-test/t/ndb_lock.test:
  Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
  Merge
sql/ha_ndbcluster.cc:
  Merge
sql/ha_ndbcluster.h:
  Merge
2006-08-15 13:37:39 +02:00
unknown
e757e5ad99 Merge dli@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  dev3-76.dev.cn.tlan:/home/lisj/mysql/mysql-5.0/mysql-5.0-ndb-bj


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
2006-08-15 19:14:12 +08:00
unknown
87b7363c5c ndb_lock.test, ndb_lock.result:
bug #18184  SELECT ... FOR UPDATE does not work..: New test case
ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp:
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);


mysql-test/r/ndb_lock.result:
  bug #18184  SELECT ... FOR UPDATE does not work..: New test case
mysql-test/t/ndb_lock.test:
  bug #18184  SELECT ... FOR UPDATE does not work..: New test case
ndb/include/ndbapi/NdbConnection.hpp:
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
sql/ha_ndbcluster.cc:
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
sql/ha_ndbcluster.h:
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
2006-08-15 13:12:27 +02:00
unknown
d8098e9f60 Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0-ndb-bj
2006-08-15 18:01:07 +08:00
unknown
f017b497dd Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0-ndb-bj


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/table.cc:
  Auto merged
2006-08-15 17:55:44 +08:00
unknown
5cafb623b7 BUG#20823 testBackup FailMaster failing
few cases not handled properly (NF occurs).


ndb/src/kernel/blocks/backup/Backup.cpp:
  Don't write fragment info if we haven't retreived any fragment info yet
  (FailMaster test 2)
      
  Go directly onto closing files if the tabPtr is RNIL (as we're in recovery)
2006-08-15 11:09:38 +08:00
unknown
25a7bd9ea5 BUG#19045, No meaningfull error message when defining too many nodes
ndb/src/mgmsrv/ConfigInfo.cpp:
  add maximum node number judging in transformNode
ndb/src/mgmsrv/MgmtSrvr.cpp:
  if configure filename isnot null, display it
2006-08-14 18:33:41 +08:00
unknown
d0bd26886c Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
2006-08-14 11:55:13 +02:00
unknown
3d7cb87b00 ndb - bug#21536
Make sure updateNodeInfo is run on master also for temporary tables


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Run update nodeinfo also here to handle
    temprorary tables in some situations
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  new error insert
ndb/test/ndbapi/testSystemRestart.cpp:
  test case
2006-08-09 16:24:14 +02:00
unknown
1bd553d41b remove undeeded printing of newline.
ndb/src/ndbapi/ClusterMgr.cpp:
  remove extra 'ndbout << endl'
2006-08-09 15:39:32 +08:00
unknown
7fcb36e2af BUG#13985
fixups after review by jonas


ndb/src/mgmclient/CommandInterpreter.cpp:
  Guard the print mutex when running SHOW
ndb/src/mgmsrv/MgmtSrvr.cpp:
  replace global_flag_send_heartbeat_now with forceHB()/updateStatus()
  
  don't use bitmask as parameter to forceHB to reflect reality of what the
  function does.
  
  remove get_connected_ndb_nodes() as it is no longer used
ndb/src/mgmsrv/MgmtSrvr.hpp:
  remove unused get_connected_ndb_nodes()
  
  update updateStatus prototype
ndb/src/mgmsrv/Services.cpp:
  use new prototype for updateStatus() - doesn't accept NodeBitmask
ndb/src/ndbapi/ClusterMgr.cpp:
  remove global_flag_send_heartbeat_now, replace with forceHB.
  
  compute bitmask of nodes to send HB to in forceHB
ndb/src/ndbapi/ClusterMgr.hpp:
  update prototype for forceHB, don't give the illusion that NodeBitmask means much.
2006-08-09 15:03:55 +08:00
unknown
4bf59910f7 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/main
into  willster.(none):/home/stewart/Documents/MySQL/5.0/bug13985
2006-08-08 14:40:40 +08:00
unknown
ad2a2f57da Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2006-08-08 08:00:22 +02:00
unknown
6e5ad6914e ndb - bug#21213
Make sure totSendlenAi is set in case of ACC_ABORTCONF and activeCreate == true
  (only needed when >2 replica)


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Make sure totSendlenAi is set in case of ACC_ABORTCONF and activeCreate == true
2006-08-08 07:59:52 +02:00
unknown
507fffa5c7 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/main
into  willster.(none):/home/stewart/Documents/MySQL/5.0/bug13985


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
  manually merge parameter to pass print mutex to event thread
2006-08-08 11:59:21 +08:00
unknown
78ead1feb2 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  merge
2006-08-07 09:49:46 +02:00
unknown
f4e01cf6a1 ndb - bug#18475
Fix error message on copyfragref


ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Fix error message
2006-08-07 09:41:39 +02:00
unknown
b50642e899 ndb - bug#21129
add missing function to mgmapi


ndb/src/mgmapi/ndb_logevent.cpp:
  add missing function
2006-08-04 10:30:57 +02:00
unknown
9e78bbc220 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
2006-08-04 10:16:42 +02:00
unknown
bb285b44c3 ndb - bug#21400
Fix docs for NdbOpertation::sub_reg


ndb/include/ndbapi/NdbOperation.hpp:
  Fix docs for sub_reg
2006-08-04 09:43:23 +02:00
unknown
fc1eeba8be Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
2006-08-04 08:41:50 +02:00
unknown
f287b4a8c8 ndb - bug#20296 (recommit in 4.1)
Make sure that tupkeyErrorLab is run if interpretedUpdate(fail), so that entry is not inserted into index.
     Yeilding crash on following dml on tupel



ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Make sure that tupkeyErrorLab is run if interpretedUpdate(fail), so that entry is not inserted into index.
        Yeilding crash on following dml on tupe
2006-08-04 08:41:32 +02:00
unknown
282ff5f149 ndb - bug#21384
merge 4.1->5.0 (variable rename)


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  merge #21384 4.1->5.0
    variable rename
2006-08-03 15:38:04 +02:00
unknown
d765c17530 ndb - bug#20892
Correction of bug#19852 (that also revealed another bug)
  Do grow noOfPagesToGrow with more than was actually allocated


ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Dont grow "noOfPagesToGrow" with more than was actually allocated
    (as it will then grow indefinitly)
2006-08-03 14:46:11 +02:00
unknown
fe2b9a8f76 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work
2006-08-03 14:02:39 +02:00
unknown
42fd7e8f7d ndb - bug#20892
Fix bug in tup buddy allocator, which made it make invalid access to cfreepagelist[16] (which is not defined)


ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  loop from firstListToCheck -1 (as firstListToCheck has already been checked), when looking for less than requested pages
  add if-statement for firtListToCheck == 0
2006-08-03 14:01:37 +02:00
unknown
1081dd6f0d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


configure.in:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2006-08-01 20:24:30 +02:00
unknown
2f8bc2141e Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/test/ndbapi/testIndex.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  merge
2006-08-01 17:06:02 +02:00
unknown
eb94c0c9f2 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
2006-08-01 17:04:29 +02:00
unknown
2f710b2d69 ndb - fix error message
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Fix printout
2006-08-01 17:03:17 +02:00
unknown
0752f2d52b Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/41-work


ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
2006-08-01 16:56:57 +02:00
unknown
e80d95a7d6 ndb - bug#21384
handle error in TCKEYREQ during TCINDXREQ better


ndb/src/kernel/blocks/ERROR_codes.txt:
  new error code
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Add 3 values to isIndexOp
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  handle error in TCKEYREQ during TCINDXREQ
ndb/test/ndbapi/testIndex.cpp:
  Add testcase
ndb/test/run-test/daily-basic-tests.txt:
  Add testcase
2006-08-01 16:55:41 +02:00
unknown
a3ac499a5a Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2006-08-01 16:26:22 +02:00
unknown
8509c31abb Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
2006-08-01 16:25:48 +02:00
unknown
dd27607065 Bug#16574 Patch to compile on GNU/Hurd (PATH_MAX limit not existing)
- Define MAX_PATH if not already defined by system header files.
 - Thanks to Christian for the report and patch!


ndb/include/ndb_global.h.in:
  PATH_MAX is defined in ndb_global.h for "sco", remove the conditional define for sco
  so it thakes effect as soon as MAX_PATH is not available
2006-07-26 15:27:53 +02:00
unknown
de41f4e7bb Bug#16561 Unknown ERROR msg "ERROR 1186 (HY000): Binlog closed" by perror
- Since error 1186 is not found among NDB error codes, the message retuned should indicate that.


extra/perror.c:
  Move the !found out one level
mysql-test/t/perror.test:
  Add test case for bug#16561
ndb/src/kernel/error/ndbd_exit_codes.c:
  Check not only for zero size string but also classification "unknown error" when looking for an error mesage for an error code
2006-07-26 14:09:20 +02:00
unknown
aca43bd8f9 BUG#21204 ndb_size.pl doesn't take extended BLOB/TEXT size into account
ndb/tools/ndb_size.pl:
  disable 5.1-dd reporting as it's not ready yet.
  
  support BLOB tables with mostly accurate space estimate (our estimates
  will be slightly higher due to the fact we also calculate an ORDERED index
  on the BLOB table, something that NDB doesn't have).
  
  now have subroutine do_table that does the calculations for a table. We
  call this with a "fake" blob table to get estimates for blob usage.
ndb/tools/ndb_size.tmpl:
  Add column in columns table for if column is VARSIZED
2006-07-26 11:44:52 +10:00
unknown
dc50ce9970 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  moonbone.local:/work/tmp_merge-5.0-opt-mysql


client/mysql.cc:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/time.cc:
  Auto merged
2006-07-18 23:45:17 +04:00
unknown
6067045823 Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41-1.2461
2006-07-15 21:54:47 +02:00
unknown
8f5681c919 Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41-1.2461
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50
2006-07-15 21:44:25 +02:00
unknown
728fbb3ab5 fix for a compatibility build problem on MacOSX intel.
Discussed with Kent.


ndb/test/ndbapi/Makefile.am:
  Fix for a compatibility build problem on MacOSX Intel.
2006-07-14 12:09:36 +03:00
unknown
27721ce53f ndb - (4.1) trivial fix to error.log (wday=0 was printed as "x")
ndb/src/kernel/error/TimeModule.cpp:
  0=Sunday
2006-07-11 17:07:23 +02:00
unknown
66fc547d1b Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-1.2167.1.2


ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
2006-07-10 14:12:02 +02:00
unknown
001c7f5fe1 ndb - bug#18781: close a tiny window (re-commit, try to by-pass merge jam)
ndb/src/kernel/blocks/dbdict/DictLock.txt:
  wait until SL_STARTED before sending DICT_UNLOCK_ORD
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  wait until SL_STARTED before sending DICT_UNLOCK_ORD
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  wait until SL_STARTED before sending DICT_UNLOCK_ORD
ndb/src/kernel/vm/SimulatedBlock.cpp:
  wait until SL_STARTED before sending DICT_UNLOCK_ORD
ndb/src/kernel/vm/SimulatedBlock.hpp:
  wait until SL_STARTED before sending DICT_UNLOCK_ORD
ndb/test/run-test/daily-basic-tests.txt:
  wait until SL_STARTED before sending DICT_UNLOCK_ORD
2006-07-10 13:59:13 +02:00
unknown
f98f5d639b ndb - bug#18781 : 5.0 : add NODE_START_REP from 5.1 (re-commit, try to by-pass merge jam)
ndb/include/kernel/GlobalSignalNumbers.h:
  5.0 : add NODE_START_REP from 5.1
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  5.0 : add NODE_START_REP from 5.1
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  5.0 : add NODE_START_REP from 5.1
ndb/src/kernel/vm/SimulatedBlock.cpp:
  5.0 : add NODE_START_REP from 5.1
ndb/src/kernel/vm/SimulatedBlock.hpp:
  5.0 : add NODE_START_REP from 5.1
2006-07-10 13:44:15 +02:00
unknown
ce3f15beb5 ndb - bug#20847: non-debug compile fix (repeat since cannot merge 4.1->5.0)
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  non-debug compile fix
2006-07-10 12:13:45 +02:00
unknown
665db1a6ad ndb - bug#20847: non-debug compile fix
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  non-debug compile fix
2006-07-10 12:05:51 +02:00
unknown
9be463262b Merge orca.ndb.mysql.com:/space/pekka/ndb/version/my41
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41-bug20847
2006-07-10 11:06:21 +02:00
unknown
32e99ab123 Merge orca.ndb.mysql.com:/space/pekka/ndb/version/my50
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-bug20847
2006-07-10 11:02:46 +02:00
unknown
bd720c4d9b Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  merge
2006-07-07 16:05:10 +02:00
unknown
31e3e75304 ndb - bug#20904
Reset logpartstate if file_change_problem after writeing of zero page is done
2006-07-07 16:01:35 +02:00
unknown
8de29d3a77 Merge mysql.com:/space_old/pekka/ndb/version/my41-bug20847
into  mysql.com:/space_old/pekka/ndb/version/my50-bug20847


BitKeeper/etc/config:
  auto
ndb/src/kernel/blocks/ERROR_codes.txt:
  manual
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  SCCS merged
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  SCCS merged
ndb/test/ndbapi/testDict.cpp:
  SCCS merged
ndb/test/run-test/daily-basic-tests.txt:
  SCCS merged
sql/opt_range.cc:
  SCCS merged
2006-07-07 13:40:47 +02:00
unknown
a610467f71 BUG#13985: Cluster: ndb_mgm "status" command can return incorrect data node status
- only force HB to data nodes
- flag for if we broadcast condition on receipt of HB


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Add get_connected_ndb_nodes to check status for connected data nodes only
ndb/src/mgmsrv/MgmtSrvr.hpp:
  add prototype for get_connected_ndb_nodes
ndb/src/mgmsrv/Services.cpp:
  only force HB to NDBD nodes
ndb/src/ndbapi/ClusterMgr.cpp:
  flag to control if we send the condition
ndb/src/ndbapi/ClusterMgr.hpp:
  flag for if we broadcast condition on receipt of hb
2006-07-07 20:10:15 +10:00
unknown
2c48aaa183 ndb - bug#20847 : DbtupTabDesMan: add merge with left buddies
ndb/src/kernel/blocks/ERROR_codes.txt:
  DbtupTabDesMan: add merge with left buddies
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  DbtupTabDesMan: add merge with left buddies
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  DbtupTabDesMan: add merge with left buddies
ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp:
  DbtupTabDesMan: add merge with left buddies
ndb/test/ndbapi/testDict.cpp:
  DbtupTabDesMan: add merge with left buddies
ndb/test/run-test/daily-basic-tests.txt:
  DbtupTabDesMan: add merge with left buddies
2006-07-07 10:57:22 +02:00
unknown
5a8919f290 BUG#13985 Cluster: ndb_mgm "status" command can return incorrect data node status
use existing transporter mutex


ndb/src/ndbapi/ClusterMgr.cpp:
  just use the transporter facade mutex.
  
  parallel 'show' will get woken up at the same time
ndb/src/ndbapi/ClusterMgr.hpp:
  remove wait for heartbeat mutex
2006-07-07 18:39:38 +10:00
unknown
bd015e57db BUG#13985 ndb_mgm "status" command can return incorrect data node status
better support parallel show commands, hold mutex when touching waitForHBFromNodes


ndb/src/ndbapi/ClusterMgr.cpp:
  correctly serialize ::forceHB calls and hold mutex for whole time updating
  waitForHBFromNodes
2006-07-07 17:39:11 +10:00
unknown
99e347b154 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-07-06 19:03:33 +02:00
unknown
ce554d56a4 Bug #20820 auto inc table not handled correctly when restored from cluster backup 2006-07-06 18:50:44 +02:00
unknown
337310a96c Merge jonas@perch:src/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
2006-07-06 16:06:19 +02:00
unknown
af3f5c9e37 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-07-06 16:03:01 +02:00
unknown
c66b8fccf0 ndb - bug#20860
Better error message when failing to read either of 2 DIH schema files


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Better error message when failing to read either of 2 DIH schema files
2006-07-06 15:51:35 +02:00
unknown
3e9758bc23 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main


ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
2006-07-06 15:23:35 +02:00
unknown
73bf763071 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
2006-07-06 15:22:25 +02:00
unknown
123c0a98b4 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/src/ndbapi/DictCache.cpp:
  Auto merged
2006-07-06 15:20:22 +02:00
unknown
7997d847f2 backport of ndb DictCache fix
- don't invalidate tables that are in state RETRIEVING
2006-07-06 15:18:00 +02:00
unknown
54f3f0263e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/src/ndbapi/NdbScanOperation.cpp:
  SCCS merged
2006-07-06 09:47:59 +02:00
unknown
d2eeb79edb Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
2006-07-06 09:41:25 +02:00
unknown
0890735c7a ndb - revert bug fix for bug#20442 2006-07-06 09:38:18 +02:00
unknown
623f8beec0 ndbd: added missing jamEntry(); 2006-07-05 20:24:12 +02:00
unknown
051f3892c3 Bug #20419 ndbd --nowait-nodes=<id_of_running_node> fails
- updated error message to more correctly reflect the issue
2006-07-05 20:20:39 +02:00
unknown
4d71b8f8f9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-07-05 16:40:24 +02:00
unknown
7a8c451655 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main


ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
2006-07-05 16:34:34 +02:00
unknown
53ed06f270 Bug #18863 NDB node fails to restart, cluster stuck in state trying to restart it.
- remove some event code to get rid of some bugs
2006-07-05 16:26:08 +02:00
unknown
95e37a4ad5 ndb - ps_7ndb as discovered by pb
fix race in scan close


ndb/src/ndbapi/NdbScanOperation.cpp:
  Fix race in scan close
2006-07-04 16:54:07 +02:00
unknown
99e4dee4ff ndb - bug#20847 fix (4.1)
ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp:
  DROP did not do merge with right buddies
2006-07-04 15:11:11 +02:00
unknown
3cea3705fe BUG#13985 ndb_mgm "status" command can return incorrect data node status
Second half of the fix for this bug.

This patch forces a heartbeat to be sent and will wait (a little while)
for replies. This way we can get

> all status
X starting
Y started
X started
>

which is okay as the new status comes after the old status, always.
There is the slimmest of opportunities to get output like above where only half
the cluster appears started.

This is about the best we can do with a command line interactive program.


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Add updateStatus method to MgmtSrvr.
  
  Used to force an update of node status for the nodes.
ndb/src/mgmsrv/MgmtSrvr.hpp:
  add prototype for updateStatus(NodeBitmask) method
ndb/src/mgmsrv/Services.cpp:
  When status is queried, force an update of the status in the mgm server. (i.e. send heartbeats)
ndb/src/ndbapi/ClusterMgr.cpp:
  new DEBUG_REG define for debugging registration and HB code.
  
  Add ClusterMgr::forceHB(NodeBitmask) which sends a HB signal to each node in
  the bitmask and then waits for a REGCONF from them.
  Will only wait for a total of 1 second, not blocking an end client for too long.
  
  On receipt of HB, clear the nodeId in the waiting for bitmask and signal any
  waiting threads.
ndb/src/ndbapi/ClusterMgr.hpp:
  Add ::forceHB(NodeBitmask) and associated variables
2006-07-03 15:37:57 +10:00
unknown
250ea729a4 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2006-06-30 11:25:37 +02:00
unknown
4354d94045 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
2006-06-30 11:25:14 +02:00
unknown
79bb70355f Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2006-06-30 09:42:15 +02:00
unknown
652a02f6e1 ndb - bug#20774
crash if system restart with more than 4096 fragments
  solution: continueb enable expand check loop


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  continueb enable expand check loop
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  continueb enable expand check loop
2006-06-30 09:41:41 +02:00
unknown
79f5a97fb9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
2006-06-29 16:34:25 +02:00
unknown
b352d9d118 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-06-29 16:31:35 +02:00
unknown
9303456fcf Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
2006-06-29 16:31:12 +02:00
unknown
1025ffd02e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1


ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
2006-06-29 16:25:45 +02:00
unknown
b25c34a6bd Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
2006-06-29 16:22:20 +02:00
unknown
6efd848ce7 ndb - autotest
Fix testNodeRestart -n DuringLCP and others (add stopTest() at end of test :-))


ndb/test/ndbapi/testNodeRestart.cpp:
  Fix testNodeRestart -n DuringLCP and others
2006-06-29 16:20:18 +02:00
unknown
702d34bbaf Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-runtime
2006-06-29 16:44:21 +04:00
unknown
f7bc05b6a1 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main


sql/ha_ndbcluster.cc:
  Auto merged
2006-06-29 22:00:50 +10:00
unknown
89a55ee411 Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-release
2006-06-29 13:25:02 +02:00
unknown
0681b810d1 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-06-29 13:03:09 +02:00
unknown
78c814154a fixed too small requestInfo in signal
+ adopted signal to be as close as possible to 5.1...
2006-06-29 13:01:54 +02:00
unknown
474c4e9206 ndb - build
Fix compile error for forte


ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Fix compile error for forte
2006-06-29 11:39:07 +02:00
unknown
7e4ae350ea Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into  mysql.com:/home/stewart/Documents/MySQL/5.0/merge


ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2006-06-28 22:25:41 +10:00
unknown
07a0e614b9 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/ndb
into  mysql.com:/home/stewart/Documents/MySQL/4.1/merge
2006-06-28 22:21:42 +10:00
unknown
3e8cba8be1 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/merge
into  mysql.com:/home/stewart/Documents/MySQL/5.0/merge


ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
2006-06-28 21:54:04 +10:00
unknown
a0837ecec4 BUG#19894 Data nodes fail during loading data if NoOfFragmentLogFiles=1
change default minimum to 3

bug is *very* timing dependent, unable to reproduce here, but theoretically possible.


ndb/src/mgmsrv/ConfigInfo.cpp:
  change minimum NoOfFragmentLogFiles to 3
2006-06-28 21:52:24 +10:00
unknown
da10159df1 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
2006-06-28 13:01:36 +02:00
unknown
d7534c3af3 ndb - bug#20442
force close of scan (of outstanding scan_frag)


ndb/src/ndbapi/NdbScanOperation.cpp:
  Force close of scan in when not doing committed read scan
2006-06-28 11:27:37 +02:00
unknown
7a3bef0158 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Auto merged
ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
2006-06-28 08:40:20 +02:00
unknown
9596ca0d7d Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
2006-06-28 08:39:34 +02:00
unknown
cee3b44dff Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main


mysql-test/mysql-test-run.sh:
  Auto merged
ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2006-06-27 14:56:20 +02:00
unknown
f105602806 ndb - bug#20252
allow user to specify scan batch size in readTuples


ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Allow user to specify batch size
ndb/include/ndbapi/NdbScanOperation.hpp:
  Allow user to specify batch size
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Fix so that last row works even if batch is complete
ndb/src/ndbapi/NdbReceiver.cpp:
  Allow user yo specify batch size
ndb/src/ndbapi/NdbScanOperation.cpp:
  Allow user to specify batchsize
2006-06-27 11:41:00 +02:00
unknown
d2da3c9685 Bug #19852 Restoring backup made from cluster with full data memory fails
- correction of previous patch
2006-06-27 11:26:00 +02:00
unknown
0335013f17 Bug #19852 Restoring backup made from cluster with full data memory fails
- make sure to allocate just enough pages in the fragments by using the actual
  row count from the backup, to avoid over allocation of pages to fragments, and
  thus avoid the bug


ndb/include/kernel/GlobalSignalNumbers.h:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - distribute fragment complete to all participants to update row count
ndb/include/kernel/signaldata/BackupContinueB.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - time slica writing of fragment info to ctl file
ndb/include/kernel/signaldata/BackupImpl.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - 32 -> 64 bit on bytes and records
  - new signal fragment complete to all participants
ndb/include/kernel/signaldata/BackupSignalData.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - 32 -> 64 bit on bytes and records
ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - add min and max rows to dict tab info
ndb/include/kernel/signaldata/LqhFrag.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - added min and max rows to add frag req
ndb/include/kernel/signaldata/TupFrag.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - added min and max rows to add frag req
ndb/include/ndbapi/NdbDictionary.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - added get/set of min max rows
ndb/src/common/debugger/signaldata/BackupImpl.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - 32 -> 64 bit on bytes and records
ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - 32 -> 64 bit on bytes and records
ndb/src/common/debugger/signaldata/DictTabInfo.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - added min and max rows to dict tab info
ndb/src/common/debugger/signaldata/LqhFrag.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - added min and max rows to frag req
ndb/src/kernel/blocks/backup/Backup.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - new section in backup with per fragment info in ctl file
  - 32 -> 64 bit on bytes and records
ndb/src/kernel/blocks/backup/Backup.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - new section in backup with per fragment info in ctl file
  - 32 -> 64 bit on bytes and records
ndb/src/kernel/blocks/backup/BackupFormat.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - new section in backup with per fragment info in ctl file
  - 32 -> 64 bit on bytes and records
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - new signal fragment complete to all participants
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - added max and min rows to dict table object
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - added max and min rows to dict table object
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - added min and max rows to frag req
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - added min and max rows to frag req
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - added min and max rows to frag req
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - added min and max rows to frag req
  - move memory allocation to fragment to after adding of attributes to get correct headsize
  - allocate pages to fragments according to min rows setting
ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - grow page allocation starting from 2 irrespective of first page allocation
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - 32 -> 64 bits on bytes and records
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - 32 -> 64 bits on bytes and records
ndb/src/ndbapi/NdbDictionary.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - min and max rows in dict
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - min and max rows in dict
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - min and max rows in dict
ndb/tools/restore/Restore.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - add retrieval of fragment info
ndb/tools/restore/Restore.hpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - add retrieval of fragment info
ndb/tools/restore/consumer_restore.cpp:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - set min in restore to the actual row count (this is the actual bug fix)
sql/ha_ndbcluster.cc:
  Bug #19852  	Restoring backup made from cluster with full data memory fails
  - set min and max rows according to sql definition
2006-06-27 10:02:58 +02:00
unknown
841a5b7a64 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/vm/SafeCounter.hpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
2006-06-26 12:17:38 +02:00
unknown
7072a63acd ndb - bug#20683
part 1 - make sure return code is propagated from request tracker


ndb/src/kernel/vm/RequestTracker.hpp:
  propagate return value
ndb/src/kernel/vm/SafeCounter.hpp:
  make sure object is not initialized in case of seize() failure, to make sure destructor doesnt assert
2006-06-26 12:16:39 +02:00
unknown
1c28807355 Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug18781


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
2006-06-22 20:59:03 +02:00
unknown
505c2b3d5f ndb - bug#19164
set max value on ports


ndb/src/mgmsrv/ConfigInfo.cpp:
  set max vlue on ports
2006-06-22 12:03:28 +02:00
unknown
de79a31cd9 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2006-06-21 14:02:10 +02:00
unknown
e7e9cc2502 ndb - bug#20197
also close scan which are in "delivered" state, as it's impossible to release locks afterwards

  backport from 5.1


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  ndb - bug#20197
    also close scan which are in "delivered" state, as it's impossible to release locks afterwards
2006-06-21 14:00:26 +02:00
unknown
d6b48592fb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main


ndb/src/ndbapi/ndberror.c:
  Auto merged
2006-06-20 19:29:18 +02:00
unknown
f62bb0515c Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
2006-06-20 19:25:41 +02:00
unknown
c2620e1fab Bug #17297 Fix error messages 2006-06-20 19:13:46 +02:00
unknown
0f6a24ad6c Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/bugsmerge


ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
2006-06-20 18:27:54 +10:00
unknown
773e91d513 BUG#20333 valgrind: mgmd event reporting dep on uninit value
ndb/src/mgmsrv/MgmtSrvr.cpp:
  user correct pointer
2006-06-20 17:29:02 +10:00
unknown
6bd6c4690b Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my50
2006-06-17 17:33:08 +02:00
unknown
81202460be Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new


ndb/Makefile.am:
  Auto merged
2006-06-17 15:42:24 +02:00
unknown
4d366600b8 Makefile.am:
Avoid error message trying 'windoze-dsp' in obsolete directory
compile-dist:
  Avoid error message for target 'distclean' and no Makefile


BUILD/compile-dist:
  Avoid error message for target 'distclean' and no Makefile
ndb/Makefile.am:
  Avoid error message trying 'windoze-dsp' in obsolete directory
2006-06-17 15:37:23 +02:00
unknown
4c9815a9b7 Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285
2006-06-17 13:53:43 +02:00
unknown
76d2eceaf5 ndb - bug#19285 minor fixes
ndb/src/ndbapi/NdbBlob.cpp:
  bug#19285 minor fixes
ndb/src/ndbapi/ndberror.c:
  bug#19285 minor fixes
2006-06-17 13:00:17 +02:00
unknown
70cf824053 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/merge-queue
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
2006-06-16 21:01:02 +10:00
unknown
e9bfc41514 ndb - bug#19285 : document and check what blob ops are allowed
ndb/src/ndbapi/ndberror.c:
  distinguish blob method errors: 4265-wrong state 4275-wrong op type/lockmode
ndb/src/ndbapi/NdbBlobImpl.hpp:
  distinguish blob method errors: 4265-wrong state 4275-wrong op type/lockmode
  fix 4269 -> 4270
ndb/test/ndbapi/testBlobs.cpp:
  test lock upgrade, test 4275 errors
ndb/include/ndbapi/NdbScanOperation.hpp:
  fix comment
ndb/include/ndbapi/NdbBlob.hpp:
  upgrade LM_CommittedRead to LM_Read
  check if write allowed (new error 4275)
  dont invalidate blob state on error (just general principle)
ndb/src/ndbapi/NdbBlob.cpp:
  upgrade LM_CommittedRead to LM_Read
  check if write allowed (new error 4275)
  dont invalidate blob state on error (just general principle)
2006-06-14 13:58:51 +02:00
unknown
7e3fe0fc91 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/marty/MySQL/mysql-5.0


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2006-06-12 15:36:10 +02:00
unknown
17a0c389cc Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-06-12 15:36:09 +02:00
unknown
7b207a8301 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/marty/MySQL/mysql-4.1
2006-06-12 15:35:46 +02:00
unknown
00f4ef1280 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main


ndb/src/mgmsrv/Services.cpp:
  Auto merged
2006-06-12 13:11:37 +02:00
unknown
f4fcc2397e Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
2006-06-12 13:09:04 +02:00
unknown
ce450e501a Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
2006-06-12 13:08:04 +02:00
unknown
40d687eb43 Bug #20336 CLUSTERLOG commands have no effect
- always calculate max log level on node start
- send event subscribe uncond


ndb/src/mgmsrv/Services.cpp:
  Bug #20336 CLUSTERLOG commands have no effect
  - always send log level update
2006-06-12 13:06:56 +02:00
unknown
e3a975c5d6 Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: Adapted to 5.0 code changes 2006-06-12 09:37:19 +02:00
unknown
a182963cc0 ndb - bug#18781 (5.0) handle rolling upgrade, minor fixes, logging, docs
ndb/src/kernel/blocks/dbdict/DictLock.txt:
  NR signals
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  call removeStaleDictLocks at right place, comment why it works
  more checks, better logging
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  call removeStaleDictLocks at right place, comment why it works
  more checks, better logging
ndb/include/kernel/signaldata/DictLock.hpp:
  2 more REFs
ndb/include/ndb_version.h.in:
  DICT LOCK appeared in 5.0.23
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  DICT LOCK rolling upgrade from version < 5.0.23
ndb/src/kernel/blocks/ERROR_codes.txt:
  more DICT LOCK related testing
ndb/test/ndbapi/testDict.cpp:
  more DICT LOCK related testing
2006-06-11 20:46:47 +02:00
unknown
ddd55d4349 Merge rurik.mysql.com:/home/igor/tmp_merge
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0


VC++Files/client/mysql.dsp:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
client/mysqldump.c:
  Manual merge
mysql-test/r/func_time.result:
  Manual merge
2006-06-09 17:56:08 -07:00
unknown
b2d3ac1b6b Merge mysql.com:/home/marty/MySQL/mysql-4.1
into  mysql.com:/home/marty/MySQL/mysql-5.0


ndb/src/ndbapi/ndberror.c:
  Auto merged
BitKeeper/deleted/.del-NdbResultSet.cpp~84d192cf3f42600d:
  Merge (keeping local)
BitKeeper/deleted/.del-NdbResultSet.hpp~e0042f4c18088ff6:
  Merge (keeping local)
ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Merge
ndb/include/ndbapi/NdbScanOperation.hpp:
  Merge
ndb/src/ndbapi/NdbScanOperation.cpp:
  Merge
sql/ha_ndbcluster.cc:
  Merge (using local, will fix manually)
sql/ha_ndbcluster.h:
  Merge
2006-06-09 12:07:04 +02:00
unknown
ca38dcf17e Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main


ndb/src/mgmsrv/Services.cpp:
  Auto merged
2006-06-08 17:57:55 +02:00
unknown
4a8c50850f Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
2006-06-08 17:55:44 +02:00
unknown
2bb4b3445f Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
2006-06-08 17:28:01 +02:00
unknown
96fe14dddc Bug #20336 CLUSTERLOG commands have no effect
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Bug #20336 CLUSTERLOG commands have no effect
  - with signal sender the clock issuing the command and the revceiver of the events are not the same
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Bug #20336 CLUSTERLOG commands have no effect
  - make sure to actually send the update to ndb nodes, and wait for the reply
ndb/src/mgmsrv/Services.cpp:
  Bug #20336 CLUSTERLOG commands have no effect
  - make sure to compute max every time for log level
2006-06-08 17:26:56 +02:00
unknown
40f44b48b0 ndb - bug#18781 lock DICT during node restart
ndb/src/kernel/main.cpp:
  signal log from start (#if 0-ed)
ndb/test/ndbapi/testDict.cpp:
  test NF/NR + dict ops
ndb/src/kernel/vm/DLFifoList.hpp:
  add hasPrev
ndb/src/kernel/vm/pc.hpp:
  ERROR_INSERTED_CLEAR(x) test and clear if set
ndb/src/common/debugger/SignalLoggerManager.cpp:
  block no fix
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  spelling
ndb/include/kernel/GlobalSignalNumbers.h:
  locking of master DICT against schema ops, used by slave DIH under NR
ndb/include/kernel/signaldata/AlterTable.hpp:
  locking of master DICT against schema ops, used by slave DIH under NR
ndb/include/kernel/signaldata/CreateTable.hpp:
  locking of master DICT against schema ops, used by slave DIH under NR
ndb/include/kernel/signaldata/DictLock.hpp:
  locking of master DICT against schema ops, used by slave DIH under NR
ndb/include/kernel/signaldata/DropTable.hpp:
  locking of master DICT against schema ops, used by slave DIH under NR
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  locking of master DICT against schema ops, used by slave DIH under NR
ndb/src/kernel/blocks/ERROR_codes.txt:
  locking of master DICT against schema ops, used by slave DIH under NR
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  locking of master DICT against schema ops, used by slave DIH under NR
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  locking of master DICT against schema ops, used by slave DIH under NR
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  locking of master DICT against schema ops, used by slave DIH under NR
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  locking of master DICT against schema ops, used by slave DIH under NR
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  locking of master DICT against schema ops, used by slave DIH under NR
ndb/src/ndbapi/ndberror.c:
  locking of master DICT against schema ops, used by slave DIH under NR
2006-06-08 16:16:07 +02:00
unknown
20e54ae6c5 Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked 2006-06-08 16:12:38 +02:00
unknown
8a7e206d71 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/jonas
into  mysql.com:/home/stewart/Documents/MySQL/5.0/merge-queue


ndb/include/mgmapi/mgmapi.h:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/src/mgmsrv/Services.hpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  hand merge bug fix by tomas with my fix for stop/shutdown behaviour
2006-06-08 02:40:16 +10:00
unknown
d1d2a7f694 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bug20016
into  mysql.com:/home/stewart/Documents/MySQL/5.0/merge-queue


ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
2006-06-08 02:33:25 +10:00
unknown
4db19d19f4 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bug19932
into  mysql.com:/home/stewart/Documents/MySQL/5.0/merge-queue
2006-06-08 02:32:33 +10:00
unknown
49ccf53e8e BUG#19318 valgrind: memory leak in ndb_mgmd
fix based on review


ndb/src/mgmsrv/ConfigInfo.cpp:
  move delete to more appropriate places inside loop.
2006-06-08 02:31:58 +10:00
unknown
d1b37c77ef BUG#18966 CHange in stop/shutdown behaviour
Fixes based on review by Tomas


ndb/src/mgmapi/mgmapi.cpp:
  Return immediately if ndb_mgm_get_version fails.
  correctly use new protocol for versions > 5.1
ndb/src/mgmsrv/Services.cpp:
  Only have 1 version of 'stop all' with reply being dependent on if the optional
  stop parameter is supplied.
ndb/src/mgmsrv/Services.hpp:
  Only 1 version of stopAll
2006-06-07 16:20:57 +10:00
unknown
a6aa5b0fa1 WL#3310 Update ndb_size.pl for 5.1
the "If I had a hammer" patch.

Had to answer the question, did it in code.

Much more accurrate results for 5.1


ndb/tools/ndb_size.pl:
  Add experimental 5.1-dd support to ndb_size.pl
  Improve calculations with 5.1 and variable sized attributes.
  
  Now much more closely resembles reality.
ndb/tools/ndb_size.tmpl:
  Comment on 5.1-dd exp support.
  
  Display:
  - nr varsized attributes
  - actual row overhead depending on version
  - overhead for varsized attributes
2006-06-07 01:37:29 +10:00
unknown
8373ba050d Merge mysql.com:/home/marty/MySQL/mysql-4.1
into  mysql.com:/home/marty/MySQL/mysql-5.0


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Merge
2006-06-02 09:02:53 +02:00
unknown
00ad00deef Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
2006-06-01 13:07:32 +02:00
unknown
c8d37af374 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-06-01 12:57:12 +02:00
unknown
f71a55da22 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
2006-06-01 08:52:55 +02:00
unknown
674a33f5e2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-06-01 08:51:57 +02:00
unknown
dbbc4c7636 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-06-01 08:50:58 +02:00
unknown
dd47289b0e Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
2006-06-01 08:28:59 +02:00
unknown
9ccf222bc3 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
2006-06-01 08:27:45 +02:00
unknown
49a4c85bdf ndb - bug#20185
Dont be too aggressive in Dbtc::nodeFailCheckTransaction
  let it timeout by 1, so that it does not assert that it has waited too long
  old impl. set timeotu value to 0, making timeout = (ctcTimer - 0) which could be quite big.


ndb/src/kernel/blocks/ERROR_codes.txt:
  error codes
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  2 new error inserts
  7030 - delay in GCP_PREPARE until checkLocalNodefailComplete is true
  7031 - delay in GCP_PREPARE and die
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Dont set api con timer to 0, as this might trigger asserion in timeoutfound lab if state == PREPARE_TO_COMMIT
ndb/test/ndbapi/testNodeRestart.cpp:
  testcase
ndb/test/run-test/daily-basic-tests.txt:
  autotest
2006-06-01 08:24:05 +02:00
unknown
2d0ec44bd3 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/marty/MySQL/mysql-5.0


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2006-05-31 15:32:49 +02:00
unknown
445e828785 Removed dead code that had been commented out 2006-05-31 15:07:11 +02:00
unknown
f982aa934a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/marty/MySQL/mysql-4.1


sql/ha_ndbcluster.cc:
  Auto merged
2006-05-30 13:20:38 +02:00
unknown
69c80350dc Merge mysql.com:/space/pekka/ndb/version/my50
into  mysql.com:/space/pekka/ndb/version/my50-bug14509


ndb/src/ndbapi/DictCache.cpp:
  Auto merged
ndb/src/ndbapi/DictCache.hpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2006-05-25 13:08:50 +02:00
unknown
83cd9eca30 Bug #16997 Table rename that changes database does not rename indexes: merge 2006-05-24 10:58:12 +02:00
unknown
746fc2f457 BUG#13985 Cluster: ndb_mgm "status" command can return incorrect data node status
partial fix for this bug. more info on what the other half of the fix involves
is in the bug report.


ndb/src/mgmclient/CommandInterpreter.cpp:
  partial fix for bug13985
  
  hold a mutex around printing out events
  hold the mutex also around printing out put of 'status' commands.
  
  this means we don't get
  1 started
  2 started
  2 starting
  
  output.
  
  we'll instead get the event before/after the entire status output.
  Due to the nature of the event arriving before status being updated,
  we'll pretty much always see started AFTER starting.
2006-05-23 18:16:26 +10:00
unknown
e1c9dd5f4b BUG#18966 Change in stop/shutdown behaviour
Improvements that were discussed with Tomas.

Maintain protocol backwards/forwards compatibilty for client and server and support
the commands from ndb_mgm 'as expected'


ndb/include/mgmapi/mgmapi.h:
  Add ndb_mgm_stop3 mgmapi function.
   - This supports stopping all DB nodes, or all DB and MGM nodes.
   - It also returns to mgmapi program if it needs to disconnect to apply changes.
  
  Add ndb_mgm_restart3 mgmapi function.
   - Tells mgmapi program if it needs to disconnect to apply changes
  
  Add (internal) ndb_mgm_get_version
   - designed to be used to find out what protocol version we need to speak to the server.
ndb/src/mgmapi/mgmapi.cpp:
  Add cache of mgmd version to ndb_mgm_handle. Only filled out in functions that
  need to know the version of the mgmd we're talking to.
  Initialize these members in create handle.
  added ndb_mgm_get_version which asks the mgm server what version it is. This call
  has been supported since the dawn of time, no compatibility issues here.
  
  Add implementation of ndb_mgm_stop3
  Check what version of the protocol the server speaks, and speak it.
  Add compatibility for ndb_mgm_stop2
  
  Same for ndb_mgm_restart3.
ndb/src/mgmclient/CommandInterpreter.cpp:
  Simplify stop and restart code.
  
  Use the new ndb_mgm_(stop|restart)3 calls to find out if we need to disconnect.
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Add nice call for shutting down MGM servers (like shutdownDB)
ndb/src/mgmsrv/MgmtSrvr.hpp:
  add prototype for shutdownMGM
ndb/src/mgmsrv/Services.cpp:
  Add restart node v2, stop v2, stop all v2 while maintaining protocol backwards
  compatibility.
  
  Unfortunately we can't add result lines due to protocol errors in clients :(
  Neither can we add extra things to the 'result: Ok' line due to the use of
  strcmp instead of strncmp.
ndb/src/mgmsrv/Services.hpp:
  Add prototypes for restart, stop and stopall v1 and v2
2006-05-23 16:24:26 +10:00
unknown
466b548f15 BUG#19932 mgmapi crash if disconnect in ndb_mgm_get_status
correctly detect and report errors in talking to mgm server and memory allocation


ndb/src/mgmapi/mgmapi.cpp:
  correctly detect and return errors in ndb_mgm_get_status
2006-05-23 14:51:04 +10:00
unknown
e94ce460db BUG#20016 error in mgm protocol parser error message incorrect
fix display of mgm protocol parser error in mgmapi


ndb/src/mgmapi/mgmapi.cpp:
  fix display of mgm protocol parser error.
2006-05-23 14:45:56 +10:00
unknown
a1ff1c9774 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-05-22 20:45:19 +02:00
unknown
9bce5261f6 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-05-22 16:30:43 +02:00
unknown
282d904dd8 ndb: corrected option handeling to give correct help in ndbd 2006-05-22 16:27:37 +02:00
unknown
cc6483a4fe Merge jonas@perch:src/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-05-22 16:27:13 +02:00
unknown
98268bf057 Merge mysql.com:/home/marty/MySQL/mysql-4.1
into  mysql.com:/home/marty/MySQL/mysql-5.0


ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  merge
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  merge
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  merge
2006-05-22 15:16:37 +02:00
unknown
48fe5a2d8f Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bug13987
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
2006-05-22 23:12:01 +10:00
unknown
a57c96747b ndb - bug#19956 (occurs only in v5.0)
mysql-test/r/ndb_blob.result:
  bug#19956 : var* pk
mysql-test/t/ndb_blob.test:
  bug#19956 : var* pk
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  bug#19956 - check var* length bytes and zero rest of value if any blob attribute
ndb/src/ndbapi/NdbOperationSearch.cpp:
  bug#19956 - check var* length bytes and zero rest of value if any blob attribute
2006-05-21 11:04:57 +02:00
unknown
71c05cf93b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-05-19 11:32:14 +02:00
unknown
aa26f5cbaa ndb - bug#19930
Add mutex surronding sessions, as ndb_mgmd now actively tries to go and  "purge stale sessions"


ndb/include/util/SocketServer.hpp:
  Add mutex surronding sessions, as ndb_mgmd now actively tries to go and  "purge stale sessions"
ndb/src/common/util/SocketServer.cpp:
  Add mutex surronding sessions, as ndb_mgmd now actively tries to go and  "purge stale sessions"
ndb/src/mgmsrv/Services.cpp:
  Add mutex surronding sessions, as ndb_mgmd now actively tries to go and  "purge stale sessions"
2006-05-19 09:59:34 +02:00
unknown
564ba97b62 BUG#18966 Change in stop/shutdown behaviour
Now need this fix to prevent crash of ndb_mgm on invalid mgm protocol.


ndb/src/mgmclient/CommandInterpreter.cpp:
  fix crash on invalid mgm protocol
2006-05-18 21:32:24 +10:00