1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines

Browse Source 
into  chilla.local:/home/mydev/mysql-5.0--team
This commit is contained in:
istruewing@chilla.local 2007-03-25 14:44:16 +02:00
commit 4e62cae016
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sql/ha_myisam.cc
View File

@ -976,6 +976,22 @@ int ha_myisam::repair(THD *thd, MI_CHECK &param, bool do_optimize)
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->s->path);
DBUG_RETURN(HA_ADMIN_FAILED);
}
param.db_name= table->s->db;
param.table_name= table->alias;
param.tmpfile_createflag = O_RDWR | O_TRUNC;