Commit cf9a7182 authored by unknown's avatar unknown
Browse files

Merge moonbone.local:/work/tmp_merge-5.0-opt-mysql 

into  moonbone.local:/work/tmp_merge-5.0-mysql


mysql-test/r/view.result:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
parents f40b6c27 7e9ed378

BUILD/check-cpu

+5 −1
Original line number Diff line number Diff line
@@ -93,6 +93,10 @@ case "$cpu_family--$model_name" in 
  *Opteron*)

    cpu_arg="opteron";

    ;;

  # MacOSX / Intel  

  *i386*i486*)

    cpu_arg="pentium-m";

    ;;



  # Intel ia64

  *Itanium*)
@@ -131,7 +135,7 @@ else 
fi



cc_ver=`$cc --version | sed 1q`

cc_verno=`echo $cc_ver | sed -e 's/[^0-9. ]//g;	 s/^ *//g; s/ .*//g'`

cc_verno=`echo $cc_ver | sed -e 's/^.*gcc/gcc/g; s/[^0-9. ]//g;	 s/^ *//g; s/ .*//g'`



case "$cc_ver--$cc_verno" in

  *GCC*)

mysql-test/r/compare.result

+7 −0
Original line number Diff line number Diff line
@@ -42,3 +42,10 @@ CHAR(31) = '' '' = CHAR(31) 
SELECT CHAR(30) = '', '' = CHAR(30);

CHAR(30) = ''	'' = CHAR(30)

0	0

create table t1 (a tinyint(1),b binary(1));

insert into t1 values (0x01,0x01);

select * from t1 where a=b;

a	b

select * from t1 where a=b and b=0x01;

a	b

drop table if exists t1;

mysql-test/r/group_by.result

+9 −0
Original line number Diff line number Diff line
@@ -821,3 +821,12 @@ a b real_b 
68	France	France

DROP VIEW v1;

DROP TABLE t1,t2;

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;

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;

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;

mysql-test/r/innodb_mysql.result

+40 −0
Original line number Diff line number Diff line
@@ -83,6 +83,27 @@ b a 
3	3

3	3

DROP TABLE t1, t2, t3;

CREATE TABLE `t1` (`id1` INT) ;

INSERT INTO `t1` (`id1`) VALUES (1),(5),(2);

CREATE TABLE `t2` (

`id1` INT,

`id2` INT NOT NULL,

`id3` INT,

`id4` INT NOT NULL,

UNIQUE (`id2`,`id4`),

KEY (`id1`)

) ENGINE=InnoDB;

INSERT INTO `t2`(`id1`,`id2`,`id3`,`id4`) VALUES 

(1,1,1,0),

(1,1,2,1),

(5,1,2,2),

(6,1,2,3),

(1,2,2,2),

(1,2,1,1);

SELECT `id1` FROM `t1` WHERE `id1` NOT IN (SELECT `id1` FROM `t2` WHERE `id2` = 1 AND `id3` = 2);

id1

2

DROP TABLE t1, t2;

create table t1m (a int) engine=myisam;

create table t1i (a int) engine=innodb;

create table t2m (a int) engine=myisam;
@@ -297,3 +318,22 @@ explain select distinct f1, f2 from t1; 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	NULL	PRIMARY	5	NULL	3	Using index for group-by; Using temporary

drop table t1;

CREATE TABLE t1 (id int(11) NOT NULL PRIMARY KEY, name varchar(20),

INDEX (name)) ENGINE=InnoDB;

CREATE TABLE t2 (id int(11) NOT NULL PRIMARY KEY, fkey int(11),

FOREIGN KEY (fkey) REFERENCES t2(id)) ENGINE=InnoDB;

INSERT INTO t1 VALUES (1,'A1'),(2,'A2'),(3,'B');

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

EXPLAIN

SELECT COUNT(*) FROM t2 LEFT JOIN t1 ON t2.fkey = t1.id 

WHERE t1.name LIKE 'A%';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	PRIMARY,name	name	23	NULL	3	Using where; Using index

1	SIMPLE	t2	ref	fkey	fkey	5	test.t1.id	1	Using where; Using index

EXPLAIN

SELECT COUNT(*) FROM t2 LEFT JOIN t1 ON t2.fkey = t1.id 

WHERE t1.name LIKE 'A%' OR FALSE;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	index	NULL	fkey	5	NULL	5	Using index

1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.fkey	1	Using where

DROP TABLE t1,t2;

mysql-test/r/join_outer.result

+1 −20
Original line number Diff line number Diff line
@@ -737,7 +737,7 @@ explain select s.*, '*', m.*, (s.match_1_h - m.home) UUX from 
(t2 s left join t1 m on m.match_id = 1) 

order by m.match_id desc;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	s	ALL	NULL	NULL	NULL	NULL	10	

1	SIMPLE	s	ALL	NULL	NULL	NULL	NULL	10	Using temporary; Using filesort

1	SIMPLE	m	const	match_id,match_id_2	match_id	1	const	1	

explain select s.*, '*', m.*, (s.match_1_h - m.home) UUX from 

(t2 s left join t1 m on m.match_id = 1)
@@ -1137,25 +1137,6 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	SIMPLE	t2	ALL	PRIMARY	NULL	NULL	NULL	4	Using where

1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.a	1	

DROP TABLE t1,t2;

CREATE TABLE t1 (id int(11) NOT NULL PRIMARY KEY, name varchar(20),

INDEX (name)) ENGINE=InnoDB;

CREATE TABLE t2 (id int(11) NOT NULL PRIMARY KEY, fkey int(11),

FOREIGN KEY (fkey) REFERENCES t2(id)) ENGINE=InnoDB;

INSERT INTO t1 VALUES (1,'A1'),(2,'A2'),(3,'B');

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

EXPLAIN

SELECT COUNT(*) FROM t2 LEFT JOIN t1 ON t2.fkey = t1.id 

WHERE t1.name LIKE 'A%';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	index	PRIMARY,name	name	23	NULL	3	Using where; Using index

1	SIMPLE	t2	ref	fkey	fkey	5	test.t1.id	1	Using where; Using index

EXPLAIN

SELECT COUNT(*) FROM t2 LEFT JOIN t1 ON t2.fkey = t1.id 

WHERE t1.name LIKE 'A%' OR FALSE;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	index	NULL	fkey	5	NULL	5	Using index

1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.fkey	1	Using where

DROP TABLE t1,t2;

DROP VIEW IF EXISTS v1,v2;

DROP TABLE IF EXISTS t1,t2;

CREATE TABLE t1 (a int);