jmiller@mysql.com
60be6c257d
Updated test cases
2006-02-13 16:36:11 +01:00
jmiller@mysql.com
6b45a0b704
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-02-10 20:58:42 +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
jmiller@mysql.com
0cf61d620f
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-02-10 12:58:55 +01:00
jmiller@mysql.com
7ce371210f
test updates
2006-02-10 12:52:35 +01: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
tomas@poseidon.ndb.mysql.com
930641a5c1
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 21:28:22 +01:00
andrey@lmy004.
67985360f0
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-events_i_s
2006-02-09 20:20:22 +01:00
andrey@lmy004.
34b3d54839
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16984
2006-02-09 20:17:49 +01:00
tomas@poseidon.ndb.mysql.com
3c0ed6d410
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 19:55:50 +01:00
aivanov@mysql.com
e22d2f1150
Fixed BUG#9680: Wrong error from cascading update
...
Applied 9680.patch (by Osku Salerma)
2006-02-09 20:43:10 +03:00
jmiller@mysql.com
a66d8a5b3b
test updates
2006-02-09 15:29:57 +01:00
ramil@mysql.com
e1dabf65e4
Merge mysql.com:/usr/home/ram/work/4.1.heap
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2006-02-09 18:23:37 +04:00
bell@sanja.is.com.ua
110ac55e4b
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2006-02-09 15:13:20 +02:00
msvensson@neptunus.(none)
d1a7592a8a
Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my51-mysqltestrun_faster
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-09 13:30:34 +01:00
konstantin@mysql.com
2a267fed2f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-09 14:22:34 +03:00