mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-17 12:27:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.6 into 10.11

Browse source
This commit is contained in:
Marko Mäkelä 2024-11-29 13:43:17 +02:00
commit 3d23adb766
397 changed files with 6217 additions and 4218 deletions
Download patch file Download diff file Expand all files Collapse all files

8
storage/perfschema/pfs_account.cc
View file

@ -67,19 +67,19 @@ void cleanup_account(void)
}
C_MODE_START
static uchar *account_hash_get_key(const uchar *entry, size_t *length,
my_bool)
static const uchar *account_hash_get_key(const void *entry, size_t *length,
my_bool)
{
const PFS_account * const *typed_entry;
const PFS_account *account;
const void *result;
typed_entry= reinterpret_cast<const PFS_account* const *> (entry);
typed_entry= static_cast<const PFS_account* const *> (entry);
assert(typed_entry != NULL);
account= *typed_entry;
assert(account != NULL);
*length= account->m_key.m_key_length;
result= account->m_key.m_hash_key;
return const_cast<uchar*> (reinterpret_cast<const uchar*> (result));
return reinterpret_cast<const uchar *>(result);
}
C_MODE_END

8
storage/perfschema/pfs_digest.cc
View file

@ -146,19 +146,19 @@ void cleanup_digest(void)
}
C_MODE_START
static uchar *digest_hash_get_key(const uchar *entry, size_t *length,
my_bool)
static const uchar *digest_hash_get_key(const void *entry, size_t *length,
my_bool)
{
const PFS_statements_digest_stat * const *typed_entry;
const PFS_statements_digest_stat *digest;
const void *result;
typed_entry= reinterpret_cast<const PFS_statements_digest_stat*const*>(entry);
typed_entry= static_cast<const PFS_statements_digest_stat*const*>(entry);
assert(typed_entry != NULL);
digest= *typed_entry;
assert(digest != NULL);
*length= sizeof (PFS_digest_key);
result= & digest->m_digest_key;
return const_cast<uchar*> (reinterpret_cast<const uchar*> (result));
return reinterpret_cast<const uchar *>(result);
}
C_MODE_END

8
storage/perfschema/pfs_host.cc
View file

@ -65,19 +65,19 @@ void cleanup_host(void)
}
C_MODE_START
static uchar *host_hash_get_key(const uchar *entry, size_t *length,
my_bool)
static const uchar *host_hash_get_key(const void *entry, size_t *length,
my_bool)
{
const PFS_host * const *typed_entry;
const PFS_host *host;
const void *result;
typed_entry= reinterpret_cast<const PFS_host* const *> (entry);
typed_entry= static_cast<const PFS_host* const *> (entry);
assert(typed_entry != NULL);
host= *typed_entry;
assert(host != NULL);
*length= host->m_key.m_key_length;
result= host->m_key.m_hash_key;
return const_cast<uchar*> (reinterpret_cast<const uchar*> (result));
return reinterpret_cast<const uchar *>(result);
}
C_MODE_END

8
storage/perfschema/pfs_instr.cc
View file

@ -253,19 +253,19 @@ void cleanup_instruments(void)
C_MODE_START
/** Get hash table key for instrumented files. */
static uchar *filename_hash_get_key(const uchar *entry, size_t *length,
my_bool)
static const uchar *filename_hash_get_key(const void *entry, size_t *length,
my_bool)
{
const PFS_file * const *typed_entry;
const PFS_file *file;
const void *result;
typed_entry= reinterpret_cast<const PFS_file* const *> (entry);
typed_entry= static_cast<const PFS_file* const *> (entry);
assert(typed_entry != NULL);
file= *typed_entry;
assert(file != NULL);
*length= file->m_filename_length;
result= file->m_filename;
return const_cast<uchar*> (reinterpret_cast<const uchar*> (result));
return reinterpret_cast<const uchar *>(result);
}
C_MODE_END

8
storage/perfschema/pfs_instr_class.cc
View file

