konstantin@mysql.com
a27e32b565
Merge mysql.com:/home/kostja/mysql/mysql-5.0-root
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-22 14:04:24 +03:00
anozdrin@mysql.com
a77cc69e62
Fix for BUG#7787: Stored procedures: improper warning for "grant execute" statement.
...
The problem was that error flag was not reset.
2006-02-22 13:44:04 +03:00
petr@mysql.com
8163afb43c
Merge mysql.com:/home/cps/mysql/devel/im/5.0-im-fix-race
...
into mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-no-debug
2006-02-22 11:27:21 +03:00
vtkachenko@quadxeon.mysql.com
ab301016f2
myisamdef.h, mi_locking.c, mi_dynrec.c:
...
Fix insert performance with mmap
2006-02-22 08:32:58 +01:00
holyfoot@mysql.com
32da648789
Merge mysql.com:/home/hf/work/mysql-5.0.clean
...
into mysql.com:/home/hf/work/mysql-5.1.clean
2006-02-22 10:53:44 +04:00
holyfoot@mysql.com
a94943df0c
Merge mysql.com:/home/hf/work/mysql-5.0.clean
...
into mysql.com:/home/hf/work/mysql-5.1.clean
2006-02-22 10:33:42 +04:00
reggie@linux.site
cb10b77c31
BUG #15408 - Partitions: subpartition names are not unique
2006-02-21 17:40:07 -06:00
konstantin@mysql.com
f0abdf1ebe
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/opt/local/work/mysql-5.0-runtime
2006-02-22 01:20:47 +03:00
reggie@linux.site
336c0ba4cb
Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into linux.site:/home/reggie/work/mysql-5.1-bug15408
2006-02-21 10:29:41 -06:00
petr@mysql.com
ce4fd24da2
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/devel/im/5.0-im-fix-race
2006-02-21 15:59:41 +03:00
petr@mysql.com
cb5e54e1bd
Fix race condition: instance map wasn't locked for the
...
duration of the whole 'flush instances'. As a consequence,
it was possible to query instance map, while it is in the
inconsistent state. The patch was reworked after review.
2006-02-21 15:57:56 +03:00
petr@mysql.com
110032bdfc
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/devel/im/5.0-im-add-error-message
2006-02-21 15:34:54 +03:00
petr@mysql.com
7146a9775e
Fix for Bug #12674 "Instance Manager: IM doesn't handle client
...
connections correctly".
Recommit with the max timeout value in sync with the comment.
2006-02-21 15:32:52 +03:00
svoj@april.(none)
b18f91ab7b
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into april.(none):/home/svoj/devel/mysql/BUG17116/mysql-5.1-new
2006-02-21 16:20:02 +04:00
andrey@lmy004.
85236db1f1
disable tests. failures happen from time to time and stop people from
...
pushing. the code needs to be more stable.
2006-02-21 13:07:25 +01:00
pekka@mysql.com
73d75104af
ndb - enable ndb_dd_backuprestore
2006-02-21 09:27:20 +01:00
pekka@mysql.com
dfa0a58014
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/space/pekka/ndb/version/my51
2006-02-21 09:27:19 +01:00
tomas@poseidon.ndb.mysql.com
37826388e0
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-21 09:27:18 +01:00
tomas@poseidon.ndb.mysql.com
0bca0d435c
fixed test result on ndb_dd_restore whwas not done before
2006-02-21 09:25:50 +01:00
pekka@mysql.com
11a7a3ea63
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/space/pekka/ndb/version/my51
2006-02-21 05:08:18 +01:00
andrey@lmy004.
2453cd4e81
fixed result
2006-02-21 03:17:53 +01:00
andrey@lmy004.
0ba2425caf
fix for bug#16407 (EVENTS: sql_mode)
...
post-review fixes
2006-02-21 02:40:23 +01:00
pekka@mysql.com
54074472e5
ndb - fix event created by ndb_restore bug#17045 (not really)
2006-02-21 02:27:23 +01:00
andrey@lmy004.
a1fdeb1386
manual merge
2006-02-21 00:01:39 +01:00
andrey@lmy004.
22ba4ca3a3
fix for bug#16407 (Events: Changes in sql_mode won't be taken into account)
...
WL#1032
sql_mode setting was disregarded during create/alter event and wasn't set during
event execution.
(post-review small fixes)
2006-02-20 23:52:22 +01:00
andrey@lmy004.
7ef557ed49
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16406
2006-02-20 23:29:55 +01:00
sergefp@mysql.com
17a212203b
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/psergey/mysql-5.1-look
2006-02-21 00:20:44 +03:00
sergefp@mysql.com
e76e791d9b
BUG#15448 (group_min_max test failure): Don't bypass group-min-max optimizer entry point
...
if we've got a tree of type ALWAYS or MAYBE.
2006-02-21 00:17:29 +03:00
konstantin@mysql.com
07db5ac8b1
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/kostja/mysql/mysql-5.1-vanilla
2006-02-20 23:00:50 +03:00
andrey@lmy004.
e5e7066e26
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16406
2006-02-20 20:57:44 +01:00
konstantin@mysql.com
b58345d8c4
A new error message for deprecated statements.
...
Fixes failing sp.test
2006-02-20 22:51:32 +03:00
tomas@poseidon.ndb.mysql.com
995d7ed1f9
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-20 18:23:30 +01:00
pekka@mysql.com
93db514db6
ndb - enable rpl_ndb_blob2 bug#17505
2006-02-20 17:20:54 +01:00
pekka@mysql.com
976be6facc
ndb - rbr blobs etc: minor changes bug#17045 bug#17505
2006-02-20 16:36:30 +01:00
tomas@poseidon.ndb.mysql.com
529be8eb98
Merge jonas@perch:src/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-02-20 13:38:26 +01:00
pekka@mysql.com
6287081587
disabled.def: merge
2006-02-20 12:37:28 +01:00
pekka@mysql.com
78d3257f37
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/space/pekka/ndb/version/my51
2006-02-20 12:37:27 +01:00
tomas@poseidon.ndb.mysql.com
bb0b5cdbb1
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-20 12:37:26 +01:00
tomas@poseidon.ndb.mysql.com
82be07c41b
Bug #17559 ndb_gis test failure
...
- test tables use blobs without PK, and was not handled correctly
2006-02-20 12:36:10 +01:00
pekka@mysql.com
32298c75c0
ndb - rbr blobs etc: set db/schema in injector_ndb before calling NDB
2006-02-20 12:07:12 +01:00
holyfoot@mysql.com
9d77d8d9fa
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/home/hf/work/mysql-5.0.w2645
2006-02-20 14:29:50 +04:00
holyfoot@deer.(none)
796489ea1e
Messgges corrected in mysql_upgrade script
2006-02-20 14:26:32 +04:00
andrey@lmy004.
51f87cc655
fix the output. now only 1 space in PK definition
2006-02-20 11:20:31 +01:00
knielsen@mysql.com
ddc2da9c09
post-merge fixes.
2006-02-20 10:30:32 +01:00
knielsen@mysql.com
4fc82049c8
Merge mysql.com:/usr/local/mysql/mysql-5.0-fixtest
...
into mysql.com:/usr/local/mysql/mysql-5.1-new
2006-02-20 09:52:22 +01:00
knielsen@mysql.com
4e378f7f72
Merge mysql.com:/usr/local/mysql/mysql-5.0-fixtest
...
into mysql.com:/usr/local/mysql/mysql-5.0
2006-02-20 09:37:26 +01:00
knielsen@mysql.com
c15158e108
Remove hard-coded ../var/.. path in test mix_innodb_myisam_binlog,
...
fails with --vardir option.
2006-02-20 09:34:02 +01:00
jonas@perch.ndb.mysql.com
0a311d93c9
ndb -
...
Fix online ordered index build of varsize table
2006-02-20 09:03:52 +01:00
jonas@perch.ndb.mysql.com
09c9d90d94
Merge perch.ndb.mysql.com:/home/jonas/src/51-new
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-02-20 08:40:24 +01:00
igor@rurik.mysql.com
1e437a1fda
Merge rurik.mysql.com:/home/igor/mysql-5.1
...
into rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-02-19 19:26:25 -08:00