Commit 68c2a008 authored by unknown's avatar unknown
Browse files

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
parents 48dfeb4d da7af481

mysql-test/r/range.result

+10 −0
Original line number Diff line number Diff line
@@ -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

2621	2635	1000015	0	filler

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 (

id int(11) NOT NULL auto_increment,

status varchar(20),

mysql-test/t/range.test

+11 −1
Original line number Diff line number Diff line
@@ -515,7 +515,17 @@ OR ((pk4 =1) AND (((pk1 IN ( 7, 2, 1 ))) OR (pk1 =522)) AND ((pk2 IN ( 0, 2635)) 
) AND (pk3 >=1000000);

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

sql/opt_range.cc

+5 −1
Original line number Diff line number Diff line
@@ -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;

sql/opt_range.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

sql/sql_select.cc

+1 −1
Original line number Diff line number Diff line
@@ -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;