more fixes for windows and status_user.test

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 

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

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 */
     }