← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_statrec.cc

  • Committer: Monty Taylor
  • Date: 2010-02-05 08:11:15 UTC
  • mfrom: (1283 build)
  • mto: (1273.13.43 fix_is)
  • mto: This revision was merged to the branch mainline in revision 1300.
  • Revision ID: mordred@inaugust.com-20100205081115-dr82nvrwv4lvw7sd
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_statrec.cc
17
17
 
18
18
#include "myisam_priv.h"
19
19
 
 
20
using namespace drizzled;
 
21
 
20
22
int _mi_write_static_record(MI_INFO *info, const unsigned char *record)
21
23
{
22
24
  unsigned char temp[8];                                /* max pointer length */
23
25
  if (info->s->state.dellink != HA_OFFSET_ERROR &&
24
26
      !info->append_insert_at_end)
25
27
  {
26
 
    my_off_t filepos=info->s->state.dellink;
 
28
    internal::my_off_t filepos=info->s->state.dellink;
27
29
    info->rec_cache.seek_not_done=1;            /* We have done a seek */
28
30
    if (info->s->file_read(info, &temp[0],info->s->base.rec_reflength,
29
31
                info->s->state.dellink+1,
84
86
  return 1;
85
87
}
86
88
 
87
 
int _mi_update_static_record(MI_INFO *info, my_off_t pos, const unsigned char *record)
 
89
int _mi_update_static_record(MI_INFO *info, internal::my_off_t pos, const unsigned char *record)
88
90
{
89
91
  info->rec_cache.seek_not_done=1;              /* We have done a seek */
90
92
  return (info->s->file_write(info,
139
141
 
140
142
 
141
143
int _mi_cmp_static_unique(MI_INFO *info, MI_UNIQUEDEF *def,
142
 
                          const unsigned char *record, my_off_t pos)
 
144
                          const unsigned char *record, internal::my_off_t pos)
143
145
{
144
146
  info->rec_cache.seek_not_done=1;              /* We have done a seek */
145
147
  if (info->s->file_read(info, info->rec_buff, info->s->base.reclength,
155
157
        /*         1 if record is deleted */
156
158
        /*        MY_FILE_ERROR on read-error or locking-error */
157
159
 
158
 
int _mi_read_static_record(register MI_INFO *info, register my_off_t pos,
 
160
int _mi_read_static_record(register MI_INFO *info, register internal::my_off_t pos,
159
161
                           register unsigned char *record)
160
162
{
161
163
  int error;
190
192
 
191
193
 
192
194
int _mi_read_rnd_static_record(MI_INFO *info, unsigned char *buf,
193
 
                               register my_off_t filepos,
 
195
                               register internal::my_off_t filepos,
194
196
                               bool skip_deleted_blocks)
195
197
{
196
198
  int locked,error,cache_read;