Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0

into  neptunus.(none):/home/msvensson/mysql/bug15020/my50-bug15020


sql/table.cc:
  Auto merged
This commit is contained in:
unknown 2006-01-19 12:12:47 +01:00
commit a648d0b161

View file

@ -1167,7 +1167,8 @@ static void frm_error(int error, TABLE *form, const char *name,
my_error(ER_NO_SUCH_TABLE, MYF(0), db, real_name);
}
else
my_error(ER_FILE_NOT_FOUND, errortype,
my_error((my_errno == EMFILE) ? ER_CANT_OPEN_FILE : ER_FILE_NOT_FOUND,
errortype,
fn_format(buff, name, form_dev, reg_ext, 0), my_errno);
break;
case 2: