← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_rnext.c

Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_rnext.c
37
37
  if (fast_mi_readinfo(info))
38
38
    return(my_errno);
39
39
  if (info->s->concurrent_insert)
40
 
    rw_rdlock(&info->s->key_root_lock[inx]);
 
40
    pthread_rwlock_rdlock(&info->s->key_root_lock[inx]);
41
41
  changed=_mi_test_if_changed(info);
42
42
  if (!flag)
43
43
  {
82
82
    if (!error && res == 2)
83
83
    {
84
84
      if (info->s->concurrent_insert)
85
 
        rw_unlock(&info->s->key_root_lock[inx]);
 
85
        pthread_rwlock_unlock(&info->s->key_root_lock[inx]);
86
86
      info->lastpos= HA_OFFSET_ERROR;
87
87
      return(my_errno= HA_ERR_END_OF_FILE);
88
88
    }
89
89
  }
90
90
  
91
91
  if (info->s->concurrent_insert)
92
 
    rw_unlock(&info->s->key_root_lock[inx]);
 
92
    pthread_rwlock_unlock(&info->s->key_root_lock[inx]);
93
93
 
94
94
        /* Don't clear if database-changed */
95
95
  info->update&= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED);