Commit ede08808 authored by Sergei Golubchik's avatar Sergei Golubchik

Merge branch 'merge-perfschema-5.6' into 10.0

parents 9859d366 3c372499
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
--source ../include/no_protocol.inc --source include/no_protocol.inc
--source ../include/wait_for_pfs_thread_count.inc --source ../include/wait_for_pfs_thread_count.inc
--disable_query_log --disable_query_log
......
# Making sure not to run when ps-protocol is set. # Making sure not to run when ps-protocol is set.
--source ../include/no_protocol.inc --source include/no_protocol.inc
--echo #################################### --echo ####################################
--echo # SETUP --echo # SETUP
......
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
--source ../include/no_protocol.inc --source include/no_protocol.inc
--source ../include/wait_for_pfs_thread_count.inc --source ../include/wait_for_pfs_thread_count.inc
--disable_query_log --disable_query_log
......
# 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
}
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
--source ../include/no_protocol.inc --source include/no_protocol.inc
--disable_query_log --disable_query_log
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
--source ../include/no_protocol.inc --source include/no_protocol.inc
--source ../include/wait_for_pfs_thread_count.inc --source ../include/wait_for_pfs_thread_count.inc
--disable_query_log --disable_query_log
......
...@@ -13,7 +13,7 @@ processlist_user NULL ...@@ -13,7 +13,7 @@ processlist_user NULL
processlist_host NULL processlist_host NULL
processlist_db NULL processlist_db NULL
processlist_command NULL processlist_command NULL
processlist_info INTERNAL DDL LOG RECOVER IN PROGRESS processlist_info NULL
unified_parent_thread_id NULL unified_parent_thread_id NULL
role NULL role NULL
instrumented YES instrumented YES
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_perfschema.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; TRUNCATE TABLE performance_schema.events_statements_summary_by_digest;
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# On windows, the socket instrumentation collects an extra "opt" # On windows, the socket instrumentation collects an extra "opt"
# event, which changes the test output. # event, which changes the test output.
--source include/not_windows.inc --source include/not_windows.inc
--source ../include/no_protocol.inc --source include/no_protocol.inc
--source ../include/wait_for_pfs_thread_count.inc --source ../include/wait_for_pfs_thread_count.inc
--disable_query_log --disable_query_log
......
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
--source ../include/no_protocol.inc --source include/no_protocol.inc
-- source include/master-slave.inc -- source include/master-slave.inc
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/have_perfschema.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/have_binlog_format_mixed.inc
--source include/master-slave.inc --source include/master-slave.inc
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
# happens per SQL statement within our MTR tests. And there is a significant # happens per SQL statement within our MTR tests. And there is a significant
# difference between standard statement execution and execution via # difference between standard statement execution and execution via
# prepared statement. # prepared statement.
--source ../include/no_protocol.inc --source include/no_protocol.inc
# Set this to enable debugging output # Set this to enable debugging output
let $my_socket_debug_dbug= 0; let $my_socket_debug_dbug= 0;
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
# happens per SQL statement within our MTR tests. And there is a significant # happens per SQL statement within our MTR tests. And there is a significant
# difference between standard statement execution and execution via # difference between standard statement execution and execution via
# prepared statement. # prepared statement.
--source ../include/no_protocol.inc --source include/no_protocol.inc
#=================================== #===================================
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
# happens per SQL statement within our MTR tests. And there is a significant # happens per SQL statement within our MTR tests. And there is a significant
# difference between standard statement execution and execution via # difference between standard statement execution and execution via
# prepared statement. # prepared statement.
--source ../include/no_protocol.inc --source include/no_protocol.inc
#=================================== #===================================
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
--source ../include/no_protocol.inc --source include/no_protocol.inc
USE performance_schema; USE performance_schema;
truncate table events_statements_history_long; truncate table events_statements_history_long;
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_perfschema.inc --source include/have_perfschema.inc
--source ../include/no_protocol.inc --source include/no_protocol.inc
USE performance_schema; USE performance_schema;
truncate table events_statements_summary_by_digest; truncate table events_statements_summary_by_digest;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
--source include/not_embedded.inc --source include/not_embedded.inc
--source include/have_perfschema.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; TRUNCATE TABLE performance_schema.events_statements_summary_by_digest;
......
...@@ -205,7 +205,7 @@ maria_declare_plugin(perfschema) ...@@ -205,7 +205,7 @@ maria_declare_plugin(perfschema)
0x0001, 0x0001,
pfs_status_vars, pfs_status_vars,
NULL, NULL,
"5.6.20", "5.6.25",
MariaDB_PLUGIN_MATURITY_STABLE MariaDB_PLUGIN_MATURITY_STABLE
} }
maria_declare_plugin_end; maria_declare_plugin_end;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment