diff options
| author | unknown <serg@serg.mylan> | 2004-11-28 16:31:14 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-11-28 16:31:14 +0100 |
| commit | 1a7783e0f6fd2bbb0cfe9705184d58dab389e606 (patch) | |
| tree | 7e3346cbddac1d10a64ad50561b06d145968a169 | |
| parent | 9fc190e60385aecba1482e8ca715c5b1c97b4887 (diff) | |
| download | mariadb-git-1a7783e0f6fd2bbb0cfe9705184d58dab389e606.tar.gz | |
skip last compress test if we're short of RAM
| -rw-r--r-- | mysql-test/r/func_compress.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/func_compress.test | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/mysql-test/r/func_compress.result b/mysql-test/r/func_compress.result index 11dbcca9431..9bc8e417e19 100644 --- a/mysql-test/r/func_compress.result +++ b/mysql-test/r/func_compress.result @@ -69,6 +69,6 @@ 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) drop table t1; set @@max_allowed_packet=1048576*100; -select compress(repeat('aaaaaaaaaa', 10000000)) is null; -compress(repeat('aaaaaaaaaa', 10000000)) is null +select compress(repeat('aaaaaaaaaa', IF(XXX, 10, 10000000))) is null; +compress(repeat('aaaaaaaaaa', IF(XXX, 10, 10000000))) is null 0 diff --git a/mysql-test/t/func_compress.test b/mysql-test/t/func_compress.test index 7b70289d2c0..f46589e9e0e 100644 --- a/mysql-test/t/func_compress.test +++ b/mysql-test/t/func_compress.test @@ -38,7 +38,10 @@ drop table t1; # # Bug #5497: a problem with large strings +# note that when LOW_MEMORY is set the "test" below is meaningless # set @@max_allowed_packet=1048576*100; -select compress(repeat('aaaaaaaaaa', 10000000)) is null; +--replace_result "''" XXX "'1'" XXX +eval select compress(repeat('aaaaaaaaaa', IF('$LOW_MEMORY', 10, 10000000))) is null; + |