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

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Monty
2019-09-02 14:06:56 +03:00
parent b0ff5a6a73 9cba6c5aa3
commit a071e0e029
671 changed files with 11116 additions and 14190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/suite/perfschema/include/hostcache_set_state.inc
View File

@ -9,10 +9,10 @@ flush privileges;
# Print critical setup
select @@global.debug;
select @@global.max_connect_errors;
select @@global.max_user_connections;
select @@global.max_connections;
#select @@global.debug;
#select @@global.max_connect_errors;
#select @@global.max_user_connections;
#select @@global.max_connections;
# Make sure there are no remaining records that can change the test outcome
@ -20,4 +20,3 @@ select `User`, `Host` from mysql.`user` where `host` like '%\\%%';
select `User`, `Host` from mysql.`user` where `user` like '192.%';
select `User`, `Host` from mysql.`user` where `user` like '2001:%';
select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';

4
mysql-test/suite/perfschema/include/stage_setup.inc
View File

@ -121,10 +121,12 @@ begin
where thread_id = my_thread_id
and nesting_event_id = my_statement_id
order by event_id asc;
# Ignore query cache as it may not be enabled
select username, event_name, nesting_event_type
from performance_schema.events_stages_history
where thread_id = my_thread_id
and nesting_event_id = my_statement_id
and nesting_event_id = my_statement_id and
event_name not like "%query cache%"
order by event_id asc;
end;
else