diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2021-02-02 17:55:53 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-02-02 17:55:53 +0100 |
| commit | 0f810b58faf487c7cd59f2ee520f62deb0f712eb (patch) | |
| tree | dfb52d41ffd83d0dbffb969c091fe190b9457a24 /sql/sql_connect.cc | |
| parent | 542d769ea1a22a7a6a87c9fe76ff911a162ade44 (diff) | |
| parent | 251b52190070095e4c65ffb0ae545d49330a02b2 (diff) | |
| download | mariadb-git-10.4-merge-attempt.tar.gz | |
Merge branch 'bb-10.3-release' into bb-10.4-release10.4-merge-attempt
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 643b7ee898a..4d09dab392b 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -92,7 +92,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)) { @@ -102,6 +101,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: |