mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-trg3 sql/handler.cc: Auto merged sql/sql_table.cc: Auto merged
This commit is contained in:
@ -257,7 +257,19 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
|
||||
/* Delete the table definition file */
|
||||
strmov(end,reg_ext);
|
||||
if (!(new_error=my_delete(path,MYF(MY_WME))))
|
||||
{
|
||||
some_tables_deleted=1;
|
||||
/*
|
||||
Destroy triggers for this table if there are any.
|
||||
|
||||
We won't need this as soon as we will have new .FRM format,
|
||||
in which we will store trigger definitions in the same .FRM
|
||||
files as table descriptions.
|
||||
*/
|
||||
strmov(end, triggers_file_ext);
|
||||
if (!access(path, F_OK))
|
||||
new_error= my_delete(path, MYF(MY_WME));
|
||||
}
|
||||
error|= new_error;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user