database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

fixes for max_user_connections (connections are now counted even if

Browse Source 
max_user_connections is not set - that is no limit - so that when
max_user_connections is set (with SET) old connections are also
taken into account
mutexes are added where appropriate
This commit is contained in:
unknown
2003-10-27 15:14:03 +01:00
parent 8f917ccd9d
commit 8507b00b34
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sql/sql_parse.cc
View File

@@ -156,7 +156,7 @@ static int get_or_create_user_conn(THD *thd, const char *user,
uc->user_len= user_len; uc->user_len= user_len;
uc->host=uc->user + uc->user_len + 1; uc->host=uc->user + uc->user_len + 1;
uc->len = temp_len; uc->len = temp_len;
uc->connections = 1; uc->connections = 0;
uc->questions=uc->updates=uc->conn_per_hour=0; uc->questions=uc->updates=uc->conn_per_hour=0;
uc->user_resources=*mqh; uc->user_resources=*mqh;
if (max_user_connections && mqh->connections > max_user_connections) if (max_user_connections && mqh->connections > max_user_connections)
@@ -171,6 +171,7 @@ static int get_or_create_user_conn(THD *thd, const char *user,
} }
} }
thd->user_connect=uc; thd->user_connect=uc;
uc->connections++;
end: end:
(void) pthread_mutex_unlock(&LOCK_user_conn); (void) pthread_mutex_unlock(&LOCK_user_conn);
return return_val; return return_val;
@@ -255,7 +256,7 @@ static bool check_user(THD *thd,enum_server_command command, const char *user,
if ((ur.questions || ur.updates || ur.connections || max_user_connections) && if ((ur.questions || ur.updates || ur.connections || max_user_connections) &&
get_or_create_user_conn(thd,user,thd->host_or_ip,&ur)) get_or_create_user_conn(thd,user,thd->host_or_ip,&ur))
return -1; 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) && max_user_connections) &&
check_for_max_user_connections(thd->user_connect)) check_for_max_user_connections(thd->user_connect))
return -1; return -1;
@@ -303,16 +304,17 @@ static int check_for_max_user_connections(USER_CONN *uc)
int error=0; int error=0;
DBUG_ENTER("check_for_max_user_connections"); DBUG_ENTER("check_for_max_user_connections");
(void) pthread_mutex_lock(&LOCK_user_conn);
if (max_user_connections && if (max_user_connections &&
(max_user_connections < (uint) uc->connections)) max_user_connections <= uc->connections)
{ {
net_printf(&(current_thd->net),ER_TOO_MANY_USER_CONNECTIONS, uc->user); net_printf(&(current_thd->net),ER_TOO_MANY_USER_CONNECTIONS, uc->user);
error=1; error=1;
uc->connections--;
goto end; goto end;
} }
uc->connections++;
if (uc->user_resources.connections && if (uc->user_resources.connections &&
uc->conn_per_hour++ >= uc->user_resources.connections) uc->user_resources.connections <= uc->conn_per_hour)
{ {
net_printf(&current_thd->net, ER_USER_LIMIT_REACHED, uc->user, net_printf(&current_thd->net, ER_USER_LIMIT_REACHED, uc->user,
"max_connections", "max_connections",
@@ -320,7 +322,9 @@ static int check_for_max_user_connections(USER_CONN *uc)
error=1; error=1;
goto end; goto end;
} }
uc->conn_per_hour++;
end: end:
(void) pthread_mutex_unlock(&LOCK_user_conn);
DBUG_RETURN(error); DBUG_RETURN(error);
} }
@@ -328,13 +332,14 @@ end:
static void decrease_user_connections(USER_CONN *uc) static void decrease_user_connections(USER_CONN *uc)
{ {
DBUG_ENTER("decrease_user_connections"); DBUG_ENTER("decrease_user_connections");
if ((uc->connections && !--uc->connections) && !mqh_used) (void) pthread_mutex_lock(&LOCK_user_conn);
DBUG_ASSERT(uc->connections);
if (!--uc->connections && !mqh_used)
{ {
/* Last connection for user; Delete it */ /* Last connection for user; Delete it */
(void) pthread_mutex_lock(&LOCK_user_conn);
(void) hash_delete(&hash_user_connections,(byte*) uc); (void) hash_delete(&hash_user_connections,(byte*) uc);
(void) pthread_mutex_unlock(&LOCK_user_conn);
} }
(void) pthread_mutex_unlock(&LOCK_user_conn);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
@@ -1026,7 +1031,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
thd->priv_user=save_priv_user; thd->priv_user=save_priv_user;
break; break;
} }
if (max_connections && save_uc) if (save_uc)
decrease_user_connections(save_uc); decrease_user_connections(save_uc);
x_free((gptr) save_db); x_free((gptr) save_db);
x_free((gptr) save_user); x_free((gptr) save_user);