Commit 8555b8d7 authored by unknown's avatar unknown
Browse files

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 

into  magare.gmz:/home/kgeorge/mysql/autopush/WL3527-5.1-opt


BitKeeper/deleted/.del-sql_parse.cc.rej:
  Auto merged
BitKeeper/deleted/.del-table.cc.rej:
  Auto merged
mysql-test/r/endspace.result:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
BitKeeper/deleted/.del-mysqld.cc.rej~35c1c438e11ebd89:
  Auto merged
mysql-test/r/group_by.result:
  manual merge to 5.1-opt
sql/mysqld.cc:
  manual merge to 5.1-opt
sql/sql_base.cc:
  manual merge to 5.1-opt
sql/sql_select.cc:
  manual merge to 5.1-opt
sql/table.h:
  manual merge to 5.1-opt
parents 209802eb 79542930

mysql-test/r/endspace.result

+9 −6
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ insert into t1 values ('teststring'), ('nothing'), ('teststring\t'); 
check table t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

select * from t1 ignore key (key1) where text1='teststring' or text1 like 'teststring_%';

select * from t1 ignore key (key1) where text1='teststring' or 

text1 like 'teststring_%' ORDER BY text1;

text1

teststring	

teststring
@@ -48,7 +49,8 @@ alter table t1 modify text1 char(32) binary not null; 
check table t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

select * from t1 ignore key (key1) where text1='teststring' or text1 like 'teststring_%';

select * from t1 ignore key (key1) where text1='teststring' or 

text1 like 'teststring_%' ORDER BY text1;

text1

teststring	

teststring
@@ -132,7 +134,8 @@ concat('|', text1, '|') 
drop table t1;

create table t1 (text1 varchar(32) not NULL, KEY key1 using BTREE (text1)) engine=heap;

insert into t1 values ('teststring'), ('nothing'), ('teststring\t');

select * from t1 ignore key (key1) where text1='teststring' or text1 like 'teststring_%';

select * from t1 ignore key (key1) where text1='teststring' or 

text1 like 'teststring_%' ORDER BY text1;

text1

teststring	

teststring

mysql-test/r/group_by.result

+105 −7
Original line number Diff line number Diff line
@@ -1035,12 +1035,110 @@ HAVING SUM(t1_inner.b)+t1_outer.b > 5); 
ERROR 42000: 'test.t1_outer.b' isn't in GROUP BY

DROP TABLE t1;

SET SQL_MODE = '';

CREATE TABLE t1 (a INT, b INT, KEY(a));

INSERT INTO t1 VALUES (1, 1), (2, 2), (3,3), (4,4);

EXPLAIN SELECT a, SUM(b) FROM t1 GROUP BY a LIMIT 2;

CREATE TABLE t1 (a INT, b INT,

PRIMARY KEY (a),

KEY i2(a,b));

INSERT INTO t1 VALUES (1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8);

INSERT INTO t1 SELECT a + 8,b FROM t1;

INSERT INTO t1 SELECT a + 16,b FROM t1;

INSERT INTO t1 SELECT a + 32,b FROM t1;

INSERT INTO t1 SELECT a + 64,b FROM t1;

INSERT INTO t1 SELECT a + 128,b FROM t1;

ANALYZE TABLE t1;

Table	Op	Msg_type	Msg_text

test.t1	analyze	status	OK

EXPLAIN SELECT a FROM t1 WHERE a < 2;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	a	5	NULL	4	

EXPLAIN SELECT a, SUM(b) FROM t1 IGNORE INDEX (a) GROUP BY a LIMIT 2;

1	SIMPLE	t1	range	PRIMARY,i2	PRIMARY	4	NULL	2	Using where; Using index

EXPLAIN SELECT a FROM t1 WHERE a < 2 ORDER BY a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	4	Using temporary; Using filesort

DROP TABLE t1;
 
