Commit 050cf69f authored by Davi Arnaut's avatar Davi Arnaut

Fix test cases to preserve the state that existed before the

test case was executed.

mysql-test/r/func_compress.result:
  Update test case result.
mysql-test/r/innodb_bug34300.result:
  Update test case result.
mysql-test/t/func_compress.test:
  Disconnect connection and reset max_allowed_packet to it's
  default value.
mysql-test/t/innodb_bug34300.test:
  Disconnect connection and reset max_allowed_packet to it's
  default value and enable query log.
parent 60241341
...@@ -72,6 +72,7 @@ set @@global.max_allowed_packet=1048576*100; ...@@ -72,6 +72,7 @@ set @@global.max_allowed_packet=1048576*100;
select compress(repeat('aaaaaaaaaa', IF(XXX, 10, 10000000))) is null; select compress(repeat('aaaaaaaaaa', IF(XXX, 10, 10000000))) is null;
compress(repeat('aaaaaaaaaa', IF(XXX, 10, 10000000))) is null compress(repeat('aaaaaaaaaa', IF(XXX, 10, 10000000))) is null
0 0
set @@global.max_allowed_packet=default;
create table t1(a blob); create table t1(a blob);
insert into t1 values(NULL), (compress('a')); insert into t1 values(NULL), (compress('a'));
select uncompress(a), uncompressed_length(a) from t1; select uncompress(a), uncompressed_length(a) from t1;
......
SELECT f4, f8 FROM bug34300;
f4 f8 f4 f8
xxx zzz xxx zzz
ALTER TABLE bug34300 ADD COLUMN (f10 INT);
SELECT f4, f8 FROM bug34300;
f4 f8 f4 f8
xxx zzz xxx zzz
DROP TABLE bug34300;
SET @@global.max_allowed_packet=default;
...@@ -49,6 +49,9 @@ set @@global.max_allowed_packet=1048576*100; ...@@ -49,6 +49,9 @@ set @@global.max_allowed_packet=1048576*100;
# reconnect to make the new max packet size take effect # reconnect to make the new max packet size take effect
--connect (newconn, localhost, root,,) --connect (newconn, localhost, root,,)
eval select compress(repeat('aaaaaaaaaa', IF('$LOW_MEMORY', 10, 10000000))) is null; eval select compress(repeat('aaaaaaaaaa', IF('$LOW_MEMORY', 10, 10000000))) is null;
disconnect newconn;
connection default;
set @@global.max_allowed_packet=default;
# #
# Bug #18643: problem with null values # Bug #18643: problem with null values
......
...@@ -21,6 +21,7 @@ CREATE TABLE bug34300 ( ...@@ -21,6 +21,7 @@ CREATE TABLE bug34300 (
INSERT INTO bug34300 VALUES ('xxx', repeat('a', 8459264), 'zzz'); INSERT INTO bug34300 VALUES ('xxx', repeat('a', 8459264), 'zzz');
-- enable_query_log
-- enable_result_log -- enable_result_log
SELECT f4, f8 FROM bug34300; SELECT f4, f8 FROM bug34300;
...@@ -30,3 +31,7 @@ ALTER TABLE bug34300 ADD COLUMN (f10 INT); ...@@ -30,3 +31,7 @@ ALTER TABLE bug34300 ADD COLUMN (f10 INT);
SELECT f4, f8 FROM bug34300; SELECT f4, f8 FROM bug34300;
DROP TABLE bug34300; DROP TABLE bug34300;
disconnect newconn;
connection default;
SET @@global.max_allowed_packet=default;
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