← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_rrnd.cc

  • Committer: Brian Aker
  • Date: 2010-12-08 22:35:56 UTC
  • mfrom: (1819.9.158 update-innobase)
  • Revision ID: brian@tangent.org-20101208223556-37mi4omqg7lkjzf3
Merge in Stewart's changes, 1.3 changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_rrnd.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 a record with random-access. The position to the record must
17
17
   get by MI_INFO. The next record can be read with pos= MI_POS_ERROR */
18
18
 
19
19
 
20
 
#include "myisamdef.h"
 
20
#include "myisam_priv.h"
 
21
 
 
22
using namespace drizzled;
21
23
 
22
24
/*
23
25
           Read a row based on position.
29
31
           HA_ERR_END_OF_FILE = EOF.
30
32
*/
31
33
 
32
 
int mi_rrnd(MI_INFO *info, unsigned char *buf, register my_off_t filepos)
 
34
int mi_rrnd(MI_INFO *info, unsigned char *buf, register internal::my_off_t filepos)
33
35
{
34
36
  bool skip_deleted_blocks;
35
37
 
52
54
  info->update&= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED);
53
55
 
54
56
  if (info->opt_flag & WRITE_CACHE_USED && flush_io_cache(&info->rec_cache))
55
 
    return(my_errno);
 
57
    return(errno);
56
58
 
57
59
  return ((*info->s->read_rnd)(info,buf,filepos,skip_deleted_blocks));
58
60
}