← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/heap/hp_rsame.c

  • Committer: Monty Taylor
  • Date: 2008-10-23 00:05:28 UTC
  • Revision ID: monty@inaugust.com-20081023000528-grdvrd8c4058nutm
Moved my_handler to myisam, which is where it actually belongs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/heap/hp_rsame.c
15
15
 
16
16
/* re-read current record */
17
17
 
18
 
#include "heap_priv.h"
 
18
#include "heapdef.h"
19
19
 
20
20
        /* If inx != -1 the new record is read according to index
21
21
           (for next/prev). Record must in this case point to last record
27
27
 
28
28
int heap_rsame(register HP_INFO *info, unsigned char *record, int inx)
29
29
{
30
 
  HP_SHARE *share= info->getShare();
 
30
  HP_SHARE *share=info->s;
31
31
 
32
32
  test_active(info);
33
33
  if (get_chunk_status(&share->recordspace, info->current_ptr) == CHUNK_STATUS_ACTIVE)
34
34
  {
35
35
    if (inx < -1 || inx >= (int) share->keys)
36
36
    {
37
 
      return(errno=HA_ERR_WRONG_INDEX);
 
37
      return(my_errno=HA_ERR_WRONG_INDEX);
38
38
    }
39
39
    else if (inx != -1)
40
40
    {
41
41
      info->lastinx=inx;
42
 
      hp_make_key(share->keydef + inx, &info->lastkey[0], record);
43
 
      if (!hp_search(info, share->keydef + inx, &info->lastkey[0], 3))
 
42
      hp_make_key(share->keydef + inx, info->lastkey, record);
 
43
      if (!hp_search(info, share->keydef + inx, info->lastkey, 3))
44
44
      {
45
45
        info->update=0;
46
 
        return(errno);
 
46
        return(my_errno);
47
47
      }
48
48
    }
49
49
    hp_extract_record(share, record, info->current_ptr);
51
51
  }
52
52
  info->update=0;
53
53
 
54
 
  return(errno=HA_ERR_RECORD_DELETED);
 
54
  return(my_errno=HA_ERR_RECORD_DELETED);
55
55
}