aivanov@mysql.com
09847849b9
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/alexi/dev/mysql-5.1-wl3148
2006-02-16 16:53:34 +03:00
aivanov@mysql.com
14633e0532
The patch adds PROCESSLIST information schema
2006-02-16 16:45:05 +03:00
ingo@mysql.com
233155e64e
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-16 07:01:15 +01:00
andrey@lmy004.
6354f2454d
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16406
2006-02-16 05:23:04 +01:00
andrey@lmy004.
7b2650a256
small post-merge fixes for bug#16406
...
(pre-push)
2006-02-16 05:21:02 +01:00
tomas@poseidon.ndb.mysql.com
704562f696
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-16 03:24:55 +01:00
tomas@poseidon.ndb.mysql.com
212d8c05e6
Bug #17415 special character tables are not handled correctly in ndb binlog/schema dist
2006-02-16 03:23:43 +01:00
andrey@lmy004.
95e87f0811
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16406
2006-02-16 02:13:37 +01:00
andrey@lmy004.
2158add8f0
merge
2006-02-16 01:27:36 +01:00
andrey@lmy004.
d3e0875759
fix for bug#16406 (Events: DROP DATABASE doesn't automatically drop events)
...
WL#1034
- This changeset also changes the executor so its quite more stable now.
Stressing test case added that executes ~800 events per second and dropping
hundreds of events at once using DROP DATABASE.
(with fixes after review of JimW)
(with fixes after review of Serg)
2006-02-16 00:43:11 +01:00
tomas@poseidon.ndb.mysql.com
cd8f8449e2
Bug #17414 ndb schema distribution functionality does not work on mysql servers without binlog
2006-02-16 00:30:56 +01:00
jimw@mysql.com
5e6b6c9935
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-15 15:08:20 -08:00
andrey@lmy004.
00b188cc52
build fixes
2006-02-15 23:43:11 +01:00
andrey@lmy004.
a613782f96
more cosmetic before push of fix for bug#17289
2006-02-15 22:32:25 +01:00
jimw@mysql.com
95b45389cd
Merge bk-internal:/home/bk/mysql-5.1-new
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-15 13:11:51 -08:00
ingo@mysql.com
e116d697bd
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-15 21:54:01 +01:00
andrey@lmy004.
189baa169b
merging before test + push
2006-02-15 21:51:57 +01:00
andrey@lmy004.
8193669f0a
cosmetic post-review changes
2006-02-15 21:40:38 +01:00
andrey@lmy004.
46fcb188d0
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16410
2006-02-15 21:32:58 +01:00
andrey@lmy004.
c29fdc8844
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16410
2006-02-15 21:26:33 +01:00
serg@serg.mylan
1f07d78c2a
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-02-15 21:25:31 +01:00
serg@serg.mylan
53d7570b9e
Item_case_expr::type() cannot be called without fix_fields() :(
2006-02-15 21:22:53 +01:00
jimw@mysql.com
9b333dd393
Merge mysql.com:/home/jimw/my/mysql-5.1-16782
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-15 11:39:54 -08:00
jimw@mysql.com
246a2a7f0c
Merge mysql.com:/home/jimw/my/mysql-5.1-16775
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-15 11:36:45 -08:00
jimw@mysql.com
e145908eb3
Bug #16782 : Partitions: crash, REPLACE .. on table with PK, DUPLICATE
...
KEY event. Partitioning wrongly claimed to be able to handle HA_DUPP_POS
when it was supported by the underlying storage engine, which resulted
in a crash when handling REPLACE statements.
2006-02-15 11:20:57 -08:00
konstantin@mysql.com
99030e3f43
Fix the coding style in a few new files.
2006-02-15 21:08:44 +03:00
andrey@lmy004.
dbb1589130
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug17289
2006-02-15 18:32:49 +01:00
andrey@lmy004.
a0fc7b89d6
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16410
2006-02-15 17:14:43 +01:00
andrey@lmy004.
32ae54bdbc
fix for bug#16410 (Events: CREATE EVENT is legal in a CREATE TRIGGER statement)
...
WL#1034 (Internal CRON)
(post-post-review updates)
2006-02-15 17:12:27 +01:00
ingo@mysql.com
0248dea334
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-15 16:34:11 +01:00
serg@serg.mylan
c56d1c248e
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-02-15 16:05:35 +01:00
ingo@mysql.com
c75e407905
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-15 15:16:11 +01:00
brian@zim.tangent.org
3195aef714
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.tangent.org:/home/brian/mysql/archive-5.1
2006-02-15 06:16:10 -08:00
ingo@mysql.com
5fa7f6b79d
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-15 14:40:39 +01:00
andrey@lmy004.
3bd895745c
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug17289
2006-02-15 14:35:19 +01:00
serg@serg.mylan
d5294e86bf
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-02-15 14:04:56 +01:00
ingo@mysql.com
aa10c18a6e
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-15 13:02:24 +01:00
mskold@mysql.com
5e4df23c96
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-work
2006-02-15 12:52:30 +01:00
andrey@lmy004.
a01ed15419
cosmetic changes of the fix for bug#17289 (no privileges checks in EVENTS), before push
2006-02-15 12:14:23 +01:00
gluh@eagle.intranet.mysql.r18.ru
544a1a98a5
Fix for bug#16907 Partitions: crash, SELECT goes into last partition, UNIQUE INDEX
...
In presense of subpartitioning use get_part_partition_id() to calculate part_id
2006-02-15 14:34:51 +04:00
mskold@mysql.com
64aa3861a4
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-work
2006-02-15 11:19:45 +01:00
ingo@mysql.com
aa12184eda
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-15 10:56:13 +01:00
gluh@eagle.intranet.mysql.r18.ru
00fc4cabe5
Fix for bug#16901 Partitions: crash, SELECT, column of part. function=first column of primary key
...
use part_info->no_subparts to calculate partition range in case of subpartitions
2006-02-15 13:42:43 +04:00
brian@zim.tangent.org
d56430423a
This patch adds a new field to the meta file for tracking flushes (this is being kept to later do stats and determine how often the compression buffer is being foiled). This should keep things all nice an compatible between versions.
...
Also added a flush table test as well. Found one possible bug in OPTIMIZE TABLE which has never been reported, but I think it would be possible on a file system that ran out of disk.
2006-02-15 00:59:24 -08:00
ingo@mysql.com
4c1735186b
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-15 07:43:43 +01:00
serg@serg.mylan
4e68f1ba3a
post-merge fixes for dbug
2006-02-15 00:14:37 +01:00
aelkin@mysql.com
3737486d56
Merge elkin@koti:MySQL/Merge/5.1-new/
...
into mysql.com:/home/elkin/MySQL/MERGE/5.1-new
2006-02-15 01:08:02 +02:00
serg@serg.mylan
48b8e842ca
Automerge
2006-02-15 00:01:46 +01:00
andrey@lmy004.
9db6d13cc4
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug17289
2006-02-14 23:35:13 +01:00
serg@serg.mylan
94d225aa6f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-02-14 22:57:12 +01:00