database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

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

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


sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown
2005-04-07 17:46:08 +04:00
parent 33e54bb815 ebbe70585a
commit 114b600b68
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_select.cc
View File

@@ -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);
}
}
}