← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_rnext_same.cc

  • Committer: Brian Aker
  • Date: 2010-08-09 18:04:12 UTC
  • mfrom: (1689.3.7 staging)
  • Revision ID: brian@gaz-20100809180412-olurwh51ojllev6p
Merge in heap conversion, and case insensitive patch, and remove need for
M_HASH in session.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_rnext_same.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
#include "myisam_priv.h"
17
17
 
37
37
  if (fast_mi_readinfo(info))
38
38
    return(errno);
39
39
 
 
40
  if (info->s->concurrent_insert)
 
41
    pthread_rwlock_rdlock(&info->s->key_root_lock[inx]);
 
42
 
40
43
  switch (keyinfo->key_alg)
41
44
  {
42
45
    case HA_KEY_ALG_BTREE:
66
69
          break;
67
70
      }
68
71
  }
69
 
  /* Don't clear if database-changed */
 
72
  if (info->s->concurrent_insert)
 
73
    pthread_rwlock_unlock(&info->s->key_root_lock[inx]);
 
74
        /* Don't clear if database-changed */
70
75
  info->update&= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED);
71
76
  info->update|= HA_STATE_NEXT_FOUND | HA_STATE_RNEXT_SAME;
72
77