Commit graph

2745 commits

Author SHA1 Message Date
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
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
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
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
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
3441f235c9 BUG#13987 Cluster: Loss of data nodes can cause high CPU usage from ndb_mgmd
A further reduction in CPU usage by ndb_mgmd with failed data nodes.


ndb/src/common/util/socket_io.cpp:
  Use a nonblocking socket to peek at the buffer to know how much to read for socket_readln.
  
  This saves us a lot of syscalls. By a lot, I've observed about halving the CPU
  usage of ndb_mgmd with 1 failed node on a 6 node cluster.
2006-05-18 16:46:48 +10:00
unknown
4e6efa1023 ndb - bug#14509 [related] re-do auto-incr error handling
ndb/include/ndbapi/Ndb.hpp:
  make auto-incr methods return int 0/-1
ndb/src/ndbapi/Ndb.cpp:
  make auto-incr methods return int 0/-1
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  make auto-incr methods return int 0/-1
ndb/test/ndbapi/testDict.cpp:
  make auto-incr methods return int 0/-1
ndb/tools/restore/consumer_restore.cpp:
  make auto-incr methods return int 0/-1
sql/ha_ndbcluster.cc:
  make auto-incr methods return int 0/-1
2006-05-17 12:40:10 +02:00
unknown
2cd08261d4 Merge tulin@production.mysql.com:mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-05-17 00:33:12 +02:00
unknown
6ee68c82fb Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/tools/waiter.cpp:
  Auto merged
2006-05-17 00:23:40 +02:00
unknown
a2f26487ff ndb: added some missing error codes to mgmapi
ndb: ndb_waiter disconnect/reconnect on get status error


ndb/src/mgmapi/mgmapi.cpp:
  ndb: added some missing error codes to mgmapi
ndb/tools/waiter.cpp:
  ndb: ndb_waiter disconnect/reconnect on get status error
2006-05-17 00:22:43 +02:00
unknown
d1ccab4129 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  production.mysql.com:/usersnfs/tulin/mysql-5.0
2006-05-16 21:46:00 +02:00
unknown
a514a26cd0 Merge mysql.com:/usr_rh9/home/elkin.rh9/4.1
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0


mysql-test/t/rpl_temporary.test:
  Auto merged
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
ndb/test/ndbapi/Makefile.am:
  Auto merged
2006-05-16 19:33:24 +03:00
unknown
864bd28331 ndb - bug#14509 [related] fix a return value
ndb/src/ndbapi/Ndb.cpp:
  fix a return value
2006-05-16 16:17:30 +02:00
unknown
0219f8b003 ndb - bug#14509 [related] setAutoIncrement: add error handling
ndb/include/ndbapi/Ndb.hpp:
  setAutoIncrement: add error handling
ndb/src/ndbapi/Ndb.cpp:
  setAutoIncrement: add error handling
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  setAutoIncrement: add error handling
ndb/tools/restore/consumer_restore.cpp:
  setAutoIncrement: add error handling
sql/ha_ndbcluster.cc:
  setAutoIncrement: add error handling
2006-05-16 12:58:41 +02:00
unknown
f5afd23358 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/ndbapi/SignalSender.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
2006-05-16 11:50:13 +02:00
unknown
976deafba6 Bug #18591 Repeated "show" and "all status" calls to ndb_mgm causes mgmd to crash
- not having lock can cause "block number list" to become corrupt => crash
- also may result in 2 threads receiving same block no => possble cause of
Bug #13987 Cluster: Loss of data nodes can cause high CPU usage from ndb_mgmd


ndb/src/mgmsrv/MgmtSrvr.cpp:
  ndb: added missing lock of mutex
2006-05-16 11:47:33 +02:00
unknown
9f46b3b53e Merge jonas@perch:src/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1


support-files/mysql.spec.sh:
  Auto merged
2006-05-16 11:31:10 +02:00
unknown
c1a2870988 Merge jonas@perch:src/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


support-files/mysql.spec.sh:
  Auto merged
