Alexey Kopytov
22e3c1f6b1
Merge mysql-5.0-bugteam->mysql-5.1-bugteam.
2008-12-10 19:17:58 +03:00
Alexey Kopytov
b3d59b09a8
Pull from mysql-5.0-bugteam.
2008-12-10 19:16:40 +03:00
Alexey Kopytov
764b9717ef
Pull from mysql-5.0-bugteam.
2008-12-10 19:14:32 +03:00
Sergey Glukhov
5fdd9c99c2
Bug#35275 INFORMATION_SCHEMA.TABLES.CREATE_OPTIONS omits KEY_BLOCK_SIZE
...
Added KEY_BLOCK_SIZE option to I_S.TABLES.CREATE_OPTIONS field
2008-12-10 18:38:27 +04:00
Sergey Glukhov
50f4e85720
5.0-bugteam->5.1-bugteam merge
2008-12-10 18:16:21 +04:00
Sergey Glukhov
2b64acde8b
Bug#37956 memory leak and / or crash with geometry and prepared statements!
...
Bug#37671 crash on prepared statement + cursor + geometry + too many open files!
if mysql_execute_command() returns error then free materialized_cursor object.
is_rnd_inited is added to satisfy rnd_end() assertion
(handler may be uninitialized in some cases)
2008-12-10 18:13:11 +04:00
Alexey Kopytov
33bac53782
Fix for a test failure on Solaris/x86/gcc introduced by the patch for bug #27483 .
...
Removed values with more than 15 significant digits from the test case. Results of
reading/printing such values using system library functions depend on implementation
and thus are not portable.
2008-12-10 16:07:32 +03:00
Luis Soares
9383631e59
push to 5.0-bugteam tree.
2008-12-10 10:53:22 +00:00
Luis Soares
c5d7c038a3
push to 5.1-buteam tree.
2008-12-10 10:51:43 +00:00
V Narayanan
5b924b3216
merging with mysql-5.1-bugteam
2008-12-10 15:36:40 +05:30
Mattias Jonsson
03ea91cc0c
merge
2008-12-10 10:33:01 +01:00
Alexander Barkov
f5a850109a
Bug#38227 EXTRACTVALUE doesn't work with DTD declarations
...
Problem:
XML syntax parser allowed to use quoted strings as attribute names,
and tried to put them into parser state stack instead of identifiers.
After that parser failed, if quoted string contained some slash characters.
Fix:
- Disallowing quoted strings in regular tags.
- Allowing quoted string in DOCTYPE declararion, but
don't push it into parse state stack (just skip it).
2008-12-10 13:05:57 +04:00
V Narayanan
4489e6c123
merging mysql-5.0-bugteam -> mysql-5.1-bugteam
2008-12-10 14:35:18 +05:30
V Narayanan
2453e20f7d
updating with mysql-5.0-bugteam
2008-12-10 14:26:57 +05:30
Mattias Jonsson
575dc079ca
merge
2008-12-10 09:11:59 +01:00
Mattias Jonsson
7ce5c00c7b
merge
2008-12-10 09:06:58 +01:00
Georgi Kodinov
500810d8c9
null-merged the backported fix for bug 34773 to 5.1-bugteam
2008-12-09 21:43:10 +02:00
Georgi Kodinov
d506265f2c
backported the fix for bug #34773 to 5.0
2008-12-09 20:35:02 +02:00
Georgi Kodinov
2d88514de4
merged 37936 to 5.1-bugteam
2008-12-09 19:58:50 +02:00
Georgi Kodinov
71296ae2e2
Bug #37936 : ASSERT_COLUMN_MARKED_FOR_WRITE in Field_datetime::store ,
...
Field_varstring::store
The code that temporary saved the bitmaps of the read set and the write set so that
it can set it to all columns for debug purposes was not expecting that the
table->read_set and table->write_set can be the same. And was always saving both in
sequence.
As a result the original value was never restored.
Fixed by saving & restoring the original value only once if the two sets are the
same (in a special set of functions).
2008-12-09 19:46:03 +02:00
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
c69ca8476c
merge
2008-12-09 10:08:52 -05: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
