diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-29 16:52:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-05-29 16:52:59 +0300 |
| commit | 7269c70821fb6999683f184bf8dad22d35a7ad96 (patch) | |
| tree | a6d1abf0845475f36f1bdb8cd58a394ed702acd5 | |
| parent | 18934fb58309f4491b34273b2781cce68f6d6e22 (diff) | |
| download | mariadb-git-7269c70821fb6999683f184bf8dad22d35a7ad96.tar.gz | |
Add an end-marker to ease future merges
| -rw-r--r-- | mysql-test/suite/maria/lock.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/maria/lock.test | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/suite/maria/lock.result b/mysql-test/suite/maria/lock.result index 1c9d6b18100..b7d5a9c220d 100644 --- a/mysql-test/suite/maria/lock.result +++ b/mysql-test/suite/maria/lock.result @@ -109,3 +109,4 @@ ALTER TABLE t1 ADD UNIQUE KEY (f1); ERROR 23000: Duplicate entry 'foo' for key 'f1' ALTER TABLE t1 ADD KEY (f2); DROP TABLE t1; +# End of 10.2 tests diff --git a/mysql-test/suite/maria/lock.test b/mysql-test/suite/maria/lock.test index 4f3d4e8065e..b22c9cc70d7 100644 --- a/mysql-test/suite/maria/lock.test +++ b/mysql-test/suite/maria/lock.test @@ -117,3 +117,5 @@ LOCK TABLE t1 WRITE; ALTER TABLE t1 ADD UNIQUE KEY (f1); ALTER TABLE t1 ADD KEY (f2); DROP TABLE t1; + +--echo # End of 10.2 tests |