Skip to content

Commit

Permalink
Test cleanup for MDEV-15833 (uncommenting forgotten tests)
Browse files Browse the repository at this point in the history
  • Loading branch information
@abarkov
abarkov committed Apr 10, 2018
1 parent 4d9c584 commit f5cb66f
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 12 deletions.
24 changes: 12 additions & 12 deletions mysql-test/extra/rpl_tests/type_conversions.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -959,12 +959,12 @@ let $can_convert = $if_is_lossy;
source extra/rpl_tests/check_type.inc;

# This failed before the fix
#let $source_type= MEDIUMBLOB;
#let $target_type= LONGBLOB;
#let $source_value= REPEAT('a',66000);
#let $target_value= REPEAT('a',66000);
#let $can_convert = $if_is_non_lossy;
#source extra/rpl_tests/check_type.inc;
let $source_type= MEDIUMBLOB;
let $target_type= LONGBLOB;
let $source_value= REPEAT('a',66000);
let $target_value= REPEAT('a',66000);
let $can_convert = $if_is_non_lossy;
source extra/rpl_tests/check_type.inc;

let $source_type= MEDIUMBLOB;
let $target_type= VARBINARY(65500);
Expand All @@ -991,12 +991,12 @@ let $can_convert = $if_is_lossy;
source extra/rpl_tests/check_type.inc;

# This failed before the fix
#let $source_type= LONGBLOB;
#let $target_type= BLOB;
#let $source_value= REPEAT('a',66000);
#let $target_value= REPEAT('a',66000);
#let $can_convert = $if_is_lossy;
#source extra/rpl_tests/check_type.inc;
let $source_type= LONGBLOB;
let $target_type= MEDIUMBLOB;
let $source_value= REPEAT('a',66000);
let $target_value= REPEAT('a',66000);
let $can_convert = $if_is_lossy;
source extra/rpl_tests/check_type.inc;

