summaryrefslogtreecommitdiff
path: root/sql/opt_range.cc
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2011-03-27 03:45:16 +0400
committerSergey Petrunya <psergey@askmonty.org>2011-03-27 03:45:16 +0400
commit5de770f31736e1ed7088b6d609a4237083d4fe47 (patch)
tree7a806cb868f740609a99d3dcdd352f68d8dcb188 /sql/opt_range.cc
parent290a72d50b65975e0bdd5caffa74d04acee906a5 (diff)
downloadmariadb-git-5de770f31736e1ed7088b6d609a4237083d4fe47.tar.gz
MWL#90: Address review feedback part #14
Diffstat (limited to 'sql/opt_range.cc')
-rw-r--r--sql/opt_range.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index 72e5daf91f4..1d76bb35132 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -4319,7 +4319,7 @@ double get_sweep_read_cost(const PARAM *param, ha_rows records)
return 1;
*/
JOIN *join= param->thd->lex->select_lex.join;
- if (!join || join->tables == 1)
+ if (!join || join->table_count == 1)
{
/* No join, assume reading is done in one 'sweep' */
result= busy_blocks*(DISK_SEEK_BASE_COST +
@@ -11270,7 +11270,7 @@ get_best_group_min_max(PARAM *param, SEL_TREE *tree)
/* Perform few 'cheap' tests whether this access method is applicable. */
if (!join)
DBUG_RETURN(NULL); /* This is not a select statement. */
- if ((join->tables != 1) || /* The query must reference one table. */
+ if ((join->table_count != 1) || /* The query must reference one table. */
((!join->group_list) && /* Neither GROUP BY nor a DISTINCT query. */
(!join->select_distinct)) ||
(join->select_lex->olap == ROLLUP_TYPE)) /* Check (B3) for ROLLUP */