Commit graph

2562 commits

Author SHA1 Message Date
unknown
8de1e4a847 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-root
2006-01-19 17:02:53 +03:00
unknown
2e60e21d34 fix ndb_mgmd --no-defaults option processing
ndb/src/mgmsrv/main.cpp:
  fix --no-defaults option processing
2006-01-20 00:06:17 +11:00
unknown
5f37520a09 Merge mysql.com:/opt/local/work/mysql-4.1-root
into  mysql.com:/opt/local/work/mysql-5.0-root


mysql-test/ndb/ndbcluster.sh:
  Auto merged
2006-01-19 15:23:01 +03:00
unknown
71f54b97cb small typo fixes
mysql-test/ndb/ndbcluster.sh:
  small fix to make ndb_mgmd run
ndb/tools/ndb_size.pl:
  small typo
2006-01-19 22:50:54 +11:00
unknown
5e902af997 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug12124


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
2006-01-19 19:14:17 +11:00
unknown
1b20404edd Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main


ndb/src/common/logger/Logger.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
sql/sql_select.cc:
  Auto merged
2006-01-19 19:03:47 +11:00
unknown
5755c78721 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug12124


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
2006-01-18 17:28:51 +11:00
unknown
984484015c Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
into  mysql.com:/home/stewart/Documents/MySQL/4.1/bug11331
2006-01-18 11:37:08 +11:00
unknown
38229d7412 BUG#12124 ndb_mgm -e "# stop" does not allow stopping ndb_mgmd processes on other systems
WL#2703 restart for ndb_mgmd

Solving two problems with one stone.

Allows the stopping and restarting of mgm nodes other than the one the mgmclient
is connected to.


ndb/include/mgmapi/mgmapi.h:
  Add the internal ndb_mgm_end_session command.
  
  This will unreserve the nodeid we have allocated synchronously.
  
  Otherwise we can't do a restart of a node really quickly as the nodeids are cleaned
  up after the connection to mgmd is closed.
ndb/include/mgmcommon/ConfigRetriever.hpp:
  Allow configuration on if end_session is going to be called on object destruction.
  
  We need to set this to false for ndbd as we fork()
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  When destroying ConfigRetreiver, ndb_mgm_end_session - i.e. deallocate the nodeid
ndb/src/common/util/SocketServer.cpp:
  When destroying a SocketServer, close the server socket.
ndb/src/kernel/main.cpp:
  don't purge allocated resources when cleaning up in parent process (nodeid)
ndb/src/kernel/vm/Configuration.cpp:
  have option end_session to closeConfiguration
ndb/src/kernel/vm/Configuration.hpp:
  have option end_session to closeConfiguration
ndb/src/mgmapi/mgmapi.cpp:
  Implement ndb_mgm_end_session
ndb/src/mgmclient/CommandInterpreter.cpp:
  Correct output of STOP as we can now stop mgmd as well as ndbd
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Add code into start for connecting to our own mgmd.
  
  Create sendStopMgmd() which does the same job as sendSTOP_REQ, but for ndb_mgmd
  
  Allow stopping of other ndb_mgmd processes by creating a connection to them
  and issuing the stop command
  
  When stopping all nodes, stop other ndb_mgmd processes as well.
  
  Remove set_connect_string. Replace with connect_to_self. This is a much better
  way of doing things.
ndb/src/mgmsrv/MgmtSrvr.hpp:
  add connect_to_self and remove set_connect_string.
ndb/src/mgmsrv/Services.cpp:
  Add endSession.
  
  - delete Allocated_resources for this connection
  - create new Allocated_resources for this connection
  
  conceivably you could keep the socket open across node restarts (and even
  possibly get a different node id). But I wouldn't try it and expect happiness.
ndb/src/mgmsrv/Services.hpp:
  Add endSession
ndb/src/mgmsrv/main.cpp:
  allow mgmd to be restarted.
  
  - add g_RestartServer flag
  - move connecting to our own mgmd into MgmtSrvr (where it belongs)
  - output correct Shutdown/Restart message on shutdown/restart
2006-01-17 00:13:18 +11:00
unknown
8a59fbc724 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2006-01-13 09:29:24 +01:00
unknown
891202f7d1 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-01-13 07:41:49 +01:00
unknown
b9e1c443b8 bug#15619 - ndb_autodiscover sometimes fails
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Make sure that node allocating id is allowed to transporter connect
2006-01-13 07:40:15 +01:00
unknown
c43a7e2e87 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-01-13 07:31:35 +01:00
unknown
ba3086a2d2 BUG#11331 "Warning: could not add log destination" message does not provide enough info
Implement error reporting to Logger and associated classes.


ndb/include/logger/LogHandler.hpp:
  Add error string to LogHandler along with error code
ndb/include/logger/Logger.hpp:
  Add reporting back of error to addHandler(BaseString).
ndb/src/common/logger/FileLogHandler.cpp:
  Implement error reporting
