← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/internal/my_open.cc

  • Committer: Lee Bieber
  • Date: 2011-03-22 17:41:09 UTC
  • mfrom: (2241.2.18 refactor2)
  • Revision ID: kalebral@gmail.com-20110322174109-1bsfvv4q1dnfd089
Merge Olaf - more code refactoring

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/internal/my_open.cc
109
109
 
110
110
int my_register_filename(int fd, const char *FileName, uint32_t error_message_number, myf MyFlags)
111
111
{
112
 
  if ((int) fd >= 0)
113
 
  {
 
112
  if (fd >= 0)
114
113
    return fd;
115
 
  }
116
 
  else
117
 
    errno= errno;
118
 
 
119
114
  if (MyFlags & (MY_FFNF | MY_FAE | MY_WME))
120
115
  {
121
116
    if (errno == EMFILE)
122
117
      error_message_number= EE_OUT_OF_FILERESOURCES;
123
 
    my_error(static_cast<drizzled::error_t>(error_message_number), MYF(ME_BELL+ME_WAITTANG),
124
 
             FileName, errno);
 
118
    my_error(static_cast<drizzled::error_t>(error_message_number), MYF(ME_BELL+ME_WAITTANG), FileName, errno);
125
119
  }
126
120
  return -1;
127
121
}