@ -403,19 +403,19 @@ void cleanup_table_share(void)
C_MODE_START
/** get_key function for @c table_share_hash. */
static uchar *table_share_hash_get_key(const uchar *entry, size_t *length,
my_bool)
static const uchar *table_share_hash_get_key(const void *entry, size_t *length,
my_bool)
{
const PFS_table_share * const *typed_entry;
const PFS_table_share *share;
const void *result;
typed_entry= reinterpret_cast<const PFS_table_share* const *> (entry);
typed_entry= static_cast<const PFS_table_share* const *> (entry);
assert(typed_entry != NULL);
share= *typed_entry;
assert(share != NULL);
*length= share->m_key.m_key_length;
result= &share->m_key.m_hash_key[0];
return const_cast<uchar*> (reinterpret_cast<const uchar*> (result));
return reinterpret_cast<const uchar *>(result);
}
C_MODE_END

8
storage/perfschema/pfs_program.cc
View file

@ -63,19 +63,19 @@ void cleanup_program(void)
}
C_MODE_START
static uchar *program_hash_get_key(const uchar *entry, size_t *length,
my_bool)
static const uchar *program_hash_get_key(const void *entry, size_t *length,
my_bool)
{
const PFS_program * const *typed_entry;
const PFS_program *program;
const void *result;
typed_entry= reinterpret_cast<const PFS_program* const *> (entry);
typed_entry= static_cast<const PFS_program* const *> (entry);
assert(typed_entry != NULL);
program= *typed_entry;
assert(program != NULL);
*length= program->m_key.m_key_length;
result= program->m_key.m_hash_key;
return const_cast<uchar*> (reinterpret_cast<const uchar*> (result));
return reinterpret_cast<const uchar *>(result);
}
C_MODE_END

8
storage/perfschema/pfs_setup_actor.cc
View file

@ -63,19 +63,19 @@ void cleanup_setup_actor(void)
}
C_MODE_START
static uchar *setup_actor_hash_get_key(const uchar *entry, size_t *length,
my_bool)
static const uchar *setup_actor_hash_get_key(const void *entry, size_t *length,
my_bool)
{
const PFS_setup_actor * const *typed_entry;
const PFS_setup_actor *setup_actor;
const void *result;
typed_entry= reinterpret_cast<const PFS_setup_actor* const *> (entry);
typed_entry= static_cast<const PFS_setup_actor* const *> (entry);
assert(typed_entry != NULL);
setup_actor= *typed_entry;
assert(setup_actor != NULL);
*length= setup_actor->m_key.m_key_length;
result= setup_actor->m_key.m_hash_key;
return const_cast<uchar*> (reinterpret_cast<const uchar*> (result));
return reinterpret_cast<const uchar *>(result);
}
C_MODE_END

8
storage/perfschema/pfs_setup_object.cc
View file

@ -63,19 +63,19 @@ void cleanup_setup_object(void)
}
C_MODE_START
static uchar *setup_object_hash_get_key(const uchar *entry, size_t *length,
my_bool)
static const uchar *setup_object_hash_get_key(const void *entry,
size_t *length, my_bool)
{
const PFS_setup_object * const *typed_entry;
const PFS_setup_object *setup_object;
const void *result;
typed_entry= reinterpret_cast<const PFS_setup_object* const *> (entry);
typed_entry= static_cast<const PFS_setup_object* const *> (entry);
assert(typed_entry != NULL);
setup_object= *typed_entry;
assert(setup_object != NULL);
*length= setup_object->m_key.m_key_length;
result= setup_object->m_key.m_hash_key;
return const_cast<uchar*> (reinterpret_cast<const uchar*> (result));
return reinterpret_cast<const uchar *>(result);
}
C_MODE_END

8
storage/perfschema/pfs_user.cc
View file

@ -64,19 +64,19 @@ void cleanup_user(void)
}
C_MODE_START
static uchar *user_hash_get_key(const uchar *entry, size_t *length,
my_bool)
static const uchar *user_hash_get_key(const void *entry, size_t *length,
my_bool)
{
const PFS_user * const *typed_entry;
const PFS_user *user;
const void *result;
typed_entry= reinterpret_cast<const PFS_user* const *> (entry);
typed_entry= static_cast<const PFS_user* const *> (entry);
assert(typed_entry != NULL);
user= *typed_entry;
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));
return reinterpret_cast<const uchar *>(result);
}
C_MODE_END