mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/usr/home/ram/work/mysql-5.1-maint

Browse source 
into  mysql.com:/usr/home/ram/work/bug20732/my51-bug20732
This commit is contained in:
ramil/ram@myoffice.izhnet.ru 2006-10-23 12:07:48 +05:00
commit d4c7b6da83
6 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mysql-test/r/range.result
View file

@ -665,6 +665,16 @@ OR ((pk4 =1) AND (((pk1 IN ( 7, 2, 1 ))) OR (pk1 =522)) AND ((pk2 IN ( 0, 2635))
pk1 pk2 pk3 pk4 filler pk1 pk2 pk3 pk4 filler
2621 2635 1000015 0 filler 2621 2635 1000015 0 filler
drop table t1, t2; drop table t1, t2;
create table t1(a char(2), key(a(1)));
insert into t1 values ('x'), ('xx');
explain select a from t1 where a > 'x';
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 range a a 2 NULL 2 Using where
select a from t1 where a > 'x';
a
xx
drop table t1;
End of 4.1 tests
CREATE TABLE t1 ( CREATE TABLE t1 (
id int(11) NOT NULL auto_increment, id int(11) NOT NULL auto_increment,
status varchar(20), status varchar(20),

12
mysql-test/t/range.test
View file

@ -515,7 +515,17 @@ OR ((pk4 =1) AND (((pk1 IN ( 7, 2, 1 ))) OR (pk1 =522)) AND ((pk2 IN ( 0, 2635))
) AND (pk3 >=1000000); ) AND (pk3 >=1000000);
drop table t1, t2; drop table t1, t2;
# End of 4.1 tests #
# Bug #20732: Partial index and long sjis search with '>' fails sometimes
#
create table t1(a char(2), key(a(1)));
insert into t1 values ('x'), ('xx');
explain select a from t1 where a > 'x';
select a from t1 where a > 'x';
drop table t1;
--echo End of 4.1 tests
# #
# Test for optimization request #10561: to use keys for # Test for optimization request #10561: to use keys for

6
sql/opt_range.cc
View file

@ -2101,6 +2101,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->null_bit= key_part_info->null_bit;
key_parts->image_type = key_parts->image_type =
(key_info->flags & HA_SPATIAL) ? Field::itMBR : Field::itRAW; (key_info->flags & HA_SPATIAL) ? Field::itMBR : Field::itRAW;
key_parts->flag= key_part_info->key_part_flag;
} }
param.real_keynr[param.keys++]=idx; param.real_keynr[param.keys++]=idx;
} }
@ -5655,7 +5656,9 @@ get_mm_leaf(RANGE_OPT_PARAM *param, COND *conf_func, Field *field,
} }
break; break;
case Item_func::GT_FUNC: 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; tree->min_flag=NEAR_MIN;
/* fall through */ /* fall through */
case Item_func::GE_FUNC: case Item_func::GE_FUNC:
@ -7644,6 +7647,7 @@ QUICK_RANGE_SELECT *get_quick_select_for_ref(THD *thd, TABLE *table,
key_part->length= key_info->key_part[part].length; key_part->length= key_info->key_part[part].length;
key_part->store_length= key_info->key_part[part].store_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->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)) if (insert_dynamic(&quick->ranges,(gptr)&range))
goto err; goto err;

2
sql/opt_range.h
View file

@ -26,7 +26,7 @@
typedef struct st_key_part { typedef struct st_key_part {
uint16 key,part, store_length, length; uint16 key,part, store_length, length;
uint8 null_bit; uint8 null_bit, flag;
Field *field; Field *field;
Field::imagetype image_type; Field::imagetype image_type;
} KEY_PART; } KEY_PART;

2
sql/sql_select.cc
View file

@ -11645,7 +11645,7 @@ part_of_refkey(TABLE *table,Field *field)
for (uint part=0 ; part < ref_parts ; part++,key_part++) for (uint part=0 ; part < ref_parts ; part++,key_part++)
if (field->eq(key_part->field) && 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 table->reginfo.join_tab->ref.items[part];
} }
return (Item*) 0; return (Item*) 0;

2
sql/table.cc
View file

@ -1168,7 +1168,7 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head,
as we need to test for NULL = NULL. as we need to test for NULL = NULL.
*/ */
if (field->real_maybe_null()) if (field->real_maybe_null())
key_part->key_part_flag|= HA_PART_KEY_SEG; key_part->key_part_flag|= HA_NULL_PART;
} }
keyinfo->usable_key_parts= usable_parts; // Filesort keyinfo->usable_key_parts= usable_parts; // Filesort