database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge 10.3 to 10.4

Browse Source 
extra2_read_len resolved by keeping the implementation
in sql/table.cc by exposed it for use by ha_partition.cc

Remove identical implementation in unireg.h
(ref: bfed2c7d57)
This commit is contained in:
Daniel Black
2022-03-16 13:25:56 +11:00
parent 9c6135e81f 6a2d88c132
commit 069139a549
27 changed files with 364 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/temporary_tables.cc
View File

@@ -693,19 +693,20 @@ bool THD::rm_temporary_table(handlerton *base, const char *path)
char frm_path[FN_REFLEN + 1];
strxnmov(frm_path, sizeof(frm_path) - 1, path, reg_ext, NullS);
if (mysql_file_delete(key_file_frm, frm_path, MYF(0)))
{
error= true;
}
file= get_new_handler((TABLE_SHARE*) 0, current_thd->mem_root, base);
file= get_new_handler((TABLE_SHARE*) 0, mem_root, base);
if (file && file->ha_delete_table(path))
{
error= true;
sql_print_warning("Could not remove temporary table: '%s', error: %d",
path, my_errno);
}
delete file;
if (mysql_file_delete(key_file_frm, frm_path, MYF(0)))
{
error= true;
}
DBUG_RETURN(error);
}