Horst Hunger
9ce98dd101
due to merge
2008-12-09 17:34:31 +01:00
Sergey Glukhov
22b701908b
automerge
2008-12-09 19:52:50 +04:00
Matthias Leich
532fd0bd18
Merge of latest changes into GCA tree
...
no conflicts
2008-12-09 16:40:12 +01:00
Sergey Glukhov
9ff609116d
updated test results
2008-12-09 19:31:22 +04:00
Horst Hunger
6e96dd3135
due to merge
2008-12-09 16:15:07 +01:00
Patrick Crews
3a8da92380
merge
2008-12-09 10:08:42 -05:00
Patrick Crews
46e471854e
merge
2008-12-09 10:07:03 -05:00
Matthias Leich
702375158b
Merge of fix for Bug 40904 into GCA tree
2008-12-09 15:11:53 +01:00
Sergey Glukhov
ed61dee680
5.0-bugteam->5.1-bugteam merge
2008-12-09 17:31:22 +04:00
Sergey Glukhov
c5c64a30d4
Bug#31399 Wrong query result when doing join buffering over BIT fields
...
if table has bit fields then uneven bits(if exist) are stored into null bits place.
So we need to copy null bits in case of uneven bit field presence.
2008-12-09 16:59:47 +04:00
Sergey Glukhov
d2b5e0bb94
Bug#31291 ALTER TABLE CONVERT TO CHARACTER SET does not change some data types
...
added ability for TINY[MEDIUM] text fields
to be converted to greater subtype during
alter if necessary(altered charset)
2008-12-09 16:38:52 +04:00
Sergey Glukhov
539bb5d42a
5.0-bugteam->5.1-bugteam automerge
2008-12-09 16:19:37 +04:00
Sergey Glukhov
f4c648aff8
automerge
2008-12-09 16:17:17 +04:00
Sergey Glukhov
904c7c4409
automerge
2008-12-09 16:11:01 +04:00
Sergey Glukhov
5168c2ac68
5.0-bugteam->5.1-bugteam merge
2008-12-09 15:16:39 +04:00
Alexey Kopytov
d4adb11088
Merge from mysql-5.0-bugteam to mysql-5.1-bugteam.
2008-12-09 13:56:46 +03:00
Alexey Kopytov
73b48decf0
Merge from mysql-5.0-bugteam.
2008-12-09 13:22:55 +03:00
Alexey Kopytov
66fa3c09a3
Added a missing bit from the original patch for bug #27483 which was lost when re-applying
...
the patch manually to another tree.
2008-12-09 13:19:46 +03:00
Sergey Glukhov
0661c210d3
bug#35558 Wrong server metadata blows up the client
...
the problem: FORMAT func max_length value was calculated incorrectly
the fix: correct calculation of max_length
2008-12-09 14:00:43 +04:00
Sergey Glukhov
eb46763654
Bug#35796 SHOW CREATE TABLE and default value for BIT field
...
show default value for BIT field in printable format
2008-12-09 13:53:23 +04:00
Sergey Vojtovich
39a28301f1
Merge.
2008-12-09 13:29:59 +04:00
Sergey Vojtovich
51f2783577
Merge.
2008-12-09 13:27:46 +04:00
Sergey Glukhov
b3012d0867
Bug#40949 Debug version of MySQL server crashes when run OPTIMIZE on compressed table.
...
reset diagnostics area state after error message is sent
2008-12-09 13:04:28 +04:00
Sergey Vojtovich
53e83e6e21
Merge.
2008-12-09 12:53:19 +04:00
Alexey Botchkov
62ca604d13
merging
2008-12-09 12:47:48 +04:00
Alexey Botchkov
315f653987
Bug#35934 mysql_upgrade calls mysqlcheck with insufficient parameters
...
modifying the original fix.
As it turned out --fix-db-names option of the mysqlcheck suppress
the --check_upgrade option, so we have to call the mysqlcheck twice
from the mysql_upgrade.
per-file comments:
client/mysql_upgrade.c
Bug#35934 mysql_upgrade calls mysqlcheck with insufficient parameters
2008-12-09 12:30:49 +04:00
Alexey Kopytov
0befdab5f0
Merge from mysql-5.0-bugteam to mysql-5.1-bugteam.
2008-12-09 11:11:52 +03:00
Alexey Kopytov
b713958132
Fixed type_float failures in --ps-protocol mode introduced by the test case for bug #27483 .
...
The reason for the failures was bug #21205 (fixed in 6.0 by dtoa, but still present in 5.0/5.1).
2008-12-09 11:05:36 +03:00
Andrei Elkin
df1f4784c0
merge 5.1-bt to a local clone.
2008-12-09 02:21:06 +02:00
Patrick Crews
cd0abe2da4
merge 5.0->5.1
...
Nothing to do, was already in 5.1
2008-12-08 16:25:33 -05:00
Patrick Crews
67fc961e6f
merge
2008-12-08 16:22:16 -05:00
Andrei Elkin
e6edcee80d
Bug #33420 Test 'rpl_packet' fails randomly with changed "Exec_Master_Log_Pos"
...
binlog_row_mix_innodb_myisam resutls are corrected.
The last operations prior the dup error is
TRUNCATE table t2;
Therefore after
--error ER_DUP_ENTRY
INSERT INTO t2 select * from t1;
table t2 must be empty, and that is what the updated results confirm.
2008-12-08 21:40:25 +02:00
Andrei Elkin
1944f98a1a
merging 5.1-bt to a local tree.
2008-12-08 21:26:32 +02:00
Chad MILLER
a8dd8f6995
Replace C++ comment in a header file. Thanks, Alik!
2008-12-08 12:45:48 -05:00
Vladislav Vaintroub
fd5a2980fc
merge
2008-12-08 16:37:32 +01:00
Mattias Jonsson
e10a3e99e7
merge
2008-12-08 16:07:41 +01:00
Andrei Elkin
ca25988f6e
Bug #40221 Replication failure on RBR + UPDATE the primary key
...
Extending bug#40221 regression test: 1. include INSERT 2. convert prim key + autoinc to
unique.
2008-12-08 17:07:08 +02:00
Andrei Elkin
b9b49981f7
merge bug#33420, bug#41173 on bt 5.0 -> 5.1
2008-12-08 16:42:59 +02:00
Matthias Leich
b16ba9aa33
Fix for Bug#40904 20 tests in 5.1 are disabled in a bad manner
...
- remove totally wrong (syntax) entries from disabled.def
- remove entries belonging to deleted tests from disabled.def
- correct the comments (correct the bug mentioned) of entries in disabled.def
- remove never completed tests which were accidently pushed
2008-12-08 15:36:42 +01:00
Andrei Elkin
0ec3e14e98
merge 5.0->5.0-bugteam for a local tree containing bug#33420 Test 'rpl_packet' fails randomly.
2008-12-08 16:29:13 +02:00
Mattias Jonsson
e3edfcb4b0
merge
2008-12-08 15:09:59 +01:00
Mats Kindahl
e2fb6dc1d9
Merging with 5.1-bugteam.
2008-12-08 14:40:57 +01:00
Alexey Kopytov
76835e57a2
Pull from mysql-5.1-bugteam.
2008-12-08 15:19:08 +03:00
Alexey Kopytov
772685705c
Pull from mysql-5.0-bugteam
2008-12-08 15:14:10 +03:00
Alexey Botchkov
f48fc26c5a
merging
2008-12-08 15:46:19 +04:00
Alexey Botchkov
f9bc9698d7
merging
2008-12-08 15:41:45 +04:00
Mats Kindahl
908937ee92
Merging patch with 5.1-bugteam.
2008-12-08 11:32:24 +01:00
Georgi Kodinov
b9f848c717
merged bug 37742 to 5.1-bugteam
2008-12-08 12:23:33 +02:00
Georgi Kodinov
057323a7b0
merge 5.0-bugteam -> 5.1-bugteam
2008-12-08 11:57:44 +02:00
Georgi Kodinov
a3cdd71a35
merged 5.1-main
2008-12-08 11:56:40 +02:00
