bk commit into 5.0 tree (sergefp:1.1869)

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.0 repository of psergey. When psergey 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.1869 05/04/07 17:46:08 sergefp@stripped +1 -0
  Merge mysql.com:/home/psergey/mysql-4.1-bug8877
  into mysql.com:/home/psergey/mysql-5.0-bug8877-merge

  sql/sql_select.cc
    1.311 05/04/07 17:46:07 sergefp@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:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-5.0-bug8877-merge/RESYNC

--- 1.310/sql/sql_select.cc	2005-04-07 17:42:27 +04:00
+++ 1.311/sql/sql_select.cc	2005-04-07 17:46:07 +04:00
@@ -5171,14 +5171,14 @@
           DBUG_ASSERT(item->type() == Item::FIELD_ITEM);
           Item_field *not_null_item= (Item_field*)item;
           JOIN_TAB *referred_tab= not_null_item->field->table->reginfo.join_tab;
-          Item_func_isnotnull *null_rej;
-          if (!(null_rej= new Item_func_isnotnull(not_null_item)))
+          Item_func_isnotnull *notnull;
+          if (!(notnull= new Item_func_isnotnull(not_null_item)))
             DBUG_VOID_RETURN;
 
-          null_rej->quick_fix_field();
-          DBUG_EXECUTE("where",print_where(null_rej,
+          notnull->quick_fix_field();
+          DBUG_EXECUTE("where",print_where(notnull,
                                            referred_tab->table->alias););
-          add_cond_and_fix(&referred_tab->select_cond, null_rej);
+          add_cond_and_fix(&referred_tab->select_cond, notnull);
         }
       }
     }