MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:msvensson Date:December 2 2005 9:01am
Subject:bk commit into 5.0 tree (msvensson:1.2035) BUG#15020
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2035 05/12/02 10:01:14 msvensson@neptunus.(none) +1 -0
  Bug #15020 "Can't find files" message incorrect for error 24

  sql/table.cc
    1.212 05/12/02 10:01:10 msvensson@neptunus.(none) +10 -2
    Use error message "Can't open file" it errno EMFILE is returned.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/bug15020/my50-bug15020

--- 1.211/sql/table.cc	2005-11-28 19:49:49 +01:00
+++ 1.212/sql/table.cc	2005-12-02 10:01:10 +01:00
@@ -1155,17 +1155,25 @@
 
   switch (error) {
   case 1:
-    if (my_errno == ENOENT)
+    switch (my_errno) {
+    case ENOENT:
     {
       char *db;
       uint length=dirname_part(buff,name);
       buff[length-1]=0;
       db=buff+dirname_length(buff);
       my_error(ER_NO_SUCH_TABLE, MYF(0), db, real_name);
+      break;
     }
-    else
+    case EMFILE: // Too many openfiles
+      my_error(ER_CANT_OPEN_FILE, errortype,
+               fn_format(buff, name, form_dev, reg_ext, 0), my_errno);
+      break;
+    default:
       my_error(ER_FILE_NOT_FOUND, errortype,
                fn_format(buff, name, form_dev, reg_ext, 0), my_errno);
+      break;
+    }
     break;
   case 2:
   {
Thread
bk commit into 5.0 tree (msvensson:1.2035) BUG#15020msvensson2 Dec