bk commit into 4.1 tree (igor:1.2367) BUG#12392

[igor]

Below is the list of changes that have just been committed into a local
4.1 repository of igor. When igor 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
  1.2367 05/08/08 16:51:12 igor@stripped +3 -0
  subselect.test, subselect.result:
    Added a test case for bug #12392.
  item_cmpfunc.cc:
    Fixed bug #12392.
    Missing handling of rows containing NULL components
    when evaluating IN predicates caused a crash.

  mysql-test/t/subselect.test
    1.148 05/08/08 16:50:41 igor@stripped +11 -0
    Added a test case for bug #12392.

  mysql-test/r/subselect.result
    1.168 05/08/08 16:50:12 igor@stripped +6 -0
    Added a test case for bug #12392.

  sql/item_cmpfunc.cc
    1.192 05/08/08 16:46:50 igor@stripped +2 -0
    Fixed bug #12392.
    Missing handling of rows containing NULL components
    when evaluating IN predicates caused a crash.

# 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:	igor
# Host:	rurik.mysql.com
# Root:	/home/igor/dev/mysql-4.1-0

--- 1.191/sql/item_cmpfunc.cc	Mon Jun 20 02:43:35 2005
+++ 1.192/sql/item_cmpfunc.cc	Mon Aug  8 16:46:50 2005
@@ -1551,6 +1551,8 @@
 byte *in_row::get_value(Item *item)
 {
   tmp.store_value(item);
+  if (item->is_null())
+    return 0;
   return (byte *)&tmp;
 }
 

--- 1.167/mysql-test/r/subselect.result	Sun Aug  7 12:09:07 2005
+++ 1.168/mysql-test/r/subselect.result	Mon Aug  8 16:50:12 2005
@@ -2742,3 +2742,9 @@
 5	6	N
 7	8	N
 DROP TABLE t1,t2;
+CREATE TABLE t1 (a char(5), b char(5));
+INSERT INTO t1 VALUES (NULL,'aaa'), ('aaa','aaa');
+SELECT * FROM t1 WHERE (a,b) IN (('aaa','aaa'), ('aaa','bbb'));
+a	b
+aaa	aaa
+DROP TABLE t1;

--- 1.147/mysql-test/t/subselect.test	Sun Aug  7 12:07:49 2005
+++ 1.148/mysql-test/t/subselect.test	Mon Aug  8 16:50:41 2005
@@ -1770,4 +1770,15 @@
 
 DROP TABLE t1,t2;
 
+#
+# Bug #12392: where cond with IN predicate for rows and NULL values in table 
+#
+
+CREATE TABLE t1 (a char(5), b char(5));
+INSERT INTO t1 VALUES (NULL,'aaa'), ('aaa','aaa');
+
+SELECT * FROM t1 WHERE (a,b) IN (('aaa','aaa'), ('aaa','bbb'));
+
+DROP TABLE t1;
+
 # End of 4.1 tests