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
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
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
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