fix merge test to restore the environment

include/test_db_charset_latin1.inc should be paired with
include/test_db_charset_restore.inc

also fix end-of-version test markers

Author: vuvova

mysql-test/suite/merge/merge.result

@@ -882,6 +882,7 @@ SELECT COUNT(*) FROM t3 WHERE a=0xDF AND b=2;
 COUNT(*)
 2
 DROP TABLE t1,t2,t3;
+# End of 4.1 tests
 create table t1 (b bit(1));
 create table t2 (b bit(1));
 create table tm (b bit(1)) engine = merge union = (t1,t2);
@@ -1007,7 +1008,7 @@ ERROR HY000: Unable to open underlying table which is differently defined or of
 SELECT * FROM m2;
 a
 DROP TABLE t1, t2, m1, m2;
-End of 5.0 tests
+# End of 5.0 tests
 create table t1 (c1 int, index(c1));
 create table t2 (c1 int, index(c1)) engine=merge union=(t1);
 insert into t1 values (1);
@@ -2419,7 +2420,7 @@ check table tm_temp_temp;
 Table	Op	Msg_type	Msg_text
 test.tm_temp_temp	check	status	OK
 drop temporary table t1_temp, tm_temp_temp;
-End of 5.1 tests
+# End of 5.1 tests
 # 
 # MDEV-4277: Crash inside mi_killed_in_mariadb() with myisammrg
 # 
@@ -2550,7 +2551,7 @@ i	a	b	filler
 2	999	999	filler-data-FILLER-DATA-qqq
 drop table t5;
 drop table t1,t2,t3,t4;
-End of 5.3 tests
+# End of 5.3 tests
 CREATE TABLE t1(a INT, KEY(a)) ENGINE=merge;
 SELECT MAX(a) FROM t1;
 MAX(a)
@@ -3800,10 +3801,8 @@ test.t1	analyze	status	Engine-independent statistics collected
 test.t1	analyze	status	Table is already up to date
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1, tmerge;
-#
 # End of 5.5 tests
 #
-#
 # Additional coverage for refactoring which is made as part
 # of fix for bug #27480 "Extend CREATE TEMPORARY TABLES privilege
 # to allow temp table operations".
@@ -3898,11 +3897,8 @@ f
 foo
 bar
 DROP TABLE mrg, t1;
-End of 10.5 tests
-#
 # End of 10.0 tests
 #
-#
 # MDEV-27407 Different ASC/DESC index attributes on MERGE and underlying table can cause wrong results
 #
 create table t (a int, key(a desc)) engine=myisam;
@@ -3924,10 +3920,8 @@ a
 2
 1
 drop table tm, t;
-#
 # End of 10.8 tests
 #
-#
 # MDEV-35816 ASAN use-after-poison in st_select_lex::print
 #
 CREATE TABLE t1 (a INT);
@@ -3964,10 +3958,8 @@ a
 4
 5
 DROP TABLE t1;
-#
 # End of 10.11 tests
 #
-#
 # MDEV-30088 Assertion `cond_selectivity <= 1.0' failed in get_range_limit_read_cost
 #
 CREATE TABLE t1 (a TIMESTAMP, KEY(a)) ENGINE=MRG_MyISAM;
@@ -4020,10 +4012,8 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	range	NULL	i1	5	NULL	1	Using index for group-by
 drop table t1;
 set use_stat_tables=default;
-#
 # End of 11.0 tests
 #
-#
 # MDEV-29174: UPDATE of view that uses MERGE table
 #
 CREATE TABLE t1 (a int) ENGINE=MERGE;
@@ -4032,3 +4022,4 @@ UPDATE v1 SET a=0;
 DROP VIEW v1;
 DROP TABLE t1;
 # End of 11.1 tests
+ALTER DATABASE test CHARACTER SET utf8mb4 COLLATE utf8mb4_uca1400_ai_ci;

mysql-test/suite/merge/merge.test

@@ -523,7 +523,7 @@ INSERT INTO t2 VALUES ('ss',2),(0xDF,2);
 SELECT COUNT(*) FROM t3 WHERE a=0xDF AND b=2;
 DROP TABLE t1,t2,t3;
 
-# End of 4.1 tests
+--echo # End of 4.1 tests
 
 #
 # BUG#19648 - Merge table does not work with bit types
@@ -632,7 +632,7 @@ SELECT * FROM m1;
 SELECT * FROM m2;
 DROP TABLE t1, t2, m1, m2;
 
---echo End of 5.0 tests
+--echo # End of 5.0 tests
 
 
 #
@@ -1829,7 +1829,7 @@ alter table tm_temp_temp insert_method=first;
 check table tm_temp_temp;
 drop temporary table t1_temp, tm_temp_temp;
 
---echo End of 5.1 tests
+--echo # End of 5.1 tests
 
 --echo # 
 --echo # MDEV-4277: Crash inside mi_killed_in_mariadb() with myisammrg
@@ -1866,7 +1866,7 @@ select * from t2, t5 where t5.a=999 and t5.b=999;
 drop table t5;
 drop table t1,t2,t3,t4;
 
---echo End of 5.3 tests
+--echo # End of 5.3 tests
 
 #
 # BUG#35274 - merge table doesn't need any base tables, gives error 124 when
@@ -2773,9 +2773,7 @@ EXECUTE stmt;
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1, tmerge;
 
---echo #
 --echo # End of 5.5 tests
---echo #
 
 --echo #
 --echo # Additional coverage for refactoring which is made as part
@@ -2860,11 +2858,7 @@ CREATE TABLE mrg (f TEXT) ENGINE=MERGE, UNION(t1);
 SELECT * FROM mrg;
 DROP TABLE mrg, t1;
 
---echo End of 10.5 tests
-
---echo #
 --echo # End of 10.0 tests
---echo #
 
 --echo #
 --echo # MDEV-27407 Different ASC/DESC index attributes on MERGE and underlying table can cause wrong results
@@ -2886,9 +2880,7 @@ insert into tm () values ();
 select * from tm;
 drop table tm, t;
 
---echo #
 --echo # End of 10.8 tests
---echo #
 
 --echo #
 --echo # MDEV-35816 ASAN use-after-poison in st_select_lex::print
@@ -2904,9 +2896,7 @@ EXECUTE nested;
 EXECUTE nested;
 DROP TABLE t1;
 
---echo #
 --echo # End of 10.11 tests
---echo #
 
 --echo #
 --echo # MDEV-30088 Assertion `cond_selectivity <= 1.0' failed in get_range_limit_read_cost
@@ -2953,9 +2943,8 @@ EXPLAIN SELECT DISTINCT a FROM t1;
 drop table t1;
 set use_stat_tables=default;
 
---echo #
 --echo # End of 11.0 tests
---echo #
+
 --echo #
 --echo # MDEV-29174: UPDATE of view that uses MERGE table
 --echo #
@@ -2967,3 +2956,4 @@ DROP VIEW v1;
 DROP TABLE t1;
 
 --echo # End of 11.1 tests
+--source include/test_db_charset_restore.inc