← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_dynrec.c

Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_dynrec.c
1666
1666
 
1667
1667
  if (info->lock_type == F_UNLCK)
1668
1668
  {
1669
 
#ifndef UNSAFE_LOCKING
1670
 
    if (share->tot_locks == 0)
1671
 
    {
1672
 
      if (my_lock(share->kfile,F_RDLCK,0L,F_TO_EOF,
1673
 
                  MYF(MY_SEEK_NOT_DONE) | info->lock_wait))
1674
 
        return(my_errno);
1675
 
    }
1676
 
#else
1677
1669
    info->tmp_lock_type=F_RDLCK;
1678
 
#endif
1679
1670
  }
1680
1671
  else
1681
1672
    info_read=1;                                /* memory-keyinfoblock is ok */