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-max.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-max.test')
-rw-r--r-- | mysql-test/main/mysqldump-max.test | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/main/mysqldump-max.test b/mysql-test/main/mysqldump-max.test index 4aadb09de53..a989fd28135 100644 --- a/mysql-test/main/mysqldump-max.test +++ b/mysql-test/main/mysqldump-max.test @@ -60,7 +60,9 @@ select * from t4; select * from t5; select * from t6; +--replace_result "NAMES utf8mb4" "NAMES utf8mb4" "NAMES utf8" "NAMES utf8mb4" --exec $MYSQL_DUMP --skip-comments --delayed-insert --insert-ignore --databases test +--replace_result "NAMES utf8mb4" "NAMES utf8mb4" "NAMES utf8" "NAMES utf8mb4" --exec $MYSQL_DUMP --skip-comments --delayed-insert --databases test drop table t1; |