Commit 82c878f9 authored by Alexey Kopytov's avatar Alexey Kopytov

Attempt #2 to fix PB failures introduced by the patch for bug #44796.

Since max_allowed_packet is a read-only variable in 5.1 and up,
disable warnings to avoid unnecessary test case complication.
parent 2cd3eaf2
...@@ -116,8 +116,6 @@ Warnings: ...@@ -116,8 +116,6 @@ 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
drop table t1; drop table t1;
SET @old_max_allowed_packet = @@max_allowed_packet;
SET @@max_allowed_packet = 1024 * 1024;
CREATE TABLE t1 (c1 INT); CREATE TABLE t1 (c1 INT);
INSERT INTO t1 VALUES (1), (1111), (11111); INSERT INTO t1 VALUES (1), (1111), (11111);
SELECT UNCOMPRESS(c1), UNCOMPRESSED_LENGTH(c1) FROM t1; SELECT UNCOMPRESS(c1), UNCOMPRESSED_LENGTH(c1) FROM t1;
...@@ -125,13 +123,6 @@ UNCOMPRESS(c1) UNCOMPRESSED_LENGTH(c1) ...@@ -125,13 +123,6 @@ UNCOMPRESS(c1) UNCOMPRESSED_LENGTH(c1)
NULL NULL NULL NULL
NULL NULL NULL NULL
NULL 825307441 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; EXPLAIN EXTENDED SELECT * FROM (SELECT UNCOMPRESSED_LENGTH(c1) FROM t1) AS s;
SET @@max_allowed_packet = @old_max_allowed_packet;
DROP TABLE t1; DROP TABLE t1;
End of 5.0 tests End of 5.0 tests
...@@ -87,21 +87,19 @@ drop table t1; ...@@ -87,21 +87,19 @@ drop table t1;
# uncompressed_length # uncompressed_length
# #
SET @old_max_allowed_packet = @@max_allowed_packet;
SET @@max_allowed_packet = 1024 * 1024;
CREATE TABLE t1 (c1 INT); CREATE TABLE t1 (c1 INT);
INSERT INTO t1 VALUES (1), (1111), (11111); 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; SELECT UNCOMPRESS(c1), UNCOMPRESSED_LENGTH(c1) FROM t1;
--enable_warnings
# We do not need the results, just make sure there are no valgrind errors # We do not need the results, just make sure there are no valgrind errors
--disable_result_log --disable_result_log
EXPLAIN EXTENDED SELECT * FROM (SELECT UNCOMPRESSED_LENGTH(c1) FROM t1) AS s; EXPLAIN EXTENDED SELECT * FROM (SELECT UNCOMPRESSED_LENGTH(c1) FROM t1) AS s;
--enable_result_log --enable_result_log
SET @@max_allowed_packet = @old_max_allowed_packet;
DROP TABLE t1; DROP TABLE t1;
--echo End of 5.0 tests --echo End of 5.0 tests
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment