Commit 7c5a417a authored by unknown's avatar unknown
Browse files

after merge fix.

parent 2ca87ae3

mysql-test/r/select.result

+17 −363
Original line number Diff line number Diff line
@@ -2811,6 +2811,23 @@ select min(key1) from t1 where key1 >= 0.3762 and rand() + 0.5 >= 0.5; 
min(key1)

0.37619999051094

DROP TABLE t1,t2;

create table t1(a bigint unsigned, b bigint);

insert into t1 values (0xfffffffffffffffff, 0xfffffffffffffffff), 

(0x10000000000000000, 0x10000000000000000), 

(0x8fffffffffffffff, 0x8fffffffffffffff);

Warnings:

Warning	1264	Out of range value adjusted for column 'a' at row 1

Warning	1264	Out of range value adjusted for column 'b' at row 1

Warning	1264	Out of range value adjusted for column 'a' at row 2

Warning	1264	Out of range value adjusted for column 'b' at row 2

Warning	1264	Out of range value adjusted for column 'b' at row 3

select hex(a), hex(b) from t1;

hex(a)	hex(b)

FFFFFFFFFFFFFFFF	7FFFFFFFFFFFFFFF

FFFFFFFFFFFFFFFF	7FFFFFFFFFFFFFFF

8FFFFFFFFFFFFFFF	7FFFFFFFFFFFFFFF

drop table t1;

End of 4.1 tests

CREATE TABLE t1 ( 

K2C4 varchar(4) character set latin1 collate latin1_bin NOT NULL default '', 

K4N4 varchar(4) character set latin1 collate latin1_bin NOT NULL default '0000',
@@ -3200,179 +3217,6 @@ select count(*) 
from t1 inner join (t2 right join t3 on t2.id = t3.b_id) on t1.id = t3.a_id;

count(*)

6

<<<<<<< gca mysql-test/r/select.result 1.34.3.40

t1	MyISAM	9	Dynamic	2	20	X	X	X	X	X	X	X	X	latin1_swedish_ci	NULL		

t11	MyISAM	9	Dynamic	0	0	X	X	X	X	X	X	X	X	latin1_swedish_ci	NULL		

select 123 as a from t1 where f1 is null;

a

drop table t1,t11;

CREATE TABLE t1 (a INT, b INT);

(SELECT a, b AS c FROM t1) ORDER BY c+1;

a	c

(SELECT a, b AS c FROM t1) ORDER BY b+1;

a	c

SELECT a, b AS c FROM t1 ORDER BY c+1;

a	c

SELECT a, b AS c FROM t1 ORDER BY b+1;

a	c

drop table t1;

CREATE TABLE t1 ( a INT NOT NULL, b INT NOT NULL, UNIQUE idx (a,b) );

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

CREATE TABLE t2 ( a INT NOT NULL, b INT NOT NULL, c INT );

INSERT INTO t2 VALUES ( 1,10,1), (1,10,2), (1,11,1), (1,11,2), (1,2,1), (1,2,2),

(1,2,3);

SELECT t2.a, t2.b, IF(t1.b IS NULL,'',c) AS c, COUNT(*) AS d FROM t2 LEFT JOIN

t1 ON t2.a = t1.a AND t2.b = t1.b GROUP BY a, b, c;

a	b	c	d

1	2	1	1

1	2	2	1

1	2	3	1

1	10		2

1	11		2

SELECT t2.a, t2.b, IF(t1.b IS NULL,'',c) AS c, COUNT(*) AS d FROM t2 LEFT JOIN

t1 ON t2.a = t1.a AND t2.b = t1.b GROUP BY t1.a, t1.b, c;

a	b	c	d

1	10		4

1	2	1	1

1	2	2	1

1	2	3	1

SELECT t2.a, t2.b, IF(t1.b IS NULL,'',c) AS c, COUNT(*) AS d FROM t2 LEFT JOIN

t1 ON t2.a = t1.a AND t2.b = t1.b GROUP BY t2.a, t2.b, c;

a	b	c	d

1	2	1	1

1	2	2	1

1	2	3	1

1	10		2

1	11		2

SELECT t2.a, t2.b, IF(t1.b IS NULL,'',c) AS c, COUNT(*) AS d FROM t2,t1

WHERE t2.a = t1.a AND t2.b = t1.b GROUP BY a, b, c;

a	b	c	d

1	2	1	1

1	2	2	1

1	2	3	1

DROP TABLE IF EXISTS t1, t2;

create table t1 (f1 int primary key, f2 int);

create table t2 (f3 int, f4 int, primary key(f3,f4));

insert into t1 values (1,1);

insert into t2 values (1,1),(1,2);

select distinct count(f2) >0 from t1 left join t2 on f1=f3 group by f1;

count(f2) >0

1

drop table t1,t2;

create table t1 (f1 int,f2 int);

insert into t1 values(1,1);

create table t2 (f3 int, f4 int, primary key(f3,f4));

insert into t2 values(1,1);

select * from t1 where f1 in (select f3 from t2 where (f3,f4)= (select f3,f4 from t2));

f1	f2

1	1

drop table t1,t2;

CREATE TABLE t1(a int, b int, c int, KEY b(b), KEY c(c));

insert into t1 values (1,0,0),(2,0,0);

CREATE TABLE t2 (a int, b varchar(2), c varchar(2), PRIMARY KEY(a));

insert into t2 values (1,'',''), (2,'','');

CREATE TABLE t3 (a int, b int, PRIMARY KEY (a,b), KEY a (a), KEY b (b));

insert into t3 values (1,1),(1,2);

explain select straight_join DISTINCT t2.a,t2.b, t1.c from t1, t3, t2 

where (t1.c=t2.a or (t1.c=t3.a and t2.a=t3.b)) and t1.b=556476786 and 

t2.b like '%%' order by t2.b limit 0,1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	b,c	b	5	const	1	Using where; Using temporary; Using filesort

1	SIMPLE	t3	index	PRIMARY,a,b	PRIMARY	8	NULL	2	Using index

1	SIMPLE	t2	ALL	PRIMARY	NULL	NULL	NULL	2	Range checked for each record (index map: 0x1)

DROP TABLE t1,t2,t3;

CREATE TABLE t1 (a int, INDEX idx(a));

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

EXPLAIN SELECT * FROM t1 IGNORE INDEX (idx);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	

EXPLAIN SELECT * FROM t1 IGNORE INDEX (a);

ERROR HY000: Key 'a' doesn't exist in table 't1'

EXPLAIN SELECT * FROM t1 FORCE INDEX (a);

ERROR HY000: Key 'a' doesn't exist in table 't1'

DROP TABLE t1;

CREATE TABLE t1 (i BIGINT UNSIGNED NOT NULL);

INSERT INTO t1 VALUES (10);

SELECT i='1e+01',i=1e+01, i in (1e+01), i in ('1e+01') FROM t1;

i='1e+01'	i=1e+01	i in (1e+01)	i in ('1e+01')

0	1	1	1

DROP TABLE t1;

CREATE TABLE t1 (a int, b int);

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

CREATE TABLE t2 (a int PRIMARY KEY, b int, KEY b (b));

INSERT INTO t2 VALUES (1,NULL), (2,10);

ALTER TABLE t1 ENABLE KEYS;

EXPLAIN SELECT STRAIGHT_JOIN SQL_NO_CACHE COUNT(*) FROM t2, t1 WHERE t1.b = t2.b OR t2.b IS NULL;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	index	b	b	5	NULL	2	Using index

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using where

SELECT STRAIGHT_JOIN SQL_NO_CACHE * FROM t2, t1 WHERE t1.b = t2.b OR t2.b IS NULL;

a	b	a	b

1	NULL	1	1

1	NULL	2	1

1	NULL	4	10

2	10	4	10

EXPLAIN SELECT STRAIGHT_JOIN SQL_NO_CACHE COUNT(*) FROM t2, t1 WHERE t1.b = t2.b OR t2.b IS NULL;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	index	b	b	5	NULL	2	Using index

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using where

SELECT STRAIGHT_JOIN SQL_NO_CACHE * FROM t2, t1 WHERE t1.b = t2.b OR t2.b IS NULL;

a	b	a	b

1	NULL	1	1

1	NULL	2	1

1	NULL	4	10

2	10	4	10

DROP TABLE IF EXISTS t1,t2;

CREATE TABLE t1 (key1 float default NULL, UNIQUE KEY key1 (key1));

CREATE TABLE t2 (key2 float default NULL, UNIQUE KEY key2 (key2));

INSERT INTO t1 VALUES (0.3762),(0.3845),(0.6158),(0.7941);

INSERT INTO t2 VALUES (1.3762),(1.3845),(1.6158),(1.7941);

explain select max(key1) from t1 where key1 <= 0.6158;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away

explain select max(key2) from t2 where key2 <= 1.6158;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away

explain select min(key1) from t1 where key1 >= 0.3762;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away

explain select min(key2) from t2 where key2 >= 1.3762;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away

explain select max(key1), min(key2) from t1, t2

where key1 <= 0.6158 and key2 >= 1.3762;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away

explain select max(key1) from t1 where key1 <= 0.6158 and rand() + 0.5 >= 0.5;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away

explain select min(key1) from t1 where key1 >= 0.3762 and rand() + 0.5 >= 0.5;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away

select max(key1) from t1 where key1 <= 0.6158;

max(key1)

0.61580002307892

select max(key2) from t2 where key2 <= 1.6158;

max(key2)

1.6158000230789

select min(key1) from t1 where key1 >= 0.3762;

min(key1)

0.37619999051094

select min(key2) from t2 where key2 >= 1.3762;

min(key2)

1.3761999607086

select max(key1), min(key2) from t1, t2

where key1 <= 0.6158 and key2 >= 1.3762;

max(key1)	min(key2)

0.61580002307892	1.3761999607086

select max(key1) from t1 where key1 <= 0.6158 and rand() + 0.5 >= 0.5;

max(key1)

0.61580002307892

select min(key1) from t1 where key1 >= 0.3762 and rand() + 0.5 >= 0.5;

min(key1)

0.37619999051094

DROP TABLE t1,t2;

<<<<<<< local mysql-test/r/select.result 1.143

drop table t1,t2,t3;

create table t1 (a int);

create table t2 (b int);
@@ -3784,193 +3628,3 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	SIMPLE	t2	range	si,ai	si	5	NULL	2	Using where

1	SIMPLE	t3	eq_ref	PRIMARY,ci	PRIMARY	4	test.t2.a	1	Using where

DROP TABLE t1,t2,t3;
 
<<<<<<< remote mysql-test/r/select.result 1.34.3.41

t1	MyISAM	9	Dynamic	2	20	X	X	X	X	X	X	X	X	latin1_swedish_ci	NULL		

t11	MyISAM	9	Dynamic	0	0	X	X	X	X	X	X	X	X	latin1_swedish_ci	NULL		

select 123 as a from t1 where f1 is null;

a

drop table t1,t11;

CREATE TABLE t1 (a INT, b INT);

(SELECT a, b AS c FROM t1) ORDER BY c+1;

a	c

(SELECT a, b AS c FROM t1) ORDER BY b+1;

a	c

SELECT a, b AS c FROM t1 ORDER BY c+1;

a	c

SELECT a, b AS c FROM t1 ORDER BY b+1;

a	c

drop table t1;

CREATE TABLE t1 ( a INT NOT NULL, b INT NOT NULL, UNIQUE idx (a,b) );

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

CREATE TABLE t2 ( a INT NOT NULL, b INT NOT NULL, c INT );

INSERT INTO t2 VALUES ( 1,10,1), (1,10,2), (1,11,1), (1,11,2), (1,2,1), (1,2,2),

(1,2,3);

SELECT t2.a, t2.b, IF(t1.b IS NULL,'',c) AS c, COUNT(*) AS d FROM t2 LEFT JOIN

t1 ON t2.a = t1.a AND t2.b = t1.b GROUP BY a, b, c;

a	b	c	d

1	2	1	1

1	2	2	1

1	2	3	1

1	10		2

1	11		2

SELECT t2.a, t2.b, IF(t1.b IS NULL,'',c) AS c, COUNT(*) AS d FROM t2 LEFT JOIN

t1 ON t2.a = t1.a AND t2.b = t1.b GROUP BY t1.a, t1.b, c;

a	b	c	d

1	10		4

1	2	1	1

1	2	2	1

1	2	3	1

SELECT t2.a, t2.b, IF(t1.b IS NULL,'',c) AS c, COUNT(*) AS d FROM t2 LEFT JOIN

t1 ON t2.a = t1.a AND t2.b = t1.b GROUP BY t2.a, t2.b, c;

a	b	c	d

1	2	1	1

1	2	2	1

1	2	3	1

1	10		2

1	11		2

SELECT t2.a, t2.b, IF(t1.b IS NULL,'',c) AS c, COUNT(*) AS d FROM t2,t1

WHERE t2.a = t1.a AND t2.b = t1.b GROUP BY a, b, c;

a	b	c	d

1	2	1	1

1	2	2	1

1	2	3	1

DROP TABLE IF EXISTS t1, t2;

create table t1 (f1 int primary key, f2 int);

create table t2 (f3 int, f4 int, primary key(f3,f4));

insert into t1 values (1,1);

insert into t2 values (1,1),(1,2);

select distinct count(f2) >0 from t1 left join t2 on f1=f3 group by f1;

count(f2) >0

1

drop table t1,t2;

create table t1 (f1 int,f2 int);

insert into t1 values(1,1);

create table t2 (f3 int, f4 int, primary key(f3,f4));

insert into t2 values(1,1);

select * from t1 where f1 in (select f3 from t2 where (f3,f4)= (select f3,f4 from t2));

f1	f2

1	1

drop table t1,t2;

CREATE TABLE t1(a int, b int, c int, KEY b(b), KEY c(c));

insert into t1 values (1,0,0),(2,0,0);

CREATE TABLE t2 (a int, b varchar(2), c varchar(2), PRIMARY KEY(a));

insert into t2 values (1,'',''), (2,'','');

CREATE TABLE t3 (a int, b int, PRIMARY KEY (a,b), KEY a (a), KEY b (b));

insert into t3 values (1,1),(1,2);

explain select straight_join DISTINCT t2.a,t2.b, t1.c from t1, t3, t2 

where (t1.c=t2.a or (t1.c=t3.a and t2.a=t3.b)) and t1.b=556476786 and 

t2.b like '%%' order by t2.b limit 0,1;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ref	b,c	b	5	const	1	Using where; Using temporary; Using filesort

1	SIMPLE	t3	index	PRIMARY,a,b	PRIMARY	8	NULL	2	Using index

1	SIMPLE	t2	ALL	PRIMARY	NULL	NULL	NULL	2	Range checked for each record (index map: 0x1)

DROP TABLE t1,t2,t3;

CREATE TABLE t1 (a int, INDEX idx(a));

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

EXPLAIN SELECT * FROM t1 IGNORE INDEX (idx);

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	

EXPLAIN SELECT * FROM t1 IGNORE INDEX (a);

ERROR HY000: Key 'a' doesn't exist in table 't1'

EXPLAIN SELECT * FROM t1 FORCE INDEX (a);

ERROR HY000: Key 'a' doesn't exist in table 't1'

DROP TABLE t1;

CREATE TABLE t1 (i BIGINT UNSIGNED NOT NULL);

INSERT INTO t1 VALUES (10);

SELECT i='1e+01',i=1e+01, i in (1e+01), i in ('1e+01') FROM t1;

i='1e+01'	i=1e+01	i in (1e+01)	i in ('1e+01')

0	1	1	1

DROP TABLE t1;

CREATE TABLE t1 (a int, b int);

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

CREATE TABLE t2 (a int PRIMARY KEY, b int, KEY b (b));

INSERT INTO t2 VALUES (1,NULL), (2,10);

ALTER TABLE t1 ENABLE KEYS;

EXPLAIN SELECT STRAIGHT_JOIN SQL_NO_CACHE COUNT(*) FROM t2, t1 WHERE t1.b = t2.b OR t2.b IS NULL;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	index	b	b	5	NULL	2	Using index

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using where

SELECT STRAIGHT_JOIN SQL_NO_CACHE * FROM t2, t1 WHERE t1.b = t2.b OR t2.b IS NULL;

a	b	a	b

1	NULL	1	1

1	NULL	2	1

1	NULL	4	10

2	10	4	10

EXPLAIN SELECT STRAIGHT_JOIN SQL_NO_CACHE COUNT(*) FROM t2, t1 WHERE t1.b = t2.b OR t2.b IS NULL;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	index	b	b	5	NULL	2	Using index

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using where

SELECT STRAIGHT_JOIN SQL_NO_CACHE * FROM t2, t1 WHERE t1.b = t2.b OR t2.b IS NULL;

a	b	a	b

1	NULL	1	1

1	NULL	2	1

1	NULL	4	10

2	10	4	10

DROP TABLE IF EXISTS t1,t2;

CREATE TABLE t1 (key1 float default NULL, UNIQUE KEY key1 (key1));

CREATE TABLE t2 (key2 float default NULL, UNIQUE KEY key2 (key2));

INSERT INTO t1 VALUES (0.3762),(0.3845),(0.6158),(0.7941);

INSERT INTO t2 VALUES (1.3762),(1.3845),(1.6158),(1.7941);

explain select max(key1) from t1 where key1 <= 0.6158;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away

explain select max(key2) from t2 where key2 <= 1.6158;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away

explain select min(key1) from t1 where key1 >= 0.3762;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away

explain select min(key2) from t2 where key2 >= 1.3762;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away

explain select max(key1), min(key2) from t1, t2

where key1 <= 0.6158 and key2 >= 1.3762;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away

explain select max(key1) from t1 where key1 <= 0.6158 and rand() + 0.5 >= 0.5;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away

explain select min(key1) from t1 where key1 >= 0.3762 and rand() + 0.5 >= 0.5;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away

select max(key1) from t1 where key1 <= 0.6158;

max(key1)

0.61580002307892

select max(key2) from t2 where key2 <= 1.6158;

max(key2)

1.6158000230789

select min(key1) from t1 where key1 >= 0.3762;

min(key1)

0.37619999051094

select min(key2) from t2 where key2 >= 1.3762;

min(key2)

1.3761999607086

select max(key1), min(key2) from t1, t2

where key1 <= 0.6158 and key2 >= 1.3762;

max(key1)	min(key2)

0.61580002307892	1.3761999607086

select max(key1) from t1 where key1 <= 0.6158 and rand() + 0.5 >= 0.5;

max(key1)

0.61580002307892

select min(key1) from t1 where key1 >= 0.3762 and rand() + 0.5 >= 0.5;

min(key1)

0.37619999051094

DROP TABLE t1,t2;

create table t1(a bigint unsigned, b bigint);

insert into t1 values (0xfffffffffffffffff, 0xfffffffffffffffff), 

(0x10000000000000000, 0x10000000000000000), 

(0x8fffffffffffffff, 0x8fffffffffffffff);

Warnings:

Warning	1264	Data truncated; out of range for column 'a' at row 1

Warning	1264	Data truncated; out of range for column 'b' at row 1

Warning	1264	Data truncated; out of range for column 'a' at row 2

Warning	1264	Data truncated; out of range for column 'b' at row 2

Warning	1264	Data truncated; out of range for column 'b' at row 3

select hex(a), hex(b) from t1;

hex(a)	hex(b)

FFFFFFFFFFFFFFFF	7FFFFFFFFFFFFFFF

FFFFFFFFFFFFFFFF	7FFFFFFFFFFFFFFF

8FFFFFFFFFFFFFFF	7FFFFFFFFFFFFFFF

drop table t1;

End of 4.1 tests

>>>>>>>

sql/item.cc

+2 −2
Original line number Diff line number Diff line
@@ -4478,10 +4478,10 @@ int Item_hex_string::save_in_field(Field *field, bool no_conversions) 
    nr= LONGLONG_MAX;

    goto warn;

  }

  return field->store((longlong) nr);

  return field->store((longlong) nr, TRUE);  // Assume hex numbers are unsigned



warn:

  if (!field->store((longlong) nr))

  if (!field->store((longlong) nr, TRUE))

    field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DATA_OUT_OF_RANGE,

                       1);

  return 1;