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

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

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


sql/sql_parse.cc:
  Auto merged
This commit is contained in:
unknown
2005-08-01 17:12:30 -07:00
parent dc6810ec5b 8efb9a0180
commit c679cb67bc
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_parse.cc
View File

@@ -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))
{