bk commit into 5.0 tree (evgen:1.2080)

[eugene]

Below is the list of changes that have just been committed into a local
5.0 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.2080 06/03/09 14:07:34 evgen@stripped +1 -0
  Merge epotemkin@stripped:/home/bk/mysql-5.0
  into moonbone.local:/work/17726-bug-5.0-mysql

  sql/item_cmpfunc.cc
    1.194 06/03/09 14:07:32 evgen@stripped +0 -0
    Auto merged

# 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/17726-bug-5.0-mysql/RESYNC

--- 1.193/sql/item_cmpfunc.cc	2006-03-03 14:28:16 +03:00
+++ 1.194/sql/item_cmpfunc.cc	2006-03-09 14:07:32 +03:00
@@ -2547,7 +2547,8 @@
   {
     table_map tmp_table_map;
     while (item->type() == Item::COND_ITEM &&
-	   ((Item_cond*) item)->functype() == functype())
+	   ((Item_cond*) item)->functype() == functype() &&
+           !((Item_cond*) item)->list.is_empty())
     {						// Identical function
       li.replace(((Item_cond*) item)->list);
       ((Item_cond*) item)->list.empty();