1	SIMPLE	t1	range	PRIMARY,i2	PRIMARY	4	NULL	2	Using where; Using index

EXPLAIN SELECT a FROM t1 WHERE a < 2 GROUP BY a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	PRIMARY,i2	PRIMARY	4	NULL	2	Using where; Using index

EXPLAIN SELECT a FROM t1 IGNORE INDEX (PRIMARY,i2);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	256	

EXPLAIN SELECT a FROM t1 IGNORE INDEX FOR JOIN (PRIMARY,i2);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	256	

EXPLAIN SELECT a FROM t1 IGNORE INDEX FOR GROUP BY (PRIMARY,i2) GROUP BY a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	PRIMARY	4	NULL	256	Using index

EXPLAIN SELECT a FROM t1 IGNORE INDEX FOR ORDER BY (PRIMARY,i2) ORDER BY a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	PRIMARY	4	NULL	256	Using index

EXPLAIN SELECT a FROM t1 IGNORE INDEX FOR ORDER BY (PRIMARY)

IGNORE INDEX FOR GROUP BY (i2) GROUP BY a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	PRIMARY	4	NULL	256	Using index

EXPLAIN SELECT a FROM t1 IGNORE INDEX (PRIMARY) IGNORE INDEX FOR ORDER BY (i2);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	i2	9	NULL	256	Using index

EXPLAIN SELECT a FROM t1 FORCE INDEX (i2);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	i2	9	NULL	256	Using index

EXPLAIN SELECT a FROM t1 USE INDEX ();

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	256	

EXPLAIN SELECT a FROM t1 USE INDEX () USE INDEX (i2);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	256	

EXPLAIN SELECT a FROM t1 

FORCE INDEX (PRIMARY) 

IGNORE INDEX FOR GROUP BY (i2)

IGNORE INDEX FOR ORDER BY (i2)

USE INDEX (i2);

ERROR HY000: Incorrect usage of USE INDEX and FORCE INDEX

EXPLAIN SELECT a FROM t1 USE INDEX (i2) USE INDEX ();

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	i2	9	NULL	256	Using index

EXPLAIN SELECT a FROM t1 FORCE INDEX ();

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1

EXPLAIN SELECT a FROM t1 IGNORE INDEX ();

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ')' at line 1

EXPLAIN SELECT a FROM t1 USE INDEX FOR JOIN (i2) 

USE INDEX FOR GROUP BY (i2) GROUP BY a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	i2	9	NULL	256	Using index

EXPLAIN SELECT a FROM t1 FORCE INDEX FOR JOIN (i2) 

FORCE INDEX FOR GROUP BY (i2) GROUP BY a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	NULL	i2	4	NULL	257	Using index for group-by

EXPLAIN SELECT a FROM t1 USE INDEX () IGNORE INDEX (i2);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	256	

EXPLAIN SELECT a FROM t1 IGNORE INDEX (i2) USE INDEX ();

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	256	

EXPLAIN SELECT a FROM t1 

USE INDEX FOR GROUP BY (i2) 

USE INDEX FOR ORDER BY (i2)

USE INDEX FOR JOIN (i2);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	i2	9	NULL	256	Using index

EXPLAIN SELECT a FROM t1 

USE INDEX FOR JOIN (i2) 

USE INDEX FOR JOIN (i2) 

USE INDEX FOR JOIN (i2,i2);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	i2	9	NULL	256	Using index

EXPLAIN SELECT 1 FROM t1 WHERE a IN

(SELECT a FROM t1 USE INDEX (i2) IGNORE INDEX (i2));

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t1	index	NULL	PRIMARY	4	NULL	256	Using where; Using index

2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	256	Using where

CREATE TABLE t2 (a INT, b INT, KEY(a));

INSERT INTO t2 VALUES (1, 1), (2, 2), (3,3), (4,4);

EXPLAIN SELECT a, SUM(b) FROM t2 GROUP BY a LIMIT 2;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	index	NULL	a	5	NULL	4	

