diff options
| author | unknown <evgen@moonbone.local> | 2007-03-11 00:26:45 +0300 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2007-03-11 00:26:45 +0300 |
| commit | 8a140cb72eecc8295f847a829ac3c692f0b0ddfd (patch) | |
| tree | 5688018d1c55ec2c3e437747634fd4fe63bd4f4e /sql/opt_range.cc | |
| parent | 209802eb79f69afd20b8e21db3b86ff6d9d933ea (diff) | |
| parent | 2f774b479b91cb279c42ce7f191a2ce4993f1890 (diff) | |
| download | mariadb-git-8a140cb72eecc8295f847a829ac3c692f0b0ddfd.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
mysql-test/r/explain.result:
Auto merged
mysql-test/r/func_default.result:
Auto merged
mysql-test/r/func_regexp.result:
Auto merged
mysql-test/r/func_test.result:
Auto merged
mysql-test/r/having.result:
Auto merged
mysql-test/r/olap.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/r/varbinary.result:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_union.cc:
Auto merged
mysql-test/r/func_str.result:
Manually merged
mysql-test/t/func_str.test:
Manually merged
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 3dc780e1b5f..05b22cee935 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -8924,7 +8924,7 @@ get_best_group_min_max(PARAM *param, SEL_TREE *tree) if ((join->tables != 1) || /* The query must reference one table. */ ((!join->group_list) && /* Neither GROUP BY nor a DISTINCT query. */ (!join->select_distinct)) || - (thd->lex->select_lex.olap == ROLLUP_TYPE)) /* Check (B3) for ROLLUP */ + (join->select_lex->olap == ROLLUP_TYPE)) /* Check (B3) for ROLLUP */ DBUG_RETURN(NULL); if (table->s->keys == 0) /* There are no indexes to use. */ DBUG_RETURN(NULL); |