database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

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

Browse Source 
into  moonbone.local:/work/mysql-5.0-bug-7422


mysql-test/r/view.result:
  SCCS merged
mysql-test/t/view.test:
  SCCS merged
This commit is contained in:
unknown
2005-06-21 21:15:20 +04:00
parent 77514fbc50 c4257ae3ce
commit e85b001321
3 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/r/view.result
View File

@ -1726,6 +1726,20 @@ sum(a)
drop procedure p1; drop procedure p1;
drop view v1; drop view v1;
drop table t1; drop table t1;
CREATE TABLE t1(a char(2) primary key, b char(2));
CREATE TABLE t2(a char(2), b char(2), index i(a));
INSERT INTO t1 VALUES ('a','1'), ('b','2');
INSERT INTO t2 VALUES ('a','5'), ('a','6'), ('b','5'), ('b','6');
CREATE VIEW v1 AS
SELECT t1.b as c, t2.b as d FROM t1,t2 WHERE t1.a=t2.a;
SELECT d, c FROM v1 ORDER BY d;
d c
5 1
5 2
6 1
6 2
DROP VIEW v1;
DROP TABLE t1, t2;
create table t1 (s1 int); create table t1 (s1 int);
create view v1 as select sum(distinct s1) from t1; create view v1 as select sum(distinct s1) from t1;
select * from v1; select * from v1;

12
mysql-test/t/view.test
View File

@ -1569,6 +1569,18 @@ drop procedure p1;
drop view v1; drop view v1;
drop table t1; drop table t1;
#
# Bug#7422 "order by" doesn't work
#
CREATE TABLE t1(a char(2) primary key, b char(2));
CREATE TABLE t2(a char(2), b char(2), index i(a));
INSERT INTO t1 VALUES ('a','1'), ('b','2');
INSERT INTO t2 VALUES ('a','5'), ('a','6'), ('b','5'), ('b','6');
CREATE VIEW v1 AS
SELECT t1.b as c, t2.b as d FROM t1,t2 WHERE t1.a=t2.a;
SELECT d, c FROM v1 ORDER BY d;
DROP VIEW v1;
DROP TABLE t1, t2;
# #
# using sum(distinct ) & avg(distinct ) in views (BUG#7015) # using sum(distinct ) & avg(distinct ) in views (BUG#7015)
# #

10
sql/filesort.cc
View File

@ -631,7 +631,7 @@ static void make_sortkey(register SORTPARAM *param,
*to++=1; *to++=1;
/* All item->str() to use some extra byte for end null.. */ /* All item->str() to use some extra byte for end null.. */
String tmp((char*) to,sort_field->length+4,cs); String tmp((char*) to,sort_field->length+4,cs);
String *res=item->val_str(&tmp); String *res= item->str_result(&tmp);
if (!res) if (!res)
{ {
if (maybe_null) if (maybe_null)
@ -673,8 +673,8 @@ static void make_sortkey(register SORTPARAM *param,
} }
case INT_RESULT: case INT_RESULT:
{ {
longlong value=item->val_int(); longlong value= item->val_int_result();
if (maybe_null) if (maybe_null)
{ {
*to++=1; /* purecov: inspected */ *to++=1; /* purecov: inspected */
if (item->null_value) if (item->null_value)
@ -715,7 +715,7 @@ static void make_sortkey(register SORTPARAM *param,
} }
case DECIMAL_RESULT: case DECIMAL_RESULT:
{ {
my_decimal dec_buf, *dec_val= item->val_decimal(&dec_buf); my_decimal dec_buf, *dec_val= item->val_decimal_result(&dec_buf);
if (maybe_null) if (maybe_null)
{ {
if (item->null_value) if (item->null_value)
@ -733,7 +733,7 @@ static void make_sortkey(register SORTPARAM *param,
} }
case REAL_RESULT: case REAL_RESULT:
{ {
double value= item->val_real(); double value= item->val_result();
if (maybe_null) if (maybe_null)
{ {
if (item->null_value) if (item->null_value)