diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-18 09:15:41 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-18 09:15:41 +0200 |
| commit | 45531949ae115f2ba7b9450cc2386653483211ba (patch) | |
| tree | 22809f3919c711d5030d2d0e55be969a7bc67e84 /sql/sql_select.cc | |
| parent | 36b7f8f4b0e46e06cfcc29c221430a5b998e3b3f (diff) | |
| parent | ed13a0d221256028299df4167280e97860ba2edc (diff) | |
| download | mariadb-git-45531949ae115f2ba7b9450cc2386653483211ba.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index ce8617cda64..ddc5a25bd07 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -22777,9 +22777,11 @@ static int remove_dup_with_compare(THD *thd, TABLE *table, Field **first_field, } file->extra(HA_EXTRA_NO_CACHE); + (void) file->ha_rnd_end(); DBUG_RETURN(0); err: file->extra(HA_EXTRA_NO_CACHE); + (void) file->ha_rnd_end(); if (error) file->print_error(error,MYF(0)); DBUG_RETURN(1); |