Commit c12dfbe8 authored by unknown's avatar unknown
Browse files

Fix after manual merge.


storage/heap/hp_write.c:
  Fix after manial merge: do cast _after_ pointer substruction.
parent ca83b547
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ int heap_write(HP_INFO *info, const byte *record)

err:
  if (my_errno == HA_ERR_FOUND_DUPP_KEY)
    DBUG_PRINT("info",("Duplicate key: %d", (int) keydef - share->keydef));
    DBUG_PRINT("info",("Duplicate key: %d", (int) (keydef - share->keydef)));
  info->errkey= keydef - share->keydef;
  /*
    We don't need to delete non-inserted key from rb-tree.  Also, if