perfschema test formatting. Use --echo #

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

 # 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

 --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 #

mysql-test/suite/perfschema/r/alter_table_progress.result

@@ -57,7 +57,7 @@ select "After payload";
 After payload
 After payload
 connection default;
-Dumping ALTER TABLE stages
+# Dumping ALTER TABLE stages
 select EVENT_NAME, WORK_COMPLETED, WORK_ESTIMATED
 from performance_schema.events_stages_history_long
 where (thread_id = @con1_thread_id)

mysql-test/suite/perfschema/r/connection_type_notwin.result

-"Default connection"
+# Default connection
 select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
@@ -21,7 +21,6 @@ SET GLOBAL general_log_file = '.../log/rewrite_general_con.log';
 SET GLOBAL log_output =       'FILE,TABLE';
 SET GLOBAL general_log=       'ON';
 connect con1, localhost, root,,;
-"Connection con1"
 select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
@@ -31,7 +30,6 @@ PROCESSLIST_HOST	localhost
 CONNECTION_TYPE	Socket
 disconnect con1;
 connect con2, "127.0.0.1", root,,test,$MASTER_MYPORT,;
-"Connection con2"
 select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
@@ -41,7 +39,6 @@ PROCESSLIST_HOST	santa.claus.ipv4.example.com
 CONNECTION_TYPE	TCP/IP
 disconnect con2;
 connect con3, "127.0.0.1", rootssl,,test,$MASTER_MYPORT,,SSL;
-"Connection con3"
 select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();

mysql-test/suite/perfschema/r/connection_type_win.result

-"Default connection"
+# Default connection
 select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
@@ -20,7 +20,6 @@ SET GLOBAL general_log_file = '.../log/rewrite_general_con.log';
 SET GLOBAL log_output =       'FILE,TABLE';
 SET GLOBAL general_log=       'ON';
 connect con1, localhost, root,,;
-"Connection con1"
 select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
@@ -30,7 +29,6 @@ PROCESSLIST_HOST	santa.claus.ipv4.example.com
 CONNECTION_TYPE	TCP/IP
 disconnect con1;
 connect con2, "127.0.0.1", root,,test,$MASTER_MYPORT,;
-"Connection con2"
 select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();
@@ -40,7 +38,6 @@ PROCESSLIST_HOST	santa.claus.ipv4.example.com
 CONNECTION_TYPE	TCP/IP
 disconnect con2;
 connect con3, "127.0.0.1", rootssl,,test,$MASTER_MYPORT,,SSL;
-"Connection con3"
 select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
 from performance_schema.threads
 where PROCESSLIST_ID = connection_id();

mysql-test/suite/perfschema/r/dml_handler.result

-
+#
 # Create a temporary table of performance schema table names
-
+#
 CREATE TEMPORARY TABLE table_list (id INT AUTO_INCREMENT, PRIMARY KEY (id)) AS
 SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES
 WHERE TABLE_SCHEMA='performance_schema'
@@ -8,10 +8,10 @@ WHERE TABLE_SCHEMA='performance_schema'
 SELECT COUNT(*) FROM table_list INTO @table_count;
 Warnings:
 Warning	1287	'<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
-
+#
 # For each table in the performance schema, attempt HANDLER...OPEN,
 # which should fail with an error 1031, ER_ILLEGAL_HA.
-
+#
 SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=80;
 HANDLER performance_schema.user_variables_by_thread OPEN;
 ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`user_variables_by_thread` doesn't have this option

mysql-test/suite/perfschema/r/dml_setup_instruments.result

@@ -77,10 +77,10 @@ LOCK TABLES performance_schema.setup_instruments READ;
 UNLOCK TABLES;
 LOCK TABLES performance_schema.setup_instruments WRITE;
 UNLOCK TABLES;
-
+#
 # Bug#13813193 ASSERTION `TABLE->READ_SET ==
 # &TABLE->DEF_READ_SET' FAILED / MYSQL_UPDATE
-
+#
 UPDATE performance_schema.setup_instruments SET timed='NO'
 ORDER BY RAND();
 update performance_schema.setup_instruments

mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result

@@ -33,7 +33,7 @@ current_user()
 root@192.0.2.4
 disconnect con2;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO
@@ -70,7 +70,7 @@ current_user()
 root@192.0.2.4
 disconnect con3;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO

mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_deny.result

@@ -24,7 +24,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_again";
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO
@@ -54,7 +54,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO

mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result

@@ -33,7 +33,7 @@ current_user()
 root@192.0.2.4
 disconnect con2;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES
@@ -70,7 +70,7 @@ current_user()
 root@192.0.2.4
 disconnect con3;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_deny.result

@@ -24,7 +24,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_bad_ipv4";
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES
@@ -54,7 +54,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result

@@ -33,7 +33,7 @@ current_user()
 root@santa.claus.ipv4.example.com
 disconnect con2;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -70,7 +70,7 @@ current_user()
 root@santa.claus.ipv4.example.com
 disconnect con3;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_deny.result

@@ -24,7 +24,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
 ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -54,7 +54,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result

@@ -35,7 +35,7 @@ current_user()
 root@192.0.2.4
 disconnect con2;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES
@@ -72,7 +72,7 @@ current_user()
 root@192.0.2.4
 disconnect con3;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_deny.result

@@ -24,7 +24,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_error_noname";
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES
@@ -54,7 +54,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv4_auth_plugin.result

@@ -29,7 +29,7 @@ set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddr
 uninstall plugin test_plugin_server;
 ERROR HY000: Plugin 'test_plugin_server' is not loaded
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -59,7 +59,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Plugin 'test_plugin_server' is not loaded
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -90,7 +90,7 @@ LAST_ERROR_SEEN	set
 install plugin test_plugin_server soname 'PLUGIN_AUTH';
 ERROR 28000: Access denied for user 'plug'@'santa.claus.ipv4.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -120,7 +120,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'plug'@'santa.claus.ipv4.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -162,7 +162,7 @@ current_user()
 plug_dest@santa.claus.ipv4.example.com
 disconnect con4;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result

@@ -29,7 +29,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4,native_password_bad_reply";
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -59,7 +59,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -89,7 +89,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -119,7 +119,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '192.0.2.4' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -149,7 +149,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '192.0.2.4' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -180,7 +180,7 @@ LAST_ERROR_SEEN	set
 flush hosts;
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -210,7 +210,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -245,7 +245,7 @@ Valid connection should reset SUM_CONNECT_ERROR counter
 connection default;
 set global debug_dbug= "+d,native_password_bad_reply";
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -275,7 +275,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -305,7 +305,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -335,7 +335,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -365,7 +365,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '192.0.2.4' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -395,7 +395,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '192.0.2.4' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv4_format.result

@@ -24,7 +24,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_format_ipv4";
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO
@@ -54,7 +54,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO

mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result

@@ -36,7 +36,7 @@ current_user()
 quota@santa.claus.ipv4.example.com
 disconnect con2a;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -73,7 +73,7 @@ current_user()
 quota@santa.claus.ipv4.example.com
 disconnect con2b;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -110,7 +110,7 @@ current_user()
 quota@santa.claus.ipv4.example.com
 disconnect con2c;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -140,7 +140,7 @@ FIRST_ERROR_SEEN	null
 LAST_ERROR_SEEN	null
 ERROR 42000: User 'quota' has exceeded the 'max_connections_per_hour' resource (current value: 3)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -170,7 +170,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User 'quota' has exceeded the 'max_connections_per_hour' resource (current value: 3)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -211,7 +211,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv4.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -247,7 +247,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv4.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -283,7 +283,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv4.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -313,7 +313,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User 'quota' has exceeded the 'max_user_connections' resource (current value: 3)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -343,7 +343,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User 'quota' has exceeded the 'max_user_connections' resource (current value: 3)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -386,7 +386,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv4.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -422,7 +422,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv4.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -458,7 +458,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv4.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -488,7 +488,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User quota already has more than 'max_user_connections' active connections
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -518,7 +518,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User quota already has more than 'max_user_connections' active connections
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -567,7 +567,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv4.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -603,7 +603,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv4.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -633,7 +633,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 Got one of the listed errors
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -663,7 +663,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 Got one of the listed errors
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result

@@ -35,7 +35,7 @@ current_user()
 root@192.0.2.4
 disconnect con2;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO
@@ -72,7 +72,7 @@ current_user()
 root@192.0.2.4
 disconnect con3;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO
@@ -110,7 +110,7 @@ current_user()
 root@santa.claus.ipv4.example.com
 disconnect con4;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -147,7 +147,7 @@ current_user()
 root@santa.claus.ipv4.example.com
 disconnect con5;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_deny.result

@@ -24,7 +24,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_again";
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO
@@ -54,7 +54,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	NO
@@ -85,7 +85,7 @@ LAST_ERROR_SEEN	set
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
 ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -115,7 +115,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host 'santa.claus.ipv4.example.com' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result

@@ -33,7 +33,7 @@ current_user()
 root@192.0.2.4
 disconnect con2;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES
@@ -70,7 +70,7 @@ current_user()
 root@192.0.2.4
 disconnect con3;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_deny.result

@@ -24,7 +24,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_error_noname";
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES
@@ -54,7 +54,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '192.0.2.4' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	NULL
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv4_passwd.result

@@ -28,7 +28,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
 ERROR 28000: Access denied for user 'user_without'@'santa.claus.ipv4.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -58,7 +58,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_without'@'santa.claus.ipv4.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -88,7 +88,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_with'@'santa.claus.ipv4.example.com' (using password: NO)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -118,7 +118,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_with'@'santa.claus.ipv4.example.com' (using password: NO)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -148,7 +148,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_with'@'santa.claus.ipv4.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -178,7 +178,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_with'@'santa.claus.ipv4.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result

@@ -32,7 +32,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
 ERROR 28000: Access denied for user 'user_ssl'@'santa.claus.ipv4.example.com' (using password: NO)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -62,7 +62,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_ssl'@'santa.claus.ipv4.example.com' (using password: NO)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -92,7 +92,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_ssl_x509'@'santa.claus.ipv4.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES
@@ -122,7 +122,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_ssl_x509'@'santa.claus.ipv4.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	192.0.2.4
 HOST	santa.claus.ipv4.example.com
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result

@@ -33,7 +33,7 @@ current_user()
 root@2001:db8::6:6
 disconnect con2;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	NO
@@ -70,7 +70,7 @@ current_user()
 root@2001:db8::6:6
 disconnect con3;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	NO

mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_deny.result

@@ -24,7 +24,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_again";
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	NO
@@ -54,7 +54,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	NO

mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result

@@ -33,7 +33,7 @@ current_user()
 root@2001:db8::6:6
 disconnect con2;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES
@@ -70,7 +70,7 @@ current_user()
 root@2001:db8::6:6
 disconnect con3;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_deny.result

@@ -24,7 +24,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_bad_ipv6";
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES
@@ -54,7 +54,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result

@@ -33,7 +33,7 @@ current_user()
 root@santa.claus.ipv6.example.com
 disconnect con2;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -70,7 +70,7 @@ current_user()
 root@santa.claus.ipv6.example.com
 disconnect con3;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_deny.result

@@ -23,7 +23,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
 ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -53,7 +53,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result

@@ -35,7 +35,7 @@ current_user()
 root@2001:db8::6:6
 disconnect con2;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES
@@ -72,7 +72,7 @@ current_user()
 root@2001:db8::6:6
 disconnect con3;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_deny.result

@@ -24,7 +24,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_error_noname";
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES
@@ -54,7 +54,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv6_auth_plugin.result

@@ -29,7 +29,7 @@ set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddr
 uninstall plugin test_plugin_server;
 ERROR HY000: Plugin 'test_plugin_server' is not loaded
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -59,7 +59,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Plugin 'test_plugin_server' is not loaded
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -90,7 +90,7 @@ LAST_ERROR_SEEN	set
 install plugin test_plugin_server soname 'PLUGIN_AUTH';
 ERROR 28000: Access denied for user 'plug'@'santa.claus.ipv6.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -120,7 +120,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'plug'@'santa.claus.ipv6.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -162,7 +162,7 @@ current_user()
 plug_dest@santa.claus.ipv6.example.com
 disconnect con4;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result

@@ -29,7 +29,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6,native_password_bad_reply";
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -59,7 +59,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -89,7 +89,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -119,7 +119,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '2001:db8::6:6' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -149,7 +149,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '2001:db8::6:6' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -180,7 +180,7 @@ LAST_ERROR_SEEN	set
 flush hosts;
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -210,7 +210,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -245,7 +245,7 @@ Valid connection should reset SUM_CONNECT_ERROR counter
 connection default;
 set global debug_dbug= "+d,native_password_bad_reply";
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -275,7 +275,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -305,7 +305,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -335,7 +335,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 08S01: Bad handshake
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -365,7 +365,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '2001:db8::6:6' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -395,7 +395,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '2001:db8::6:6' is blocked because of many connection errors; unblock with 'mysqladmin flush-hosts'
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result

@@ -36,7 +36,7 @@ current_user()
 quota@santa.claus.ipv6.example.com
 disconnect con2a;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -73,7 +73,7 @@ current_user()
 quota@santa.claus.ipv6.example.com
 disconnect con2b;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -110,7 +110,7 @@ current_user()
 quota@santa.claus.ipv6.example.com
 disconnect con2c;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -140,7 +140,7 @@ FIRST_ERROR_SEEN	null
 LAST_ERROR_SEEN	null
 ERROR 42000: User 'quota' has exceeded the 'max_connections_per_hour' resource (current value: 3)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -170,7 +170,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User 'quota' has exceeded the 'max_connections_per_hour' resource (current value: 3)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -211,7 +211,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv6.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -247,7 +247,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv6.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -283,7 +283,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv6.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -313,7 +313,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User 'quota' has exceeded the 'max_user_connections' resource (current value: 3)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -343,7 +343,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User 'quota' has exceeded the 'max_user_connections' resource (current value: 3)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -386,7 +386,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv6.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -422,7 +422,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv6.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -458,7 +458,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv6.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -488,7 +488,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User quota already has more than 'max_user_connections' active connections
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -518,7 +518,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 42000: User quota already has more than 'max_user_connections' active connections
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -567,7 +567,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv6.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -603,7 +603,7 @@ select current_user();
 current_user()
 quota@santa.claus.ipv6.example.com
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -633,7 +633,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 Got one of the listed errors
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -663,7 +663,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 Got one of the listed errors
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result

@@ -35,7 +35,7 @@ current_user()
 root@2001:db8::6:6
 disconnect con2;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	NO
@@ -72,7 +72,7 @@ current_user()
 root@2001:db8::6:6
 disconnect con3;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	NO
@@ -110,7 +110,7 @@ current_user()
 root@santa.claus.ipv6.example.com
 disconnect con4;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -147,7 +147,7 @@ current_user()
 root@santa.claus.ipv6.example.com
 disconnect con5;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_deny.result

@@ -24,7 +24,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_again";
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	NO
@@ -54,7 +54,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	NO
@@ -85,7 +85,7 @@ LAST_ERROR_SEEN	set
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
 ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -115,7 +115,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host 'santa.claus.ipv6.example.com' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result

@@ -33,7 +33,7 @@ current_user()
 root@2001:db8::6:6
 disconnect con2;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES
@@ -70,7 +70,7 @@ current_user()
 root@2001:db8::6:6
 disconnect con3;
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_deny.result

@@ -24,7 +24,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_error_noname";
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES
@@ -54,7 +54,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR HY000: Host '2001:db8::6:6' is not allowed to connect to this MariaDB server
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	NULL
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv6_passwd.result

@@ -28,7 +28,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
 ERROR 28000: Access denied for user 'user_without'@'santa.claus.ipv6.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -58,7 +58,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_without'@'santa.claus.ipv6.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -88,7 +88,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_with'@'santa.claus.ipv6.example.com' (using password: NO)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -118,7 +118,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_with'@'santa.claus.ipv6.example.com' (using password: NO)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -148,7 +148,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_with'@'santa.claus.ipv6.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -178,7 +178,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_with'@'santa.claus.ipv6.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result

@@ -32,7 +32,7 @@ SET @saved_dbug = @@GLOBAL.debug_dbug;
 set global debug_dbug= "+d,vio_peer_addr_fake_ipv6,getnameinfo_fake_ipv6,getaddrinfo_fake_good_ipv6";
 ERROR 28000: Access denied for user 'user_ssl'@'santa.claus.ipv6.example.com' (using password: NO)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -62,7 +62,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_ssl'@'santa.claus.ipv6.example.com' (using password: NO)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -92,7 +92,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_ssl_x509'@'santa.claus.ipv6.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES
@@ -122,7 +122,7 @@ FIRST_ERROR_SEEN	set
 LAST_ERROR_SEEN	set
 ERROR 28000: Access denied for user 'user_ssl_x509'@'santa.claus.ipv6.example.com' (using password: YES)
 connection default;
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 IP	2001:db8::6:6
 HOST	santa.claus.ipv6.example.com
 HOST_VALIDATED	YES

mysql-test/suite/perfschema/r/hostcache_peer_addr.result

@@ -39,7 +39,7 @@ Connection_errors_max_connections	0
 Connection_errors_peer_address	1
 Connection_errors_select	0
 Connection_errors_tcpwrap	0
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 ERROR HY000: Can't get hostname for your address
 connection default;
 show global status like "connection_errors_%";
@@ -50,7 +50,7 @@ Connection_errors_max_connections	0
 Connection_errors_peer_address	2
 Connection_errors_select	0
 Connection_errors_tcpwrap	0
-"Dumping performance_schema.host_cache"
+# Dumping performance_schema.host_cache
 SET @@GLOBAL.debug_dbug = @saved_dbug;
 flush status;
 show global status like "connection_errors_%";

mysql-test/suite/perfschema/r/io_cache.result

-
+#
 ## Connection default
-
+#
 connection default;
 USE test;
 DROP TABLE IF EXISTS t1;
@@ -13,9 +13,9 @@ SELECT @@global.binlog_stmt_cache_size;
 SELECT * FROM performance_schema.setup_instruments WHERE name LIKE "%file/sql/io_cache%";
 NAME	ENABLED	TIMED
 wait/io/file/sql/io_cache	YES	YES
-
+#
 ## Connection con1
-
+#
 connect con1, localhost, root,,;
 USE test;
 CREATE TABLE t1 (s1 INT, s2 VARCHAR(4096));
@@ -82,9 +82,9 @@ SELECT COUNT(*) FROM t1;
 COUNT(*)
 8
 disconnect con1;
-
+#
 ## Connection default
-
+#
 connection default;
 SELECT COUNT(*) FROM test.t1;
 COUNT(*)

mysql-test/suite/perfschema/r/misc.result

@@ -116,7 +116,7 @@ select mysql_errno, returned_sqlstate, message_text, errors, warnings
 from performance_schema.events_statements_history where errors > 0;
 mysql_errno	returned_sqlstate	message_text	errors	warnings
 1146	42S02	Table 'test.t1' doesn't exist	1	0
-
+#
 select mysql_errno, returned_sqlstate, message_text, errors, warnings from 
 performance_schema.events_statements_history_long where errors > 0;
 mysql_errno	returned_sqlstate	message_text	errors	warnings

mysql-test/suite/perfschema/r/pfs_upgrade_event.result

-"Testing mysql_upgrade with EVENT performance_schema.user_event"
+# 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";
 Warnings:

mysql-test/suite/perfschema/r/pfs_upgrade_func.result

-"Testing mysql_upgrade with FUNCTION performance_schema.user_func"
+# Testing mysql_upgrade with FUNCTION performance_schema.user_func
 create function test.user_func() returns integer
 return 0;
 update mysql.proc set db='performance_schema' where name='user_func';

mysql-test/suite/perfschema/r/pfs_upgrade_proc.result

-"Testing mysql_upgrade with PROCEDURE performance_schema.user_proc"
+# Testing mysql_upgrade with PROCEDURE performance_schema.user_proc
 create procedure test.user_proc()
 select "Not supposed to be here";
 update mysql.proc set db='performance_schema' where name='user_proc';

mysql-test/suite/perfschema/r/pfs_upgrade_table.result

-"Testing mysql_upgrade with TABLE performance_schema.user_table"
+# Testing mysql_upgrade with TABLE performance_schema.user_table
 create table test.user_table(a int);
 use performance_schema;
 show tables like "user_table";

mysql-test/suite/perfschema/r/pfs_upgrade_view.result

-"Testing mysql_upgrade with VIEW performance_schema.user_view"
+# Testing mysql_upgrade with VIEW performance_schema.user_view
 create view test.user_view as select "Not supposed to be here";
 use performance_schema;
 show tables like "user_view";

mysql-test/suite/perfschema/r/rpl_statements.result

 include/master-slave.inc
 [connection master]
-
+#
 #
 # STEP 1 - CREATE AND REPLICATE TEST TABLES
 #
 connection master;
-
-*** Create test tables
-
+#
+# *** Create test tables
+#
 show global variables like 'binlog_format%';
 Variable_name	Value
 binlog_format	MIXED
@@ -17,73 +17,73 @@ from performance_schema.threads
 where processlist_id = connection_id();
 create table test.marker(s1 int) engine=innodb;
 connection slave;
-
-*** Clear statement events
-
+#
+# *** Clear statement events
+#
 #
 # STEP 2 - REPLICATE ONE ROW ON MASTER TO GET REPLICATION THREAD ID ON SLAVE
 #
 connection master;
-
+#
 insert into test.marker values (0);
-
+#
 connection slave;
-
-*** Verify row, get replication thread id, clear statement events
-
+#
+# *** Verify row, get replication thread id, clear statement events
+#
 select thread_id into @slave_thread_id from performance_schema.events_statements_history
 where sql_text like '%marker%';
-*** Verify row inserted on master was replicated
+# *** Verify row inserted on master was replicated
 select count(*) = 1 as 'Expect 1' from test.marker;
 Expect 1
 1
-*** Clear statement events
-
+# *** Clear statement events
+#
 #
 # STEP 3 - PERFORM DML STATEMENTS ON MASTER
 #
 connection master;
-
+#
 show global variables like 'binlog_format%';
 Variable_name	Value
 binlog_format	MIXED
-*** Clear statement events
-
-*** Create/drop table, create/drop database
-
+# *** Clear statement events
+#
+# *** Create/drop table, create/drop database
+#
 create database marker1_db;
 create database marker2_db;
 create table marker1_db.table1 (s1 int) engine=innodb;
 create table marker2_db.table1 (s1 int) engine=innodb;
 create table marker2_db.table2 (s1 int) engine=innodb;
-
-*** Transaction
+#
+# *** Transaction
 start transaction;
 insert into marker1_db.table1 values (1), (2), (3);
 insert into marker2_db.table1 values (1), (2), (3);
 commit;
-
-*** Alter
+#
+# *** Alter
 alter table marker1_db.table1 add column (s2 varchar(32));
-
-*** Insert, Update
+#
+# *** Insert, Update
 start transaction;
 insert into marker1_db.table1 values (4, 'four'), (5, 'five'), (6, 'six');
 update marker1_db.table1 set s1 = s1 + 1;
 commit;
-
-*** Rollback
+#
+# *** Rollback
 start transaction;
 insert into marker1_db.table1 values (7, 'seven'), (8, 'eight'), (9, 'nine');
 rollback;
-
-*** Autocommit, Delete, Drop
+#
+# *** Autocommit, Delete, Drop
 delete from marker1_db.table1 where s1 > 4;
 drop table marker2_db.table1;
 drop database marker2_db;
-
-*** Examine statements events that will be compared on the slave
-
+#
+# *** Examine statements events that will be compared on the slave
+#
 select thread_id, event_id, rpad(event_name, 28, ' ') event_name, rpad(current_schema, 10, ' ') current_schema, rpad(digest_text, 72, ' ') digest_text, sql_text from performance_schema.events_statements_history_long
 where sql_text like '%marker%' order by event_id;
 thread_id	event_id	event_name	current_schema	digest_text	sql_text
@@ -101,13 +101,13 @@ thread_id	event_id	event_name	current_schema	digest_text	sql_text
 [THREAD_ID]	[EVENT_ID]	statement/sql/delete        	test      	DELETE FROM `marker1_db` . `table1` WHERE `s1` > ?                      	delete from marker1_db.table1 where s1 > 4
 [THREAD_ID]	[EVENT_ID]	statement/sql/drop_table    	test      	DROP TABLE `marker2_db` . `table1`                                      	drop table marker2_db.table1
 [THREAD_ID]	[EVENT_ID]	statement/sql/drop_db       	test      	DROP SCHEMA `marker2_db`                                                	drop database marker2_db
