Commit graph

328 commits

Author SHA1 Message Date
tomas@whalegate.ndb.mysql.com
73306167ca Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-09 12:52:23 +02:00
jonas@perch.ndb.mysql.com
5db64df3dc Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-04-30 12:57:20 +02:00
jonas@perch.ndb.mysql.com
6559c77022 ndb - bug#28161
fix commit triggers with DD but not using DD
2007-04-30 12:56:16 +02:00
tomas@whalegate.ndb.mysql.com
c1cdd288b9 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-27 11:45:03 +02:00
joerg@trift-lap.fambruehe
044f2e110e Merge trift-lap.fambruehe:/MySQL/M50/push-5.0
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
2007-04-26 17:11:33 +02:00
tomas@whalegate.ndb.mysql.com
0326179d10 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-26 13:50:04 +02:00
tomas@whalegate.ndb.mysql.com
3b38c544eb ndb: force varpart part I, allow setting of flag in dictionary 2007-04-26 08:34:38 +02:00
knielsen@ymer.(none)
5dff16eb80 Merge bk-internal:/home/bk/mysql-5.1-telco-gca
into  ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca
2007-04-25 20:45:48 +02:00
knielsen@ymer.(none)
39914c9b9b Merge ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
2007-04-25 15:40:13 +02:00
knielsen@ymer.(none)
7a54b41925 Merge ymer.(none):/usr/local/mysql/mysql-5.0-telco-gca
into  ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca
2007-04-25 15:18:34 +02:00
knielsen@ymer.(none)
2c65524328 Merge bk-internal:/home/bk/mysql-5.1-new-ndb
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
2007-04-25 15:06:03 +02:00
knielsen@ymer.(none)
45e18df811 After-merge fixes. 2007-04-25 15:02:23 +02:00
knielsen@ymer.(none)
ae8f9ac9f3 Merge ymer.(none):/usr/local/mysql/mysql-5.0-ndb-bug27370
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
2007-04-24 09:00:13 +02:00
tomas@whalegate.ndb.mysql.com
2c723aa91f Bug #27712 Single user mode. Creating logfile group and tablespace is allowed 2007-04-16 11:43:14 +02:00
tomas@whalegate.ndb.mysql.com
ce23702510 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-12 21:35:39 +02:00
jonas@perch.ndb.mysql.com
6b67f57249 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-04-12 16:00:51 +02:00
jonas@perch.ndb.mysql.com
967eb52b68 ndb - bug#27756
testcase only
  new pseudo column NDB$COPY_ROWID
2007-04-12 11:47:38 +02:00
tomas@whalegate.ndb.mysql.com
deec4449ac Bug#26176 NdbObjectIdMap::expand unable to expand!! mysqld got signal 11
- try to catch as many malloc failures as possible and give error messages
(more for 5.1)
2007-04-11 18:10:45 +02:00
tomas@whalegate.ndb.mysql.com
da1ebc7fce Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-11 15:51:09 +02:00
jonas@perch.ndb.mysql.com
d2225f0894 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-04-10 10:06:04 +02:00
jonas@perch.ndb.mysql.com
ee4a94a0c1 ndb - bug#27728 (5.1)
Make sure API is connected to nodes when subscribing
2007-04-10 10:05:01 +02:00
tomas@whalegate.ndb.mysql.com
70fa6a4e5d ndb: change attribute id for ANY_VALUE as id was already reserved for upcoming read pached patch 2007-04-05 12:01:01 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
fdf57c7ac2 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
2007-04-05 10:47:40 +08:00
tomas@whalegate.ndb.mysql.com
81ac116dfa Bug #17095 Cluster RBR in circle does not terminate
- add any value to ndb
- use it to update correct server id in binlog thread
2007-04-03 12:57:18 +02:00
jonas@perch.ndb.mysql.com
d50539b624 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-27 14:33:18 +02:00
jonas@perch.ndb.mysql.com
e5faf16bc0 ndb - bug#27466 nf during nr can leave cluster in inconsistent state (recommit in 5.1)
Fix race condition between NODE_FAILREP and local INCL_NODEREQ loop
    Also retry on ZNODE_START_DISALLOWED_ERROR
2007-03-27 14:27:43 +02:00
tomas@whalegate.ndb.mysql.com
d4982247cf Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-26 20:57:10 +02:00
tomas@whalegate.ndb.mysql.com
d5f63f25c5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-23 21:50:57 +01:00
tomas@whalegate.ndb.mysql.com
78dce2dd97 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-single-user
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-23 17:17:44 +01:00
tomas@whalegate.ndb.mysql.com
f4fed734c6 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-23 14:17:08 +01:00
tomas@whalegate.ndb.mysql.com
9899df36bd Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user
2007-03-23 14:06:00 +01:00
stewart@mysql.com[stewart]
471469a674 [PATCH] WL#3704 mgmapi timeouts: For mgm server, have timeout per operation, not for entire connection (i.e. fix the bug)
for TransporterRegistry, keep connection to management server alive.


