summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
diff options
context:
space:
mode:
authorunknown <serg@serg.mysql.com>2002-02-08 10:18:32 +0000
committerunknown <serg@serg.mysql.com>2002-02-08 10:18:32 +0000
commitf5e6f0e7ca8fb4e347e9ac6a1b00ee2451b10f43 (patch)
tree47a56f7c99c8e93ba036844eed1ea12d912593aa /sql/sql_parse.cc
parent6259917372b2980a5302f50b62fd6e549827b2c5 (diff)
downloadmariadb-git-f5e6f0e7ca8fb4e347e9ac6a1b00ee2451b10f43.tar.gz
bugfix for max_user_connections
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r--sql/sql_parse.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index cf84c815973..d1f9c2bafdc 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -233,8 +233,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 ((max_questions || max_user_connections) &&
- get_or_create_user_conn(thd,user,thd->host_or_ip,max_questions))
+ if (get_or_create_user_conn(thd,user,thd->host_or_ip,max_questions) &&
+ (max_questions || max_user_connections))
return -1;
if (max_user_connections && thd->user_connect &&
check_for_max_user_connections(thd->user_connect))