1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more fixes for windows and status_user.test

Browse Source
This commit is contained in:
Sergei Golubchik 2010-04-02 20:51:02 +02:00
parent 3b03f5d97e
commit d979dd6f81
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmysqld/CMakeLists.txt
View File

@ -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/client.c ../sql-common/my_time.c
../sql-common/my_user.c ../sql-common/pack.c ../sql-common/my_user.c ../sql-common/pack.c
../sql/password.c ../sql/discover.cc ../sql/derror.cc ../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/filesort.cc ../sql/gstream.cc ../sql/ha_partition.cc
../sql/handler.cc ../sql/hash_filo.cc ../sql/hostname.cc ../sql/handler.cc ../sql/hash_filo.cc ../sql/hostname.cc
../sql/init.cc ../sql/item_buff.cc ../sql/item_cmpfunc.cc ../sql/init.cc ../sql/item_buff.cc ../sql/item_cmpfunc.cc

4
mysql-test/r/status_user.result
View File

@ -137,7 +137,7 @@ ROWS_INSERTED 8
ROWS_UPDATED 5 ROWS_UPDATED 5
SELECT_COMMANDS 3 SELECT_COMMANDS 3
UPDATE_COMMANDS 11 UPDATE_COMMANDS 11
OTHER_COMMANDS 9 OTHER_COMMANDS 7
COMMIT_TRANSACTIONS 19 COMMIT_TRANSACTIONS 19
ROLLBACK_TRANSACTIONS 2 ROLLBACK_TRANSACTIONS 2
DENIED_CONNECTIONS 0 DENIED_CONNECTIONS 0
@ -154,7 +154,7 @@ ROWS_INSERTED 8
ROWS_UPDATED 5 ROWS_UPDATED 5
SELECT_COMMANDS 3 SELECT_COMMANDS 3
UPDATE_COMMANDS 11 UPDATE_COMMANDS 11
OTHER_COMMANDS 9 OTHER_COMMANDS 7
COMMIT_TRANSACTIONS 19 COMMIT_TRANSACTIONS 19
ROLLBACK_TRANSACTIONS 2 ROLLBACK_TRANSACTIONS 2
DENIED_CONNECTIONS 0 DENIED_CONNECTIONS 0

2
sql/sql_class.cc
View File

@ -924,7 +924,7 @@ void THD::update_stats(void)
/* A SQL query. */ /* A SQL query. */
if (lex->sql_command == SQLCOM_SELECT) if (lex->sql_command == SQLCOM_SELECT)
select_commands++; 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 */ /* Ignore 'SHOW ' commands */
} }