From f5cb66fb97101bc0f17ff879025fd7146c032cbc Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Tue, 10 Apr 2018 14:27:18 +0400 Subject: [PATCH] Test cleanup for MDEV-15833 (uncommenting forgotten tests) --- .../extra/rpl_tests/type_conversions.test | 24 +++++++++---------- .../binlog_encryption/rpl_typeconv.result | 8 +++++++ mysql-test/suite/rpl/r/rpl_typeconv.result | 8 +++++++ 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/mysql-test/extra/rpl_tests/type_conversions.test b/mysql-test/extra/rpl_tests/type_conversions.test index 9004cb00c24..b013d471f01 100644 --- a/mysql-test/extra/rpl_tests/type_conversions.test +++ b/mysql-test/extra/rpl_tests/type_conversions.test @@ -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); @@ -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); diff --git a/mysql-test/suite/binlog_encryption/rpl_typeconv.result b/mysql-test/suite/binlog_encryption/rpl_typeconv.result index 46e68de6764..e9ffdd2b7b1 100644 --- a/mysql-test/suite/binlog_encryption/rpl_typeconv.result +++ b/mysql-test/suite/binlog_encryption/rpl_typeconv.result @@ -202,9 +202,11 @@ BLOB LONGBLOB BLOB VARBINARY(65500 MEDIUMBLOB TINYBLOB MEDIUMBLOB BLOB +MEDIUMBLOB LONGBLOB MEDIUMBLOB VARBINARY(65500 LONGBLOB TINYBLOB LONGBLOB BLOB +LONGBLOB MEDIUMBLOB LONGBLOB VARBINARY(65500 TINYBLOB TINYBLOB ALL_NON_LOSSY TINYBLOB BLOB ALL_NON_LOSSY @@ -337,9 +339,11 @@ BLOB LONGBLOB ALL_NON_LOSSY BLOB VARBINARY(65500 ALL_NON_LOSSY MEDIUMBLOB TINYBLOB ALL_NON_LOSSY MEDIUMBLOB BLOB ALL_NON_LOSSY +MEDIUMBLOB LONGBLOB ALL_NON_LOSSY MEDIUMBLOB VARBINARY(65500 ALL_NON_LOSSY LONGBLOB TINYBLOB ALL_NON_LOSSY LONGBLOB BLOB ALL_NON_LOSSY +LONGBLOB MEDIUMBLOB ALL_NON_LOSSY LONGBLOB VARBINARY(65500 ALL_NON_LOSSY TINYBLOB TINYBLOB ALL_LOSSY TINYBLOB BLOB ALL_LOSSY @@ -472,9 +476,11 @@ BLOB LONGBLOB ALL_LOSSY BLOB VARBINARY(65500 ALL_LOSSY MEDIUMBLOB TINYBLOB ALL_LOSSY MEDIUMBLOB BLOB ALL_LOSSY +MEDIUMBLOB LONGBLOB ALL_LOSSY MEDIUMBLOB VARBINARY(65500 ALL_LOSSY LONGBLOB TINYBLOB ALL_LOSSY LONGBLOB BLOB ALL_LOSSY +LONGBLOB MEDIUMBLOB ALL_LOSSY LONGBLOB VARBINARY(65500 ALL_LOSSY TINYBLOB TINYBLOB ALL_LOSSY,ALL_NON_LOSSY TINYBLOB BLOB ALL_LOSSY,ALL_NON_LOSSY @@ -607,9 +613,11 @@ BLOB LONGBLOB ALL_LOSSY,ALL_NON_LOSSY BLOB VARBINARY(65500 ALL_LOSSY,ALL_NON_LOSSY MEDIUMBLOB TINYBLOB ALL_LOSSY,ALL_NON_LOSSY MEDIUMBLOB BLOB ALL_LOSSY,ALL_NON_LOSSY +MEDIUMBLOB LONGBLOB ALL_LOSSY,ALL_NON_LOSSY MEDIUMBLOB VARBINARY(65500 ALL_LOSSY,ALL_NON_LOSSY LONGBLOB TINYBLOB ALL_LOSSY,ALL_NON_LOSSY LONGBLOB BLOB ALL_LOSSY,ALL_NON_LOSSY +LONGBLOB MEDIUMBLOB ALL_LOSSY,ALL_NON_LOSSY LONGBLOB VARBINARY(65500 ALL_LOSSY,ALL_NON_LOSSY DROP TABLE type_conversions; call mtr.add_suppression("Slave SQL.*Column 1 of table .test.t1. cannot be converted from type.* error.* 1677"); diff --git a/mysql-test/suite/rpl/r/rpl_typeconv.result b/mysql-test/suite/rpl/r/rpl_typeconv.result index 46e68de6764..e9ffdd2b7b1 100644 --- a/mysql-test/suite/rpl/r/rpl_typeconv.result +++ b/mysql-test/suite/rpl/r/rpl_typeconv.result @@ -202,9 +202,11 @@ BLOB LONGBLOB BLOB VARBINARY(65500 MEDIUMBLOB TINYBLOB MEDIUMBLOB BLOB +MEDIUMBLOB LONGBLOB MEDIUMBLOB VARBINARY(65500 LONGBLOB TINYBLOB LONGBLOB BLOB +LONGBLOB MEDIUMBLOB LONGBLOB VARBINARY(65500 TINYBLOB TINYBLOB ALL_NON_LOSSY TINYBLOB BLOB ALL_NON_LOSSY @@ -337,9 +339,11 @@ BLOB LONGBLOB ALL_NON_LOSSY BLOB VARBINARY(65500 ALL_NON_LOSSY MEDIUMBLOB TINYBLOB ALL_NON_LOSSY MEDIUMBLOB BLOB ALL_NON_LOSSY +MEDIUMBLOB LONGBLOB ALL_NON_LOSSY MEDIUMBLOB VARBINARY(65500 ALL_NON_LOSSY LONGBLOB TINYBLOB ALL_NON_LOSSY LONGBLOB BLOB ALL_NON_LOSSY +LONGBLOB MEDIUMBLOB ALL_NON_LOSSY LONGBLOB VARBINARY(65500 ALL_NON_LOSSY TINYBLOB TINYBLOB ALL_LOSSY TINYBLOB BLOB ALL_LOSSY @@ -472,9 +476,11 @@ BLOB LONGBLOB ALL_LOSSY BLOB VARBINARY(65500 ALL_LOSSY MEDIUMBLOB TINYBLOB ALL_LOSSY MEDIUMBLOB BLOB ALL_LOSSY +MEDIUMBLOB LONGBLOB ALL_LOSSY MEDIUMBLOB VARBINARY(65500 ALL_LOSSY LONGBLOB TINYBLOB ALL_LOSSY LONGBLOB BLOB ALL_LOSSY +LONGBLOB MEDIUMBLOB ALL_LOSSY LONGBLOB VARBINARY(65500 ALL_LOSSY TINYBLOB TINYBLOB ALL_LOSSY,ALL_NON_LOSSY TINYBLOB BLOB ALL_LOSSY,ALL_NON_LOSSY @@ -607,9 +613,11 @@ BLOB LONGBLOB ALL_LOSSY,ALL_NON_LOSSY BLOB VARBINARY(65500 ALL_LOSSY,ALL_NON_LOSSY MEDIUMBLOB TINYBLOB ALL_LOSSY,ALL_NON_LOSSY MEDIUMBLOB BLOB ALL_LOSSY,ALL_NON_LOSSY +MEDIUMBLOB LONGBLOB ALL_LOSSY,ALL_NON_LOSSY MEDIUMBLOB VARBINARY(65500 ALL_LOSSY,ALL_NON_LOSSY LONGBLOB TINYBLOB ALL_LOSSY,ALL_NON_LOSSY LONGBLOB BLOB ALL_LOSSY,ALL_NON_LOSSY +LONGBLOB MEDIUMBLOB ALL_LOSSY,ALL_NON_LOSSY LONGBLOB VARBINARY(65500 ALL_LOSSY,ALL_NON_LOSSY DROP TABLE type_conversions; call mtr.add_suppression("Slave SQL.*Column 1 of table .test.t1. cannot be converted from type.* error.* 1677");