Commit 6f19b5fa authored by unknown's avatar unknown

wrong test for -q/-qq (T_QUICK/T_FORCE_UNIQUENESS) in myisamchk corrected

parent 8c8c2a7b
...@@ -1238,7 +1238,7 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info, ...@@ -1238,7 +1238,7 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info,
USE_WHOLE_KEY); USE_WHOLE_KEY);
} }
sort_info.dupp++; sort_info.dupp++;
if (!(rep_quick & T_FORCE_UNIQUENESS)) if ((param->testflag & (T_FORCE_UNIQUENESS|T_QUICK)) == T_QUICK)
{ {
param->testflag|=T_RETRY_WITHOUT_QUICK; param->testflag|=T_RETRY_WITHOUT_QUICK;
param->error_printed=1; param->error_printed=1;
...@@ -3210,7 +3210,7 @@ static int sort_delete_record(MI_SORT_PARAM *sort_param) ...@@ -3210,7 +3210,7 @@ static int sort_delete_record(MI_SORT_PARAM *sort_param)
MI_INFO *info=sort_info->info; MI_INFO *info=sort_info->info;
DBUG_ENTER("sort_delete_record"); DBUG_ENTER("sort_delete_record");
if (!(param->testflag & T_FORCE_UNIQUENESS)) if ((param->testflag & (T_FORCE_UNIQUENESS|T_QUICK)) == T_QUICK)
{ {
mi_check_print_error(param, mi_check_print_error(param,
"Quick-recover aborted; Run recovery without switch -q or with switch -qq"); "Quick-recover aborted; Run recovery without switch -q or with switch -qq");
......
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