Browse Source

Fix typo bug that cause myisam repair to fail

We need to return TRUE if got_error == 1, not error, which is
initialized to FALSE.
pull/833/head mariadb-5.5.50
Vicențiu Ciorbaru 9 years ago
parent
commit
12ae840375
  1. 2
      storage/maria/ma_sort.c
  2. 4
      storage/myisam/sort.c

2
storage/maria/ma_sort.c

@ -335,7 +335,7 @@ err:
static my_bool _ma_thr_find_all_keys_exec(MARIA_SORT_PARAM* sort_param)
{
my_bool error= FALSE;
int error= 0;
ulonglong memavl, old_memavl;
uint UNINIT_VAR(keys), idx;
uint sort_length;

4
storage/myisam/sort.c

@ -326,12 +326,12 @@ static my_bool thr_find_all_keys_exec(MI_SORT_PARAM *sort_param)
uint sort_length;
uint maxbuffer;
uchar **sort_keys= NULL;
my_bool error= FALSE;
int error= 0;
DBUG_ENTER("thr_find_all_keys");
DBUG_PRINT("enter", ("master: %d", sort_param->master));
if (sort_param->sort_info->got_error)
DBUG_RETURN(error);
DBUG_RETURN(TRUE);
set_sort_param_read_write(sort_param);

Loading…
Cancel
Save