database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Enable TokuDB online ALTER

Browse Source 
sql/create_options.cc:
  an utility function to compare two filled-in engine_option structures
sql/sql_table.cc:
  * two keys are different if their option_struct's differ
    (for ALTER TABLE DROP key, ADD key)
  * engines doing inplace alter must see the new frm image
This commit is contained in:
Sergei Golubchik
2013-09-25 19:42:22 +02:00
parent fd55306254
commit 20031c6273
39 changed files with 175 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sql/sql_table.cc
View File

@ -5747,6 +5747,10 @@ static bool fill_alter_inplace_info(THD *thd,
new_key->user_defined_key_parts))
goto index_changed;
if (engine_options_differ(table_key->option_struct, new_key->option_struct,
table->file->ht->index_options))
goto index_changed;
/*
Check that the key parts remain compatible between the old and
new tables.
@ -8045,11 +8049,7 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
{
Alter_inplace_info ha_alter_info(create_info, alter_info,
key_info, key_count,
#ifdef WITH_PARTITION_STORAGE_ENGINE
thd->work_part_info,
#else
NULL,
#endif
IF_PARTITIONING(thd->work_part_info, NULL),
ignore);
TABLE *altered_table= NULL;
bool use_inplace= true;
@ -8170,15 +8170,14 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
if (use_inplace)
{
table->s->frm_image= &frm;
int res= mysql_inplace_alter_table(thd, table_list, table, altered_table,
&ha_alter_info, inplace_supported,
&target_mdl_request, &alter_ctx);
my_free(const_cast<uchar*>(frm.str));
if (mysql_inplace_alter_table(thd, table_list, table,
altered_table,
&ha_alter_info,
inplace_supported, &target_mdl_request,
&alter_ctx))
{
if (res)
DBUG_RETURN(true);
}
goto end_inplace;
}