diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-03 14:44:06 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-03 14:44:06 +0200 |
commit | 57325e470615e79f674d82b2d5b09f609508fc6a (patch) | |
tree | 7a2e84a6753a5a5592f44f96194ad7a551c4669f /sql/filesort.cc | |
parent | 706a7101bfacd29f4f5728034be92240e82df583 (diff) | |
parent | c32f71af7e4b747de223bf6b44e691941f5997cf (diff) | |
download | mariadb-git-57325e470615e79f674d82b2d5b09f609508fc6a.tar.gz |
Merge branch '10.3' into 10.4
Diffstat (limited to 'sql/filesort.cc')
-rw-r--r-- | sql/filesort.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index 6a04f6ebfdb..aa25474be1a 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -850,12 +850,12 @@ static ha_rows find_all_keys(THD *thd, Sort_param *param, SQL_SELECT *select, } if (!quick_select) { - (void) file->extra(HA_EXTRA_NO_CACHE); /* End cacheing of records */ + (void) file->extra(HA_EXTRA_NO_CACHE); /* End caching of records */ if (!next_pos) file->ha_rnd_end(); } - /* Signal we should use orignal column read and write maps */ + /* Signal we should use original column read and write maps */ sort_form->column_bitmaps_set(save_read_set, save_write_set); if (unlikely(thd->is_error())) |