Commit fcbf1509 authored by unknown's avatar unknown
Browse files

Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 

into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt


BitKeeper/deleted/.del-bdb.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/group_min_max.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/olap.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/type_decimal.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
mysql-test/t/group_min_max.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
include/my_base.h:
  SCCS merged
mysql-test/include/mix1.inc:
  SCCS merged
mysql-test/r/group_by.result:
  SCCS merged
mysql-test/r/innodb_mysql.result:
  SCCS merged
mysql-test/t/group_by.test:
  SCCS merged
sql/sql_select.cc:
  SCCS merged
parents f4f15b54 5e1fe0f8

include/my_base.h

+6 −1
Original line number Diff line number Diff line
@@ -229,12 +229,17 @@ enum ha_base_keytype { 
#define HA_USES_PARSER           16384  /* Fulltext index uses [pre]parser */

#define HA_USES_BLOCK_SIZE	 ((uint) 32768)

#define HA_SORT_ALLOWS_SAME      512    /* Intern bit when sorting records */

#if MYSQL_VERSION_ID < 0x50200

/*

  Key has a part that can have end space.  If this is an unique key

  we have to handle it differently from other unique keys as we can find

  many matching rows for one key (because end space are not compared)

*/

#define HA_END_SPACE_KEY	4096

#define HA_END_SPACE_KEY      0 /* was: 4096 */

#else

#error HA_END_SPACE_KEY is obsolete, please remove it

#endif





	/* These flags can be added to key-seg-flag */

mysql-test/include/mix1.inc

+18 −0
Original line number Diff line number Diff line
@@ -321,6 +321,24 @@ SELECT COUNT(*) FROM t2 LEFT JOIN t1 ON t2.fkey = t1.id 


DROP TABLE t1,t2;



#

# Bug#22781: SQL_BIG_RESULT fails to influence sort plan

#

CREATE TABLE t1 (a INT PRIMARY KEY, b INT, c FLOAT, KEY b(b)) ENGINE = INNODB;



INSERT INTO t1 VALUES (    1 , 1              , 1);

INSERT INTO t1 SELECT  a + 1 , MOD(a + 1 , 20), 1 FROM t1;

INSERT INTO t1 SELECT  a + 2 , MOD(a + 2 , 20), 1 FROM t1;

INSERT INTO t1 SELECT  a + 4 , MOD(a + 4 , 20), 1 FROM t1;

INSERT INTO t1 SELECT  a + 8 , MOD(a + 8 , 20), 1 FROM t1;

INSERT INTO t1 SELECT  a + 16, MOD(a + 16, 20), 1 FROM t1;

INSERT INTO t1 SELECT  a + 32, MOD(a + 32, 20), 1 FROM t1;

INSERT INTO t1 SELECT  a + 64, MOD(a + 64, 20), 1 FROM t1;



EXPLAIN SELECT b, SUM(c) FROM t1 GROUP BY b;

EXPLAIN SELECT SQL_BIG_RESULT b, SUM(c) FROM t1 GROUP BY b;

DROP TABLE t1;



#

# Test of behaviour with CREATE ... SELECT

#

mysql-test/r/func_gconcat.result

+0 −5
Original line number Diff line number Diff line
@@ -74,11 +74,6 @@ grp group_concat(c order by 1) 
1	a

2	b,c

3	C,D,d,d,D,E

select grp,group_concat(c order by "c") from t1 group by grp;

grp	group_concat(c order by "c")

1	a

2	b,c

3	C,D,d,d,D,E

select grp,group_concat(distinct c order by c) from t1 group by grp;

grp	group_concat(distinct c order by c)

1	a

mysql-test/r/func_str.result

+2 −2
Original line number Diff line number Diff line
@@ -1143,9 +1143,9 @@ EXPLAIN EXTENDED 
SELECT * FROM t1 INNER JOIN t2 ON code=id 

WHERE id='a12' AND (LENGTH(code)=5 OR code < 'a00');

id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra

1	SIMPLE	t2	const	PRIMARY	PRIMARY	12	const	1	100.00	Using index

1	SIMPLE	t1	ref	code	code	13	const	3	100.00	Using where; Using index

1	SIMPLE	t2	ref	PRIMARY	PRIMARY	12	const	1	100.00	Using where; Using index

Warnings:

Note	1003	select `test`.`t1`.`code` AS `code`,`test`.`t2`.`id` AS `id` from `test`.`t1` join `test`.`t2` where ((`test`.`t1`.`code` = _latin1'a12') and (`test`.`t2`.`id` = _latin1'a12') and (length(`test`.`t1`.`code`) = 5))

Note	1003	select `test`.`t1`.`code` AS `code`,`test`.`t2`.`id` AS `id` from `test`.`t1` join `test`.`t2` where ((`test`.`t1`.`code` = _latin1'a12') and (length(`test`.`t1`.`code`) = 5))

DROP TABLE t1,t2;

End of 5.0 tests

mysql-test/r/group_by.result

+114 −2
Original line number Diff line number Diff line
@@ -303,10 +303,10 @@ spid sum(userid) 
1	1

explain select sql_big_result score,count(*) from t1 group by score desc;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	score	3	NULL	8	Using index

1	SIMPLE	t1	index	NULL	score	3	NULL	8	Using index; Using filesort

explain select sql_big_result score,count(*) from t1 group by score desc order by null;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	score	3	NULL	8	Using index

1	SIMPLE	t1	index	NULL	score	3	NULL	8	Using index; Using filesort

select sql_big_result score,count(*) from t1 group by score desc;

score	count(*)

3	5
@@ -775,6 +775,55 @@ select sql_buffer_result max(f1)+1 from t1; 
max(f1)+1

3

drop table t1;

CREATE TABLE t1(a INT);

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

SELECT a FROM t1 GROUP BY 'a';

a

1

SELECT a FROM t1 GROUP BY "a";

a

1

SELECT a FROM t1 GROUP BY `a`;

a

1

2

set sql_mode=ANSI_QUOTES;

SELECT a FROM t1 GROUP BY "a";

a

1

2

SELECT a FROM t1 GROUP BY 'a';

a

1

SELECT a FROM t1 GROUP BY `a`;

a

1

2

set sql_mode='';

SELECT a FROM t1 HAVING 'a' > 1;

a

Warnings:

Warning	1292	Truncated incorrect DOUBLE value: 'a'

SELECT a FROM t1 HAVING "a" > 1;

a

Warnings:

Warning	1292	Truncated incorrect DOUBLE value: 'a'

SELECT a FROM t1 HAVING `a` > 1;

a

2

SELECT a FROM t1 ORDER BY 'a' DESC;

a

1

2

SELECT a FROM t1 ORDER BY "a" DESC;

a

1

2

SELECT a FROM t1 ORDER BY `a` DESC;

a

2

1

DROP TABLE t1;

create table t1 (c1 char(3), c2 char(3));

create table t2 (c3 char(3), c4 char(3));

insert into t1 values ('aaa', 'bb1'), ('aaa', 'bb2');
@@ -821,6 +870,69 @@ a b real_b 
68	France	France

DROP VIEW v1;

DROP TABLE t1,t2;

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

INSERT INTO t1 VALUES (1,      1);

INSERT INTO t1 SELECT  a + 1 , MOD(a + 1 , 20) FROM t1;

INSERT INTO t1 SELECT  a + 2 , MOD(a + 2 , 20) FROM t1;

INSERT INTO t1 SELECT  a + 4 , MOD(a + 4 , 20) FROM t1;

INSERT INTO t1 SELECT  a + 8 , MOD(a + 8 , 20) FROM t1;

INSERT INTO t1 SELECT  a + 16, MOD(a + 16, 20) FROM t1;

INSERT INTO t1 SELECT  a + 32, MOD(a + 32, 20) FROM t1;

INSERT INTO t1 SELECT  a + 64, MOD(a + 64, 20) FROM t1;

SELECT MIN(b), MAX(b) from t1;

MIN(b)	MAX(b)

0	19

EXPLAIN SELECT b, sum(1) FROM t1 GROUP BY b;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	b	5	NULL	128	Using index

EXPLAIN SELECT SQL_BIG_RESULT b, sum(1) FROM t1 GROUP BY b;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	NULL	b	5	NULL	128	Using index; Using filesort

SELECT b, sum(1) FROM t1 GROUP BY b;

b	sum(1)

0	6

1	7

2	7

3	7

4	7

5	7

6	7

7	7

8	7

9	6

10	6

11	6

12	6

13	6

14	6

15	6

16	6

17	6

18	6

19	6

SELECT SQL_BIG_RESULT b, sum(1) FROM t1 GROUP BY b;

b	sum(1)

0	6

1	7

2	7

3	7

4	7

5	7

6	7

7	7

8	7

9	6

10	6

11	6

12	6

13	6

14	6

15	6

16	6

17	6

18	6

19	6

DROP TABLE t1;

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;