Skip to content

M
MariaDB
Commit 76589007 authored by Yuchen Pei's avatar Yuchen Pei
Browse files
Options

MDEV-34872 fix json fields charset 

Defaulting to utf8mb4 results in inconsistency as demonstrated in the
added test
parent db5d1cde
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 78 deletions
mysql-test/main/column_compression.result
View file @ 76589007
......@@ -1722,7 +1722,7 @@ d TINYTEXT COMPRESSED BINARY
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` longtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`a`)),
`a` longtext /*M!100301 COMPRESSED*/ DEFAULT NULL CHECK (json_valid(`a`)),
`b` varchar(1000) /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`c` varchar(1000) /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
`d` tinytext /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL
......
mysql-test/main/ctype_binary.result
View file @ 76589007
......@@ -3271,7 +3271,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c` enum('\0a') CHARACTER SET binary DEFAULT NULL,
`d` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`d`))
`d` longtext DEFAULT NULL CHECK (json_valid(`d`))
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
INSERT INTO t1 (c) VALUES (1);
SELECT HEX(c) FROM t1;
......
mysql-test/main/ctype_utf16_uca.result
View file @ 76589007
......@@ -7911,7 +7911,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c` enum('\0a\0a\0a\0a\0a\0a\0a\0a') CHARACTER SET binary DEFAULT NULL,
`d` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`d`))
`d` longtext DEFAULT NULL CHECK (json_valid(`d`))
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
INSERT INTO t1 (c) VALUES (1);
SELECT HEX(c) FROM t1;
......@@ -7923,7 +7923,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c` enum('\0a\0a\0a\0a\0a\0a\0a\0a\0a') CHARACTER SET binary DEFAULT NULL,
`d` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`d`))
`d` longtext DEFAULT NULL CHECK (json_valid(`d`))
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
INSERT INTO t1 (c) VALUES (1);
SELECT HEX(c) FROM t1;
......@@ -7935,7 +7935,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c` enum('\0a\0a\0a\0a\0a\0a\0a\0a\0a\0a') CHARACTER SET binary DEFAULT NULL,
`d` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`d`))
`d` longtext DEFAULT NULL CHECK (json_valid(`d`))
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
INSERT INTO t1 (c) VALUES (1);
SELECT HEX(c) FROM t1;
......
mysql-test/main/ctype_utf32.result
View file @ 76589007
......@@ -3121,7 +3121,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` enum('\0\0\0a','\0\0\0b','\0\0\0a\0\0\0c') CHARACTER SET binary DEFAULT NULL,
`c2` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`c2`)),
`c2` longtext DEFAULT NULL CHECK (json_valid(`c2`)),
`c3` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
INSERT INTO t1 (c1) VALUES (1),(2),(3);
......
mysql-test/main/ctype_utf32_uca.result
View file @ 76589007
......@@ -7973,7 +7973,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` set('\0\0\0a') CHARACTER SET binary DEFAULT NULL,
`c2` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`c2`))
`c2` longtext DEFAULT NULL CHECK (json_valid(`c2`))
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
DROP TABLE t1;
SET NAMES utf8;
......
mysql-test/main/json_charset.result 0 → 100644
View file @ 76589007
CREATE TABLE t ( cs varchar(80), cj JSON ) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci;
select character_set_name from information_schema.columns where table_name = 't' and column_name='cj';
character_set_name
utf8mb3
alter table t CONVERT TO CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci;
select character_set_name from information_schema.columns where table_name = 't' and column_name='cj';
character_set_name
utf8mb3
drop table t;
mysql-test/main/json_charset.test 0 → 100644
View file @ 76589007
CREATE TABLE t ( cs varchar(80), cj JSON ) CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci;
select character_set_name from information_schema.columns where table_name = 't' and column_name='cj';
alter table t CONVERT TO CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci;
select character_set_name from information_schema.columns where table_name = 't' and column_name='cj';
drop table t;
mysql-test/main/json_normalize.result
View file @ 76589007
......@@ -3,7 +3,7 @@ create table t1 (json json);
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`json`))
`json` longtext DEFAULT NULL CHECK (json_valid(`json`))
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
insert into t1 values
('{ }'),
......@@ -20,9 +20,9 @@ json json_normalize(json)
[ "string", { "key" : "val", "a" : "b", "c" : [ 10, 9, 8, "seven", 11 ] }] ["string",{"a":"b","c":[1.0E1,9.0E0,8.0E0,"seven",1.1E1],"key":"val"}]
[ 1.2, 0.0, "text", 0, null, true, false ] [1.2E0,0.0E0,"text",0.0E0,null,true,false]
{ } {}
{ "ăț€": "val1", "âț€":"val2" } {"âț€":"val2","ăț€":"val1"}
{ "foo" : "bar" } {"foo":"bar"}
{ "foo" : "bar", "baz" : "whatever" } {"baz":"whatever","foo":"bar"}
{ "ăț€": "val1", "âț€":"val2" } {"âț€":"val2","ăț€":"val1"}
create view v1 as (select json, json_normalize(json) norm_json from t1);
show create view v1;
View Create View character_set_client collation_connection
......@@ -34,9 +34,9 @@ json norm_json
[ "string", { "key" : "val", "a" : "b", "c" : [ 10, 9, 8, "seven", 11 ] }] ["string",{"a":"b","c":[1.0E1,9.0E0,8.0E0,"seven",1.1E1],"key":"val"}]
[ 1.2, 0.0, "text", 0, null, true, false ] [1.2E0,0.0E0,"text",0.0E0,null,true,false]
{ } {}
{ "ăț€": "val1", "âț€":"val2" } {"âț€":"val2","ăț€":"val1"}
{ "foo" : "bar" } {"foo":"bar"}
{ "foo" : "bar", "baz" : "whatever" } {"baz":"whatever","foo":"bar"}
{ "ăț€": "val1", "âț€":"val2" } {"âț€":"val2","ăț€":"val1"}
select json_normalize(NULL);
json_normalize(NULL)
NULL
......
mysql-test/main/mysql-metadata.result
View file @ 76589007
......@@ -23,7 +23,7 @@ Collation: latin1_swedish_ci (8)
Length: 4294967295
Max_length: 0
Decimals: 0
Flags: BLOB BINARY
Flags: BLOB
Field 2: `js1`
Org_field: `js1`
......@@ -83,7 +83,7 @@ Collation: latin1_swedish_ci (8)
Length: 4294967295
Max_length: 0
Decimals: 0
Flags: BINARY
Flags:
0 rows in set (TIME)
......
mysql-test/main/mysql_json_table_recreate.result
View file @ 76589007
......@@ -183,7 +183,7 @@ create table t1(j json);
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`j` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`j`))
`j` longtext DEFAULT NULL CHECK (json_valid(`j`))
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
drop table t1;
create table t1(j mysql_json);
......
mysql-test/main/system_mysql_db.result
View file @ 76589007
......@@ -78,7 +78,7 @@ Table Create Table
global_priv CREATE TABLE `global_priv` (
`Host` char(255) NOT NULL DEFAULT '',
`User` char(128) NOT NULL DEFAULT '',
`Priv` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '{}' CHECK (json_valid(`Priv`)),
`Priv` longtext NOT NULL DEFAULT '{}' CHECK (json_valid(`Priv`)),
PRIMARY KEY (`Host`,`User`)
) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Users and global privileges'
show create table tables_priv;
......
mysql-test/main/system_mysql_db_fix40123.result
View file @ 76589007
......@@ -116,7 +116,7 @@ Table Create Table
global_priv CREATE TABLE `global_priv` (
`Host` char(255) NOT NULL DEFAULT '',
`User` char(128) NOT NULL DEFAULT '',
`Priv` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '{}' CHECK (json_valid(`Priv`)),
`Priv` longtext NOT NULL DEFAULT '{}' CHECK (json_valid(`Priv`)),
PRIMARY KEY (`Host`,`User`)
) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Users and global privileges'
show create table tables_priv;
......
mysql-test/main/system_mysql_db_fix50030.result
View file @ 76589007
......@@ -120,7 +120,7 @@ Table Create Table
global_priv CREATE TABLE `global_priv` (
`Host` char(255) NOT NULL DEFAULT '',
`User` char(128) NOT NULL DEFAULT '',
`Priv` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '{}' CHECK (json_valid(`Priv`)),
`Priv` longtext NOT NULL DEFAULT '{}' CHECK (json_valid(`Priv`)),
PRIMARY KEY (`Host`,`User`)
) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Users and global privileges'
show create table tables_priv;
......
mysql-test/main/system_mysql_db_fix50117.result
View file @ 76589007
......@@ -100,7 +100,7 @@ Table Create Table
global_priv CREATE TABLE `global_priv` (
`Host` char(255) NOT NULL DEFAULT '',
`User` char(128) NOT NULL DEFAULT '',
`Priv` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '{}' CHECK (json_valid(`Priv`)),
`Priv` longtext NOT NULL DEFAULT '{}' CHECK (json_valid(`Priv`)),
PRIMARY KEY (`Host`,`User`)
) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Users and global privileges'
show create table tables_priv;
......
mysql-test/main/system_mysql_db_fix50568.result
View file @ 76589007
......@@ -121,7 +121,7 @@ Table Create Table
global_priv CREATE TABLE `global_priv` (
`Host` char(255) NOT NULL DEFAULT '',
`User` char(128) NOT NULL DEFAULT '',
`Priv` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '{}' CHECK (json_valid(`Priv`)),
`Priv` longtext NOT NULL DEFAULT '{}' CHECK (json_valid(`Priv`)),
PRIMARY KEY (`Host`,`User`)
) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Users and global privileges'
show create table tables_priv;
......
mysql-test/main/type_json.result
View file @ 76589007
......@@ -2,7 +2,7 @@ create or replace table t1(a json);
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`a`))
`a` longtext DEFAULT NULL CHECK (json_valid(`a`))
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
create or replace table t1(a json character set utf8);
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'character set utf8)' at line 1
......@@ -10,13 +10,13 @@ create or replace table t1(a json default '{a:1}');
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT '{a:1}' CHECK (json_valid(`a`))
`a` longtext DEFAULT '{a:1}' CHECK (json_valid(`a`))
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
create or replace table t1(a json not null check (json_valid(a)));
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL CHECK (json_valid(`a`))
`a` longtext NOT NULL CHECK (json_valid(`a`))
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
insert t1 values ('[]');
insert t1 values ('a');
......@@ -25,7 +25,7 @@ create or replace table t1(a json not null);
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL CHECK (json_valid(`a`))
`a` longtext NOT NULL CHECK (json_valid(`a`))
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
insert t1 values ('[]');
insert t1 values ('a');
......@@ -35,7 +35,7 @@ create or replace table t1(a json default(json_object('now', now())));
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT json_object('now',current_timestamp()) CHECK (json_valid(`a`))
`a` longtext DEFAULT json_object('now',current_timestamp()) CHECK (json_valid(`a`))
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
insert t1 values ();
select * from t1;
......@@ -51,25 +51,25 @@ t
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`t` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`t`))
`t` longtext DEFAULT NULL CHECK (json_valid(`t`))
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
show create table t2;
Table Create Table
t2 CREATE TABLE `t2` (
`a` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`a`)),
`a` longtext DEFAULT NULL CHECK (json_valid(`a`)),
`t` varchar(38) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
show create table t3;
Table Create Table
t3 CREATE TABLE `t3` (
`t` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid(`t`))
`t` longtext DEFAULT NULL CHECK (json_valid(`t`))
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
drop table t1,t2,t3;
create table t1 (t json check (length(t) > 0));
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`t` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (octet_length(`t`) > 0)
`t` longtext DEFAULT NULL CHECK (octet_length(`t`) > 0)
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
drop table t1;
create table t1 (t text) engine=myisam;
......@@ -91,7 +91,7 @@ a
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT json_object('now',1) CHECK (json_valid(`a`))
`a` longtext DEFAULT json_object('now',1) CHECK (json_valid(`a`))
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
drop table t1;
select cast('{a:1}' as text);
......@@ -113,15 +113,15 @@ js3 TEXT CHECK (LENGTH(js2) > 0 OR JSON_VALID(js2))
) CHARACTER SET utf8;
SELECT * FROM t1;
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
def test t1 t1 js0 js0 252 (format=json) 4294967295 0 Y 144 0 192
def test t1 t1 js0 js0 252 (format=json) 4294967295 0 Y 16 0 192
def test t1 t1 js1 js1 252 (format=json) 196605 0 Y 16 0 192
def test t1 t1 js2 js2 252 (format=json) 196605 0 Y 16 0 192
def test t1 t1 js3 js3 252 196605 0 Y 16 0 192
js0 js1 js2 js3
SELECT js0, JSON_COMPACT(js0), JSON_COMPACT('{}') FROM t1;
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
def test t1 t1 js0 js0 252 (format=json) 4294967295 0 Y 144 0 192
def JSON_COMPACT(js0) 251 (format=json) 4294967295 0 Y 128 0 192
def test t1 t1 js0 js0 252 (format=json) 4294967295 0 Y 16 0 192
def JSON_COMPACT(js0) 251 (format=json) 4294967295 0 Y 0 0 192
def JSON_COMPACT('{}') 253 (format=json) 6 0 Y 0 0 192
js0 JSON_COMPACT(js0) JSON_COMPACT('{}')
DROP TABLE t1;
......@@ -132,21 +132,21 @@ CREATE TABLE t1 (a JSON);
INSERT INTO t1 VALUES ('{"a":"b"}');
SELECT a, JSON_COMPACT(a), COALESCE(a) FROM t1;
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
def test t1 t1 a a 252 (format=json) 4294967295 9 Y 144 0 192
def JSON_COMPACT(a) 251 (format=json) 4294967295 9 Y 128 0 192
def COALESCE(a) 251 (format=json) 4294967295 9 Y 128 39 192
def test t1 t1 a a 252 (format=json) 4294967295 9 Y 16 0 192
def JSON_COMPACT(a) 251 (format=json) 4294967295 9 Y 0 0 192
def COALESCE(a) 251 (format=json) 4294967295 9 Y 0 39 192
a JSON_COMPACT(a) COALESCE(a)
{"a":"b"} {"a":"b"} {"a":"b"}
SELECT JSON_ARRAYAGG(1), JSON_ARRAYAGG(a) FROM t1;
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
def JSON_ARRAYAGG(1) 252 (format=json) 9437184 3 Y 0 0 192
def JSON_ARRAYAGG(a) 252 (format=json) 12582912 11 Y 128 0 192
def JSON_ARRAYAGG(a) 252 (format=json) 12582912 11 Y 0 0 192
JSON_ARRAYAGG(1) JSON_ARRAYAGG(a)
[1] [{"a":"b"}]
SELECT JSON_OBJECTAGG('a','b'), JSON_OBJECTAGG('a',a) FROM t1;
Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr
def JSON_OBJECTAGG('a','b') 252 (format=json) 9437184 9 Y 0 0 192
def JSON_OBJECTAGG('a',a) 252 (format=json) 12582912 15 Y 128 0 192
def JSON_OBJECTAGG('a',a) 252 (format=json) 12582912 15 Y 0 0 192
JSON_OBJECTAGG('a','b') JSON_OBJECTAGG('a',a)
{"a":"b"} {"a":{"a":"b"}}
DROP TABLE t1;
......
mysql-test/suite/compat/oracle/r/column_compression.result
View file @ 76589007
......@@ -25,7 +25,7 @@ d TINYTEXT COMPRESSED BINARY
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE "t1" (
"a" longtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL CHECK (json_valid("a")),
"a" longtext /*M!100301 COMPRESSED*/ DEFAULT NULL CHECK (json_valid("a")),
"b" varchar(1000) /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL,
"c" varchar(1000) /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
"d" tinytext /*M!100301 COMPRESSED*/ CHARACTER SET latin1 COLLATE latin1_bin DEFAULT NULL
......
mysql-test/suite/plugins/r/feedback_plugin_load.result
View file @ 76589007
......@@ -30,7 +30,6 @@ VARIABLE_VALUE>0 VARIABLE_NAME
1 Collation used utf8mb3_bin
1 Collation used utf8mb3_general_ci
1 Collation used utf8mb3_uca1400_ai_ci
1 Collation used utf8mb4_bin
1 Collation used utf8mb4_general_ci
1 Collation used utf8mb4_uca1400_ai_ci
prepare stmt from "SELECT VARIABLE_VALUE>0, VARIABLE_NAME FROM INFORMATION_SCHEMA.FEEDBACK WHERE VARIABLE_NAME LIKE 'Collation used %' ORDER BY VARIABLE_NAME";
......@@ -47,7 +46,6 @@ VARIABLE_VALUE>0 VARIABLE_NAME
1 Collation used utf8mb3_bin
1 Collation used utf8mb3_general_ci
1 Collation used utf8mb3_uca1400_ai_ci
1 Collation used utf8mb4_bin
1 Collation used utf8mb4_general_ci
1 Collation used utf8mb4_uca1400_ai_ci
execute stmt;
......@@ -63,7 +61,6 @@ VARIABLE_VALUE>0 VARIABLE_NAME
1 Collation used utf8mb3_bin
1 Collation used utf8mb3_general_ci
1 Collation used utf8mb3_uca1400_ai_ci
1 Collation used utf8mb4_bin
1 Collation used utf8mb4_general_ci
1 Collation used utf8mb4_uca1400_ai_ci
deallocate prepare stmt;
mysql-test/suite/plugins/r/feedback_plugin_send.result
View file @ 76589007
......@@ -30,7 +30,6 @@ VARIABLE_VALUE>0 VARIABLE_NAME
1 Collation used utf8mb3_bin
1 Collation used utf8mb3_general_ci
1 Collation used utf8mb3_uca1400_ai_ci
1 Collation used utf8mb4_bin
1 Collation used utf8mb4_general_ci
1 Collation used utf8mb4_uca1400_ai_ci
prepare stmt from "SELECT VARIABLE_VALUE>0, VARIABLE_NAME FROM INFORMATION_SCHEMA.FEEDBACK WHERE VARIABLE_NAME LIKE 'Collation used %' ORDER BY VARIABLE_NAME";
......@@ -47,7 +46,6 @@ VARIABLE_VALUE>0 VARIABLE_NAME
1 Collation used utf8mb3_bin
1 Collation used utf8mb3_general_ci
1 Collation used utf8mb3_uca1400_ai_ci
1 Collation used utf8mb4_bin
1 Collation used utf8mb4_general_ci
1 Collation used utf8mb4_uca1400_ai_ci
execute stmt;
......@@ -63,7 +61,6 @@ VARIABLE_VALUE>0 VARIABLE_NAME
1 Collation used utf8mb3_bin
1 Collation used utf8mb3_general_ci
1 Collation used utf8mb3_uca1400_ai_ci
1 Collation used utf8mb4_bin
1 Collation used utf8mb4_general_ci
1 Collation used utf8mb4_uca1400_ai_ci
deallocate prepare stmt;
......
sql/sql_yacc.yy
View file @ 76589007
......@@ -6443,7 +6443,7 @@ field_type_lob:
{ $$.set(&type_handler_medium_blob, $2); }
| JSON_SYM opt_compressed
{
$$.set(&type_handler_long_blob_json, &my_charset_utf8mb4_bin);
$$.set(&type_handler_long_blob_json);
}
;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7