-
+#
 #
 # STEP 4 - REPLICATE STATEMENT EVENTS ON MASTER TO SLAVE
 #
-
-*** Store statement events in holding table, then replicate
-
+#
+# *** Store statement events in holding table, then replicate
+#
 #
 # Create table to hold statement events for later comparison on the slave
 #
@@ -115,14 +115,14 @@ create table test.master_events_statements_history_long as
 (select thread_id, event_id, event_name, sql_text, digest, digest_text, current_schema, rows_affected
 from performance_schema.events_statements_history_long
 where (thread_id=@my_thread_id and digest_text like '%marker%'));
-
+#
 #
 # STEP 5 - VERIFY DML AND DDL STATEMENT EVENTS ON SLAVE
 #
 connection slave;
-
-*** List statement events from master
-
+#
+# *** List statement events from master
+#
 select thread_id, event_id, rpad(event_name, 28, ' ') event_name, rpad(current_schema, 10, ' ') current_schema, rpad(digest_text, 72, ' ') digest_text, sql_text from master_events_statements_history_long order by event_id;
 thread_id	event_id	event_name	current_schema	digest_text	sql_text
 [THREAD_ID]	[EVENT_ID]	statement/sql/create_db     	test      	CREATE SCHEMA `marker1_db`                                              	create database marker1_db
@@ -139,9 +139,9 @@ thread_id	event_id	event_name	current_schema	digest_text	sql_text
 [THREAD_ID]	[EVENT_ID]	statement/sql/delete        	test      	DELETE FROM `marker1_db` . `table1` WHERE `s1` > ?                      	delete from marker1_db.table1 where s1 > 4
 [THREAD_ID]	[EVENT_ID]	statement/sql/drop_table    	test      	DROP TABLE `marker2_db` . `table1`                                      	drop table marker2_db.table1
 [THREAD_ID]	[EVENT_ID]	statement/sql/drop_db       	test      	DROP SCHEMA `marker2_db`                                                	drop database marker2_db
-
-*** List statement events on slave
-
+#
+# *** List statement events on slave
+#
 select thread_id, event_id, rpad(event_name, 28, ' ') event_name, rpad(current_schema, 10, ' ') current_schema, rpad(digest_text, 72, ' ') digest_text, sql_text from performance_schema.events_statements_history_long
 where thread_id = @slave_thread_id and sql_text like '%marker%' order by event_id;
 thread_id	event_id	event_name	current_schema	digest_text	sql_text
@@ -158,11 +158,11 @@ thread_id	event_id	event_name	current_schema	digest_text	sql_text
 [THREAD_ID]	[EVENT_ID]	statement/sql/delete        	test      	DELETE FROM `marker1_db` . `table1` WHERE `s1` > ?                      	delete from marker1_db.table1 where s1 > 4
 [THREAD_ID]	[EVENT_ID]	statement/sql/drop_table    	test      	DROP TABLE `marker2_db` . `table1`                                      	DROP TABLE `marker2_db`.`table1` /* generated by server */
 [THREAD_ID]	[EVENT_ID]	statement/sql/drop_db       	marker2_db	DROP SCHEMA `marker2_db`                                                	drop database marker2_db
+#
+# *** Compare master and slave events
+#
 
-*** Compare master and slave events
-
-
-*** Event name comparison - expect 0 mismatches
+# *** Event name comparison - expect 0 mismatches
 
 select thread_id, event_id, event_name, digest_text, sql_text from performance_schema.events_statements_history_long t1
 where t1.thread_id = @slave_thread_id and
@@ -170,14 +170,14 @@ sql_text like '%marker%' and
 not exists (select * from master_events_statements_history_long t2 where t2.event_name = t1.event_name);
 thread_id	event_id	event_name	digest_text	sql_text
 
-*** Statement digest comparison - expect 1 mismatch for DROP TABLE
+# *** Statement digest comparison - expect 1 mismatch for DROP TABLE
 
 select thread_id, event_id, event_name, digest, digest_text, sql_text from performance_schema.events_statements_history_long t1
 where t1.thread_id = @slave_thread_id and
 sql_text like '%marker%' and
 not exists (select * from master_events_statements_history_long t2 where t2.digest = t1.digest);
 thread_id	event_id	event_name	digest	digest_text	sql_text
-
+#
 #
 # STEP 6 - DISABLE REPLICATED STATEMENT EVENTS ON SLAVE
 #
@@ -186,38 +186,38 @@ update performance_schema.setup_instruments set enabled='no', timed='no'
 select * from performance_schema.setup_instruments where name like '%statement/abstract/relay_log%';
 NAME	ENABLED	TIMED
 statement/abstract/relay_log	NO	NO
-
+#
 #
 # STEP 7 - UPDATE TABLES ON MASTER, REPLICATE
 #
 connection master;
-
-*** Clear statement events
-*** Update some tables, then replicate
-
+#
+# *** Clear statement events
+# *** Update some tables, then replicate
+#
 insert into marker1_db.table1 values (999, '999'), (998, '998'), (997, '997');
-
+#
 #
 # STEP 8 - VERIFY TABLE UPDATES FROM MASTER, EXPECT NO STATEMENT EVENTS ON SLAVE
 #
 connection slave;
-
-*** Confirm rows were replicated
-
+#
+# *** Confirm rows were replicated
+#
 select * from marker1_db.table1 where s1 > 900 order by s1;
 s1	s2
 997	997
 998	998
 999	999
-
-*** Confirm that are no statements events from the replication thread
-
+#
+# *** Confirm that are no statements events from the replication thread
+#
 select * from performance_schema.events_statements_history_long
 where thread_id = @slave_thread_id;
 THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	LOCK_TIME	SQL_TEXT	DIGEST	DIGEST_TEXT	CURRENT_SCHEMA	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	OBJECT_INSTANCE_BEGIN	MYSQL_ERRNO	RETURNED_SQLSTATE	MESSAGE_TEXT	ERRORS	WARNINGS	ROWS_AFFECTED	ROWS_SENT	ROWS_EXAMINED	CREATED_TMP_DISK_TABLES	CREATED_TMP_TABLES	SELECT_FULL_JOIN	SELECT_FULL_RANGE_JOIN	SELECT_RANGE	SELECT_RANGE_CHECK	SELECT_SCAN	SORT_MERGE_PASSES	SORT_RANGE	SORT_ROWS	SORT_SCAN	NO_INDEX_USED	NO_GOOD_INDEX_USED	NESTING_EVENT_ID	NESTING_EVENT_TYPE	NESTING_EVENT_LEVEL
-
+#
 #
 # STEP 9 - CLEAN UP
 #
-
+#
 include/rpl_end.inc

mysql-test/suite/perfschema/r/socket_connect.result

@@ -11,21 +11,21 @@ SELECT @@port INTO @MY_MASTER_PORT;
 # 1.0 Get the default connection object_instance_begin, thread id and verify
 #     the expected number of client connections.
 #==============================================================================
-
+#
 # 1.1 Confirm only one client connection
-
+#
 SELECT COUNT(*) INTO @my_client_connections
 FROM performance_schema.socket_instances
 WHERE EVENT_NAME LIKE "%client_connection%";
-
+#
 # 1.2 Get the default THREAD_ID;
-
+#
 SELECT THREAD_ID INTO @my_thread_id
 FROM performance_schema.threads
 WHERE PROCESSLIST_ID = CONNECTION_ID();
-
+#
 # 1.3 Get the default OBJECT_INSTANCE_BEGIN
-
+#
 SELECT OBJECT_INSTANCE_BEGIN INTO @my_object_instance_begin
 FROM performance_schema.socket_instances
 WHERE THREAD_ID = @my_thread_id;
@@ -33,27 +33,27 @@ WHERE THREAD_ID = @my_thread_id;
 # 2.0 ESTABLISH TCP/IP CONNECTION 1
 #     Connect with IP = localhost (127.0.0.1 or ::1)
 #==============================================================================
-
+#
 # 2.1 Get the connection thread id
-
+#
 SELECT THREAD_ID INTO @my_thread_id
 FROM performance_schema.threads
 WHERE PROCESSLIST_ID = CONNECTION_ID();
-
+#
 # 2.2 Get the connection object instance begin
-
+#
 SELECT OBJECT_INSTANCE_BEGIN INTO @my_object_instance_begin
 FROM performance_schema.socket_instances
 WHERE THREAD_ID = @my_thread_id;
