Skip to content

MDEV-38740 Implement JSON as a pluggable data type #5263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hadeer-r wants to merge 1 commit into
base: main
Choose a base branch
from
Open

MDEV-38740 Implement JSON as a pluggable data type #5263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mysql-test/main/check_constraint.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ path VARCHAR(100) NOT NULL,
json_c1 JSON NOT NULL DEFAULT '{}',
CONSTRAINT json_c1 CHECK (path > 0)
);
ERROR HY000: Duplicate CHECK constraint name 'json_c1'
DROP TABLE t2;
CREATE TABLE t3 (a INT, CONSTRAINT c1 CHECK (a > 0),
CONSTRAINT c1 CHECK (a < 100));
ERROR HY000: Duplicate CHECK constraint name 'c1'
Expand Down
3 changes: 2 additions & 1 deletion mysql-test/main/check_constraint.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,12 +350,13 @@ drop table t1;
--error ER_DUP_CONSTRAINT_NAME
CREATE TABLE t1 (a INT CHECK (a>2), CONSTRAINT a CHECK (a < 5));

--error ER_DUP_CONSTRAINT_NAME
# MDEV-38740: JSON is a native type now, so it no longer generates a conflicting implicit CHECK constraint
CREATE TABLE t2 (
path VARCHAR(100) NOT NULL,
json_c1 JSON NOT NULL DEFAULT '{}',
CONSTRAINT json_c1 CHECK (path > 0)
);
DROP TABLE t2;

