database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

Fix typo bug that cause myisam repair to fail

Browse Source 
We need to return TRUE if got_error == 1, not error, which is
initialized to FALSE.
This commit is contained in:
Vicențiu Ciorbaru
2016-06-16 22:04:24 +03:00
parent c7eef02953
commit 12ae840375
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/maria/ma_sort.c
View File

@@ -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;

4
storage/myisam/sort.c
View File

@@ -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);