diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-01-19 12:12:47 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-01-19 12:12:47 +0100 |
| commit | a648d0b1619624f195e4acf6eb2df9273d109d04 (patch) | |
| tree | cd788ab8332e8035703966a147a7a37b3fa4b484 /sql/table.cc | |
| parent | 48ac5c4a2b241d8fcc8f7266b4192664855e0ee6 (diff) | |
| parent | ac015116e14e32f83fe3cbbc7c6608ee5a6b6f89 (diff) | |
| download | mariadb-git-a648d0b1619624f195e4acf6eb2df9273d109d04.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug15020/my50-bug15020
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index 45f8edddd0b..9ae5348b5c6 100644 --- 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: |