bk commit into 4.1 tree (istruewing:1.2623)

[ingo]

Below is the list of changes that have just been committed into a local
4.1 repository of istruewing. When istruewing 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, 2007-03-16 14:11:44+01:00, istruewing@stripped +1 -0
  Merge istruewing@stripped:/home/bk/mysql-4.1-engines
  into  blade08.mysql.com:/data0/istruewing/autopush/mysql-4.1-bug25289
  MERGE: 1.2602.11.1

  sql/ha_myisam.cc@stripped, 2007-03-16 14:11:42+01:00, istruewing@stripped +0 -0
    Auto merged
    MERGE: 1.164.1.1

# 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:	istruewing
# Host:	blade08.mysql.com
# Root:	/data0/istruewing/autopush/mysql-4.1-bug25289/RESYNC

--- 1.165/sql/ha_myisam.cc	2007-03-16 14:11:45 +01:00
+++ 1.166/sql/ha_myisam.cc	2007-03-16 14:11:45 +01:00
@@ -902,6 +902,22 @@
   ha_rows rows= file->state->records;
   DBUG_ENTER("ha_myisam::repair");
 
+  /*
+    Normally this method is entered with a properly opened table. If the
+    repair fails, it can be repeated with more elaborate options. Under
+    special circumstances it can happen that a repair fails so that it
+    closed the data file and cannot re-open it. In this case file->dfile
+    is set to -1. We must not try another repair without an open data
+    file. (Bug #25289)
+  */
+  if (file->dfile == -1)
+  {
+    sql_print_information("Retrying repair of: '%s' failed. "
+                          "Please try REPAIR EXTENDED or myisamchk",
+                          table->path);
+    DBUG_RETURN(HA_ADMIN_FAILED);
+  }
+
   param.db_name    = table->table_cache_key;
   param.table_name = table->table_name;
   param.tmpfile_createflag = O_RDWR | O_TRUNC;