maria-developers team mailing list archive

[<serg@xxxxxxxxxxxx>]

At http://bazaar.launchpad.net/~maria-captains/maria/5.2/

------------------------------------------------------------
revno: 2770
revision-id: sergii@xxxxxxxxx-20100402185102-3jj9hj51tfjblsyu
parent: sergii@xxxxxxxxx-20100402092009-fsk3s46z6furxi1k
committer: Sergei Golubchik <sergii@xxxxxxxxx>
branch nick: 5.2
timestamp: Fri 2010-04-02 20:51:02 +0200
message:
  more fixes for windows and status_user.test

=== modified file 'libmysqld/CMakeLists.txt'
--- a/libmysqld/CMakeLists.txt	2010-01-31 09:13:21 +0000
+++ b/libmysqld/CMakeLists.txt	2010-04-02 18:51:02 +0000
@@ -104,7 +104,7 @@ SET(LIBMYSQLD_SOURCES emb_qcache.cc libm
            ../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 

=== modified file 'mysql-test/r/status_user.result'
--- a/mysql-test/r/status_user.result	2010-03-21 20:58:19 +0000
+++ b/mysql-test/r/status_user.result	2010-04-02 18:51:02 +0000
@@ -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

=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2010-04-02 09:20:09 +0000
+++ b/sql/sql_class.cc	2010-04-02 18:51:02 +0000
@@ -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 */
     }