mirror of
https://github.com/MariaDB/server.git
synced 2025-01-28 09:44:17 +01:00
BUG#16000: .par file not removed plus errors to error log for normal errors
sql/table.cc: Remove error printouts when error occurs during open frm as part of CREATE/ALTER TABLE sql/unireg.cc: Ensure .par file is removed after error
This commit is contained in:
parent
9f8c532f0c
commit
3d04972974
2 changed files with 12 additions and 0 deletions
11
sql/table.cc
11
sql/table.cc
|
@ -1484,7 +1484,18 @@ int open_table_from_share(THD *thd, TABLE_SHARE *share, const char *alias,
|
|||
tmp= fix_partition_func(thd, outparam, is_create_table);
|
||||
*root_ptr= old_root;
|
||||
if (tmp)
|
||||
{
|
||||
if (is_create_table)
|
||||
{
|
||||
/*
|
||||
During CREATE/ALTER TABLE it is ok to receive errors here.
|
||||
It is not ok if it happens during the opening of an frm
|
||||
file as part of a normal query.
|
||||
*/
|
||||
error_reported= TRUE;
|
||||
}
|
||||
goto err;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
@ -339,6 +339,7 @@ int rea_create_table(THD *thd, const char *path,
|
|||
DBUG_RETURN(0);
|
||||
|
||||
err_handler:
|
||||
VOID(file->create_handler_files(path, NULL, CHF_DELETE_FLAG, create_info));
|
||||
my_delete(frm_name, MYF(0));
|
||||
DBUG_RETURN(1);
|
||||
} /* rea_create_table */
|
||||
|
|
Loading…
Add table
Reference in a new issue