Commit b6c926ed authored by unknown's avatar unknown

Fix after manual merge.


storage/heap/hp_write.c:
  Fix after manial merge: do cast _after_ pointer substruction.
parent 8290cad2
...@@ -68,7 +68,7 @@ int heap_write(HP_INFO *info, const byte *record) ...@@ -68,7 +68,7 @@ int heap_write(HP_INFO *info, const byte *record)
err: err:
if (my_errno == HA_ERR_FOUND_DUPP_KEY) 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; info->errkey= keydef - share->keydef;
/* /*
We don't need to delete non-inserted key from rb-tree. Also, if We don't need to delete non-inserted key from rb-tree. Also, if
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment