diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-12 14:26:34 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-12 14:26:34 +0200 |
| commit | b32bc70e340b5b0d8fcb9aa48b1b875f3f2f12dc (patch) | |
| tree | 4edd8565c6eb0b1139cbb37c48f4d5f5a28798be /mysql-test/main/func_json.test | |
| parent | f010c90807da68487b1ce4c952588c6c3def2afd (diff) | |
| parent | f72760df3390407c3cbe876e827818bc52849b71 (diff) | |
| download | mariadb-git-b32bc70e340b5b0d8fcb9aa48b1b875f3f2f12dc.tar.gz | |
Merge 10.2 into 10.3
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 fabca504530..bcf0fdfe3fc 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 # |