summaryrefslogtreecommitdiff
path: root/mysql-test/t/func_compress.test
diff options
context:
space:
mode:
authorAlexey Kopytov <Alexey.Kopytov@sun.com>2009-05-21 21:51:48 +0400
committerAlexey Kopytov <Alexey.Kopytov@sun.com>2009-05-21 21:51:48 +0400
commit42b3d8c74f6592d0b3492daa6fae7a0074217e07 (patch)
tree4dd3545fea81a0b2a8adab7d312ea9e5b65d8751 /mysql-test/t/func_compress.test
parent2e644e2b5dc1f9ceb2139f32f31baadebfeb421e (diff)
parent645817dd5616dc16883914bff38c2dc96325c8fc (diff)
downloadmariadb-git-42b3d8c74f6592d0b3492daa6fae7a0074217e07.tar.gz
Automerge.
Diffstat (limited to 'mysql-test/t/func_compress.test')
-rw-r--r--mysql-test/t/func_compress.test8
1 files changed, 3 insertions, 5 deletions
diff --git a/mysql-test/t/func_compress.test b/mysql-test/t/func_compress.test
index 385e3269f76..d63130f190d 100644
--- a/mysql-test/t/func_compress.test
+++ b/mysql-test/t/func_compress.test
@@ -94,21 +94,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