← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_rkey.c

  • Committer: Padraig O'Sullivan
  • Date: 2009-03-21 20:26:28 UTC
  • mto: (960.2.5 mordred)
  • mto: This revision was merged to the branch mainline in revision 961.
  • Revision ID: osullivan.padraig@gmail.com-20090321202628-nh6qsi825m4d4av6
Removing the queues.[h,cc] files from the mysys directory. The only place
where they are needed now is in the MyISAM storage engine. Thus, I moved the
files there and updated the files in the MyISAM storage engine
appropriately.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_rkey.c
47
47
    */
48
48
    key_buff=info->lastkey+info->s->base.max_key_length;
49
49
    pack_key_length= keypart_map;
50
 
    memcpy(key_buff, key, pack_key_length);
 
50
    memmove(key_buff, key, pack_key_length);
51
51
    last_used_keyseg= info->s->keyinfo[inx].seg + info->last_used_keyseg;
52
52
  }
53
53
  else
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;
101
101
      while ((info->lastpos >= info->state->data_file_length &&
102
102
              (search_flag != HA_READ_KEY_EXACT ||
103
103
              last_used_keyseg != keyinfo->seg + keyinfo->keysegs)) ||
104
 
             (info->index_cond_func && 
 
104
             (info->index_cond_func &&
105
105
              !(res= mi_check_index_cond(info, inx, buf))))
106
106
      {
107
107
        uint32_t not_used[2];
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 &&