-
+#
 # 2.3 Get the connection port
-
+#
 SELECT PORT INTO @my_port
 FROM performance_schema.socket_instances
 WHERE THREAD_ID = @my_thread_id;
-
+#
 # 2.4 Verify that the connection is 127.0.0.1 or ::1
-
+#
 SELECT COUNT(*) = 1 AS 'Expect 1'
 FROM performance_schema.socket_instances
 WHERE EVENT_NAME LIKE '%client_connection%'
@@ -62,44 +62,44 @@ AND PORT= @con1_port
 AND OBJECT_INSTANCE_BEGIN= @con1_object_id;
 Expect 1
 1
-
+#
 # 2.5 Verify that the same connection is in the summary instance table
-
+#
 SELECT COUNT(*) = 1 AS 'Expect 1'
 FROM performance_schema.socket_summary_by_instance
 WHERE EVENT_NAME LIKE '%client_connection%'
   AND OBJECT_INSTANCE_BEGIN= @con1_object_id;
 Expect 1
 1
-
+#
 # Switch to connection default
-
+#
 connection default;
 #==============================================================================
 # 3.0 ESTABLISH TCP/IP CONNECTION 2
 #     Connect with IP = localhost (127.0.0.1 or ::1)
 #==============================================================================
-
+#
 # 3.1 Get the connection thread id
-
+#
 SELECT THREAD_ID INTO @my_thread_id
 FROM performance_schema.threads
 WHERE PROCESSLIST_ID = CONNECTION_ID();
-
+#
 # 3.2 Get the connection object instance begin
-
+#
 SELECT OBJECT_INSTANCE_BEGIN INTO @my_object_instance_begin
 FROM performance_schema.socket_instances
 WHERE THREAD_ID = @my_thread_id;
-
+#
 # 3.3 Get the connection port
-
+#
 SELECT PORT INTO @my_port
 FROM performance_schema.socket_instances
 WHERE THREAD_ID = @my_thread_id;
-
+#
 # 3.4 Verify that the connection is 127.0.0.1 or ::1
-
+#
 SELECT COUNT(*) = 1 AS 'Expect 1'
 FROM performance_schema.socket_instances
 WHERE EVENT_NAME LIKE '%client_connection%'
@@ -108,18 +108,18 @@ AND PORT= @con2_port
 AND OBJECT_INSTANCE_BEGIN= @con2_object_id;
 Expect 1
 1
-
+#
 # 3.5 Verify that the same connection is in the summary instance table
-
+#
 SELECT COUNT(*) = 1 AS 'Expect 1'
 FROM performance_schema.socket_summary_by_instance
 WHERE EVENT_NAME LIKE '%client_connection%'
   AND OBJECT_INSTANCE_BEGIN= @con2_object_id;
 Expect 1
 1
-
+#
 # 3.6 Verify that the connection is 127.0.0.1 or ::1
-
+#
 SELECT COUNT(*) = 1 AS 'Expect 1'
 FROM performance_schema.socket_instances
 WHERE EVENT_NAME LIKE '%client_connection%'
@@ -132,9 +132,9 @@ Expect 1
 # 4.0 Verify both connections exist in the instance tables
 #==============================================================================
 connection default;
-
+#
 # 4.1 Verify that there are two TCP/IP connections in the socket instance table
-
+#
 SELECT COUNT(*) = 2 AS 'Expect 1'
 FROM performance_schema.socket_instances
 WHERE EVENT_NAME LIKE '%client_connection%'
@@ -142,9 +142,9 @@ WHERE EVENT_NAME LIKE '%client_connection%'
 AND (IP LIKE '%127.0.0.1' OR IP LIKE '%::1');
 Expect 1
 1
-
+#
 # 4.2 Verify that there are two TCP/IP connections in the summary instance table
-
+#
 SELECT COUNT(*) = 2 AS 'Expect 1'
 FROM performance_schema.socket_summary_by_instance
 WHERE EVENT_NAME LIKE '%client_connection%'
@@ -164,9 +164,9 @@ connection default;
 #==============================================================================
 # 6.0 Verify sockets were removed from the instance tables
 #==============================================================================
-
+#
 # 6.1 Verify that there are no TCP/IP connections in the socket instance table
-
-
+#
+#
 # 6.2 Verify that there are no TCP/IP connections in the summary instance table
-
+#

mysql-test/suite/perfschema/r/socket_summary_by_event_name_func.result

@@ -10,123 +10,123 @@ SELECT @@port INTO @MY_MASTER_PORT;
 #==============================================================================
 # 1.0 TEST INITIALIZATION
 #==============================================================================
-
+#
 # 1.1 Disable instrumentation of the default (this) connection
-
+#
 connection default;
 UPDATE performance_schema.threads
 SET INSTRUMENTED='NO' WHERE PROCESSLIST_ID = CONNECTION_ID();
-
+#
 # 1.2 Get the default THREAD_ID;
-
+#
 SELECT THREAD_ID INTO @my_thread_id
 FROM performance_schema.threads
 WHERE PROCESSLIST_ID = CONNECTION_ID();
-
+#
 # 1.3 Get the default OBJECT_INSTANCE_BEGIN
-
+#
 SELECT OBJECT_INSTANCE_BEGIN INTO @my_object_instance_begin
 FROM performance_schema.socket_instances
 WHERE THREAD_ID = @my_thread_id;
-
+#
 # 1.4 Create a test database
-
+#
 CREATE SCHEMA mysqltest;
-
+#
 # 1.5 Create a table to store summary values from socket_summary_by_instance
 and socket_summary_by_event_name
-
+#
 CREATE TABLE mysqltest.my_socket_summary AS
 SELECT * FROM performance_schema.socket_summary_by_instance
 WHERE 1 = 0;
-
+#
 # 1.6 Drop object_instance_begin from my_socket_summary
-
+#
 ALTER TABLE mysqltest.my_socket_summary
 DROP COLUMN OBJECT_INSTANCE_BEGIN;
-
+#
 # 1.7 Add an auto_inc column to my_socket_summary
-
+#
 ALTER TABLE mysqltest.my_socket_summary
 ADD COLUMN (n INT AUTO_INCREMENT, PRIMARY KEY(n));
-
+#
 # 1.8 Create test tables
-
+#
 CREATE TABLE mysqltest.t1 (n INT AUTO_INCREMENT, s1 VARCHAR(1024), PRIMARY KEY(n));
 CREATE TABLE mysqltest.t2 (n INT AUTO_INCREMENT, s1 VARCHAR(1024), PRIMARY KEY(n));
 #==============================================================================
 # 2.0 ESTABLISH CLIENT CONNECTIONS
 #==============================================================================
-
+#
 # 2.1 Connection 1 (tcp/ip, 127.0.0.1 or ::1)
-
-
+#
+#
 # 2.2 Connection 2 (localhost or unix domain socket)
-
+#
 #==============================================================================
 # 3.0 RUN THE TESTS
 #==============================================================================
-
+#
 # 3.1 Clear performance schema tables
-
+#
 TRUNCATE performance_schema.socket_summary_by_instance;
 TRUNCATE performance_schema.socket_summary_by_event_name;
-
+#
 # 3.2 Get the 'before' sum of bytes written from socket_summary_by_instance
 for later comparison to the 'after' byte count as a simple confirmation
 that the table was updated.
-
+#
 connection default;
 SELECT sum(SUM_NUMBER_OF_BYTES_WRITE) INTO @my_write_count
 FROM performance_schema.socket_summary_by_instance;
-
+#
 # 3.3 From connection 1, insert one a 1K row of data into t1
-
+#
 connection con1;
 USE mysqltest;
 INSERT INTO t1 (s1) VALUES (REPEAT('a', 1024));
 INSERT INTO t1 (s1) SELECT s1 FROM t1;
-
+#
 # 3.4 From connection 2, insert one a 1K row of data into t2
-
+#
 connection con2;
 USE mysqltest;
 INSERT INTO t2 (s1) VALUES (REPEAT('a', 1024));
 INSERT INTO t2 (s1) SELECT s1 FROM t2;
-
+#
 # 3.5 Get the 'after' sum of bytes written from socket_summary_by_instance
-
+#
 connection default;
 SELECT sum(SUM_NUMBER_OF_BYTES_WRITE) INTO @my_write_count
 FROM performance_schema.socket_summary_by_instance;
