bar@mysql.com/bar.myoffice.izhnet.ru
84e6d960e0
After merge fix
2008-03-08 01:14:56 +04:00
bar@bar.myoffice.izhnet.ru
c49eccfe71
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b27580v2
...
into mysql.com:/home/bar/mysql-work/mysql-5.1.b27580
Additonal after merge fix
2008-03-07 15:28:51 +04:00
bar@mysql.com/bar.myoffice.izhnet.ru
86d9b5e9dc
additional test fixes for bug 27580
2008-03-06 09:58:49 +04:00
bar@bar.myoffice.izhnet.ru
34da9303ef
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b27580
...
into mysql.com:/home/bar/mysql-work/mysql-5.0.b27580v2
2008-03-06 08:41:05 +04:00
bar@mysql.com/bar.myoffice.izhnet.ru
f83cc8e6db
Bug#23924 general_log truncates queries with character set introducers.
...
Problem: logging of utf8-incompatible binary strings didn't work
Fix: hex-encoding of incompatible sequences.
2008-02-29 17:56:50 +04:00
mattiasj@witty.
2e3ed6a216
Post push fix
...
Fixed a missed case in the patch for Bug#31931.
Also makes Bug#33722 a duplicate of Bug#31931.
Added tests for better coverage.
Replaced some legacy function calls.
2008-02-25 21:18:50 +01:00
mattiasj@witty.
2bf256f8dd
Merge witty.:/Users/mattiasj/clones/mysql-5.1-bug20129.2
...
into witty.:/Users/mattiasj/clones/topush-51
2008-02-24 17:48:57 +01:00
mattiasj@witty.
d3937fd63c
Merge witty.:/Users/mattiasj/clones/mysql-5.1-bug31931.2
...
into witty.:/Users/mattiasj/clones/topush-51
2008-02-24 16:46:35 +01:00
acurtis/antony@ltamd64.xiphis.org
9ed3da2c12
Merge xiphis.org:/anubis/antony/work/mysql-5.0-engines
...
into xiphis.org:/anubis/antony/work/merge.20080220/mysql-5.0
2008-02-20 22:42:24 -08:00
svoj@june.mysql.com
33ad5a480f
Merge mysql.com:/home/svoj/devel/mysql/BUG34289/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG34289/mysql-5.1-engines
2008-02-20 21:22:21 +04:00
svoj@mysql.com/june.mysql.com
921e1cc4bb
BUG#34289 - Incorrect NAME_CONST substitution in stored procedures
...
breaks replication
NAME_CONST() didn't replicate constant character set and collation
correctly.
With this fix NAME_CONST() inherits collation from the value argument.
2008-02-19 18:16:17 +04:00
istruewing@stella.local
4bbbd57c81
Merge stella.local:/home2/mydev/mysql-5.1-amain
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-15 20:44:33 +01:00
istruewing@stella.local
108013f6a7
Merge stella.local:/home2/mydev/mysql-5.1-ateam
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-14 21:00:10 +01:00
istruewing@stella.local
6c977025df
Merge stella.local:/home2/mydev/mysql-5.0-ateam
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2008-02-14 20:24:01 +01:00
istruewing@stella.local
9a4d57e319
Merge stella.local:/home2/mydev/mysql-5.1-amain
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-14 16:53:03 +01:00
istruewing@stella.local
fb20c9dd5e
Merge stella.local:/home2/mydev/mysql-5.1-ateam
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-14 16:51:41 +01:00
istruewing@stella.local
b6c8f8a58b
Merge stella.local:/home2/mydev/mysql-5.0-amain
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2008-02-14 16:14:30 +01:00
svoj@april.(none)
2ab1b8406e
Merge mysql.com:/home/svoj/devel/mysql/BUG33946/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG33946/mysql-5.1-engines
2008-02-14 16:47:46 +04:00
svoj@mysql.com/april.(none)
7fa875e42b
BUG#33946 - Join on Federated tables with Unique index gives error 1430
...
from storage engine
Federated may crash a server, return wrong result set, return
"ERROR 1030 (HY000): Got error 1430 from storage engine" message
when local (engine=federated) table has a key against nullable
column.
The problem was wrong implementation of function that creates
WHERE clause for remote query from key.
2008-02-14 16:27:01 +04:00
mkindahl@dl145h.mysql.com
32853b9fa5
Removing non-deterministic tests from events_scheduling test.
2008-02-13 12:41:54 +01:00
mikael@dator6.(none)
e1820b2e77
Merge dator6.(none):/home/mikael/mysql_clones/bug32943
...
into dator6.(none):/home/mikael/mysql_clones/mysql-5.1-engines
2008-02-13 11:29:50 +01:00
tomas@poseidon.ndb.mysql.com
a4d8864b5e
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-rpl-merge
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2008-02-12 11:22:07 +01:00
tomas@poseidon.ndb.mysql.com
3103c2fb8c
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2008-02-11 17:37:25 +01:00
istruewing@stella.local
16be963007
Merge stella.local:/home2/mydev/mysql-5.1-amain
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-11 12:07:19 +01:00
istruewing@stella.local
d59ee3db2d
Merge stella.local:/home2/mydev/mysql-5.1-ateam
...
into stella.local:/home2/mydev/mysql-5.1-axmrg
2008-02-11 11:58:23 +01:00
mattiasj@client-10-129-10-147.upp.off.mysql.com
2335bfaa5b
Bug#20129: ALTER TABLE ... ANALYZE/CHECK/OPTIMIZE/REPAIR PARTITION
...
Problem was that it did not work with corrupted/crashed tables.
Solution is to disable these commands until WL#4176 is completed
2008-02-11 11:32:46 +01:00
istruewing@stella.local
21534505d0
Merge stella.local:/home2/mydev/mysql-5.0-amain
...
into stella.local:/home2/mydev/mysql-5.0-axmrg
2008-02-11 11:19:06 +01:00
anozdrin/alik@quad.
fab537bc89
Fix create.test: use latin1 instead ucs2.
2008-02-08 20:06:05 +03:00
kostja@dipika.(none)
e9c887cc3d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into dipika.(none):/opt/local/work/mysql-5.1-runtime
2008-02-08 18:55:07 +03:00
kostja@dipika.(none)
0e4b6ea058
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dipika.(none):/opt/local/work/mysql-5.0-runtime
2008-02-08 18:51:07 +03:00
davi@endora.local
31b22496f4
Merge mysql.com:/Users/davi/mysql/mysql-5.0-runtime
...
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-02-08 10:21:58 -02:00
davi@mysql.com/endora.local
24b9abf36d
Bug#33798 prepared statements improperly handle large unsigned ints
...
The unsignedness of large integer user variables was not being
properly preserved when feeded to prepared statements. This was
happening because the unsigned flags wasn't being updated when
converting the user variable is converted to a parameter.
The solution is to copy the unsigned flag when converting the
user variable to a parameter and take the unsigned flag into
account when converting the integer to a string.
2008-02-08 08:55:55 -02:00
mikael@dator6.(none)
6995b41ba2
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into dator6.(none):/home/mikael/mysql_clones/mysql-5.1-engines
2008-02-08 00:29:59 +01:00
malff@lambda.hsd1.co.comcast.net.
5d5bed0bcc
test update
2008-02-07 12:00:48 -07:00
davi@endora.local
2e0ef9424d
Merge mysql.com:/Users/davi/mysql/bugs/32633-5.1
...
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-02-07 16:14:39 -02:00
mikael@dator6.(none)
f0e7ceba50
Merge dator6.(none):/home/mikael/mysql_clones/bug33429
...
into dator6.(none):/home/mikael/mysql_clones/mysql-5.1-engines
2008-02-07 16:14:01 +01:00
mikael@dator6.(none)
5855dac773
Merge dator6.(none):/home/mikael/mysql_clones/bug33182
...
into dator6.(none):/home/mikael/mysql_clones/mysql-5.1-engines
2008-02-07 16:01:20 +01:00
mattiasj@witty.ndb.mysql.com
dc994bcb90
Merge witty.ndb.mysql.com:/Users/mattiasj/clones/mysql-5.1-bug33379
...
into witty.ndb.mysql.com:/Users/mattiasj/clones/51-topush
2008-02-07 15:54:55 +01:00
mattiasj@witty.ndb.mysql.com
11923a5ec2
Merge witty.ndb.mysql.com:/Users/mattiasj/Public/shared-vms/mysql-5.1-bug33379
...
into witty.ndb.mysql.com:/Users/mattiasj/clones/51-topush
2008-02-07 15:27:37 +01:00
mattiasj@witty.ndb.mysql.com
d5364e38c5
Bug#34358: Cannot find specified bit row in partitioned table
...
Problem was incorrect data length in the key_restore function
resulting in overwriting the search key.
Solution, remove one byte in length if uneven bits are used.
2008-02-07 15:09:59 +01:00
msvensson@pilot.mysql.com
04ca458fcb
Merge pilot.mysql.com:/data/msvensson/mysql/bug31004/my50-bug31004
...
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-runtime
2008-02-07 12:42:49 +01:00
mattiasj@witty.local
5d4e9d040e
Bug#33379: valgrind error in parts/partition_bit_myisam
...
Problem was that Field_bit used Field::hash() function that did not
know about using null-byte for storing bits.
Resulting in wrong length, which was caught by valgrind.
Solution: created a Field_bit::hash() that uses Field_bit::val_int()
and my_charset_bin-collation function hash_sort.
Also use the store function for platform independs
2008-02-07 12:28:38 +01:00
istruewing@stella.local
fc375a2d19
Bug#34376 - merge-big test fails
...
After changes to the bug fix for bug 26379 (Combination of FLUSH
TABLE and REPAIR TABLE corrupts a MERGE table) the test case
merge-big failed.
Repaired the test case.
Removed tests for INSERT ... SELECT, which is disabled for MERGE.
Test case change only.
2008-02-07 12:04:19 +01:00
davi@mysql.com/endora.local
1c6768c487
Bug#32633 Can not create any routine if SQL_MODE=no_engine_substitution
...
The problem is that one can not create a stored routine if sql_mode
contains NO_ENGINE_SUBSTITUTION or PAD_CHAR_TO_FULL_LENGTH. Also when
a event is created, the mode is silently lost if sql_mode contains one
of the aforementioned. This was happening because the table definitions
which stored sql_mode values weren't being updated to accept new values
of sql_mode.
The solution is to update, in a backwards compatible manner, the various
table definitions (columns) that store the sql_mode value to take into
account the new possible values. One incompatible change is that if a event
that is being created can't be stored to the mysql.event table, an error
will be raised.
The tests case also ensure that new SQL modes will be added to the mysql.proc
and mysql.event tables, otherwise the tests will fail.
2008-02-07 08:47:39 -02:00
davi@endora.local
8278d42586
Merge mysql.com:/Users/davi/mysql/bugs/21801-5.1
...
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-02-06 12:50:22 -02:00
davi@endora.local
6efa489780
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-02-06 11:22:18 -02:00
davi@mysql.com/endora.local
2af5e25c1d
Bug#32710: SHOW INNODB STATUS requires SUPER
...
Changed "SHOW ENGINE ... STATUS" and "SHOW ENGINE ... MUTEX"
to require the PROCESS privilege, instead of SUPER.
Fixed by Damien Katz
2008-02-06 11:20:15 -02:00
anozdrin/alik@quad.
3b60dc73a4
Add a test case for Bug#21380: DEFAULT definition not always
...
transfered by CREATE TABLE/SELECT to the new table.
2008-02-06 14:55:19 +03:00
davi@mysql.com/endora.local
bd4e875448
Bug#34311 main.lock_multi.test fails
...
Re-enable the test case for Bug 30331.
2008-02-06 09:40:59 -02:00
tomas@whalegate.ndb.mysql.com
1fa870fa88
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2008-02-06 11:42:18 +01:00