ramil/ram@ramil.myoffice.izhnet.ru
6164613f18
Merge mysql.com:/home/ram/work/b32559/b32559.5.0
...
into mysql.com:/home/ram/work/b32559/b32559.5.1
2007-11-29 10:23:30 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
98b2f62ddf
Merge mysql.com:/home/ram/work/mysql-5.1-engines
...
into mysql.com:/home/ram/work/b32676/b32676.5.1
2007-11-29 08:29:25 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
92d4ea79ef
Merge mysql.com:/home/ram/work/mysql-5.0-engines
...
into mysql.com:/home/ram/work/b32676/b32676.5.0
2007-11-29 08:24:52 +04:00
sergefp@foxhole.(none)
1b3e95e1da
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/home/psergey/mysql-5.1-bug32772
2007-11-28 22:43:52 +03:00
df@pippilotta.erinye.com
4530750499
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-11-28 19:49:29 +01:00
df@pippilotta.erinye.com
8765858d8a
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-11-28 17:08:40 +01:00
df@pippilotta.erinye.com
24b4226f1d
include data files for parts test suite in distribution
2007-11-28 17:04:02 +01:00
malff@lambda.hsd1.co.comcast.net.
4e8f8a0178
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-base
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
2007-11-28 07:42:36 -07:00
malff@lambda.hsd1.co.comcast.net.
7c4f906bf3
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
2007-11-28 07:23:51 -07:00
davi@endora.local
7441f466e2
Merge mysql.com:/Users/davi/mysql/bugs/31479-5.0
...
into mysql.com:/Users/davi/mysql/mysql-5.0-runtime
2007-11-28 10:49:30 -02:00
davi@mysql.com/endora.local
bd3f76d767
Bug#31479 Bad lock interaction if CREATE TABLE LIKE is killed
...
Kill of a CREATE TABLE source_table LIKE statement waiting for a
name-lock on the source table causes a bad lock interaction.
The mysql_create_like_table() has a bug that if the connection is
killed while waiting for the name-lock on the source table, it will
jump to the wrong error path and try to unlock the source table and
LOCK_open, but both weren't locked.
The solution is to simple return when the name lock request is killed,
it's safe to do so because no lock was acquired and no cleanup is needed.
Original bug report also contains description of other problems
related to this scenario but they either already fixed in 5.1 or
will be addressed separately (see bug report for details).
2007-11-28 10:18:01 -02:00
gluh@mysql.com/eagle.(none)
3628a7af97
Bug#25629 CREATE TABLE LIKE does not work with INFORMATION_SCHEMA
...
added new func mysql_create_like_schema_frm() which creates frm file based on I_S table
2007-11-28 15:37:00 +04:00
bar@mysql.com/bar.myoffice.izhnet.ru
7840cdae38
bug#29562 default collation of ucs2_unicode_ci crashes slave
...
Problem: some pieces of code relied on the default character
set settings, which didn't work in case of default character set
ucs2.
Fix: Specifying character set explicitly, not to depend on
the default settings.
2007-11-28 15:35:25 +04:00
mkindahl@dl145h.mysql.com
0d13a48c25
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-new-rpl
2007-11-28 12:34:25 +01:00
mkindahl@dl145h.mysql.com
087c239bb3
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-new-rpl
2007-11-28 12:05:35 +01:00
istruewing@stella.local
1a87a089a7
Merge stella.local:/home2/mydev/mysql-5.0-axmrg
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-28 11:06:40 +01:00
istruewing@stella.local
4d38a04665
Bug#8693 Test 'rpl_log_pos' fails sometimes
...
Moved disabling to rpl suite.
Bug#32801 wait_timeout.test fails randomly
Disabled test case.
2007-11-28 10:00:23 +01:00
ramil/ram@ramil.myoffice.izhnet.ru
5d9f96af27
Merge mysql.com:/home/ram/work/b32676/b32676.5.0
...
into mysql.com:/home/ram/work/b32676/b32676.5.1
2007-11-28 12:49:48 +04:00
istruewing@stella.local
02e321d350
Bug#29149 Test "kill" fails on Windows
...
Disabled test case.
2007-11-28 09:48:06 +01:00
thek@adventure.(none)
c2c84976d1
Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2007-11-28 09:04:49 +01:00
thek@adventure.(none)
906697768c
Error number increased; fixing broken number.
2007-11-28 09:03:21 +01:00
tomas@whalegate.ndb.mysql.com
88da58090d
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-11-28 08:57:31 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
75095711f4
Fix for bug #32726 : crash with cast in order by clause and cp932 charset
...
- fix for #31070 (missed during merging) applied for cp932 charset.
- tests/results adjusted.
2007-11-28 10:55:13 +04:00
sergefp@mysql.com
7d6d808b6a
BUG#32772: partition crash 1: enum column
...
The bug was that for ordered index scans, ha_partition::index_init() did
not put index columns into table->read_set if the underlying storage
engine did not have HA_PARTIAL_COLUMN_READ flag.
This was causing assertion failure when handle_ordered_index_scan() tried
to sort the records according to index order.
Fixed by making ha_partition::index_init() put index columns into table->read_set
for all ordered scans.
2007-11-28 03:02:05 +03:00
istruewing@stella.local
63e48ec22c
Merge stella.local:/home2/mydev/mysql-5.0-axmrg
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-27 20:30:03 +01:00
istruewing@stella.local
da28f9eac4
Merge stella.local:/home2/mydev/mysql-5.1-amain
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-27 19:29:10 +01:00
istruewing@stella.local
777d79f5fd
Merge stella.local:/home2/mydev/mysql-5.0-ateam
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-27 18:42:59 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
e2fa11fb50
after-merge fixup: archive test/result adjusted.
2007-11-27 21:30:00 +04:00
istruewing@stella.local
c389535ae9
Merge stella.local:/home2/mydev/mysql-5.0-ateam
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-27 17:34:03 +01:00
istruewing@stella.local
a167dd0bf4
Bug#8693 Test 'rpl_log_pos' fails sometimes
...
Disabled the test case.
2007-11-27 17:28:55 +01:00
ramil/ram@ramil.myoffice.izhnet.ru
f03fb473b3
Merge mysql.com:/home/ram/work/mysql-5.0-engines
...
into mysql.com:/home/ram/work/b30495/b30495.5.0
2007-11-27 20:03:09 +04:00
malff@lambda.hsd1.co.comcast.net.
fc76a4824a
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-base
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge
2007-11-27 09:03:04 -07:00
ramil/ram@ramil.myoffice.izhnet.ru
4344785894
Merge mysql.com:/home/ram/work/mysql-5.1-engines
...
into mysql.com:/home/ram/work/b30495/b30495.5.1
2007-11-27 20:00:50 +04:00
malff@lambda.hsd1.co.comcast.net.
352e59b37b
Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-base
...
into lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-rt-merge
2007-11-27 08:56:43 -07:00
istruewing@stella.local
a39180c1f2
Merge stella.local:/home2/mydev/mysql-5.0-amain
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2007-11-27 16:24:44 +01:00
gkodinov/kgeorge@magare.gmz
11d268ba47
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B30355-5.0-opt
2007-11-27 17:21:36 +02:00
gkodinov/kgeorge@magare.gmz
0f3db011d5
Merge magare.gmz:/home/kgeorge/mysql/work/B30355-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/work/B30355-5.1-opt
2007-11-27 17:19:51 +02:00
gkodinov/kgeorge@magare.gmz
8c3d5135ba
Bug #30355 : Incorrect ordering of UDF results
...
There's currently no way of knowing the determinicity of an UDF.
And the optimizer and the sequence() UDFs were making wrong
assumptions about what the is_const member means.
Plus there was no implementation of update_system_tables()
causing the optimizer to overwrite the information returned by
the <udf>_init function.
Fixed by equating the assumptions about the semantics of
is_const and providing a implementation of update_used_tables().
Added a TODO item for the UDF API change needed to make a better
implementation.
2007-11-27 17:16:52 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
14e74e82e8
Merge mysql.com:/home/ram/work/mysql-5.0-engines
...
into mysql.com:/home/ram/work/b30495/b30495.5.0
2007-11-27 15:15:28 +04:00
mkindahl@dl145h.mysql.com
b1428496df
Disabling several tests that fail and reported as errors.
2007-11-27 11:02:00 +01:00
msvensson@pilot.mysql.com
038a093c97
Increase the slave_net_timeout to double of what the master
...
uses for connect_timeout
2007-11-27 10:56:46 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
d20dcd2421
after-merge fix:
...
- archive test/result adjusted.
- OPTIMIZE/ANALYZE PARTITION EXTENDED test case added.
2007-11-27 12:28:08 +04:00
istruewing@stella.local
13f317c565
Bug#32754 - InnoDB tests do not prepare or clean up correctly
...
Some test cases were missing preparation to deal with failed
predecessor test cases.
Added preparation (drop table if exists) to some test cases.
2007-11-27 09:25:45 +01:00
ramil/ram@ramil.myoffice.izhnet.ru
32f9164bb5
Merge mysql.com:/home/ram/work/b30495/b30495.5.0
...
into mysql.com:/home/ram/work/b30495/b30495.5.1
2007-11-27 10:14:46 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
ac034767c0
Fix for bug #32559 : connection hangs on query with name_const
...
Problem: passing a non-constant name to the NAME_CONST function results in a crash.
Fix: check the NAME_CONST name argument; return fake item type if we got
non-constant argument(s).
2007-11-27 09:36:43 +04:00
hhunger@hh-nb.hhunger
aa30bc517d
post merge fix for bug#32496.
2007-11-26 22:50:12 +01:00
hhunger@hh-nb.hhunger
a075c70588
Merge hh-nb.hhunger:/work/merge/mysql-5.0-32496
...
into hh-nb.hhunger:/work/merge/mysql-5.1-32496
2007-11-26 22:19:39 +01:00
hhunger@hh-nb.hhunger
10ea2aa927
patch for bug#32496 (2nd) with ansi conformant and Mysql test case.
2007-11-26 21:28:01 +01:00
evgen@moonbone.local
66258ff324
Many files:
...
Test case for the bug#31048 is moved to the subselect_notembedded tests as the embedded server isn't affected by this bug.
2007-11-26 22:21:46 +03:00
msvensson@pilot.mysql.com
ec08b4a405
Remove disabling of testcases
2007-11-26 20:05:52 +01:00