← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_rnext.cc

  • Committer: Patrick Crews
  • Date: 2011-01-29 14:17:35 UTC
  • mto: (2126.1.1 build)
  • mto: This revision was merged to the branch mainline in revision 2127.
  • Revision ID: gleebix@gmail.com-20110129141735-3y2658vt5ur0a33o
Fixes to make test-dbqp

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_rnext.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
#include "myisam_priv.h"
17
17
 
38
38
 
39
39
  if (fast_mi_readinfo(info))
40
40
    return(errno);
41
 
  if (info->s->concurrent_insert)
42
 
    pthread_rwlock_rdlock(&info->s->key_root_lock[inx]);
43
41
  changed=_mi_test_if_changed(info);
44
42
  if (!flag)
45
43
  {
83
81
    }
84
82
    if (!error && res == 2)
85
83
    {
86
 
      if (info->s->concurrent_insert)
87
 
        pthread_rwlock_unlock(&info->s->key_root_lock[inx]);
88
84
      info->lastpos= HA_OFFSET_ERROR;
89
85
      return(errno= HA_ERR_END_OF_FILE);
90
86
    }
91
87
  }
92
88
 
93
 
  if (info->s->concurrent_insert)
94
 
    pthread_rwlock_unlock(&info->s->key_root_lock[inx]);
95
 
 
96
 
        /* Don't clear if database-changed */
 
89
  /* Don't clear if database-changed */
97
90
  info->update&= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED);
98
91
  info->update|= HA_STATE_NEXT_FOUND;
99
92