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

opt_sum.cc:

Browse Source 
Slightly improved the fix for bug #5406.
This commit is contained in:
igor@rurik.mysql.com
2004-09-15 23:52:46 -07:00
parent dab8918647
commit cfbd2b7f7a
1 changed files with 4 additions and 6 deletions
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 ? range_fl & NEAR_MIN ?
HA_READ_AFTER_KEY : HA_READ_AFTER_KEY :
HA_READ_KEY_OR_NEXT); HA_READ_KEY_OR_NEXT);
if ((!error || error == HA_ERR_KEY_NOT_FOUND) && if (!error && reckey_in_range(0, &ref, item_field->field,
reckey_in_range(0, &ref, item_field->field, conds, range_fl, prefix_len))
conds, range_fl, prefix_len))
error= HA_ERR_KEY_NOT_FOUND; error= HA_ERR_KEY_NOT_FOUND;
if (table->key_read) 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 ? range_fl & NEAR_MAX ?
HA_READ_BEFORE_KEY : HA_READ_BEFORE_KEY :
HA_READ_PREFIX_LAST_OR_PREV); HA_READ_PREFIX_LAST_OR_PREV);
if ((!error || error == HA_ERR_KEY_NOT_FOUND) && if (!error && reckey_in_range(1, &ref, item_field->field,
reckey_in_range(1, &ref, item_field->field, conds, range_fl, prefix_len))
conds, range_fl, prefix_len))
error= HA_ERR_KEY_NOT_FOUND; error= HA_ERR_KEY_NOT_FOUND;
if (table->key_read) if (table->key_read)
{ {