Add an end-of-tests marker to ease merges

f72760df · Marko Mäkelä · bef947b4 · f72760df · f72760df
Commit f72760df authored Mar 12, 2019 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

mysql-test/r/func_json.result mysql-test/r/func_json.result +3 -0

mysql-test/t/func_json.test mysql-test/t/func_json.test +3 -0

No files found.
--- 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
+#
--- 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 #