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

---
 mysql-test/r/func_json.result | 3 +++
 mysql-test/t/func_json.test   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/mysql-test/r/func_json.result b/mysql-test/r/func_json.result
index e74d6292476..752a745b3b4 100644
--- a/mysql-test/r/func_json.result
+++ b/mysql-test/r/func_json.result
@@ -842,3 +842,6 @@ latin1
 SELECT CHARSET(JSON_OBJECT());
 CHARSET(JSON_OBJECT())
 latin1
+#
+# End of 10.2 tests
+#
diff --git a/mysql-test/t/func_json.test b/mysql-test/t/func_json.test
index ef3fdc685fe..8e924fb7f9e 100644
--- a/mysql-test/t/func_json.test
+++ b/mysql-test/t/func_json.test
@@ -494,3 +494,6 @@ SELECT JSON_ARRAY(_UTF8 'str', JSON_OBJECT(_LATIN1 'plugin', _LATIN1'unix_socket
 SELECT CHARSET(JSON_ARRAY());
 SELECT CHARSET(JSON_OBJECT());
 
+--echo #
+--echo # End of 10.2 tests
+--echo #