Commit graph

30531 commits

Author SHA1 Message Date
brian@zim.tangent.org
eeefb8ba7c Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.tangent.org:/home/brian/raid/mysql-5.1-new
2006-02-11 17:26:32 -08:00
brian@zim.tangent.org
9485856f1a This patch is to further remove the RAID code. We removed support for people creating tables with RAID. This patch remove most of the source for this. 2006-02-11 17:21:01 -08:00
knielsen@mysql.com
cbe5fb2e01 Merge mysql.com:/usr/local/mysql/mysql-4.1-fixrace
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2006-02-11 23:32:51 +01:00
knielsen@mysql.com
43189fd8ad Fix a race on some platforms in mysql-test-run.pl, where it would sometimes
errorneously abort reporting failure to kill child processes, where in
reality the problem was merely that the child had become a zombie because
of missing waitpid() call.
2006-02-11 22:50:59 +01:00
andrey@lmy004.
64818ead73 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-new-clean
2006-02-11 19:23:20 +01:00
andrey@lmy004.
7d0ca81d10 Merge lmy004.:/work/mysql-5.0-clean
into lmy004.:/work/mysql-5.1-new-clean
2006-02-11 09:32:46 +01:00
bell@sanja.is.com.ua
af43c2a402 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.1
2006-02-11 00:29:46 +02:00
ingo@mysql.com
8efa06bd68 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-wl1563-msg
2006-02-10 22:28:59 +01:00
ingo@mysql.com
66883d76dd WL#1563 - Modify MySQL to support fast CREATE/DROP INDEX
After merge fix.
2006-02-10 22:26:04 +01:00
bell@sanja.is.com.ua
0a50f832ad Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.1
2006-02-10 22:17:01 +02:00
bell@sanja.is.com.ua
0400b2ef9a Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.1
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.1
2006-02-10 21:02:08 +02:00
ingo@mysql.com
b9bc1e9108 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-wl1563-msg
2006-02-10 20:00:22 +01:00
petr@mysql.com
2e01c8b0d0 Merge mysql.com:/home/cps/mysql/devel/5.0-mike
into  mysql.com:/home/cps/mysql/devel/5.1-merge
2006-02-10 21:03:49 +03:00
tomas@poseidon.ndb.mysql.com
0ec372ed21 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-10 18:08:04 +01:00
tomas@poseidon.ndb.mysql.com
f0d95d0af3 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-10 18:04:46 +01:00
tomas@poseidon.ndb.mysql.com
5ba3f69f3e manual merge 2006-02-10 17:59:53 +01:00
tomas@poseidon.ndb.mysql.com
27a14f93eb Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-02-10 17:50:17 +01:00
tomas@poseidon.ndb.mysql.com
7050a7586e Bug #17249 ndb, delete statement with join where clause fails when table do not have pk
Bug #17257 ndb, update fails for inner joins if tables do not have Primary Key

change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
2006-02-10 17:40:22 +01:00
andrey@lmy004.
bdf0f9a2d9 fix test of bug 12744 on OSX 2006-02-10 14:42:08 +01:00
bell@sanja.is.com.ua
074f19622d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.1
2006-02-10 15:12:35 +02:00
petr@mysql.com
b6b6da9fb9 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/cps/mysql/devel/5.0-mike
2006-02-10 14:06:23 +03:00
msvensson@neptunus.(none)
332a1a1f18 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-10 11:27:30 +01:00
petr@mysql.com
fe87e3472c Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/cps/mysql/devel/5.0-mike
2006-02-10 13:25:35 +03:00
knielsen@mysql.com
344c334141 Merge mysql.com:/usr/local/mysql/mysql-5.1-sp-destruct
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2006-02-10 10:44:09 +01:00
jonas@perch.ndb.mysql.com
7d34d2f4ba Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-02-10 10:19:06 +01:00
knielsen@mysql.com
1bc91adcef Fix missing test cleanup 2006-02-10 10:18:57 +01:00
jonas@perch.ndb.mysql.com
af875527fa Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-02-10 10:11:30 +01:00
jonas@perch.ndb.mysql.com
0c559223ed merge 2006-02-10 10:10:52 +01:00
jonas@perch.ndb.mysql.com
b8d6434616 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-02-10 09:40:56 +01:00
jonas@perch.ndb.mysql.com
7a490207aa Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-02-10 09:39:45 +01:00
jonas@perch.ndb.mysql.com
3e312142a1 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work
2006-02-10 09:38:10 +01:00
jonas@perch.ndb.mysql.com
088c7d4268 bug#10987 - ndb - unable to find restorable replica
Introduce new variable c_newest_restorable_gci
    which is set _after_ both GCP_SAVE and COPY_GCI
    
  This variable is used when cutting redo (calcKeepGci)
  
  Also make sure complete GCI is run inbetween LCP's
2006-02-10 09:37:36 +01:00
jonas@perch.ndb.mysql.com
84ed332f67 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work
2006-02-10 09:18:50 +01:00
jonas@perch.ndb.mysql.com
d9e402ef52 bug#17295 - ndb - error while reading REDO log
fix corruption due to page 0, file 0 gets released
2006-02-10 09:17:53 +01:00
msvensson@neptunus.(none)
5690dd8b85 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-10 09:14:22 +01:00
petr@mysql.com
f037d4772e Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/cps/mysql/devel/5.0-mike
2006-02-10 10:56:27 +03:00
petr@mysql.com
c5794763e4 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/devel/5.1-utf-bug
2006-02-10 10:24:30 +03:00
ramil@mysql.com
9ea857d058 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b16511
2006-02-10 10:32:46 +04:00
petr@mysql.com
f3d73e8cbe Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/devel/5.1-im-fixes
2006-02-10 03:38:29 +03:00
petr@mysql.com
392f93c0aa Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/cps/mysql/devel/5.1-utf-bug
2006-02-10 03:37:13 +03:00
petr@mysql.com
8488498545 IM changes by GUI team: add a version_no column to the
SHOW INSTANCE STATUS output
2006-02-10 03:35:07 +03:00
tomas@poseidon.ndb.mysql.com
5bb07f7e1f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-10 00:17:33 +01:00
petr@mysql.com
1c7bc08537 a bunch of IM fixes from the GUI team 2006-02-10 02:15:55 +03:00
tomas@poseidon.ndb.mysql.com
76f6331aed changed to use temporary heap table on a ndb test
corrected multiple --log-bin options in mysql-test-run
2006-02-10 00:15:07 +01:00
tomas@poseidon.ndb.mysql.com
fe0ff3e21c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-09 23:48:52 +01:00
andrey@lmy004.
0aced4daf3 remove volatile. fixes windows build
WL#1034 (Internal CRON)
2006-02-09 23:15:48 +01:00
andrey@lmy004.
541e67342f from fix for bug#16414 (Events: Crash or hang if event drops itself)
WL #1034
2006-02-09 23:15:47 +01:00
tomas@poseidon.ndb.mysql.com
246d0ea290 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-09 23:15:46 +01:00
andrey@lmy004.
24c010892c Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-events_i_s
2006-02-09 23:15:46 +01:00
aivanov@mysql.com
f8f8af970e Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/innodb/mysql-5.1-merged
2006-02-10 01:15:45 +03:00