Tatiana A. Nurnberg
1d85ad238b
manual merge
2009-02-19 18:22:28 +01:00
Tatiana A. Nurnberg
f218f9f278
Bug#33550: mysqldump 4.0 compatibility broken
...
mysqldump included character_set_client magic
that is unknown before 4.1 even when asked for
an appropriate compatibility mode.
In compatibility (3.23, 4.0) mode, we do not
output charset statements (not even in a
"comment conditional"), nor do we do magic on
the server, even if the server is sufficient
new (4.1+). Table-names will be output converted
to the charset requested by mysqldump; if such
a conversion is not possible (Ivrit -> Latin),
mysqldump will fail.
2009-02-19 17:33:28 +01:00
Sergey Glukhov
afc1c8a5af
automerge
2009-02-19 18:52:49 +04:00
Sergey Glukhov
bca6863ac7
5.0-bugteam->5.1-bugteam merge
2009-02-19 17:59:00 +04:00
Sergey Glukhov
6a9de01a95
Bug#37601 Cast Is Not Done On Row Comparison
...
In case of ROW item each compared pair does not
check if argumet collations can be aggregated and
thus appropiriate item conversion does not happen.
The fix is to add the check and convertion for ROW
pairs.
2009-02-19 17:20:44 +04:00
Staale Smedseng
ac8f752e92
Bug#31506 detection of function's availability is wrong in
...
configure.in
Replacing AC_CHECK_FUNC+AC_CHECK_LIB combination with
AC_SEARCH_LIBS.
2009-02-19 11:24:52 +01:00
Alexey Kopytov
fb9f6e13c1
Merge mysql-5.0-bugteam -> mysql-5.1-bugteam.
2009-02-19 12:05:44 +03:00
Alexey Kopytov
ed0859a05d
Automerge.
2009-02-19 12:03:23 +03:00
Alexey Kopytov
ae9ea0414c
Automerge.
2009-02-19 12:02:11 +03:00
Alexey Kopytov
57b54ae7b1
Automerge.
2009-02-19 11:56:16 +03:00
Alexey Kopytov
c4f0c2d38c
Fix for bug #41078 : With CURSOR_TYPE_READ_ONLY mysql_stmt_fetch()
...
returns short string value.
Multibyte character sets were not taken into account when
calculating max_length in Item_param::convert_str_value(). As a
result, string parameters of a prepared statement could be
truncated later when calculating string length in characters by
dividing length in bytes by the charset's mbmaxlen value (e.g. in
Field_varstring::store()).
Fixed by taking charset's mbmaxlen into account when calculating
max_length in Item_param::convert_str_value().
2009-02-19 11:49:35 +03:00
Sergey Glukhov
ad0e657db4
5.0->bugteam->5.1-bugteam merge
2009-02-18 16:09:46 +04:00
Sergey Glukhov
49243dd212
automerge
2009-02-18 15:53:30 +04:00
Georgi Kodinov
4c45c68e08
merge of bug 26724 to 5.1-bugteam
2009-02-18 12:26:11 +02:00
Georgi Kodinov
2202d5b7f5
Bug #26724 : mysql command line client, ignores input to internal cmd after space
...
Removed the misleading "NOTE:" from the \h command.
2009-02-18 12:18:38 +02:00
Vladislav Vaintroub
df733e5f12
merge
2009-02-18 10:31:53 +01:00
Sergey Glukhov
7acaece2ba
Bug#25830 SHOW TABLE STATUS behaves differently depending on table name(for 5.0 only)
...
replace wild_case_compare with my_wildcmp which is multibyte safe function
2009-02-17 18:22:48 +04:00
Matthias Leich
fc43a137d4
Merge of fix for Bug 42836 into GCA tree
2009-02-16 20:43:34 +01:00
Andrei Elkin
19a7e36679
commenting windows disable for rpl_cross_version to relate to Bug #42879
2009-02-16 14:51:39 +02:00
Andrei Elkin
f37b12812f
merging from 5.1-bt
2009-02-16 14:47:51 +02:00
Davi Arnaut
d5f92fec29
Bug#41077: Warning contains wrong future version
...
Substitute all references of MySQL version "5.2" to "6.0" in
deprecation warning messages.Deprecated constructs are being
removed in the 6.0 tree.
2009-02-16 08:38:15 -03:00
Georgi Kodinov
b0c2ba5b5b
merged 5.1-main -> 5.1-bugteam
2009-02-16 12:59:50 +02:00
Georgi Kodinov
9fcc08d3ca
merged 5.0-bugteam -> 5.1-bugteam
2009-02-16 12:55:59 +02:00
Georgi Kodinov
209cc33609
merged 5.1-main -> 5.1-bugteam
2009-02-16 12:54:03 +02:00
Andrei Elkin
5101180304
rpl_cross_version.test is disable for win till a proper fixing bug#42451
2009-02-16 10:49:51 +02:00
Alexey Kopytov
5105fb34a0
Take additional precision into account
2009-02-15 14:11:50 +03:00
Alexey Kopytov
f0be8af10e
Automerge.
2009-02-15 12:47:04 +03:00
Alexey Kopytov
b615d8bcb4
Fixed PB failures on IA64 hosts introduced by the patch for bug #21205 .
2009-02-15 12:26:08 +03:00
Patrick Crews
b7a5717d19
automerge
2009-02-14 17:52:45 -05:00
Alexey Kopytov
5ecbccf9c9
Automerge.
2009-02-14 20:14:10 +03:00
Alexey Kopytov
831914b848
Added missing DROP TABLE to type_float.result.
2009-02-14 20:12:14 +03:00
Alexey Kopytov
48c4ff8010
Fixed parser test failure introduced by the patch for bug #21205 .
2009-02-14 19:04:16 +03:00
Alexey Kopytov
4fd80a9dc5
Merge mysql-5.0-bugteam -> mysql-5.1-bugteam
2009-02-14 19:00:11 +03:00
Alexey Kopytov
811ace8364
Fixed several test failures in the funcs_1 suite introduced by the patch for bug #21205 .
2009-02-14 18:58:07 +03:00
Alexey Kopytov
c41a700550
Fixed bdb_gis and ndb_gis test failures in PB introduced by the patch for bug #21205 .
2009-02-14 18:36:57 +03:00
Ramil Kalimullin
31138433f6
Auto-merge
2009-02-14 14:47:33 +04:00
Ramil Kalimullin
ff8229fbef
Fix for bug#21476: stack overflow crashes server; error-message
...
stack reservation too small
Problem: some tests fail on HP-UX due to insufficient stack reservation.
Fix: increase stack reservation.
2009-02-14 14:40:22 +04:00
Alexey Kopytov
3c5db06b81
Merge mysql-5.0-bugteam -> mysql-5.1-bugteam.
2009-02-14 12:14:05 +03:00
Alexey Kopytov
0614aec4c0
Merge from dev tree.
2009-02-14 12:11:32 +03:00
Alexey Kopytov
9d21ff1148
Merge from dev tree.
2009-02-14 12:09:35 +03:00
Patrick Crews
ffd9672b9b
BUG#32667: lowercase_table3.test reports to error log
...
Cleaned up SQL code in the test.
Needed to move the FLUSH TABLES statement prior to the DROP TABLE t1 to prevent a warning of
Table open on delete and a test fail.
2009-02-13 16:12:59 -05:00
Davi Arnaut
19b053aee6
Empty merge.
2009-02-13 17:32:24 -02:00
Davi Arnaut
9cce8f40eb
Remove test case for bug 40264.
...
Dirty close tricky does not work on Windows.
2009-02-13 17:26:20 -02:00
Tatiana A. Nurnberg
c0255fbc64
auto-merge
2009-02-13 19:18:01 +01:00
Matthias Leich
3f82fcccfb
Fix for Bug#42836 Funcs_1 storedproc and storedproc_08 tests failing
2009-02-13 19:07:56 +01:00
Tatiana A. Nurnberg
aa3f93083c
Bug#42146 - DATETIME fractional seconds parse error
...
Bug#38435 - LONG Microseconds cause MySQL to fail a CAST to DATETIME or DATE
Parsing of optional microsecond part in datetime did not
fail gracefully when field width was larger than the allowed
six places.
Now handles up to the correct six places, and disregards
any extra digits without messing up what we've already got.
2009-02-13 19:07:03 +01:00
Alexey Kopytov
7040781c19
Merge from team tree
2009-02-13 19:32:23 +03:00
Alexey Kopytov
7cc2e62e25
Merge mysql-5.0-bugteam -> mysql-5.1-bugteam.
2009-02-13 19:20:56 +03:00
Andrei Elkin
7497edf967
merging from the main to a local branch
2009-02-13 18:20:36 +02:00
Alexey Kopytov
ccd5a4dc46
Merge from dev tree.
2009-02-13 19:17:07 +03:00
