mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix max_connections_per_hour handling when the global

Browse source 
max_user_connections is also set. (Bug #9947)


sql/sql_parse.cc:
  Don't cap max_connections_per_hour to the global max_user_connections,
  since the latter is a limit of concurrent connections. Also, count
  number of concurrent connections for a user correctly, instead of
  starting at 2.
This commit is contained in:
unknown 2005-06-27 18:03:14 -07:00
parent a7e66efc2c
commit 8efb9a0180
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
sql/sql_parse.cc
View file

@ -136,7 +136,7 @@ static int get_or_create_user_conn(THD *thd, const char *user,
const char *host,
USER_RESOURCES *mqh)
{
int return_val=0;
int return_val= 0;
uint temp_len, user_len;
char temp_user[USERNAME_LENGTH+HOSTNAME_LENGTH+2];
struct user_conn *uc;
@ -144,7 +144,7 @@ static int get_or_create_user_conn(THD *thd, const char *user,
DBUG_ASSERT(user != 0);
DBUG_ASSERT(host != 0);
user_len=strlen(user);
user_len= strlen(user);
temp_len= (strmov(strmov(temp_user, user)+1, host) - temp_user)+1;
(void) pthread_mutex_lock(&LOCK_user_conn);
if (!(uc = (struct user_conn *) hash_search(&hash_user_connections,
@ -156,25 +156,23 @@ static int get_or_create_user_conn(THD *thd, const char *user,
MYF(MY_WME)))))
{
send_error(thd, 0, NullS); // Out of memory
return_val=1;
return_val= 1;
goto end;
}
uc->user=(char*) (uc+1);
memcpy(uc->user,temp_user,temp_len+1);
uc->user_len= user_len;
uc->host=uc->user + uc->user_len + 1;
uc->len = temp_len;
uc->connections = 1;
uc->questions=uc->updates=uc->conn_per_hour=0;
uc->user_resources=*mqh;
if (max_user_connections && mqh->connections > max_user_connections)
uc->user_resources.connections = max_user_connections;
uc->intime=thd->thr_create_time;
uc->host= uc->user + uc->user_len + 1;
uc->len= temp_len;
uc->connections= 0;
uc->questions= uc->updates= uc->conn_per_hour=0;
uc->user_resources= *mqh;
uc->intime= thd->thr_create_time;
if (my_hash_insert(&hash_user_connections, (byte*) uc))
{
my_free((char*) uc,0);
send_error(thd, 0, NullS); // Out of memory
return_val=1;
return_val= 1;
goto end;
}
}