diff options
| author | Nikita Malyavin <nikitamalyavin@gmail.com> | 2021-07-21 15:42:21 +0300 |
|---|---|---|
| committer | Nikita Malyavin <nikitamalyavin@gmail.com> | 2021-10-20 14:52:15 +0300 |
| commit | a8401ad5afd766d2febc63a8bcfedda2978ff44c (patch) | |
| tree | c8793f61bf30705f4efc7a94354bedde5a0dca45 | |
| parent | 1a54cf62f85044a7686dc3becfe39e6b52209484 (diff) | |
| download | mariadb-git-a8401ad5afd766d2febc63a8bcfedda2978ff44c.tar.gz | |
restore default.test, default.result after MDEV-23597 c47e4aab62c65 commit
| -rw-r--r-- | mysql-test/r/default.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/default.test | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/default.result b/mysql-test/r/default.result index 1a35a29aa7f..c7179e29723 100644 --- a/mysql-test/r/default.result +++ b/mysql-test/r/default.result @@ -3089,8 +3089,8 @@ DROP TABLE t1; # # Collations # -CREATE TABLE t1 (a VARCHAR(20) CHARACTER SET latin1 DEFAULT CONCAT('�')) CHARACTER SET koi8r COLLATE koi8r_bin; -ERROR 22007: Encountered illegal value '�' when converting to koi8r +CREATE TABLE t1 (a VARCHAR(20) CHARACTER SET latin1 DEFAULT CONCAT('ö')) CHARACTER SET koi8r COLLATE koi8r_bin; +ERROR 22007: Encountered illegal value 'ö' when converting to koi8r CREATE OR REPLACE TABLE t1 (a char(2) default concat('A') COLLATE utf8mb4_unicode_ci); SHOW CREATE TABLE t1; Table Create Table diff --git a/mysql-test/t/default.test b/mysql-test/t/default.test index 472b1fa4796..a4fe74aefb5 100644 --- a/mysql-test/t/default.test +++ b/mysql-test/t/default.test @@ -1855,7 +1855,7 @@ DROP TABLE t1; --echo # --error ER_BAD_DATA -CREATE TABLE t1 (a VARCHAR(20) CHARACTER SET latin1 DEFAULT CONCAT('�')) CHARACTER SET koi8r COLLATE koi8r_bin; +CREATE TABLE t1 (a VARCHAR(20) CHARACTER SET latin1 DEFAULT CONCAT('ö')) CHARACTER SET koi8r COLLATE koi8r_bin; CREATE OR REPLACE TABLE t1 (a char(2) default concat('A') COLLATE utf8mb4_unicode_ci); SHOW CREATE TABLE t1; DROP TABLE t1; |