← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/internal/my_open.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/internal/my_open.cc
13
13
   along with this program; if not, write to the Free Software
14
14
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
15
15
 
16
 
#include "mysys/mysys_priv.h"
17
 
#include "mysys/mysys_err.h"
 
16
#include "drizzled/internal/mysys_priv.h"
 
17
#include "drizzled/my_error.h"
18
18
#include "my_dir.h"
19
19
 
20
20
#include <fcntl.h>
74
74
 
75
75
  if (err)
76
76
  {
77
 
    my_errno=errno;
 
77
    errno=errno;
78
78
    if (MyFlags & (MY_FAE | MY_WME))
79
79
      my_error(EE_BADCLOSE, MYF(ME_BELL+ME_WAITTANG), "unknown", errno);
80
80
  }
111
111
    return fd;
112
112
  }
113
113
  else
114
 
    my_errno= errno;
 
114
    errno= errno;
115
115
 
116
116
  if (MyFlags & (MY_FFNF | MY_FAE | MY_WME))
117
117
  {
118
 
    if (my_errno == EMFILE)
 
118
    if (errno == EMFILE)
119
119
      error_message_number= EE_OUT_OF_FILERESOURCES;
120
120
    my_error(error_message_number, MYF(ME_BELL+ME_WAITTANG),
121
 
             FileName, my_errno);
 
121
             FileName, errno);
122
122
  }
123
123
  return -1;
124
124
}