Commit 4c318bf6 authored by Georgi Kodinov's avatar Georgi Kodinov
Browse files

merge 5.0-bugteam -> 5.1-bugteam

parents da2d3e3f 0e3bc47f

mysql-test/r/group_min_max.result

+76 −0
Original line number Diff line number Diff line
@@ -2372,3 +2372,79 @@ a MIN(b) MAX(b) AVG(b) 
2	1	3	2.0000

1	1	3	2.0000

DROP TABLE t1;

create table t1 (a int, b int, primary key (a,b), key `index` (a,b)) engine=MyISAM;

insert into  t1 (a,b) values 

(0,0),(0,1),(0,2),(0,3),(0,4),(0,5),(0,6),

(0,7),(0,8),(0,9),(0,10),(0,11),(0,12),(0,13),

(1,0),(1,1),(1,2),(1,3),(1,4),(1,5),(1,6),

(1,7),(1,8),(1,9),(1,10),(1,11),(1,12),(1,13),

(2,0),(2,1),(2,2),(2,3),(2,4),(2,5),(2,6),

(2,7),(2,8),(2,9),(2,10),(2,11),(2,12),(2,13),

(3,0),(3,1),(3,2),(3,3),(3,4),(3,5),(3,6),

(3,7),(3,8),(3,9),(3,10),(3,11),(3,12),(3,13);

insert into t1 (a,b) select a, max(b)+1 from t1 where a = 0 group by a;

select * from t1;

a	b

0	0

0	1

0	2

0	3

0	4

0	5

0	6

0	7

0	8

0	9

0	10

0	11

0	12

0	13

0	14

1	0

1	1

1	2

1	3

1	4

1	5

1	6

1	7

1	8

1	9

1	10

1	11

1	12

1	13

2	0

2	1

2	2

2	3

2	4

2	5

2	6

2	7

2	8

2	9

2	10

2	11

2	12

2	13

3	0

3	1

3	2

3	3

3	4

3	5

3	6

3	7

3	8

3	9

3	10

3	11

3	12

3	13

explain extended select sql_buffer_result a, max(b)+1 from t1 where a = 0 group by a;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra

1	SIMPLE	t1	range	PRIMARY,index	PRIMARY	4	NULL	3	100.00	Using where; Using index for group-by; Using temporary

Warnings:

Note	1003	select sql_buffer_result `test`.`t1`.`a` AS `a`,(max(`test`.`t1`.`b`) + 1) AS `max(b)+1` from `test`.`t1` where (`test`.`t1`.`a` = 0) group by `test`.`t1`.`a`

drop table t1;

mysql-test/r/type_bit.result

+24 −0
Original line number Diff line number Diff line
@@ -684,6 +684,30 @@ SELECT 1 FROM t1 GROUP BY a; 
1

1

DROP TABLE t1;

CREATE TABLE t1 (b BIT NOT NULL, i2 INTEGER NOT NULL, s VARCHAR(255) NOT NULL);

INSERT INTO t1 VALUES(0x01,100,''), (0x00,300,''), (0x01,200,''), (0x00,100,'');

SELECT HEX(b), i2 FROM t1 WHERE (i2>=100 AND i2<201) AND b=TRUE;

HEX(b)	i2

1	100

1	200

CREATE TABLE t2 (b1 BIT NOT NULL, b2 BIT NOT NULL, i2 INTEGER NOT NULL,

s VARCHAR(255) NOT NULL);

INSERT INTO t2 VALUES (0x01,0x00,100,''), (0x00,0x01,300,''),

(0x01,0x00,200,''), (0x00,0x01,100,'');

SELECT HEX(b1), i2 FROM t2 WHERE (i2>=100 AND i2<201) AND b1=TRUE;

HEX(b1)	i2

1	100

1	200

SELECT HEX(b2), i2 FROM t2 WHERE (i2>=100 AND i2<201) AND b2=FALSE;

HEX(b2)	i2

0	100

0	200

SELECT HEX(b1), HEX(b2), i2 FROM t2

