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

Merge willster.(none):/home/stewart/Documents/MySQL/4.1/main

Browse Source 
into  willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2
This commit is contained in:
stewart@willster.(none)
2006-09-25 14:48:39 +10:00
parent 0f3874dffa 878416e054
commit 3ecc09e0e4
34 changed files with 764 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/opt_sum.cc
View File

@ -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))
{