Commit 6077086c authored by Alexey Kopytov's avatar Alexey Kopytov

Fixed a PB failure introduced by the patch for bug #44796.

Set max_allowed_packet to get a consistent error message.
parent 85645fe3
...@@ -116,6 +116,8 @@ Warnings: ...@@ -116,6 +116,8 @@ 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;
...@@ -128,7 +130,8 @@ Error 1259 ZLIB: Input data corrupted ...@@ -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 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; 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,6 +87,9 @@ drop table t1; ...@@ -87,6 +87,9 @@ 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);
...@@ -97,6 +100,8 @@ SELECT UNCOMPRESS(c1), UNCOMPRESSED_LENGTH(c1) FROM t1; ...@@ -97,6 +100,8 @@ SELECT UNCOMPRESS(c1), UNCOMPRESSED_LENGTH(c1) FROM t1;
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