diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-03-16 13:38:35 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-03-16 13:38:35 +0100 |
| commit | a117dfb087459000b4ebc13cd3a83842dc4b8897 (patch) | |
| tree | 7504806512538a57804f1cd65fc19acba4bbf414 /mysql-test/r/status_user.result | |
| parent | 5f47217e2e271295e35510493fbfd8c147452130 (diff) | |
| download | mariadb-git-a117dfb087459000b4ebc13cd3a83842dc4b8897.tar.gz | |
fixes for the status_user.test in ps protocol
sql/sql_class.cc:
reset userstat_running after the data were colleced to prevent double accounting.
don't assert for COM_QUERY, many more are possible.
don't update_stats() here, it's too late, lex->sql_command may be already reset
sql/sql_parse.cc:
update_stats() here, when the current arena is still valid
Diffstat (limited to 'mysql-test/r/status_user.result')
| -rw-r--r-- | mysql-test/r/status_user.result | 48 |
1 files changed, 34 insertions, 14 deletions
diff --git a/mysql-test/r/status_user.result b/mysql-test/r/status_user.result index afd736927aa..4f1a6d859b2 100644 --- a/mysql-test/r/status_user.result +++ b/mysql-test/r/status_user.result @@ -127,20 +127,40 @@ test t1 6 13 13 show index_statistics; Table_schema Table_name Index_name Rows_read test t1 PRIMARY 2 -select TOTAL_CONNECTIONS, CONCURRENT_CONNECTIONS, ROWS_READ, ROWS_SENT, -ROWS_DELETED, ROWS_INSERTED, ROWS_UPDATED, SELECT_COMMANDS, -UPDATE_COMMANDS, OTHER_COMMANDS, COMMIT_TRANSACTIONS, -ROLLBACK_TRANSACTIONS, DENIED_CONNECTIONS, LOST_CONNECTIONS, -ACCESS_DENIED, EMPTY_QUERIES from information_schema.client_statistics; -TOTAL_CONNECTIONS CONCURRENT_CONNECTIONS ROWS_READ ROWS_SENT ROWS_DELETED ROWS_INSERTED ROWS_UPDATED SELECT_COMMANDS UPDATE_COMMANDS OTHER_COMMANDS COMMIT_TRANSACTIONS ROLLBACK_TRANSACTIONS DENIED_CONNECTIONS LOST_CONNECTIONS ACCESS_DENIED EMPTY_QUERIES -1 0 6 2 1 8 5 3 11 9 10 2 0 0 0 1 -select TOTAL_CONNECTIONS, CONCURRENT_CONNECTIONS, ROWS_READ, ROWS_SENT, -ROWS_DELETED, ROWS_INSERTED, ROWS_UPDATED, SELECT_COMMANDS, -UPDATE_COMMANDS, OTHER_COMMANDS, COMMIT_TRANSACTIONS, -ROLLBACK_TRANSACTIONS, DENIED_CONNECTIONS, LOST_CONNECTIONS, -ACCESS_DENIED, EMPTY_QUERIES from information_schema.user_statistics; -TOTAL_CONNECTIONS CONCURRENT_CONNECTIONS ROWS_READ ROWS_SENT ROWS_DELETED ROWS_INSERTED ROWS_UPDATED SELECT_COMMANDS UPDATE_COMMANDS OTHER_COMMANDS COMMIT_TRANSACTIONS ROLLBACK_TRANSACTIONS DENIED_CONNECTIONS LOST_CONNECTIONS ACCESS_DENIED EMPTY_QUERIES -1 0 6 2 1 8 5 3 11 9 10 2 0 0 0 1 +select TOTAL_CONNECTIONS, CONCURRENT_CONNECTIONS, ROWS_READ, ROWS_SENT, ROWS_DELETED, ROWS_INSERTED, ROWS_UPDATED, SELECT_COMMANDS, UPDATE_COMMANDS, OTHER_COMMANDS, COMMIT_TRANSACTIONS, ROLLBACK_TRANSACTIONS, DENIED_CONNECTIONS, LOST_CONNECTIONS, ACCESS_DENIED, EMPTY_QUERIES from information_schema.client_statistics;; +TOTAL_CONNECTIONS 1 +CONCURRENT_CONNECTIONS 0 +ROWS_READ 6 +ROWS_SENT 2 +ROWS_DELETED 1 +ROWS_INSERTED 8 +ROWS_UPDATED 5 +SELECT_COMMANDS 3 +UPDATE_COMMANDS 11 +OTHER_COMMANDS 9 +COMMIT_TRANSACTIONS 10 +ROLLBACK_TRANSACTIONS 2 +DENIED_CONNECTIONS 0 +LOST_CONNECTIONS 0 +ACCESS_DENIED 0 +EMPTY_QUERIES 1 +select TOTAL_CONNECTIONS, CONCURRENT_CONNECTIONS, ROWS_READ, ROWS_SENT, ROWS_DELETED, ROWS_INSERTED, ROWS_UPDATED, SELECT_COMMANDS, UPDATE_COMMANDS, OTHER_COMMANDS, COMMIT_TRANSACTIONS, ROLLBACK_TRANSACTIONS, DENIED_CONNECTIONS, LOST_CONNECTIONS, ACCESS_DENIED, EMPTY_QUERIES from information_schema.user_statistics;; +TOTAL_CONNECTIONS 1 +CONCURRENT_CONNECTIONS 0 +ROWS_READ 6 +ROWS_SENT 2 +ROWS_DELETED 1 +ROWS_INSERTED 8 +ROWS_UPDATED 5 +SELECT_COMMANDS 3 +UPDATE_COMMANDS 11 +OTHER_COMMANDS 9 +COMMIT_TRANSACTIONS 10 +ROLLBACK_TRANSACTIONS 2 +DENIED_CONNECTIONS 0 +LOST_CONNECTIONS 0 +ACCESS_DENIED 0 +EMPTY_QUERIES 1 flush table_statistics; flush index_statistics; select * from information_schema.index_statistics; |