Commit 5d695b77 authored by evgen@moonbone.local's avatar evgen@moonbone.local
Browse files

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  moonbone.local:/mnt/gentoo64/work/test-5.0-opt-mysql
parents 8fd809bf 7dbe9d33

mysql-test/r/user_var.result

+23 −2
Original line number Diff line number Diff line
@@ -317,8 +317,11 @@ SHOW COUNT(*) WARNINGS; 
SHOW COUNT(*) ERRORS;

@@session.error_count

1

create table t1(f1 int);

insert into t1 values(1),(1),(2),(3),(4),(1),(3),(1);

create table t1(f1 int, f2 varchar(2), f3 float, f4 decimal(2,1));

insert into t1 values 

(1, "a", 1.5, 1.6), (1, "a", 1.5, 1.6), (2, "b", 2.5, 2.6),

(3, "c", 3.5, 3.6), (4, "d", 4.5, 4.6), (1, "a", 1.5, 1.6),

(3, "c", 3.5, 3.6), (1, "a", 1.5, 1.6);

select @a:=f1, count(f1) from t1 group by 1 desc;

@a:=f1	count(f1)

4	1
@@ -331,4 +334,22 @@ select @a:=f1, count(f1) from t1 group by 1 asc; 
2	1

3	2

4	1

select @a:=f2, count(f2) from t1 group by 1 desc;

@a:=f2	count(f2)

a	4

b	1

c	2

d	1

select @a:=f3, count(f3) from t1 group by 1 desc;

@a:=f3	count(f3)

1.5	4

2.5	1

3.5	2

4.5	1

select @a:=f4, count(f4) from t1 group by 1 desc;

@a:=f4	count(f4)

4.6	1

3.6	2

2.6	1

1.6	4

drop table t1;

mysql-test/t/user_var.test

+8 −2
Original line number Diff line number Diff line
@@ -226,8 +226,14 @@ SHOW COUNT(*) ERRORS; 
#

# Bug#28494: Grouping by Item_func_set_user_var produces incorrect result.

#

create table t1(f1 int);

insert into t1 values(1),(1),(2),(3),(4),(1),(3),(1);

create table t1(f1 int, f2 varchar(2), f3 float, f4 decimal(2,1));

insert into t1 values 

  (1, "a", 1.5, 1.6), (1, "a", 1.5, 1.6), (2, "b", 2.5, 2.6),

  (3, "c", 3.5, 3.6), (4, "d", 4.5, 4.6), (1, "a", 1.5, 1.6),

  (3, "c", 3.5, 3.6), (1, "a", 1.5, 1.6);

select @a:=f1, count(f1) from t1 group by 1 desc;

select @a:=f1, count(f1) from t1 group by 1 asc;

select @a:=f2, count(f2) from t1 group by 1 desc;

select @a:=f3, count(f3) from t1 group by 1 desc;

select @a:=f4, count(f4) from t1 group by 1 desc;

drop table t1;