tomas@whalegate.ndb.mysql.com
8dd90e8817
WL#1190 preparatory work needed for compatability with future online add column
2007-04-26 13:36:51 +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
jonas@perch.ndb.mysql.com
35b65dbf14
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-04-25 23:49:37 +02:00
jonas@perch.ndb.mysql.com
0fc59172aa
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-25 23:48:31 +02:00
jonas@perch.ndb.mysql.com
7c7f5104eb
ndb -
...
clean up varsize
by putting varpart ref "inside" fixpart instead of "optionally" at the end
2007-04-25 22:50:35 +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
jonas@perch.ndb.mysql.com
7b215a5762
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-04-25 18:02:40 +02:00
lzhou/zhl@dev3-63.(none)
fcec5410bf
BUG#27207 Return correct error message when ndb_mgmd start with wrong config.ini parameter in TCP section
2007-04-25 14:39:16 +00:00
knielsen@ymer.(none)
0faa86bb86
After-merge fixes.
2007-04-25 15:48:12 +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)
0027a93dc5
Merge ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca-bug28073
...
into ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca
2007-04-25 15:21:05 +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)
e8c6b76615
BUG#28073: Infinite loop in lock queue.
...
In a certain code path the NDBD could loop infinitely in the lock queue.
2007-04-25 14:38:05 +02:00
gni@dev3-221.dev.cn.tlan
9aadf5ad20
BUG#25741 AllocNodeIdRef::NodeFailureHandlingNotCompleted
2007-04-25 15:57:42 +08:00
stewart@willster.(none)
14cf73361a
Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
2007-04-24 13:45:28 -07:00
stewart@willster.(none)
14ff88741c
Bug #24228 ndb_size.pl requires non-standard HTML::Template module
...
Bug #24227 ndb_size.pl should report default values instead of < default for config params
Bug #24229 ndb_size.pl doesn't compute Index usage correctly
Big ndb_size.pl update
2007-04-24 13:43:13 -07:00
df@pippilotta.erinye.com
6992b90152
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
2007-04-24 22:34:57 +02:00
tomas@whalegate.ndb.mysql.com
64d2bea65b
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-24 19:23:36 +02:00
gni@dev3-221.dev.cn.tlan
98d37e1d6c
Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
...
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/bug18676
2007-04-24 18:28:23 +08:00
gni@dev3-221.dev.cn.tlan
1869b2c4d0
Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
...
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/bug18676
2007-04-24 17:34:36 +08:00
gni@dev3-221.dev.cn.tlan
40060d2f2e
Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
...
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug22240
2007-04-24 17:29:00 +08:00
jonas@perch.ndb.mysql.com
da8931cb98
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-04-24 09:53:32 +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
jonas@perch.ndb.mysql.com
542c9e9b5d
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-04-24 08:24:34 +02:00
jonas@perch.ndb.mysql.com
dfa2008911
ndb - bug#21755
...
table/index (es) need special treatment...
2007-04-24 08:22:30 +02:00
dli@dev3-164.dev.cn.tlan
c98aea71e4
Merge dev3-164.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
...
into dev3-164.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-23137
2007-04-24 10:28:11 +08:00
gni@dev3-221.dev.cn.tlan
4648c56769
BUG#22240 Upgrading from cluster 5.0 to 5.1 does not resize VARCHARS as expected. With --no-upgrade (-u) option, user can decide if ignore the upgrade, the default action is to upgrade them.
2007-04-24 09:45:15 +08:00
iggy@recycle.(none)
13b54aa963
Bug#24732 Executables do not include Vista manifests
...
- Post merge cleanup.
2007-04-23 16:23:32 -04:00
tomas@whalegate.ndb.mysql.com
cf8ef29ca0
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-23 20:30:26 +02:00
tomas@whalegate.ndb.mysql.com
aca5ac19ed
new ndb tool to measure replication latency
2007-04-23 20:27:43 +02:00
tomas@whalegate.ndb.mysql.com
f24ada7fe6
simple extend of listen_event to do apply on remote cluster
2007-04-23 19:18:46 +02:00
tomas@whalegate.ndb.mysql.com
2029c3c26f
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-23 19:03:08 +02:00
msvensson@pilot.blaudden
2ac94c30f4
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-23 17:01:02 +02:00
jonas@perch.ndb.mysql.com
c7944ddda5
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-23 15:48:50 +02:00
jonas@perch.ndb.mysql.com
00ee136e45
ndb -
...
add new functions for (easier) using NdbRestarter
2007-04-23 15:48:06 +02:00
jonas@perch.ndb.mysql.com
aae07fd104
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-23 15:43:56 +02:00
jonas@perch.ndb.mysql.com
8fa46718ec
ndb -
...
add (auto) testcase for bug#28023
2007-04-23 15:38:06 +02:00
jonas@perch.ndb.mysql.com
a92a9b5380
ndb - bug#28023 (51-main)
...
Add/sub correct offsets (with 2 word varpart ref)
2007-04-23 14:22:23 +02:00
jonas@perch.ndb.mysql.com
770e48fca7
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-23 09:01:35 +02:00
jonas@perch.ndb.mysql.com
347a0bf722
ndb - Fix bug in new Hugo equal code (theStatus: 10)
2007-04-23 08:58:15 +02:00
mats@romeo.(none)
875de0e571
Merge romeo.(none):/home/bkroot/mysql-5.1-rpl
...
into romeo.(none):/home/bk/merge-mysql-5.1
2007-04-20 10:46:58 +02:00
tomas@whalegate.ndb.mysql.com
742a4d50e9
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
2007-04-20 10:46:34 +02:00
svoj@june.mysql.com
40a3e2fe04
Merge mysql.com:/home/svoj/devel/mysql/warn/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/warn/mysql-5.1-engines
2007-04-19 11:59:20 +05:00
tsmith@siva.hindu.god
cf1cf3a0d1
Applied innodb-5.1-ss1404 snapshot
...
Fixes:
- Bug #26662 : mysqld assertion when creating temporary (InnoDB) table on a tmpfs filesystem
Fix by not open(2)ing with O_DIRECT but rather calling fcntl(2) to set
this flag immediately after open(2)ing. This way an error caused by
O_DIRECT not being supported can easily be ignored.
- Bug #23313 : AUTO_INCREMENT=# not reported back for InnoDB tables
- Bug #21404 : AUTO_INCREMENT value reset when Adding FKEY (or ALTER?)
Report the current value of the AUTO_INCREMENT counter to MySQL.
2007-04-18 19:53:28 -06:00
tomas@whalegate.ndb.mysql.com
da2b2300c9
Bug#17095 circular replication
...
- make sure any value is set for linked operations as well, e.g. blob tables
2007-04-18 15:58:30 +02:00
svoj@june.mysql.com
05a8c545df
Merge mysql.com:/home/svoj/devel/mysql/BUG24342/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG24342/mysql-5.1-engines
2007-04-18 16:35:22 +05:00
tomas@poseidon.mysql.com
78e4f1e74c
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-04-18 07:55:31 +02:00
tomas@poseidon.mysql.com
1ccd09a2c1
Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-04-18 07:52:45 +02:00
jonas@perch.ndb.mysql.com
f7115f126b
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-17 16:50:08 +02:00
jonas@perch.ndb.mysql.com
6a35dddef4
ndb - bug#21755
...
redo checkSchemaState to handle bug (plus prepare to handle other DD related bugs in the area)
2007-04-17 16:43:47 +02:00
jonas@perch.ndb.mysql.com
4810b84c3c
ndb -
...
new big test prg testDict -n DictRestart
new bug test prg testDict -n Bug21755
2007-04-17 16:31:21 +02:00
jonas@perch.ndb.mysql.com
539c67e32a
ndb - make NdbMixRestarter a bit more verbose
2007-04-17 16:26:16 +02:00
jonas@perch.ndb.mysql.com
930f5cc234
ndb -
...
refactor testSRBank and create new class NdbMixRestarter
2007-04-17 09:54:36 +02:00
jonas@perch.ndb.mysql.com
527158baa5
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-16 19:05:19 +02:00
serg@janus.mylan
00479a441d
wl#2936 post-merge fixes
2007-04-16 18:16:17 +02:00
tomas@whalegate.ndb.mysql.com
03c6d037fc
Bug #27710 Creating unique index fails during single user mode
...
- enable indexes to be used always, if in single user, reject will happen before, and if it is kerlel doing stuff, it should always be allowed
2007-04-16 13:08:09 +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
serg@sergbook.mysql.com
6bc9bc92df
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936
2007-04-16 10:37:50 +02:00
jonas@perch.ndb.mysql.com
ee9448162c
ndb -
...
fix COPY_ROWID return value
2007-04-16 10:00:03 +02:00
gni/root@dev3-221.dev.cn.tlan
648b03aa14
BUG#18676 In order to coincide with 5.0 mysqld error code after bug#18676, Map the 4009 ndb error code to 157 mysql error code
2007-04-16 15:15:47 +08:00
serg@sergbook.mysql.com
c53037af36
more wl#2936 fixes: removed implicit ha_thd() calls (too error-prone),
...
fixed an assert crash
2007-04-15 15:47:27 +02:00
serg@janus.mylan
3ecbb5a443
wl#2936 - fixing problems
2007-04-13 19:23:02 +02:00
tomas@whalegate.ndb.mysql.com
0de46f18ca
remove duplicate info in paramInfo and ConfigInfo
2007-04-13 11:33:08 +02:00
svoj@june.mysql.com
dd8e472661
Merge mysql.com:/home/svoj/devel/mysql/BUG27516/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG27516/mysql-5.1-engines
2007-04-13 12:44:02 +05:00
tomas@whalegate.ndb.mysql.com
ac8d2dead6
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-13 01:45:44 +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
bdd0e4543e
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-04-12 16:01:45 +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
f06225a6e1
ndb - bug#27756
...
make sure that copy tuple is released in all cases
2007-04-12 15:55:39 +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
jonas@perch.ndb.mysql.com
3411ba8ba6
ndb - hugo - add new method for setting primary key(s)
2007-04-12 11:43:56 +02:00
tomas@whalegate.ndb.mysql.com
98c2e79af4
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-04-12 11:29:05 +02:00
tomas@whalegate.ndb.mysql.com
2e620e3db6
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 11:12:43 +02:00
jonas@perch.ndb.mysql.com
890b19c895
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 07:40:15 +02:00
jonas@perch.ndb.mysql.com
ca94188aae
ndb - bug#27757
...
tupscan misses uncommitted inserts by own transaction
let tupkeyreq handle dirty/savepoint
also siable diskscan as temporary fix for bug#27776
2007-04-12 06:59:56 +02:00
tomas@whalegate.ndb.mysql.com
ec6476cbef
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 20:30:23 +02:00
tomas@whalegate.ndb.mysql.com
537af12420
correct merge error
2007-04-11 19:38:29 +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
9696d5b465
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:30:22 +02:00
jonas@perch.ndb.mysql.com
8723380db2
ndb -
...
add event log listener test tool
2007-04-10 10:27:02 +02:00
jonas@perch.ndb.mysql.com
6dca65b57b
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-04-10 10:22:55 +02:00
jonas@perch.ndb.mysql.com
406620d71d
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:16:07 +02:00
jonas@perch.ndb.mysql.com
cd3c4a9786
ndb - bug#27651 (5.1)
...
Only prepare "next" GCI if we're in the first 4 highest GCI's
to avoid we can get several buckets with same GCI
2007-04-10 10:15:35 +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
holyfoot/hf@hfmain.(none)
33ed2ead2a
Merge bk@192.168.21.1:mysql-5.1
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-09 11:07:20 +05:00
kent@kent-amd64.(none)
a16289d550
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/kent/bk/tmp4/mysql-5.1-engines
2007-04-08 20:48:07 +02:00
holyfoot/hf@hfmain.(none)
ce426dd622
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-07 14:59:53 +05:00
acurtis/antony@ltamd64.xiphis.org
78734f145d
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into xiphis.org:/home/antony/work2/mysql-5.1-engines.merge
2007-04-06 17:18:26 +00: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
tomas@whalegate.ndb.mysql.com
d04730c06d
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-05 10:21:41 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
10dffc5a19
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 12:26:01 +08: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
6ec3cd9836
set name for ndb tools
2007-04-04 14:46:09 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
888c2057e9
sync the initialization configuration information between ConfigInfo.cpp and ParamInfo.cpp
2007-04-04 19:30:43 +08:00
gluh@mysql.com/eagle.(none)
2d47f0cb1b
Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
2007-04-03 16:13:27 +05: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
gni/root@dev3-221.dev.cn.tlan
e1971cfa51
Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
...
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug21699
2007-04-03 18:05:10 +08:00
gni/root@dev3-221.dev.cn.tlan
96c37edd5c
Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
...
into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug21699
2007-04-03 18:01:43 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
c8d0b6fc89
Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug24521-5.1-new-ndb-bj
2007-04-03 17:07:00 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
85c0d0554c
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug24521-5.1-new-ndb-bj
2007-04-03 17:03:12 +08:00
msvensson@pilot.blaudden
fc904eaead
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-02 11:15:09 +02:00
msvensson@pilot.blaudden
cbe7c63fc7
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-02 10:45:51 +02:00
jonas@perch.ndb.mysql.com
fbcfa4be3d
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-04-02 09:34:33 +02:00
jonas@perch.ndb.mysql.com
6f12c538c4
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-02 09:30:35 +02:00
jonas@perch.ndb.mysql.com
27902d6507
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-04-02 09:29:11 +02:00
jonas@perch.ndb.mysql.com
48e890be45
fix atrt mysql_install_db, make sure no extra my.cnf is read
2007-04-02 08:39:58 +02:00
svoj@april.(none)
51710387ab
Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG26138/mysql-5.1-engines
2007-03-31 17:29:40 +05:00
lzhou/zhl@dev3-63.(none)
4e39f3bb18
Merge dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug24793
...
into dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug24793
2007-03-30 16:43:39 +00:00
lzhou/zhl@dev3-63.(none)
439202bd9b
Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
...
into dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug23354
2007-03-30 13:30:58 +00:00
lzhou/zhl@dev3-63.(none)
984f807f5c
Merge dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug23354
...
into dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug23354
2007-03-30 11:02:36 +00:00
istruewing@chilla.local
8ad2472e24
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-03-30 12:33:44 +02:00
tomas@whalegate.ndb.mysql.com
1296080941
5.1.17 not compatible with 5.1.18 because of change in var page reference size
2007-03-30 11:37:21 +02:00
msvensson@pilot.blaudden
266cd861e7
Add missing \ causing CMakelists.txt etc not to be included in dist
2007-03-30 06:57:58 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
a9464595ea
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug25446-5.1-new-ndb-bj
2007-03-30 11:03:44 +08:00
tomas@whalegate.ndb.mysql.com
ca5f4f4642
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-29 14:15:19 +02:00
tomas@whalegate.ndb.mysql.com
b327e23c5b
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-03-29 14:10:51 +02:00
tomas@whalegate.ndb.mysql.com
90113ac9ee
Bug #27512 Inconsistent tuples when using variable size and >16Gb datamemory
...
- also run this patch on 32 bit machines to allow online upgrade
2007-03-29 14:10:21 +02:00
tomas@whalegate.ndb.mysql.com
8f8a659b79
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-03-29 13:52:17 +02:00
tsmith@quadxeon.mysql.com
0b0d2c3258
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
2007-03-29 12:58:26 +02:00
tomas@whalegate.ndb.mysql.com
5660e224c2
Bug #27512 Inconsistent tuples when using variable size and >16Gb datamemory
...
- increase var part reference from 32 to 64 bits on 64 bit systems
- note current patch does not allow for online upgrade from 32 to 64 bit systems or vice versa
2007-03-29 11:05:32 +02:00
istruewing@chilla.local
d0ad6cd45b
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-03-29 08:36:57 +02:00
tsmith@siva.hindu.god
4ffeba761f
Applied innodb-5.1-ss1381 snapshot
...
Bug #27381 : InnoDB exits when attempting to rename table to non-existant database
Fix Bug#27381 by calling os_file_handle_error_no_exit() instead of
os_file_handle_error().
2007-03-28 22:46:28 -06:00
antony@ppcg5.local
6f21d39d51
WL#2936
...
"Plugin Server Variables"
Post review cleanups.
2007-03-28 21:29:16 -07:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
566f48d07f
Bug#24521, ndbd node crashes if try to create many datafiles for tablespace
2007-03-29 10:59:05 +08:00
baker@bk-internal.mysql.com
1b9c4358a8
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-03-28 22:31:10 +02:00
istruewing@chilla.local
3f0bfd831a
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-03-28 17:06:09 +02:00
istruewing@chilla.local
20bb4ae8cf
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-03-28 16:59:09 +02:00
istruewing@chilla.local
350c5da724
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-03-28 16:57:08 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
cf21cf2c73
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug24568-5.0-ndb-bj
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug24568-5.1-new-ndb-bj
2007-03-28 11:11:11 +08:00
istruewing@chilla.local
f90c056b5c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into chilla.local:/home/mydev/mysql-5.1-bug24985
2007-03-27 17:59:49 +02:00
jonas@perch.ndb.mysql.com
c1946a59b9
ndb -
...
remove compiler warning/error
2007-03-27 16:47:08 +02:00
jonas@perch.ndb.mysql.com
050dcdee40
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 16:16:02 +02:00
jonas@perch.ndb.mysql.com
52469dee16
ndb -
...
reformat code a bit to be more compiler friendly
2007-03-27 16:15:22 +02:00
jonas@perch.ndb.mysql.com
924036859f
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 16:00:15 +02:00
jonas@perch.ndb.mysql.com
3aa1a59a77
ndb -
...
remove compiler warning from last changeset
2007-03-27 15:57:36 +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
istruewing@chilla.local
49884979b4
Merge chilla.local:/home/mydev/mysql-5.0-bug24985
...
into chilla.local:/home/mydev/mysql-5.1-bug24985
2007-03-27 12:46:54 +02:00
tomas@whalegate.ndb.mysql.com
a39fe6c128
Bug #27444 DataMemory missing from report in cluster logs
...
- error in initial signal length giving uninitialized variable
2007-03-27 11:12:26 +02:00
brian@zim.(none)
e661d6eeb6
Making sure thar archive is inited for info AUTO call.
2007-03-26 22:50:08 -07:00
brian@zim.(none)
9e1565e37e
Merge piggy:/home/brian/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/pread-archive-5.1
2007-03-26 17:31:52 -07:00
brian@zim.(none)
88719428f5
Centralized init logic for starting a scan.
2007-03-26 17:15:31 -07:00
brian@piggy.tangent.org
414da94c04
Adjusting locks for concurrency issue (not found, but suspect).
2007-03-26 16:45:17 -07: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
brian@zim.(none)
ff9da1f048
New comments, additional init for rebuild options.
2007-03-25 11:38:49 -07:00
pekka@clam.(none)
5f061a7e5c
Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb
...
into clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug24028
2007-03-25 15:06:19 +02:00