jonas@perch.ndb.mysql.com
81f9676de6
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-09-03 17:55:01 +02:00
pekka@orca.ndb.mysql.com
2534153973
ndb - bug#21754 ndb api events: fix sizes for blobs + remove expensive loop
2006-09-03 16:13:59 +02:00
jonas@perch.ndb.mysql.com
16a32bc211
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
2006-09-03 11:31:51 +02:00
jonas@perch.ndb.mysql.com
5a78db3ddc
ndb -
...
fix ndb-violations of strict aliasing found by gcc4.1
(crashes in ndb_dd_*)
2006-09-03 11:11:37 +02:00
jonas@perch.ndb.mysql.com
6d715dead0
ndb -
...
gcc-4.1.1 work-around for bug in strict-aliasing
2006-09-03 10:57:34 +02:00
pekka@orca.ndb.mysql.com
454d545473
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
2006-09-02 05:23:04 +02:00
mskold/marty@mysql.com/linux.site
ccd3e89525
Added missing return
2006-09-01 20:56:34 +02:00
brian@zim.(none)
c7baf60267
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/tmp/mysql-5.1-arch
2006-09-01 09:19:10 -07:00
mskold/marty@linux.site
04a62eb684
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-09-01 15:26:03 +02:00
mskold/marty@mysql.com/linux.site
8fdc781d39
Fixed ndbapi-examples, and added tests for mysql-test-run.pl
2006-09-01 15:14:50 +02:00
evgen@moonbone.local
e1c245bff3
Merge moonbone.local:/home/evgen/bk-trees/mysql-5.1-opt
...
into moonbone.local:/work/tmp_merge-5.1-mysql
2006-09-01 14:08:38 +04:00
dli@dev3-76.dev.cn.tlan
ac481a3206
Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-21345
...
into dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-21345
2006-09-01 10:36:32 +08:00
brian@zim.(none)
b5fdcc2962
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/tmp/mysql-5.1-arch
2006-08-31 16:11:57 -07:00
gni/root@dev3-127.(none)
2b94b80661
BUG#21033 The error log of mysqld shows useless information, and hides the real error.
2006-08-31 18:29:23 +08:00
pekka@orca.ndb.mysql.com
2da1333a61
ndb - bug#21690 workaround-fix, cleanup in separate patch
2006-08-31 10:54:34 +02:00
evgen@moonbone.local
94028c618f
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into moonbone.local:/work/tmp_merge-5.1-opt-mysql
2006-08-31 12:14:27 +04:00
cmiller@zippy.cornsilk.net
d575196c35
Manual merge.
2006-08-30 21:26:43 -04:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
38a59efbc9
add 2 placeholder values for config and system variables.
2006-08-30 14:27:29 -07:00
mskold/marty@mysql.com/linux.site
6bac3b8f40
NDBAPI cleanup
2006-08-30 11:41:21 +02:00
jonas@perch.ndb.mysql.com
365b69dc7f
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-29 22:56:23 +02:00
evgen@moonbone.local
8cf9781717
Merge moonbone.local:/work/tmp_merge-5.0-mysql
...
into moonbone.local:/work/tmp_merge-5.1-opt-mysql
2006-08-29 18:58:50 +04:00
jonas@perch.ndb.mysql.com
853cf3dac4
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-29 09:20:09 +02:00
jonas@perch.ndb.mysql.com
b6e908ca29
ndb -
...
fix backup/lcp race
2006-08-29 09:19:41 +02:00
gni/root@dev3-127.(none)
49e96f3bc9
Merge dev3-127.(none):/mnt/mysql/home/ngb/bug19873
...
into dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-bug19873
2006-08-29 13:43:04 +08:00
gni/root@dev3-127.(none)
dd82086f67
Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-ndb-bj
2006-08-29 11:04:51 +08:00
tnurnberg@salvation.intern.azundris.com
499553365e
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1
2006-08-28 19:30:58 +02:00
jonas@perch.ndb.mysql.com
6011ad7868
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-28 16:03:51 +02:00
jonas@perch.ndb.mysql.com
8fb56fbc3a
ndb -
...
Snapup testBackup XXXerror
2006-08-28 15:55:30 +02:00
jonas@perch.ndb.mysql.com
802990e139
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-work
2006-08-28 10:27:02 +02:00
jonas@perch.ndb.mysql.com
b3ee645364
ndb - autotest
...
adopt to new error code 755 (invalid tablespace)
2006-08-28 08:32:14 +02:00
brian@zim.(none)
7216b5bc7a
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/home/brian/mysql/arch-5.1
2006-08-25 14:07:30 -07:00
brian@zim.(none)
e831273902
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/arch-5.1
2006-08-25 13:32:06 -07:00
brian@zim.(none)
baa914e66d
Cleanup of unused variables.
...
Fixed "discover" in the handler API.
Fixed problem where handlerton was not zero'ed. I need to look around, I suspect this problem is more widespread.
2006-08-25 13:31:15 -07:00
jonas@perch.ndb.mysql.com
97a956ca73
ndb - fix some bug in testSRBank
2006-08-25 16:47:31 +02:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
aeea252b4d
no longer need ifdef as plugin is conditionally compiled
2006-08-25 00:37:01 -07:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
b68f0437e7
fix for windows build
2006-08-24 22:10:55 -07:00
jonas@perch.ndb.mysql.com
a7513025c4
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-24 20:31:54 +02:00
jonas@perch.ndb.mysql.com
392b7ea14b
ndb -
...
disable ndb_binlog_discover as it's broken
remove debug printout
2006-08-24 20:31:12 +02:00
jonas@perch.ndb.mysql.com
cac363e69e
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-24 15:23:46 +02:00
jonas@perch.ndb.mysql.com
74defc5737
ndb - fix monster bug in NdbEventOperation->stop where Suma sent uninitialized data
...
affects basically all replication tests
2006-08-24 15:22:07 +02:00
petr/cps@mysql.com/owlet.local
e36be72adb
after merge fix
2006-08-24 16:17:42 +04:00
jonas@perch.ndb.mysql.com
e16c431759
ndb -
...
bug#21800 - 5.0 -> 5.1 merge
2006-08-24 07:25:54 +02:00
brian@zim.(none)
212ab97668
This patch removes need for a innodb to have its own configure.
2006-08-23 13:59:16 -07:00
jonas@perch.ndb.mysql.com
e5e5d0273b
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-23 12:40:58 +02:00
jonas@perch.ndb.mysql.com
51fc14dd12
ndb - sr -
...
Fix so that expand_check2 is only run per fragment,
as restore now works 1 fragment at a time (again)
2006-08-23 11:22:48 +02:00
brian@zim.(none)
b518763728
This changest:
...
Plugins now when compiled or not compiled work correctly with status variables.
Status variables from plugins now set their own names (removed bit where plugin name was pre-appended this broke Innodb and Cluster)
A few Makefile cleanups.
2006-08-22 16:24:12 -07:00
pekka@orca.ndb.mysql.com
4828d63cda
Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
...
into orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug21017
2006-08-22 15:00:42 +02:00
pekka@orca.ndb.mysql.com
b97a4b7f44
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
2006-08-22 10:24:58 +02:00
jonas@perch.ndb.mysql.com
a1ea21bf26
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-22 09:49:28 +02:00
jonas@perch.ndb.mysql.com
e0f7590e7c
ndb -
...
fix incorrect assertion in dbacc
2006-08-22 09:45:35 +02:00