diff options
author | unknown <msvensson@neptunus.(none)> | 2006-01-19 15:05:58 +0100 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2006-01-19 15:05:58 +0100 |
commit | 502720fec9bf3398e1427d626b82164994dd2518 (patch) | |
tree | a56ab40ec6f2180c9a2511bc0df269d82c6302ec /sql/table.cc | |
parent | 7dbb63fe209a3977367c6282e81052fbbd9980e6 (diff) | |
parent | b55dc806504dab445a4832cb702bd9e25cc33c2b (diff) | |
download | mariadb-git-502720fec9bf3398e1427d626b82164994dd2518.tar.gz |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
into neptunus.(none):/home/msvensson/mysql/bug15020/my51-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 4640bfe9849..dabb5963aee 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1734,7 +1734,8 @@ void open_table_error(TABLE_SHARE *share, int error, int db_errno, int errarg) else { strxmov(buff, share->normalized_path.str, reg_ext, NullS); - my_error(ER_FILE_NOT_FOUND, errortype, buff, db_errno); + my_error((db_errno == EMFILE) ? ER_CANT_OPEN_FILE : ER_FILE_NOT_FOUND, + errortype, buff, db_errno); } break; case 2: |