Skip to content

Commit

Permalink
5.6.25
Browse files Browse the repository at this point in the history
  • Loading branch information
vuvova committed Jun 16, 2015
1 parent d71d411 commit 3c37249
Show file tree
Hide file tree
Showing 17 changed files with 16 additions and 26 deletions.
2 changes: 1 addition & 1 deletion mysql-test/suite/perfschema/include/connection_setup.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/perfschema/include/digest_setup.inc
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions mysql-test/suite/perfschema/include/no_protocol.inc

This file was deleted.

2 changes: 1 addition & 1 deletion mysql-test/suite/perfschema/include/stage_setup.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/perfschema/r/threads_mysql.result
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/perfschema/t/digest_null_literal.test
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/perfschema/t/nesting.test
Original file line number Diff line number Diff line change
Expand Up @@ -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
--source include/have_QC_Disabled.inc

Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/perfschema/t/rpl_gtid_func.test
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--source include/not_embedded.inc
--source include/have_perfschema.inc
--source ../include/no_protocol.inc
--source include/no_protocol.inc

-- source include/master-slave.inc

Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/perfschema/t/rpl_statements.test
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#
--source include/not_embedded.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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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= 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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


#===================================
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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


#===================================
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/perfschema/t/start_server_low_digest.test
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/perfschema/t/unary_digest.test
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 3c37249

Please sign in to comment.