Commit 4624982e authored by unknown's avatar unknown
Browse files

WL 2826: Error handling of ALTER TABLE for partitioning 

Use \0 to indicate frm-file
Add more comments
Add more #ifdef code missing previously


sql/sql_partition.cc:
  Use \0 to indicate frm-file
sql/sql_table.cc:
  Use \0 to indicate frm-file
  Add more comments
  Add more #ifdef code missing previously
parent 9a40c5bf

sql/sql_partition.cc

+1 −1
Original line number Diff line number Diff line
@@ -4759,7 +4759,7 @@ static bool write_log_replace_delete_frm(ALTER_PARTITION_PARAM_TYPE *lpt, 
  else

    ddl_log_entry.action_type= DDL_LOG_DELETE_ACTION;

  ddl_log_entry.next_entry= next_entry;

  ddl_log_entry.handler_name= "frm";

  ddl_log_entry.handler_name[0]= 0;

  ddl_log_entry.name= to_path;

  if (replace_flag)

    ddl_log_entry.from_name= from_path;

sql/sql_table.cc

+11 −1
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ static bool execute_ddl_log_action(THD *thd, DDL_LOG_ENTRY *ddl_log_entry) 
    DBUG_RETURN(TRUE);

  }

  init_sql_alloc(&mem_root, TABLE_ALLOC_BLOCK_SIZE, 0); 

  if (strcmp("frm", ddl_log_entry->handler_name))

  if (ddl_log_entry->handler_name[0] == 0)

    frm_action= TRUE;

  else

  {
@@ -1260,6 +1260,12 @@ bool mysql_write_frm(ALTER_PARTITION_PARAM_TYPE *lpt, uint flags) 
    /*

      When we are changing to use new frm file we need to ensure that we

      don't collide with another thread in process to open the frm file.

      We start by deleting the .frm file and possible .par file. Then we

      write to the DDL log that we have completed the delete phase by

      increasing the phase of the log entry. Next step is to rename the

      new .frm file and the new .par file to the real name. After

      completing this we write a new phase to the log entry that will

      deactivate it.

    */

    VOID(pthread_mutex_lock(&LOCK_open));

    if (my_delete(frm_name, MYF(MY_WME)) ||
@@ -1269,9 +1275,13 @@ bool mysql_write_frm(ALTER_PARTITION_PARAM_TYPE *lpt, uint flags) 
        deactivate_ddl_log_entry(part_info->frm_log_entry->entry_pos) ||

        (sync_ddl_log(), FALSE) ||

#endif

#ifdef WITH_PARTITION_STORAGE_ENGINE

        my_rename(shadow_frm_name, frm_name, MYF(MY_WME)) ||

        lpt->table->file->create_handler_files(path, shadow_path,

                                               CHF_RENAME_FLAG))

#else

        my_rename(shadow_frm_name, frm_name, MYF(MY_WME)))

#endif

    {

      error= 1;

    }