Commit graph

2138 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
697cfe7f07 Merge from 4.1 2005-05-26 21:01:55 +02:00
joerg@mysql.com
5178c84bef Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mysql-5.0
2005-05-26 18:12:56 +02:00
joerg@mysql.com
9504bd0ddd Manual merge. 2005-05-26 12:51:44 +02:00
msvensson@neptunus.(none)
6c00006d2c Fix icc compiler warning 2005-05-26 12:12:36 +02:00
msvensson@neptunus.(none)
676ba73480 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-05-26 11:37:19 +02:00
msvensson@neptunus.(none)
f3cc29e93b Fix compiler warning 2005-05-26 11:36:01 +02:00
stewart@mysql.com
119e500c80 BUG#10831 ndb mgmd LogDestination maxfiles does not rotate logs properly 2005-05-25 15:35:51 +10:00
msvensson@neptunus.(none)
197978e3d1 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0.6-build
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-tmp
2005-05-23 19:01:16 +02:00
msvensson@neptunus.(none)
548994aa7b Build fixes for icc, compile _without_ "-no-gnu" 2005-05-23 18:53:53 +02:00
msvensson@neptunus.(none)
3973e55f49 Build fix 2005-05-23 15:02:02 +02:00
pekka@mysql.com
cfb1b90005 ndb - NdbDictionaryImpl.cpp: fix access to freed memory 2005-05-22 20:47:08 +02:00
bell@sanja.is.com.ua
299f06d4fd Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug-5.0
2005-05-20 17:32:36 +03:00
bell@sanja.is.com.ua
e37fbf2382 Macos 10.4 compatibility changes 2005-05-20 16:21:23 +03:00
monty@mysql.com
0b75f6e37b compatibility issues
Fixed errors reported by valgrind (some errors in NDB remains)
2005-05-20 16:14:35 +03:00
msvensson@neptunus.(none)
72dcde4111 Merge neptunus.(none):/home/msvensson/mysql/bug9626
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-build
2005-05-19 20:41:23 +02:00
msvensson@neptunus.(none)
920c16c055 BUG#9626 valgrind warnings
- after review fixes
2005-05-19 20:38:48 +02:00
magnus@msdesk.mysql.com
8a0f304375 Fix 2005-05-19 16:00:32 +02:00
msvensson@neptunus.(none)
a996abc594 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug9626
2005-05-19 14:53:57 +02:00
msvensson@neptunus.(none)
cb5bfad14e Fix 2005-05-19 12:53:44 +02:00
msvensson@neptunus.(none)
89415d272c Merge 2005-05-18 20:52:59 +02:00
msvensson@neptunus.(none)
2d515425a3 BUG#9626
- Fix valgrind warnings
 - Remove static db, schema and table name buffers from Ndb.cpp
2005-05-18 20:50:29 +02:00
jimw@mysql.com
3f6aad900c Resolve merge from 4.1 2005-05-18 11:06:34 -07:00
pekka@mysql.com
6dbcd43224 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2005-05-18 18:05:37 +02:00
pekka@mysql.com
c054f84ae3 ndb - allow upgrade 4.1.10->4.1.12 2005-05-18 17:47:43 +02:00
tulin@dl145c.mysql.com
13bbb3dbb3 ndberror.c:
updated error message for ndb
2005-05-18 10:22:27 +02:00
pekka@mysql.com
3131434dcf ndb - wl-2451 update schemafile format change to 5.0.6 2005-05-15 18:10:30 +02:00
pekka@mysql.com
143ad5081a ndb - testScan -n ScanRead488O fix 2005-05-15 17:56:39 +02:00
joreland@mysql.com
1cd1359049 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-09 21:13:27 +02:00
joreland@mysql.com
5c4da6aa4d merge 2005-05-09 20:28:55 +02:00
joreland@mysql.com
b15797bbaa Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-09 15:15:25 +02:00
joreland@mysql.com
f2edd8069f bug#10471 - ndb - potential inconsistent backup
whith some multi update scenarios

  Make sure to init GCI on correct operation before firering operation
2005-05-09 14:59:49 +02:00
joreland@mysql.com
a36b2e3953 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-05-09 11:04:34 +02:00
joreland@mysql.com
28814b66f4 bug#10142 - ndb unique index resource shortage
honor abort_option as TC now abort on 288
2005-05-09 11:03:07 +02:00
mskold@mysql.com
9e1117c3e5 Merge 2005-05-08 22:52:55 +02:00
mskold@mysql.com
4b06c68d83 Fixes to compile with icc 2005-05-08 22:16:24 +02:00
joreland@mysql.com
40d913612e Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-08 20:25:11 +02:00
joreland@mysql.com
caa5cfc63f Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-08 20:23:56 +02:00
joreland@mysql.com
a91f302097 ndb - autotest
fix name of result tar ball
2005-05-08 20:23:05 +02:00
mskold@mysql.com
bea71274f7 Merge 2005-05-07 22:49:04 +02:00
mskold@mysql.com
cb8d2905aa bug#9813: Post review fixes 2005-05-07 22:04:52 +02:00
joreland@mysql.com
b15f8bcbaf Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-07 18:39:10 +02:00
joreland@mysql.com
0eb9947ce8 merge 2005-05-07 18:37:59 +02:00
joreland@mysql.com
5455e9ddd9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-07 18:28:18 +02:00
joreland@mysql.com
347c21fe42 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-07 18:22:51 +02:00
joreland@mysql.com
4d1804ebb1 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-07 18:21:36 +02:00
joreland@mysql.com
749129487e ndb - autotest
fix configs and scripts
2005-05-07 18:20:29 +02:00
ndbdev@ndbmaster.mysql.com
e31a07265f ndb autotest - add show version to cpcd 2005-05-07 16:06:41 +02:00
joreland@mysql.com
678bef34a8 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-07 13:27:06 +02:00
joreland@mysql.com
85066eb0a2 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-07 13:25:52 +02:00
joreland@mysql.com
092eea3a7a ndb - autotest
fixes
2005-05-07 13:23:38 +02:00