mi_check flags cleanup

CHECK/REPAIR syntax cleanup
REPAIR ... USE_FRM syntax


include/myisam.h:
  mi_check flags cleanup
myisam/mi_check.c:
  mi_check flags cleanup
myisam/myisamchk.c:
  mi_check flags cleanup
mysql-test/r/check.result:
  CHECK/REPAIR syntax cleanup
mysql-test/r/show_check.result:
  CHECK/REPAIR syntax cleanup
mysql-test/t/check.test:
  CHECK/REPAIR syntax cleanup
mysql-test/t/show_check.test:
  CHECK/REPAIR syntax cleanup
sql/ha_myisam.cc:
  mi_check flags cleanup
sql/handler.h:
  mi_check flags cleanup
sql/lex.h:
  REPAIR ... USE_FRM syntax
sql/slave.cc:
  mi_check flags cleanup

2 files changed, 28 insertions, 22 deletions

diff --git a/myisam/mi_check.c b/myisam/mi_check.c
index 5b21e9b6ef2..2ba74836ab7 100644
--- a/myisam/mi_check.c
+++ b/myisam/mi_check.c
@@ -221,7 +221,7 @@ int chk_del(MI_CHECK *param, register MI_INFO *info, uint test_flag)
   }
   DBUG_RETURN(0);
 wrong:
-  param->retry_without_quick=1;		/* Don't use quick repair */
+  param->testflag|=T_RETRY_WITHOUT_QUICK;
   if (test_flag & T_VERBOSE) puts("");
   mi_check_print_error(param,"record delete-link-chain corrupted");
   DBUG_RETURN(1);
@@ -321,7 +321,7 @@ int chk_size(MI_CHECK *param, register MI_INFO *info)
       error=1;
       mi_check_print_error(param,"Size of datafile is: %-9s         Should be: %s",
 		    llstr(size,buff), llstr(skr,buff2));
-      param->retry_without_quick=1;		/* Don't use quick repair */
+      param->testflag|=T_RETRY_WITHOUT_QUICK;
     }
     else
     {
@@ -1094,7 +1094,7 @@ int chk_data_link(MI_CHECK *param, MI_INFO *info,int extend)
   mi_check_print_error(param,"got error: %d when reading datafile at record: %s",my_errno, llstr(records,llbuff));
  err2:
   my_free((gptr) record,MYF(0));
-  param->retry_without_quick=1;
+  param->testflag|=T_RETRY_WITHOUT_QUICK;
   DBUG_RETURN(1);
 } /* chk_data_link */
 
@@ -1238,9 +1238,10 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info,
 		      USE_WHOLE_KEY);
       }
       sort_info->dupp++;
-      if (rep_quick == 1)
+      if (!(rep_quick & T_FORCE_UNIQUENESS))
       {
-	param->error_printed=param->retry_without_quick=1;
+        param->testflag|=T_RETRY_WITHOUT_QUICK;
+	param->error_printed=1;
 	goto err;
       }
       continue;
@@ -1269,7 +1270,8 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info,
     mi_check_print_error(param,"Couldn't fix table with quick recovery: Found wrong number of deleted records");
     mi_check_print_error(param,"Run recovery again without -q");
     got_error=1;
-    param->retry_repair=param->retry_without_quick=1;
+    param->retry_repair=1;
+    param->testflag|=T_RETRY_WITHOUT_QUICK;
     goto err;
   }
   if (param->testflag & T_SAFE_REPAIR)
@@ -1987,11 +1989,12 @@ int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info,
     mi_check_print_error(param,"Couldn't fix table with quick recovery: Found wrong number of deleted records");
     mi_check_print_error(param,"Run recovery again without -q");
     got_error=1;
-    param->retry_repair=param->retry_without_quick=1;
+    param->retry_repair=1;
+    param->testflag|=T_RETRY_WITHOUT_QUICK;
     goto err;
   }
 
