1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'merge-perfschema-5.6' into 10.0

Browse Source
This commit is contained in:
Sergei Golubchik 2015-06-16 12:47:58 +02:00
commit ede08808e9
18 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/perfschema/include/connection_setup.inc
View File

@ -48,7 +48,7 @@
--source include/not_embedded.inc
--source include/have_perfschema.inc
--source ../include/no_protocol.inc
--source include/no_protocol.inc
--source ../include/wait_for_pfs_thread_count.inc
--disable_query_log

2
mysql-test/suite/perfschema/include/digest_setup.inc
View File

@ -1,5 +1,5 @@
# Making sure not to run when ps-protocol is set.
--source ../include/no_protocol.inc
--source include/no_protocol.inc
--echo ####################################
--echo # SETUP

2
mysql-test/suite/perfschema/include/event_aggregate_setup.inc
View File

@ -62,7 +62,7 @@
--source include/not_embedded.inc
--source include/have_perfschema.inc
--source ../include/no_protocol.inc
--source include/no_protocol.inc
--source ../include/wait_for_pfs_thread_count.inc
--disable_query_log

10
mysql-test/suite/perfschema/include/no_protocol.inc
View File

@ -1,10 +0,0 @@
# Tests for the performance schema
# The file with expected results fits only to a run without
# ps-protocol/sp-protocol/cursor-protocol/view-protocol.
if (`SELECT $PS_PROTOCOL + $SP_PROTOCOL + $CURSOR_PROTOCOL
+ $VIEW_PROTOCOL > 0`)
{
--skip Test requires: ps-protocol/sp-protocol/cursor-protocol/view-protocol disabled
}

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

@ -24,7 +24,7 @@
--source include/not_embedded.inc
--source include/have_perfschema.inc
--source ../include/no_protocol.inc
--source include/no_protocol.inc
--disable_query_log

2
mysql-test/suite/perfschema/include/table_aggregate_setup.inc
View File

@ -67,7 +67,7 @@
--source include/not_embedded.inc
--source include/have_perfschema.inc
--source ../include/no_protocol.inc
--source include/no_protocol.inc
--source ../include/wait_for_pfs_thread_count.inc
--disable_query_log

2
mysql-test/suite/perfschema/r/threads_mysql.result
View File

@ -13,7 +13,7 @@ processlist_user NULL
processlist_host NULL
processlist_db NULL
processlist_command NULL
processlist_info INTERNAL DDL LOG RECOVER IN PROGRESS
processlist_info NULL
unified_parent_thread_id NULL
role NULL
instrumented YES

2
mysql-test/suite/perfschema/t/digest_null_literal.test
View File

@ -7,7 +7,7 @@
--source include/not_embedded.inc
--source include/have_perfschema.inc
--source ../include/no_protocol.inc
--source include/no_protocol.inc
TRUNCATE TABLE performance_schema.events_statements_summary_by_digest;

2
mysql-test/suite/perfschema/t/nesting.test
View File

@ -5,7 +5,7 @@
# On windows, the socket instrumentation collects an extra "opt"
# event, which changes the test output.
--source include/not_windows.inc
--source ../include/no_protocol.inc
--source include/no_protocol.inc
--source ../include/wait_for_pfs_thread_count.inc
--disable_query_log

2
mysql-test/suite/perfschema/t/rpl_gtid_func.test
View File

@ -1,7 +1,7 @@
--source include/not_embedded.inc
--source include/have_innodb.inc
--source include/have_perfschema.inc
--source ../include/no_protocol.inc
--source include/no_protocol.inc
-- source include/master-slave.inc

2
mysql-test/suite/perfschema/t/rpl_statements.test
View File

@ -4,7 +4,7 @@
--source include/not_embedded.inc
--source include/have_innodb.inc
--source include/have_perfschema.inc
--source ../include/no_protocol.inc
--source include/no_protocol.inc
--source include/have_binlog_format_mixed.inc
--source include/master-slave.inc

2
mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test
View File

@ -26,7 +26,7 @@
# happens per SQL statement within our MTR tests. And there is a significant
# difference between standard statement execution and execution via
# prepared statement.
--source ../include/no_protocol.inc
--source include/no_protocol.inc
# Set this to enable debugging output
let $my_socket_debug_dbug= 0;

2
mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test
View File

@ -36,7 +36,7 @@
# happens per SQL statement within our MTR tests. And there is a significant
# difference between standard statement execution and execution via
# prepared statement.
--source ../include/no_protocol.inc
--source include/no_protocol.inc
#===================================

2
mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test
View File

@ -38,7 +38,7 @@
# happens per SQL statement within our MTR tests. And there is a significant
# difference between standard statement execution and execution via
# prepared statement.
--source ../include/no_protocol.inc
--source include/no_protocol.inc
#===================================

2
mysql-test/suite/perfschema/t/start_server_low_digest.test
View File

@ -4,7 +4,7 @@
--source include/not_embedded.inc
--source include/have_perfschema.inc
--source ../include/no_protocol.inc
--source include/no_protocol.inc
USE performance_schema;
truncate table events_statements_history_long;

2
mysql-test/suite/perfschema/t/statement_digest_long_query.test
View File

@ -4,7 +4,7 @@
--source include/not_embedded.inc
--source include/have_perfschema.inc
--source ../include/no_protocol.inc
--source include/no_protocol.inc
USE performance_schema;
truncate table events_statements_summary_by_digest;

2
mysql-test/suite/perfschema/t/unary_digest.test
View File

@ -7,7 +7,7 @@
--source include/not_embedded.inc
--source include/have_perfschema.inc
--source ../include/no_protocol.inc
--source include/no_protocol.inc
TRUNCATE TABLE performance_schema.events_statements_summary_by_digest;

2
storage/perfschema/ha_perfschema.cc
View File

@ -205,7 +205,7 @@ maria_declare_plugin(perfschema)
0x0001,
pfs_status_vars,
NULL,
"5.6.20",
"5.6.25",
MariaDB_PLUGIN_MATURITY_STABLE
}
maria_declare_plugin_end;