diff options
| author | Monty <monty@mariadb.org> | 2019-09-02 14:06:56 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2019-09-03 13:17:32 +0300 |
| commit | a071e0e029cd7c155cff1054d9f7f8a6aa898620 (patch) | |
| tree | b592c10cb8ca3036688ea19039208eadd485fe7c /mysql-test/main/mysqldump-utf8mb4.test | |
| parent | b0ff5a6a7393c057cd201aff63279e45d3e0cc49 (diff) | |
| parent | 9cba6c5aa3b15fffc0ca10e92bcb55a126a20701 (diff) | |
| download | mariadb-git-a071e0e029cd7c155cff1054d9f7f8a6aa898620.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/mysqldump-utf8mb4.test')
| -rw-r--r-- | mysql-test/main/mysqldump-utf8mb4.test | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/main/mysqldump-utf8mb4.test b/mysql-test/main/mysqldump-utf8mb4.test index f8512c9bd7b..38b7527c5d6 100644 --- a/mysql-test/main/mysqldump-utf8mb4.test +++ b/mysql-test/main/mysqldump-utf8mb4.test @@ -1,5 +1,6 @@ --source include/have_utf8mb4.inc --source include/not_embedded.inc +--source include/default_charset.inc SET NAMES utf8mb4; @@ -18,14 +19,14 @@ INSERT INTO t1 VALUES ('01f300', UNHEX('f09f8c80'), 'U+1F300 CYCLONE'); --echo Testing XML format output --echo ---- ---exec $MYSQL_DUMP --skip-create-options --skip-comments -X test t1 +--exec $MYSQL_DUMP --default-character-set=utf8mb4 --skip-create-options --skip-comments -X test t1 --echo ---- --echo Testing text format output --echo ---- ---exec $MYSQL_DUMP --skip-create-options --skip-comments test t1 +--exec $MYSQL_DUMP --default-character-set=utf8mb4 --skip-create-options --skip-comments test t1 DROP TABLE t1; @@ -42,7 +43,7 @@ CREATE TABLE t1 ( ) CHARACTER SET utf8mb4; INSERT INTO t1 VALUES ('01f300', UNHEX('f09f8c80'), 'U+1F300 CYCLONE'); ---exec $MYSQL_DUMP test t1 > $file +--exec $MYSQL_DUMP --default-character-set=utf8mb4 test t1 > $file DROP TABLE t1; --exec $MYSQL test < $file SELECT * FROM t1; |