2006-05-16 11:05:50 +02:00
unknown
ce7a7b20d1 ndb - bug#19537: arithmetic conversion Uint64 reg to Uint32 attr
ndb/test/ndbapi/Makefile.am:
  enable testInterpreter
ndb/test/ndbapi/testInterpreter.cpp:
  add test case Bug19537
  the bug fix also fixed IncValue64 for whatever reason..
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  bug#19537: write_attr: perform arithmetic conversion Uint64 to Uint32
2006-05-15 19:53:29 +02:00
unknown
84b8f11141 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
ndb/src/ndbapi/DictCache.hpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
ndb/include/ndbapi/ndb_cluster_connection.hpp:
  manual merge
ndb/src/ndbapi/ClusterMgr.cpp:
  manual merge
ndb/src/ndbapi/ClusterMgr.hpp:
  manual merge
2006-05-15 18:44:17 +02:00
unknown
37f940ce86 Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
- invalidate ndb dict cache on cluster disconnect (ClusterMgr.cpp)
- add check for correct frm on external lock when table cache is found invalid


ndb/include/ndbapi/ndb_cluster_connection.hpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/ClusterMgr.cpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/ClusterMgr.hpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/DictCache.cpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/DictCache.hpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/TransporterFacade.hpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
sql/ha_ndbcluster.cc:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
mysql-test/r/ndb_autodiscover3.result:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
mysql-test/t/ndb_autodiscover3.test:
  Bug #16875 Using stale MySQLD FRM files can cause restored cluster to fail
2006-05-15 16:23:59 +02:00
unknown
cba185d924 Merge mysql.com:/home/marty/MySQL/mysql-4.1_old
into  mysql.com:/home/marty/MySQL/mysql-4.1
2006-05-12 10:21:17 +02:00
unknown
cda752e3cf ndb - bug#14509 (5.0) part 2: create SYSTAB_0 row on first use
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  do not pre-create tupleid values (the values were obsolete too).
  they are created on first use.
  this is easy way to handle rolling upgrade when number of tables is increased
ndb/src/ndbapi/Ndb.cpp:
  create SYSTAB_0 row on first use (use writeTuple).
  fix check of interpreted program return code
2006-05-11 12:58:45 +02:00
unknown
06d0f3fb22 Merge mysql.com:/home/marty/MySQL/mysql-4.1
into  mysql.com:/home/marty/MySQL/mysql-5.0


ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Auto merged
2006-05-09 12:17:38 +02:00
unknown
1bdb7f7789 bug #19623 UniqueHashIndexes resource leak: allocate array pool based on MaxNoOfTables 2006-05-09 11:55:41 +02:00
unknown
f272d3272a ndb - bug#14509, part 1: move autoincr pre-fetch from Ndb to local dict cache
mysql-test/r/ndb_alter_table.result:
  bug#14509, part 1
  move cached autoincr range from Ndb object to local dict cache (Ndb_local_table_info)
  remove private methods get/read/setTupleId by table name or table id
mysql-test/t/ndb_alter_table.test:
  bug#14509, part 1
  move cached autoincr range from Ndb object to local dict cache (Ndb_local_table_info)
  remove private methods get/read/setTupleId by table name or table id
ndb/include/ndbapi/Ndb.hpp:
  bug#14509, part 1
  move cached autoincr range from Ndb object to local dict cache (Ndb_local_table_info)
  remove private methods get/read/setTupleId by table name or table id
ndb/src/ndbapi/DictCache.cpp:
  bug#14509, part 1
  move cached autoincr range from Ndb object to local dict cache (Ndb_local_table_info)
  remove private methods get/read/setTupleId by table name or table id
ndb/src/ndbapi/DictCache.hpp:
  bug#14509, part 1
  move cached autoincr range from Ndb object to local dict cache (Ndb_local_table_info)
  remove private methods get/read/setTupleId by table name or table id
