← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_rkey.cc

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2010-10-02 14:17:48 UTC
  • mfrom: (1.1.1 upstream)
  • mto: (2.1.17 sid)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20101002141748-m6vbfbfjhrw1153e
Tags: 2010.09.1802-1
* New upstream release.
* Removed pid-file argument hack.
* Updated GPL-2 address to be new address.
* Directly copy in drizzledump.1 since debian doesn't have sphinx 1.0 yet.
* Link to jquery from libjs-jquery. Add it as a depend.
* Add drizzled.8 symlink to the install files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_rkey.cc
68
68
  if (fast_mi_readinfo(info))
69
69
    goto err;
70
70
 
71
 
  if (share->concurrent_insert)
72
 
    pthread_rwlock_rdlock(&share->key_root_lock[inx]);
73
 
 
74
71
  nextflag=myisam_read_vec[search_flag];
75
72
  use_key_length=pack_key_length;
76
73
  if (!(nextflag & (SEARCH_FIND | SEARCH_NO_FIND | SEARCH_LAST)))
135
132
      if (res == 2)
136
133
      {
137
134
        info->lastpos= HA_OFFSET_ERROR;
138
 
        if (share->concurrent_insert)
139
 
          pthread_rwlock_unlock(&share->key_root_lock[inx]);
140
135
        return((errno= HA_ERR_KEY_NOT_FOUND));
141
136
      }
142
137
      /*
151
146
      }
152
147
    }
153
148
  }
154
 
  if (share->concurrent_insert)
155
 
    pthread_rwlock_unlock(&share->key_root_lock[inx]);
156
149
 
157
150
  /* Calculate length of the found key;  Used by mi_rnext_same */
158
151
  if ((keyinfo->flag & HA_VAR_LENGTH_KEY) && last_used_keyseg &&