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

6a3114e1 · unknown · fa96bb42 · 6a3114e1
Commit 6a3114e1 authored Oct 31, 2003 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sql/sql_parse.cc sql/sql_parse.cc +2 -1

No files found.
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -318,7 +318,8 @@ int check_user(THD *thd, enum enum_server_command command,
           ur.connections || max_user_connections) &&
          get_or_create_user_conn(thd,thd->user,thd->host_or_ip,&ur))
        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))
        DBUG_RETURN(-1);