diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2016-06-16 22:04:24 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2016-06-16 22:04:24 +0300 |
| commit | 12ae840375fe30da1c23647facaa0678858d6d92 (patch) | |
| tree | 17134a52667f89be8b8b0e5416c01ea77f8cb334 /storage/myisam | |
| parent | c7eef029533d71d1c83c231dde065184589930f7 (diff) | |
| download | mariadb-git-12ae840375fe30da1c23647facaa0678858d6d92.tar.gz | |
Fix typo bug that cause myisam repair to failmariadb-5.5.50
We need to return TRUE if got_error == 1, not error, which is
initialized to FALSE.
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/sort.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/myisam/sort.c b/storage/myisam/sort.c index b1cdbf450c8..ed9267a6f1f 100644 --- a/storage/myisam/sort.c +++ b/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); |