diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-02-01 13:49:33 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-02-01 13:49:33 +0100 |
| commit | 60ea09eae6f464e8ec483f4d31f7b910a8451c28 (patch) | |
| tree | 7b79f55a96c8bc9dc3f0353cc08f43b825fe8707 /sql/sql_connect.cc | |
| parent | 59eda73eff1a22ac0373d818bc802c05e82b5449 (diff) | |
| parent | ff5186fd2b1ed06ed40fe3d817b41326e3f943d5 (diff) | |
| download | mariadb-git-60ea09eae6f464e8ec483f4d31f7b910a8451c28.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'sql/sql_connect.cc')
| -rw-r--r-- | sql/sql_connect.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc index 59271694d8d..4d9ef98d22b 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -88,7 +88,6 @@ int get_or_create_user_conn(THD *thd, const char *user, uc->host= uc->user + user_len + 1; uc->len= (uint)temp_len; uc->connections= uc->questions= uc->updates= uc->conn_per_hour= 0; - uc->user_resources= *mqh; uc->reset_utime= thd->thr_create_utime; if (my_hash_insert(&hash_user_connections, (uchar*) uc)) { @@ -98,6 +97,7 @@ int get_or_create_user_conn(THD *thd, const char *user, goto end; } } + uc->user_resources= *mqh; thd->user_connect=uc; uc->connections++; end: |