database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Add an end-of-tests marker to ease merges

Browse Source
This commit is contained in:
Marko Mäkelä
2019-03-12 14:20:01 +02:00
parent bef947b4c9
commit f72760df33
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/func_json.result
View File

@ -842,3 +842,6 @@ latin1
SELECT CHARSET(JSON_OBJECT()); SELECT CHARSET(JSON_OBJECT());
CHARSET(JSON_OBJECT()) CHARSET(JSON_OBJECT())
latin1 latin1
#
# End of 10.2 tests
#

3
mysql-test/t/func_json.test
View File

@ -494,3 +494,6 @@ SELECT JSON_ARRAY(_UTF8 'str', JSON_OBJECT(_LATIN1 'plugin', _LATIN1'unix_socket
SELECT CHARSET(JSON_ARRAY()); SELECT CHARSET(JSON_ARRAY());
SELECT CHARSET(JSON_OBJECT()); SELECT CHARSET(JSON_OBJECT());
--echo #
--echo # End of 10.2 tests
--echo #