diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-07-18 12:41:41 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-07-18 12:41:41 +0200 |
| commit | 7f2140d3ed7a114a42a2ca645608e46ff2768238 (patch) | |
| tree | 3f831238bad1ea4e7ea34473aa1794686d5ae4e5 /mysql-test/r/func_compress.result | |
| parent | b46c81e10947c54704a58812698debbf687bae80 (diff) | |
| download | mariadb-git-7f2140d3ed7a114a42a2ca645608e46ff2768238.tar.gz | |
Bug#18539 uncompress(d) is null: impossible?
- Add a check that length of field to uncompress is longer than 4 bytes.
This can be dones as the length of uncompressed data is written as
first four bytes of field and thus it can't be valid compressed data.
mysql-test/r/func_compress.result:
Update test results
sql/item_strfunc.cc:
Is size of field is less than or equal to 4 bytes, indicate data is uncompressable/corrupt.
Diffstat (limited to 'mysql-test/r/func_compress.result')
| -rw-r--r-- | mysql-test/r/func_compress.result | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/r/func_compress.result b/mysql-test/r/func_compress.result index df8939d98f1..00d5ebfc351 100644 --- a/mysql-test/r/func_compress.result +++ b/mysql-test/r/func_compress.result @@ -85,12 +85,12 @@ explain select * from t1 where uncompress(a) is null; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 system NULL NULL NULL NULL 1 Warnings: -Error 1256 Uncompressed data size too large; the maximum size is 104857600 (probably, length of uncompressed data was corrupted) +Error 1259 ZLIB: Input data corrupted select * from t1 where uncompress(a) is null; a foo Warnings: -Error 1256 Uncompressed data size too large; the maximum size is 104857600 (probably, length of uncompressed data was corrupted) +Error 1259 ZLIB: Input data corrupted explain select *, uncompress(a) from t1; id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t1 system NULL NULL NULL NULL 1 @@ -98,12 +98,12 @@ select *, uncompress(a) from t1; a uncompress(a) foo NULL Warnings: -Error 1256 Uncompressed data size too large; the maximum size is 104857600 (probably, length of uncompressed data was corrupted) +Error 1259 ZLIB: Input data corrupted select *, uncompress(a), uncompress(a) is null from t1; a uncompress(a) uncompress(a) is null foo NULL 1 Warnings: -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 104857600 (probably, length of uncompressed data was corrupted) +Error 1259 ZLIB: Input data corrupted +Error 1259 ZLIB: Input data corrupted drop table t1; End of 5.0 tests |