msvensson@neptunus.(none)
899dca14ee
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-03 17:53:10 +01:00
cmiller@zippy.cornsilk.net
b074e13483
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-11-02 17:51:59 -05:00
kostja@bodhi.local
965669d1f9
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-11-02 03:24:11 +03:00
joerg@trift2.
0d27df6f1a
Merge trift2.:/MySQL/M51/clone-5.1
...
into trift2.:/MySQL/M51/push-5.1
2006-11-01 13:26:03 +01:00
msvensson@shellback.(none)
5a049ba807
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-10-30 13:45:24 +01:00
jonas@perch.ndb.mysql.com
f6fcb302ab
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-10-28 00:01:24 +02:00
petr/cps@owlet.local
eda71e24c3
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mysql.com:/home/cps/mysql/devel/5.1-rename-bug
2006-10-24 17:00:23 +04:00
tsmith/tim@siva.hindu.god
aeced431e3
Merge siva.hindu.god:/usr/home/tim/m/bk/g51
...
into siva.hindu.god:/usr/home/tim/m/bk/51
2006-10-23 23:41:07 -06:00
gkodinov@dl145s.mysql.com
bb0422a0b0
Merge bk-internal:/home/bk/mysql-5.1
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
2006-10-20 11:12:35 +02:00
svoj@april.(none)
8b01686765
Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/engines/mysql-5.1-engines
2006-10-19 19:59:57 +05:00
gkodinov@dl145s.mysql.com
ea8ba03556
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.1
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
2006-10-19 16:00:06 +02:00
holyfoot/hf@mysql.com/deer.(none)
b8e31d05f1
bug #23369 (Embedded library can't be linked)
...
Problem is that some files moved to storage/*/ still are dependent
on sql/ code (usually use members of THD structure)
that can get different being compiled with another #define-s
Code added to recompile these for the embedded server
2006-10-18 17:03:37 +05:00
stewart@willster.(none)
71636edc16
Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge
...
into willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge
2006-10-18 18:51:39 +10:00
istruewing@chilla.local
8c6ba6ebb2
Merge chilla.local:/home/mydev/mysql-5.1--team
...
into chilla.local:/home/mydev/mysql-5.1-ateam
2006-10-16 12:43:03 +02:00
petr/cps@mysql.com/owlet.local
6846f8d9c4
Fix for Bug #17544 "Cannot do atomic log rotate",
...
Bug #21785 "Server crashes after rename of the log table" and
Bug #21966 "Strange warnings on create like/repair of the log
tables"
According to the patch, from now on, one should use RENAME to
perform a log table rotation (this should also be reflected in
the manual).
Here is a sample:
use mysql;
CREATE TABLE IF NOT EXISTS general_log2 LIKE general_log;
RENAME TABLE general_log TO general_log_backup, general_log2 TO general_log;
The rules for Rename of the log tables are following:
IF 1. Log tables are enabled
AND 2. Rename operates on the log table and nothing is being
renamed to the log table.
DO 3. Throw an error message.
ELSE 4. Perform rename.
The very RENAME query will go the the old (backup) table. This is
consistent with the behavoiur we have with binlog ROTATE LOGS
statement.
Other problems, which are solved by the patch are:
1) Now REPAIR of the log table is exclusive operation (as it should be), this
also eliminates lock-related warnings. and
2) CREATE LIKE TABLE now usese usual read lock on the source table rather
then name lock, which is too restrictive. This way we get rid of another
log table-related warning, which occured because of the above fact
(as a side-effect, name lock resulted in a warning).
2006-10-13 17:26:46 +04:00
istruewing@chilla.local
61a5ddbd19
Bug#21627 - Warnings in build of myisampack
...
Added proper casts
No test case. myisampack must be tested manually.
2006-10-11 16:36:24 +02:00
andrey@example.com
2e2339e125
Merge example.com:/work/bug23074/my50-bug23074
...
into example.com:/work/bug23074/my51-bug23074
2006-10-11 11:48:33 +02:00
istruewing@chilla.local
bd69350e43
Bug#8283 - OPTIMIZE TABLE causes data loss
...
After merge fix. Renamed 'info' -> 'sort_param'.
2006-10-10 20:01:39 +02:00
istruewing@chilla.local
b15a23a79e
Merge chilla.local:/home/mydev/mysql-5.0-bug8283
...
into chilla.local:/home/mydev/mysql-5.1-bug8283
2006-10-09 22:24:55 +02:00
brian@zim.(none)
faff46eefe
Added license information display to output of plugins schema, and tagged all plugins with GPL flag.
2006-10-05 00:41:29 -07:00
msvensson@neptunus.(none)
ca21b57992
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-10-03 09:28:44 +02:00
svoj@april.(none)
115c4fe8dc
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2006-10-02 15:11:08 +05:00
baker@bk-internal.mysql.com
8a5fef1419
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2006-10-01 22:31:04 +02:00
holyfoot/hf@deer.(none)
5edde5a859
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/home/hf/work/21888/my51-21888
2006-10-01 15:21:06 +05:00
brian@zim.(none)
4117860ec6
Merge zim.(none):/home/brian/mysql/merge-5.1
...
into zim.(none):/home/brian/mysql/arch-5.1
2006-09-30 18:44:42 -07:00
brian@zim.(none)
46ae2113ba
This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch).
...
Partitioning now has a flag to allow disabling of engines from being compatible with partitioning. Cleaned up heap naming convention on panic call.
2006-09-30 12:49:46 -07:00
gkodinov@dl145s.mysql.com
869d1a6a1d
Merge bk-internal:/home/bk/mysql-5.1
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
2006-09-30 09:35:11 +02:00
brian@zim.(none)
a756fd36ef
This removes the passing of global hton to engine instance.
2006-09-29 17:19:02 -07:00
tsmith/tim@siva.hindu.god
44f0e55ca4
Merge siva.hindu.god:/usr/home/tim/m/bk/50
...
into siva.hindu.god:/usr/home/tim/m/bk/mrg/51
2006-09-29 18:04:34 -06:00
tsmith/tim@siva.hindu.god
ca1f99bdb8
Merge siva.hindu.god:/usr/home/tim/m/bk/g51
...
into siva.hindu.god:/usr/home/tim/m/bk/mrg/51
2006-09-29 17:01:16 -06:00
holyfoot/hf@deer.(none)
7392296414
Merge mysql.com:/home/hf/work/21888/my50-21888
...
into mysql.com:/home/hf/work/21888/my51-21888
2006-09-29 17:58:36 +05:00
istruewing@chilla.local
8655a80cda
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into chilla.local:/home/mydev/mysql-5.1-bug22384
2006-09-29 09:29:37 +02:00
istruewing@chilla.local
d56f3c3398
Merge chilla.local:/home/mydev/mysql-5.0-bug22384
...
into chilla.local:/home/mydev/mysql-5.1-bug22384
2006-09-28 21:55:03 +02:00
brian@zim.(none)
542cf080a4
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zim.(none):/home/brian/mysql/merge-5.1
2006-09-28 10:51:56 -07:00
cmiller@zippy.cornsilk.net
e72bc63906
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-28 10:15:32 -04:00
gkodinov@dl145s.mysql.com
41a2631cb3
Merge bk-internal:/home/bk/mysql-5.1
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
2006-09-28 14:53:31 +02:00
gkodinov@dl145s.mysql.com
3abb604333
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.1
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
2006-09-28 10:41:42 +02:00
petr/cps@owlet.local
64c2c0cb19
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/cps/mysql/trees/5.1-runtime-new
2006-09-28 04:44:55 +04:00
svoj@april.(none)
92d7d668df
Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2006-09-27 15:29:04 +05:00
gkodinov/kgeorge@macbook.gmz
a01e7b12ce
Merge macbook.gmz:/Users/kgeorge/mysql/work/B21174-5.0-opt
...
into macbook.gmz:/Users/kgeorge/mysql/work/B21174-5.1-opt
2006-09-27 13:03:41 +03:00
brian@zim.(none)
f9a02811da
Removed Field (this came in as an idea from a previous patch by Serg)
2006-09-26 21:26:04 -07:00
msvensson@shellback.(none)
fe0cfacf35
Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
...
into shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-09-21 20:31:35 +02:00
istruewing@chilla.local
0aaf483734
Merge chilla.local:/home/mydev/mysql-5.1--main
...
into chilla.local:/home/mydev/mysql-5.1-tomain
2006-09-21 09:37:31 +02:00
Kristofer.Pettersson@naruto.
3599c87654
Merge kpettersson@bk-internal:/home/bk/mysql-5.1-maint
...
into naruto.:C:/cpp/mysql-5.1-maint
2006-09-20 12:21:49 +02:00
Kristofer.Pettersson@naruto.
1db3f60248
Merge naruto.:C:/cpp/bug20789/my50-bug20789
...
into naruto.:C:/cpp/bug20789/my51-bug20789
2006-09-20 07:40:56 +02:00
istruewing@chilla.local
c49c58cbf4
Merge chilla.local:/home/mydev/mysql-5.0-bug14400-monty
...
into chilla.local:/home/mydev/mysql-5.1-bug14400-monty
2006-09-19 14:33:29 +02:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
98a8537adf
Bug#22417
...
"plug.in not included in dist source"
2006-09-18 19:31:08 -07:00
acurtis/antony@ltamd64.xiphis.org
424857e0e4
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into xiphis.org:/home/antony/work2/engines-merge
2006-09-18 12:16:03 -07:00
svoj@april.(none)
419a51c5a5
Merge april.(none):/home/svoj/devel/bk/mysql-5.1
...
into april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-engines
2006-09-18 19:43:33 +05:00
Kristofer.Pettersson@naruto.
8ec47c091e
Merge naruto.:C:/cpp/bug20789/my50-bug20789
...
into naruto.:C:/cpp/mysql-5.1-new-maint
2006-09-17 14:06:29 +02:00