Adding more option combinations into ctype_gbk_export_import.

mysql-test/r/ctype_gbk_export_import.result

@@ -603,6 +603,27 @@ file	EE5C-EE5C5C
 a	3F5C          BAD-TEXT
 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 
@@ -666,6 +687,27 @@ file	EE5C-EE5C
 a	3F5C          BAD-TEXT
 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 
@@ -729,6 +771,27 @@ file	E9A0AB-3F5C5C
 a	EE5C
 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 

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