diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-12 16:14:31 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-12 16:14:31 +0200 |
| commit | e4505279388e3c1e84937b6737bf5619a15a7d4c (patch) | |
| tree | f83ddf88057c0310d58596a499b9b3b1b76bed1b /mysql-test/main/func_json.test | |
| parent | 6d68a3464e9a93baecc277a2c270cad28fbf50bd (diff) | |
| parent | 69b33fca8cce0912b7fecc79cbef895a119f3017 (diff) | |
| download | mariadb-git-e4505279388e3c1e84937b6737bf5619a15a7d4c.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/main/func_json.test')
| -rw-r--r-- | mysql-test/main/func_json.test | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/main/func_json.test b/mysql-test/main/func_json.test index 09ae35ad653..ea0be8fd757 100644 --- a/mysql-test/main/func_json.test +++ b/mysql-test/main/func_json.test @@ -485,6 +485,13 @@ SET sql_mode=default; select JSON_VALID( '{"a":1]' ); --echo # +--echo # MDEV-18886 JSON_ARRAY() does not recognise JSON argument. +--echo # +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 # |