mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
Fixed some things to make MySQL to compile again.
libmysqld/lib_sql.cc: Fix to make the embedded server compile with the new USER_REOSURCEs. sql/sql_acl.cc: Fixed wrong test in password checking. sql/sql_cache.cc: Fixed wrong cast sql/sql_parse.cc: Cleanup
This commit is contained in:
@ -242,7 +242,8 @@ static bool check_user(THD *thd,enum_server_command command, const char *user,
|
||||
db ? db : (char*) "");
|
||||
thd->db_access=0;
|
||||
/* Don't allow user to connect if he has done too many queries */
|
||||
if ((ur.questions || ur.updates || ur.connections) && get_or_create_user_conn(thd,user,thd->host_or_ip,&ur))
|
||||
if ((ur.questions || ur.updates || ur.connections) &&
|
||||
get_or_create_user_conn(thd,user,thd->host_or_ip,&ur))
|
||||
return -1;
|
||||
if (thd->user_connect && thd->user_connect->user_resources.connections &&
|
||||
check_for_max_user_connections(thd->user_connect))
|
||||
@ -259,6 +260,7 @@ static bool check_user(THD *thd,enum_server_command command, const char *user,
|
||||
return 0; // ok
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
Check for maximum allowable user connections, if the mysqld server is
|
||||
started with corresponding variable that is greater then 0.
|
||||
|
Reference in New Issue
Block a user