bk commit into 4.1 tree (evgen:1.2307) BUG#9728

[eugene]

Below is the list of changes that have just been committed into a local
4.1 repository of evgen. When evgen 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.2307 05/06/22 22:58:44 evgen@stripped +1 -0
  item.h:
    Fix for fix for bug#9728 decreased functionality in "on duplicate key update"
    Have to return false to set flag for whole expression.

  sql/item.h
    1.184 05/06/22 22:53:44 evgen@stripped +1 -1
    Fix for fix for bug#9728 decreased functionality in "on duplicate key update"
    Have to return false to set flag for whole expression.

# 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:	evgen
# Host:	moonbone.local
# Root:	/work/mysql-4.1-bug-8147

--- 1.183/sql/item.h	2005-06-22 07:15:55 +04:00
+++ 1.184/sql/item.h	2005-06-22 22:53:44 +04:00
@@ -336,7 +336,7 @@
   virtual bool set_flags_processor(byte *args)
   {
     this->item_flags|= *((uint8*)args);
-    return true;
+    return false;
   }
 };