Modifying ctype_gbk_export_import.test to help "meld" not to confuse/join

individual records when displaying diff.

mysql-test/t/ctype_gbk_export_import.test

@@ -35,6 +35,7 @@ CREATE TABLE t1 (
 DELIMITER |;
 CREATE PROCEDURE populate()
 BEGIN
+  TRUNCATE TABLE t1;
   INSERT INTO t1 SET id=1, a1=0xEE5C, a2=_gbk 0xEE5C, b1=0xEE5C, eol='$';
   INSERT INTO t1 SET id=2, a1=0xEE5C5C, a2=_gbk 0xEE5C5C, b1=0xEE5C5C, eol='$';
 END|
@@ -71,7 +72,8 @@ SELECT
   CONCAT(RPAD(HEX(a1),50,' '), cmt(id, 'a1', a1)) AS a1,
   CONCAT(RPAD(HEX(a2),50,' '), cmt(id, 'a2', a2)) AS a2,
   CONCAT(RPAD(HEX(b1),50,' '), cmt(id, 'b1', b1)) AS b1,
-  CONCAT(RPAD(HEX(eol),50,' '), IF(eol<>'$','BAD-EOL','')) AS eol
+  CONCAT(RPAD(HEX(eol),50,' '), IF(eol<>'$','BAD-EOL','')) AS eol,
+  '---' AS `---`
 FROM t1;
 SHOW CREATE TABLE t1;
 
@@ -88,7 +90,7 @@ for $DUMP_CHARSET_CLAUSE ("", "CHARACTER SET gbk", "CHARACTER SET utf8", "CHARAC
 for $RESTORE_OPTIONS ("--default-character-set=auto", "--default-character-set=gbk","--default-character-set=utf8") {
 for $RESTORE_CHARSET_CLAUSE ("", "CHARACTER SET gbk", "CHARACTER SET utf8", "CHARACTER SET binary") {
 print $FILE <<END
---echo
+--echo Start of {$LOCALE}{$DUMP_OPTIONS $DUMP_CHARSET_CLAUSE}{$RESTORE_OPTIONS $RESTORE_CHARSET_CLAUSE}
 --echo Locale:  $LOCALE
 --echo OUTFILE: $DUMP_OPTIONS $DUMP_CHARSET_CLAUSE
 --echo INFILE:  $RESTORE_OPTIONS $RESTORE_CHARSET_CLAUSE
@@ -100,7 +102,9 @@ TRUNCATE TABLE t1;
 --eval SELECT display_file(LOAD_FILE('\$MYSQLTEST_VARDIR/tmp/t1')) AS file;
 --exec LC_ALL=$LOCALE \$MYSQL $RESTORE_OPTIONS gbk -e "LOAD DATA INFILE '\$MYSQLTEST_VARDIR/tmp/t1' INTO TABLE t1 $RESTORE_CHARSET_CLAUSE"
 SELECT * FROM v1;
-TRUNCATE TABLE t1;
+--echo End of {$LOCALE}{$DUMP_OPTIONS $DUMP_CHARSET_CLAUSE}{$RESTORE_OPTIONS $RESTORE_CHARSET_CLAUSE}
+--echo
+--echo
 --horizontal_results
 --enable_query_log
 --remove_file \$MYSQLTEST_VARDIR/tmp/t1
@@ -125,7 +129,7 @@ for $DUMP_OPTIONS ("--default-character-set=binary","--default-character-set=gbk
 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", "CHARACTER SET binary") {
 print $FILE <<END
---echo
+--echo Start of {$LOCALE}{$DUMP_OPTIONS}{$RESTORE_OPTIONS $RESTORE_CHARSET_CLAUSE}
 --echo Locale:    $LOCALE
 --echo mysqldump: $DUMP_OPTIONS
 --echo INFILE:    $RESTORE_OPTIONS $RESTORE_CHARSET_CLAUSE
@@ -137,7 +141,9 @@ TRUNCATE TABLE t1;
 --eval SELECT display_file(LOAD_FILE('\$MYSQLTEST_VARDIR/tmp/tmpgbk/t1.txt')) AS file;
 --exec LC_ALL=$LOCALE \$MYSQL $RESTORE_OPTIONS gbk -e "LOAD DATA INFILE '\$MYSQLTEST_VARDIR/tmp/tmpgbk/t1.txt' INTO TABLE t1 $RESTORE_CHARSET_CLAUSE"
 SELECT * FROM v1;
-TRUNCATE TABLE t1;
+--echo End of {$LOCALE}{$DUMP_OPTIONS}{$RESTORE_OPTIONS $RESTORE_CHARSET_CLAUSE}
+--echo
+--echo
 --horizontal_results
 --enable_query_log
 --remove_file \$MYSQLTEST_VARDIR/tmp/tmpgbk/t1.txt