Commit d286751a authored by Michael Widenius's avatar Michael Widenius

Fixed bug in underflow handling of page during delete found by running sql_bench

storage/maria/ma_delete.c:
  Remove wrong optimization (first_key is not related to keypos value at this point)
storage/maria/maria_chk.c:
  Added printing of forgotten option
parent dd406c1e
...@@ -1112,7 +1112,7 @@ static int underflow(register MARIA_HA *info, MARIA_KEYDEF *keyinfo, ...@@ -1112,7 +1112,7 @@ static int underflow(register MARIA_HA *info, MARIA_KEYDEF *keyinfo,
MARIA_KEY_PARAM anc_key_inserted; MARIA_KEY_PARAM anc_key_inserted;
size_t tmp_length; size_t tmp_length;
if (first_key) if (keypos == anc_buff + share->keypage_header + key_reflength)
anc_pos= 0; /* First key */ anc_pos= 0; /* First key */
else else
{ {
......
...@@ -443,6 +443,8 @@ static void usage(void) ...@@ -443,6 +443,8 @@ static void usage(void)
#endif #endif
printf(", they will be used\n\ printf(", they will be used\n\
in a round-robin fashion.\n\ in a round-robin fashion.\n\
--require-control-file Abort if we can't find/read the maria_log_control\n\
file\n\
-s, --silent Only print errors. One can use two -s to make\n\ -s, --silent Only print errors. One can use two -s to make\n\
maria_chk very silent.\n\ maria_chk very silent.\n\
-v, --verbose Print more information. This can be used with\n\ -v, --verbose Print more information. This can be used with\n\
......
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