diff options
| author | Patrick Crews <patrick.crews@sun.com> | 2009-05-22 11:38:52 -0400 |
|---|---|---|
| committer | Patrick Crews <patrick.crews@sun.com> | 2009-05-22 11:38:52 -0400 |
| commit | a41d2dafa0759a010ba6c8c1115852be3dd247a8 (patch) | |
| tree | c9a006de178637e85aae6e2406cac717bca9f2bb | |
| parent | e42f28192d582ec84cd62066a6ce0fb83e32ad0b (diff) | |
| parent | 645817dd5616dc16883914bff38c2dc96325c8fc (diff) | |
| download | mariadb-git-a41d2dafa0759a010ba6c8c1115852be3dd247a8.tar.gz | |
merge
| -rw-r--r-- | mysql-test/r/func_compress.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/func_compress.test | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/mysql-test/r/func_compress.result b/mysql-test/r/func_compress.result index a30ca7859f1..d8745c38f57 100644 --- a/mysql-test/r/func_compress.result +++ b/mysql-test/r/func_compress.result @@ -123,12 +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 104857600 (probably, length of uncompressed data was corrupted) EXPLAIN EXTENDED SELECT * FROM (SELECT UNCOMPRESSED_LENGTH(c1) FROM t1) AS s; 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..c84f22c5595 100644 --- a/mysql-test/t/func_compress.test +++ b/mysql-test/t/func_compress.test @@ -90,7 +90,10 @@ drop table t1; 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 |