1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge rurik.mysql.com:/home/igor/mysql-4.1

Browse Source 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
This commit is contained in:
unknown 2004-09-16 01:23:38 -07:00
commit 7a5fb94920
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sql/opt_sum.cc
View File

@ -191,9 +191,8 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds)
range_fl & NEAR_MIN ?
HA_READ_AFTER_KEY :
HA_READ_KEY_OR_NEXT);
if ((!error || error == HA_ERR_KEY_NOT_FOUND) &&
reckey_in_range(0, &ref, item_field->field,
conds, range_fl, prefix_len))
if (!error && reckey_in_range(0, &ref, item_field->field,
conds, range_fl, prefix_len))
error= HA_ERR_KEY_NOT_FOUND;
if (table->key_read)
{
@ -264,9 +263,8 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds)
range_fl & NEAR_MAX ?
HA_READ_BEFORE_KEY :
HA_READ_PREFIX_LAST_OR_PREV);
if ((!error || error == HA_ERR_KEY_NOT_FOUND) &&
reckey_in_range(1, &ref, item_field->field,
conds, range_fl, prefix_len))
if (!error && reckey_in_range(1, &ref, item_field->field,
conds, range_fl, prefix_len))
error= HA_ERR_KEY_NOT_FOUND;
if (table->key_read)
{