diff options
| author | Alexander Barkov <bar@mariadb.com> | 2018-04-10 14:27:18 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2018-04-10 14:27:18 +0400 |
| commit | f5cb66fb97101bc0f17ff879025fd7146c032cbc (patch) | |
| tree | 3c0d882d59c1f4754cb99f14bd140ff5d56df674 | |
| parent | 4d9c5844b8b8661c6d61af9871d4c92c68271fd1 (diff) | |
| download | mariadb-git-f5cb66fb97101bc0f17ff879025fd7146c032cbc.tar.gz | |
Test cleanup for MDEV-15833 (uncommenting forgotten tests)
| -rw-r--r-- | mysql-test/extra/rpl_tests/type_conversions.test | 24 | ||||
| -rw-r--r-- | mysql-test/suite/binlog_encryption/rpl_typeconv.result | 8 | ||||
| -rw-r--r-- | 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 <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> @@ -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> @@ -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> @@ -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"); 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 <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> @@ -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> @@ -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> @@ -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"); |