diff options
| author | unknown <gkodinov@dl145s.mysql.com> | 2006-11-29 11:25:22 +0100 |
|---|---|---|
| committer | unknown <gkodinov@dl145s.mysql.com> | 2006-11-29 11:25:22 +0100 |
| commit | 37d0126b994d977dfc08838b1fb68e8b80c58d87 (patch) | |
| tree | b8b0b8117c3c83cb85ff2f054b6058055c11c6db /sql/opt_range.cc | |
| parent | 00fec63a38f90d873a18e849cf0dc191d1ad42eb (diff) | |
| parent | 6c0ff6c236ce096061f3db181e1469917781731d (diff) | |
| download | mariadb-git-37d0126b994d977dfc08838b1fb68e8b80c58d87.tar.gz | |
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-opt
mysql-test/t/group_min_max.test:
Auto merged
sql/opt_range.cc:
Auto merged
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index ef755d868d9..affb6dea241 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -7445,7 +7445,7 @@ static TRP_GROUP_MIN_MAX * get_best_group_min_max(PARAM *param, SEL_TREE *tree) { THD *thd= param->thd; - JOIN *join= thd->lex->select_lex.join; + JOIN *join= thd->lex->current_select->join; TABLE *table= param->table; bool have_min= FALSE; /* TRUE if there is a MIN function. */ bool have_max= FALSE; /* TRUE if there is a MAX function. */ @@ -7466,7 +7466,7 @@ get_best_group_min_max(PARAM *param, SEL_TREE *tree) DBUG_ENTER("get_best_group_min_max"); /* Perform few 'cheap' tests whether this access method is applicable. */ - if (!join || (thd->lex->sql_command != SQLCOM_SELECT)) + if (!join) DBUG_RETURN(NULL); /* This is not a select statement. */ if ((join->tables != 1) || /* The query must reference one table. */ ((!join->group_list) && /* Neither GROUP BY nor a DISTINCT query. */ @@ -8316,7 +8316,7 @@ TRP_GROUP_MIN_MAX::make_quick(PARAM *param, bool retrieve_full_rows, DBUG_ENTER("TRP_GROUP_MIN_MAX::make_quick"); quick= new QUICK_GROUP_MIN_MAX_SELECT(param->table, - param->thd->lex->select_lex.join, + param->thd->lex->current_select->join, have_min, have_max, min_max_arg_part, group_prefix_len, used_key_parts, index_info, index, read_cost, records, |