msvensson@neptunus.(none)
6a2c609fa4
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-16 10:18:12 +01:00
msvensson@neptunus.(none)
c00adf2028
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-16 10:09:53 +01:00
msvensson@neptunus.(none)
7d9eba0441
ndb_load disabled
2006-02-16 10:03:13 +01: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
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
jimw@mysql.com
6892c2a52a
Small post-merge fix to partition test
2006-02-15 17:01:31 -08: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
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
msvensson@neptunus.(none)
bb52ae8ca6
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-15 21:15:45 +01:00
jimw@mysql.com
d33b03abef
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-15 12:06:20 -08: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
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.
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
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
msvensson@devsrv-b.mysql.com
4b18b5e786
Bug#17360 sp-code test case broken
...
- Change 94 to 95 according to Pem's instructions in bug report.
2006-02-15 14:12:36 +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
msvensson@neptunus.(none)
6a43d635c8
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-15 12:03:36 +01:00
msvensson@neptunus.(none)
56ef2e28e4
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-15 12:02:20 +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
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
msvensson@neptunus.(none)
aacf783e86
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-15 10:53:25 +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
aelkin@mysql.com
e7c73bb754
Merge mysql.com:/home/elkin/MySQL/BARE/5.1-new
...
into mysql.com:/home/elkin/MySQL/MERGE/5.1-new
2006-02-15 03:24:07 +02:00
brian@zim.tangent.org
1d3775a371
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into zim.tangent.org:/home/brian/mysql/cleanup-5.1
2006-02-14 16:20:06 -08:00
aelkin@mysql.com
cb24989122
BUG#16217 merge
2006-02-15 02:19:42 +02:00
aelkin@mysql.com
9b1e80b941
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1-new
2006-02-14 22:02:42 +02:00
andrey@lmy004.
6d54ee58a4
manual merge
2006-02-14 20:27:42 +01:00
ingo@mysql.com
db905454ab
Merge mysql.com:/home/mydev/mysql-5.1
...
into mysql.com:/home/mydev/mysql-5.1-bug8841
2006-02-14 20:17:25 +01:00
andrey@lmy004.
e9af8c1d83
post-merge fixes of bug 16548
2006-02-14 20:10:51 +01:00
aelkin@mysql.com
a70ac6eadf
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1-new
2006-02-14 20:51:08 +02:00
aelkin@mysql.com
7397bc8fb4
Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
...
into mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1-new
2006-02-14 20:48:34 +02:00
brian@zim.tangent.org
1d908def20
Added --silent option andd just test results via select. This will keep down the appearance of non deterministic responses.
...
This is for bug#17384
2006-02-14 10:46:46 -08:00
andrey@lmy004.
a47a706d1f
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug17289
2006-02-14 19:44:10 +01:00
andrey@lmy004.
07ab9e38c8
Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into lmy004.:/work/mysql-5.1-bug16548
2006-02-14 19:33:18 +01:00