perfschema test formatting. Use --echo #

mysql-test/suite/perfschema/include/hostcache_dump.inc

@@ -1,6 +1,6 @@
 # Helper for hostcache_*.test
 
---echo "Dumping performance_schema.host_cache"
+--echo # Dumping performance_schema.host_cache
 
 --disable_query_log
 --vertical_results

mysql-test/suite/perfschema/include/pfs_upgrade.inc

@@ -20,7 +20,7 @@ drop event if exists test.user_event;
 --enable_warnings
 
 
---echo "Testing mysql_upgrade with TABLE performance_schema.user_table"
+--echo # Testing mysql_upgrade with TABLE performance_schema.user_table
 
 create table test.user_table(a int);
 
@@ -43,7 +43,7 @@ use test;
 drop table test.user_table;
 
 
---echo "Testing mysql_upgrade with VIEW performance_schema.user_view"
+--echo # Testing mysql_upgrade with VIEW performance_schema.user_view
 
 create view test.user_view as select "Not supposed to be here";
 
@@ -66,7 +66,7 @@ use test;
 drop view test.user_view;
 
 
---echo "Testing mysql_upgrade with PROCEDURE performance_schema.user_proc"
+--echo # Testing mysql_upgrade with PROCEDURE performance_schema.user_proc
 
 create procedure test.user_proc()
   select "Not supposed to be here";
@@ -81,7 +81,7 @@ update mysql.proc set db='test' where name='user_proc';
 drop procedure test.user_proc;
 
 
---echo "Testing mysql_upgrade with FUNCTION performance_schema.user_func"
+--echo # Testing mysql_upgrade with FUNCTION performance_schema.user_func
 
 create function test.user_func() returns integer
   return 0;
@@ -96,7 +96,7 @@ update mysql.proc set db='test' where name='user_func';
 drop function test.user_func;
 
 
---echo "Testing mysql_upgrade with EVENT performance_schema.user_event"
+--echo # Testing mysql_upgrade with EVENT performance_schema.user_event
 
 create event test.user_event on schedule every 1 day do
   select "not supposed to be here";

mysql-test/suite/perfschema/include/show_aggregate.inc

@@ -12,7 +12,7 @@ UPDATE test.status_results sr, performance_schema.global_status sg
   SET sr.stop = sg.variable_value
   WHERE sr.variable_name = sg.variable_name
     AND sg.variable_name IN ('handler_delete', 'handler_rollback');
---echo
+--echo #
 --echo # Global deltas: END - START.
 UPDATE test.status_results sr
   SET sr.delta = sr.stop - sr.start;
@@ -30,21 +30,21 @@ UPDATE test.status_results sr, performance_schema.status_by_thread sbt
   WHERE sr.variable_name = sbt.variable_name
     AND sbt.variable_name IN ('handler_delete', 'handler_rollback')
     AND sbt.thread_id = @con1_id;
---echo
+--echo #
 --echo # Thread results from CON2.
 UPDATE test.status_results sr, performance_schema.status_by_thread sbt
   SET sr.t2 = sbt.variable_value
   WHERE sr.variable_name = sbt.variable_name
     AND sbt.variable_name IN ('handler_delete', 'handler_rollback')
     AND sbt.thread_id = @con2_id;
---echo
+--echo #
 --echo # Thread results from CON3.
 UPDATE test.status_results sr, performance_schema.status_by_thread sbt
   SET sr.t3 = sbt.variable_value
   WHERE sr.variable_name = sbt.variable_name
     AND sbt.variable_name IN ('handler_delete', 'handler_rollback')
     AND sbt.thread_id = @con3_id;
---echo
+--echo #
 --echo # Thread totals for 3 connections.
 UPDATE test.status_results sr
   SET sr.thread = sr.t1 + sr.t2 + sr.t3;
@@ -58,21 +58,21 @@ UPDATE test.status_results sr, performance_schema.status_by_user sbu
   WHERE sr.variable_name = sbu.variable_name
     AND sbu.variable_name IN ('handler_delete', 'handler_rollback')
     AND sbu.user IN ('user1');
---echo
+--echo #
 --echo # User2
 UPDATE test.status_results sr, performance_schema.status_by_user sbu
   SET sr.u2 = sbu.variable_value
   WHERE sr.variable_name = sbu.variable_name
     AND sbu.variable_name IN ('handler_delete', 'handler_rollback')
     AND sbu.user IN ('user2');
---echo
+--echo #
 --echo # User3
 UPDATE test.status_results sr, performance_schema.status_by_user sbu
   SET sr.u3 = sbu.variable_value
   WHERE sr.variable_name = sbu.variable_name
     AND sbu.variable_name IN ('handler_delete', 'handler_rollback')
     AND sbu.user IN ('user3');
---echo
+--echo #
 --echo # Status totals for 3 users.
 UPDATE test.status_results sr
   SET sr.user = sr.u1 + sr.u2 + sr.u3;
@@ -80,14 +80,14 @@ UPDATE test.status_results sr
 --echo #===========================
 --echo # Status by host (localhost)
 --echo #===========================
---echo
+--echo #
 --echo # host1 = localhost
 UPDATE test.status_results sr, performance_schema.status_by_host sbh
   SET sr.h1 = sbh.variable_value
   WHERE sr.variable_name = sbh.variable_name
     AND sbh.variable_name IN ('handler_delete', 'handler_rollback')
     AND sbh.host IN ('localhost');
---echo
+--echo #
 --echo # Status totals for 'localhost' only.
 UPDATE test.status_results sr
   SET sr.host = sr.h1 + sr.h2 + sr.h3;
@@ -101,22 +101,22 @@ UPDATE test.status_results sr, performance_schema.status_by_account sba
   WHERE sr.variable_name = sba.variable_name
     AND sba.variable_name IN ('handler_delete', 'handler_rollback')
     AND sba.user IN ('user1');
