diff options
| author | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-10-19 16:15:30 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-10-19 16:15:30 +0500 |
| commit | 68c2a008a1e5fc305a735cf90bd994230729a68d (patch) | |
| tree | 86c6c0aa08ccf4c172196dfc0d398e73fd46bd93 /sql | |
| parent | 48dfeb4de0e3444fe5ddf9aba1040707d11cfa85 (diff) | |
| parent | da7af481cda9d0fb836f010d421ce00830b69f56 (diff) | |
| download | mariadb-git-68c2a008a1e5fc305a735cf90bd994230729a68d.tar.gz | |
Merge mysql.com:/usr/home/ram/work/bug20732/my41-bug20732
into mysql.com:/usr/home/ram/work/bug20732/my50-bug20732
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/range.result:
SCCS merged
mysql-test/t/range.test:
SCCS merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/opt_range.cc | 6 | ||||
| -rw-r--r-- | sql/opt_range.h | 2 | ||||
| -rw-r--r-- | sql/sql_select.cc | 2 | ||||
| -rw-r--r-- | sql/table.cc | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 737a296e1d7..c936663cdfc 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -1924,6 +1924,7 @@ int SQL_SELECT::test_quick_select(THD *thd, key_map keys_to_use, key_parts->null_bit= key_part_info->null_bit; key_parts->image_type = (key_info->flags & HA_SPATIAL) ? Field::itMBR : Field::itRAW; + key_parts->flag= key_part_info->key_part_flag; } param.real_keynr[param.keys++]=idx; } @@ -4347,7 +4348,9 @@ get_mm_leaf(PARAM *param, COND *conf_func, Field *field, KEY_PART *key_part, } break; case Item_func::GT_FUNC: - if (field_is_equal_to_item(field,value)) + /* Don't use open ranges for partial key_segments */ + if (field_is_equal_to_item(field,value) && + !(key_part->flag & HA_PART_KEY_SEG)) tree->min_flag=NEAR_MIN; /* fall through */ case Item_func::GE_FUNC: @@ -6237,6 +6240,7 @@ QUICK_RANGE_SELECT *get_quick_select_for_ref(THD *thd, TABLE *table, key_part->length= key_info->key_part[part].length; key_part->store_length= key_info->key_part[part].store_length; key_part->null_bit= key_info->key_part[part].null_bit; + key_part->flag= key_info->key_part[part].key_part_flag; } if (insert_dynamic(&quick->ranges,(gptr)&range)) goto err; diff --git a/sql/opt_range.h b/sql/opt_range.h index 40a95beb894..14dafb1490a 100644 --- a/sql/opt_range.h +++ b/sql/opt_range.h @@ -26,7 +26,7 @@ typedef struct st_key_part { uint16 key,part, store_length, length; - uint8 null_bit; + uint8 null_bit, flag; Field *field; Field::imagetype image_type; } KEY_PART; diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 6d17faf8509..b1354a7a457 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -11428,7 +11428,7 @@ part_of_refkey(TABLE *table,Field *field) for (uint part=0 ; part < ref_parts ; part++,key_part++) if (field->eq(key_part->field) && - !(key_part->key_part_flag & HA_PART_KEY_SEG)) + !(key_part->key_part_flag & (HA_PART_KEY_SEG | HA_NULL_PART))) return table->reginfo.join_tab->ref.items[part]; } return (Item*) 0; diff --git a/sql/table.cc b/sql/table.cc index 1886fdb0b82..cd8e12ca852 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -820,7 +820,7 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat, as we need to test for NULL = NULL. */ if (field->real_maybe_null()) - key_part->key_part_flag|= HA_PART_KEY_SEG; + key_part->key_part_flag|= HA_NULL_PART; } else { // Error: shorten key |