Merge mysql.com:/home/psergey/mysql-4.1-bug8877

into mysql.com:/home/psergey/mysql-5.0-bug8877-merge


sql/sql_select.cc:
  Auto merged

1 files changed, 5 insertions, 5 deletions

diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 09fb0b3c5ae..339939dcb93 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -5171,14 +5171,14 @@ static void add_not_null_conds(JOIN *join)
           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);
         }
       }
     }