database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

perfschema compilation, test and misc fixes

Browse Source
This commit is contained in:
Sergei Golubchik
2020-02-15 18:25:57 +01:00
parent 81cffda2e6
commit 7af733a5a2
403 changed files with 20147 additions and 63173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
mysql-test/suite/perfschema/r/setup_actors.result
View File

@@ -12,12 +12,11 @@ insert into performance_schema.setup_actors
values ('hostb', '%', '%', 'YES', 'YES');
select * from performance_schema.setup_actors
order by USER, HOST, ROLE;
<<<<<<< HEAD
HOST USER ROLE
hostb % %
hosta user1 %
% user2 %
localhost user3 %
HOST USER ROLE ENABLED HISTORY
hostb % % YES YES
hosta user1 % YES YES
% user2 % YES YES
localhost user3 % YES YES
create user user1@localhost;
grant ALL on *.* to user1@localhost;
create user user2@localhost;
@@ -27,35 +26,7 @@ grant ALL on *.* to user3@localhost;
create user user4@localhost;
grant ALL on *.* to user4@localhost;
create user user5@localhost;
=======
HOST USER ROLE ENABLED HISTORY
hostb % % YES YES
hosta user1 % YES YES
% user2 % YES YES
localhost user3 % YES YES
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.
grant ALL on *.* to user1@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.
grant ALL on *.* to user2@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.
grant ALL on *.* to user3@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.
grant ALL on *.* to user4@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.
>>>>>>> merge-perfschema-5.7
grant select on test.* to user5@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, user1, , ;
select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
@@ -65,13 +36,8 @@ NAME TYPE INSTRUMENTED PROCESSLIST_USER PROCESSLIST_HOST
thread/sql/one_connection FOREGROUND NO user1 localhost
connection default;
insert into performance_schema.setup_actors
<<<<<<< HEAD
values ('%', 'user1', '%');
connection con1;
=======
values ('%', 'user1', '%', 'YES', 'YES');
# Switch to connection con1
>>>>>>> merge-perfschema-5.7
connection con1;
select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
from performance_schema.threads
where PROCESSLIST_ID = connection_id();
@@ -127,16 +93,6 @@ insert into performance_schema.setup_actors
values ('localhost', '%', '%', 'YES', 'YES');
select * from performance_schema.setup_actors
order by USER, HOST, ROLE;
<<<<<<< HEAD
HOST USER ROLE
hostb % %
localhost % %
% user1 %
hosta user1 %
% user2 %
localhost user3 %
connect con4b, localhost, user4, , ;
=======
HOST USER ROLE ENABLED HISTORY
hostb % % YES YES
localhost % % YES YES
@@ -144,8 +100,7 @@ localhost % % YES YES
hosta user1 % YES YES
% user2 % YES YES
localhost user3 % YES YES
# Switch to (con4b, localhost, user4, , )
>>>>>>> merge-perfschema-5.7
connect con4b, localhost, user4, , ;
select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST
from performance_schema.threads
where PROCESSLIST_ID = connection_id();