Commit 6a3114e1 authored by unknown's avatar unknown

small fix for max_user_connections. everything else will be pulled from 4.0

parent fa96bb42
...@@ -318,7 +318,8 @@ int check_user(THD *thd, enum enum_server_command command, ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment