diff options
| author | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-05-21 19:14:56 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-05-21 19:14:56 +0400 |
| commit | 7fe1db37f13b8314c078ea34c7a4b684742b444a (patch) | |
| tree | 3c3b2c9a2638729940f90d40eb227b11c39f412c | |
| parent | 2e5f1d0f2c28850e4e1495bd14273d539a46b117 (diff) | |
| download | mariadb-git-7fe1db37f13b8314c078ea34c7a4b684742b444a.tar.gz | |
Fixed a PB failure introduced by the patch for bug #44796.
Set max_allowed_packet to get a consistent error message.
| -rw-r--r-- | mysql-test/r/func_compress.result | 5 | ||||
| -rw-r--r-- | mysql-test/t/func_compress.test | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/mysql-test/r/func_compress.result b/mysql-test/r/func_compress.result index a30ca7859f1..af3c5905678 100644 --- a/mysql-test/r/func_compress.result +++ b/mysql-test/r/func_compress.result @@ -116,6 +116,8 @@ Warnings: Error 1259 ZLIB: Input data corrupted Error 1259 ZLIB: Input data corrupted drop table t1; +SET @old_max_allowed_packet = @@max_allowed_packet; +SET @@max_allowed_packet = 1024 * 1024; CREATE TABLE t1 (c1 INT); INSERT INTO t1 VALUES (1), (1111), (11111); SELECT UNCOMPRESS(c1), UNCOMPRESSED_LENGTH(c1) FROM t1; @@ -128,7 +130,8 @@ Error 1259 ZLIB: Input data corrupted Error 1259 ZLIB: Input data corrupted Error 1259 ZLIB: Input data corrupted Error 1259 ZLIB: Input data corrupted -Error 1256 Uncompressed data size too large; the maximum size is 104857600 (probably, length of uncompressed data was corrupted) +Error 1256 Uncompressed data size too large; the maximum size is 1048576 (probably, length of uncompressed data was corrupted) EXPLAIN EXTENDED SELECT * FROM (SELECT UNCOMPRESSED_LENGTH(c1) FROM t1) AS s; +SET @@max_allowed_packet = @old_max_allowed_packet; DROP TABLE t1; End of 5.0 tests diff --git a/mysql-test/t/func_compress.test b/mysql-test/t/func_compress.test index b1a37c16c6d..8df26dce2ee 100644 --- a/mysql-test/t/func_compress.test +++ b/mysql-test/t/func_compress.test @@ -87,6 +87,9 @@ drop table t1; # uncompressed_length # +SET @old_max_allowed_packet = @@max_allowed_packet; +SET @@max_allowed_packet = 1024 * 1024; + CREATE TABLE t1 (c1 INT); INSERT INTO t1 VALUES (1), (1111), (11111); @@ -97,6 +100,8 @@ SELECT UNCOMPRESS(c1), UNCOMPRESSED_LENGTH(c1) FROM t1; EXPLAIN EXTENDED SELECT * FROM (SELECT UNCOMPRESSED_LENGTH(c1) FROM t1) AS s; --enable_result_log +SET @@max_allowed_packet = @old_max_allowed_packet; + DROP TABLE t1; --echo End of 5.0 tests |