EXPLAIN SELECT a, SUM(b) FROM t2 IGNORE INDEX (a) GROUP BY a LIMIT 2;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	4	Using temporary; Using filesort

EXPLAIN SELECT 1 FROM t2 WHERE a IN

(SELECT a FROM t1 USE INDEX (i2) IGNORE INDEX (i2));

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t2	index	NULL	a	5	NULL	4	Using where; Using index

2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	256	Using where

DROP TABLE t1, t2;

mysql-test/t/endspace.test

+6 −3
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ drop table if exists t1; 
create table t1 (text1 varchar(32) not NULL, KEY key1 (text1));

insert into t1 values ('teststring'), ('nothing'), ('teststring\t');

check table t1;

select * from t1 ignore key (key1) where text1='teststring' or text1 like 'teststring_%';

select * from t1 ignore key (key1) where text1='teststring' or 

  text1 like 'teststring_%' ORDER BY text1;

select * from t1 where text1='teststring' or text1 like 'teststring_%';

select * from t1 where text1='teststring' or text1 > 'teststring\t';

select * from t1 order by text1;
@@ -24,7 +25,8 @@ explain select * from t1 order by text1; 


alter table t1 modify text1 char(32) binary not null;

check table t1;

select * from t1 ignore key (key1) where text1='teststring' or text1 like 'teststring_%';

select * from t1 ignore key (key1) where text1='teststring' or 

  text1 like 'teststring_%' ORDER BY text1;

select concat('|', text1, '|') from t1 where text1='teststring' or text1 like 'teststring_%';

select concat('|', text1, '|') from t1 where text1='teststring' or text1 > 'teststring\t';

select text1, length(text1) from t1 order by text1;
@@ -57,7 +59,8 @@ drop table t1; 


create table t1 (text1 varchar(32) not NULL, KEY key1 using BTREE (text1)) engine=heap;

insert into t1 values ('teststring'), ('nothing'), ('teststring\t');

select * from t1 ignore key (key1) where text1='teststring' or text1 like 'teststring_%';

select * from t1 ignore key (key1) where text1='teststring' or 

  text1 like 'teststring_%' ORDER BY text1;

select * from t1 where text1='teststring' or text1 like 'teststring_%';

select * from t1 where text1='teststring' or text1 >= 'teststring\t';

select * from t1 order by text1;

mysql-test/t/group_by.test

+62 −6
Original line number Diff line number Diff line
@@ -757,10 +757,66 @@ SET SQL_MODE = ''; 
# Bug #21174: Index degrades sort performance and 

#             optimizer does not honor IGNORE INDEX

#

CREATE TABLE t1 (a INT, b INT, KEY(a));

INSERT INTO t1 VALUES (1, 1), (2, 2), (3,3), (4,4);

CREATE TABLE t1 (a INT, b INT,

                 PRIMARY KEY (a),

                 KEY i2(a,b));

INSERT INTO t1 VALUES (1,1),(2,2),(3,3),(4,4),(5,5),(6,6),(7,7),(8,8);

INSERT INTO t1 SELECT a + 8,b FROM t1;

INSERT INTO t1 SELECT a + 16,b FROM t1;

INSERT INTO t1 SELECT a + 32,b FROM t1;

INSERT INTO t1 SELECT a + 64,b FROM t1;

INSERT INTO t1 SELECT a + 128,b FROM t1;

ANALYZE TABLE t1;

EXPLAIN SELECT a FROM t1 WHERE a < 2;

EXPLAIN SELECT a FROM t1 WHERE a < 2 ORDER BY a;

EXPLAIN SELECT a FROM t1 WHERE a < 2 GROUP BY a;

EXPLAIN SELECT a FROM t1 IGNORE INDEX (PRIMARY,i2);

EXPLAIN SELECT a FROM t1 IGNORE INDEX FOR JOIN (PRIMARY,i2);

