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.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2017-03-30 12:48:42 +02:00
parent 9ec8500998 a00517ac97
commit da4d71d10d
1708 changed files with 29631 additions and 15718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/suite/perfschema/include/pfs_no_running_event_scheduler.inc Normal file
View File

@ -0,0 +1,10 @@
# threads are removed from:
# - information_schema.processlist
# - performance_schema.threads
# at different times, so we may have to wait a little more
# for the event_scheduler to shutdown
#
let $wait_condition=
SELECT COUNT(*) = 0 FROM performance_schema.threads
WHERE name like 'thread/sql/event%';
--source include/wait_condition.inc

10
mysql-test/suite/perfschema/include/pfs_running_event_scheduler.inc Normal file
View File

@ -0,0 +1,10 @@
# threads are removed from:
# - information_schema.processlist
# - performance_schema.threads
# at different times, so we may have to wait a little more
# for the event_scheduler to shutdown
#
let $wait_condition=
SELECT COUNT(*) = 1 FROM performance_schema.threads
WHERE name like 'thread/sql/event%';
--source include/wait_condition.inc

3
mysql-test/suite/perfschema/include/table_io_result_helper.inc
View File

@ -14,7 +14,8 @@ eval select event_name,
order by thread_id, event_id;
# In case of failures, this will tell if table io are lost.
show status like 'performance_schema_%';
show status where Variable_name like 'performance_schema_%' and
Variable_name not like 'performance_schema_%_classes_lost';
# Cleanup
truncate performance_schema.events_waits_history_long;

11
mysql-test/suite/perfschema/include/upgrade_check.inc
View File

@ -3,15 +3,14 @@
#
--source include/count_sessions.inc
--exec $MYSQL_UPGRADE --skip-verbose --force > $out_file 2> $err_file
--exec $MYSQL_UPGRADE --skip-verbose --force > $MYSQLTEST_VARDIR/tmp/out_file 2> $MYSQLTEST_VARDIR/tmp/err_file
--source include/wait_until_count_sessions.inc
# Verify that mysql_upgrade does not complain about the performance_schema
--replace_regex /at line [0-9]+/at line ###/
--cat_file $err_file
--error 0,1
--remove_file $out_file
--error 0,1
--remove_file $err_file
--cat_file $MYSQLTEST_VARDIR/tmp/err_file
--remove_file $MYSQLTEST_VARDIR/tmp/out_file
--remove_file $MYSQLTEST_VARDIR/tmp/err_file
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info