bzr push into mysql-6.0 branch (gshchepa:2716 to 2717)

[Gleb Shchepa]

 2717 Gleb Shchepa	2008-07-15 [merge]
      merge from local tree into 6.0-bugteam
modified:
  sql/item_cmpfunc.cc

 2716 Gleb Shchepa	2008-07-14 [merge]
      merge 5.1-bugteam --> 6.0-bugteam
modified:
  mysql-test/r/func_in.result
  mysql-test/t/func_in.test
  sql/item_cmpfunc.cc

=== modified file 'sql/item_cmpfunc.cc'
--- a/sql/item_cmpfunc.cc	2008-07-14 09:11:23 +0000
+++ b/sql/item_cmpfunc.cc	2008-07-15 12:17:01 +0000
@@ -3822,8 +3822,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++)
   {
@@ -3833,6 +3831,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)