Index: ndb-work/storage/ndb/include/util/InputStream.hpp
===================================================================
2007-03-22 22:36:07 +11:00
stewart@mysql.com[stewart]
75cff8cd26 [PATCH] WL#3704 mgmapi timeouts: Correct cpc client usage of Socket Input/OutputStream for timeouts
Index: ndb-work/storage/ndb/include/util/InputStream.hpp
===================================================================
2007-03-22 22:35:55 +11:00
stewart@mysql.com[stewart]
acb61e810c [PATCH] WL#3704 mgmapi timeouts: update NDBAPI usage of mgmapi for timeouts
Default timout of 30secs for ConfigRetriever

Default timout of 5sec for use by Transporter (ports etc).

And Ndb_cluster_connection::set_timeout() api for setting timeout from
NDBAPI applications. Should be called before connect. e.g.

c.set_timeout(4200);
c.connect();

Index: ndb-work/storage/ndb/include/mgmcommon/ConfigRetriever.hpp
===================================================================
2007-03-22 22:35:31 +11:00
stewart@mysql.com[stewart]
c537c27796 [PATCH] WL#3704 mgmapi timeouts: Change to have total timeout for call, not per request
use portable method, getting milliseconds between calls - Linux would
let us do funky stuff by getting the timeout from select(2). Everywhere
else sucks and doesn't let us do that :(

Index: ndb-work/storage/ndb/include/util/InputStream.hpp
===================================================================
2007-03-22 22:35:07 +11:00
stewart@mysql.com[stewart]
298719def2 [PATCH] WL#3704 mgmapi timeouts: clarify multiple mgmd connect timeout semantics
Index: ndb-work/storage/ndb/include/mgmapi/mgmapi.h
===================================================================
2007-03-22 22:34:55 +11:00
stewart@mysql.com[stewart]
e77a4480ab [PATCH] WL#3704 mgmapi timeouts: consolidate NdbMgmHandle timeouts into one
Only one timeout value is needed. Also saves 8bytes per NdbMgmHandle :)

Index: ndb-work/storage/ndb/include/mgmapi/mgmapi.h
===================================================================
2007-03-22 22:34:43 +11:00
stewart@mysql.com[stewart]
64361ee36f [PATCH] WL#3704 mgmapi timeouts: Add bool timeout flag to Streams
Index: ndb-work/storage/ndb/include/util/InputStream.hpp
===================================================================
2007-03-22 22:33:43 +11:00
stewart@mysql.com[stewart]
c2f0a25dc4 [PATCH] WL#3704 mgmapi timeouts: Rename inputstream timeout
Index: ndb-work/storage/ndb/include/util/InputStream.hpp
===================================================================
2007-03-22 22:33:31 +11:00
stewart@mysql.com[stewart]
36888199ac [PATCH] WL#3704 mgmapi timeouts: add ndb_mgm_set_timeout(h,ms)
Add not so neat set_timeout call to make testMgm work

Index: ndb-work/storage/ndb/include/mgmapi/mgmapi.h
===================================================================
2007-03-22 22:33:19 +11:00
gni/root@dev3-221.dev.cn.tlan
61dd58beb3 BUG#21699 DROP last DATAFILE from TABLESPACE even though there are still table in it. And it gives the cofusing error message. 2007-03-20 10:36:20 +08:00
tomas@poseidon.
12fd06a6cb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  poseidon.:/home/tomas/mysql-5.1-new-ndb
2007-03-19 10:54:47 +01:00
jonas@perch.ndb.mysql.com
023ce289b6 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-13 13:56:51 +01:00
jonas@perch.ndb.mysql.com
4a27e9adb9 ndb - bug#27003
merge to 5.1, adopt testprg to optimized node recovery
2007-03-13 12:38:47 +01:00
tomas@poseidon.mysql.com
f4e0bc78dd Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-09 01:01:20 +07:00
tomas@poseidon.mysql.com
e4eb1c0087 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca-ndb_restore
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore
2007-03-08 15:57:33 +07:00
tomas@poseidon.mysql.com
8370b2c5e0 Merge poseidon.mysql.com:/home/tomas/mysql-5.1
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-08 08:39:49 +07:00
tomas@poseidon.mysql.com
bd49cdd273 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca-ndb_restore
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore
2007-03-07 13:44:54 +07:00
tomas@poseidon.mysql.com
e0ba5ee1ab Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-02 09:17:17 +07:00
tomas@poseidon.mysql.com
60ab46bd87 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
2007-03-02 09:13:00 +07:00