post-merge fix

myisam/mi_check.c

@@ -2109,7 +2109,7 @@ err:
   DESCRIPTION
     Same as mi_repair_by_sort but do it multithreaded
     Each key is handled by a separate thread.
-    TODO: make a number of thread a parameter
+    TODO: make a number of threads a parameter
 
   RESULT
     0	ok
@@ -2358,7 +2358,7 @@ int mi_repair_parallel(MI_CHECK *param, register MI_INFO *info,
   }
   got_error=1;				/* Assume the following may go wrong */
 
-  if (sort_param->fix_datafile)
+  if (sort_param[0].fix_datafile)
   {
     if (write_data_suffix(&sort_info,1) || end_io_cache(&info->rec_cache))
       goto err;

myisam/myisamchk.c

@@ -219,7 +219,7 @@ static struct my_option my_long_options[] =
   {"recover", 'r',
    "Can fix almost anything except unique keys that aren't unique.",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
-  {"paraller-recover", 'p',
+  {"parallel-recover", 'p',
    "Same as '-r' but creates all the keys in parallel",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"safe-recover", 'o',

mysys/mf_iocache.c

@@ -508,7 +508,6 @@ int _my_b_read_r(register IO_CACHE *info, byte *Buffer, uint Count)
     pos_in_file= info->pos_in_file + (uint)(info->read_end - info->buffer);
     diff_length= (uint) (pos_in_file & (IO_SIZE-1));
     length=IO_ROUND_UP(Count+diff_length)-diff_length;
-    length=IO_ROUND_UP(Count+diff_length)-diff_length;
     length=(length <= info->read_length) ?
                    length + IO_ROUND_DN(info->read_length - length) :
                    length - IO_ROUND_UP(length - info->read_length) ;