diff options
| author | unknown <stewart@willster.(none)> | 2006-09-25 14:48:39 +1000 |
|---|---|---|
| committer | unknown <stewart@willster.(none)> | 2006-09-25 14:48:39 +1000 |
| commit | 0f72ee6766e92307806c5cfcb7d92146afeaee1e (patch) | |
| tree | df17b5bc9833c6fc8989e30886964e357263bca1 /sql/opt_sum.cc | |
| parent | d4d3dcacaa896fb5cc4ad25885bf2521a07e04d1 (diff) | |
| parent | 103fc806c3ab6c8840e1f8315faf6d7206a6cc2c (diff) | |
| download | mariadb-git-0f72ee6766e92307806c5cfcb7d92146afeaee1e.tar.gz | |
Merge willster.(none):/home/stewart/Documents/MySQL/4.1/main
into willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2
sql/opt_sum.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/opt_sum.cc')
| -rw-r--r-- | sql/opt_sum.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc index 64b01ce002a..412fc0dc037 100644 --- a/sql/opt_sum.cc +++ b/sql/opt_sum.cc @@ -187,7 +187,7 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds) Type of range for the key part for this field will be returned in range_fl. */ - if ((outer_tables & table->map) || + if (table->file->inited || (outer_tables & table->map) || !find_key_for_maxmin(0, &ref, item_field->field, conds, &range_fl, &prefix_len)) { @@ -274,7 +274,7 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds) Type of range for the key part for this field will be returned in range_fl. */ - if ((outer_tables & table->map) || + if (table->file->inited || (outer_tables & table->map) || !find_key_for_maxmin(1, &ref, item_field->field, conds, &range_fl, &prefix_len)) { |