Commit 114b600b authored by unknown's avatar unknown
Browse files

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
parents 33e54bb8 ebbe7058

sql/sql_select.cc

+5 −5
Original line number Diff line number Diff line
@@ -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);

        }

      }

    }