Manuel merge.

mysql-test/r/mysql-bug41486.result

+DROP TABLE IF EXISTS t1;
+SET @old_max_allowed_packet= @@global.max_allowed_packet;
+SET @@global.max_allowed_packet = 2 * 1024 * 1024 + 1024;
+CREATE TABLE t1(data LONGBLOB);
+INSERT INTO t1 SELECT REPEAT('1', 2*1024*1024);
+SELECT LENGTH(data) FROM t1;
+LENGTH(data)
+2097152
+DROP TABLE t1;
+SET @@global.max_allowed_packet = @old_max_allowed_packet;

mysql-test/r/mysql.result

@@ -192,15 +192,6 @@ delimiter
 1
 1
 1
-set @old_max_allowed_packet = @@global.max_allowed_packet;
-set @@global.max_allowed_packet = 2 * 1024 * 1024 + 1024;
-CREATE TABLE t1(data LONGBLOB);
-INSERT INTO t1 SELECT REPEAT('1', 2*1024*1024);
-SELECT LENGTH(data) FROM t1;
-LENGTH(data)
-2097152
-DROP TABLE t1;
-set @@global.max_allowed_packet = @old_max_allowed_packet;
 End of 5.0 tests
 WARNING: --server-arg option not supported in this configuration.
 Warning (Code 1286): Unknown table engine 'nonexistent'

mysql-test/t/mysql-bug41486.test

+#
+# Bug#41486 extra character appears in BLOB for every ~40Mb after
+#           mysqldump/import
+#
+# 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;
+# 2 MB blob length + some space for the rest of INSERT query
+SET @@global.max_allowed_packet = 2 * 1024 * 1024 + 1024;
+
+# Create a new connection since the global max_allowed_packet
+# has no effect for the current connection
+connect (con1, localhost, root,,);
+
+CREATE TABLE t1(data LONGBLOB);
+INSERT INTO t1 SELECT REPEAT('1', 2*1024*1024);
+
+let $outfile= $MYSQLTEST_VARDIR/tmp/bug41486.sql;
+--error 0,1
+remove_file $outfile;
+--exec $MYSQL_DUMP test t1 > $outfile
+# Check that the mysql client does not insert extra newlines when loading
+# strings longer than client's max_allowed_packet
+--exec $MYSQL --max_allowed_packet=1M test < $outfile 2>&1
+SELECT LENGTH(data) FROM t1;
+
+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;

mysql-test/t/mysql.test

@@ -332,39 +332,6 @@ EOF
 
 remove_file $MYSQLTEST_VARDIR/tmp/bug31060.sql;
 
-#  
-# Bug #41486: extra character appears in BLOB for every ~40Mb after   
-#             mysqldump/import   
-#  
-  
-# Have to change the global variable as the session variable is 
-# read-only.
-set @old_max_allowed_packet = @@global.max_allowed_packet; 
-# 2 MB blob length + some space for the rest of INSERT query
-set @@global.max_allowed_packet = 2 * 1024 * 1024 + 1024; 
-
-# Create a new connection since the global max_allowed_packet
-# has no effect for the current connection
-connect (con1, localhost, root,,);
-connection con1; 
-
-CREATE TABLE t1(data LONGBLOB);  
-INSERT INTO t1 SELECT REPEAT('1', 2*1024*1024);  
-  
---exec $MYSQL_DUMP test t1 >$MYSQLTEST_VARDIR/tmp/bug41486.sql  
-# Check that the mysql client does not insert extra newlines when loading  
-# strings longer than client's max_allowed_packet  
---exec $MYSQL --max_allowed_packet=1M test < $MYSQLTEST_VARDIR/tmp/bug41486.sql 2>&1  
-SELECT LENGTH(data) FROM t1;  
-  
-remove_file $MYSQLTEST_VARDIR/tmp/bug41486.sql; 
-DROP TABLE t1;  
-
-connection default;
-disconnect con1;
-
-set @@global.max_allowed_packet = @old_max_allowed_packet; 
- 
 --echo End of 5.0 tests
 
 #