database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

followup to max_user_connections fix, keep the count more accurate

Browse Source
This commit is contained in:
unknown
2003-10-29 08:33:31 +01:00
parent 8507b00b34
commit 5f2611d318
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_parse.cc
View File

@@ -303,14 +303,13 @@ static int check_for_max_user_connections(USER_CONN *uc)
{
int error=0;
DBUG_ENTER("check_for_max_user_connections");
(void) pthread_mutex_lock(&LOCK_user_conn);
if (max_user_connections &&
max_user_connections <= uc->connections)
max_user_connections < uc->connections)
{
net_printf(&(current_thd->net),ER_TOO_MANY_USER_CONNECTIONS, uc->user);
error=1;
uc->connections--;
goto end;
}
if (uc->user_resources.connections &&
@@ -324,6 +323,8 @@ static int check_for_max_user_connections(USER_CONN *uc)
}
uc->conn_per_hour++;
end:
if (error)
uc->connections--; // no need for decrease_user_connections() here
(void) pthread_mutex_unlock(&LOCK_user_conn);
DBUG_RETURN(error);
}