summaryrefslogtreecommitdiff
path: root/mysql-test/suite/versioning/r
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-05-30 10:48:11 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-05-30 10:48:27 +0300
commit2e1d10ecacc8ccfc0bda8a199c741ee36df981be (patch)
treef4794dd4cf7a9aa585f5eef1b1a1924b1eaac189 /mysql-test/suite/versioning/r
parente9aaa10c116370ca581bd1b6f7cc360b43938674 (diff)
downloadmariadb-git-2e1d10ecacc8ccfc0bda8a199c741ee36df981be.tar.gz
Add end-of-test markers to ease merges
Diffstat (limited to 'mysql-test/suite/versioning/r')
-rw-r--r--mysql-test/suite/versioning/r/partition.result1
-rw-r--r--mysql-test/suite/versioning/r/partition_innodb.result1
2 files changed, 2 insertions, 0 deletions
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