ndb/src/ndbapi/Ndb.cpp:
  bug#14509, part 1
  move cached autoincr range from Ndb object to local dict cache (Ndb_local_table_info)
  remove private methods get/read/setTupleId by table name or table id
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  bug#14509, part 1
  move cached autoincr range from Ndb object to local dict cache (Ndb_local_table_info)
  remove private methods get/read/setTupleId by table name or table id
ndb/src/ndbapi/Ndbinit.cpp:
  bug#14509, part 1
  move cached autoincr range from Ndb object to local dict cache (Ndb_local_table_info)
  remove private methods get/read/setTupleId by table name or table id
2006-05-08 15:19:17 +02:00
unknown
82a3779449 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


support-files/mysql.spec.sh:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  merge
2006-05-08 07:56:26 +02:00
unknown
2dce78e8f6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1


support-files/mysql.spec.sh:
  Auto merged
2006-05-08 07:48:08 +02:00
unknown
b1e20006b6 Bug#16997 Table rename that changes database does not rename indexes, recreate indexes in new database 2006-05-05 17:18:47 +02:00
unknown
303cdacd09 ndb - bug#17421, changes NDB API pushdown LIKE arg to plain char
mysql-test/r/ndb_condition_pushdown.result:
  bug#17421, changes NDB API pushdown LIKE arg to plain char
mysql-test/t/ndb_condition_pushdown.test:
  bug#17421, changes NDB API pushdown LIKE arg to plain char
ndb/include/ndbapi/NdbOperation.hpp:
  bug#17421, changes NDB API pushdown LIKE arg to plain char
ndb/include/util/NdbSqlUtil.hpp:
  bug#17421, changes NDB API pushdown LIKE arg to plain char
ndb/src/common/util/NdbSqlUtil.cpp:
  bug#17421, changes NDB API pushdown LIKE arg to plain char
2006-05-05 00:53:34 +02:00
unknown
b5732e7c8c Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/space/pekka/ndb/version/my50


mysql-test/r/ndb_blob.result:
  Auto merged
mysql-test/t/ndb_blob.test:
  Auto merged
ndb/include/kernel/signaldata/TcKeyReq.hpp:
  Auto merged
ndb/include/ndbapi/NdbBlob.hpp:
  Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
sql/sql_table.cc:
  Auto merged
ndb/tools/delete_all.cpp:
  nuts
2006-05-03 23:17:16 +02:00
unknown
e93b203d08 ndb - bug#19201 (4.1), see comment in NdbBlob.cpp
ndb/test/ndbapi/testBlobs.cpp:
  option -fac (fetch across commit)
ndb/tools/delete_all.cpp:
  option --transactional (default remains truncate)
mysql-test/r/ndb_blob.result:
  bug#19201
mysql-test/t/ndb_blob.test:
  bug#19201
ndb/include/kernel/signaldata/TcKeyReq.hpp:
  bug#19201
ndb/include/ndbapi/NdbBlob.hpp:
  bug#19201
ndb/src/ndbapi/NdbBlob.cpp:
  bug#19201
2006-05-02 14:33:55 +02:00
unknown
db849fe79f Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-04-26 16:57:46 +02:00
unknown
2f955d19a6 Bug #18550 ndbd getting "node failure handling not complete..." after graceful restart
- addded more retries to wait for nodefailure to complete
Bug #19039 multi node failure causes node failure handling not to complete
- patch to avoid this scenario when the management server is used to perform the stop
- wait for NF_COMPLETE_REP in management server before returning
ndb: allocate nodeid
- only retry on retryable error
2006-04-26 16:57:45 +02:00
unknown
32d7b5c80a Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0


ndb/src/mgmsrv/Services.cpp:
  Auto merged
2006-04-26 16:57:43 +02:00
unknown
c0c6461a11 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-04-26 16:57:43 +02:00
unknown
2a04d49e77 ndb: added timeout handling to alloc node id to avoid the usage of purge stale sessions 2006-04-26 16:57:41 +02:00
unknown
e1e3a93f73 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-04-26 16:57:41 +02:00