diff options
| author | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-03-25 10:32:01 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-03-25 10:32:01 +0300 |
| commit | d61ae8167f1f97fad4057acb6596d79d51b01559 (patch) | |
| tree | 4bf1441434aa3b6431b97774100f151c116b8d65 | |
| parent | a49b057dc40391205d7428e1676e245053e75e42 (diff) | |
| download | mariadb-git-d61ae8167f1f97fad4057acb6596d79d51b01559.tar.gz | |
Fix for bug #43801: mysql.test takes too long, fails due to
expired timeout on debx86-b in PB
Turned off general log when importing DB dump in the test
case for bug #41486 due to the bug in CSV engine code that
makes logging long SQL query too slow.
mysql-test/r/mysql-bug41486.result:
Turned off general log when importing DB dump in the test
case for bug #41486 due to the bug in CSV engine code that
makes logging long SQL query too slow.
mysql-test/t/mysql-bug41486.test:
Turned off general log when importing DB dump in the test
case for bug #41486 due to the bug in CSV engine code that
makes logging long SQL query too slow.
| -rw-r--r-- | mysql-test/r/mysql-bug41486.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/mysql-bug41486.test | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/mysql-bug41486.result b/mysql-test/r/mysql-bug41486.result index 454b5888b49..02777ab587f 100644 --- a/mysql-test/r/mysql-bug41486.result +++ b/mysql-test/r/mysql-bug41486.result @@ -3,6 +3,9 @@ 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); +SET @old_general_log = @@global.general_log; +SET @@global.general_log = 0; +SET @@global.general_log = @old_general_log; SELECT LENGTH(data) FROM t1; LENGTH(data) 2097152 diff --git a/mysql-test/t/mysql-bug41486.test b/mysql-test/t/mysql-bug41486.test index 805c0f99480..7ea9f6d81c7 100644 --- a/mysql-test/t/mysql-bug41486.test +++ b/mysql-test/t/mysql-bug41486.test @@ -30,9 +30,12 @@ let $outfile= $MYSQLTEST_VARDIR/tmp/bug41486.sql; --error 0,1 remove_file $outfile; --exec $MYSQL_DUMP test t1 > $outfile +SET @old_general_log = @@global.general_log; +SET @@global.general_log = 0; # 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 +SET @@global.general_log = @old_general_log; SELECT LENGTH(data) FROM t1; DROP TABLE t1; |