Commit 12ae8403 authored by Vicențiu Ciorbaru's avatar Vicențiu Ciorbaru

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.
parent c7eef029
...@@ -335,7 +335,7 @@ err: ...@@ -335,7 +335,7 @@ err:
static my_bool _ma_thr_find_all_keys_exec(MARIA_SORT_PARAM* sort_param) 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; ulonglong memavl, old_memavl;
uint UNINIT_VAR(keys), idx; uint UNINIT_VAR(keys), idx;
uint sort_length; uint sort_length;
......
...@@ -326,12 +326,12 @@ static my_bool thr_find_all_keys_exec(MI_SORT_PARAM *sort_param) ...@@ -326,12 +326,12 @@ static my_bool thr_find_all_keys_exec(MI_SORT_PARAM *sort_param)
uint sort_length; uint sort_length;
uint maxbuffer; uint maxbuffer;
uchar **sort_keys= NULL; uchar **sort_keys= NULL;
my_bool error= FALSE; int error= 0;
DBUG_ENTER("thr_find_all_keys"); DBUG_ENTER("thr_find_all_keys");
DBUG_PRINT("enter", ("master: %d", sort_param->master)); DBUG_PRINT("enter", ("master: %d", sort_param->master));
if (sort_param->sort_info->got_error) if (sort_param->sort_info->got_error)
DBUG_RETURN(error); DBUG_RETURN(TRUE);
set_sort_param_read_write(sort_param); set_sort_param_read_write(sort_param);
......
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