← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_rnext.c

Merged vcol stuff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_rnext.c
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 */
15
 
 
16
 
#include "myisam_priv.h"
17
 
 
18
 
using namespace drizzled;
 
14
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
15
 
 
16
#include "myisamdef.h"
19
17
 
20
18
        /*
21
19
           Read next row with the same key as previous read
31
29
  int res= 0;
32
30
 
33
31
  if ((inx = _mi_check_index(info,inx)) < 0)
34
 
    return(errno);
 
32
    return(my_errno);
35
33
  flag=SEARCH_BIGGER;                           /* Read next */
36
34
  if (info->lastpos == HA_OFFSET_ERROR && info->update & HA_STATE_PREV_FOUND)
37
35
    flag=0;                                     /* Read first */
38
36
 
39
37
  if (fast_mi_readinfo(info))
40
 
    return(errno);
 
38
    return(my_errno);
 
39
  if (info->s->concurrent_insert)
 
40
    rw_rdlock(&info->s->key_root_lock[inx]);
41
41
  changed=_mi_test_if_changed(info);
42
42
  if (!flag)
43
43
  {
81
81
    }
82
82
    if (!error && res == 2)
83
83
    {
 
84
      if (info->s->concurrent_insert)
 
85
        rw_unlock(&info->s->key_root_lock[inx]);
84
86
      info->lastpos= HA_OFFSET_ERROR;
85
 
      return(errno= HA_ERR_END_OF_FILE);
 
87
      return(my_errno= HA_ERR_END_OF_FILE);
86
88
    }
87
89
  }
 
90
  
 
91
  if (info->s->concurrent_insert)
 
92
    rw_unlock(&info->s->key_root_lock[inx]);
88
93
 
89
 
  /* Don't clear if database-changed */
 
94
        /* Don't clear if database-changed */
90
95
  info->update&= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED);
91
96
  info->update|= HA_STATE_NEXT_FOUND;
92
97
 
93
98
  if (error)
94
99
  {
95
 
    if (errno == HA_ERR_KEY_NOT_FOUND)
96
 
      errno=HA_ERR_END_OF_FILE;
 
100
    if (my_errno == HA_ERR_KEY_NOT_FOUND)
 
101
      my_errno=HA_ERR_END_OF_FILE;
97
102
  }
98
103
  else if (!buf)
99
104
  {
100
 
    return(info->lastpos==HA_OFFSET_ERROR ? errno : 0);
 
105
    return(info->lastpos==HA_OFFSET_ERROR ? my_errno : 0);
101
106
  }
102
107
  else if (!(*info->read_record)(info,info->lastpos,buf))
103
108
  {
104
109
    info->update|= HA_STATE_AKTIV;              /* Record is read */
105
110
    return(0);
106
111
  }
107
 
  return(errno);
 
112
  return(my_errno);
108
113
} /* mi_rnext */