diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-01-28 11:57:52 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-01-28 11:57:52 +0100 |
| commit | 880d54355432d6135a77c1cff3f15977947b3107 (patch) | |
| tree | 01909a9746b303312049e8f59d3410e84e4747dd /storage/perfschema/pfs_user.cc | |
| parent | 430d60d1fc01958f2a503d01b24154672a4189bf (diff) | |
| parent | 157e66273b83119fe4837693899b2b2ef84de02c (diff) | |
| download | mariadb-git-880d54355432d6135a77c1cff3f15977947b3107.tar.gz | |
Merge branch 'merge-perfschema-5.7' into 10.5
Diffstat (limited to 'storage/perfschema/pfs_user.cc')
| -rw-r--r-- | storage/perfschema/pfs_user.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/storage/perfschema/pfs_user.cc b/storage/perfschema/pfs_user.cc index feb99f41147..d7dfda4efc2 100644 --- a/storage/perfschema/pfs_user.cc +++ b/storage/perfschema/pfs_user.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2010, 2021, Oracle and/or its affiliates. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, @@ -71,9 +71,9 @@ static uchar *user_hash_get_key(const uchar *entry, size_t *length, const PFS_user *user; const void *result; typed_entry= reinterpret_cast<const PFS_user* const *> (entry); - DBUG_ASSERT(typed_entry != NULL); + assert(typed_entry != NULL); user= *typed_entry; - DBUG_ASSERT(user != NULL); + assert(user != NULL); *length= user->m_key.m_key_length; result= user->m_key.m_hash_key; return const_cast<uchar*> (reinterpret_cast<const uchar*> (result)); @@ -119,7 +119,7 @@ static LF_PINS* get_user_hash_pins(PFS_thread *thread) static void set_user_key(PFS_user_key *key, const char *user, uint user_length) { - DBUG_ASSERT(user_length <= USERNAME_LENGTH); + assert(user_length <= USERNAME_LENGTH); char *ptr= &key->m_hash_key[0]; if (user_length > 0) @@ -293,7 +293,7 @@ void purge_user(PFS_thread *thread, PFS_user *user) user->m_key.m_hash_key, user->m_key.m_key_length)); if (entry && (entry != MY_ERRPTR)) { - DBUG_ASSERT(*entry == user); + assert(*entry == user); if (user->get_refcount() == 0) { lf_hash_delete(&user_hash, pins, |