← 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-02-14 01:56:51 UTC
  • mto: (1273.16.5 fix_is)
  • mto: This revision was merged to the branch mainline in revision 1300.
  • Revision ID: brian@gaz-20100214015651-ror9j0xu7dccz0ct
Two fixes for "make dist"

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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
14
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  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
 
71
74
  nextflag=myisam_read_vec[search_flag];
72
75
  use_key_length=pack_key_length;
73
76
  if (!(nextflag & (SEARCH_FIND | SEARCH_NO_FIND | SEARCH_LAST)))
132
135
      if (res == 2)
133
136
      {
134
137
        info->lastpos= HA_OFFSET_ERROR;
 
138
        if (share->concurrent_insert)
 
139
          pthread_rwlock_unlock(&share->key_root_lock[inx]);
135
140
        return((errno= HA_ERR_KEY_NOT_FOUND));
136
141
      }
137
142
      /*
146
151
      }
147
152
    }
148
153
  }
 
154
  if (share->concurrent_insert)
 
155
    pthread_rwlock_unlock(&share->key_root_lock[inx]);
149
156
 
150
157
  /* Calculate length of the found key;  Used by mi_rnext_same */
151
158
  if ((keyinfo->flag & HA_VAR_LENGTH_KEY) && last_used_keyseg &&