~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_rkey.c

MergedĀ fromĀ trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
67
67
    goto err;
68
68
 
69
69
  if (share->concurrent_insert)
70
 
    rw_rdlock(&share->key_root_lock[inx]);
 
70
    pthread_rwlock_rdlock(&share->key_root_lock[inx]);
71
71
 
72
72
  nextflag=myisam_read_vec[search_flag];
73
73
  use_key_length=pack_key_length;
134
134
      {
135
135
        info->lastpos= HA_OFFSET_ERROR;
136
136
        if (share->concurrent_insert)
137
 
          rw_unlock(&share->key_root_lock[inx]);
 
137
          pthread_rwlock_unlock(&share->key_root_lock[inx]);
138
138
        return((my_errno= HA_ERR_KEY_NOT_FOUND));
139
139
      }
140
140
      /*
150
150
    }
151
151
  }
152
152
  if (share->concurrent_insert)
153
 
    rw_unlock(&share->key_root_lock[inx]);
 
153
    pthread_rwlock_unlock(&share->key_root_lock[inx]);
154
154
 
155
155
  /* Calculate length of the found key;  Used by mi_rnext_same */
156
156
  if ((keyinfo->flag & HA_VAR_LENGTH_KEY) && last_used_keyseg &&