diff options
| author | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-02-15 01:39:37 +0530 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-05-19 06:48:36 +0200 |
| commit | 2fdb556e045e9918410086eeaac5a94a4c028626 (patch) | |
| tree | 1420013b4e76b3192cb8ac33406c818d3ecfc3af /mysql-test/main/plugin_auth.result | |
| parent | c366845a0b5c08285c958cf1500b3b7906ecf8d4 (diff) | |
| download | mariadb-git-2fdb556e045e9918410086eeaac5a94a4c028626.tar.gz | |
MDEV-8334: Rename utf8 to utf8mb3
This patch changes the main name of 3 byte character set from utf8 to
utf8mb3. New old_mode UTF8_IS_UTF8MB3 is added and set TRUE by default,
so that utf8 would mean utf8mb3. If not set, utf8 would mean utf8mb4.
Diffstat (limited to 'mysql-test/main/plugin_auth.result')
| -rw-r--r-- | mysql-test/main/plugin_auth.result | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mysql-test/main/plugin_auth.result b/mysql-test/main/plugin_auth.result index 5c8f55e38ec..3d86d713009 100644 --- a/mysql-test/main/plugin_auth.result +++ b/mysql-test/main/plugin_auth.result @@ -23,16 +23,16 @@ test mysql.proxies_priv; SHOW CREATE TABLE mysql.proxies_priv; Table Create Table proxies_priv CREATE TABLE `proxies_priv` ( - `Host` char(255) COLLATE utf8_bin NOT NULL DEFAULT '', - `User` char(128) COLLATE utf8_bin NOT NULL DEFAULT '', - `Proxied_host` char(255) COLLATE utf8_bin NOT NULL DEFAULT '', - `Proxied_user` char(128) COLLATE utf8_bin NOT NULL DEFAULT '', + `Host` char(255) COLLATE utf8mb3_bin NOT NULL DEFAULT '', + `User` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '', + `Proxied_host` char(255) COLLATE utf8mb3_bin NOT NULL DEFAULT '', + `Proxied_user` char(128) COLLATE utf8mb3_bin NOT NULL DEFAULT '', `With_grant` tinyint(1) NOT NULL DEFAULT 0, - `Grantor` varchar(384) COLLATE utf8_bin NOT NULL DEFAULT '', + `Grantor` varchar(384) COLLATE utf8mb3_bin NOT NULL DEFAULT '', `Timestamp` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), PRIMARY KEY (`Host`,`User`,`Proxied_host`,`Proxied_user`), KEY `Grantor` (`Grantor`) -) ENGINE=Aria DEFAULT CHARSET=utf8 COLLATE=utf8_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='User proxy privileges' +) ENGINE=Aria DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_bin PAGE_CHECKSUM=1 TRANSACTIONAL=1 COMMENT='User proxy privileges' connect plug_con,localhost,plug,plug_dest; select USER(),CURRENT_USER(); USER() CURRENT_USER() |