diff options
| author | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-05-21 21:50:58 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-05-21 21:50:58 +0400 |
| commit | 17dba81fcb3a92ab8b7e6b4ef49fc0ab28e2a257 (patch) | |
| tree | 034b3c28a14f7bcbe2ab746d7170d5095cb09550 /mysql-test | |
| parent | 680964d89685b4cf7b80c91fa31aec239fa87554 (diff) | |
| parent | 1341ab23474f5eca9e26d68dffaea836c8030530 (diff) | |
| download | mariadb-git-17dba81fcb3a92ab8b7e6b4ef49fc0ab28e2a257.tar.gz | |
Automerge.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/func_compress.result | 9 | ||||
| -rw-r--r-- | mysql-test/t/func_compress.test | 8 |
2 files changed, 3 insertions, 14 deletions
diff --git a/mysql-test/r/func_compress.result b/mysql-test/r/func_compress.result index af3c5905678..d8745c38f57 100644 --- a/mysql-test/r/func_compress.result +++ b/mysql-test/r/func_compress.result @@ -116,8 +116,6 @@ 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; @@ -125,13 +123,6 @@ UNCOMPRESS(c1) UNCOMPRESSED_LENGTH(c1) NULL NULL NULL NULL NULL 825307441 -Warnings: -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 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 8df26dce2ee..c84f22c5595 100644 --- a/mysql-test/t/func_compress.test +++ b/mysql-test/t/func_compress.test @@ -87,21 +87,19 @@ 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); +# Disable warnings to avoid dependency on max_allowed_packet value +--disable_warnings SELECT UNCOMPRESS(c1), UNCOMPRESSED_LENGTH(c1) FROM t1; +--enable_warnings # We do not need the results, just make sure there are no valgrind errors --disable_result_log 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 |