summaryrefslogtreecommitdiff
path: root/sql/table.cc
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-01-19 11:43:19 +0100
committerunknown <msvensson@neptunus.(none)>2006-01-19 11:43:19 +0100
commitb55dc806504dab445a4832cb702bd9e25cc33c2b (patch)
tree1e3456764861c28c7783633e3b96f5d36766358c /sql/table.cc
parent952c56ce5b9acfe2f9c0c9fa6b84aadb9c8b41cd (diff)
parentac015116e14e32f83fe3cbbc7c6608ee5a6b6f89 (diff)
downloadmariadb-git-b55dc806504dab445a4832cb702bd9e25cc33c2b.tar.gz
Merge neptunus.(none):/home/msvensson/mysql/bug15020/my50-bug15020
into neptunus.(none):/home/msvensson/mysql/bug15020/my51-bug15020 sql/table.cc: Merge BUG#15020 from 5.0 -> 5.1
Diffstat (limited to 'sql/table.cc')
-rw-r--r--sql/table.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc
index ff29a33ef03..44f43f9e801 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -1626,7 +1626,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: