stewart@willster.(none)
8f3ac043e8
Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
...
into willster.(none):/home/stewart/Documents/MySQL/5.1/bug20839
2006-10-26 21:29:27 +10:00
pekka@orca.ndb.mysql.com
0dac23f627
Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-tux
...
into orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-tux
2006-10-25 17:32:32 +02:00
pekka@orca.ndb.mysql.com
00db3c9982
ndb - dbtux: remove redundant code line (no functional change)
2006-10-25 17:30:30 +02:00
mskold/marty@mysql.com/linux.site
bf365af0bd
Bug #21072 Duplicate key error in NDB references wrong key: Re-wrote string usage to avoid valgrind warnings
2006-10-25 15:34:47 +02:00
mskold/marty@linux.site
c845b3e139
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-10-25 15:22:47 +02:00
mskold/marty@linux.site
c0ede46465
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-10-25 13:18:03 +02:00
mskold/marty@linux.site
6c8b930378
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-10-25 13:13:32 +02:00
stewart@willster.(none)
fb77211e2f
Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
2006-10-25 20:51:18 +10:00
stewart@willster.(none)
1f05ac4ac3
post merge fixes (from merging test fixes from bug 19914)
2006-10-25 20:37:10 +10:00
mskold/marty@mysql.com/linux.site
0dea24947d
Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0
2006-10-25 12:21:45 +02:00
mskold/marty@mysql.com/linux.site
44e55e3b43
Bug #21072 Duplicate key error in NDB references wrong key: Re-wrote string usage to avoid valgrind warnings
2006-10-25 11:44:40 +02:00
knielsen@ymer.(none)
e43c5fca48
Merge ymer.(none):/usr/local/mysql/mysql-4.1-ndb.tmp
...
into ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
2006-10-25 10:44:22 +02:00
stewart@willster.(none)
d5810cd067
Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb
...
into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
2006-10-25 18:41:17 +10:00
knielsen@ymer.(none)
44aa0f4de1
Fix two small problems in the source, potentially causing user-visible
...
bugs.
2006-10-25 10:37:53 +02:00
jonas@perch.ndb.mysql.com
d9d7c7859a
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-10-25 08:49:35 +02:00
jonas@perch.ndb.mysql.com
5230dcebcc
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-10-25 08:45:06 +02:00
jonas@perch.ndb.mysql.com
61f87f5d3c
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-10-25 08:31:30 +02:00
jonas@perch.ndb.mysql.com
6e4a0ec042
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
2006-10-25 08:28:30 +02:00
pekka@orca.ndb.mysql.com
64c414a004
Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb
...
into orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-tux
2006-10-24 20:52:09 +02:00
stewart@willster.(none)
a8037f478d
fix result file for ndb_multi
2006-10-25 00:41:55 +10:00
stewart@willster.(none)
dc38d0249a
fix ndb_cache_multi2
...
util thread wasn't behaving correctly after 241 error due to get_table_statistics
not properly returning an error code
2006-10-24 23:26:58 +10:00
mskold/marty@mysql.com/linux.site
0067cd8a4a
bug#21873 MySQLD Crash on ALTER...ADD..UNIQUE..USING HASH statement for NDB backed table: Use passed key_info to check for nullable fields
2006-10-24 12:24:32 +02:00
mskold/marty@mysql.com/linux.site
8da80dd39d
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-10-24 08:29:37 +02:00
stewart@willster.(none)
826628c99b
post merge fix
2006-10-24 00:18:57 +10:00
stewart@willster.(none)
3c2eeb2c15
Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2-merge2
...
into willster.(none):/home/stewart/Documents/MySQL/5.0/ndb
2006-10-23 23:57:28 +10:00
stewart@willster.(none)
5926602aa7
Bug #19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables
...
fixes for ndb_* tests broken by previous fix
be more careful in ndb about setting errors on failure of info call (especially
in open)
2006-10-23 23:46:35 +10:00
stewart@willster.(none)
fc776db8e7
Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2
...
into willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2-merge2
2006-10-23 23:43:48 +10:00
pekka@orca.ndb.mysql.com
af27544fd6
Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb
...
into orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-tux
2006-10-23 12:55:53 +02:00
jonas@perch.ndb.mysql.com
79d8773e31
ndb -
...
revert fix bug#21052 as it's wrong, and induces bus-error on node crashes
2006-10-22 08:24:31 +02:00
jonas@perch.ndb.mysql.com
bcb92268e7
merge
2006-10-20 16:26:40 +02:00
jonas@perch.ndb.mysql.com
c2dcd9a9f0
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-work
2006-10-20 16:25:14 +02:00
jonas@perch.ndb.mysql.com
822e638d57
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-work
2006-10-20 16:22:16 +02:00
jonas@perch.ndb.mysql.com
a03b282f17
ndb - bug#23499 and bug#23502
...
Fix some too small buffers in backup
2006-10-20 16:16:01 +02:00
stewart@willster.(none)
910e4d974c
BUG#20839 Illegal error code: 155 returned downgrading from 5.1.12-> 5.1.11
...
post-review fixups - magnus suggested creating dynstr_trunc instead of doing
it manually.
2006-10-20 22:47:28 +10:00
jonas@perch.ndb.mysql.com
ff05ba5131
ndb - bug#23494
...
Fix bug in restore with table with many columns, Compute size of databuffer pool correctly
2006-10-20 14:37:34 +02:00
jonas@perch.ndb.mysql.com
07c6a601ea
ndb -
...
Add better error message if getting error in RESTORE
2006-10-20 14:36:39 +02:00
jonas@perch.ndb.mysql.com
11b4ac4733
ndb - bug#22838
...
when doing create unique index which mysql will silently converts to PK, ndb is not informed
so table will be useless.
change so that we never do online add index wo/ primary key.
this is not good, but it's better than a useless table
2006-10-20 14:35:59 +02:00
jonas@perch.ndb.mysql.com
6980a0090f
merge
2006-10-20 14:35:22 +02:00
jonas@perch.ndb.mysql.com
4218eb0fde
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-work
2006-10-20 14:31:39 +02:00
jonas@perch.ndb.mysql.com
ab4ec626e2
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-work
2006-10-20 13:38:49 +02:00
jonas@perch.ndb.mysql.com
303d7f6bed
ndb -
...
Fixed a 4.1/5.0 vs. 5.1 name change in latest SR bug fix
2006-10-20 13:38:15 +02:00
jonas@perch.ndb.mysql.com
a93a4c7bdb
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-work
2006-10-20 12:31:51 +02:00
jonas@perch.ndb.mysql.com
88385d162a
ndb -
...
Fix monster SR bug making SR with ordered indexes (or temporary tables) broken
2006-10-20 12:29:16 +02:00
mskold/marty@linux.site
22ed305062
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-10-19 15:32:21 +02:00
mskold/marty@linux.site
dfa91a4043
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-10-19 15:29:52 +02:00
mskold/marty@mysql.com/linux.site
a1b40c1679
Bug #21072 Duplicate key error in NDB references wrong key: use MAX_KEY to signal unknown key: Added string initialization
2006-10-19 15:22:50 +02:00
mskold/marty@linux.site
33538223b6
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-10-19 15:15:03 +02:00
mskold/marty@mysql.com/linux.site
6961bd6315
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2006-10-19 15:08:10 +02:00
mskold/marty@mysql.com/linux.site
b97dff67c9
Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0
2006-10-19 15:00:46 +02:00
mskold/marty@mysql.com/linux.site
240cd87dbf
Bug #21072 Duplicate key error in NDB references wrong key: use MAX_KEY to signal unknown key: Added string initialization
2006-10-19 14:57:04 +02:00