From 2e1d10ecacc8ccfc0bda8a199c741ee36df981be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Sat, 30 May 2020 10:48:11 +0300 Subject: [PATCH] Add end-of-test markers to ease merges --- mysql-test/suite/versioning/r/partition.result | 1 + mysql-test/suite/versioning/r/partition_innodb.result | 1 + mysql-test/suite/versioning/t/partition.test | 2 ++ mysql-test/suite/versioning/t/partition_innodb.test | 2 ++ 4 files changed, 6 insertions(+) diff --git a/mysql-test/suite/versioning/r/partition.result b/mysql-test/suite/versioning/r/partition.result index 4d0426512e6..ab206db1213 100644 --- a/mysql-test/suite/versioning/r/partition.result +++ b/mysql-test/suite/versioning/r/partition.result @@ -673,3 +673,4 @@ delete from v1; ERROR HY000: Table 't1' was locked with a READ lock and can't be updated drop view v1; drop table t1; +# End of 10.3 tests diff --git a/mysql-test/suite/versioning/r/partition_innodb.result b/mysql-test/suite/versioning/r/partition_innodb.result index 2489af91b7f..b9870797cd2 100644 --- a/mysql-test/suite/versioning/r/partition_innodb.result +++ b/mysql-test/suite/versioning/r/partition_innodb.result @@ -77,3 +77,4 @@ select * from t1 where i > 0 or pk = 1000 limit 1; pk i c 1 1 a drop table t1; +# End of 10.3 tests diff --git a/mysql-test/suite/versioning/t/partition.test b/mysql-test/suite/versioning/t/partition.test index 6cd88caf1a9..726b991c00e 100644 --- a/mysql-test/suite/versioning/t/partition.test +++ b/mysql-test/suite/versioning/t/partition.test @@ -635,4 +635,6 @@ delete from v1; drop view v1; drop table t1; +--echo # End of 10.3 tests + --source suite/versioning/common_finish.inc diff --git a/mysql-test/suite/versioning/t/partition_innodb.test b/mysql-test/suite/versioning/t/partition_innodb.test index 79130dbbccf..29ec58af13c 100644 --- a/mysql-test/suite/versioning/t/partition_innodb.test +++ b/mysql-test/suite/versioning/t/partition_innodb.test @@ -89,4 +89,6 @@ replace into t1 select * from t1; select * from t1 where i > 0 or pk = 1000 limit 1; drop table t1; +--echo # End of 10.3 tests + --source suite/versioning/common_finish.inc