diff options
Diffstat (limited to 'mysql-test/main/func_json.result')
| -rw-r--r-- | mysql-test/main/func_json.result | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/main/func_json.result b/mysql-test/main/func_json.result index 8fc867c0bc8..0c87ede0f31 100644 --- a/mysql-test/main/func_json.result +++ b/mysql-test/main/func_json.result @@ -273,7 +273,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `f` varchar(32) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci select * from t1; f {"id": 87, "name": "carrot"} @@ -298,7 +298,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `json_quote('foo')` varchar(38) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table t1; select json_merge('string'); ERROR 42000: Incorrect parameter count in the call to native function 'json_merge' @@ -466,7 +466,7 @@ show create table json; Table Create Table json CREATE TABLE `json` ( `j` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci drop table json; select json_length( '[ 1, [ 2, 3, 4 ], 5 ]', '$[2]' ); json_length( '[ 1, [ 2, 3, 4 ], 5 ]', '$[2]' ) @@ -760,7 +760,7 @@ Table Create Table t1 CREATE TABLE `t1` ( `c1` varchar(38) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL, `c2` varchar(38) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1; # # MDEV-16054 simple json functions flatline cpu on garbage input. @@ -823,7 +823,7 @@ SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( `JSON_ARRAY_INSERT(fld, '$.[0]', '0')` varchar(25) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci DROP TABLE t1, t2; SET sql_mode=default; # |