-
+#
 # 3.6 Verify that SUM_NUMBER_OF_BYTES_WRITE increased
-
-
+#
+#
 # socket_summary_by_instance was updated
-
+#
 #==============================================================================
 # 4.0 VERIFY RESULTS
 #==============================================================================
-
+#
 # 4.1 Verify that the totals in socket_summary_by_event_name are
 consistent with totals in socket_summary_by_instance
-
+#
 #==============================================================================
 # 5.0 Clean up
 #==============================================================================
-
+#
 # 5.1 Disconnect con1
-
+#
 connection con1;
 disconnect con1;
-
+#
 # 5.2 Disconnect con2
-
+#
 connection con2;
 disconnect con2;
-
+#
 # 5.3 Drop mysqltest
-
+#
 connection default;
 DROP DATABASE mysqltest;

mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result

@@ -140,47 +140,47 @@ connection default;
 # 4.4.4 Compare impact of statements
 #       SELECT col2 FROM does_not_exist WHERE col1 = 0
 #       SELECT col2 FROM does_not_exist
-# One statement is longer than the other.
+# # One statement is longer than the other.
 # Both statements fail with the same error message (table does not exist)
 # 4.4.5 Compare impact of statements
 #       SELECT col2 FROM does_not_exist WHERE col1 A 0
 #       SELECT col2 FROM does_not_exist WHERE col1 = 0
-# Both statements have the same length and fail.
+# # Both statements have the same length and fail.
 # The length of the error messages differs.
 # 4.4.6 Compare impact of statements
 #       SELECT col2 FROM does_not_exist0123
 #       SELECT col2 FROM does_not_exist
-# Both statements fail (table does not exist).
+# # Both statements fail (table does not exist).
 # The length of the statement and the length of the error messages differs.
 # Reason for both differences is the length of the table name.
 # 4.4.7 Compare impact of statements
 #       SELECT col2 AS my_super_col FROM mysqltest.my_aux WHERE col1 = -1
 #       SELECT col2 FROM mysqltest.my_aux WHERE col1 = -1
-# Both statements get an empty result set.
+# # Both statements get an empty result set.
 # The length of the statements and the length of the result sets differs.
 # Reason for both differences is the length of the some column name.
 # 4.4.8 Compare impact of statements
 #       SELECT col2 FROM mysqltest.my_aux WHERE col1 = 1
 #       SELECT col2 FROM mysqltest.my_aux WHERE col1 = -1
-# Both statements differ in the statement length.
+# # Both statements differ in the statement length.
 # One statement earns an empty result set.
 # The other statement earns one row containing an empty string.
 # 4.4.9 Compare impact of statements
 #       SELECT col2 FROM mysqltest.my_aux WHERE col1 = 2
 #       SELECT col2 FROM mysqltest.my_aux WHERE col1 = 1
-# Both statements have the same length.
+# # Both statements have the same length.
 # One statement earns an one row containing an empty string.
 # The other statement earns one row containing a string 1 byte long.
 # 4.4.10 Compare impact of statements
 #       SELECT col2 FROM mysqltest.my_aux WHERE col1 = 3
 #       SELECT col2 FROM mysqltest.my_aux WHERE col1 = 1
-# Both statements have the same length.
+# # Both statements have the same length.
 # One statement earns an one row containing an empty string.
 # The other statement earns one row containing a string 1024 byte long.
 # 4.4.11 Compare impact of statements
 #       SELECT col2 FROM mysqltest.my_aux WHERE col1 < 2
 #       SELECT col2 FROM mysqltest.my_aux WHERE col1 = 1
-# Both statements have the same length.
+# # Both statements have the same length.
 # One statement earns an one row containing an empty string.
 # The other statement earns two rows containing an empty string.
 # 4.5 Check the differences caused by Connects

mysql-test/suite/perfschema/r/table_name.result

-
+#
 #
 # TEST 1: Normal tables prefixed with "#sql" and "sql".
 #
 USE test;
 CREATE TABLE `#sql_1` (a int, b text);
 INSERT INTO `#sql_1` VALUES(1,'one');
-
+#
 CREATE TABLE `sql_1` (a int, b text);
 INSERT INTO `sql_1` VALUES(1,'one');
-
+#
 # Verify that the tables are treated as normal tables .
-
+#
 SELECT object_type, object_schema, object_name
 FROM performance_schema.objects_summary_global_by_type
 WHERE object_schema="test"
@@ -18,46 +18,46 @@ ORDER BY object_name;
 object_type	object_schema	object_name
 TABLE	test	#sql_1
 TABLE	test	sql_1
-
+#
 # Drop the tables, verify that the table objects are removed.
-
+#
 DROP TABLE `#sql_1`;
 DROP TABLE `sql_1`;
-
+#
 SELECT object_type, object_schema, object_name
 FROM performance_schema.objects_summary_global_by_type
 WHERE object_schema="test"
 ORDER BY object_name;
 object_type	object_schema	object_name
-
+#
 #
 # TEST 2: Temporary tables, no special prefix.
 #
 CREATE TEMPORARY TABLE sql_temp2_myisam (a int, b text) ENGINE=MYISAM;
 INSERT INTO sql_temp2_myisam VALUES(1,'one');
-
+#
 CREATE TEMPORARY TABLE sql_temp2_innodb (a int, b text) ENGINE=INNODB;
 INSERT INTO sql_temp2_innodb VALUES(1,'one');
-
+#
 # Confirm that the temporary tables are ignored.
-
+#
 SELECT object_type, object_schema, object_name
 FROM performance_schema.objects_summary_global_by_type
 WHERE object_schema="test"
 ORDER BY object_name;
 object_type	object_schema	object_name
-
+#
 # Drop the tables, verify that the table objects are not created.
-
+#
 DROP TABLE sql_temp2_myisam;
 DROP TABLE sql_temp2_innodb;
-
+#
 SELECT object_type, object_schema, object_name
 FROM performance_schema.objects_summary_global_by_type
 WHERE object_schema="test"
 ORDER BY object_name;
 object_type	object_schema	object_name
-
+#
 #
 # TEST 3: Temporary tables with the "#sql" prefix.
 #
@@ -66,78 +66,78 @@ CHECK TABLE `#sql_temp3_myisam`;
 Table	Op	Msg_type	Msg_text
 test.#sql_temp3_myisam	check	status	OK
 INSERT INTO `#sql_temp3_myisam` VALUES(1,'one');
-
+#
 CREATE TEMPORARY TABLE `#sql_temp3_innodb` (a int, b text) ENGINE=INNODB;
 CHECK TABLE `#sql_temp3_innodb`;
 Table	Op	Msg_type	Msg_text
 test.#sql_temp3_innodb	check	status	OK
 INSERT INTO `#sql_temp3_innodb` VALUES(1,'one');
-
+#
 # Confirm that the temporary tables are ignored.
-
+#
 SELECT object_type, object_schema, object_name
 FROM performance_schema.objects_summary_global_by_type
 WHERE object_schema="test"
 ORDER BY object_name;
 object_type	object_schema	object_name
-
+#
 # Drop the temporary tables.
-
+#
 DROP TABLE `#sql_temp3_myisam`;
 DROP TABLE `#sql_temp3_innodb`;
-
+#
 # Confirm that the temporary tables are still ignored.
-
+#
 SELECT object_type, object_schema, object_name
 FROM performance_schema.objects_summary_global_by_type
 WHERE object_schema="test"
 ORDER BY object_name;
 object_type	object_schema	object_name
-
+#
 #
 # TEST 4: Special case: MyISAM temporary tables are recreated as non-temporary
 #         when they are truncated.
 #
 CREATE TEMPORARY TABLE `sql_temp4_myisam` (a int, b text) ENGINE=MYISAM;
 INSERT INTO `sql_temp4_myisam` VALUES(1,'one');
-
+#
 CREATE TEMPORARY TABLE `#sql_temp4_myisam` (a int, b text) ENGINE=MYISAM;
 INSERT INTO `#sql_temp4_myisam` VALUES(1,'one');
-
+#
 # Confirm that the MyISAM temporary tables are ignored.
-
+#
 SELECT object_type, object_schema, object_name
 FROM performance_schema.objects_summary_global_by_type
 WHERE object_schema="test"
 ORDER BY object_name;
 object_type	object_schema	object_name
-
+#
 # Truncate the MyISAM temporary tables, forcing them to be recreated as non-temporary.