-  if (rep_quick != 1)
+  if (rep_quick & T_FORCE_UNIQUENESS)
   {
     my_off_t skr=info->state->data_file_length+
       (share->options & HA_OPTION_COMPRESS_RECORD ?
@@ -2175,7 +2178,8 @@ static int sort_get_next_record(SORT_INFO *sort_info)
       {
 	if (param->read_cache.error)
 	  param->out_flag |= O_DATA_LOST;
-	param->retry_repair=param->retry_without_quick=1;
+        param->retry_repair=1;
+        param->testflag|=T_RETRY_WITHOUT_QUICK;
 	DBUG_RETURN(-1);
       }
       sort_info->start_recpos=sort_info->pos;
@@ -2209,8 +2213,8 @@ static int sort_get_next_record(SORT_INFO *sort_info)
       if (searching)
       {
 	pos=MY_ALIGN(pos,MI_DYN_ALIGN_SIZE);
-	param->retry_without_quick=1;
-	sort_info->start_recpos=pos;	  
+        param->testflag|=T_RETRY_WITHOUT_QUICK;
+	sort_info->start_recpos=pos;
       }
       do
       {
@@ -2245,7 +2249,8 @@ static int sort_get_next_record(SORT_INFO *sort_info)
 	if (searching && ! sort_info->fix_datafile)
 	{
 	  param->error_printed=1;
-	  param->retry_repair=param->retry_without_quick=1;
+          param->retry_repair=1;
+          param->testflag|=T_RETRY_WITHOUT_QUICK;
 	  DBUG_RETURN(1);	/* Something wrong with data */
 	}
 	if (((b_type=_mi_get_block_info(&block_info,-1,pos)) &
@@ -2456,7 +2461,8 @@ static int sort_get_next_record(SORT_INFO *sort_info)
       if (searching && ! sort_info->fix_datafile)
       {
 	param->error_printed=1;
-	param->retry_repair=param->retry_without_quick=1;
+        param->retry_repair=1;
+        param->testflag|=T_RETRY_WITHOUT_QUICK;
 	DBUG_RETURN(1);		/* Something wrong with data */
       }
       sort_info->start_recpos=sort_info->pos;
@@ -2655,7 +2661,7 @@ static int sort_key_write(SORT_INFO *sort_info, const void *a)
 						    sort_info->key_block->
 						    lastkey),
 				 llbuff2));
-    param->retry_without_quick=1;
+    param->testflag|=T_RETRY_WITHOUT_QUICK;
     if (sort_info->param->testflag & T_VERBOSE)
       _mi_print_key(stdout,sort_info->keyseg,(uchar*) a, USE_WHOLE_KEY);
     return (sort_delete_record(param));
@@ -2778,10 +2784,10 @@ static int sort_delete_record(MI_CHECK *param)
   SORT_INFO *sort_info= &param->sort_info;
   DBUG_ENTER("sort_delete_record");
 
-  if (param->opt_rep_quick == 1)
+  if (!(param->testflag & T_FORCE_UNIQUENESS))
   {
     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");
     DBUG_RETURN(1);
   }
   info=sort_info->info;
diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c
index ca546051290..20554b69393 100644
--- a/myisam/myisamchk.c
+++ b/myisam/myisamchk.c
@@ -517,9 +517,10 @@ get_one_option(int optid,
     break;
   case 'q':
     if (argument && *argument == '0')
-      check_param.opt_rep_quick=0;
+      check_param.testflag&= ~(T_QUICK | T_FORCE_UNIQUENESS);
     else
-      check_param.opt_rep_quick++;
+      check_param.testflag|=
+        (check_param.testflag & T_QUICK) ? T_FORCE_UNIQUENESS : T_QUICK;
     break;
   case 'u':
     if (argument && *argument == '0')
@@ -627,7 +628,7 @@ static void get_options(register int *argc,register char ***argv)
   }
 
   if ((check_param.testflag & T_UNPACK) &&
-      (check_param.opt_rep_quick || (check_param.testflag & T_SORT_RECORDS)))
+      (check_param.testflag & (T_QUICK | T_SORT_RECORDS)))
   {
     VOID(fprintf(stderr,
 		 "%s: --unpack can't be used with --quick or --sort-records\n",
@@ -659,7 +660,7 @@ static void get_options(register int *argc,register char ***argv)
 static int myisamchk(MI_CHECK *param, my_string filename)
 {
   int error,lock_type,recreate;
-  int rep_quick= param->opt_rep_quick;
+  int rep_quick= param->testflag & (T_QUICK | T_FORCE_UNIQUENESS);
   uint raid_chunks;
   MI_INFO *info;
   File datafile;
@@ -794,8 +795,7 @@ static int myisamchk(MI_CHECK *param, my_string filename)
       param->testflag|=T_REP_BY_SORT;		/* if only STATISTICS */
       if (!(param->testflag & T_SILENT))
 	printf("- '%s' has old table-format. Recreating index\n",filename);
-      if (!rep_quick)
-	rep_quick=1;
+      rep_quick|=T_QUICK;
     }
     share=info->s;
     share->r_locks=0;