database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

fixes for the status_user.test in ps protocol

Browse Source 
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
This commit is contained in:
Sergei Golubchik
2010-03-16 13:38:35 +01:00
parent 5f47217e2e
commit a117dfb087
6 changed files with 44 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_class.cc
View File

@@ -921,9 +921,6 @@ void THD::update_stats(void)
/* sql_command == SQLCOM_END in case of parse errors or quit */
if (lex->sql_command != SQLCOM_END)
{
/* The replication thread has the COM_CONNECT command */
DBUG_ASSERT(command == COM_QUERY || command == COM_CONNECT);
/* A SQL query. */
if (lex->sql_command == SQLCOM_SELECT)
select_commands++;
@@ -959,9 +956,8 @@ void THD::update_all_stats()
status_var_add(status_var.cpu_time, cpu_time);
status_var_add(status_var.busy_time, busy_time);
/* Updates THD stats and the global user stats. */
update_stats();
update_global_user_stats(this, TRUE, save_time);
userstat_running= 0;
}