Automerge.
This commit is contained in:
commit
9c1e2bbcf6
@ -112,7 +112,7 @@ extern "C" {
|
|||||||
#define PROMPT_CHAR '\\'
|
#define PROMPT_CHAR '\\'
|
||||||
#define DEFAULT_DELIMITER ";"
|
#define DEFAULT_DELIMITER ";"
|
||||||
|
|
||||||
#define MAX_BATCH_BUFFER_SIZE (1024L * 1024L)
|
#define MAX_BATCH_BUFFER_SIZE (1024L * 1024L * 1024L)
|
||||||
|
|
||||||
typedef struct st_status
|
typedef struct st_status
|
||||||
{
|
{
|
||||||
|
8
mysql-test/r/mysql-bug45236.result
Normal file
8
mysql-test/r/mysql-bug45236.result
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
DROP TABLE IF EXISTS t1;
|
||||||
|
SET @old_max_allowed_packet= @@global.max_allowed_packet;
|
||||||
|
SET @@global.max_allowed_packet = 1024 * 1024 + 1024;
|
||||||
|
CREATE TABLE t1(data LONGBLOB);
|
||||||
|
INSERT INTO t1 SELECT CONCAT(REPEAT('1', 1024*1024 - 27),
|
||||||
|
"\'\r dummydb dummyhost");
|
||||||
|
DROP TABLE t1;
|
||||||
|
SET @@global.max_allowed_packet = @old_max_allowed_packet;
|
43
mysql-test/t/mysql-bug45236.test
Normal file
43
mysql-test/t/mysql-bug45236.test
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
#
|
||||||
|
# Bug #45236: large blob inserts from mysqldump fail, possible memory issue ?
|
||||||
|
#
|
||||||
|
# This test consumes a significant amount of resources.
|
||||||
|
# Therefore it should be kept separated from other tests.
|
||||||
|
# Otherwise we might suffer from problems like
|
||||||
|
# Bug#43801 mysql.test takes too long, fails due to expired timeout
|
||||||
|
# on debx86-b in PB
|
||||||
|
#
|
||||||
|
|
||||||
|
--disable_warnings
|
||||||
|
DROP TABLE IF EXISTS t1;
|
||||||
|
--enable_warnings
|
||||||
|
|
||||||
|
# Have to change the global variable as the session variable is
|
||||||
|
# read-only.
|
||||||
|
SET @old_max_allowed_packet= @@global.max_allowed_packet;
|
||||||
|
# ~1 MB blob length + some space for the rest of INSERT query
|
||||||
|
SET @@global.max_allowed_packet = 1024 * 1024 + 1024;
|
||||||
|
|
||||||
|
# Create a new connection since the global max_allowed_packet
|
||||||
|
# has no effect onr the current one
|
||||||
|
connect (con1, localhost, root,,);
|
||||||
|
|
||||||
|
CREATE TABLE t1(data LONGBLOB);
|
||||||
|
INSERT INTO t1 SELECT CONCAT(REPEAT('1', 1024*1024 - 27),
|
||||||
|
"\'\r dummydb dummyhost");
|
||||||
|
|
||||||
|
let $outfile= $MYSQLTEST_VARDIR/tmp/bug41486.sql;
|
||||||
|
--error 0,1
|
||||||
|
remove_file $outfile;
|
||||||
|
--exec $MYSQL_DUMP --compact -t test t1 > $outfile
|
||||||
|
# Check that the mysql client does not interpret the "\r" sequence as a command
|
||||||
|
--exec $MYSQL --max_allowed_packet=1M test < $outfile 2>&1
|
||||||
|
|
||||||
|
DROP TABLE t1;
|
||||||
|
|
||||||
|
# Cleanup
|
||||||
|
disconnect con1;
|
||||||
|
--source include/wait_until_disconnected.inc
|
||||||
|
remove_file $outfile;
|
||||||
|
connection default;
|
||||||
|
SET @@global.max_allowed_packet = @old_max_allowed_packet;
|
Loading…
x
Reference in New Issue
Block a user