From 4abb8216a054e14afbeb81e8529e02bab6fa14ac Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sat, 24 Nov 2018 14:13:41 +0100 Subject: MDEV-17658 change the structure of mysql.user table Implement User_table_json. Fix scripts to use mysql.global_priv. Fix tests. --- mysql-test/main/system_mysql_db_fix40123.result | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'mysql-test/main/system_mysql_db_fix40123.result') diff --git a/mysql-test/main/system_mysql_db_fix40123.result b/mysql-test/main/system_mysql_db_fix40123.result index abb6fbb38e1..c4c4d3df706 100644 --- a/mysql-test/main/system_mysql_db_fix40123.result +++ b/mysql-test/main/system_mysql_db_fix40123.result @@ -6,6 +6,7 @@ db event func general_log +global_priv gtid_slave_pos help_category help_keyword @@ -121,6 +122,14 @@ func CREATE TABLE `func` ( `type` enum('function','aggregate') CHARACTER SET utf8 NOT NULL, PRIMARY KEY (`name`) ) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='User defined functions' +show create table global_priv; +Table Create Table +global_priv CREATE TABLE `global_priv` ( + `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '', + `User` char(80) COLLATE utf8_bin NOT NULL DEFAULT '', + `Priv` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL DEFAULT '{}' CHECK (json_valid(`Priv`)), + PRIMARY KEY (`Host`,`User`) +) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='Users and global privileges' show create table tables_priv; Table Create Table tables_priv CREATE TABLE `tables_priv` ( -- cgit v1.2.1