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
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
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
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
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
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
knielsen@mysql.com
1bc91adcef
Fix missing test cleanup
2006-02-10 10:18:57 +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
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
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
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.
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
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
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
konstantin@mysql.com
e1f807af26
Merge mysql.com:/home/kostja/mysql/mysql-5.0-root
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-09 13:35:59 +03:00
msvensson@neptunus.(none)
63aca4de7b
Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my50-mysqltestrun_faster
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-09 10:35:47 +01:00
msvensson@neptunus.(none)
63f9b6ce43
Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my50-mysqltestrun_faster
...
into neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my51-mysqltestrun_faster
2006-02-09 10:31:35 +01:00
msvensson@neptunus.(none)
35fc3dcc99
Force stop of old cluster
2006-02-09 10:25:14 +01:00
msvensson@neptunus.(none)
74af19958e
Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my50-mysqltestrun_faster
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-09 09:57:07 +01:00
msvensson@neptunus.(none)
c2df73e2c2
Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my50-mysqltestrun_faster
...
into neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my51-mysqltestrun_faster
2006-02-09 09:46:56 +01:00
msvensson@neptunus.(none)
0e9e1f2c5d
Start cluster only for testcases that really needs it and stop it when
...
not needed by the tescases. This will save test time for those testcases
that does not need cluster, but need a restart, as they dont have to wait
the extra time it would take for cluster to restart. It will also save
time for other testcases, as cluster does not
need to be contacted for each table to be dropped or created.
Backport from 5.1
2006-02-09 09:40:48 +01:00
bell@sanja.is.com.ua
daaf883f97
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 10:26:06 +02:00
brian@zim.tangent.org
01a8c54406
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.tangent.org:/home/brian/mysql/cleanup-5.1
2006-02-08 21:55:40 -08:00
tomas@poseidon.ndb.mysql.com
d39cb0eb0c
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 06:45:28 +01:00
konstantin@mysql.com
51fda104cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-09 01:06:55 +03:00
jmiller@mysql.com
057b3f9e25
rpl_stm_log.result:
...
Fixed bug in test case
2006-02-08 22:26:16 +01:00
konstantin@mysql.com
19018128a3
Merge mysql.com:/home/kostja/mysql/tmp_merge1
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-09 00:21:22 +03:00
jmiller@mysql.com
4a7cd1a583
rpl_stm_log.test:
...
Fixed bug in test case
2006-02-08 22:17:46 +01:00
tomas@poseidon.ndb.mysql.com
c4c4510a54
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-08 22:15:34 +01:00
jmiller@mysql.com
33781f642e
Missed a check in of new results for rpl_relay_space_myisam
2006-02-08 22:00:11 +01:00
konstantin@mysql.com
5ed755d0d8
Merge mysql.com:/home/kostja/mysql/tmp_merge
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-08 23:53:45 +03:00
tomas@poseidon.ndb.mysql.com
edd1417b46
Bug #17206 Update through VIEW is not working
2006-02-08 18:08:18 +01:00
jmiller@mysql.com
0a59884aad
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-08 17:48:22 +01:00
jmiller@mysql.com
be29712da5
updated results
2006-02-08 17:47:27 +01:00
jmiller@mysql.com
8e8235ff7c
implement a reviw comments
2006-02-08 17:09:57 +01:00
jmiller@mysql.com
e3bfdb9b1c
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-08 16:52:34 +01:00
jmiller@mysql.com
dacf64b678
Implement suggestions from lars review
2006-02-08 16:47:46 +01:00