bk commit into 5.1 tree (dli:1.2323) BUG#15021

[David Li]

Below is the list of changes that have just been committed into a local
5.1 repository of dli. When dli 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@stripped, 2006-11-28 11:14:36+08:00, dli@stripped +1 -0
  ndb - fiexed for bug#15021, binlog_index table become inconsistent if errors during
purge of binlogs.
  
  improved the original patch, changed if/else to switch/case.

  sql/table.cc@stripped, 2006-11-28 11:14:33+08:00, dli@stripped +25 -25
    changed if/else to switch/case.

# 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:	dli
# Host:	dev3-76.dev.cn.tlan
# Root:	/home/dli/mysql/mysql-5.1/mysql-5.1-bug-15021

--- 1.244/sql/table.cc	2006-11-28 11:14:44 +08:00
+++ 1.245/sql/table.cc	2006-11-28 11:14:44 +08:00
@@ -1553,32 +1553,32 @@ int open_table_from_share(THD *thd, TABL
                        outparam->file->auto_repair() &&
                        !(ha_open_flags & HA_OPEN_FOR_REPAIR));
 
-      if (ha_err == HA_ERR_NO_SUCH_TABLE)
+      switch (ha_err)
       {
-	/*
-          The table did not exists in storage engine, use same error message
-          as if the .frm file didn't exist
-        */
-	error= 1;
-	my_errno= ENOENT;
-      }
-      else if (ha_err == EMFILE)
-      {
-	/*
-          Too many files opened, use same error message as if the .frm
-           file can't open
-         */
-        DBUG_PRINT("error", ("open file: %s failed, too many files opened (errno: %d)", 
-		share->normalized_path.str, ha_err));
-	error= 1;
-	my_errno= EMFILE;
-      }
-      else
-      {
-        outparam->file->print_error(ha_err, MYF(0));
-        error_reported= TRUE;
-        if (ha_err == HA_ERR_TABLE_DEF_CHANGED)
-          error= 7;
+        case HA_ERR_NO_SUCH_TABLE:
+	  /*
+            The table did not exists in storage engine, use same error message
+            as if the .frm file didn't exist
+          */
+	  error= 1;
+	  my_errno= ENOENT;
+          break;
+        case EMFILE:
+	  /*
+            Too many files opened, use same error message as if the .frm
+            file can't open
+           */
+          DBUG_PRINT("error", ("open file: %s failed, too many files opened (errno: %d)",

+		  share->normalized_path.str, ha_err));
+	  error= 1;
+	  my_errno= EMFILE;
+          break;
+        default:
+          outparam->file->print_error(ha_err, MYF(0));
+          error_reported= TRUE;
+          if (ha_err == HA_ERR_TABLE_DEF_CHANGED)
+            error= 7;
+          break;
       }
       goto err;                                 /* purecov: inspected */
     }