← Back to branch summary

~jlukas79/+junk/mysql-server

« back to all changes in this revision

Viewing changes to storage/heap/hp_delete.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_delete.c
23
23
  HP_SHARE *share=info->s;
24
24
  HP_KEYDEF *keydef, *end, *p_lastinx;
25
25
  DBUG_ENTER("heap_delete");
26
 
  DBUG_PRINT("enter",("info: 0x%lx  record: 0x%lx", (long) info, (long) record));
 
26
  DBUG_PRINT("enter",("info: %p  record: %p", info, record));
27
27
 
28
28
  test_active(info);
29
29
 
139
139
    /* Save for heap_rnext/heap_rprev */
140
140
    info->current_hash_ptr=last_ptr;
141
141
    info->current_ptr = last_ptr ? last_ptr->ptr_to_rec : 0;
142
 
    DBUG_PRINT("info",("Corrected current_ptr to point at: 0x%lx",
143
 
                       (long) info->current_ptr));
 
142
    DBUG_PRINT("info",("Corrected current_ptr to point at: %p",
 
143
                       info->current_ptr));
144
144
  }
145
145
  empty=pos;
146
146
  if (gpos)