let $source_type= LONGBLOB;
let $target_type= VARBINARY(65500);
Expand Down
8 changes: 8 additions & 0 deletions mysql-test/suite/binlog_encryption/rpl_typeconv.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,11 @@ BLOB LONGBLOB <Correct error>
BLOB VARBINARY(65500 <Correct error>
MEDIUMBLOB TINYBLOB <Correct error>
MEDIUMBLOB BLOB <Correct error>
MEDIUMBLOB LONGBLOB <Correct error>
MEDIUMBLOB VARBINARY(65500 <Correct error>
LONGBLOB TINYBLOB <Correct error>
LONGBLOB BLOB <Correct error>
LONGBLOB MEDIUMBLOB <Correct error>
LONGBLOB VARBINARY(65500 <Correct error>
TINYBLOB TINYBLOB ALL_NON_LOSSY <Correct value>
TINYBLOB BLOB ALL_NON_LOSSY <Correct value>
Expand Down Expand Up @@ -337,9 +339,11 @@ BLOB LONGBLOB ALL_NON_LOSSY <Correct value>
BLOB VARBINARY(65500 ALL_NON_LOSSY <Correct error>
MEDIUMBLOB TINYBLOB ALL_NON_LOSSY <Correct error>
MEDIUMBLOB BLOB ALL_NON_LOSSY <Correct error>
MEDIUMBLOB LONGBLOB ALL_NON_LOSSY <Correct value>
MEDIUMBLOB VARBINARY(65500 ALL_NON_LOSSY <Correct error>
LONGBLOB TINYBLOB ALL_NON_LOSSY <Correct error>
LONGBLOB BLOB ALL_NON_LOSSY <Correct error>
LONGBLOB MEDIUMBLOB ALL_NON_LOSSY <Correct error>
LONGBLOB VARBINARY(65500 ALL_NON_LOSSY <Correct error>
TINYBLOB TINYBLOB ALL_LOSSY <Correct value>
TINYBLOB BLOB ALL_LOSSY <Correct error>
Expand Down Expand Up @@ -472,9 +476,11 @@ BLOB LONGBLOB ALL_LOSSY <Correct error>
BLOB VARBINARY(65500 ALL_LOSSY <Correct value>
MEDIUMBLOB TINYBLOB ALL_LOSSY <Correct value>
MEDIUMBLOB BLOB ALL_LOSSY <Correct value>
MEDIUMBLOB LONGBLOB ALL_LOSSY <Correct error>
MEDIUMBLOB VARBINARY(65500 ALL_LOSSY <Correct value>
LONGBLOB TINYBLOB ALL_LOSSY <Correct value>
LONGBLOB BLOB ALL_LOSSY <Correct value>
LONGBLOB MEDIUMBLOB ALL_LOSSY <Correct value>
LONGBLOB VARBINARY(65500 ALL_LOSSY <Correct value>
TINYBLOB TINYBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
TINYBLOB BLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
Expand Down Expand Up @@ -607,9 +613,11 @@ BLOB LONGBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
BLOB VARBINARY(65500 ALL_LOSSY,ALL_NON_LOSSY <Correct value>
MEDIUMBLOB TINYBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
MEDIUMBLOB BLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
MEDIUMBLOB LONGBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
MEDIUMBLOB VARBINARY(65500 ALL_LOSSY,ALL_NON_LOSSY <Correct value>
LONGBLOB TINYBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
LONGBLOB BLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
LONGBLOB MEDIUMBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
LONGBLOB VARBINARY(65500 ALL_LOSSY,ALL_NON_LOSSY <Correct value>
DROP TABLE type_conversions;
call mtr.add_suppression("Slave SQL.*Column 1 of table .test.t1. cannot be converted from type.* error.* 1677");
Expand Down
8 changes: 8 additions & 0 deletions mysql-test/suite/rpl/r/rpl_typeconv.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,11 @@ BLOB LONGBLOB <Correct error>
BLOB VARBINARY(65500 <Correct error>
MEDIUMBLOB TINYBLOB <Correct error>
MEDIUMBLOB BLOB <Correct error>
MEDIUMBLOB LONGBLOB <Correct error>
MEDIUMBLOB VARBINARY(65500 <Correct error>
LONGBLOB TINYBLOB <Correct error>
LONGBLOB BLOB <Correct error>
LONGBLOB MEDIUMBLOB <Correct error>
LONGBLOB VARBINARY(65500 <Correct error>
TINYBLOB TINYBLOB ALL_NON_LOSSY <Correct value>
TINYBLOB BLOB ALL_NON_LOSSY <Correct value>
Expand Down Expand Up @@ -337,9 +339,11 @@ BLOB LONGBLOB ALL_NON_LOSSY <Correct value>
BLOB VARBINARY(65500 ALL_NON_LOSSY <Correct error>
MEDIUMBLOB TINYBLOB ALL_NON_LOSSY <Correct error>
MEDIUMBLOB BLOB ALL_NON_LOSSY <Correct error>
MEDIUMBLOB LONGBLOB ALL_NON_LOSSY <Correct value>
MEDIUMBLOB VARBINARY(65500 ALL_NON_LOSSY <Correct error>
LONGBLOB TINYBLOB ALL_NON_LOSSY <Correct error>
LONGBLOB BLOB ALL_NON_LOSSY <Correct error>
LONGBLOB MEDIUMBLOB ALL_NON_LOSSY <Correct error>
LONGBLOB VARBINARY(65500 ALL_NON_LOSSY <Correct error>
TINYBLOB TINYBLOB ALL_LOSSY <Correct value>
TINYBLOB BLOB ALL_LOSSY <Correct error>
Expand Down Expand Up @@ -472,9 +476,11 @@ BLOB LONGBLOB ALL_LOSSY <Correct error>
BLOB VARBINARY(65500 ALL_LOSSY <Correct value>
MEDIUMBLOB TINYBLOB ALL_LOSSY <Correct value>
MEDIUMBLOB BLOB ALL_LOSSY <Correct value>
MEDIUMBLOB LONGBLOB ALL_LOSSY <Correct error>
MEDIUMBLOB VARBINARY(65500 ALL_LOSSY <Correct value>
LONGBLOB TINYBLOB ALL_LOSSY <Correct value>
LONGBLOB BLOB ALL_LOSSY <Correct value>
LONGBLOB MEDIUMBLOB ALL_LOSSY <Correct value>
LONGBLOB VARBINARY(65500 ALL_LOSSY <Correct value>
TINYBLOB TINYBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
TINYBLOB BLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
Expand Down Expand Up @@ -607,9 +613,11 @@ BLOB LONGBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
BLOB VARBINARY(65500 ALL_LOSSY,ALL_NON_LOSSY <Correct value>
MEDIUMBLOB TINYBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
MEDIUMBLOB BLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
MEDIUMBLOB LONGBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
MEDIUMBLOB VARBINARY(65500 ALL_LOSSY,ALL_NON_LOSSY <Correct value>
LONGBLOB TINYBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
LONGBLOB BLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
LONGBLOB MEDIUMBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value>
LONGBLOB VARBINARY(65500 ALL_LOSSY,ALL_NON_LOSSY <Correct value>
DROP TABLE type_conversions;
call mtr.add_suppression("Slave SQL.*Column 1 of table .test.t1. cannot be converted from type.* error.* 1677");
Expand Down

0 comments on commit f5cb66f

Please sign in to comment.