bk commit into 5.1 tree (mikron:1.2117)

[mikael]

Below is the list of changes that have just been committed into a local
5.1 repository of mikron. When mikron does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2117 06/02/09 15:39:15 mikron@stripped +3 -0
  WL 2826: Error handling of ALTER TABLE for partitioning
  A little more complete handling

  sql/sql_partition.cc
    1.39 06/02/09 15:39:03 mikron@stripped +20 -5
    A little more complete handling

  sql/sql_table.cc
    1.310 06/02/09 15:39:03 mikron@stripped +10 -2
    A little more complete handling

  sql/mysql_priv.h
    1.388 06/02/09 15:39:02 mikron@stripped +1 -0
    Complete flag

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mikron
# Host:	mikael-ronstr-ms-dator.local
# Root:	/Users/mikron/wl2826

--- 1.387/sql/mysql_priv.h	2006-02-09 20:13:17 +01:00
+++ 1.388/sql/mysql_priv.h	2006-02-09 15:39:02 +01:00
@@ -1190,6 +1190,7 @@
 bool write_table_log_entry(TABLE_LOG_ENTRY *table_log_entry,
                            TABLE_LOG_MEMORY_ENTRY **active_entry);
 bool write_execute_table_log_entry(uint first_entry,
+                                   bool complete,
                                    TABLE_LOG_MEMORY_ENTRY **active_entry);
 void release_table_log_memory_entry(TABLE_LOG_MEMORY_ENTRY *log_entry);
 void release_table_log();

--- 1.309/sql/sql_table.cc	2006-02-09 20:13:17 +01:00
+++ 1.310/sql/sql_table.cc	2006-02-09 15:39:03 +01:00
@@ -367,6 +367,8 @@
   int4store(&global_table_log.file_entry[8], const_var);
   if (write_table_log_file_entry(0UL))
     error= TRUE;
+  if (!error)
+    error= sync_table_log();
   DBUG_RETURN(error);
 }
 
@@ -688,14 +690,20 @@
 
 bool
 write_execute_table_log_entry(uint first_entry,
+                              bool complete,
                               TABLE_LOG_MEMORY_ENTRY **active_entry)
 {
   bool write_header;
   char *file_entry= (char*)global_table_log.file_entry;
   DBUG_ENTER("write_execute_table_log_entry");
 
-  VOID(sync_table_log());
-  file_entry[0]= 'e';
+  if (!complete)
+  {
+    VOID(sync_table_log());
+    file_entry[0]= 'e';
+  }
+  else
+    file_entry[0]= 'i';
   file_entry[1]= 0; /* Ignored for execute entries */
   int4store(&file_entry[2], first_entry);
   file_entry[6]= 0;

--- 1.38/sql/sql_partition.cc	2006-02-09 20:20:15 +01:00
+++ 1.39/sql/sql_partition.cc	2006-02-09 15:39:03 +01:00
@@ -5100,7 +5100,7 @@
   while (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;
 }
@@ -5145,7 +5145,8 @@
     if (write_table_log_entry(&table_log_entry, &log_entry))
       break;
     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;
     part_info->exec_log_entry= exec_log_entry;
     unlock_global_table_log();
@@ -5286,7 +5287,8 @@
     if (write_table_log_entry(&table_log_entry, &log_entry))
       break;
     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;
     release_part_info_log_entries(old_first_log_entry);
     unlock_global_table_log();
@@ -5345,7 +5347,8 @@
       break;
     log_entry= part_info->first_log_entry;
     /* 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;
     release_part_info_log_entries(old_first_log_entry);
     unlock_global_table_log();
@@ -5426,9 +5429,21 @@
 bool
 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();
+  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();
   DBUG_RETURN(FALSE);
 }