5.6.25

2026-01-06 05:22:24 +03:00 · 2015-06-16 11:00:33 +02:00
parent d71d411905
commit 3c3724991e
17 changed files with 16 additions and 26 deletions
--- a/mysql-test/suite/perfschema/include/connection_setup.inc
+++ b/mysql-test/suite/perfschema/include/connection_setup.inc
@@ -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
--- a/mysql-test/suite/perfschema/include/digest_setup.inc
+++ b/mysql-test/suite/perfschema/include/digest_setup.inc
@@ -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
--- a/mysql-test/suite/perfschema/include/event_aggregate_setup.inc
+++ b/mysql-test/suite/perfschema/include/event_aggregate_setup.inc
@@ -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
--- a/mysql-test/suite/perfschema/include/no_protocol.inc
+++ b/mysql-test/suite/perfschema/include/no_protocol.inc
@@ -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
-}
-
--- a/mysql-test/suite/perfschema/include/stage_setup.inc
+++ b/mysql-test/suite/perfschema/include/stage_setup.inc
@@ -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

--- a/mysql-test/suite/perfschema/include/table_aggregate_setup.inc
+++ b/mysql-test/suite/perfschema/include/table_aggregate_setup.inc
@@ -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