Below is the list of changes that have just been committed into a local
5.0 repository of uchum. When uchum does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-04-19 17:20:05+05:00, gshchepa@stripped +4 -0
Merge gshchepa.loc:/home/uchum/work/bk-trees/mysql-4.1-opt-27704
into gshchepa.loc:/home/uchum/work/bk-trees/mysql-5.0-opt-27704
MERGE: 1.1616.2877.80
mysql-test/r/row.result@stripped, 2007-04-19 17:17:30+05:00, gshchepa@stripped +85 -86
Test case updated for Bug#27704: incorrect
comparison of rows with NULL components.
MERGE: 1.18.1.2
mysql-test/r/subselect.result@stripped, 2007-04-19 17:16:57+05:00, gshchepa@stripped +0 -2
Auto merged
MERGE: 1.67.1.121
mysql-test/t/row.test@stripped, 2007-04-19 17:16:57+05:00, gshchepa@stripped +0 -0
Auto merged
MERGE: 1.16.1.3
sql/item_cmpfunc.cc@stripped, 2007-04-19 17:19:14+05:00, gshchepa@stripped +4 -23
Bug#27704: incorrect comparison of rows with NULL components
MERGE: 1.111.23.19
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: gshchepa
# Host: gshchepa.loc
# Root: /home/uchum/work/bk-trees/mysql-5.0-opt-27704/RESYNC
--- 1.244/sql/item_cmpfunc.cc 2007-04-12 00:45:25 +05:00
+++ 1.245/sql/item_cmpfunc.cc 2007-04-19 17:19:14 +05:00
@@ -811,8 +811,18 @@ int Arg_comparator::compare_row()
if (owner->null_value)
{
// NULL was compared
- if (owner->abort_on_null)
- return -1; // We do not need correct NULL returning
+ switch (owner->functype()) {
+ case Item_func::NE_FUNC:
+ break;
+ case Item_func::LT_FUNC:
+ case Item_func::LE_FUNC:
+ case Item_func::GT_FUNC:
+ case Item_func::GE_FUNC:
+ return -1;
+ default:
+ if (owner->abort_on_null)
+ return -1; // We do not need correct NULL returning
+ }
was_null= 1;
owner->null_value= 0;
res= 0; // continue comparison (maybe we will meet explicit difference)
--- 1.27/mysql-test/r/row.result 2007-04-12 00:45:25 +05:00
+++ 1.28/mysql-test/r/row.result 2007-04-19 17:17:30 +05:00
@@ -68,21 +68,51 @@ ROW(2,2,3)=ROW(1+1,2,3)
SELECT ROW(1,2,3)=ROW(1+1,2,3);
ROW(1,2,3)=ROW(1+1,2,3)
0
+SELECT ROW(1,2,3)<ROW(1,2,3);
+ROW(1,2,3)<ROW(1,2,3)
+0
SELECT ROW(1,2,3)<ROW(1+1,2,3);
ROW(1,2,3)<ROW(1+1,2,3)
1
+SELECT ROW(1,2,3)<ROW(1,2+1,3);
+ROW(1,2,3)<ROW(1,2+1,3)
+1
+SELECT ROW(1,2,3)>ROW(1,2,3);
+ROW(1,2,3)>ROW(1,2,3)
+0
SELECT ROW(1,2,3)>ROW(1+1,2,3);
ROW(1,2,3)>ROW(1+1,2,3)
0
+SELECT ROW(1,2,3)>ROW(1,2+1,3);
+ROW(1,2,3)>ROW(1,2+1,3)
+0
+SELECT ROW(1,2,3)<=ROW(1,2,3);
+ROW(1,2,3)<=ROW(1,2,3)
+1
SELECT ROW(1,2,3)<=ROW(1+1,2,3);
ROW(1,2,3)<=ROW(1+1,2,3)
1
+SELECT ROW(1,2,3)<=ROW(1,2+1,3);
+ROW(1,2,3)<=ROW(1,2+1,3)
+1
+SELECT ROW(1,2,3)>=ROW(1,2,3);
+ROW(1,2,3)>=ROW(1,2,3)
+1
SELECT ROW(1,2,3)>=ROW(1+1,2,3);
ROW(1,2,3)>=ROW(1+1,2,3)
0
+SELECT ROW(1,2,3)>=ROW(1,2+1,3);
+ROW(1,2,3)>=ROW(1,2+1,3)
+0
+SELECT ROW(1,2,3)<>ROW(1,2,3);
+ROW(1,2,3)<>ROW(1,2,3)
+0
SELECT ROW(1,2,3)<>ROW(1+1,2,3);
ROW(1,2,3)<>ROW(1+1,2,3)
1
+SELECT ROW(1,2,3)<>ROW(1,2+1,3);
+ROW(1,2,3)<>ROW(1,2+1,3)
+1
SELECT ROW(NULL,2,3)=ROW(NULL,2,3);
ROW(NULL,2,3)=ROW(NULL,2,3)
NULL
@@ -336,4 +366,89 @@ SET @x:= (SELECT h FROM t1 WHERE (a,b,c,
SELECT @x;
@x
99
+DROP TABLE t1;
+CREATE TABLE t1(a int, b int, c int);
+INSERT INTO t1 VALUES (1, 2, 3),
+(NULL, 2, 3 ), (1, NULL, 3 ), (1, 2, NULL),
+(NULL, 2, 3+1), (1, NULL, 3+1), (1, 2+1, NULL),
+(NULL, 2, 3-1), (1, NULL, 3-1), (1, 2-1, NULL);
+SELECT (1,2,3) <> (1, NULL, 3);
+(1,2,3) <> (1, NULL, 3)
+NULL
+SELECT (1,2,3) <> (1+1, NULL, 3);
+(1,2,3) <> (1+1, NULL, 3)
+1
+SELECT (1,2,3) <> (1, NULL, 3+1);
+(1,2,3) <> (1, NULL, 3+1)
+1
+SELECT * FROM t1 WHERE (a,b,c) <> (1,2,3);
+a b c
+NULL 2 4
+1 NULL 4
+1 3 NULL
+NULL 2 2
+1 NULL 2
+1 1 NULL
+SELECT (1,2,3) < (NULL, 2, 3);
+(1,2,3) < (NULL, 2, 3)
+NULL
+SELECT (1,2,3) < (1, NULL, 3);
+(1,2,3) < (1, NULL, 3)
+NULL
+SELECT (1,2,3) < (1-1, NULL, 3);
+(1,2,3) < (1-1, NULL, 3)
+0
+SELECT (1,2,3) < (1+1, NULL, 3);
+(1,2,3) < (1+1, NULL, 3)
+1
+SELECT * FROM t1 WHERE (a,b,c) < (1,2,3);
+a b c
+1 1 NULL
+SELECT (1,2,3) <= (NULL, 2, 3);
+(1,2,3) <= (NULL, 2, 3)
+NULL
+SELECT (1,2,3) <= (1, NULL, 3);
+(1,2,3) <= (1, NULL, 3)
+NULL
+SELECT (1,2,3) <= (1-1, NULL, 3);
+(1,2,3) <= (1-1, NULL, 3)
+0
+SELECT (1,2,3) <= (1+1, NULL, 3);
+(1,2,3) <= (1+1, NULL, 3)
+1
+SELECT * FROM t1 WHERE (a,b,c) <= (1,2,3);
+a b c
+1 2 3
+1 1 NULL
+SELECT (1,2,3) > (NULL, 2, 3);
+(1,2,3) > (NULL, 2, 3)
+NULL
+SELECT (1,2,3) > (1, NULL, 3);
+(1,2,3) > (1, NULL, 3)
+NULL
+SELECT (1,2,3) > (1-1, NULL, 3);
+(1,2,3) > (1-1, NULL, 3)
+1
+SELECT (1,2,3) > (1+1, NULL, 3);
+(1,2,3) > (1+1, NULL, 3)
+0
+SELECT * FROM t1 WHERE (a,b,c) > (1,2,3);
+a b c
+1 3 NULL
+SELECT (1,2,3) >= (NULL, 2, 3);
+(1,2,3) >= (NULL, 2, 3)
+NULL
+SELECT (1,2,3) >= (1, NULL, 3);
+(1,2,3) >= (1, NULL, 3)
+NULL
+SELECT (1,2,3) >= (1-1, NULL, 3);
+(1,2,3) >= (1-1, NULL, 3)
+1
+SELECT (1,2,3) >= (1+1, NULL, 3);
+(1,2,3) >= (1+1, NULL, 3)
+0
+SELECT * FROM t1 WHERE (a,b,c) >= (1,2,3);
+a b c
+1 2 3
+1 3 NULL
DROP TABLE t1;
--- 1.23/mysql-test/t/row.test 2007-04-11 23:44:08 +05:00
+++ 1.24/mysql-test/t/row.test 2007-04-19 17:16:57 +05:00
@@ -30,11 +30,21 @@ SELECT (1,2,3)=(1,NULL,0);
SELECT ROW(1,2,3)=ROW(1,2,3);
SELECT ROW(2,2,3)=ROW(1+1,2,3);
SELECT ROW(1,2,3)=ROW(1+1,2,3);
+SELECT ROW(1,2,3)<ROW(1,2,3);
SELECT ROW(1,2,3)<ROW(1+1,2,3);
+SELECT ROW(1,2,3)<ROW(1,2+1,3);
+SELECT ROW(1,2,3)>ROW(1,2,3);
SELECT ROW(1,2,3)>ROW(1+1,2,3);
+SELECT ROW(1,2,3)>ROW(1,2+1,3);
+SELECT ROW(1,2,3)<=ROW(1,2,3);
SELECT ROW(1,2,3)<=ROW(1+1,2,3);
+SELECT ROW(1,2,3)<=ROW(1,2+1,3);
+SELECT ROW(1,2,3)>=ROW(1,2,3);
SELECT ROW(1,2,3)>=ROW(1+1,2,3);
+SELECT ROW(1,2,3)>=ROW(1,2+1,3);
+SELECT ROW(1,2,3)<>ROW(1,2,3);
SELECT ROW(1,2,3)<>ROW(1+1,2,3);
+SELECT ROW(1,2,3)<>ROW(1,2+1,3);
SELECT ROW(NULL,2,3)=ROW(NULL,2,3);
SELECT ROW(NULL,2,3)<=>ROW(NULL,2,3);
SELECT ROW(1,2,ROW(3,4,5))=ROW(1,2,ROW(3,4,5));
@@ -109,6 +119,47 @@ SELECT ROW(1,ROW(2,3)) IN ((SELECT 1,1),
SELECT ROW(2,1) IN (ROW(21,2),ROW(ROW(1,1,3),0));
--error 1241
SELECT ROW(2,1) IN (ROW(ROW(1,1,3),0),ROW(21,2));
+
+#
+# Bug#27704: erroneous comparison of rows with NULL components
+#
+
+CREATE TABLE t1(a int, b int, c int);
+INSERT INTO t1 VALUES (1, 2, 3),
+ (NULL, 2, 3 ), (1, NULL, 3 ), (1, 2, NULL),
+ (NULL, 2, 3+1), (1, NULL, 3+1), (1, 2+1, NULL),
+ (NULL, 2, 3-1), (1, NULL, 3-1), (1, 2-1, NULL);
+
+SELECT (1,2,3) <> (1, NULL, 3);
+SELECT (1,2,3) <> (1+1, NULL, 3);
+SELECT (1,2,3) <> (1, NULL, 3+1);
+SELECT * FROM t1 WHERE (a,b,c) <> (1,2,3);
+
+SELECT (1,2,3) < (NULL, 2, 3);
+SELECT (1,2,3) < (1, NULL, 3);
+SELECT (1,2,3) < (1-1, NULL, 3);
+SELECT (1,2,3) < (1+1, NULL, 3);
+SELECT * FROM t1 WHERE (a,b,c) < (1,2,3);
+
+SELECT (1,2,3) <= (NULL, 2, 3);
+SELECT (1,2,3) <= (1, NULL, 3);
+SELECT (1,2,3) <= (1-1, NULL, 3);
+SELECT (1,2,3) <= (1+1, NULL, 3);
+SELECT * FROM t1 WHERE (a,b,c) <= (1,2,3);
+
+SELECT (1,2,3) > (NULL, 2, 3);
+SELECT (1,2,3) > (1, NULL, 3);
+SELECT (1,2,3) > (1-1, NULL, 3);
+SELECT (1,2,3) > (1+1, NULL, 3);
+SELECT * FROM t1 WHERE (a,b,c) > (1,2,3);
+
+SELECT (1,2,3) >= (NULL, 2, 3);
+SELECT (1,2,3) >= (1, NULL, 3);
+SELECT (1,2,3) >= (1-1, NULL, 3);
+SELECT (1,2,3) >= (1+1, NULL, 3);
+SELECT * FROM t1 WHERE (a,b,c) >= (1,2,3);
+
+DROP TABLE t1;
# End of 4.1 tests
| Thread |
|---|
| • bk commit into 5.0 tree (gshchepa:1.2457) | gshchepa | 19 Apr |