ndb/src/common/logger/LogHandler.cpp:
  Implement error reporting.
  
  Trim spaces and tabs out of parameter names. This allows "p=v, param=value"
ndb/src/common/logger/Logger.cpp:
  Report back errors when adding a handler via BaseString
ndb/src/common/logger/SysLogHandler.cpp:
  Report an error on invalid syslog facility
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Report error when adding log handler
2006-01-13 11:43:50 +11:00
unknown
7ea07618b0 Merge mysql.com:/usr/local/mysql/mysql-5.0-sol10-sparc-a-fix
into  mysql.com:/usr/local/mysql/mysql-5.0
2006-01-11 09:02:13 +01:00
unknown
51525a9b82 ndb - wl#2972 ndb api test_event_merge 5.0+5.1
ndb/test/ndbapi/test_event_merge.cpp:
  5.0 passes. 5.1 has many problems
2006-01-09 01:09:42 +01:00
unknown
e6dff42367 BUG#16282: Remove unused gcc.cpp linker input that causes failure in make -j.
BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838:
  Delete: ndb/src/common/portlib/gcc.cpp
2006-01-08 07:42:40 +01:00
unknown
a503f2c772 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/test/ndbapi/testDataBuffers.cpp:
  merge
2006-01-04 11:41:43 +01:00
unknown
522bbb8304 ndb - Make testDatabuffer clean up tables
ndb/test/ndbapi/testDataBuffers.cpp:
  Make testDatabuffer clean up tables
2006-01-04 11:38:58 +01:00
unknown
61938527a3 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/DblqhMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
2006-01-02 14:49:02 +01:00
unknown
07908a4544 bug#16125 - ndb bitfield of exact 32 bits, incorrect assertion (i.e. only noticable in debug compiled)
mysql-test/r/ndb_bitfield.result:
  bug#16125
mysql-test/t/ndb_bitfield.test:
  bug#16125
ndb/include/util/Bitmask.hpp:
  bug#16125
2006-01-02 14:38:38 +01:00
unknown
d105ee3cc6 ndb - wl#2972 (4.1) copy detached trigger fix from 5.0
ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  detached trigger fix from 5.0
2005-12-31 10:54:36 +01:00
unknown
6706115c0a Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/space/pekka/ndb/version/my50
2005-12-27 18:56:33 +01:00
unknown
b4d115073e ndb - wl#2972 (5.0) fix detached trigger opType + new pgm test_event_merge
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  error code 4709 was set outside if()
ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  fix opType for detached triggers (accidental miss since v21x?)
ndb/test/ndbapi/Makefile.am:
  test_event_merge v5.0
ndb/test/ndbapi/test_event_merge.cpp:
  test_event_merge v5.0
2005-12-27 16:57:50 +01:00
unknown
f69108833f 5.0 ndb build fix.
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  build fix for 5.0
2005-12-28 01:32:03 +11:00
unknown
88ef95ff4e Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main


client/mysql.cc:
  Auto merged
myisam/mi_delete.c:
  Auto merged
mysql-test/r/fulltext2.result:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-12-28 00:57:18 +11:00
unknown
979c824e12 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/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
2005-12-21 16:32:35 +01:00
unknown
887d498b26 bug#15908 - ndb
When scan is completed, but lqhkeyreq is outstanding on primary replica and
  starting node dies, scan will not be closed leading to error handling of failed
  node not completing


ndb/src/kernel/blocks/ERROR_codes.txt:
  New error code
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Set scan state to WAIT_LQHKEY_COPY when scan is finished but LQHKEYREQ is outstanding
2005-12-21 16:31:58 +01:00
unknown
e54c3c880e build fix 2005-12-21 00:18:58 +11:00
unknown
5da2f8439e Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
into  mysql.com:/home/stewart/Documents/MySQL/4.1/cleanup


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2005-12-19 19:06:12 +11:00
unknown
adc0c223b4 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/cleanup


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2005-12-19 19:01:20 +11:00
unknown
bdca072855 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
into  mysql.com:/home/stewart/Documents/MySQL/4.1/cleanup


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
2005-12-19 19:00:17 +11:00
unknown
ed5f4d69bc Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push


mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/src/kernel/vm/SimulatedBlock.cpp:
  merge
2005-12-14 11:34:08 +01:00
unknown
2c808bed24 bug#15682 - ndb - invalid handling of varchar in position/rnd_pos
mysql-test/r/ndb_basic.result:
  bug#15682 - invalid handling of varchar in position/rnd_pos
mysql-test/t/ndb_basic.test:
  bug#15682 - invalid handling of varchar in position/rnd_pos
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  New error code for invalid key
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Handle invalid key gracefully
ndb/src/kernel/vm/SimulatedBlock.cpp:
  Handle invalid key gracefully
ndb/src/ndbapi/ndberror.c:
  New error code
sql/ha_ndbcluster.cc:
  Fix varchar keys in position/rnd_pos
