Commit aa9d81e6 authored by Sinisa@sinisa.nasamreza.org's avatar Sinisa@sinisa.nasamreza.org
Browse files

Merge sinisa@work.mysql.com:/home/bk/mysql-4.0 

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
parents ff7016e9 17e99909

sql/sql_parse.cc

+3 −8
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static int get_or_create_user_conn(THD *thd, const char *user, 
    uc->connections = 1;

    uc->questions=uc->updates=uc->conn_per_hour=0;

    uc->user_resources=*mqh;

    if (mqh->connections > max_user_connections) 

    if (max_user_connections && mqh->connections > max_user_connections) 

      uc->user_resources.connections = max_user_connections;

    uc->intime=thd->thr_create_time;

    if (hash_insert(&hash_user_connections, (byte*) uc))
@@ -317,12 +317,7 @@ static void decrease_user_connections(USER_CONN *uc) 
*/



  DBUG_ENTER("decrease_user_connections");

  if (mqh_used)

  {

    if (uc->conn_per_hour) 

      uc->conn_per_hour--;

  }

  else if (!--uc->connections)

  if (!mqh_used && uc->connections && !--uc->connections)

  {

    /* Last connection for user; Delete it */

    (void) pthread_mutex_lock(&LOCK_user_conn);