diff options
Diffstat (limited to 'mysql-test/main/mysqldump-system.result')
| -rw-r--r-- | mysql-test/main/mysqldump-system.result | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/mysql-test/main/mysqldump-system.result b/mysql-test/main/mysqldump-system.result index 559f6f29f44..42cbe7b2f01 100644 --- a/mysql-test/main/mysqldump-system.result +++ b/mysql-test/main/mysqldump-system.result @@ -55,8 +55,8 @@ CREATE FUNCTION metaphon RETURNS STRING SONAME "UDF_EXAMPLE_LIB"; INSTALL PLUGIN test_plugin_server SONAME 'AUTH_TEST_PLUGIN_LIB'; INSTALL PLUGIN cleartext_plugin_server SONAME 'AUTH_TEST_PLUGIN_LIB'; CREATE USER `mariadb.sys`@`localhost` PASSWORD EXPIRE; -CREATE USER `root`@`localhost`; CREATE USER `foobar`@`%` IDENTIFIED VIA test_plugin_server USING 'plug_dest'; +CREATE USER `root`@`localhost`; SELECT COALESCE(CURRENT_ROLE(),'NONE') into @current_role; CREATE ROLE IF NOT EXISTS mariadb_dump_import_role; GRANT mariadb_dump_import_role TO CURRENT_USER(); @@ -71,16 +71,16 @@ GRANT USAGE ON *.* TO `mariadb.sys`@`localhost`; GRANT SELECT, DELETE ON `mysql`.`global_priv` TO `mariadb.sys`@`localhost`; /*M!100005 SET DEFAULT ROLE NONE FOR 'mariadb.sys'@'localhost' */; /*!80001 ALTER USER 'mariadb.sys'@'localhost' DEFAULT ROLE NONE */; -GRANT `role_1` TO `root`@`localhost` WITH ADMIN OPTION; -GRANT ALL PRIVILEGES ON *.* TO `root`@`localhost` WITH GRANT OPTION; -GRANT PROXY ON ''@'%' TO 'root'@'localhost' WITH GRANT OPTION; -/*M!100005 SET DEFAULT ROLE NONE FOR 'root'@'localhost' */; -/*!80001 ALTER USER 'root'@'localhost' DEFAULT ROLE NONE */; GRANT `role_1` TO `foobar`@`%`; GRANT `role_2` TO `foobar`@`%`; GRANT USAGE ON *.* TO `foobar`@`%` IDENTIFIED VIA test_plugin_server USING 'plug_dest'; /*M!100005 SET DEFAULT ROLE 'role_2' FOR 'foobar'@'%' */; /*!80001 ALTER USER 'foobar'@'%' DEFAULT ROLE 'role_2' */; +GRANT `role_1` TO `root`@`localhost` WITH ADMIN OPTION; +GRANT ALL PRIVILEGES ON *.* TO `root`@`localhost` WITH GRANT OPTION; +GRANT PROXY ON ''@'%' TO 'root'@'localhost' WITH GRANT OPTION; +/*M!100005 SET DEFAULT ROLE NONE FOR 'root'@'localhost' */; +/*!80001 ALTER USER 'root'@'localhost' DEFAULT ROLE NONE */; GRANT `role_2` TO `role_1` WITH ADMIN OPTION; GRANT SHOW DATABASES ON *.* TO `role_1`; GRANT USAGE ON *.* TO `role_2`; @@ -655,19 +655,19 @@ DELIMITER ; /*!50701 DROP USER IF EXISTS 'mariadb.sys'@'localhost' */; CREATE /*M!100103 OR REPLACE */ USER `mariadb.sys`@`localhost` PASSWORD EXPIRE; DELIMITER | -/*M!100101 IF current_user()="'root'@'localhost'" THEN - SIGNAL SQLSTATE '45000' SET MYSQL_ERRNO=30001, MESSAGE_TEXT="Don't remove current user 'root'@'localhost''"; -END IF */| -DELIMITER ; -/*!50701 DROP USER IF EXISTS 'root'@'localhost' */; -CREATE /*M!100103 OR REPLACE */ USER `root`@`localhost`; -DELIMITER | /*M!100101 IF current_user()="'foobar'@'%'" THEN SIGNAL SQLSTATE '45000' SET MYSQL_ERRNO=30001, MESSAGE_TEXT="Don't remove current user 'foobar'@'%''"; END IF */| DELIMITER ; /*!50701 DROP USER IF EXISTS 'foobar'@'%' */; CREATE /*M!100103 OR REPLACE */ USER `foobar`@`%` IDENTIFIED VIA test_plugin_server USING 'plug_dest'; +DELIMITER | +/*M!100101 IF current_user()="'root'@'localhost'" THEN + SIGNAL SQLSTATE '45000' SET MYSQL_ERRNO=30001, MESSAGE_TEXT="Don't remove current user 'root'@'localhost''"; +END IF */| +DELIMITER ; +/*!50701 DROP USER IF EXISTS 'root'@'localhost' */; +CREATE /*M!100103 OR REPLACE */ USER `root`@`localhost`; SELECT COALESCE(CURRENT_ROLE(),'NONE') into @current_role; CREATE ROLE IF NOT EXISTS mariadb_dump_import_role; GRANT mariadb_dump_import_role TO CURRENT_USER(); @@ -684,16 +684,16 @@ GRANT USAGE ON *.* TO `mariadb.sys`@`localhost`; GRANT SELECT, DELETE ON `mysql`.`global_priv` TO `mariadb.sys`@`localhost`; /*M!100005 SET DEFAULT ROLE NONE FOR 'mariadb.sys'@'localhost' */; /*!80001 ALTER USER 'mariadb.sys'@'localhost' DEFAULT ROLE NONE */; -GRANT `role_1` TO `root`@`localhost` WITH ADMIN OPTION; -GRANT ALL PRIVILEGES ON *.* TO `root`@`localhost` WITH GRANT OPTION; -GRANT PROXY ON ''@'%' TO 'root'@'localhost' WITH GRANT OPTION; -/*M!100005 SET DEFAULT ROLE NONE FOR 'root'@'localhost' */; -/*!80001 ALTER USER 'root'@'localhost' DEFAULT ROLE NONE */; GRANT `role_1` TO `foobar`@`%`; GRANT `role_2` TO `foobar`@`%`; GRANT USAGE ON *.* TO `foobar`@`%` IDENTIFIED VIA test_plugin_server USING 'plug_dest'; /*M!100005 SET DEFAULT ROLE 'role_2' FOR 'foobar'@'%' */; /*!80001 ALTER USER 'foobar'@'%' DEFAULT ROLE 'role_2' */; +GRANT `role_1` TO `root`@`localhost` WITH ADMIN OPTION; +GRANT ALL PRIVILEGES ON *.* TO `root`@`localhost` WITH GRANT OPTION; +GRANT PROXY ON ''@'%' TO 'root'@'localhost' WITH GRANT OPTION; +/*M!100005 SET DEFAULT ROLE NONE FOR 'root'@'localhost' */; +/*!80001 ALTER USER 'root'@'localhost' DEFAULT ROLE NONE */; GRANT `role_2` TO `role_1` WITH ADMIN OPTION; GRANT SHOW DATABASES ON *.* TO `role_1`; GRANT USAGE ON *.* TO `role_2`; @@ -1260,8 +1260,8 @@ UNLOCK TABLES; INSTALL PLUGIN test_plugin_server /*M!100401 IF NOT EXISTS */ SONAME 'AUTH_TEST_PLUGIN_LIB'; INSTALL PLUGIN cleartext_plugin_server /*M!100401 IF NOT EXISTS */ SONAME 'AUTH_TEST_PLUGIN_LIB'; CREATE USER IF NOT EXISTS `mariadb.sys`@`localhost` PASSWORD EXPIRE; -CREATE USER IF NOT EXISTS `root`@`localhost`; CREATE USER IF NOT EXISTS `foobar`@`%` IDENTIFIED VIA test_plugin_server USING 'plug_dest'; +CREATE USER IF NOT EXISTS `root`@`localhost`; SELECT COALESCE(CURRENT_ROLE(),'NONE') into @current_role; CREATE ROLE IF NOT EXISTS mariadb_dump_import_role; GRANT mariadb_dump_import_role TO CURRENT_USER(); @@ -1276,16 +1276,16 @@ GRANT USAGE ON *.* TO `mariadb.sys`@`localhost`; GRANT SELECT, DELETE ON `mysql`.`global_priv` TO `mariadb.sys`@`localhost`; /*M!100005 SET DEFAULT ROLE NONE FOR 'mariadb.sys'@'localhost' */; /*!80001 ALTER USER 'mariadb.sys'@'localhost' DEFAULT ROLE NONE */; -GRANT `role_1` TO `root`@`localhost` WITH ADMIN OPTION; -GRANT ALL PRIVILEGES ON *.* TO `root`@`localhost` WITH GRANT OPTION; -GRANT PROXY ON ''@'%' TO 'root'@'localhost' WITH GRANT OPTION; -/*M!100005 SET DEFAULT ROLE NONE FOR 'root'@'localhost' */; -/*!80001 ALTER USER 'root'@'localhost' DEFAULT ROLE NONE */; GRANT `role_1` TO `foobar`@`%`; GRANT `role_2` TO `foobar`@`%`; GRANT USAGE ON *.* TO `foobar`@`%` IDENTIFIED VIA test_plugin_server USING 'plug_dest'; /*M!100005 SET DEFAULT ROLE 'role_2' FOR 'foobar'@'%' */; /*!80001 ALTER USER 'foobar'@'%' DEFAULT ROLE 'role_2' */; +GRANT `role_1` TO `root`@`localhost` WITH ADMIN OPTION; +GRANT ALL PRIVILEGES ON *.* TO `root`@`localhost` WITH GRANT OPTION; +GRANT PROXY ON ''@'%' TO 'root'@'localhost' WITH GRANT OPTION; +/*M!100005 SET DEFAULT ROLE NONE FOR 'root'@'localhost' */; +/*!80001 ALTER USER 'root'@'localhost' DEFAULT ROLE NONE */; GRANT `role_2` TO `role_1` WITH ADMIN OPTION; GRANT SHOW DATABASES ON *.* TO `role_1`; GRANT USAGE ON *.* TO `role_2`; |