← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to storage/heap/hp_rrnd.c

manual merge 6.0-main --> 6.0-bka-review

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/heap/hp_rrnd.c
28
28
{
29
29
  HP_SHARE *share=info->s;
30
30
  DBUG_ENTER("heap_rrnd");
31
 
  DBUG_PRINT("enter",("info: 0x%lx  pos: %lx",(long) info, (long) pos));
 
31
  DBUG_PRINT("enter",("info: %p  pos: %lx",info, (long) pos));
32
32
 
33
33
  info->lastinx= -1;
34
34
  if (!(info->current_ptr= pos))
43
43
  }
44
44
  info->update=HA_STATE_PREV_FOUND | HA_STATE_NEXT_FOUND | HA_STATE_AKTIV;
45
45
  memcpy(record,info->current_ptr,(size_t) share->reclength);
46
 
  DBUG_PRINT("exit", ("found record at 0x%lx", (long) info->current_ptr));
 
46
  DBUG_PRINT("exit", ("found record at %p", info->current_ptr));
47
47
  info->current_hash_ptr=0;                     /* Can't use rnext */
48
48
  DBUG_RETURN(0);
49
49
} /* heap_rrnd */