1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Automerge.

Browse Source
This commit is contained in:
Alexey Kopytov 2009-05-21 21:51:48 +04:00
commit 019e8a6c71
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/r/func_compress.result
View File

@ -117,8 +117,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;
@ -126,13 +124,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

8
mysql-test/t/func_compress.test
View File

@ -94,21 +94,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