From d979dd6f81394f115a2ae744b207d134db5b8241 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 2 Apr 2010 20:51:02 +0200 Subject: [PATCH] more fixes for windows and status_user.test --- libmysqld/CMakeLists.txt | 2 +- mysql-test/r/status_user.result | 4 ++-- sql/sql_class.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 9adf91c997b..0e8acc8a5e5 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -104,7 +104,7 @@ SET(LIBMYSQLD_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ../sql-common/client.c ../sql-common/my_time.c ../sql-common/my_user.c ../sql-common/pack.c ../sql/password.c ../sql/discover.cc ../sql/derror.cc - ../sql/field.cc ../sql/field_conv.cc + ../sql/field.cc ../sql/field_conv.cc ../sql-common/client_plugin.c ../sql/filesort.cc ../sql/gstream.cc ../sql/ha_partition.cc ../sql/handler.cc ../sql/hash_filo.cc ../sql/hostname.cc ../sql/init.cc ../sql/item_buff.cc ../sql/item_cmpfunc.cc diff --git a/mysql-test/r/status_user.result b/mysql-test/r/status_user.result index f49cadcca57..9fb631e209e 100644 --- a/mysql-test/r/status_user.result +++ b/mysql-test/r/status_user.result @@ -137,7 +137,7 @@ ROWS_INSERTED 8 ROWS_UPDATED 5 SELECT_COMMANDS 3 UPDATE_COMMANDS 11 -OTHER_COMMANDS 9 +OTHER_COMMANDS 7 COMMIT_TRANSACTIONS 19 ROLLBACK_TRANSACTIONS 2 DENIED_CONNECTIONS 0 @@ -154,7 +154,7 @@ ROWS_INSERTED 8 ROWS_UPDATED 5 SELECT_COMMANDS 3 UPDATE_COMMANDS 11 -OTHER_COMMANDS 9 +OTHER_COMMANDS 7 COMMIT_TRANSACTIONS 19 ROLLBACK_TRANSACTIONS 2 DENIED_CONNECTIONS 0 diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 656d9e03b71..61554e58592 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -924,7 +924,7 @@ void THD::update_stats(void) /* A SQL query. */ if (lex->sql_command == SQLCOM_SELECT) select_commands++; - else if (! (sql_command_flags[lex->sql_command] & CF_STATUS_COMMAND)) + else if (sql_command_flags[lex->sql_command] & CF_STATUS_COMMAND) { /* Ignore 'SHOW ' commands */ }