database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.1 into 10.2

Browse Source
This commit is contained in:
Marko Mäkelä
2019-01-23 15:09:06 +02:00
parent d06ebd932d 3b6d2efcb1
commit 9a7281a703
17 changed files with 201 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/opt_range.cc
View File

@ -1558,6 +1558,7 @@ failure:
head->column_bitmaps_set(save_read_set, save_write_set, save_vcol_set);
delete file;
file= save_file;
free_file= false;
DBUG_RETURN(1);
}
@ -6546,6 +6547,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