← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_rkey.cc

  • Committer: Brian Aker
  • Date: 2010-11-19 19:42:44 UTC
  • mto: (1945.2.1 quick)
  • mto: This revision was merged to the branch mainline in revision 1944.
  • Revision ID: brian@tangent.org-20101119194244-7vx6u5vwzvu9uvex
Remove dead getShare() call which should have been a call on the cache
directly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_rkey.cc
11
11
 
12
12
   You should have received a copy of the GNU General Public License
13
13
   along with this program; if not, write to the Free Software
14
 
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
14
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
15
15
 
16
16
/* Read record based on a key */
17
17
 
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 &&