Commit e3e66a57 authored by Sergei Golubchik's avatar Sergei Golubchik

make perfschema.show_aggregate test more debuggable

parent fbd11d5f
...@@ -7,6 +7,7 @@ SET @@session.sql_log_bin=OFF; ...@@ -7,6 +7,7 @@ SET @@session.sql_log_bin=OFF;
# CREATE 3 CLIENTS, 3 CONNECTIONS, RESULTS TABLE # CREATE 3 CLIENTS, 3 CONNECTIONS, RESULTS TABLE
connection default; connection default;
USE test; USE test;
flush status;
# #
# Create results table # Create results table
CREATE TABLE test.status_results CREATE TABLE test.status_results
...@@ -204,100 +205,99 @@ USE performance_schema; ...@@ -204,100 +205,99 @@ USE performance_schema;
# #
# Verify expected counts for 'handler_delete' per thread # 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', 'handler_rollback'); SELECT *, IF (variable_value = 1,'OK1','ERROR1') 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 THREAD_ID VARIABLE_NAME VARIABLE_VALUE Expected
con_1 Handler_delete 1 OK con_1 Handler_delete 1 OK1
con_1 Handler_rollback 1 OK con_1 Handler_rollback 1 OK1
# #
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'); SELECT *, IF (variable_value = 2,'OK2','ERROR2') 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 THREAD_ID VARIABLE_NAME VARIABLE_VALUE Expected
con_2 Handler_delete 2 OK con_2 Handler_delete 2 OK2
con_2 Handler_rollback 2 OK con_2 Handler_rollback 2 OK2
# #
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'); SELECT *, IF (variable_value = 3,'OK3','ERROR3') 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 THREAD_ID VARIABLE_NAME VARIABLE_VALUE Expected
con_3 Handler_delete 3 OK con_3 Handler_delete 3 OK3
con_3 Handler_rollback 3 OK con_3 Handler_rollback 3 OK3
# #
# STATUS_BY_THREAD vs. GLOBAL_STATUS # STATUS_BY_THREAD vs. GLOBAL_STATUS
# #
SELECT variable_name, t1, t2, t3, delta, thread, IF(thread=delta,'OK','ERROR') Expected SELECT variable_name, t1, t2, t3, delta, thread, IF(thread=delta,'OK4','ERROR4') Expected
FROM test.status_results FROM test.status_results
ORDER BY variable_name; ORDER BY variable_name;
variable_name t1 t2 t3 delta thread Expected variable_name t1 t2 t3 delta thread Expected
Handler_delete 1 2 3 6 6 OK Handler_delete 1 2 3 6 6 OK4
Handler_rollback 1 2 3 6 6 OK Handler_rollback 1 2 3 6 6 OK4
# #
# ================================================================================ # ================================================================================
# TEST 2: STATUS_BY_USER: Verify expected status counts per user (1,2,3) # TEST 2: STATUS_BY_USER: Verify expected status counts per user (1,2,3)
# ================================================================================ # ================================================================================
SELECT *, IF (variable_value = 1,'OK','ERROR') AS Expected FROM status_by_user WHERE user IN ('user1') AND variable_name IN ('handler_delete'); SELECT *, IF (variable_value = 1,'OK5','ERROR5') AS Expected FROM status_by_user WHERE user IN ('user1') AND variable_name IN ('handler_delete');
USER VARIABLE_NAME VARIABLE_VALUE Expected USER VARIABLE_NAME VARIABLE_VALUE Expected
user1 Handler_delete 1 OK user1 Handler_delete 1 OK5
# #
SELECT *, IF (variable_value = 2,'OK','ERROR') AS Expected FROM status_by_user WHERE user IN ('user2') AND variable_name IN ('handler_delete'); SELECT *, IF (variable_value = 2,'OK6','ERROR6') AS Expected FROM status_by_user WHERE user IN ('user2') AND variable_name IN ('handler_delete');
USER VARIABLE_NAME VARIABLE_VALUE Expected USER VARIABLE_NAME VARIABLE_VALUE Expected
user2 Handler_delete 2 OK user2 Handler_delete 2 OK6
# #
SELECT *, IF (variable_value = 3,'OK','ERROR') AS Expected FROM status_by_user WHERE user IN ('user3') AND variable_name IN ('handler_delete'); SELECT *, IF (variable_value = 3,'OK7','ERROR7') AS Expected FROM status_by_user WHERE user IN ('user3') AND variable_name IN ('handler_delete');
USER VARIABLE_NAME VARIABLE_VALUE Expected USER VARIABLE_NAME VARIABLE_VALUE Expected
user3 Handler_delete 3 OK user3 Handler_delete 3 OK7
# #
# STATUS_BY_USER vs. GLOBAL_STATUS # STATUS_BY_USER vs. GLOBAL_STATUS
# #
SELECT variable_name, u1, u2, u3, delta, user, IF(user=delta,'OK','ERROR') Expected SELECT variable_name, u1, u2, u3, delta, user, IF(user=delta,'OK8','ERROR8') Expected
FROM test.status_results FROM test.status_results
ORDER BY variable_name; ORDER BY variable_name;
variable_name u1 u2 u3 delta user Expected variable_name u1 u2 u3 delta user Expected
Handler_delete 1 2 3 6 6 OK Handler_delete 1 2 3 6 6 OK8
Handler_rollback 1 2 3 6 6 OK Handler_rollback 1 2 3 6 6 OK8
# #
# ================================================================================ # ================================================================================
# TEST 3: STATUS_BY_ACCOUNT: Verify expected status counts per user, host (1,2,3) # TEST 3: STATUS_BY_ACCOUNT: Verify expected status counts per user, host (1,2,3)
# ================================================================================ # ================================================================================
SELECT *, IF (variable_value = 1,'OK','ERROR') AS Expected FROM status_by_account WHERE user IN ('user1') AND variable_name IN ('handler_delete'); SELECT *, IF (variable_value = 1,'OK9','ERROR9') AS Expected FROM status_by_account WHERE user IN ('user1') AND variable_name IN ('handler_delete');
USER HOST VARIABLE_NAME VARIABLE_VALUE Expected USER HOST VARIABLE_NAME VARIABLE_VALUE Expected
user1 localhost Handler_delete 1 OK user1 localhost Handler_delete 1 OK9
# #
SELECT *, IF (variable_value = 2,'OK','ERROR') AS Expected FROM status_by_account WHERE user IN ('user2') AND variable_name IN ('handler_delete'); SELECT *, IF (variable_value = 2,'OKa','ERRORa') AS Expected FROM status_by_account WHERE user IN ('user2') AND variable_name IN ('handler_delete');
USER HOST VARIABLE_NAME VARIABLE_VALUE Expected USER HOST VARIABLE_NAME VARIABLE_VALUE Expected
user2 localhost Handler_delete 2 OK user2 localhost Handler_delete 2 OKa
# #
SELECT *, IF (variable_value = 3,'OK','ERROR') AS Expected FROM status_by_account WHERE user IN ('user3') AND variable_name IN ('handler_delete'); SELECT *, IF (variable_value = 3,'OKb','ERRORb') AS Expected FROM status_by_account WHERE user IN ('user3') AND variable_name IN ('handler_delete');
USER HOST VARIABLE_NAME VARIABLE_VALUE Expected USER HOST VARIABLE_NAME VARIABLE_VALUE Expected
user3 localhost Handler_delete 3 OK user3 localhost Handler_delete 3 OKb
# #
# STATUS_BY_ACCOUNT vs. GLOBAL_STATUS # STATUS_BY_ACCOUNT vs. GLOBAL_STATUS
# #
SELECT variable_name, a1, a2, a3, delta, acct, IF(acct=delta,'OK','ERROR') Expected SELECT variable_name, a1, a2, a3, delta, acct, IF(acct=delta,'OKc','ERRORc') Expected
FROM test.status_results FROM test.status_results
ORDER BY variable_name; ORDER BY variable_name;
variable_name a1 a2 a3 delta acct Expected variable_name a1 a2 a3 delta acct Expected
Handler_delete 1 2 3 6 6 OK Handler_delete 1 2 3 6 6 OKc
Handler_rollback 1 2 3 6 6 OK Handler_rollback 1 2 3 6 6 OKc
# ================================================================================ # ================================================================================
# TEST 4: STATUS_BY_HOST: Verify expected status counts per host (6) # TEST 4: STATUS_BY_HOST: Verify expected status counts per host (6)
# ================================================================================ # ================================================================================
SELECT *, IF (variable_value = 6,'OK','ERROR') AS Expected FROM status_by_host WHERE host IN ('localhost') AND variable_name IN ('handler_delete'); SELECT *, IF (variable_value = 6,'OKd','ERRORd') AS Expected FROM status_by_host WHERE host IN ('localhost') AND variable_name IN ('handler_delete');
HOST VARIABLE_NAME VARIABLE_VALUE Expected HOST VARIABLE_NAME VARIABLE_VALUE Expected
localhost Handler_delete 6 OK localhost Handler_delete 6 OKd
# #
# STATUS_BY_HOST vs. GLOBAL_STATUS # STATUS_BY_HOST vs. GLOBAL_STATUS
# #
# Special case: No way to isolate pre-existing 'localhost' activity, so # Special case: No way to isolate pre-existing 'localhost' activity, so
# just check global totals = sum(status_by_host). # just check global totals = sum(status_by_host).
# #
SELECT variable_name, h1, h2, h3, delta, host, IF(host=delta,'OK','ERROR') Expected SELECT variable_name, h1, h2, h3, delta, host, IF(host=delta,'OKe','ERRORe') Expected
FROM test.status_results FROM test.status_results
ORDER BY variable_name; ORDER BY variable_name;
variable_name h1 h2 h3 delta host Expected variable_name h1 h2 h3 delta host Expected
Handler_delete 6 0 0 6 6 OK Handler_delete 6 0 0 6 6 OKe
Handler_rollback 6 0 0 6 6 OK Handler_rollback 6 0 0 6 6 OKe
# #
# ================================================================================ # ================================================================================
# DISCONNECT ALL USERS AND RUN THE TESTS AGAIN. RESULTS SHOULD NOT CHANGE. # DISCONNECT ALL USERS AND RUN THE TESTS AGAIN. RESULTS SHOULD NOT CHANGE.
# ================================================================================ # ================================================================================
connection default;
disconnect con1; disconnect con1;
disconnect con2; disconnect con2;
disconnect con3; disconnect con3;
...@@ -429,68 +429,68 @@ USE performance_schema; ...@@ -429,68 +429,68 @@ USE performance_schema;
# ================================================================================ # ================================================================================
# TEST 5: STATUS_BY_USER: Verify expected status counts per user (1,2,3) # TEST 5: STATUS_BY_USER: Verify expected status counts per user (1,2,3)
# ================================================================================ # ================================================================================
SELECT *, IF (variable_value = 1,'OK','ERROR') AS Expected FROM status_by_user WHERE user IN ('user1') AND variable_name IN ('handler_delete'); SELECT *, IF (variable_value = 1,'OKf','ERRORf') AS Expected FROM status_by_user WHERE user IN ('user1') AND variable_name IN ('handler_delete');
USER VARIABLE_NAME VARIABLE_VALUE Expected USER VARIABLE_NAME VARIABLE_VALUE Expected
user1 Handler_delete 1 OK user1 Handler_delete 1 OKf
# #
SELECT *, IF (variable_value = 2,'OK','ERROR') AS Expected FROM status_by_user WHERE user IN ('user2') AND variable_name IN ('handler_delete'); SELECT *, IF (variable_value = 2,'OKg','ERRORg') AS Expected FROM status_by_user WHERE user IN ('user2') AND variable_name IN ('handler_delete');
USER VARIABLE_NAME VARIABLE_VALUE Expected USER VARIABLE_NAME VARIABLE_VALUE Expected
user2 Handler_delete 2 OK user2 Handler_delete 2 OKg
# #
SELECT *, IF (variable_value = 3,'OK','ERROR') AS Expected FROM status_by_user WHERE user IN ('user3') AND variable_name IN ('handler_delete'); SELECT *, IF (variable_value = 3,'OKh','ERRORh') AS Expected FROM status_by_user WHERE user IN ('user3') AND variable_name IN ('handler_delete');
USER VARIABLE_NAME VARIABLE_VALUE Expected USER VARIABLE_NAME VARIABLE_VALUE Expected
user3 Handler_delete 3 OK user3 Handler_delete 3 OKh
# #
# STATUS_BY_USER vs. GLOBAL_STATUS # STATUS_BY_USER vs. GLOBAL_STATUS
# #
SELECT variable_name, u1, u2, u3, delta, user, IF(user=delta,'OK','ERROR') Expected SELECT variable_name, u1, u2, u3, delta, user, IF(user=delta,'OKi','ERRORi') Expected
FROM test.status_results FROM test.status_results
ORDER BY variable_name; ORDER BY variable_name;
variable_name u1 u2 u3 delta user Expected variable_name u1 u2 u3 delta user Expected
Handler_delete 1 2 3 6 6 OK Handler_delete 1 2 3 6 6 OKi
Handler_rollback 1 2 3 6 6 OK Handler_rollback 1 2 3 6 6 OKi
# #
# ================================================================================ # ================================================================================
# TEST 6: STATUS_BY_ACCOUNT: Verify expected status counts per user:host (1,2,3) # TEST 6: STATUS_BY_ACCOUNT: Verify expected status counts per user:host (1,2,3)
# ================================================================================ # ================================================================================
SELECT *, IF (variable_value = 1,'OK','ERROR') AS Expected FROM status_by_account WHERE user IN ('user1') AND variable_name IN ('handler_delete'); SELECT *, IF (variable_value = 1,'OKj','ERRORj') AS Expected FROM status_by_account WHERE user IN ('user1') AND variable_name IN ('handler_delete');
USER HOST VARIABLE_NAME VARIABLE_VALUE Expected USER HOST VARIABLE_NAME VARIABLE_VALUE Expected
user1 localhost Handler_delete 1 OK user1 localhost Handler_delete 1 OKj
# #
SELECT *, IF (variable_value = 2,'OK','ERROR') AS Expected FROM status_by_account WHERE user IN ('user2') AND variable_name IN ('handler_delete'); SELECT *, IF (variable_value = 2,'OKk','ERRORk') AS Expected FROM status_by_account WHERE user IN ('user2') AND variable_name IN ('handler_delete');
USER HOST VARIABLE_NAME VARIABLE_VALUE Expected USER HOST VARIABLE_NAME VARIABLE_VALUE Expected
user2 localhost Handler_delete 2 OK user2 localhost Handler_delete 2 OKk
# #
SELECT *, IF (variable_value = 3,'OK','ERROR') AS Expected FROM status_by_account WHERE user IN ('user3') AND variable_name IN ('handler_delete'); SELECT *, IF (variable_value = 3,'OKl','ERRORl') AS Expected FROM status_by_account WHERE user IN ('user3') AND variable_name IN ('handler_delete');
USER HOST VARIABLE_NAME VARIABLE_VALUE Expected USER HOST VARIABLE_NAME VARIABLE_VALUE Expected
user3 localhost Handler_delete 3 OK user3 localhost Handler_delete 3 OKl
# #
# STATUS_BY_ACCOUNT vs. GLOBAL_STATUS # STATUS_BY_ACCOUNT vs. GLOBAL_STATUS
# #
SELECT variable_name, a1, a2, a3, delta, acct, IF(acct=delta,'OK','ERROR') Expected SELECT variable_name, a1, a2, a3, delta, acct, IF(acct=delta,'OKn','ERRORn') Expected
FROM test.status_results FROM test.status_results
ORDER BY variable_name; ORDER BY variable_name;
variable_name a1 a2 a3 delta acct Expected variable_name a1 a2 a3 delta acct Expected
Handler_delete 1 2 3 6 6 OK Handler_delete 1 2 3 6 6 OKn
Handler_rollback 1 2 3 6 6 OK Handler_rollback 1 2 3 6 6 OKn
# ================================================================================ # ================================================================================
# TEST 7: STATUS_BY_HOST: Verify expected status counts per host (6) # TEST 7: STATUS_BY_HOST: Verify expected status counts per host (6)
# ================================================================================ # ================================================================================
SELECT *, IF (variable_value = 6,'OK','ERROR') AS Expected FROM status_by_host WHERE host IN ('localhost') AND variable_name IN ('handler_delete'); SELECT *, IF (variable_value = 6,'OKo','ERRORo') AS Expected FROM status_by_host WHERE host IN ('localhost') AND variable_name IN ('handler_delete');
HOST VARIABLE_NAME VARIABLE_VALUE Expected HOST VARIABLE_NAME VARIABLE_VALUE Expected
localhost Handler_delete 6 OK localhost Handler_delete 6 OKo
# #
# STATUS_BY_HOST vs. GLOBAL_STATUS # STATUS_BY_HOST vs. GLOBAL_STATUS
# #
# Special case: No way to isolate pre-existing 'localhost' activity, so # Special case: No way to isolate pre-existing 'localhost' activity, so
# just check global totals = sum(status_by_host). # just check global totals = sum(status_by_host).
# #
SELECT variable_name, h1, h2, h3, delta, host, IF(host=delta,'OK','ERROR') Expected SELECT variable_name, h1, h2, h3, delta, host, IF(host=delta,'OKp','ERRORp') Expected
FROM test.status_results FROM test.status_results
ORDER BY variable_name; ORDER BY variable_name;
variable_name h1 h2 h3 delta host Expected variable_name h1 h2 h3 delta host Expected
Handler_delete 6 0 0 6 6 OK Handler_delete 6 0 0 6 6 OKp
Handler_rollback 6 0 0 6 6 OK Handler_rollback 6 0 0 6 6 OKp
# ================================================================================ # ================================================================================
# TEST 8: FLUSH STATUS should clear account, host and user status # TEST 8: FLUSH STATUS should clear account, host and user status
# ================================================================================ # ================================================================================
......
...@@ -14,8 +14,6 @@ ...@@ -14,8 +14,6 @@
--source include/no_protocol.inc --source include/no_protocol.inc
--source include/maybe_pool_of_threads.inc --source include/maybe_pool_of_threads.inc
--enable_connect_log
--echo # --echo #
--echo # ================================================================================ --echo # ================================================================================
--echo # SETUP --echo # SETUP
...@@ -26,10 +24,7 @@ SET @@session.sql_log_bin=OFF; ...@@ -26,10 +24,7 @@ SET @@session.sql_log_bin=OFF;
connection default; connection default;
USE test; USE test;
# Clear user, host and account status accumulated from preliminary checks by mtr.
--disable_query_log
flush status; flush status;
--enable_query_log
--echo # --echo #
--echo # Create results table --echo # Create results table
...@@ -135,18 +130,18 @@ USE performance_schema; ...@@ -135,18 +130,18 @@ USE performance_schema;
--echo # Verify expected counts for 'handler_delete' per thread --echo # Verify expected counts for 'handler_delete' per thread
--echo # --echo #
--replace_column 1 con_1 --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'); SELECT *, IF (variable_value = 1,'OK1','ERROR1') AS Expected FROM status_by_thread WHERE thread_id = @con1_id AND variable_name IN ('handler_delete', 'handler_rollback');
--echo # --echo #
--replace_column 1 con_2 --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'); SELECT *, IF (variable_value = 2,'OK2','ERROR2') AS Expected FROM status_by_thread WHERE thread_id = @con2_id AND variable_name IN ('handler_delete', 'handler_rollback');
--echo # --echo #
--replace_column 1 con_3 --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'); SELECT *, IF (variable_value = 3,'OK3','ERROR3') AS Expected FROM status_by_thread WHERE thread_id = @con3_id AND variable_name IN ('handler_delete', 'handler_rollback');
--echo # --echo #
--echo # STATUS_BY_THREAD vs. GLOBAL_STATUS --echo # STATUS_BY_THREAD vs. GLOBAL_STATUS
--echo # --echo #
SELECT variable_name, t1, t2, t3, delta, thread, IF(thread=delta,'OK','ERROR') Expected SELECT variable_name, t1, t2, t3, delta, thread, IF(thread=delta,'OK4','ERROR4') Expected
FROM test.status_results FROM test.status_results
ORDER BY variable_name; ORDER BY variable_name;
...@@ -154,16 +149,16 @@ ORDER BY variable_name; ...@@ -154,16 +149,16 @@ ORDER BY variable_name;
--echo # ================================================================================ --echo # ================================================================================
--echo # TEST 2: STATUS_BY_USER: Verify expected status counts per user (1,2,3) --echo # TEST 2: STATUS_BY_USER: Verify expected status counts per user (1,2,3)
--echo # ================================================================================ --echo # ================================================================================
SELECT *, IF (variable_value = 1,'OK','ERROR') AS Expected FROM status_by_user WHERE user IN ('user1') AND variable_name IN ('handler_delete'); SELECT *, IF (variable_value = 1,'OK5','ERROR5') AS Expected FROM status_by_user WHERE user IN ('user1') AND variable_name IN ('handler_delete');
--echo # --echo #
SELECT *, IF (variable_value = 2,'OK','ERROR') AS Expected FROM status_by_user WHERE user IN ('user2') AND variable_name IN ('handler_delete'); SELECT *, IF (variable_value = 2,'OK6','ERROR6') AS Expected FROM status_by_user WHERE user IN ('user2') AND variable_name IN ('handler_delete');
--echo # --echo #
SELECT *, IF (variable_value = 3,'OK','ERROR') AS Expected FROM status_by_user WHERE user IN ('user3') AND variable_name IN ('handler_delete'); SELECT *, IF (variable_value = 3,'OK7','ERROR7') AS Expected FROM status_by_user WHERE user IN ('user3') AND variable_name IN ('handler_delete');
--echo # --echo #
--echo # STATUS_BY_USER vs. GLOBAL_STATUS --echo # STATUS_BY_USER vs. GLOBAL_STATUS
--echo # --echo #
SELECT variable_name, u1, u2, u3, delta, user, IF(user=delta,'OK','ERROR') Expected SELECT variable_name, u1, u2, u3, delta, user, IF(user=delta,'OK8','ERROR8') Expected
FROM test.status_results FROM test.status_results
ORDER BY variable_name; ORDER BY variable_name;
...@@ -171,23 +166,23 @@ ORDER BY variable_name; ...@@ -171,23 +166,23 @@ ORDER BY variable_name;
--echo # ================================================================================ --echo # ================================================================================
--echo # TEST 3: STATUS_BY_ACCOUNT: Verify expected status counts per user, host (1,2,3) --echo # TEST 3: STATUS_BY_ACCOUNT: Verify expected status counts per user, host (1,2,3)
--echo # ================================================================================ --echo # ================================================================================
SELECT *, IF (variable_value = 1,'OK','ERROR') AS Expected FROM status_by_account WHERE user IN ('user1') AND variable_name IN ('handler_delete'); SELECT *, IF (variable_value = 1,'OK9','ERROR9') AS Expected FROM status_by_account WHERE user IN ('user1') AND variable_name IN ('handler_delete');
--echo # --echo #
SELECT *, IF (variable_value = 2,'OK','ERROR') AS Expected FROM status_by_account WHERE user IN ('user2') AND variable_name IN ('handler_delete'); SELECT *, IF (variable_value = 2,'OKa','ERRORa') AS Expected FROM status_by_account WHERE user IN ('user2') AND variable_name IN ('handler_delete');
--echo # --echo #
SELECT *, IF (variable_value = 3,'OK','ERROR') AS Expected FROM status_by_account WHERE user IN ('user3') AND variable_name IN ('handler_delete'); SELECT *, IF (variable_value = 3,'OKb','ERRORb') AS Expected FROM status_by_account WHERE user IN ('user3') AND variable_name IN ('handler_delete');
--echo # --echo #
--echo # STATUS_BY_ACCOUNT vs. GLOBAL_STATUS --echo # STATUS_BY_ACCOUNT vs. GLOBAL_STATUS
--echo # --echo #
SELECT variable_name, a1, a2, a3, delta, acct, IF(acct=delta,'OK','ERROR') Expected SELECT variable_name, a1, a2, a3, delta, acct, IF(acct=delta,'OKc','ERRORc') Expected
FROM test.status_results FROM test.status_results
ORDER BY variable_name; ORDER BY variable_name;
--echo # ================================================================================ --echo # ================================================================================
--echo # TEST 4: STATUS_BY_HOST: Verify expected status counts per host (6) --echo # TEST 4: STATUS_BY_HOST: Verify expected status counts per host (6)
--echo # ================================================================================ --echo # ================================================================================
SELECT *, IF (variable_value = 6,'OK','ERROR') AS Expected FROM status_by_host WHERE host IN ('localhost') AND variable_name IN ('handler_delete'); SELECT *, IF (variable_value = 6,'OKd','ERRORd') AS Expected FROM status_by_host WHERE host IN ('localhost') AND variable_name IN ('handler_delete');
--echo # --echo #
--echo # STATUS_BY_HOST vs. GLOBAL_STATUS --echo # STATUS_BY_HOST vs. GLOBAL_STATUS
...@@ -195,7 +190,7 @@ SELECT *, IF (variable_value = 6,'OK','ERROR') AS Expected FROM status_by_host W ...@@ -195,7 +190,7 @@ SELECT *, IF (variable_value = 6,'OK','ERROR') AS Expected FROM status_by_host W
--echo # Special case: No way to isolate pre-existing 'localhost' activity, so --echo # Special case: No way to isolate pre-existing 'localhost' activity, so
--echo # just check global totals = sum(status_by_host). --echo # just check global totals = sum(status_by_host).
--echo # --echo #
SELECT variable_name, h1, h2, h3, delta, host, IF(host=delta,'OK','ERROR') Expected SELECT variable_name, h1, h2, h3, delta, host, IF(host=delta,'OKe','ERRORe') Expected
FROM test.status_results FROM test.status_results
ORDER BY variable_name; ORDER BY variable_name;
...@@ -203,7 +198,6 @@ ORDER BY variable_name; ...@@ -203,7 +198,6 @@ ORDER BY variable_name;
--echo # ================================================================================ --echo # ================================================================================
--echo # DISCONNECT ALL USERS AND RUN THE TESTS AGAIN. RESULTS SHOULD NOT CHANGE. --echo # DISCONNECT ALL USERS AND RUN THE TESTS AGAIN. RESULTS SHOULD NOT CHANGE.
--echo # ================================================================================ --echo # ================================================================================
connection default;
disconnect con1; disconnect con1;
disconnect con2; disconnect con2;
disconnect con3; disconnect con3;
...@@ -232,16 +226,16 @@ USE performance_schema; ...@@ -232,16 +226,16 @@ USE performance_schema;
--echo # ================================================================================ --echo # ================================================================================
--echo # TEST 5: STATUS_BY_USER: Verify expected status counts per user (1,2,3) --echo # TEST 5: STATUS_BY_USER: Verify expected status counts per user (1,2,3)
--echo # ================================================================================ --echo # ================================================================================
SELECT *, IF (variable_value = 1,'OK','ERROR') AS Expected FROM status_by_user WHERE user IN ('user1') AND variable_name IN ('handler_delete'); SELECT *, IF (variable_value = 1,'OKf','ERRORf') AS Expected FROM status_by_user WHERE user IN ('user1') AND variable_name IN ('handler_delete');
--echo # --echo #
SELECT *, IF (variable_value = 2,'OK','ERROR') AS Expected FROM status_by_user WHERE user IN ('user2') AND variable_name IN ('handler_delete'); SELECT *, IF (variable_value = 2,'OKg','ERRORg') AS Expected FROM status_by_user WHERE user IN ('user2') AND variable_name IN ('handler_delete');
--echo # --echo #
SELECT *, IF (variable_value = 3,'OK','ERROR') AS Expected FROM status_by_user WHERE user IN ('user3') AND variable_name IN ('handler_delete'); SELECT *, IF (variable_value = 3,'OKh','ERRORh') AS Expected FROM status_by_user WHERE user IN ('user3') AND variable_name IN ('handler_delete');
--echo # --echo #
--echo # STATUS_BY_USER vs. GLOBAL_STATUS --echo # STATUS_BY_USER vs. GLOBAL_STATUS
--echo # --echo #
SELECT variable_name, u1, u2, u3, delta, user, IF(user=delta,'OK','ERROR') Expected SELECT variable_name, u1, u2, u3, delta, user, IF(user=delta,'OKi','ERRORi') Expected
FROM test.status_results FROM test.status_results
ORDER BY variable_name; ORDER BY variable_name;
...@@ -249,23 +243,23 @@ ORDER BY variable_name; ...@@ -249,23 +243,23 @@ ORDER BY variable_name;
--echo # ================================================================================ --echo # ================================================================================
--echo # TEST 6: STATUS_BY_ACCOUNT: Verify expected status counts per user:host (1,2,3) --echo # TEST 6: STATUS_BY_ACCOUNT: Verify expected status counts per user:host (1,2,3)
--echo # ================================================================================ --echo # ================================================================================
SELECT *, IF (variable_value = 1,'OK','ERROR') AS Expected FROM status_by_account WHERE user IN ('user1') AND variable_name IN ('handler_delete'); SELECT *, IF (variable_value = 1,'OKj','ERRORj') AS Expected FROM status_by_account WHERE user IN ('user1') AND variable_name IN ('handler_delete');
--echo # --echo #
SELECT *, IF (variable_value = 2,'OK','ERROR') AS Expected FROM status_by_account WHERE user IN ('user2') AND variable_name IN ('handler_delete'); SELECT *, IF (variable_value = 2,'OKk','ERRORk') AS Expected FROM status_by_account WHERE user IN ('user2') AND variable_name IN ('handler_delete');
--echo # --echo #
SELECT *, IF (variable_value = 3,'OK','ERROR') AS Expected FROM status_by_account WHERE user IN ('user3') AND variable_name IN ('handler_delete'); SELECT *, IF (variable_value = 3,'OKl','ERRORl') AS Expected FROM status_by_account WHERE user IN ('user3') AND variable_name IN ('handler_delete');
--echo # --echo #
--echo # STATUS_BY_ACCOUNT vs. GLOBAL_STATUS --echo # STATUS_BY_ACCOUNT vs. GLOBAL_STATUS
--echo # --echo #
SELECT variable_name, a1, a2, a3, delta, acct, IF(acct=delta,'OK','ERROR') Expected SELECT variable_name, a1, a2, a3, delta, acct, IF(acct=delta,'OKn','ERRORn') Expected
FROM test.status_results FROM test.status_results
ORDER BY variable_name; ORDER BY variable_name;
--echo # ================================================================================ --echo # ================================================================================
--echo # TEST 7: STATUS_BY_HOST: Verify expected status counts per host (6) --echo # TEST 7: STATUS_BY_HOST: Verify expected status counts per host (6)
--echo # ================================================================================ --echo # ================================================================================
SELECT *, IF (variable_value = 6,'OK','ERROR') AS Expected FROM status_by_host WHERE host IN ('localhost') AND variable_name IN ('handler_delete'); SELECT *, IF (variable_value = 6,'OKo','ERRORo') AS Expected FROM status_by_host WHERE host IN ('localhost') AND variable_name IN ('handler_delete');
--echo # --echo #
--echo # STATUS_BY_HOST vs. GLOBAL_STATUS --echo # STATUS_BY_HOST vs. GLOBAL_STATUS
...@@ -273,11 +267,10 @@ SELECT *, IF (variable_value = 6,'OK','ERROR') AS Expected FROM status_by_host W ...@@ -273,11 +267,10 @@ SELECT *, IF (variable_value = 6,'OK','ERROR') AS Expected FROM status_by_host W
--echo # Special case: No way to isolate pre-existing 'localhost' activity, so --echo # Special case: No way to isolate pre-existing 'localhost' activity, so
--echo # just check global totals = sum(status_by_host). --echo # just check global totals = sum(status_by_host).
--echo # --echo #
SELECT variable_name, h1, h2, h3, delta, host, IF(host=delta,'OK','ERROR') Expected SELECT variable_name, h1, h2, h3, delta, host, IF(host=delta,'OKp','ERRORp') Expected
FROM test.status_results FROM test.status_results
ORDER BY variable_name; ORDER BY variable_name;
--echo # ================================================================================ --echo # ================================================================================
--echo # TEST 8: FLUSH STATUS should clear account, host and user status --echo # TEST 8: FLUSH STATUS should clear account, host and user status
--echo # ================================================================================ --echo # ================================================================================
...@@ -290,7 +283,6 @@ SELECT * FROM status_by_host WHERE host IN ('localhost') AND variable_name IN (' ...@@ -290,7 +283,6 @@ SELECT * FROM status_by_host WHERE host IN ('localhost') AND variable_name IN ('
--echo # --echo #
SELECT * FROM status_by_user WHERE user IN ('user1', 'user2', 'user3') AND variable_name IN ('handler_delete'); SELECT * FROM status_by_user WHERE user IN ('user1', 'user2', 'user3') AND variable_name IN ('handler_delete');
--echo # ================================================================================ --echo # ================================================================================
--echo # CLEANUP --echo # CLEANUP
--echo # ================================================================================ --echo # ================================================================================
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment