bk commit into 5.1 tree (holyfoot:1.2495)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.1 repository of hf. When hf 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-03-22 23:49:44+04:00, holyfoot@hfmain.(none) +2 -0
  Merge bk@stripped:mysql-5.1
  into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
  MERGE: 1.2473.22.12

  sql/item_cmpfunc.cc@stripped, 2007-03-22 23:49:40+04:00, holyfoot@hfmain.(none) +0 -0
    Auto merged
    MERGE: 1.254.1.1

  sql/sql_yacc.yy@stripped, 2007-03-22 23:49:41+04:00, holyfoot@hfmain.(none) +0 -0
    Auto merged
    MERGE: 1.554.1.2

# 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:	holyfoot
# Host:	hfmain.(none)
# Root:	/home/hf/work/mrg/mysql-5.1-opt/RESYNC

--- 1.255/sql/item_cmpfunc.cc	2007-03-22 23:49:50 +04:00
+++ 1.256/sql/item_cmpfunc.cc	2007-03-22 23:49:50 +04:00
@@ -2458,7 +2458,8 @@ void in_decimal::set(uint pos, Item *ite
   dec->len= DECIMAL_BUFF_LENGTH;
   dec->fix_buffer_pointer();
   my_decimal *res= item->val_decimal(dec);
-  if (res != dec)
+  /* if item->val_decimal() is evaluated to NULL then res == 0 */ 
+  if (!item->null_value && res != dec)
     my_decimal2decimal(res, dec);
 }
 

--- 1.555/sql/sql_yacc.yy	2007-03-22 23:49:50 +04:00
+++ 1.556/sql/sql_yacc.yy	2007-03-22 23:49:50 +04:00
@@ -11075,7 +11075,7 @@ union_list:
 	UNION_SYM union_option
 	{
 	  LEX *lex=Lex;
-	  if (lex->exchange)
+	  if (lex->result)
 	  {
 	    /* Only the last SELECT can have  INTO...... */
 	    my_error(ER_WRONG_USAGE, MYF(0), "UNION", "INTO");