Fix of result files from merge

mysql-test/r/mysqldump.result:
  Fix of result file (adding the echo's)
mysql-test/r/rpl_view.result:
  Added end of 5.0 echo
mysql-test/t/rpl_view.test:
  Added end of 5.0 echo

3 files changed, 243 insertions, 1 deletions

diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index 3172a32de76..ee50fc42203 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -22,6 +22,9 @@ INSERT INTO t1 VALUES (1), (2);
 </database>
 </mysqldump>
 DROP TABLE t1;
+#
+# Bug #2005
+#
 CREATE TABLE t1 (a decimal(64, 20));
 INSERT INTO t1 VALUES ("1234567890123456789012345678901234567890"),
 ("0987654321098765432109876543210987654321");
@@ -30,6 +33,9 @@ CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 INSERT INTO `t1` VALUES ('1234567890123456789012345678901234567890.00000000000000000000'),('987654321098765432109876543210987654321.00000000000000000000');
 DROP TABLE t1;
+#
+# Bug #2055
+#
 CREATE TABLE t1 (a double);
 INSERT INTO t1 VALUES ('-9e999999');
 Warnings:
@@ -39,6 +45,9 @@ CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 INSERT INTO `t1` VALUES (RES);
 DROP TABLE t1;
+#
+# Bug #3361 mysqldump quotes DECIMAL values inconsistently
+#
 CREATE TABLE t1 (a DECIMAL(10,5), b FLOAT);
 INSERT INTO t1 VALUES (1.2345, 2.3456);
 INSERT INTO t1 VALUES ('1.2345', 2.3456);
@@ -136,6 +145,9 @@ INSERT INTO t1 VALUES (1, "test", "tes"), (2, "TEST", "TES");
 </database>
 </mysqldump>
 DROP TABLE t1;
+#
+# Bug #1707
+#
 CREATE TABLE t1 (`a"b"` char(2));
 INSERT INTO t1 VALUES ("1\""), ("\"2");
 <?xml version="1.0"?>
@@ -155,6 +167,10 @@ INSERT INTO t1 VALUES ("1\""), ("\"2");
 </database>
 </mysqldump>
 DROP TABLE t1;
+#
+# Bug #1994
+# Bug #4261
+#
 CREATE TABLE t1 (a  VARCHAR(255)) DEFAULT CHARSET koi8r;
 INSERT INTO t1  VALUES (_koi8r x'C1C2C3C4C5'), (NULL);
 
@@ -190,6 +206,9 @@ UNLOCK TABLES;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
 DROP TABLE t1;
+#
+# Bug #2634
+#
 CREATE TABLE t1 (a int) ENGINE=MYISAM;
 INSERT INTO t1 VALUES (1), (2);
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
@@ -239,11 +258,17 @@ UNLOCK TABLES;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
 DROP TABLE t1;
+#
+# Bug #2592 'mysqldump doesn't quote "tricky" names correctly'
+#
 create table ```a` (i int);
 CREATE TABLE ```a` (
   `i` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 drop table ```a`;
+#
+# Bug #2591 "mysqldump quotes names inconsistently"
+#
 create table t1(a int);
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
@@ -352,6 +377,9 @@ UNLOCK TABLES;
 
 set global sql_mode='';
 drop table t1;
+#
+# Bug #2705 'mysqldump --tab extra output'
+#
 create table t1(a int);
 insert into t1 values (1),(2),(3);
 
@@ -380,6 +408,9 @@ CREATE TABLE `t1` (
 2
 3
 drop table t1;
+#
+# Bug #6101: create database problem
+#
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -432,6 +463,12 @@ USE `mysqldump_test_db`;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
 drop database mysqldump_test_db;
+#
+# Bug #7020
+# Check that we don't dump in UTF8 in compatible mode by default,
+# but use the default compiled values, or the values given in
+# --default-character-set=xxx. However, we should dump in UTF8
+# if it is explicitely set.
 CREATE TABLE t1 (a  CHAR(10));
 INSERT INTO t1  VALUES (_latin1 'ÄÖÜß');
 
@@ -465,6 +502,13 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
+#
+# Bug#8063: make test mysqldump [ fail ]
+# We cannot tes this command because its output depends
+# on --default-character-set incompiled into "mysqldump" program.
+# If the future we can move this command into a separate test with
+# checking that "mysqldump" is compiled with "latin1"
+#
 /*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
 /*!40103 SET TIME_ZONE='+00:00' */;
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
@@ -535,6 +579,9 @@ UNLOCK TABLES;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
 DROP TABLE t1;
+#
+# WL #2319: Exclude Tables from dump
+#
 CREATE TABLE t1 (a int);
 CREATE TABLE t2 (a int);
 INSERT INTO t1 VALUES (1),(2),(3);
@@ -572,6 +619,9 @@ UNLOCK TABLES;
 
 DROP TABLE t1;
 DROP TABLE t2;
+#
+#  Bug  #8830
+#
 CREATE TABLE t1 (`b` blob);
 INSERT INTO `t1` VALUES (0x602010000280100005E71A);
 
@@ -606,6 +656,9 @@ UNLOCK TABLES;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
 DROP TABLE t1;
+#
+# Test for --insert-ignore
+#
 CREATE TABLE t1 (a int);
 INSERT INTO t1 VALUES (1),(2),(3);
 INSERT INTO t1 VALUES (4),(5),(6);
@@ -670,6 +723,10 @@ INSERT  DELAYED IGNORE INTO `t1` VALUES (1),(2),(3),(4),(5),(6);
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
 DROP TABLE t1;
+#
+# Bug #10286: mysqldump -c crashes on table that has many fields with long
+# names
+# 
 create table t1 (
 F_c4ca4238a0b923820dcc509a6f75849b int,
 F_c81e728d9d4c2f636f067f89cc14862c int,
@@ -1363,6 +1420,9 @@ UNLOCK TABLES;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
 drop table t1;
+#
+# Test for --add-drop-database
+#
 CREATE TABLE t1 (a int);
 INSERT INTO t1 VALUES (1),(2),(3);
 
@@ -1403,6 +1463,9 @@ UNLOCK TABLES;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
 DROP TABLE t1;
+#
+# Bug #9558 mysqldump --no-data db t1 t2 format still dumps data
+#
 CREATE DATABASE mysqldump_test_db;
 USE mysqldump_test_db;
 CREATE TABLE t1 ( a INT );
@@ -1491,6 +1554,11 @@ CREATE TABLE `t2` (
 </mysqldump>
 DROP TABLE t1, t2;
 DROP DATABASE mysqldump_test_db;
+#
+#  Testing with tables and databases that don't exists
+#  or contains illegal characters
+# (Bug #9358 mysqldump crashes if tablename starts with \)
+#
 create database mysqldump_test_db;
 use mysqldump_test_db;
 create table t1(a varchar(30) primary key, b int not null);
@@ -1529,6 +1597,9 @@ mysqldump: Got error: 1102: Incorrect database name 'mysqld\ump_test_db' when se
 drop table t1, t2, t3;
 drop database mysqldump_test_db;
 use test;
+#
+# Bug #9657 mysqldump xml ( -x ) does not format NULL fields correctly
+#
 create table t1 (a int(10));
 create table t2 (pk int primary key auto_increment,
 a int(10), b varchar(30), c datetime, d blob, e text);
@@ -1585,6 +1656,9 @@ insert into t2 (a, b) values (NULL, NULL),(10, NULL),(NULL, "twenty"),(30, "thir
 </database>
 </mysqldump>
 drop table t1, t2;
+#
+# BUG #12123
+#
 create table t1 (a text character set utf8, b text character set latin1);
 insert t1 values (0x4F736E616272C3BC636B, 0x4BF66C6E);
 select * from t1;
@@ -1595,7 +1669,13 @@ select * from t1;
 a	b
 Osnabrück	Köln
 drop table t1;
+#
+# BUG#15328 Segmentation fault occured if my.cnf is invalid for escape sequence
+#
 --fields-optionally-enclosed-by="
+#
+# BUG #19025 mysqldump doesn't correctly dump "auto_increment = [int]"
+#
 create table `t1` (
 t1_name varchar(255) default null,
 t1_id int(10) unsigned not null auto_increment,
@@ -1633,6 +1713,9 @@ t1	CREATE TABLE `t1` (
   KEY `t1_name` (`t1_name`)
 ) ENGINE=MyISAM AUTO_INCREMENT=1003 DEFAULT CHARSET=latin1
 drop table `t1`;
+#
+# Bug #18536: wrong table order
+#
 create table t1(a int);
 create table t2(a int);
 create table t3(a int);
@@ -1670,6 +1753,9 @@ CREATE TABLE `t2` (
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
 drop table t1, t2, t3;
+#
+# Bug #21288: mysqldump segmentation fault when using --where
+#
 create table t1 (a int);
 mysqldump: Couldn't execute 'SELECT /*!40001 SQL_NO_CACHE */ * FROM `t1` WHERE xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx': You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1 (1064)
 mysqldump: Got error: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' at line 1 when retrieving data from server
@@ -1701,6 +1787,9 @@ CREATE TABLE `t1` (
 
 drop table t1;
 End of 4.1 tests
+#
+# Bug #10213 mysqldump crashes when dumping VIEWs(on MacOS X)
+#
 create database db1;
 use db1;
 CREATE TABLE t2 (
@@ -1760,6 +1849,9 @@ drop table t2;
 drop view v2;
 drop database db1;
 use test;
+#
+# Bug 10713 mysqldump includes database in create view and referenced tables
+#
 create database db2;
 use db2;
 create table t1 (a int);
@@ -1833,6 +1925,9 @@ DROP TABLE IF EXISTS `v1`;
 
 drop view v1;
 drop table t1;
+#
+# Bug #10213 mysqldump crashes when dumping VIEWs(on MacOS X)
+#
 create database mysqldump_test_db;
 use mysqldump_test_db;
 CREATE TABLE t2 (
@@ -1892,6 +1987,9 @@ drop table t2;
 drop view v2;
 drop database mysqldump_test_db;
 use test;
+#
+# Bug #9756
+#
 CREATE TABLE t1 (a char(10));
 INSERT INTO t1 VALUES ('\'');
 
@@ -1926,6 +2024,9 @@ UNLOCK TABLES;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
 DROP TABLE t1;
+#
+# Bug #10927 mysqldump: Can't reload dump with view that consist of other view
+#
 create table t1(a int, b int, c varchar(30));
 insert into t1 values(1, 2, "one"), (2, 4, "two"), (3, 6, "three");
 create view v3 as
@@ -2003,6 +2104,9 @@ DROP TABLE IF EXISTS `v3`;
 
 drop view v1, v2, v3;
 drop table t1;
+#
+# Test for dumping triggers
+#
 CREATE TABLE t1 (a int, b bigint default NULL);
 CREATE TABLE t2 (a int);
 create trigger trg1 before insert on t1 for each row
@@ -2201,8 +2305,14 @@ set @fired:= "No";
 end if;
 end	BEFORE	#	STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER	root@localhost
 DROP TABLE t1, t2;
+#
+# Bugs #9136, #12917: problems with --defaults-extra-file option
+#
 --port=1234
 --port=1234
+#
+# Test of fix to BUG 12597
+#
 DROP TABLE IF EXISTS `test1`;
 Warnings:
 Note	1051	Unknown table 'test1'
@@ -2234,6 +2344,9 @@ a2
 DROP TRIGGER testref;
 DROP TABLE test1;
 DROP TABLE test2;
+#
+# BUG#9056 - mysqldump does not dump routines
+#
 DROP TABLE IF EXISTS t1;
 DROP FUNCTION IF EXISTS bug9056_func1;
 DROP FUNCTION IF EXISTS bug9056_func2;
@@ -2330,6 +2443,9 @@ DROP PROCEDURE bug9056_proc1;
 DROP PROCEDURE bug9056_proc2;
 DROP PROCEDURE `a'b`;
 drop table t1;
+#
+# BUG# 13052 - mysqldump timestamp reloads broken
+#
 drop table if exists t1;
 create table t1 (`d` timestamp, unique (`d`));
 set time_zone='+00:00';
@@ -2416,6 +2532,9 @@ UNLOCK TABLES;
 drop table t1;
 set global time_zone=default;
 set time_zone=default;
+#
+# Test of fix to BUG 13146 - ansi quotes break loading of triggers 
+#
 DROP TABLE IF EXISTS `t1 test`;
 DROP TABLE IF EXISTS `t2 test`;
 CREATE TABLE `t1 test` (
@@ -2479,6 +2598,9 @@ UNLOCK TABLES;
 DROP TRIGGER `test trig`;
 DROP TABLE `t1 test`;
 DROP TABLE `t2 test`;
+#
+# BUG# 12838 mysqldump -x with views exits with error 
+#
 drop table if exists t1;
 create table t1 (a int, b varchar(32), c varchar(32));
 insert into t1 values (1, 'first value', 'xxxx');
@@ -2571,6 +2693,10 @@ drop view v2;
 drop view v0;
 drop view v1;
 drop table t1;
+#
+# BUG#14554 - mysqldump does not separate words "ROW" and "BEGIN"
+# for tables with trigger created in the IGNORE_SPACE sql mode.
+#
 SET @old_sql_mode = @@SQL_MODE;
 SET SQL_MODE = IGNORE_SPACE;
 CREATE TABLE t1 (a INT);
@@ -2626,6 +2752,9 @@ DELIMITER ;
 
 DROP TRIGGER tr1;
 DROP TABLE t1;
+#
+# Bug #13318: Bad result with empty field and --hex-blob
+# 
 create table t1 (a binary(1), b blob);
 insert into t1 values ('','');
 
@@ -2693,6 +2822,9 @@ UNLOCK TABLES;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
 drop table t1;
+#
+# Bug 14871 Invalid view dump output
+#
 create table t1 (a int);
 insert into t1 values (289), (298), (234), (456), (789);
 create definer = CURRENT_USER view v1 as select * from t1;
@@ -2719,6 +2851,9 @@ a
 789
 drop table t1;
 drop view v1, v2, v3, v4, v5;
+#
+# Bug #16878 dump of trigger
+#
 create table t1 (a int, created datetime);
 create table t2 (b int, created datetime);
 create trigger tr1 before insert on t1 for each row set
@@ -2741,6 +2876,9 @@ end	AFTER	#		root@localhost
 drop trigger tr1;
 drop trigger tr2;
 drop table t1, t2;
+#
+# Bug#18462 mysqldump does not dump view structures correctly
+#
 create table t (qty int, price int);
 insert into t values(3, 50);
 insert into t values(5, 51);
@@ -2760,6 +2898,10 @@ mysqldump {
 drop view v1;
 drop view v2;
 drop table t;
+#
+# Bug#14857 Reading dump files with single statement stored routines fails.
+# fixed by patch for bug#16878
+#
 /*!50003 CREATE FUNCTION `f`() RETURNS bigint(20)
 return 42 */|
 /*!50003 CREATE PROCEDURE `p`()
@@ -2774,6 +2916,9 @@ p		CREATE DEFINER=`root`@`localhost` PROCEDURE `p`()
 select 42
 drop function f;
 drop procedure p;
+#
+# Bug #17371 Unable to dump a schema with invalid views
+#
 create table t1 ( id serial );
 create view v1 as select * from t1;
 drop table t1;
@@ -2783,6 +2928,9 @@ mysqldump {
 
 } mysqldump
 drop view v1;
+# BUG#17201 Spurious 'DROP DATABASE' in output,
+# also confusion between tables and views.
+# Example code from Markus Popp
 create database mysqldump_test_db;
 use mysqldump_test_db;
 create table t1 (id int);
@@ -2843,6 +2991,9 @@ USE `mysqldump_test_db`;
 drop view v1;
 drop table t1;
 drop database mysqldump_test_db;
+#
+# Bug21014 Segmentation fault of mysqldump on view
+#
 create database mysqldump_tables;
 use mysqldump_tables;
 create table basetable ( id serial, tag varchar(64) );
@@ -2876,6 +3027,9 @@ drop view nasishnasifu;
 drop database mysqldump_views;
 drop table mysqldump_tables.basetable;
 drop database mysqldump_tables;
+#
+# Bug20221 Dumping of multiple databases containing view(s) yields maleformed dumps
+#
 create database mysqldump_dba;
 use mysqldump_dba;
 create table t1 (f1 int, f2 int);
@@ -2908,6 +3062,9 @@ drop view v1;
 drop table t1;
 drop database mysqldump_dbb;
 use test;
+#
+# Bug#21215 mysqldump creating incomplete backups without warning
+#
 create user mysqltest_1@localhost;
 create table t1(a int, b varchar(34));
 reset master;
@@ -2924,6 +3081,12 @@ CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 drop table t1;
 drop user mysqltest_1@localhost;
+#
+# Bug #21527 mysqldump incorrectly tries to LOCK TABLES on the 
+# information_schema database.
+#
+# Bug #21424 mysqldump failing to export/import views
+#
 create database mysqldump_myDB;
 use mysqldump_myDB;
 create user myDB_User;
@@ -2942,6 +3105,9 @@ revoke all privileges on mysqldump_myDB.* from myDB_User@localhost;
 drop user myDB_User;
 drop database mysqldump_myDB;
 flush privileges;
+# Bug #21424 continues from here.
+# Restore. Flush Privileges test ends.  
+#
 use mysqldump_myDB;
 select * from mysqldump_myDB.v1;
 c1
@@ -2957,4 +3123,78 @@ revoke all privileges on mysqldump_myDB.* from myDB_User@localhost;
 drop user myDB_User;
 drop database mysqldump_myDB;
 use test;
-End of 5.0 tests
+#
+# BUG#13926: --order-by-primary fails if PKEY contains quote character
+#
+DROP TABLE IF EXISTS `t1`;
+CREATE TABLE `t1` (
+`a b` INT,
+`c"d` INT,
+`e``f` INT,
+PRIMARY KEY (`a b`, `c"d`, `e``f`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+insert into t1 values (0815, 4711, 2006);
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO,ANSI' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+DROP TABLE IF EXISTS "t1";
+CREATE TABLE "t1" (
+  "a b" int(11) NOT NULL default '0',
+  "c""d" int(11) NOT NULL default '0',
+  "e`f" int(11) NOT NULL default '0',
+  PRIMARY KEY  ("a b","c""d","e`f")
+);
+
+LOCK TABLES "t1" WRITE;
+/*!40000 ALTER TABLE "t1" DISABLE KEYS */;
+INSERT INTO "t1" VALUES (815,4711,2006);
+/*!40000 ALTER TABLE "t1" ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+DROP TABLE IF EXISTS `t1`;
+CREATE TABLE `t1` (
+  `a b` int(11) NOT NULL default '0',
+  `c"d` int(11) NOT NULL default '0',
+  `e``f` int(11) NOT NULL default '0',
+  PRIMARY KEY  (`a b`,`c"d`,`e``f`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+LOCK TABLES `t1` WRITE;
+/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
+INSERT INTO `t1` VALUES (815,4711,2006);
+/*!40000 ALTER TABLE `t1` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+DROP TABLE `t1`;
+#
+# End of 5.0 tests
+#
diff --git a/mysql-test/r/rpl_view.result b/mysql-test/r/rpl_view.result
index 51a8e3193aa..601f3d9cd14 100644
--- a/mysql-test/r/rpl_view.result
+++ b/mysql-test/r/rpl_view.result
@@ -106,3 +106,4 @@ a	b
 1	6
 drop table t1;
 drop view v1;
+End of 5.0 tests
diff --git a/mysql-test/t/rpl_view.test b/mysql-test/t/rpl_view.test
index 52db75aaf69..812e5d44d58 100644
--- a/mysql-test/t/rpl_view.test
+++ b/mysql-test/t/rpl_view.test
@@ -149,3 +149,4 @@ drop view v1;
 
 sync_slave_with_master;
 
+--echo End of 5.0 tests