~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_dynrec.c

  • Committer: Brian Aker
  • Date: 2008-07-14 22:18:37 UTC
  • mfrom: (77.1.96 codestyle)
  • Revision ID: brian@tangent.org-20080714221837-oceoshx7fjkla9u3
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
1699
1699
 
1700
1700
  if (info->lock_type == F_UNLCK)
1701
1701
  {
1702
 
#ifndef UNSAFE_LOCKING
1703
 
    if (share->tot_locks == 0)
1704
 
    {
1705
 
      if (my_lock(share->kfile,F_RDLCK,0L,F_TO_EOF,
1706
 
                  MYF(MY_SEEK_NOT_DONE) | info->lock_wait))
1707
 
        DBUG_RETURN(my_errno);
1708
 
    }
1709
 
#else
1710
1702
    info->tmp_lock_type=F_RDLCK;
1711
 
#endif
1712
1703
  }
1713
1704
  else
1714
1705
    info_read=1;                                /* memory-keyinfoblock is ok */