-
+#
 TRUNCATE TABLE `sql_temp4_myisam`;
 TRUNCATE TABLE `#sql_temp4_myisam`;
-
+#
 # Confirm that the recreated MyISAM tables are still regarded as temporary and ignored.
-
+#
 SELECT object_type, object_schema, object_name
 FROM performance_schema.objects_summary_global_by_type
 WHERE object_schema="test"
 ORDER BY object_name;
 object_type	object_schema	object_name
-
+#
 # Drop the recreated MyISAM tables;
-
+#
 DROP TABLE `sql_temp4_myisam`;
 DROP TABLE `#sql_temp4_myisam`;
-
+#
 # Confirm that the recreated temporary tables are still ignored.
-
+#
 SELECT object_type, object_schema, object_name
 FROM performance_schema.objects_summary_global_by_type
 WHERE object_schema="test"
 ORDER BY object_name;
 object_type	object_schema	object_name
-
+#
 #
 # TEST 5: Generate temporary tables with ALTER MyISAM table.
 #
@@ -145,21 +145,21 @@ USE test;
 CREATE TABLE t1 (a int) ENGINE=MYISAM;
 INSERT INTO t1 VALUES (1), (2), (3);
 ALTER TABLE t1 ADD COLUMN (b int);
-
+#
 # Confirm that the recreated temporary tables are still ignored.
-
+#
 SELECT object_type, object_schema, object_name
 FROM performance_schema.objects_summary_global_by_type
 WHERE object_schema="test"
 ORDER BY object_name;
 object_type	object_schema	object_name
-
+#
 # Drop the MyISAM table
-
+#
 DROP TABLE t1;
-
+#
 # Confirm that no tables remain;
-
+#
 SELECT object_type, object_schema, object_name
 FROM performance_schema.objects_summary_global_by_type
 WHERE object_schema="test"

mysql-test/suite/perfschema/t/alter_table_progress.test

@@ -120,7 +120,7 @@ select "After payload";
 
 --connection default
 
---echo Dumping ALTER TABLE stages
+--echo # Dumping ALTER TABLE stages
 
 # Print all stages for this ALTER TABLE statement
 select EVENT_NAME, WORK_COMPLETED, WORK_ESTIMATED

mysql-test/suite/perfschema/t/connection_type_notwin.test

@@ -4,7 +4,7 @@
 --source include/have_debug.inc
 --source include/have_perfschema.inc
 
---echo "Default connection"
+--echo # Default connection
 
 --vertical_results
 select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
@@ -35,8 +35,6 @@ SET GLOBAL general_log=       'ON';
 
 connect(con1, localhost, root,,);
 
---echo "Connection con1"
-
 select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
   from performance_schema.threads
   where PROCESSLIST_ID = connection_id();
@@ -45,8 +43,6 @@ select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
 
 connect(con2, "127.0.0.1", root,,test,$MASTER_MYPORT,);
 
---echo "Connection con2"
-
 select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
   from performance_schema.threads
   where PROCESSLIST_ID = connection_id();
@@ -55,8 +51,6 @@ select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
 
 connect(con3, "127.0.0.1", rootssl,,test,$MASTER_MYPORT,,SSL);
 
---echo "Connection con3"
-
 select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
   from performance_schema.threads
   where PROCESSLIST_ID = connection_id();

mysql-test/suite/perfschema/t/connection_type_win.test

@@ -4,7 +4,7 @@
 --source include/have_debug.inc
 --source include/have_perfschema.inc
 
---echo "Default connection"
+--echo # Default connection
 
 --vertical_results
 select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
@@ -34,8 +34,6 @@ SET GLOBAL general_log=       'ON';
 
 connect(con1, localhost, root,,);
 
---echo "Connection con1"
-
 select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
   from performance_schema.threads
   where PROCESSLIST_ID = connection_id();
@@ -44,8 +42,6 @@ select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
 
 connect(con2, "127.0.0.1", root,,test,$MASTER_MYPORT,);
 
---echo "Connection con2"
-
 select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
   from performance_schema.threads
   where PROCESSLIST_ID = connection_id();
@@ -54,8 +50,6 @@ select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
 
 connect(con3, "127.0.0.1", rootssl,,test,$MASTER_MYPORT,,SSL);
 
---echo "Connection con3"
-
 select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
   from performance_schema.threads
   where PROCESSLIST_ID = connection_id();

mysql-test/suite/perfschema/t/dml_handler.test

@@ -12,9 +12,9 @@
 # which should return error 1031, "Table storage engine for '<table name>'
 # doesn't have this option."
 #
---echo
+--echo #
 --echo # Create a temporary table of performance schema table names
---echo
+--echo #
  
 CREATE TEMPORARY TABLE table_list (id INT AUTO_INCREMENT, PRIMARY KEY (id)) AS
   SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES
@@ -25,10 +25,10 @@ SELECT COUNT(*) FROM table_list INTO @table_count;
 
 let $count=`SELECT @table_count`;
 
---echo
+--echo #
 --echo # For each table in the performance schema, attempt HANDLER...OPEN,
 --echo # which should fail with an error 1031, ER_ILLEGAL_HA.
---echo
+--echo #
 
 while ($count > 0)
 {

mysql-test/suite/perfschema/t/dml_setup_instruments.test

@@ -90,10 +90,10 @@ UNLOCK TABLES;
 LOCK TABLES performance_schema.setup_instruments WRITE;
 UNLOCK TABLES;
 
---echo
+--echo #
 --echo # Bug#13813193 ASSERTION `TABLE->READ_SET ==
 --echo # &TABLE->DEF_READ_SET' FAILED / MYSQL_UPDATE
---echo
+--echo #
 UPDATE performance_schema.setup_instruments SET timed='NO'
 ORDER BY RAND();
 

mysql-test/suite/perfschema/t/io_cache.test

@@ -11,9 +11,9 @@
 --source include/not_embedded.inc
 --source include/no_protocol.inc
 
---echo
+--echo #
 --echo ## Connection default
---echo
+--echo #
 --connection default
 --disable_warnings
 USE test;
@@ -23,9 +23,9 @@ SELECT @@global.binlog_cache_size;
 SELECT @@global.binlog_stmt_cache_size;
 SELECT * FROM performance_schema.setup_instruments WHERE name LIKE "%file/sql/io_cache%";
 
---echo
+--echo #
 --echo ## Connection con1
---echo
+--echo #
 connect(con1, localhost, root,,);
 USE test;
 CREATE TABLE t1 (s1 INT, s2 VARCHAR(4096));
@@ -103,9 +103,9 @@ COMMIT;
 SELECT COUNT(*) FROM t1;
 --disconnect con1
 
---echo
+--echo #
 --echo ## Connection default
---echo
+--echo #
 --connection default
 SELECT COUNT(*) FROM test.t1;
 

mysql-test/suite/perfschema/t/misc.test

@@ -204,7 +204,7 @@ select * from t1;
 select mysql_errno, returned_sqlstate, message_text, errors, warnings
   from performance_schema.events_statements_history where errors > 0;
   
---echo
+--echo #
 select mysql_errno, returned_sqlstate, message_text, errors, warnings from 
   performance_schema.events_statements_history_long where errors > 0;
 

mysql-test/suite/perfschema/t/pfs_upgrade_event.test

@@ -9,7 +9,7 @@
 
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
 
---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/t/pfs_upgrade_func.test

@@ -9,7 +9,7 @@
 
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
 
---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;

mysql-test/suite/perfschema/t/pfs_upgrade_proc.test

@@ -9,7 +9,7 @@
 
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
 
---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";

mysql-test/suite/perfschema/t/pfs_upgrade_table.test

@@ -9,7 +9,7 @@
 
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
 
---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);
 

mysql-test/suite/perfschema/t/pfs_upgrade_view.test

@@ -9,7 +9,7 @@
 
 let $MYSQLD_DATADIR= `SELECT @@datadir`;
 
---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";
 

mysql-test/suite/perfschema/t/rpl_statements.test

@@ -49,16 +49,16 @@ let $column_list=
 # Define instrument name for enable/disable instruments
 let $pfs_instrument='%statement/%';
 
---echo
+--echo #
 --echo #
 --echo # STEP 1 - CREATE AND REPLICATE TEST TABLES
 --echo #
 
 connection master;
 
