← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/heap/hp_hash.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/heap/hp_hash.cc
17
17
 
18
18
#include "heap_priv.h"
19
19
 
20
 
#include <mystrings/m_ctype.h>
 
20
#include "drizzled/charset_info.h"
21
21
#include <drizzled/util/test.h>
22
22
 
23
23
#include <math.h>
132
132
        case 2:                                 /* Search previous */
133
133
          if (pos->ptr_to_rec == info->current_ptr)
134
134
          {
135
 
            my_errno=HA_ERR_KEY_NOT_FOUND;      /* If gpos == 0 */
 
135
            errno=HA_ERR_KEY_NOT_FOUND; /* If gpos == 0 */
136
136
            info->current_hash_ptr=prev_ptr;
137
137
            return(info->current_ptr=prev_ptr ? prev_ptr->ptr_to_rec : 0);
138
138
          }
157
157
    }
158
158
    while ((pos=pos->next_key));
159
159
  }
160
 
  my_errno=HA_ERR_KEY_NOT_FOUND;
 
160
  errno=HA_ERR_KEY_NOT_FOUND;
161
161
  if (nextflag == 2 && ! info->current_ptr)
162
162
  {
163
163
    /* Do a previous from end */
166
166
  }
167
167
 
168
168
  if (old_nextflag && nextflag)
169
 
    my_errno=HA_ERR_RECORD_CHANGED;             /* Didn't find old record */
 
169
    errno=HA_ERR_RECORD_CHANGED;                /* Didn't find old record */
170
170
  info->current_hash_ptr=0;
171
171
  return((info->current_ptr= 0));
172
172
}
188
188
      return (info->current_ptr= pos->ptr_to_rec);
189
189
    }
190
190
  }
191
 
  my_errno=HA_ERR_KEY_NOT_FOUND;
 
191
  errno=HA_ERR_KEY_NOT_FOUND;
192
192
  info->current_hash_ptr=0;
193
193
  return ((info->current_ptr= 0));
194
194
}