diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-02-15 02:51:43 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-02-15 02:51:43 +0200 |
| commit | 0ee35d6da9757619ee1525e87d49b307e80264fb (patch) | |
| tree | 79f74969fda0dbd1b3b3050eb739af47a78ac57c /sql | |
| parent | 93c1f96f7d694afcc90d1af7f5868f9e0a5777e0 (diff) | |
| parent | 728c191b11fa238b20b8f0580b61be091977e7c4 (diff) | |
| download | mariadb-git-0ee35d6da9757619ee1525e87d49b307e80264fb.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_parse.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index efb31829f41..e649f109a0d 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)) |