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

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

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug15020/my50-bug15020
bc827255 · msvensson@neptunus.(none) · 86cb9bf9 · 78037e80 · bc827255
Commit bc827255 authored Jan 24, 2006 by msvensson@neptunus.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sql/table.cc sql/table.cc +2 -1

No files found.
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -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: