Commit 514533eb authored by Monty's avatar Monty

aria_chk sets --warning-if-wrong-transid=0 if --ignore-control-file is used

parent 3a37644a
...@@ -140,16 +140,20 @@ int main(int argc, char **argv) ...@@ -140,16 +140,20 @@ int main(int argc, char **argv)
HA_ERR_FIRST+ array_elements(handler_error_messages)-1); HA_ERR_FIRST+ array_elements(handler_error_messages)-1);
maria_block_size= 0; /* Use block size from control file */ maria_block_size= 0; /* Use block size from control file */
if (!opt_ignore_control_file && if (!opt_ignore_control_file)
(ma_control_file_open(FALSE, opt_require_control_file ||
!(check_param.testflag & T_SILENT),
TRUE) &&
(opt_require_control_file ||
(opt_transaction_logging && (check_param.testflag & T_REP_ANY)))))
{ {
error= 1; if ((ma_control_file_open(FALSE, opt_require_control_file ||
goto end; !(check_param.testflag & T_SILENT),
TRUE) &&
(opt_require_control_file ||
(opt_transaction_logging && (check_param.testflag & T_REP_ANY)))))
{
error= 1;
goto end;
}
} }
else
opt_warning_for_wrong_transid= 0;
/* /*
If we are doing a repair, user may want to store this repair into the log If we are doing a repair, user may want to store this repair into the log
......
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