From: Date: July 15 2008 2:25pm
Subject: bzr push into mysql-5.1 branch (gshchepa:2699 to 2700) Bug#35577
List-Archive: http://lists.mysql.com/commits/49760
X-Bug: 35577
Message-Id: <20080715122739.CE9E740C792@localhost.localdomain>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 2700 Gleb Shchepa	2008-07-15 [merge]
      merge from local tree to 5.1-bugteam
modified:
  sql/item_cmpfunc.cc

 2699 Marc Alff	2008-07-14 [merge]
      Bug#35577, manual merge mysql-5.0-bugteam -> mysql-5.1-bugteam
added:
  mysql-test/r/parser_stack.result
  mysql-test/t/parser_stack.test
modified:
  sql/event_data_objects.cc
  sql/mysql_priv.h
  sql/sp.cc
  sql/sp_head.cc
  sql/sql_class.cc
  sql/sql_class.h
  sql/sql_lex.cc
  sql/sql_lex.h
  sql/sql_parse.cc
  sql/sql_partition.cc
  sql/sql_prepare.cc
  sql/sql_trigger.cc
  sql/sql_view.cc
  sql/sql_yacc.yy

=== modified file 'sql/item_cmpfunc.cc'
--- a/sql/item_cmpfunc.cc	2008-07-14 09:06:49 +0000
+++ b/sql/item_cmpfunc.cc	2008-07-15 12:12:08 +0000
@@ -3758,8 +3758,6 @@ longlong Item_func_in::val_int()
     return (longlong) (!null_value && tmp != negated);
   }
 
-  if ((null_value= args[0]->null_value))
-    return 0;
   have_null= 0;
   for (uint i= 1 ; i < arg_count ; i++)
   {
@@ -3769,6 +3767,8 @@ longlong Item_func_in::val_int()
     if (!(value_added_map & (1 << (uint)cmp_type)))
     {
       in_item->store_value(args[0]);
+      if ((null_value= args[0]->null_value))
+        return 0;
       value_added_map|= 1 << (uint)cmp_type;
     }
     if (!in_item->cmp(args[i]) && !args[i]->null_value)