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

Merge 11.4 into 11.7

Browse source
This commit is contained in:
Marko Mäkelä 2024-12-02 17:51:17 +02:00
commit 33907f9ec6
449 changed files with 6778 additions and 4295 deletions
Download patch file Download diff file Expand all files Collapse all files

14
sql/sql_handler.cc
View file

@ -108,11 +108,12 @@ SQL_HANDLER::~SQL_HANDLER()
Pointer to the TABLE_LIST struct.
*/
static char *mysql_ha_hash_get_key(SQL_HANDLER *table, size_t *key_len,
my_bool first __attribute__((unused)))
static const uchar *mysql_ha_hash_get_key(const void *table_, size_t *key_len,
my_bool)
{
auto table= static_cast<const SQL_HANDLER *>(table_);
*key_len= table->handler_name.length + 1 ; /* include '\0' in comparisons */
return (char*) table->handler_name.str;
return reinterpret_cast<const uchar *>(table->handler_name.str);
}
@ -130,9 +131,9 @@ static char *mysql_ha_hash_get_key(SQL_HANDLER *table, size_t *key_len,
Nothing
*/
static void mysql_ha_hash_free(SQL_HANDLER *table)
static void mysql_ha_hash_free(void *table)
{
delete table;
delete static_cast<SQL_HANDLER *>(table);
}
static void mysql_ha_close_childs(THD *thd, TABLE_LIST *current_table_list,
@ -287,8 +288,7 @@ bool mysql_ha_open(THD *thd, TABLE_LIST *tables, SQL_HANDLER *reopen)
*/
if (my_hash_init(key_memory_THD_handler_tables_hash,
&thd->handler_tables_hash, &my_charset_latin1,
HANDLER_TABLES_HASH_SIZE, 0, 0, (my_hash_get_key)
mysql_ha_hash_get_key, (my_hash_free_key)
HANDLER_TABLES_HASH_SIZE, 0, 0, mysql_ha_hash_get_key,
mysql_ha_hash_free, 0))
{
DBUG_PRINT("exit",("ERROR"));