database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1

Browse Source 
into sanja.is.com.ua:/home/bell/mysql/work-in-4.1
This commit is contained in:
bell@sanja.is.com.ua
2003-03-11 13:26:26 +02:00
parent 1cbf8f7408 9c8838749f
commit 113dc05655
7 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/derived.result
View File

@ -146,3 +146,5 @@ SELECT 1 as a FROM (SELECT a UNION SELECT 1) b;
Unknown column 'a' in 'field list' Unknown column 'a' in 'field list'
SELECT 1 as a FROM (SELECT 1 UNION SELECT a) b; SELECT 1 as a FROM (SELECT 1 UNION SELECT a) b;
Unknown column 'a' in 'field list' Unknown column 'a' in 'field list'
select 1 from (select 2) a order by 0;
Unknown column '0' in 'order clause'

6
mysql-test/r/row.result
View File

@ -159,3 +159,9 @@ a MAX(b) (1, MAX(b)) = (1, 4)
1 4 1 1 4 1
10 43 0 10 43 0
drop table t1; drop table t1;
SELECT ROW(2,10) <=> ROW(3,4);
ROW(2,10) <=> ROW(3,4)
0
SELECT ROW(NULL,10) <=> ROW(3,NULL);
ROW(NULL,10) <=> ROW(3,NULL)
0

2
mysql-test/r/union.result
View File

@ -267,3 +267,5 @@ id select_type table type possible_keys key key_len ref rows Extra
1 PRIMARY t1 const PRIMARY PRIMARY 4 const 1 1 PRIMARY t1 const PRIMARY PRIMARY 4 const 1
2 UNION t1 ref b b 5 const 1 Using where 2 UNION t1 ref b b 5 const 1 Using where
drop table t1,t2; drop table t1,t2;
(select 1) union (select 2) order by 0;
Unknown column '0' in 'order clause'

2
mysql-test/t/derived.test
View File

@ -62,3 +62,5 @@ SELECT * FROM (SELECT 1 UNION SELECT a) b;
SELECT 1 as a FROM (SELECT a UNION SELECT 1) b; SELECT 1 as a FROM (SELECT a UNION SELECT 1) b;
--error 1054 --error 1054
SELECT 1 as a FROM (SELECT 1 UNION SELECT a) b; SELECT 1 as a FROM (SELECT 1 UNION SELECT a) b;
--error 1054
select 1 from (select 2) a order by 0;

2
mysql-test/t/row.test
View File

@ -79,3 +79,5 @@ insert into t1 values (10, 43);
insert into t1 values (1, 4); insert into t1 values (1, 4);
select a, MAX(b), (1, MAX(b)) = (1, 4) from t1 group by a; select a, MAX(b), (1, MAX(b)) = (1, 4) from t1 group by a;
drop table t1; drop table t1;
SELECT ROW(2,10) <=> ROW(3,4);
SELECT ROW(NULL,10) <=> ROW(3,NULL);

2
mysql-test/t/union.test
View File

@ -142,3 +142,5 @@ explain (select * from t1 where a=1) union (select * from t2 where a=1);
explain (select * from t1 where a=1 and b=10) union (select t1.a,t2.a from t1,t2 where t1.a=t2.a); explain (select * from t1 where a=1 and b=10) union (select t1.a,t2.a from t1,t2 where t1.a=t2.a);
explain (select * from t1 where a=1) union (select * from t1 where b=1); explain (select * from t1 where a=1) union (select * from t1 where b=1);
drop table t1,t2; drop table t1,t2;
--error 1054
(select 1) union (select 2) order by 0;

5
sql/item_cmpfunc.cc
View File

@ -266,8 +266,8 @@ int Arg_comparator::compare_e_row()
uint n= (*a)->cols(); uint n= (*a)->cols();
for (uint i= 0; i<n; i++) for (uint i= 0; i<n; i++)
{ {
if ((res= comparators[i].compare())) if ((res= !comparators[i].compare()))
return 1; return 0;
} }
return 1; return 1;
} }
@ -362,7 +362,6 @@ void Item_func_equal::fix_length_and_dec()
{ {
Item_bool_func2::fix_length_and_dec(); Item_bool_func2::fix_length_and_dec();
maybe_null=null_value=0; maybe_null=null_value=0;
set_cmp_func();
} }
longlong Item_func_equal::val_int() longlong Item_func_equal::val_int()