WHERE (i2>=100 AND i2<201) AND b1=TRUE AND b2=FALSE;

HEX(b1)	HEX(b2)	i2

1	0	100

1	0	200

DROP TABLE t1, t2;

End of 5.0 tests

create table t1(a bit(7));

insert into t1 values(0x40);

mysql-test/t/group_min_max.test

+19 −0
Original line number Diff line number Diff line
@@ -942,3 +942,22 @@ SELECT a, MIN(b), MAX(b), AVG(b) FROM t1 GROUP BY a ORDER BY a DESC; 
SELECT a, MIN(b), MAX(b), AVG(b) FROM t1 GROUP BY a ORDER BY a DESC;



DROP TABLE t1;



#

# Bug#38195: Incorrect handling of aggregate functions when loose index scan is

#            used causes server crash.

#

create table t1 (a int, b int, primary key (a,b), key `index` (a,b)) engine=MyISAM;

insert into  t1 (a,b) values 

(0,0),(0,1),(0,2),(0,3),(0,4),(0,5),(0,6),

  (0,7),(0,8),(0,9),(0,10),(0,11),(0,12),(0,13),

(1,0),(1,1),(1,2),(1,3),(1,4),(1,5),(1,6),

  (1,7),(1,8),(1,9),(1,10),(1,11),(1,12),(1,13),

(2,0),(2,1),(2,2),(2,3),(2,4),(2,5),(2,6),

  (2,7),(2,8),(2,9),(2,10),(2,11),(2,12),(2,13),

(3,0),(3,1),(3,2),(3,3),(3,4),(3,5),(3,6),

  (3,7),(3,8),(3,9),(3,10),(3,11),(3,12),(3,13);

insert into t1 (a,b) select a, max(b)+1 from t1 where a = 0 group by a;

select * from t1;

explain extended select sql_buffer_result a, max(b)+1 from t1 where a = 0 group by a;

drop table t1;

mysql-test/t/type_bit.test

+19 −0
Original line number Diff line number Diff line
@@ -333,6 +333,25 @@ SELECT 1 FROM t1 GROUP BY a; 


DROP TABLE t1;



#

# Bug#37799 SELECT with a BIT column in WHERE clause returns unexpected result

#



CREATE TABLE t1 (b BIT NOT NULL, i2 INTEGER NOT NULL, s VARCHAR(255) NOT NULL);

INSERT INTO t1 VALUES(0x01,100,''), (0x00,300,''), (0x01,200,''), (0x00,100,'');

SELECT HEX(b), i2 FROM t1 WHERE (i2>=100 AND i2<201) AND b=TRUE;



CREATE TABLE t2 (b1 BIT NOT NULL, b2 BIT NOT NULL, i2 INTEGER NOT NULL,

                 s VARCHAR(255) NOT NULL);

INSERT INTO t2 VALUES (0x01,0x00,100,''), (0x00,0x01,300,''),

                      (0x01,0x00,200,''), (0x00,0x01,100,'');

SELECT HEX(b1), i2 FROM t2 WHERE (i2>=100 AND i2<201) AND b1=TRUE;

SELECT HEX(b2), i2 FROM t2 WHERE (i2>=100 AND i2<201) AND b2=FALSE;

SELECT HEX(b1), HEX(b2), i2 FROM t2

       WHERE (i2>=100 AND i2<201) AND b1=TRUE AND b2=FALSE;



DROP TABLE t1, t2;



--echo End of 5.0 tests



#

sql/field.h

+1 −2
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ class Field 
  virtual bool eq(Field *field)

  {

    return (ptr == field->ptr && null_ptr == field->null_ptr &&

            null_bit == field->null_bit);

            null_bit == field->null_bit && field->type() == type());

  }

  virtual bool eq_def(Field *field);
@@ -1960,7 +1960,6 @@ class Field_bit :public Field { 
  bool eq(Field *field)

  {

    return (Field::eq(field) &&

            field->type() == type() &&

            bit_ptr == ((Field_bit *)field)->bit_ptr &&

            bit_ofs == ((Field_bit *)field)->bit_ofs);

  }