1--- mysqldump-system.result 2+++ mysqldump-system,win.result 3@@ -7,8 +7,6 @@ 4 delete from mysql.user where host not in ('localhost'); 5 flush privileges; 6 create user USER; 7-install plugin /*M!100401 IF NOT EXISTS */ unix_socket soname 'auth_socket.so';; 8-alter user USER identified via unix_socket; 9 CREATE ROLE role_1; 10 CREATE ROLE role_2 WITH ADMIN role_1; 11 GRANT SHOW DATABASES ON *.* TO role_1; 12@@ -48,9 +46,8 @@ 13 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; 14 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; 15 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; 16-INSTALL PLUGIN unix_socket SONAME 'auth_socket.so'; 17 CREATE USER `root`@`localhost`; 18-CREATE USER `USER`@`%` IDENTIFIED VIA unix_socket; 19+CREATE USER `USER`@`%`; 20 SELECT COALESCE(CURRENT_ROLE(),'NONE') into @current_role; 21 CREATE ROLE IF NOT EXISTS mariadb_dump_import_role; 22 GRANT mariadb_dump_import_role TO CURRENT_USER(); 23@@ -68,7 +65,7 @@ 24 /*!80001 ALTER USER 'root'@'localhost' DEFAULT ROLE NONE */; 25 GRANT `role_1` TO `USER`@`%`; 26 GRANT `role_2` TO `USER`@`%`; 27-GRANT USAGE ON *.* TO `USER`@`%` IDENTIFIED VIA unix_socket; 28+GRANT USAGE ON *.* TO `USER`@`%`; 29 /*M!100005 SET DEFAULT ROLE 'role_2' FOR 'USER'@'%' */; 30 /*!80001 ALTER USER 'USER'@'%' DEFAULT ROLE 'role_2' */; 31 GRANT `role_2` TO `role_1` WITH ADMIN OPTION; 32@@ -168,8 +165,6 @@ 33 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; 34 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; 35 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; 36-/*M!100401 UNINSTALL PLUGIN IF EXIST unix_socket */; 37-INSTALL PLUGIN unix_socket SONAME 'auth_socket.so'; 38 DELIMITER | 39 /*M!100101 IF current_user()="'root'@'localhost'" THEN 40 SIGNAL SQLSTATE '45000' SET MYSQL_ERRNO=30001, MESSAGE_TEXT="Don't remove current user 'root'@'localhost''"; 41@@ -183,7 +178,7 @@ 42 END IF */| 43 DELIMITER ; 44 /*!50701 DROP USER IF EXISTS 'USER'@'%' */; 45-CREATE /*M!100103 OR REPLACE */ USER `USER`@`%` IDENTIFIED VIA unix_socket; 46+CREATE /*M!100103 OR REPLACE */ USER `USER`@`%`; 47 SELECT COALESCE(CURRENT_ROLE(),'NONE') into @current_role; 48 CREATE ROLE IF NOT EXISTS mariadb_dump_import_role; 49 GRANT mariadb_dump_import_role TO CURRENT_USER(); 50@@ -203,7 +198,7 @@ 51 /*!80001 ALTER USER 'root'@'localhost' DEFAULT ROLE NONE */; 52 GRANT `role_1` TO `USER`@`%`; 53 GRANT `role_2` TO `USER`@`%`; 54-GRANT USAGE ON *.* TO `USER`@`%` IDENTIFIED VIA unix_socket; 55+GRANT USAGE ON *.* TO `USER`@`%`; 56 /*M!100005 SET DEFAULT ROLE 'role_2' FOR 'USER'@'%' */; 57 /*!80001 ALTER USER 'USER'@'%' DEFAULT ROLE 'role_2' */; 58 GRANT `role_2` TO `role_1` WITH ADMIN OPTION; 59@@ -304,9 +299,8 @@ 60 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; 61 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; 62 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; 63-INSTALL PLUGIN unix_socket /*M!100401 IF NOT EXISTS */ SONAME 'auth_socket.so'; 64 CREATE USER IF NOT EXISTS `root`@`localhost`; 65-CREATE USER IF NOT EXISTS `USER`@`%` IDENTIFIED VIA unix_socket; 66+CREATE USER IF NOT EXISTS `USER`@`%`; 67 SELECT COALESCE(CURRENT_ROLE(),'NONE') into @current_role; 68 CREATE ROLE IF NOT EXISTS mariadb_dump_import_role; 69 GRANT mariadb_dump_import_role TO CURRENT_USER(); 70@@ -324,7 +318,7 @@ 71 /*!80001 ALTER USER 'root'@'localhost' DEFAULT ROLE NONE */; 72 GRANT `role_1` TO `USER`@`%`; 73 GRANT `role_2` TO `USER`@`%`; 74-GRANT USAGE ON *.* TO `USER`@`%` IDENTIFIED VIA unix_socket; 75+GRANT USAGE ON *.* TO `USER`@`%`; 76 /*M!100005 SET DEFAULT ROLE 'role_2' FOR 'USER'@'%' */; 77 /*!80001 ALTER USER 'USER'@'%' DEFAULT ROLE 'role_2' */; 78 GRANT `role_2` TO `role_1` WITH ADMIN OPTION; 79@@ -413,12 +407,12 @@ 80 CHECKSUM TABLE mysql.user, mysql.roles_mapping, mysql.time_zone_transition, mysql.plugin, 81 mysql.servers, mysql.func, mysql.innodb_table_stats, mysql.table_stats; 82 Table Checksum 83-mysql.user 3159177919 84+mysql.user 3007943331 85 mysql.roles_mapping 3150178430 86 mysql.time_zone_transition 3895294076 87-mysql.plugin 1520695737 88+mysql.plugin 0 89 mysql.servers 2783974349 90-mysql.func 3241572444 91+mysql.func 310494789 92 mysql.innodb_table_stats 347867921 93 mysql.table_stats 664320059 94 # Opps.... 95@@ -442,12 +436,12 @@ 96 CHECKSUM TABLE mysql.user, mysql.roles_mapping, mysql.time_zone_transition, mysql.plugin, 97 mysql.servers, mysql.func, mysql.innodb_table_stats, mysql.table_stats; 98 Table Checksum 99-mysql.user 3159177919 100+mysql.user 3007943331 101 mysql.roles_mapping 3150178430 102 mysql.time_zone_transition 3895294076 103-mysql.plugin 1520695737 104+mysql.plugin 0 105 mysql.servers 2783974349 106-mysql.func 3241572444 107+mysql.func 310494789 108 mysql.innodb_table_stats 347867921 109 mysql.table_stats 664320059 110 DROP FUNCTION IF EXISTS metaphon; 111@@ -461,7 +455,6 @@ 112 DROP ROLE role_2; 113 DROP ROLE role_1; 114 drop user USER; 115-uninstall plugin unix_socket; 116 insert into mysql.user select * from backup_users; 117 flush privileges; 118 drop table backup_users; 119