summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2002-02-11 14:47:22 +0200
committerunknown <Sinisa@sinisa.nasamreza.org>2002-02-11 14:47:22 +0200
commitc8ca19689611bd560a6e55ce0f1069f866a657be (patch)
tree5d29769b3dcae91a73d7b6ac52a02504faf6ceb0 /sql
parentd9b0ee5a96703ad5d0c2736941531e59a3c31790 (diff)
downloadmariadb-git-c8ca19689611bd560a6e55ce0f1069f866a657be.tar.gz
reverting wrong fix
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_parse.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index d1f9c2bafdc..8ebedba13ac 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -233,8 +233,7 @@ 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 (get_or_create_user_conn(thd,user,thd->host_or_ip,max_questions) &&
- (max_questions || max_user_connections))
+ if ((max_questions || max_user_connections) && get_or_create_user_conn(thd,user,thd->host_or_ip,max_questions))
return -1;
if (max_user_connections && thd->user_connect &&
check_for_max_user_connections(thd->user_connect))