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

WL 2826: Error handling of ALTER TABLE for partitioning

Browse Source 
A little more complete handling
This commit is contained in:
mikron@mikael-ronstr-ms-dator.local
2006-02-09 20:20:21 +01:00
parent b290744ce7
commit 4b6b06fd80
3 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/mysql_priv.h
View File

@ -1190,6 +1190,7 @@ typedef struct st_table_log_memory_entry
bool write_table_log_entry(TABLE_LOG_ENTRY *table_log_entry, bool write_table_log_entry(TABLE_LOG_ENTRY *table_log_entry,
TABLE_LOG_MEMORY_ENTRY **active_entry); TABLE_LOG_MEMORY_ENTRY **active_entry);
bool write_execute_table_log_entry(uint first_entry, bool write_execute_table_log_entry(uint first_entry,
bool complete,
TABLE_LOG_MEMORY_ENTRY **active_entry); TABLE_LOG_MEMORY_ENTRY **active_entry);
void release_table_log_memory_entry(TABLE_LOG_MEMORY_ENTRY *log_entry); void release_table_log_memory_entry(TABLE_LOG_MEMORY_ENTRY *log_entry);
void release_table_log(); void release_table_log();

25
sql/sql_partition.cc
View File

@ -5100,7 +5100,7 @@ release_part_info_log_entries(TABLE_LOG_MEMORY_ENTRY *log_entry)
while (log_entry) while (log_entry)
{ {
release_table_log_memory_entry(log_entry); release_table_log_memory_entry(log_entry);
log_entry= log_entry->next_log_entry; log_entry= log_entry->next_active_log_entry;
} }
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
@ -5145,7 +5145,8 @@ write_log_shadow_frm(ALTER_PARTITION_PARAM_TYPE *lpt, bool install_frm)
if (write_table_log_entry(&table_log_entry, &log_entry)) if (write_table_log_entry(&table_log_entry, &log_entry))
break; break;
insert_part_info_log_entry_list(part_info, log_entry); insert_part_info_log_entry_list(part_info, log_entry);
if (write_execute_table_log_entry(log_entry->entry_pos, &exec_log_entry)) if (write_execute_table_log_entry(log_entry->entry_pos,
FALSE, &exec_log_entry))
break; break;
part_info->exec_log_entry= exec_log_entry; part_info->exec_log_entry= exec_log_entry;
unlock_global_table_log(); unlock_global_table_log();
@ -5286,7 +5287,8 @@ write_log_drop_partition(ALTER_PARTITION_PARAM_TYPE *lpt)
if (write_table_log_entry(&table_log_entry, &log_entry)) if (write_table_log_entry(&table_log_entry, &log_entry))
break; break;
insert_part_info_log_entry_list(part_info, log_entry); insert_part_info_log_entry_list(part_info, log_entry);
if (write_execute_table_log_entry(log_entry->entry_pos, &exec_log_entry)) if (write_execute_table_log_entry(log_entry->entry_pos,
FALSE, &exec_log_entry))
break; break;
release_part_info_log_entries(old_first_log_entry); release_part_info_log_entries(old_first_log_entry);
unlock_global_table_log(); unlock_global_table_log();
@ -5345,7 +5347,8 @@ write_log_add_partition(ALTER_PARTITION_PARAM_TYPE *lpt)
break; break;
log_entry= part_info->first_log_entry; log_entry= part_info->first_log_entry;
/* Ensure first entry is the last dropped partition */ /* Ensure first entry is the last dropped partition */
if (write_execute_table_log_entry(log_entry->entry_pos, &exec_log_entry)) if (write_execute_table_log_entry(log_entry->entry_pos,
FALSE, &exec_log_entry))
break; break;
release_part_info_log_entries(old_first_log_entry); release_part_info_log_entries(old_first_log_entry);
unlock_global_table_log(); unlock_global_table_log();
@ -5426,9 +5429,21 @@ static
bool bool
write_log_completed(ALTER_PARTITION_PARAM_TYPE *lpt) write_log_completed(ALTER_PARTITION_PARAM_TYPE *lpt)
{ {
DBUG_ENTER("write_log_ph2_change_partition"); partition_info *part_info= lpt->part_info;
TABLE_LOG_MEMORY_ENTRY *log_entry= part_info->exec_log_entry;
DBUG_ENTER("write_log_completed");
lock_global_table_log(); lock_global_table_log();
DBUG_ASSERT(part_info->exec_log_entry);
if (write_execute_table_log_entry(0UL, TRUE, &part_info->exec_log_entry))
{
DBUG_RETURN(TRUE);
}
release_part_info_log_entries(part_info->first_log_entry);
part_info->first_log_entry= NULL;
part_info->exec_log_entry->next_active_log_entry= NULL;
release_part_info_log_entries(part_info->exec_log_entry);
part_info->exec_log_entry= NULL;
unlock_global_table_log(); unlock_global_table_log();
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);
} }

12
sql/sql_table.cc
View File

@ -367,6 +367,8 @@ write_table_log_header()
int4store(&global_table_log.file_entry[8], const_var); int4store(&global_table_log.file_entry[8], const_var);
if (write_table_log_file_entry(0UL)) if (write_table_log_file_entry(0UL))
error= TRUE; error= TRUE;
if (!error)
error= sync_table_log();
DBUG_RETURN(error); DBUG_RETURN(error);
} }
@ -688,14 +690,20 @@ write_table_log_entry(TABLE_LOG_ENTRY *table_log_entry,
bool bool
write_execute_table_log_entry(uint first_entry, write_execute_table_log_entry(uint first_entry,
bool complete,
TABLE_LOG_MEMORY_ENTRY **active_entry) TABLE_LOG_MEMORY_ENTRY **active_entry)
{ {
bool write_header; bool write_header;
char *file_entry= (char*)global_table_log.file_entry; char *file_entry= (char*)global_table_log.file_entry;
DBUG_ENTER("write_execute_table_log_entry"); DBUG_ENTER("write_execute_table_log_entry");
VOID(sync_table_log()); if (!complete)
file_entry[0]= 'e'; {
VOID(sync_table_log());
file_entry[0]= 'e';
}
else
file_entry[0]= 'i';
file_entry[1]= 0; /* Ignored for execute entries */ file_entry[1]= 0; /* Ignored for execute entries */
int4store(&file_entry[2], first_entry); int4store(&file_entry[2], first_entry);
file_entry[6]= 0; file_entry[6]= 0;