Commit 897dd479 authored by unknown's avatar unknown
Browse files

WL 2826: Error handling of ALTER TABLE for partitioning 

Added action code for recovery


sql/mysql_priv.h:
  Added entry in table log struct
sql/sql_partition.cc:
  Some renames to replace
sql/sql_table.cc:
  Added action code for recovery
parent 5d5eba2d

sql/mysql_priv.h

+1 −0
Original line number Diff line number Diff line
@@ -1175,6 +1175,7 @@ typedef struct st_table_log_entry 
  const char *from_name;

  const char *handler_type;

  uint next_entry;

  uint entry_pos;

  char action_type;

  char entry_type;

  char phase;

sql/sql_partition.cc

+6 −6
Original line number Diff line number Diff line
@@ -5132,7 +5132,7 @@ write_log_replace_delete_frm(ALTER_PARTITION_PARAM_TYPE *lpt, 
{

  TABLE_LOG_ENTRY table_log_entry;

  TABLE_LOG_MEMORY_ENTRY *log_entry;

  DBUG_ENTER("write_log_replace_frm");

  DBUG_ENTER("write_log_replace_delete_frm");



  if (replace_flag)

    table_log_entry.action_type= TLOG_REPLACE_ACTION_CODE;
@@ -5412,7 +5412,7 @@ write_log_drop_shadow_frm(ALTER_PARTITION_PARAM_TYPE *lpt) 
  lock_global_table_log();

  do

  {

    if (write_log_rename_delete_frm(lpt, 0UL, NULL,

    if (write_log_replace_delete_frm(lpt, 0UL, NULL,

                                    (const char*)shadow_path, FALSE))

      break;

    log_entry= part_info->first_log_entry;
@@ -5465,7 +5465,7 @@ write_log_rename_frm(ALTER_PARTITION_PARAM_TYPE *lpt) 
  lock_global_table_log();

  do

  {

    if (write_log_rename_delete_frm(lpt, 0UL, path, shadow_path, FALSE))

    if (write_log_replace_delete_frm(lpt, 0UL, path, shadow_path, FALSE))

      break;

    log_entry= part_info->first_log_entry;

    part_info->frm_log_entry= log_entry;
@@ -5525,7 +5525,7 @@ write_log_drop_partition(ALTER_PARTITION_PARAM_TYPE *lpt) 
    if (write_log_dropped_partitions(lpt, &next_entry, (const char*)path,

                                     FALSE))

      break;

    if (write_log_rename_delete_frm(lpt, next_entry, (const char*)path,

    if (write_log_replace_delete_frm(lpt, next_entry, (const char*)path,

                                    (const char*)tmp_path, TRUE))

      break;

    log_entry= part_info->first_log_entry;
@@ -5585,7 +5585,7 @@ write_log_add_change_partition(ALTER_PARTITION_PARAM_TYPE *lpt) 
    if (write_log_dropped_partitions(lpt, &next_entry, (const char*)path,

                                     FALSE))

      break;

    if (write_log_rename_delete_frm(lpt, next_entry, NULL, tmp_path,

    if (write_log_replace_delete_frm(lpt, next_entry, NULL, tmp_path,

                                    FALSE))

      break;

    log_entry= part_info->first_log_entry;
@@ -5647,7 +5647,7 @@ write_log_final_change_partition(ALTER_PARTITION_PARAM_TYPE *lpt) 
      break;

    if (write_log_changed_partitions(lpt, &next_entry, (const char*)path))

      break;

    if (write_log_rename_delete_frm(lpt, 0UL, path, shadow_path, FALSE))

    if (write_log_replace_delete_frm(lpt, 0UL, path, shadow_path, FALSE))

      break;

    log_entry= part_info->first_log_entry;

    part_info->frm_log_entry= log_entry;

sql/sql_table.cc

+97 −2
Original line number Diff line number Diff line
@@ -478,6 +478,7 @@ read_table_log_entry(uint read_entry, TABLE_LOG_ENTRY *table_log_entry) 
    /* Error handling */

    DBUG_RETURN(TRUE);

  }

  table_log_entry->entry_pos= read_entry;

  table_log_entry->entry_type= file_entry[TLOG_ENTRY_TYPE_POS];

  table_log_entry->action_type= file_entry[TLOG_ACTION_TYPE_POS];

  table_log_entry->phase= file_entry[TLOG_PHASE_POS];
@@ -544,9 +545,98 @@ static 
bool

execute_table_log_action(TABLE_LOG_ENTRY *table_log_entry)

{

  bool frm_action= FALSE;

  LEX_STRING handler_name;

  handler *file;

  MEMROOT mem_root;

  bool= error= TRUE;

  char path[FN_REFLEN];

  char from_path[FN_REFLEN];

  char *par_ext= ".par";

  DBUG_ENTER("execute_table_log_action");



  if (table_log_entry->entry_type == TLOG_IGNORE_LOG_ENTRY_CODE)

  {

    DBUG_RETURN(FALSE);

  }

  handler_name.str= table_log_entry->handler_type;

  handler_name.length= strlen(table_log_entry->handler_type);

  hton= ha_resolve_by_name(current_thd, handler_name);

  if (!hton)

  {

    DBUG_RETURN(TRUE);

  }

  init_sql_alloc(&mem_root, TABLE_ALLOC_BLOCK_SIZE, 0); 

  if (strcmp("frm", table_log_entry->handler_type))

    frm_action= TRUE;

  else

  {

    file= get_new_handler(table_share, &mem_root, hton);

    if (!file)

      goto error;

  }

  switch (table_log_entry->action_type)

    case TLOG_ACTION_DELETE_CODE:

    case TLOG_ACTION_REPLACE_CODE:

      if (table_log_entry->action_type == TLOG_ACTION_DELETE_CODE ||

          (table_log_entry->action_type == TLOG_ACTION_REPLACE_CODE &&

           table_log_entry->phase == 0UL))

      {

        if (frm_action)

        {

          strxmov(path, table_log_entry->name, reg_ext, NullS);

          VOID(my_delete(path, MYF(0)));

          strxmov(path, table_log_entry->name, par_ext, NullS);

          VOID(my_delete(path, MYF(0)));

        }

        else

        {

          if (file->delete_table(table_name))

            break;

        }

        if ((!inactivate_table_log_entry(table_log_entry->entry_pos)) &&

            (!sync_table_log()))

          ;

        else

          error= FALSE;

        break;

      }

      if (table_log_entry->action_type == TLOG_ACTION_DELETE_CODE)

        break;

    case TLOG_ACTION_RENAME_CODE:

      error= TRUE;

      if (frm_action)

      {

        strxmov(path, table_log_entry->name, reg_ext, NullS);

        strxmov(from_path, table_log_entry->from_name, reg_ext, NullS);

        if (my_rename(path, from_path, MYF(0)))

          break;

        strxmov(path, table_log_entry->name, par_ext, NullS);

        strxmov(from_path, table_log_entry->from_name, par_ext, NullS);

        if (my_rename(path, from_path, MYF(0)))

          break;

      }

      else

      {

        if (file->rename_table(table_log_entry->name,

                               table_log_entry->from_name))

          break;

        if ((!inactivate_table_log_entry(table_log_entry->entry_pos)) &&

            (!sync_table_log()))

          ;

        else

          error= FALSE;

      }

      break;

    default:

      DBUG_ASSERT(0);

      break;

  }

  delete file;

error:

  free_root(&mem_root, MYF(0)); 

  DBUG_RETURN(error);

}





/*
@@ -864,6 +954,7 @@ execute_table_log_entry(uint first_entry) 
  uint read_entry= first_entry;

  DBUG_ENTER("execute_table_log_entry");



  lock_global_table_log();

  do

  {

    if (read_table_log_entry(read_entry, &table_log_entry))
@@ -874,7 +965,8 @@ execute_table_log_entry(uint first_entry) 
    }

    DBUG_ASSERT(table_log_entry.entry_type == TLOG_LOG_ENTRY_CODE ||

                table_log_entry.entry_type == TLOG_IGNORE_LOG_ENTRY_CODE);

    if (execute_table_log_action(&table_log_entry))



    if (execute_table_log_action(file, &table_log_entry))

    {

      DBUG_ASSERT(0);

      /* Write to error log and continue with next log entry */
@@ -882,9 +974,11 @@ execute_table_log_entry(uint first_entry) 
    }

    read_entry= table_log_entry.next_entry;

  } while (read_entry);

  unlock_global_table_log();

  DBUG_RETURN(FALSE);

}





/*

  Execute the table log at recovery of MySQL Server

  SYNOPSIS
@@ -922,6 +1016,7 @@ execute_table_log_recovery() 
      }

    }

  }

  release_handler_objects();

  VOID(init_table_log());

  DBUG_VOID_RETURN;

}