1
0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00

Manual merge from the bugfix tree.

conflicts:
   conflict      sql/sql_parse.cc
This commit is contained in:
Alexey Kopytov
2010-06-11 16:52:06 +04:00
16 changed files with 182 additions and 61 deletions

View File

@@ -39,5 +39,14 @@ a
2
DROP TABLE t1;
#
# Bug#42064: low memory crash when importing hex strings, in Item_hex_string::Item_hex_string
#
CREATE TABLE t1(a BLOB);
SET SESSION debug="+d,bug42064_simulate_oom";
INSERT INTO t1 VALUES("");
Got one of the listed errors
SET SESSION debug=DEFAULT;
DROP TABLE t1;
#
# End of 5.1 tests
#