From ec24dd0be9c8fe10c275f4f6870ec35ce5cbbd89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Wed, 13 Mar 2019 11:47:10 +0200
Subject: [PATCH] Add an end-of-tests marker to ease merges

---
 mysql-test/r/win.result | 3 +++
 mysql-test/t/win.test   | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/mysql-test/r/win.result b/mysql-test/r/win.result
index ce94c1947e9..083b5dfd16d 100644
--- a/mysql-test/r/win.result
+++ b/mysql-test/r/win.result
@@ -3505,3 +3505,6 @@ id	a	b	sum_a_b
 2	2	1	3
 2	2	2	4
 drop table t1;
+#
+# End of 10.2 tests
+#
diff --git a/mysql-test/t/win.test b/mysql-test/t/win.test
index 8c9bf3e36f9..0f02b1414a0 100644
--- a/mysql-test/t/win.test
+++ b/mysql-test/t/win.test
@@ -2254,3 +2254,7 @@ select e.id,
  (select max(t1.v) from t1 where t1.id=e.id) + (row_number() over (partition by e.id order by e.v)) as sum_a_b
 from t1 e;
 drop table t1;
+
+--echo #
+--echo # End of 10.2 tests
+--echo #