database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Replace ha_notify_table_changed() with notify_tabledef_changed()

Browse Source 
Reason for the change was that ha_notify_table_changed() was done
after table open when .frm had been replaced, which caused failure
in engines that checks on open if .frm matches the engines table
definition.

Other changes:
- Remove not needed open/close call at end of inline alter table.
  Some test that depended on the table beeing in the table cache after
  ALTER TABLE had to be updated.
This commit is contained in:
Monty
2019-05-08 23:12:01 +03:00
parent 96037a6f03
commit 007f68c37f
17 changed files with 78 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
sql/sql_table.cc
View File

@ -7499,11 +7499,10 @@ static bool mysql_inplace_alter_table(THD *thd,
{
Open_table_context ot_ctx(thd, MYSQL_OPEN_REOPEN | MYSQL_OPEN_IGNORE_KILLED);
handlerton *db_type= table->s->db_type();
MDL_ticket *mdl_ticket= table->mdl_ticket;
Alter_info *alter_info= ha_alter_info->alter_info;
bool reopen_tables= false;
bool res;
handlerton *hton;
DBUG_ENTER("mysql_inplace_alter_table");
/* Downgrade DDL lock while we are waiting for exclusive lock below */
@ -7709,6 +7708,28 @@ static bool mysql_inplace_alter_table(THD *thd,
}
}
/* Notify the engine that the table definition has changed */
hton= table->file->ht;
if (hton->notify_tabledef_changed)
{
char db_buff[FN_REFLEN], table_buff[FN_REFLEN];
LEX_CSTRING tmp_db, tmp_table;
tmp_db.str= db_buff;
tmp_table.str= table_buff;
tmp_db.length= tablename_to_filename(table_list->db.str,
db_buff, sizeof(db_buff));
tmp_table.length= tablename_to_filename(table_list->table_name.str,
table_buff, sizeof(table_buff));
if ((hton->notify_tabledef_changed)(hton, &tmp_db, &tmp_table,
table->s->frm_image,
&table->s->tabledef_version))
{
my_error(HA_ERR_INCOMPATIBLE_DEFINITION, MYF(0));
DBUG_RETURN(true);
}
}
close_all_tables_for_name(thd, table->s,
alter_ctx->is_table_renamed() ?
HA_EXTRA_PREPARE_FOR_RENAME :
@ -7733,24 +7754,6 @@ static bool mysql_inplace_alter_table(THD *thd,
DBUG_RETURN(true);
}
table_list->mdl_request.ticket= mdl_ticket;
if (open_table(thd, table_list, &ot_ctx))
DBUG_RETURN(true);
/*
Tell the handler that the changed frm is on disk and table
has been re-opened
*/
table_list->table->file->ha_notify_table_changed();
/*
We might be going to reopen table down on the road, so we have to
restore state of the TABLE object which we used for obtaining of
handler object to make it usable for later reopening.
*/
close_thread_table(thd, &thd->open_tables);
table_list->table= NULL;
// Rename altered table if requested.
if (alter_ctx->is_table_renamed())
{