database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

P_S 5.7.28

Browse Source
This commit is contained in:
Sergei Golubchik
2019-12-10 15:35:00 +01:00
parent dfe6e914e5
commit 0ea717f51a
942 changed files with 174739 additions and 20780 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/suite/perfschema/r/global_read_lock.result
View File

@ -1,7 +1,19 @@
use performance_schema;
update performance_schema.setup_instruments set enabled='YES';
<<<<<<< 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, LOCK TABLES 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;
lock tables performance_schema.setup_instruments read;
@ -27,7 +39,7 @@ operation
from performance_schema.events_waits_current
where event_name like "wait/synch/cond/sql/MDL_context::COND_wait_status";
event_name short_source timer_end timer_wait operation
wait/synch/cond/sql/MDL_context::COND_wait_status mdl.cc: SET SET timed_wait
wait/synch/cond/sql/MDL_context::COND_wait_status SET SET timed_wait
unlock tables;
connection con1;
update performance_schema.setup_instruments set enabled='NO';