diff options
Diffstat (limited to 'mysql-test/suite/perfschema/t')
13 files changed, 5 insertions, 94 deletions
diff --git a/mysql-test/suite/perfschema/t/global_read_lock.test b/mysql-test/suite/perfschema/t/global_read_lock.test index 0883ed1ed42..4217de0d723 100644 --- a/mysql-test/suite/perfschema/t/global_read_lock.test +++ b/mysql-test/suite/perfschema/t/global_read_lock.test @@ -15,7 +15,6 @@ create user pfsuser@localhost; grant SELECT, UPDATE, LOCK TABLES on performance_schema.* to pfsuser@localhost; flush privileges; ---echo connect (con1, localhost, pfsuser, , test); connect (con1, localhost, pfsuser, , test); lock tables performance_schema.setup_instruments read; @@ -29,12 +28,10 @@ update performance_schema.setup_instruments set enabled='NO'; update performance_schema.setup_instruments set enabled='YES'; unlock tables; ---echo connection default; connection default; flush tables with read lock; ---echo connection con1; connection con1; lock tables performance_schema.setup_instruments read; @@ -47,7 +44,6 @@ unlock tables; --send lock tables performance_schema.setup_instruments write; ---echo connection default; connection default; let $wait_condition= select 1 from performance_schema.events_waits_current where event_name like "wait/synch/cond/sql/MDL_context::COND_wait_status"; @@ -75,7 +71,6 @@ unlock tables; disconnect con1; --source include/wait_until_disconnected.inc ---echo connection default; connection default; drop user pfsuser@localhost; diff --git a/mysql-test/suite/perfschema/t/nesting.test b/mysql-test/suite/perfschema/t/nesting.test index 7f1c0b570ad..9ab59157f50 100644 --- a/mysql-test/suite/perfschema/t/nesting.test +++ b/mysql-test/suite/perfschema/t/nesting.test @@ -69,8 +69,6 @@ truncate performance_schema.events_statements_history_long; connect (con1, localhost, user1, , ); -echo "================== con1 connected =================="; - select "MARKER_BEGIN" as marker; select "This is simple statement one" as payload; @@ -88,8 +86,6 @@ select "MARKER_END" as marker; select "Con1 is done with payload" as status; -echo "================== con1 done =================="; - --connection default set @con1_tid = (select thread_id from performance_schema.threads diff --git a/mysql-test/suite/perfschema/t/one_thread_per_con.test b/mysql-test/suite/perfschema/t/one_thread_per_con.test index d295f2e658c..6aeec55dbb5 100644 --- a/mysql-test/suite/perfschema/t/one_thread_per_con.test +++ b/mysql-test/suite/perfschema/t/one_thread_per_con.test @@ -29,26 +29,17 @@ show variables like "thread_handling"; # Code to test connection con1; - --- echo "----------------- Connection 1" create table test.t1(a int) engine=MYISAM; connection con2; - --- echo "----------------- Connection 2" create table test.t2(a int) engine=MYISAM; connection con3; - --- echo "----------------- Connection 3" create table test.t3(a int) engine=MYISAM; # Verification connection default; - --- echo "----------------- Connection default" - --disable_query_log eval set @tid= $con1_THREAD_ID; --enable_query_log diff --git a/mysql-test/suite/perfschema/t/read_only.test b/mysql-test/suite/perfschema/t/read_only.test index 7b0284a7a48..0020c64937b 100644 --- a/mysql-test/suite/perfschema/t/read_only.test +++ b/mysql-test/suite/perfschema/t/read_only.test @@ -15,15 +15,12 @@ create user pfsuser@localhost; grant SELECT, UPDATE on performance_schema.* to pfsuser@localhost; flush privileges; ---echo connect (con1, localhost, pfsuser, , test); connect (con1, localhost, pfsuser, , test); ---echo connection default; connection default; set global read_only=0; ---echo connection con1; connection con1; select @@global.read_only; @@ -34,12 +31,10 @@ update performance_schema.setup_instruments set enabled='NO'; update performance_schema.setup_instruments set enabled='YES'; --enable_result_log ---echo connection default; connection default; set global read_only=1; ---echo connection con1; connection con1; select @@global.read_only; @@ -52,14 +47,12 @@ update performance_schema.setup_instruments set enabled='NO'; update performance_schema.setup_instruments set enabled='YES'; --enable_result_log ---echo connection default; connection default; grant super on *.* to pfsuser@localhost; flush privileges; disconnect con1; ---echo connect (con1, localhost, pfsuser, , test); connect (con1, localhost, pfsuser, , test); select @@global.read_only; @@ -73,7 +66,6 @@ update performance_schema.setup_instruments set enabled='YES'; disconnect con1; --source include/wait_until_disconnected.inc ---echo connection default; connection default; set global read_only= @start_read_only; diff --git a/mysql-test/suite/perfschema/t/relaylog.test b/mysql-test/suite/perfschema/t/relaylog.test index 1455d1297e2..12fc96a8b27 100644 --- a/mysql-test/suite/perfschema/t/relaylog.test +++ b/mysql-test/suite/perfschema/t/relaylog.test @@ -34,7 +34,6 @@ drop table test.t1; # connection master; --- echo "============ Performance schema on master ============" select substring(file_name, locate("master-", file_name)) as FILE_NAME, diff --git a/mysql-test/suite/perfschema/t/rpl_gtid_func.test b/mysql-test/suite/perfschema/t/rpl_gtid_func.test index 6373d4284dc..048dbca0576 100644 --- a/mysql-test/suite/perfschema/t/rpl_gtid_func.test +++ b/mysql-test/suite/perfschema/t/rpl_gtid_func.test @@ -6,7 +6,6 @@ -- source include/master-slave.inc connection master; ---echo **** On Master **** --disable_warnings drop table if exists test.marker; @@ -23,7 +22,6 @@ update performance_schema.setup_instruments set enabled='YES', timed='YES'; sync_slave_with_master; ---echo **** On Slave **** truncate table performance_schema.events_waits_history_long; truncate table performance_schema.events_statements_summary_by_digest; @@ -32,7 +30,6 @@ update performance_schema.setup_instruments set enabled='YES', timed='NO'; connection master; ---echo **** On Master **** select * from performance_schema.setup_instruments where timed='NO'; @@ -52,7 +49,6 @@ select digest_text, count_star insert into test.marker values (2); sync_slave_with_master; ---echo **** On Slave **** select * from test.marker; @@ -72,11 +68,9 @@ select digest_text, count_star where digest_text like "%in_%_digest%"; connection master; ---echo **** On Master **** delete from performance_schema.setup_objects where object_schema='master'; sync_slave_with_master; ---echo **** On Slave **** delete from performance_schema.setup_objects where object_schema='slave'; diff --git a/mysql-test/suite/perfschema/t/rpl_statements.test b/mysql-test/suite/perfschema/t/rpl_statements.test index 4f65cdcbd7b..a4604e7904c 100644 --- a/mysql-test/suite/perfschema/t/rpl_statements.test +++ b/mysql-test/suite/perfschema/t/rpl_statements.test @@ -57,10 +57,6 @@ let $pfs_instrument='%statement/%'; connection master; --echo ---echo ************** ---echo *** MASTER *** ---echo ************** ---echo --echo *** Create test tables --echo @@ -76,9 +72,6 @@ create table test.marker(s1 int) engine=innodb; sync_slave_with_master; ---echo ************** ---echo *** SLAVE *** ---echo ************** --echo --echo *** Clear statement events --source ../include/rpl_statements_truncate.inc @@ -90,18 +83,12 @@ sync_slave_with_master; connection master; ---echo ************** ---echo *** MASTER *** ---echo ************** --echo insert into test.marker values (0); --echo sync_slave_with_master; ---echo ************** ---echo *** SLAVE *** ---echo ************** --echo --echo *** Verify row, get replication thread id, clear statement events --echo @@ -125,9 +112,6 @@ select count(*) = 1 as 'Expect 1' from test.marker; connection master; ---echo ************** ---echo *** MASTER *** ---echo ************** --echo show variables like 'binlog_format%'; @@ -212,10 +196,6 @@ create table test.master_events_statements_history_long as sync_slave_with_master; ---echo ************** ---echo *** SLAVE *** ---echo ************** - --source ../include/disable_instruments.inc --echo @@ -282,9 +262,6 @@ select * from performance_schema.setup_instruments where name like '%statement/a connection master; ---echo ************** ---echo *** MASTER *** ---echo ************** --echo --echo *** Clear statement events --source ../include/rpl_statements_truncate.inc @@ -301,9 +278,6 @@ insert into marker1_db.table1 values (999, '999'), (998, '998'), (997, '997'); sync_slave_with_master; ---echo ************** ---echo *** SLAVE *** ---echo ************** --echo --echo *** Confirm rows were replicated --echo diff --git a/mysql-test/suite/perfschema/t/setup_actors.test b/mysql-test/suite/perfschema/t/setup_actors.test index 39d60b0ab03..1d4a86b6517 100644 --- a/mysql-test/suite/perfschema/t/setup_actors.test +++ b/mysql-test/suite/perfschema/t/setup_actors.test @@ -46,7 +46,6 @@ grant select on test.* to user5@localhost; flush privileges; ---echo # Switch to (con1, localhost, user1, , ) connect (con1, localhost, user1, , ); # INSTRUMENTED must be NO because there is no match in performance_schema.setup_actors @@ -56,12 +55,10 @@ where PROCESSLIST_ID = connection_id(); let $con1_thread_id= `select THREAD_ID from performance_schema.threads where PROCESSLIST_ID = connection_id()`; ---echo # Switch to connection default --connection default insert into performance_schema.setup_actors values ('%', 'user1', '%'); ---echo # Switch to connection con1 --connection con1 # INSTRUMENTED must be NO because there was no match in performance_schema.setup_actors # when our current session made its connect. Later changes in setup_actors have no @@ -70,10 +67,8 @@ select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST from performance_schema.threads where PROCESSLIST_ID = connection_id(); ---echo # Disconnect con1 --disconnect con1 ---echo # Switch to (con2, localhost, user2, , ) connect (con2, localhost, user2, , ); # INSTRUMENTED must be YES because there is a match via @@ -84,10 +79,8 @@ where PROCESSLIST_ID=connection_id(); let $con2_thread_id= `select THREAD_ID from performance_schema.threads where PROCESSLIST_ID = connection_id()`; ---echo # Disconnect con2 --disconnect con2 ---echo # Switch to connection default --connection default # If a thread dies, we don't expect its THREAD_ID value will be re-used. if ($con2_thread_id <= $con1_thread_id) @@ -102,7 +95,6 @@ drop table if exists test.t1; create table test.t1 (col1 bigint); lock table test.t1 write; ---echo # Switch to (con3, localhost, user3, , ) connect (con3, localhost, user3, , ); # INSTRUMENTED must be YES because there is a match via @@ -138,7 +130,6 @@ where PROCESSLIST_ID = connection_id(); --echo # comes back. We will pull this later. send insert into test.t1 set col1 = 1; ---echo # Switch to (con4, localhost, user4, , ) connect (con4, localhost, user4, , ); --echo # Poll till INFO is no more NULL and State = 'Waiting for table metadata lock'. let $wait_condition= select count(*) from information_schema.processlist @@ -154,29 +145,23 @@ from performance_schema.threads T inner join information_schema.PROCESSLIST P where T.PROCESSLIST_USER = 'user3' and T.NAME = 'thread/sql/one_connection'; # Resolve the situation + some cleanup ---echo # Switch to connection default --connection default unlock tables; ---echo # Switch to connection con3 and reap the result of the no more blocked insert --connection con3 +--echo # Reap the result of the no more blocked insert --reap ---echo # Switch to connection default --connection default drop table test.t1; ---echo # Disconnect con3 --disconnect con3 ---echo # Switch to connection con4 --connection con4 # INSTRUMENTED must be NO because there is no match in performance_schema.setup_actors select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST from performance_schema.threads where PROCESSLIST_ID = connection_id(); ---echo # Disconnect con4 --disconnect con4 ---echo # Switch to connection default --connection default insert into performance_schema.setup_actors @@ -185,7 +170,6 @@ values ('localhost', '%', '%'); select * from performance_schema.setup_actors order by USER, HOST, ROLE; ---echo # Switch to (con4b, localhost, user4, , ) connect (con4b, localhost, user4, , ); # INSTRUMENTED must be YES because there is a match via @@ -194,10 +178,8 @@ select NAME, TYPE, INSTRUMENTED, PROCESSLIST_USER, PROCESSLIST_HOST from performance_schema.threads where PROCESSLIST_ID = connection_id(); ---echo # Disconnect con4b --disconnect con4b ---echo # Switch to connection default --connection default insert into performance_schema.setup_actors values ('%', 'user5', '%'); @@ -206,7 +188,6 @@ create sql security definer view test.v1 as select NAME, TYPE, INSTRUMENTED, PRO from performance_schema.threads where PROCESSLIST_ID = connection_id(); ---echo # Switch to (con5, localhost, user5, , ) connect (con5, localhost, user5, , ); --error ER_TABLEACCESS_DENIED_ERROR @@ -221,12 +202,10 @@ select * from performance_schema.threads; # Therefore PROCESSLIST_USER must be 'user5' though we run with right's of definer 'root' select * from test.v1; ---echo # Disconnect con5 --disconnect con5 --source include/wait_until_disconnected.inc ---echo # Switch to connection default and cleanup --connection default drop view test.v1; diff --git a/mysql-test/suite/perfschema/t/socket_instances_func.test b/mysql-test/suite/perfschema/t/socket_instances_func.test index 12411103579..4cf58d42185 100644 --- a/mysql-test/suite/perfschema/t/socket_instances_func.test +++ b/mysql-test/suite/perfschema/t/socket_instances_func.test @@ -58,8 +58,6 @@ let $con0_thread_id= `SELECT @thread_id`; # # Start connection with IP = localhost (127.0.0.1 or ::1) ---echo # Establish local TCP/IP connection (con1,localhost,root,,test,,) ---disable_query_log ONCE --connect (con1,$my_localhost,root,,test,,$MASTER_MYPORT) if($my_socket_debug) @@ -81,7 +79,6 @@ WHERE THREAD_ID = @thread_id; let $con1_thread_id= `SELECT @thread_id`; let $con1_port= `SELECT @port`; ---echo # Switch to connection default --connection default # @@ -89,8 +86,6 @@ let $con1_port= `SELECT @port`; # # Start a second connection with IP = localhost (127.0.0.1 or ::1) ---echo # Establish second local TCP/IP connection (con1,localhost,root,,test,,) ---disable_query_log ONCE --connect (con2,$my_localhost,root,,test,,$MASTER_MYPORT) if($my_socket_debug) @@ -112,7 +107,6 @@ WHERE THREAD_ID = @thread_id; let $con2_thread_id= `SELECT @thread_id`; let $con2_port= `SELECT @port`; ---echo # Switch to connection default --connection default # @@ -120,7 +114,6 @@ let $con2_port= `SELECT @port`; # # Connect via mysql sock file ---echo # Establish local unix domain connection (con3,localhost,root,,test,,) --connect(con3,localhost,root,,test,,) if($my_socket_debug) @@ -142,7 +135,6 @@ WHERE THREAD_ID = @thread_id; let $con3_port= `SELECT @port`; let $con3_thread_id= `SELECT @thread_id`; ---echo # Switch to connection default --connection default # @@ -419,7 +411,6 @@ $part; # DROP CLIENT CONNECTIONS # ---echo # Disconnect con1, con2 and con3 --connection con1 --disconnect con1 --source include/wait_until_disconnected.inc diff --git a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test index bf04e62e1b5..99f89bd3225 100644 --- a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test +++ b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test @@ -1653,7 +1653,7 @@ if($print_details) --enable_result_log --horizontal_results --echo # Dump detailed differences after - before statement execution - --echo # 1. The statement executing connection and hopefully noone else + --echo # 1. The statement executing connection and hopefully no one else SELECT @default_object_instance_begin; SELECT EVENT_NAME, OBJECT_INSTANCE_BEGIN, COUNT_READ, SUM_NUMBER_OF_BYTES_READ, diff --git a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test index cefaf1de549..0ecb51af203 100644 --- a/mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test +++ b/mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test @@ -1663,7 +1663,7 @@ if($print_details) --enable_result_log --horizontal_results --echo # Dump detailed differences after - before statement execution - --echo # 1. The statement executing connection and hopefully noone else + --echo # 1. The statement executing connection and hopefully no one else SELECT @default_object_instance_begin; SELECT EVENT_NAME, OBJECT_INSTANCE_BEGIN, COUNT_READ, SUM_NUMBER_OF_BYTES_READ, diff --git a/mysql-test/suite/perfschema/t/start_server_low_digest.test b/mysql-test/suite/perfschema/t/start_server_low_digest.test index 6f06def169b..f1ff90d2413 100644 --- a/mysql-test/suite/perfschema/t/start_server_low_digest.test +++ b/mysql-test/suite/perfschema/t/start_server_low_digest.test @@ -18,4 +18,4 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1 --echo #################################### --echo # QUERYING PS STATEMENT DIGEST --echo #################################### -SELECT event_name, digest, digest_text, sql_text FROM events_statements_history_long; +SELECT event_name, digest_text, sql_text FROM events_statements_history_long; diff --git a/mysql-test/suite/perfschema/t/threads_mysql-master.opt b/mysql-test/suite/perfschema/t/threads_mysql-master.opt index f93413a61e5..00efa80d41e 100644 --- a/mysql-test/suite/perfschema/t/threads_mysql-master.opt +++ b/mysql-test/suite/perfschema/t/threads_mysql-master.opt @@ -1 +1 @@ ---event-scheduler +--event-scheduler --thread-cache-size=0 |