diff options
| author | unknown <mhansson@dl145s.mysql.com> | 2007-08-16 14:13:07 +0200 |
|---|---|---|
| committer | unknown <mhansson@dl145s.mysql.com> | 2007-08-16 14:13:07 +0200 |
| commit | f4a163c3a531fecf6cf20c80ce9a7e57d357f11a (patch) | |
| tree | a052b07d62e341ad24fc20ade392e9e8bc835c7c /sql/opt_range.cc | |
| parent | bbf2211bdcd43581b9ddf54f1bfc731384e289c7 (diff) | |
| parent | 01f8130aa68392d14f36cc17c01e1b349bf844f5 (diff) | |
| download | mariadb-git-f4a163c3a531fecf6cf20c80ce9a7e57d357f11a.tar.gz | |
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into dl145s.mysql.com:/data0/mhansson/my50-bug28570
sql/opt_range.cc:
Auto merged
mysql-test/r/innodb_mysql.result:
Bug#28570: Manual Merge
mysql-test/t/innodb_mysql.test:
Bug#28570: Manual Merge
Diffstat (limited to 'sql/opt_range.cc')
| -rw-r--r-- | sql/opt_range.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index d978c8882ac..b195e37920e 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -6369,8 +6369,7 @@ QUICK_RANGE_SELECT *get_quick_select_for_ref(THD *thd, TABLE *table, range->min_key=range->max_key=(char*) ref->key_buff; range->min_length=range->max_length=ref->key_length; range->flag= ((ref->key_length == key_info->key_length && - (key_info->flags & (HA_NOSAME | HA_END_SPACE_KEY)) == - HA_NOSAME) ? EQ_RANGE : 0); + (key_info->flags & HA_END_SPACE_KEY) == 0) ? EQ_RANGE : 0); if (!(quick->key_parts=key_part=(KEY_PART *) alloc_root(&quick->alloc,sizeof(KEY_PART)*ref->key_parts))) |