diff options
| author | Alexander Barkov <bar@mariadb.org> | 2016-04-07 17:22:16 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2016-04-07 17:22:16 +0400 |
| commit | 9db357d4c55f522d6a1ddd91d12cf53207862c99 (patch) | |
| tree | 3b7fb1500fc3dd9d04a91289e8bc727f0429c88a | |
| parent | d383a1681d01e99b8b321cbe49514705492d2b65 (diff) | |
| download | mariadb-git-9db357d4c55f522d6a1ddd91d12cf53207862c99.tar.gz | |
Adding more option combinations into ctype_gbk_export_import.
| -rw-r--r-- | mysql-test/r/ctype_gbk_export_import.result | 63 | ||||
| -rw-r--r-- | mysql-test/t/ctype_gbk_export_import.test | 2 |
2 files changed, 64 insertions, 1 deletions
diff --git a/mysql-test/r/ctype_gbk_export_import.result b/mysql-test/r/ctype_gbk_export_import.result index 12f50eff21a..23fb4b61edb 100644 --- a/mysql-test/r/ctype_gbk_export_import.result +++ b/mysql-test/r/ctype_gbk_export_import.result @@ -605,6 +605,27 @@ b EE5C0A BAD-BLOB Locale: zh_CN.gbk OUTFILE: --default-character-set=binary +INFILE: --default-character-set=binary +file EE5C-EE5C5C +a EE5C +b EE5C0A BAD-BLOB + +Locale: zh_CN.gbk +OUTFILE: --default-character-set=binary +INFILE: --default-character-set=binary CHARACTER SET gbk +file EE5C-EE5C5C +a EE5C +b EE5C0A BAD-BLOB + +Locale: zh_CN.gbk +OUTFILE: --default-character-set=binary +INFILE: --default-character-set=binary CHARACTER SET utf8 +file EE5C-EE5C5C +a 3F5C BAD-TEXT +b EE5C0A BAD-BLOB + +Locale: zh_CN.gbk +OUTFILE: --default-character-set=binary INFILE: --default-character-set=gbk file EE5C-EE5C5C a EE5C @@ -668,6 +689,27 @@ b EE5C Locale: zh_CN.gbk OUTFILE: --default-character-set=gbk +INFILE: --default-character-set=binary +file EE5C-EE5C +a EE5C +b EE5C + +Locale: zh_CN.gbk +OUTFILE: --default-character-set=gbk +INFILE: --default-character-set=binary CHARACTER SET gbk +file EE5C-EE5C +a EE5C +b EE5C + +Locale: zh_CN.gbk +OUTFILE: --default-character-set=gbk +INFILE: --default-character-set=binary CHARACTER SET utf8 +file EE5C-EE5C +a 3F5C BAD-TEXT +b EE5C + +Locale: zh_CN.gbk +OUTFILE: --default-character-set=gbk INFILE: --default-character-set=gbk file EE5C-EE5C a EE5C @@ -731,6 +773,27 @@ b 3F5C BAD-BLOB Locale: zh_CN.gbk OUTFILE: --default-character-set=utf8 +INFILE: --default-character-set=binary +file E9A0AB-3F5C5C +a E9A03F BAD-TEXT +b 3F5C BAD-BLOB + +Locale: zh_CN.gbk +OUTFILE: --default-character-set=utf8 +INFILE: --default-character-set=binary CHARACTER SET gbk +file E9A0AB-3F5C5C +a E9A03F BAD-TEXT +b 3F5C BAD-BLOB + +Locale: zh_CN.gbk +OUTFILE: --default-character-set=utf8 +INFILE: --default-character-set=binary CHARACTER SET utf8 +file E9A0AB-3F5C5C +a EE5C +b 3F5C BAD-BLOB + +Locale: zh_CN.gbk +OUTFILE: --default-character-set=utf8 INFILE: --default-character-set=gbk file E9A0AB-3F5C5C a E9A03F BAD-TEXT diff --git a/mysql-test/t/ctype_gbk_export_import.test b/mysql-test/t/ctype_gbk_export_import.test index 41250314829..1c0bbb6f1af 100644 --- a/mysql-test/t/ctype_gbk_export_import.test +++ b/mysql-test/t/ctype_gbk_export_import.test @@ -75,7 +75,7 @@ my $dir= $ENV{'MYSQL_TMP_DIR'}; open (my $FILE, '>', "$dir/tmpgbk.inc") or die "open(): $!"; for $LOCALE ("zh_CN.gbk") { for $DUMP_OPTIONS ("--default-character-set=binary","--default-character-set=gbk","--default-character-set=utf8") { -for $RESTORE_OPTIONS ("--default-character-set=auto", "--default-character-set=gbk","--default-character-set=utf8") { +for $RESTORE_OPTIONS ("--default-character-set=auto","--default-character-set=binary","--default-character-set=gbk","--default-character-set=utf8") { for $RESTORE_CHARSET_CLAUSE ("", "CHARACTER SET gbk", "CHARACTER SET utf8") { print $FILE <<END --echo |