diff options
| author | unknown <serg@serg.mylan> | 2003-10-31 15:53:54 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-10-31 15:53:54 +0100 |
| commit | ab9fb4ea752731bb04cfbd844902ae34c63123ab (patch) | |
| tree | f377294dd1f8594a406142889f6df92806bbb0d1 | |
| parent | c0c369f081d13dde54ba133bcd1c898a6d81b72c (diff) | |
| download | mariadb-git-ab9fb4ea752731bb04cfbd844902ae34c63123ab.tar.gz | |
small fix for max_user_connections. everything else will be pulled from 4.0
| -rw-r--r-- | sql/sql_parse.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 09ae7ff6900..704ac726fa6 100644 --- 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); |