diff options
| author | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-03-24 23:44:38 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-03-24 23:44:38 +0300 |
| commit | 8d4d3e1301ed8910a21c70cdb7b9e2f468bb7af6 (patch) | |
| tree | df804904d2700c325ef7b21412ebdafcd0c529af /mysql-test/t/mysql.test | |
| parent | afcfe81fea26b9f746ee7043c41d8dff52333067 (diff) | |
| download | mariadb-git-8d4d3e1301ed8910a21c70cdb7b9e2f468bb7af6.tar.gz | |
Fix for bug #43801: mysql.test takes too long, fails due to
expired timeout on debx86-b in PB
Moved the resource-intensive test case for bug #41486 into
a separate test file to reduce execution time for mysql.test.
mysql-test/include/wait_until_disconnected.inc:
Used in mysql-bug41486.test.
mysql-test/r/mysql-bug41486.result:
Moved the resource-intensive test case for bug #41486 into
a separate test file to reduce execution time for mysql.test.
mysql-test/r/mysql.result:
Moved the resource-intensive test case for bug #41486 into
a separate test file to reduce execution time for mysql.test.
mysql-test/t/mysql-bug41486.test:
Moved the resource-intensive test case for bug #41486 into
a separate test file to reduce execution time for mysql.test.
mysql-test/t/mysql.test:
Moved the resource-intensive test case for bug #41486 into
a separate test file to reduce execution time for mysql.test.
Diffstat (limited to 'mysql-test/t/mysql.test')
| -rw-r--r-- | mysql-test/t/mysql.test | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index f352c08fb5b..594d10e46a5 100644 --- a/mysql-test/t/mysql.test +++ b/mysql-test/t/mysql.test @@ -331,37 +331,4 @@ 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 |