---echo
---echo *** Create test tables
---echo
+--echo #
+--echo # *** Create test tables
+--echo #
 
 show global variables like 'binlog_format%';
 
@@ -72,26 +72,26 @@ create table test.marker(s1 int) engine=innodb;
 
 sync_slave_with_master;
 
---echo
---echo *** Clear statement events
+--echo #
+--echo # *** Clear statement events
 --source ../include/rpl_statements_truncate.inc
 
---echo
+--echo #
 --echo #
 --echo # STEP 2 - REPLICATE ONE ROW ON MASTER TO GET REPLICATION THREAD ID ON SLAVE
 --echo #
 
 connection master;
 
---echo
+--echo #
 insert into test.marker values (0);
---echo
+--echo #
 
 sync_slave_with_master;
 
---echo
---echo *** Verify row, get replication thread id, clear statement events
---echo
+--echo #
+--echo # *** Verify row, get replication thread id, clear statement events
+--echo #
 
 # TODO: Get slave thread id from threads using thread/sql/slave_sql event name
 
@@ -99,82 +99,82 @@ select thread_id into @slave_thread_id from performance_schema.events_statements
   where sql_text like '%marker%';
 let $slave_thread_id= `select @slave_thread_id`;
 
---echo *** Verify row inserted on master was replicated
+--echo # *** Verify row inserted on master was replicated
 select count(*) = 1 as 'Expect 1' from test.marker;
 
---echo *** Clear statement events
+--echo # *** Clear statement events
 --source ../include/rpl_statements_truncate.inc
 
---echo
+--echo #
 --echo #
 --echo # STEP 3 - PERFORM DML STATEMENTS ON MASTER
 --echo #
 
 connection master;
 
---echo
+--echo #
 show global variables like 'binlog_format%';
 
---echo *** Clear statement events
+--echo # *** Clear statement events
 --source ../include/rpl_statements_truncate.inc
 
---echo
---echo *** Create/drop table, create/drop database
---echo
+--echo #
+--echo # *** Create/drop table, create/drop database
+--echo #
 create database marker1_db;
 create database marker2_db;
 create table marker1_db.table1 (s1 int) engine=innodb;
 create table marker2_db.table1 (s1 int) engine=innodb;
 create table marker2_db.table2 (s1 int) engine=innodb;
 
---echo
---echo *** Transaction
+--echo #
+--echo # *** Transaction
 start transaction;
 insert into marker1_db.table1 values (1), (2), (3);
 insert into marker2_db.table1 values (1), (2), (3);
 commit;
 
---echo
---echo *** Alter
+--echo #
+--echo # *** Alter
 alter table marker1_db.table1 add column (s2 varchar(32));
 
---echo
---echo *** Insert, Update
+--echo #
+--echo # *** Insert, Update
 start transaction;
 insert into marker1_db.table1 values (4, 'four'), (5, 'five'), (6, 'six');
 update marker1_db.table1 set s1 = s1 + 1;
 commit;
 
---echo
---echo *** Rollback
+--echo #
+--echo # *** Rollback
 start transaction;
 insert into marker1_db.table1 values (7, 'seven'), (8, 'eight'), (9, 'nine');
 rollback;
 
---echo
---echo *** Autocommit, Delete, Drop
+--echo #
+--echo # *** Autocommit, Delete, Drop
 delete from marker1_db.table1 where s1 > 4;
 drop table marker2_db.table1;
 drop database marker2_db;
 
 --source ../include/disable_instruments.inc
 
---echo
---echo *** Examine statements events that will be compared on the slave
---echo
+--echo #
+--echo # *** Examine statements events that will be compared on the slave
+--echo #
 
 --replace_column 1 [THREAD_ID] 2 [EVENT_ID]
 
 eval select $column_list from performance_schema.events_statements_history_long
   where sql_text like '%marker%' order by event_id;
 
---echo
+--echo #
 --echo #
 --echo # STEP 4 - REPLICATE STATEMENT EVENTS ON MASTER TO SLAVE
 --echo #
---echo
---echo *** Store statement events in holding table, then replicate
---echo
+--echo #
+--echo # *** Store statement events in holding table, then replicate
+--echo #
 
 --source ../include/disable_instruments.inc
 
@@ -189,7 +189,7 @@ create table test.master_events_statements_history_long as
 
 --source ../include/enable_instruments.inc
 
---echo
+--echo #
 --echo #
 --echo # STEP 5 - VERIFY DML AND DDL STATEMENT EVENTS ON SLAVE
 --echo #
@@ -198,24 +198,24 @@ sync_slave_with_master;
 
 --source ../include/disable_instruments.inc
 
---echo
---echo *** List statement events from master
---echo
+--echo #
+--echo # *** List statement events from master
+--echo #
 --replace_column 1 [THREAD_ID] 2 [EVENT_ID]
 eval select $column_list from master_events_statements_history_long order by event_id;
 
---echo
---echo *** List statement events on slave
---echo
+--echo #
+--echo # *** List statement events on slave
+--echo #
 
 --replace_column 1 [THREAD_ID] 2 [EVENT_ID]
 
 eval select $column_list from performance_schema.events_statements_history_long
   where thread_id = @slave_thread_id and sql_text like '%marker%' order by event_id;
 
---echo
---echo *** Compare master and slave events
---echo
+--echo #
+--echo # *** Compare master and slave events
+--echo #
 
 # Note: The statement digest provides a more robust comparison than the
 # event name. However, in some cases, e.g. DROP TABLE, the server generates
@@ -224,7 +224,7 @@ eval select $column_list from performance_schema.events_statements_history_long
 # statements, so we use both methods to ensure coverage.
 
 --echo 
---echo *** Event name comparison - expect 0 mismatches
+--echo # *** Event name comparison - expect 0 mismatches
 --echo 
 
 select thread_id, event_id, event_name, digest_text, sql_text from performance_schema.events_statements_history_long t1
@@ -233,7 +233,7 @@ select thread_id, event_id, event_name, digest_text, sql_text from performance_s
     not exists (select * from master_events_statements_history_long t2 where t2.event_name = t1.event_name);
 
 --echo 
---echo *** Statement digest comparison - expect 1 mismatch for DROP TABLE
+--echo # *** Statement digest comparison - expect 1 mismatch for DROP TABLE
 --echo 
 
 --replace_column 1 [THREAD_ID] 2 [EVENT_ID] 4 [DIGEST]
@@ -243,7 +243,7 @@ select thread_id, event_id, event_name, digest, digest_text, sql_text from perfo
     sql_text like '%marker%' and
     not exists (select * from master_events_statements_history_long t2 where t2.digest = t1.digest);
 
---echo
+--echo #
 --echo #
 --echo # STEP 6 - DISABLE REPLICATED STATEMENT EVENTS ON SLAVE
 --echo #
@@ -255,49 +255,49 @@ update performance_schema.setup_instruments set enabled='no', timed='no'
 
 select * from performance_schema.setup_instruments where name like '%statement/abstract/relay_log%';
 
---echo
+--echo #
 --echo #
 --echo # STEP 7 - UPDATE TABLES ON MASTER, REPLICATE
 --echo #
 
 connection master;
 
---echo
---echo *** Clear statement events
+--echo #
+--echo # *** Clear statement events
 --source ../include/rpl_statements_truncate.inc
 
---echo *** Update some tables, then replicate
---echo
+--echo # *** Update some tables, then replicate
+--echo #
 
 insert into marker1_db.table1 values (999, '999'), (998, '998'), (997, '997');
 
---echo
+--echo #
 --echo #
 --echo # STEP 8 - VERIFY TABLE UPDATES FROM MASTER, EXPECT NO STATEMENT EVENTS ON SLAVE
 --echo #
 
 sync_slave_with_master;
 
---echo
---echo *** Confirm rows were replicated
---echo
+--echo #
+--echo # *** Confirm rows were replicated
+--echo #
 
 select * from marker1_db.table1 where s1 > 900 order by s1;
 
---echo
---echo *** Confirm that are no statements events from the replication thread
---echo
+--echo #
+--echo # *** Confirm that are no statements events from the replication thread
+--echo #
 
 select * from performance_schema.events_statements_history_long
   where thread_id = @slave_thread_id;
 
 --source ../include/enable_instruments.inc
 
---echo
+--echo #
 --echo #
 --echo # STEP 9 - CLEAN UP
 --echo #
---echo
+--echo #
 --disable_query_log
 --disable_warnings