← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_statrec.c

Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_statrec.c
226
226
    else
227
227
    {                                           /* We don't nead new info */
228
228
#ifndef UNSAFE_LOCKING
229
 
      if ((! cache_read || share->base.reclength > cache_length) &&
230
 
          share->tot_locks == 0)
231
 
      {                                         /* record not in cache */
232
 
        if (my_lock(share->kfile,F_RDLCK,0L,F_TO_EOF,
233
 
                    MYF(MY_SEEK_NOT_DONE) | info->lock_wait))
234
 
          return(my_errno);
235
 
        locked=1;
236
 
      }
 
229
      locked=1;
237
230
#else
238
231
      info->tmp_lock_type=F_RDLCK;
239
232
#endif