---echo
+--echo #
 --echo # User2@localhost
 UPDATE test.status_results sr, performance_schema.status_by_account sba
   SET sr.a2 = sba.variable_value
   WHERE sr.variable_name = sba.variable_name
     AND sba.variable_name IN ('handler_delete', 'handler_rollback')
     AND sba.user IN ('user2');
---echo
+--echo #
 --echo # User3@localhost
 UPDATE test.status_results sr, performance_schema.status_by_account sba
   SET sr.a3 = sba.variable_value
   WHERE sr.variable_name = sba.variable_name
     AND sba.variable_name IN ('handler_delete', 'handler_rollback')
     AND sba.user IN ('user3');
---echo
---echo
+--echo #
+--echo #
 --echo # Status totals for 3 accounts.
 UPDATE test.status_results sr
   SET sr.acct = sr.a1 + sr.a2 + sr.a3;

mysql-test/suite/perfschema/include/show_plugin_verifier.inc

@@ -1,20 +1,20 @@
 --disable_warnings
 
---echo
+--echo #
 SHOW GLOBAL STATUS LIKE "example_%";
---echo
+--echo #
 SHOW SESSION STATUS LIKE "example_%";
---echo
+--echo #
 SHOW GLOBAL VARIABLES LIKE "example_%";
---echo
+--echo #
 SHOW SESSION VARIABLES LIKE "example_%";
---echo
+--echo #
 SELECT variable_name, variable_value FROM performance_schema.global_status WHERE variable_name LIKE "example_%";
---echo
+--echo #
 SELECT variable_name, variable_value FROM performance_schema.session_status WHERE variable_name LIKE "example_%";
---echo
+--echo #
 SELECT variable_name, variable_value FROM performance_schema.global_variables WHERE variable_name LIKE "example_%";
---echo
+--echo #
 SELECT variable_name, variable_value FROM performance_schema.session_variables WHERE variable_name LIKE "example_%";
 
 #

mysql-test/suite/perfschema/include/show_transaction_gtid.inc

@@ -24,6 +24,6 @@ if ($current_result == '')
   --let $current_result= none
 }
 
---echo - history=$history_result current=$current_result
+--echo # - history=$history_result current=$current_result
 
 --connection default

mysql-test/suite/perfschema/include/socket_check1.inc

@@ -63,7 +63,7 @@
 --echo # $title_prefix.$check_num Compare impact of statements
 --echo #       $stmt2
 --echo #       $stmt1
---echo $msg
+--echo # $msg
 
 # Enable this when extending the checks for SQL statements.
 if(0)

mysql-test/suite/perfschema/include/transaction_nested_events_verifier.inc

@@ -17,11 +17,11 @@ let $wait_condition=
 --source include/wait_condition.inc
 if(!$success)
 {
-  --echo The activity of connection con1 did not finish.
+  --echo # The activity of connection con1 did not finish.
   SELECT thread_id , PROCESSLIST_id, PROCESSLIST_STATE, PROCESSLIST_INFO
   FROM performance_schema.threads
   WHERE thread_id = @con1_thread_id;
-  --echo Abort.
+  --echo # Abort.
   exit;
 }
 
@@ -47,8 +47,9 @@ select if(@base_tx_event_id < @base_stmt_event_id,
 # set @base_event_id = 0;
 # select @base_tx_event_id, @base_stmt_event_id, @base_event_id;
 
---echo EVENTS_TRANSACTIONS_CURRENT
---echo
+--echo #
+--echo # EVENTS_TRANSACTIONS_CURRENT
+--echo #
 
 --replace_column 1 thread_id
 
@@ -66,9 +67,9 @@ FROM performance_schema.events_transactions_current
 WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
 ORDER BY thread_id, event_id;
 
---echo
---echo EVENTS_TRANSACTIONS_HISTORY_LONG
---echo
+--echo #
+--echo # EVENTS_TRANSACTIONS_HISTORY_LONG
+--echo #
 
 --replace_column 1 thread_id
 
@@ -86,9 +87,9 @@ FROM performance_schema.events_transactions_history_long
 WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
 ORDER BY thread_id, event_id;
 
---echo
---echo EVENTS_STATEMENTS_HISTORY_LONG
---echo
+--echo #
+--echo # EVENTS_STATEMENTS_HISTORY_LONG
+--echo #
 
 --replace_column 1 thread_id
 
@@ -105,11 +106,11 @@ FROM performance_schema.events_statements_history_long
 WHERE ((THREAD_ID = @con1_thread_id) OR (@all_threads = 1))
 ORDER BY thread_id, event_id;
 
---echo
---echo ## Combined statement and transaction event history ordered by event id
---echo
---echo EVENTS_STATEMENTS_HISTORY_LONG + EVENTS_TRANSACTIONS_HISTORY_LONG
---echo
+--echo #
+--echo ### Combined statement and transaction event history ordered by event id
+--echo #
+--echo #EVENTS_STATEMENTS_HISTORY_LONG + EVENTS_TRANSACTIONS_HISTORY_LONG
+--echo #
 
 --replace_column 1 thread_id
 
@@ -134,11 +135,11 @@ FROM performance_schema.events_statements_history_long s
 WHERE ((s.thread_id = @con1_thread_id) OR (@all_threads = 1))
 ORDER BY thread_id, r_event_id;
 
---echo
---echo ## Clear statement and transaction history
---echo CALL test.clear_history();
+--echo #
+--echo ### Clear statement and transaction history
+--echo # CALL test.clear_history();
 CALL test.clear_history();
 --enable_query_log
 --echo ## Reset db.t1
 DELETE FROM db.t1;
---echo
+--echo #