diff options
| author | Varun Gupta <varun.gupta@mariadb.com> | 2019-11-28 16:56:49 +0530 |
|---|---|---|
| committer | Varun Gupta <varun.gupta@mariadb.com> | 2019-11-28 16:56:49 +0530 |
| commit | b23fa1e5c4837fece85f23447b1349ec5248ee1c (patch) | |
| tree | 26af7590e5899dfcf905f063ff7347fc82fe8702 /sql/filesort.cc | |
| parent | e660bb5fe43beadc7182348328f55632dae1c247 (diff) | |
| download | mariadb-git-10.5-mdev6519.tar.gz | |
Minor fix10.5-mdev6519
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 c2ce6b75cbc..4abd3b81360 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -889,8 +889,8 @@ static ha_rows find_all_keys(THD *thd, Sort_param *param, SQL_SELECT *select, if (packed_addon_fields && rec_sz != param->rec_length) fs_info->adjust_next_record_pointer(rec_sz); idx++; - num_records++; } + num_records++; } /* It does not make sense to read more keys in case of a fatal error */ @@ -927,10 +927,10 @@ static ha_rows find_all_keys(THD *thd, Sort_param *param, SQL_SELECT *select, write_keys(param, fs_info, idx, buffpek_pointers, tempfile)) DBUG_RETURN(HA_POS_ERROR); /* purecov: inspected */ + (*found_rows)= num_records; if (pq) num_records= pq->num_elements(); - (*found_rows)= num_records; DBUG_PRINT("info", ("find_all_keys return %llu", (ulonglong) num_records)); DBUG_RETURN(num_records); |