← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/my_pread.cc

  • Committer: Brian Aker
  • Date: 2009-05-23 16:15:00 UTC
  • mto: This revision was merged to the branch mainline in revision 1038.
  • Revision ID: brian@gaz-20090523161500-nldnoav8b7x1iz1b
Remove locks around my_open(). Open file counts are now "best effort" (not
that they were ever exact, since Innodb didn't use the calls).

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/my_pread.cc
58
58
      if (MyFlags & (MY_WME | MY_FAE | MY_FNABP))
59
59
      {
60
60
        if (readbytes == (size_t) -1)
61
 
          my_error(EE_READ, MYF(ME_BELL+ME_WAITTANG),
62
 
                   my_filename(Filedes),my_errno);
 
61
          my_error(EE_READ, MYF(ME_BELL+ME_WAITTANG), "unknown", my_errno);
63
62
        else if (MyFlags & (MY_NABP | MY_FNABP))
64
 
          my_error(EE_EOFERR, MYF(ME_BELL+ME_WAITTANG),
65
 
                   my_filename(Filedes),my_errno);
 
63
          my_error(EE_EOFERR, MYF(ME_BELL+ME_WAITTANG), "unknown", my_errno);
66
64
      }
67
65
      if (readbytes == (size_t) -1 || (MyFlags & (MY_FNABP | MY_NABP)))
68
66
        return(MY_FILE_ERROR);          /* Return with error */
123
121
    {
124
122
      if (!(errors++ % MY_WAIT_GIVE_USER_A_MESSAGE))
125
123
        my_error(EE_DISK_FULL,MYF(ME_BELL | ME_NOREFRESH),
126
 
                 my_filename(Filedes),my_errno,MY_WAIT_FOR_USER_TO_FIX_PANIC);
 
124
                 "unknown", my_errno, MY_WAIT_FOR_USER_TO_FIX_PANIC);
127
125
      sleep(MY_WAIT_FOR_USER_TO_FIX_PANIC);
128
126
      continue;
129
127
    }
134
132
    {
135
133
      if (MyFlags & (MY_WME | MY_FAE | MY_FNABP))
136
134
      {
137
 
        my_error(EE_WRITE, MYF(ME_BELL | ME_WAITTANG),
138
 
                 my_filename(Filedes),my_errno);
 
135
        my_error(EE_WRITE, MYF(ME_BELL | ME_WAITTANG), "unknown", my_errno);
139
136
      }
140
137
      return(MY_FILE_ERROR);            /* Error on read */
141
138
    }