diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-09-11 11:49:36 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-09-11 12:10:23 +0200 |
| commit | 40b743f99e8ca5ac479e8c559f8316b606033582 (patch) | |
| tree | 31cfcdb4be497a64bfefb11c3049709977585a9d | |
| parent | b42158be539c36dfd74cb1c8f82c864a4ba8fad7 (diff) | |
| download | mariadb-git-40b743f99e8ca5ac479e8c559f8316b606033582.tar.gz | |
remove redundant select in the perfschema.show_aggregate test
instead, include handler_rollback in the following per-connection selects
| -rw-r--r-- | mysql-test/suite/perfschema/r/show_aggregate.result | 23 | ||||
| -rw-r--r-- | mysql-test/suite/perfschema/t/show_aggregate.test | 14 |
2 files changed, 15 insertions, 22 deletions
diff --git a/mysql-test/suite/perfschema/r/show_aggregate.result b/mysql-test/suite/perfschema/r/show_aggregate.result index 7b104a56ba0..69861fa42c9 100644 --- a/mysql-test/suite/perfschema/r/show_aggregate.result +++ b/mysql-test/suite/perfschema/r/show_aggregate.result @@ -201,28 +201,23 @@ SET sr.acct = sr.a1 + sr.a2 + sr.a3; # Review per-thread status counts # USE performance_schema; -SELECT * FROM status_by_thread WHERE thread_id IN (@con1_id, @con2_id, @con3_id) AND variable_name IN ('handler_delete', 'handler_rollback') ORDER BY thread_id; -THREAD_ID VARIABLE_NAME VARIABLE_VALUE -thread_id Handler_delete 1 -thread_id Handler_rollback 1 -thread_id Handler_delete 2 -thread_id Handler_rollback 2 -thread_id Handler_delete 3 -thread_id Handler_rollback 3 # # Verify expected counts for 'handler_delete' per thread # -SELECT *, IF (variable_value = 1,'OK','ERROR') AS Expected FROM status_by_thread WHERE thread_id = @con1_id AND variable_name IN ('handler_delete'); +SELECT *, IF (variable_value = 1,'OK','ERROR') AS Expected FROM status_by_thread WHERE thread_id = @con1_id AND variable_name IN ('handler_delete', 'handler_rollback'); THREAD_ID VARIABLE_NAME VARIABLE_VALUE Expected -connect_1 Handler_delete 1 OK +con_1 Handler_delete 1 OK +con_1 Handler_rollback 1 OK # -SELECT *, IF (variable_value = 2,'OK','ERROR') AS Expected FROM status_by_thread WHERE thread_id = @con2_id AND variable_name IN ('handler_delete'); +SELECT *, IF (variable_value = 2,'OK','ERROR') AS Expected FROM status_by_thread WHERE thread_id = @con2_id AND variable_name IN ('handler_delete', 'handler_rollback'); THREAD_ID VARIABLE_NAME VARIABLE_VALUE Expected -connnect_2 Handler_delete 2 OK +con_2 Handler_delete 2 OK +con_2 Handler_rollback 2 OK # -SELECT *, IF (variable_value = 3,'OK','ERROR') AS Expected FROM status_by_thread WHERE thread_id = @con3_id AND variable_name IN ('handler_delete'); +SELECT *, IF (variable_value = 3,'OK','ERROR') AS Expected FROM status_by_thread WHERE thread_id = @con3_id AND variable_name IN ('handler_delete', 'handler_rollback'); THREAD_ID VARIABLE_NAME VARIABLE_VALUE Expected -connnect_3 Handler_delete 3 OK +con_3 Handler_delete 3 OK +con_3 Handler_rollback 3 OK # # STATUS_BY_THREAD vs. GLOBAL_STATUS # diff --git a/mysql-test/suite/perfschema/t/show_aggregate.test b/mysql-test/suite/perfschema/t/show_aggregate.test index 3f01de15b01..a15dea45268 100644 --- a/mysql-test/suite/perfschema/t/show_aggregate.test +++ b/mysql-test/suite/perfschema/t/show_aggregate.test @@ -130,20 +130,18 @@ SELECT thread_id INTO @con3_id FROM threads WHERE processlist_user IN ('user3'); --echo # Review per-thread status counts --echo # USE performance_schema; ---replace_column 1 thread_id -SELECT * FROM status_by_thread WHERE thread_id IN (@con1_id, @con2_id, @con3_id) AND variable_name IN ('handler_delete', 'handler_rollback') ORDER BY thread_id; --echo # --echo # Verify expected counts for 'handler_delete' per thread --echo # ---replace_column 1 connect_1 -SELECT *, IF (variable_value = 1,'OK','ERROR') AS Expected FROM status_by_thread WHERE thread_id = @con1_id AND variable_name IN ('handler_delete'); +--replace_column 1 con_1 +SELECT *, IF (variable_value = 1,'OK','ERROR') AS Expected FROM status_by_thread WHERE thread_id = @con1_id AND variable_name IN ('handler_delete', 'handler_rollback'); --echo # ---replace_column 1 connnect_2 -SELECT *, IF (variable_value = 2,'OK','ERROR') AS Expected FROM status_by_thread WHERE thread_id = @con2_id AND variable_name IN ('handler_delete'); +--replace_column 1 con_2 +SELECT *, IF (variable_value = 2,'OK','ERROR') AS Expected FROM status_by_thread WHERE thread_id = @con2_id AND variable_name IN ('handler_delete', 'handler_rollback'); --echo # ---replace_column 1 connnect_3 -SELECT *, IF (variable_value = 3,'OK','ERROR') AS Expected FROM status_by_thread WHERE thread_id = @con3_id AND variable_name IN ('handler_delete'); +--replace_column 1 con_3 +SELECT *, IF (variable_value = 3,'OK','ERROR') AS Expected FROM status_by_thread WHERE thread_id = @con3_id AND variable_name IN ('handler_delete', 'handler_rollback'); --echo # --echo # STATUS_BY_THREAD vs. GLOBAL_STATUS |