diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-23 14:34:23 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-23 14:34:23 +0200 |
| commit | 3b6d2efcb1d5be93574b3b345e3dbfc8fc9387e1 (patch) | |
| tree | 0f28104bebbe56d1b93b8a02c5a032c07d910f7c /sql/opt_range.cc | |
| parent | 52d13036d81fdaa277c9894784dfefd85cf41287 (diff) | |
| parent | 2a0f1d613219ad7962c3394b9c1996ece40926df (diff) | |
| download | mariadb-git-3b6d2efcb1d5be93574b3b345e3dbfc8fc9387e1.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 072f607fb51..46b10b559b2 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -1569,6 +1569,7 @@ failure: head->column_bitmaps_set(save_read_set, save_write_set); delete file; file= save_file; + free_file= false; DBUG_RETURN(1); } @@ -6557,6 +6558,8 @@ TRP_ROR_INTERSECT *get_best_ror_intersect(const PARAM *param, SEL_TREE *tree, if (ror_intersect_add(intersect, cpk_scan, TRUE) && (intersect->total_cost < min_cost)) intersect_best= intersect; //just set pointer here + else + cpk_scan= 0; // Don't use cpk_scan } else cpk_scan= 0; // Don't use cpk_scan |