Commit 44de69cf authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/psergey/tmp_merge3 

into  mysql.com:/home/psergey/mysql-5.1-merge2


mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/opt_range.cc:
  Manual merge
parents bd7e4cad 3fa6432b

mysql-test/r/select.result

+16 −0
Original line number Diff line number Diff line
@@ -3411,3 +3411,19 @@ SELECT * FROM t1; 
i

255

DROP TABLE t1;

create table t1 (a int);

insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);

create table t2 (a int, b int, c int, e int, primary key(a,b,c));

insert into t2 select A.a, B.a, C.a, C.a from t1 A, t1 B, t1 C;

analyze table t2;

Table	Op	Msg_type	Msg_text

test.t2	analyze	status	OK

select 'In next EXPLAIN, B.rows must be exactly 10:' Z;

Z

In next EXPLAIN, B.rows must be exactly 10:

explain select * from t2 A, t2 B where A.a=5 and A.b=5 and A.C<5

and B.a=5 and B.b=A.e and (B.b =1 or B.b = 3 or B.b=5);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	A	range	PRIMARY	PRIMARY	12	NULL	3	Using where

1	SIMPLE	B	ref	PRIMARY	PRIMARY	8	const,test.A.e	10	

drop table t1, t2;

mysql-test/r/subselect.result

+1 −1
Original line number Diff line number Diff line
@@ -1480,7 +1480,7 @@ Note 1003 select `test`.`t1`.`s1` AS `s1`,not(<in_optimizer>(`test`.`t1`.`s1`,<e 
explain extended select s1, s1 NOT IN (SELECT s1 FROM t2 WHERE s1 < 'a2') from t1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t1	index	NULL	s1	6	NULL	3	Using index

2	DEPENDENT SUBQUERY	t2	index_subquery	s1	s1	6	func	1	Using index; Using where

2	DEPENDENT SUBQUERY	t2	index_subquery	s1	s1	6	func	2	Using index; Using where

Warnings:

Note	1003	select `test`.`t1`.`s1` AS `s1`,not(<in_optimizer>(`test`.`t1`.`s1`,<exists>(<index_lookup>(<cache>(`test`.`t1`.`s1`) in t2 on s1 checking NULL where (`test`.`t2`.`s1` < _latin1'a2'))))) AS `s1 NOT IN (SELECT s1 FROM t2 WHERE s1 < 'a2')` from `test`.`t1`

drop table t1,t2;

mysql-test/t/select.test

+13 −0
Original line number Diff line number Diff line
@@ -2886,3 +2886,16 @@ SELECT * FROM t1; 
UPDATE t1 SET i = i - 1;

SELECT * FROM t1;

DROP TABLE t1;



# BUG#17379



create table t1 (a int);

insert into t1 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);

create table t2 (a int, b int, c int, e int, primary key(a,b,c));

insert into t2 select A.a, B.a, C.a, C.a from t1 A, t1 B, t1 C;

analyze table t2;

select 'In next EXPLAIN, B.rows must be exactly 10:' Z;



explain select * from t2 A, t2 B where A.a=5 and A.b=5 and A.C<5

          and B.a=5 and B.b=A.e and (B.b =1 or B.b = 3 or B.b=5);

drop table t1, t2;

sql/opt_range.cc

+8 −1
Original line number Diff line number Diff line
@@ -450,6 +450,8 @@ class PARAM : public RANGE_OPT_PARAM 


  /* TRUE if last checked tree->key can be used for ROR-scan */

  bool is_ror_scan;

  /* Number of ranges in the last checked tree->key */

  uint n_ranges;

};



class TABLE_READ_PLAN;
@@ -6582,6 +6584,7 @@ check_quick_select(PARAM *param,uint idx,SEL_ARG *tree) 
               param->table->file->primary_key_is_clustered());

    param->is_ror_scan= !cpk_scan;

  }

  param->n_ranges= 0;



  records=check_quick_keys(param,idx,tree,param->min_key,0,param->max_key,0);

  if (records != HA_POS_ERROR)
@@ -6589,7 +6592,7 @@ check_quick_select(PARAM *param,uint idx,SEL_ARG *tree) 
    param->table->quick_keys.set_bit(key);

    param->table->quick_rows[key]=records;

    param->table->quick_key_parts[key]=param->max_key_part+1;



    param->table->quick_n_ranges[key]= param->n_ranges;

    if (cpk_scan)

      param->is_ror_scan= TRUE;

  }
@@ -6725,7 +6728,10 @@ check_quick_keys(PARAM *param,uint idx,SEL_ARG *key_tree, 
      HA_NOSAME &&

      min_key_length == max_key_length &&

      !memcmp(param->min_key,param->max_key,min_key_length))

  {

    tmp=1;					// Max one record

    param->n_ranges++;

  }

  else

  {

    if (param->is_ror_scan)
@@ -6745,6 +6751,7 @@ check_quick_keys(PARAM *param,uint idx,SEL_ARG *key_tree, 
            is_key_scan_ror(param, keynr, key_tree->part + 1)))

        param->is_ror_scan= FALSE;

    }

    param->n_ranges++;



    if (tmp_min_flag & GEOM_FLAG)

    {

sql/sql_select.cc

+117 −357

File changed.

Preview size limit exceeded, changes collapsed.