database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.6 into 10.11

Browse Source
This commit is contained in:
Marko Mäkelä
2025-03-27 08:01:47 +02:00
parent ba81009f63 191209d8ab
commit ab0f2a00b6
463 changed files with 4278 additions and 1958 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_base.cc
View File

@@ -781,6 +781,7 @@ close_all_tables_for_name(THD *thd, TABLE_SHARE *share,
}
}
#ifdef DBUG_ASSERT_EXISTS
static inline bool check_field_pointers(const TABLE *table)
{
for (Field **pf= table->field; *pf; pf++)
@@ -796,6 +797,7 @@ static inline bool check_field_pointers(const TABLE *table)
}
return true;
}
#endif
int close_thread_tables_for_query(THD *thd)
@@ -9407,9 +9409,11 @@ my_bool mysql_rm_tmp_tables(void)
memcpy(path_copy, path, path_len - ext_len);
path_copy[path_len - ext_len]= 0;
init_tmp_table_share(thd, &share, "", 0, "", path_copy);
handlerton *ht= share.db_type();
if (!open_table_def(thd, &share))
ht->drop_table(share.db_type(), path_copy);
{
handlerton *ht= share.db_type();
ht->drop_table(ht, path_copy);
}
free_table_share(&share);
}
/*