diff options
Diffstat (limited to 'mysql-test/suite/perfschema/r/read_only.result')
| -rw-r--r-- | mysql-test/suite/perfschema/r/read_only.result | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/mysql-test/suite/perfschema/r/read_only.result b/mysql-test/suite/perfschema/r/read_only.result index b83cb907b1d..b25d542c178 100644 --- a/mysql-test/suite/perfschema/r/read_only.result +++ b/mysql-test/suite/perfschema/r/read_only.result @@ -1,19 +1,7 @@ use performance_schema; set @start_read_only= @@global.read_only; -<<<<<<< HEAD create user pfsuser@localhost; -======= -set @orig_sql_mode= @@sql_mode; -set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER','')); -Warnings: -Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release. ->>>>>>> merge-perfschema-5.7 grant SELECT, UPDATE on performance_schema.* to pfsuser@localhost; -Warnings: -Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement. -set sql_mode= @orig_sql_mode; -Warnings: -Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release. flush privileges; connect con1, localhost, pfsuser, , test; connection default; @@ -26,6 +14,7 @@ show grants; Grants for pfsuser@localhost GRANT USAGE ON *.* TO `pfsuser`@`localhost` GRANT SELECT, UPDATE ON `performance_schema`.* TO `pfsuser`@`localhost` +# Update on perf_schema is allowed in read_only mode. select * from performance_schema.setup_instruments; update performance_schema.setup_instruments set enabled='NO'; update performance_schema.setup_instruments set enabled='YES'; @@ -59,23 +48,6 @@ update performance_schema.setup_instruments set enabled='NO'; update performance_schema.setup_instruments set enabled='YES'; disconnect con1; connection default; -set global super_read_only=1; -connection con1; -select @@global.super_read_only; -@@global.super_read_only -1 -show grants; -Grants for pfsuser@localhost -GRANT SUPER ON *.* TO 'pfsuser'@'localhost' -GRANT SELECT, UPDATE ON `performance_schema`.* TO 'pfsuser'@'localhost' -select * from performance_schema.setup_instruments; -# Update is allowed in super_read_only on perf schema for -# super user. -update performance_schema.setup_instruments set enabled='NO'; -update performance_schema.setup_instruments set enabled='YES'; -disconnect con1; -connection default; set global read_only= @start_read_only; -set global super_read_only= @start_super_read_only; drop user pfsuser@localhost; flush privileges; |