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

Fixed problems detected by pushbuild

Browse Source
This commit is contained in:
monty@mysql.com/narttu.mysql.fi 2007-01-30 13:52:26 +02:00
parent 1f6d91c5a6
commit 25e481aed8
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/t/log_state.test
View File

@ -37,7 +37,6 @@ set session long_query_time=1;
select sleep(2); select sleep(2);
--replace_column 1 TIMESTAMP 2 USER_HOST 3 QUERY_TIME --replace_column 1 TIMESTAMP 2 USER_HOST 3 QUERY_TIME
select * from mysql.slow_log; select * from mysql.slow_log;
disconnect con1;
connection default; connection default;
show global variables show global variables
where Variable_name = 'log' or Variable_name = 'log_slow_queries' or where Variable_name = 'log' or Variable_name = 'log_slow_queries' or
@ -121,3 +120,8 @@ drop table t1;
select * from mysql.general_log; select * from mysql.general_log;
--enable_ps_protocol --enable_ps_protocol
#
# Cleanup (must be done last to avoid delayed 'Quit' message in general log)
#
disconnect con1;

6
plugin/daemon_example/daemon_example.c
View File

@ -19,11 +19,11 @@
#include <mysql/plugin.h> #include <mysql/plugin.h>
/* /*
#if !defined(__attribute__) && (defined(__cplusplus) || !defined(__GNUC__) || __GNUC__ == 2 && __GNUC_MINOR__ < 8) Disable __attribute__() on non-gcc compilers.
*/
#if !defined(__attribute__) && !defined(__GNUC__)
#define __attribute__(A) #define __attribute__(A)
#endif #endif
*/
/* /*

2
sql-common/client.c
View File

@ -682,7 +682,7 @@ cli_advanced_command(MYSQL *mysql, enum enum_server_command command,
mysql->info=0; mysql->info=0;
mysql->affected_rows= ~(my_ulonglong) 0; mysql->affected_rows= ~(my_ulonglong) 0;
/* /*
We don't want to clear the protocol buffer on COM_QUIT, beacsue if We don't want to clear the protocol buffer on COM_QUIT, because if
the previous command was a shutdown command, we may have the the previous command was a shutdown command, we may have the
response for the COM_QUIT already in the communication buffer response for the COM_QUIT already in the communication buffer
*/ */

6
sql/sql_parse.cc
View File

@ -413,7 +413,11 @@ int check_user(THD *thd, enum enum_server_command command,
} }
} }
/* Why logging is performed before all checks've passed? */ /*
Log the command before authentication checks, so that the user can
check the log for the tried login tried and also to detect
break-in attempts.
*/
general_log_print(thd, command, general_log_print(thd, command,
(thd->main_security_ctx.priv_user == (thd->main_security_ctx.priv_user ==
thd->main_security_ctx.user ? thd->main_security_ctx.user ?