small fix for max_user_connections. everything else will be pulled from 4.0
This commit is contained in:
parent
c0c369f081
commit
ab9fb4ea75
@ -318,7 +318,8 @@ int check_user(THD *thd, enum enum_server_command command,
|
|||||||
ur.connections || max_user_connections) &&
|
ur.connections || max_user_connections) &&
|
||||||
get_or_create_user_conn(thd,thd->user,thd->host_or_ip,&ur))
|
get_or_create_user_conn(thd,thd->user,thd->host_or_ip,&ur))
|
||||||
DBUG_RETURN(-1);
|
DBUG_RETURN(-1);
|
||||||
if (thd->user_connect && thd->user_connect->user_resources.connections &&
|
if (thd->user_connect && (thd->user_connect->user_resources.connections ||
|
||||||
|
max_user_connections) &&
|
||||||
check_for_max_user_connections(thd, thd->user_connect))
|
check_for_max_user_connections(thd, thd->user_connect))
|
||||||
DBUG_RETURN(-1);
|
DBUG_RETURN(-1);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user