EXPLAIN SELECT a FROM t1 IGNORE INDEX FOR GROUP BY (PRIMARY,i2) GROUP BY a;

EXPLAIN SELECT a FROM t1 IGNORE INDEX FOR ORDER BY (PRIMARY,i2) ORDER BY a;

EXPLAIN SELECT a FROM t1 IGNORE INDEX FOR ORDER BY (PRIMARY)

  IGNORE INDEX FOR GROUP BY (i2) GROUP BY a;

EXPLAIN SELECT a FROM t1 IGNORE INDEX (PRIMARY) IGNORE INDEX FOR ORDER BY (i2);

EXPLAIN SELECT a FROM t1 FORCE INDEX (i2);

EXPLAIN SELECT a FROM t1 USE INDEX ();

EXPLAIN SELECT a FROM t1 USE INDEX () USE INDEX (i2);

--error ER_WRONG_USAGE

EXPLAIN SELECT a FROM t1 

  FORCE INDEX (PRIMARY) 

  IGNORE INDEX FOR GROUP BY (i2)

  IGNORE INDEX FOR ORDER BY (i2)

  USE INDEX (i2);

EXPLAIN SELECT a FROM t1 USE INDEX (i2) USE INDEX ();

--error ER_PARSE_ERROR

EXPLAIN SELECT a FROM t1 FORCE INDEX ();

--error ER_PARSE_ERROR

EXPLAIN SELECT a FROM t1 IGNORE INDEX ();

EXPLAIN SELECT a FROM t1 USE INDEX FOR JOIN (i2) 

  USE INDEX FOR GROUP BY (i2) GROUP BY a;

EXPLAIN SELECT a FROM t1 FORCE INDEX FOR JOIN (i2) 

  FORCE INDEX FOR GROUP BY (i2) GROUP BY a;

EXPLAIN SELECT a FROM t1 USE INDEX () IGNORE INDEX (i2);

EXPLAIN SELECT a FROM t1 IGNORE INDEX (i2) USE INDEX ();



EXPLAIN SELECT a FROM t1 

  USE INDEX FOR GROUP BY (i2) 

  USE INDEX FOR ORDER BY (i2)

  USE INDEX FOR JOIN (i2);



EXPLAIN SELECT a FROM t1 

  USE INDEX FOR JOIN (i2) 

  USE INDEX FOR JOIN (i2) 

  USE INDEX FOR JOIN (i2,i2);



EXPLAIN SELECT 1 FROM t1 WHERE a IN

  (SELECT a FROM t1 USE INDEX (i2) IGNORE INDEX (i2));



CREATE TABLE t2 (a INT, b INT, KEY(a));

INSERT INTO t2 VALUES (1, 1), (2, 2), (3,3), (4,4);

EXPLAIN SELECT a, SUM(b) FROM t2 GROUP BY a LIMIT 2; 

EXPLAIN SELECT a, SUM(b) FROM t2 IGNORE INDEX (a) GROUP BY a LIMIT 2;



EXPLAIN SELECT 1 FROM t2 WHERE a IN

  (SELECT a FROM t1 USE INDEX (i2) IGNORE INDEX (i2));



EXPLAIN SELECT a, SUM(b) FROM t1 GROUP BY a LIMIT 2; 

EXPLAIN SELECT a, SUM(b) FROM t1 IGNORE INDEX (a) GROUP BY a LIMIT 2;



DROP TABLE t1;
 
DROP TABLE t1, t2;

sql/item.cc

+1 −1
Original line number Diff line number Diff line
@@ -3906,7 +3906,7 @@ bool Item_field::fix_fields(THD *thd, Item **reference) 
      {

        /* First usage of column */

        table->used_fields++;                     // Used to optimize loops

        table->used_keys.intersect(field->part_of_key);

        table->covering_keys.intersect(field->part_of_key);

      }

    }

  }