Commit c679cb67 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-4.1-9947 

into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/sql_parse.cc:
  Auto merged
parents dc6810ec 8efb9a01

sql/sql_parse.cc

+10 −12
Original line number Diff line number Diff line
@@ -164,11 +164,9 @@ static int get_or_create_user_conn(THD *thd, const char *user, 
    uc->user_len= user_len;

    uc->host= uc->user + uc->user_len +  1;

    uc->len= temp_len;

    uc->connections = 1;

    uc->connections= 0;

    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;

    if (my_hash_insert(&hash_user_connections, (byte*) uc))

    {