diff options
| author | Andrei Elkin <andrei.elkin@mariadb.com> | 2018-10-03 21:45:05 +0300 |
|---|---|---|
| committer | Andrei Elkin <andrei.elkin@mariadb.com> | 2018-10-16 12:56:33 +0300 |
| commit | 2308b9afec559cd8c5717007a7ad6821c374370d (patch) | |
| tree | dce30fd30cb6a5b6952b8f505fafec49a8ed8dc8 /mysql-test/suite | |
| parent | 2d4075e1d9dba3dd8503d65fdb145a6dcc056c51 (diff) | |
| download | mariadb-git-2308b9afec559cd8c5717007a7ad6821c374370d.tar.gz | |
MDEV-17098 DATE -> DATETIME replication conversion not working, even in ALL_NON_LOSSY mode
Opened up MYSQL_TYPE _DATETIME{,2} <-> _NEWDATE conversions for replication.
Diffstat (limited to 'mysql-test/suite')
| -rw-r--r-- | mysql-test/suite/binlog_encryption/rpl_typeconv.result | 44 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_typeconv.result | 44 |
2 files changed, 88 insertions, 0 deletions
diff --git a/mysql-test/suite/binlog_encryption/rpl_typeconv.result b/mysql-test/suite/binlog_encryption/rpl_typeconv.result index e9ffdd2b7b1..e65dede28e0 100644 --- a/mysql-test/suite/binlog_encryption/rpl_typeconv.result +++ b/mysql-test/suite/binlog_encryption/rpl_typeconv.result @@ -43,6 +43,10 @@ SET GLOBAL SLAVE_TYPE_CONVERSIONS=''; # MDEV-15833 Row format replication between LONGBLOB and MEDIUMBLOB does not work for long values # # End of MDEV-15833 +# +# MDEV-17098 DATE <-> DATETIME +# +# End of MDEV-17098 include/rpl_reset.inc connection slave; SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_NON_LOSSY'; @@ -51,6 +55,10 @@ SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_NON_LOSSY'; # MDEV-15833 Row format replication between LONGBLOB and MEDIUMBLOB does not work for long values # # End of MDEV-15833 +# +# MDEV-17098 DATE <-> DATETIME +# +# End of MDEV-17098 include/rpl_reset.inc connection slave; SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_LOSSY'; @@ -59,6 +67,10 @@ SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_LOSSY'; # MDEV-15833 Row format replication between LONGBLOB and MEDIUMBLOB does not work for long values # # End of MDEV-15833 +# +# MDEV-17098 DATE <-> DATETIME +# +# End of MDEV-17098 include/rpl_reset.inc connection slave; SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_LOSSY,ALL_NON_LOSSY'; @@ -67,6 +79,10 @@ SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_LOSSY,ALL_NON_LOSSY'; # MDEV-15833 Row format replication between LONGBLOB and MEDIUMBLOB does not work for long values # # End of MDEV-15833 +# +# MDEV-17098 DATE <-> DATETIME +# +# End of MDEV-17098 include/rpl_reset.inc connection slave; **** Result of conversions **** @@ -208,6 +224,13 @@ LONGBLOB TINYBLOB <Correct error> LONGBLOB BLOB <Correct error> LONGBLOB MEDIUMBLOB <Correct error> LONGBLOB VARBINARY(65500 <Correct error> +DATE DATETIME(6) <Correct error> +DATE DATETIME(6) <Correct error> +DATE DATETIME(6) <Correct error> +DATE DATETIME(0) <Correct error> +DATETIME(6) DATE <Correct error> +DATETIME(6) DATE <Correct error> +DATETIME(0) DATE <Correct error> TINYBLOB TINYBLOB ALL_NON_LOSSY <Correct value> TINYBLOB BLOB ALL_NON_LOSSY <Correct value> TINYBLOB MEDIUMBLOB ALL_NON_LOSSY <Correct value> @@ -345,6 +368,13 @@ 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> +DATE DATETIME(6) ALL_NON_LOSSY <Correct value> +DATE DATETIME(6) ALL_NON_LOSSY <Correct value> +DATE DATETIME(6) ALL_NON_LOSSY <Correct value> +DATE DATETIME(0) ALL_NON_LOSSY <Correct value> +DATETIME(6) DATE ALL_NON_LOSSY <Correct error> +DATETIME(6) DATE ALL_NON_LOSSY <Correct error> +DATETIME(0) DATE ALL_NON_LOSSY <Correct error> TINYBLOB TINYBLOB ALL_LOSSY <Correct value> TINYBLOB BLOB ALL_LOSSY <Correct error> TINYBLOB MEDIUMBLOB ALL_LOSSY <Correct error> @@ -482,6 +512,13 @@ 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> +DATE DATETIME(6) ALL_LOSSY <Correct error> +DATE DATETIME(6) ALL_LOSSY <Correct error> +DATE DATETIME(6) ALL_LOSSY <Correct error> +DATE DATETIME(0) ALL_LOSSY <Correct error> +DATETIME(6) DATE ALL_LOSSY <Correct value> +DATETIME(6) DATE ALL_LOSSY <Correct value> +DATETIME(0) DATE ALL_LOSSY <Correct value> TINYBLOB TINYBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value> TINYBLOB BLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value> TINYBLOB MEDIUMBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value> @@ -619,6 +656,13 @@ 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> +DATE DATETIME(6) ALL_LOSSY,ALL_NON_LOSSY <Correct value> +DATE DATETIME(6) ALL_LOSSY,ALL_NON_LOSSY <Correct value> +DATE DATETIME(6) ALL_LOSSY,ALL_NON_LOSSY <Correct value> +DATE DATETIME(0) ALL_LOSSY,ALL_NON_LOSSY <Correct value> +DATETIME(6) DATE ALL_LOSSY,ALL_NON_LOSSY <Correct value> +DATETIME(6) DATE ALL_LOSSY,ALL_NON_LOSSY <Correct value> +DATETIME(0) DATE 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"); connection master; diff --git a/mysql-test/suite/rpl/r/rpl_typeconv.result b/mysql-test/suite/rpl/r/rpl_typeconv.result index e9ffdd2b7b1..e65dede28e0 100644 --- a/mysql-test/suite/rpl/r/rpl_typeconv.result +++ b/mysql-test/suite/rpl/r/rpl_typeconv.result @@ -43,6 +43,10 @@ SET GLOBAL SLAVE_TYPE_CONVERSIONS=''; # MDEV-15833 Row format replication between LONGBLOB and MEDIUMBLOB does not work for long values # # End of MDEV-15833 +# +# MDEV-17098 DATE <-> DATETIME +# +# End of MDEV-17098 include/rpl_reset.inc connection slave; SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_NON_LOSSY'; @@ -51,6 +55,10 @@ SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_NON_LOSSY'; # MDEV-15833 Row format replication between LONGBLOB and MEDIUMBLOB does not work for long values # # End of MDEV-15833 +# +# MDEV-17098 DATE <-> DATETIME +# +# End of MDEV-17098 include/rpl_reset.inc connection slave; SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_LOSSY'; @@ -59,6 +67,10 @@ SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_LOSSY'; # MDEV-15833 Row format replication between LONGBLOB and MEDIUMBLOB does not work for long values # # End of MDEV-15833 +# +# MDEV-17098 DATE <-> DATETIME +# +# End of MDEV-17098 include/rpl_reset.inc connection slave; SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_LOSSY,ALL_NON_LOSSY'; @@ -67,6 +79,10 @@ SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_LOSSY,ALL_NON_LOSSY'; # MDEV-15833 Row format replication between LONGBLOB and MEDIUMBLOB does not work for long values # # End of MDEV-15833 +# +# MDEV-17098 DATE <-> DATETIME +# +# End of MDEV-17098 include/rpl_reset.inc connection slave; **** Result of conversions **** @@ -208,6 +224,13 @@ LONGBLOB TINYBLOB <Correct error> LONGBLOB BLOB <Correct error> LONGBLOB MEDIUMBLOB <Correct error> LONGBLOB VARBINARY(65500 <Correct error> +DATE DATETIME(6) <Correct error> +DATE DATETIME(6) <Correct error> +DATE DATETIME(6) <Correct error> +DATE DATETIME(0) <Correct error> +DATETIME(6) DATE <Correct error> +DATETIME(6) DATE <Correct error> +DATETIME(0) DATE <Correct error> TINYBLOB TINYBLOB ALL_NON_LOSSY <Correct value> TINYBLOB BLOB ALL_NON_LOSSY <Correct value> TINYBLOB MEDIUMBLOB ALL_NON_LOSSY <Correct value> @@ -345,6 +368,13 @@ 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> +DATE DATETIME(6) ALL_NON_LOSSY <Correct value> +DATE DATETIME(6) ALL_NON_LOSSY <Correct value> +DATE DATETIME(6) ALL_NON_LOSSY <Correct value> +DATE DATETIME(0) ALL_NON_LOSSY <Correct value> +DATETIME(6) DATE ALL_NON_LOSSY <Correct error> +DATETIME(6) DATE ALL_NON_LOSSY <Correct error> +DATETIME(0) DATE ALL_NON_LOSSY <Correct error> TINYBLOB TINYBLOB ALL_LOSSY <Correct value> TINYBLOB BLOB ALL_LOSSY <Correct error> TINYBLOB MEDIUMBLOB ALL_LOSSY <Correct error> @@ -482,6 +512,13 @@ 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> +DATE DATETIME(6) ALL_LOSSY <Correct error> +DATE DATETIME(6) ALL_LOSSY <Correct error> +DATE DATETIME(6) ALL_LOSSY <Correct error> +DATE DATETIME(0) ALL_LOSSY <Correct error> +DATETIME(6) DATE ALL_LOSSY <Correct value> +DATETIME(6) DATE ALL_LOSSY <Correct value> +DATETIME(0) DATE ALL_LOSSY <Correct value> TINYBLOB TINYBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value> TINYBLOB BLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value> TINYBLOB MEDIUMBLOB ALL_LOSSY,ALL_NON_LOSSY <Correct value> @@ -619,6 +656,13 @@ 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> +DATE DATETIME(6) ALL_LOSSY,ALL_NON_LOSSY <Correct value> +DATE DATETIME(6) ALL_LOSSY,ALL_NON_LOSSY <Correct value> +DATE DATETIME(6) ALL_LOSSY,ALL_NON_LOSSY <Correct value> +DATE DATETIME(0) ALL_LOSSY,ALL_NON_LOSSY <Correct value> +DATETIME(6) DATE ALL_LOSSY,ALL_NON_LOSSY <Correct value> +DATETIME(6) DATE ALL_LOSSY,ALL_NON_LOSSY <Correct value> +DATETIME(0) DATE 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"); connection master; |