--error ER_DUP_CONSTRAINT_NAME
CREATE TABLE t3 (a INT, CONSTRAINT c1 CHECK (a > 0),
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/main/column_compression.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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` json DEFAULT NULL,
`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
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/main/ctype_binary.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3244,7 +3244,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` json DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
INSERT INTO t1 (c) VALUES (1);
SELECT HEX(c) FROM t1;
Expand Down
6 changes: 3 additions & 3 deletions mysql-test/main/ctype_utf16_uca.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7908,7 +7908,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` json DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
INSERT INTO t1 (c) VALUES (1);
SELECT HEX(c) FROM t1;
Expand All @@ -7920,7 +7920,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` json DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
INSERT INTO t1 (c) VALUES (1);
SELECT HEX(c) FROM t1;
Expand All @@ -7932,7 +7932,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` json DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
INSERT INTO t1 (c) VALUES (1);
SELECT HEX(c) FROM t1;
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/main/ctype_utf32.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3120,7 +3120,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` json DEFAULT NULL,
`c3` int(11) DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
INSERT INTO t1 (c1) VALUES (1),(2),(3);
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/main/ctype_utf32_uca.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7970,7 +7970,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` json DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
DROP TABLE t1;
SET NAMES utf8;
Expand Down
4 changes: 2 additions & 2 deletions mysql-test/main/func_json.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3921,7 +3921,7 @@ ERROR 23000: CONSTRAINT `obj_table.val_obj` failed for `test`.`obj_table`
INSERT INTO obj_table VALUES('{"number1":3, "string1":"abcd"}');
ERROR 23000: CONSTRAINT `obj_table.val_obj` failed for `test`.`obj_table`
INSERT INTO obj_table VALUES('{"number1":3, "string1":"abcd", "object1":{"key1":"val1", "key2":[1,2,3, "string1"]}');
ERROR 23000: CONSTRAINT `obj_table.val_obj` failed for `test`.`obj_table`
ERROR 22007: Incorrect json value: '{"number1":3, "string1":"abcd", "object1":{"key1":"val1", "key2":[1,2,3, "string1"]}' for column `test`.`obj_table`.`val_obj` at row 1
SELECT * FROM obj_table;
val_obj
{"number1":4, "string1":"abcd", "object1":{"key1":"val1", "key2":[1,2,3, "string1"], "key3":4}}
Expand Down Expand Up @@ -6003,7 +6003,7 @@ INSERT INTO test_check_json VALUES
('[1, 2, 3]', '[1, 2]', '{"key": "value"}', '{"key": "value"}'),
('{"key": "value"}', '[1, 2]', '{"key": "value"}', '{"key": "value", "key2": "value2"}');
INSERT INTO test_check_json VALUES ('[1, 2, 3]', '{1, 2}', '{"key": "value"}', 'invalid');
ERROR 23000: CONSTRAINT `test_check_json.j_array` failed for `test`.`test_check_json`
ERROR 22007: Incorrect json value: '{1, 2}' for column `test`.`test_check_json`.`j_array` at row 1
INSERT INTO test_check_json VALUES ('[1, 2, 3]', '[1, 2]', '{"key": "value"}', '{"key": "value", "key": "value2"}');
ERROR 23000: CONSTRAINT `test_check_json.j_object_with_unique_keys` failed for `test`.`test_check_json`
DROP TABLE test_check_json;
Expand Down
4 changes: 2 additions & 2 deletions mysql-test/main/func_json.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2878,7 +2878,7 @@ INSERT INTO obj_table VALUES('{"number1":4, "string1":"abcd", "object1":{"key1":
INSERT INTO obj_table VALUES('{"number1":3, "string1":"abcd", "object1":{"key1":"val1", "key2":[1,2,3, "string1"], "key3":4}}');
--error ER_CONSTRAINT_FAILED
INSERT INTO obj_table VALUES('{"number1":3, "string1":"abcd"}');
--error ER_CONSTRAINT_FAILED
--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD
INSERT INTO obj_table VALUES('{"number1":3, "string1":"abcd", "object1":{"key1":"val1", "key2":[1,2,3, "string1"]}');
SELECT * FROM obj_table;

Expand Down Expand Up @@ -4622,7 +4622,7 @@ INSERT INTO test_check_json VALUES
('[1, 2, 3]', '[1, 2]', '{"key": "value"}', '{"key": "value"}'),
('{"key": "value"}', '[1, 2]', '{"key": "value"}', '{"key": "value", "key2": "value2"}');

--error ER_CONSTRAINT_FAILED
--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD
INSERT INTO test_check_json VALUES ('[1, 2, 3]', '{1, 2}', '{"key": "value"}', 'invalid');
--error ER_CONSTRAINT_FAILED
INSERT INTO test_check_json VALUES ('[1, 2, 3]', '[1, 2]', '{"key": "value"}', '{"key": "value", "key": "value2"}');
Expand Down
2 changes: 0 additions & 2 deletions mysql-test/main/information_schema.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -916,14 +916,12 @@ information_schema SYSTEM_VARIABLES ENUM_VALUE_LIST
information_schema TRIGGERS ACTION_CONDITION
information_schema TRIGGERS ACTION_STATEMENT
information_schema VIEWS VIEW_DEFINITION
mysql global_priv Priv
sys innodb_lock_waits waiting_query
sys innodb_lock_waits blocking_query
sys processlist current_statement
sys processlist last_statement
sys schema_auto_increment_columns column_type
sys schema_table_lock_waits waiting_query
mysql servers Options
sys session current_statement
sys session last_statement
sys statement_analysis query
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/main/json_normalize.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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` json DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
insert into t1 values
('{ }'),
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/main/mysql-metadata.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Catalog: `def`
Database: `test`
Table: `t1`
Org_table: `t1`
Type: BLOB (format=json)
Type: LONG_BLOB (type=json)
Collation: latin1_swedish_ci (8)
Length: 4294967295
Max_length: 0
Expand Down
14 changes: 2 additions & 12 deletions mysql-test/main/mysql_json_table_recreate.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,25 +192,15 @@ 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` json DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_uca1400_ai_ci
drop table t1;
create table t1(j mysql_json);
ERROR HY000: 'MYSQL_JSON' is not allowed in this context
create table `testjson` (
`t` json /* JSON from MySQL 5.7*/ CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci;
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 utf8mb4 COLLATE utf8mb4_bin NOT NULL
) ENGINE=InnoDB DEFAULT CH...' at line 2
create table `testjson` (
`t` json /* JSON from MySQL 5.7*/ COLLATE utf8mb4_bin NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci;
show create table testjson;
Table Create Table
testjson CREATE TABLE `testjson` (
`t` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL CHECK (json_valid(`t`))
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
drop table testjson;
ERROR HY000: Data type 'json' doesn't support CHARACTER SET attribute.
create table `testjson` (
`t` longtext /* JSON from MySQL 5.7 */ CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci;
Expand Down
13 changes: 4 additions & 9 deletions mysql-test/main/mysql_json_table_recreate.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,19 +109,14 @@ show create table t1;
drop table t1;
--error ER_NOT_ALLOWED_IN_THIS_CONTEXT
create table t1(j mysql_json);
# `json` type should not have character set and collation other than utf8mb4_bin
--error ER_PARSE_ERROR
create table `testjson` (
`t` json /* JSON from MySQL 5.7*/ CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci;

# By removing character set from `json` field query should work and
# expand to `longtext` with characterset
# Even if only collation is provided without character set, the native `json`
# type should reject it as it does not support character set/collation attributes
--error ER_UNSUPPORTED_DATA_TYPE_ATTRIBUTE
create table `testjson` (
`t` json /* JSON from MySQL 5.7*/ COLLATE utf8mb4_bin NOT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci;
show create table testjson;
drop table testjson;


# `longtext` that is alias can have character set
create table `testjson` (
Expand Down
4 changes: 2 additions & 2 deletions mysql-test/main/system_mysql_db.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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` json 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;
Expand Down Expand Up @@ -133,7 +133,7 @@ servers CREATE TABLE `servers` (
`Socket` char(108) NOT NULL DEFAULT '',
`Wrapper` char(64) NOT NULL DEFAULT '',
`Owner` varchar(512) NOT NULL DEFAULT '',
`Options` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '{}' CHECK (json_valid(`Options`)),
`Options` json NOT NULL DEFAULT '{}' CHECK (json_valid(`Options`)),
PRIMARY KEY (`Server_name`)
) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='MySQL Foreign Servers table'
show create table proc;
Expand Down
4 changes: 2 additions & 2 deletions mysql-test/main/system_mysql_db_fix40123.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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` json 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;
Expand Down Expand Up @@ -171,7 +171,7 @@ servers CREATE TABLE `servers` (
`Socket` char(108) NOT NULL DEFAULT '',
`Wrapper` char(64) NOT NULL DEFAULT '',
`Owner` varchar(512) NOT NULL DEFAULT '',
`Options` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '{}' CHECK (json_valid(`Options`)),
`Options` json NOT NULL DEFAULT '{}' CHECK (json_valid(`Options`)),
PRIMARY KEY (`Server_name`)
) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='MySQL Foreign Servers table'
show create table proc;
Expand Down
4 changes: 2 additions & 2 deletions mysql-test/main/system_mysql_db_fix50030.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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` json 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;
Expand Down Expand Up @@ -175,7 +175,7 @@ servers CREATE TABLE `servers` (
`Socket` char(108) NOT NULL DEFAULT '',
`Wrapper` char(64) NOT NULL DEFAULT '',
`Owner` varchar(512) NOT NULL DEFAULT '',
`Options` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '{}' CHECK (json_valid(`Options`)),
`Options` json NOT NULL DEFAULT '{}' CHECK (json_valid(`Options`)),
PRIMARY KEY (`Server_name`)
) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='MySQL Foreign Servers table'
show create table proc;
Expand Down
4 changes: 2 additions & 2 deletions mysql-test/main/system_mysql_db_fix50117.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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` json 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;
Expand Down Expand Up @@ -155,7 +155,7 @@ servers CREATE TABLE `servers` (
`Socket` char(108) NOT NULL DEFAULT '',
`Wrapper` char(64) NOT NULL DEFAULT '',
`Owner` varchar(512) NOT NULL DEFAULT '',
`Options` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '{}' CHECK (json_valid(`Options`)),
`Options` json NOT NULL DEFAULT '{}' CHECK (json_valid(`Options`)),
PRIMARY KEY (`Server_name`)
) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='MySQL Foreign Servers table'
show create table proc;
Expand Down
4 changes: 2 additions & 2 deletions mysql-test/main/system_mysql_db_fix50568.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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` json 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;
Expand Down Expand Up @@ -176,7 +176,7 @@ servers CREATE TABLE `servers` (
`Socket` char(108) NOT NULL DEFAULT '',
`Wrapper` char(64) NOT NULL DEFAULT '',
`Owner` varchar(512) NOT NULL DEFAULT '',
`Options` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '{}' CHECK (json_valid(`Options`)),
`Options` json NOT NULL DEFAULT '{}' CHECK (json_valid(`Options`)),
PRIMARY KEY (`Server_name`)
) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='MySQL Foreign Servers table'
show create table proc;
Expand Down
Loading