2005-12-14 10:57:09 +01:00
unknown
2bec1f7e08 ndb - merge error
note bug#15629 has been fixed in release clone (sp on 64 bit platform), but not merged here yet


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  merge error
2005-12-13 14:41:28 +01:00
unknown
1df94c9269 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
2005-12-13 11:58:46 +01:00
unknown
01c7bd20b9 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
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/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
ndb/src/kernel/blocks/ERROR_codes.txt:
  merge
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  merge
ndb/test/run-test/daily-basic-tests.txt:
  merge
2005-12-13 11:54:42 +01:00
unknown
3f39dd450e Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push


ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
2005-12-13 11:48:26 +01:00
unknown
12aef413ee Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
2005-12-13 11:45:42 +01:00
unknown
fd80fa2d4c ndb - bug#15685
Error in abort handling in TC when timeout during abort
  


ndb/src/kernel/blocks/ERROR_codes.txt:
  New error codes
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  New error codes
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Dont release transaction record to early
ndb/test/ndbapi/testNodeRestart.cpp:
  Test case
ndb/test/run-test/daily-basic-tests.txt:
  Test case
2005-12-12 17:19:04 +01:00
unknown
5b10b7bc53 bug#15632 - ndb
Fix race between INCL_NODEREQ(prio b) and GCP_PREPARE(prio a) by also waiting for starting nodes


ndb/include/ndb_version.h.in:
  Handle upgrade of bug fix
ndb/src/kernel/blocks/ERROR_codes.txt:
  New error code for delaying INCL_NODE_REQ
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Fix race between INCL_NODEREQ(prio b) and GCP_PREPARE(prio a)
    by also waiting for starting nodes
ndb/test/ndbapi/testNodeRestart.cpp:
  Add testcase for bug#15632
2005-12-09 13:51:12 +01:00
unknown
fc4c198ef0 bug#15587 - ndb
Fix typo in autotest script


ndb/test/run-test/daily-basic-tests.txt:
  Fix typo in autotest script
2005-12-08 15:29:39 +01:00
unknown
e5269eed60 bug#15587 - ndb
Fix error in NF during NR


ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Add dump for ERROR 5002 with specified table
ndb/src/kernel/blocks/ERROR_codes.txt:
  Add dump for ERROR 5002 with specified table
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Run updateNodeInfo if failed node is not in list of storedReplicas
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Add dump for ERROR 5002 with specified table
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Add dump for ERROR 5002 with specified table
ndb/test/ndbapi/testNodeRestart.cpp:
  Add testcase for bug#15587
ndb/test/run-test/daily-basic-tests.txt:
  Add testcase for bug#15587
2005-12-08 15:28:15 +01:00
unknown
56b1a531f4 New tool to collate all information to form a good error report for NDB.
It will copy from each node the logs and trace dumps (if any) and create
a tarball. Having this tarball attached to a bug report greatly helps
troubleshooting and avoids user error.

It will (optionally) also get the filesystem.


ndb/tools/ndb_error_reporter:
  New BitKeeper file ``ndb/tools/ndb_error_reporter''
2005-12-07 11:11:59 +01:00
unknown
5b6a006443 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/cleanup
into  mysql.com:/home/stewart/Documents/MySQL/5.0/cleanup


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2005-12-06 13:25:28 +01:00
unknown
fc1c0f5635 BUG#15512 crash during online add of API/SQL node
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Only get_connect_address for connected nodes.
  
  (also cleanup whitespace)
2005-12-06 11:25:53 +01:00
unknown
454e085291 Manually merged
mysql-test/r/update.result:
  Auto merged
mysql-test/t/update.test:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
sql/sql_update.cc:
  Auto merged
2005-12-02 19:42:14 +03:00
unknown
a1a803b46c BUG#15425 Small window for NF during backup failing without error
ndb/src/kernel/blocks/backup/Backup.cpp:
  If crash 10018 is inserted on a 2 node cluster with fast CPU and slower disk,
  all nodes can respond with BACKUP_FRAGMENT_CONF for all fragments before the
  error in FSAPPENDCONF is hit.
  
  This would mean that no error code was set for the backup and that it would
  be incomplete as not all IO had been written to disk before the node crash.
  This would not be reported to the user.
  
  So the backup would appear to succeed but it really didn't.
  
  The window for this is rather small though.
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Assert is incorrect for testBackup NFSlave test (causes crash insert 10015 to fail)
2005-12-02 09:27:06 +01:00
unknown
a2c7b2a67c Backup.cpp:
convert comment to english


ndb/src/kernel/blocks/backup/Backup.cpp:
  convert comment to english
2005-12-01 14:55:25 +01:00
unknown
f632c90498 DblqhMain.cpp:
Use DBblock_REF instead of calcBLOCKBlockRef(getOwnNodeId()) as they are the same and the former is more efficient.

Makes it easier to grep for senders of signals to specific blocks


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Use DBblock_REF instead of calcBLOCKBlockRef(getOwnNodeId()) as they are the same and the former is more efficient.
2005-11-30 14:18:43 +01:00