1
0
mirror of https://github.com/MariaDB/server.git synced 2025-10-12 12:25:37 +03:00

Merge 5.3->5.5

This commit is contained in:
Igor Babaev
2013-08-29 12:32:09 -07:00
5 changed files with 86 additions and 1 deletions

View File

@@ -13832,7 +13832,7 @@ internal_remove_eq_conds(THD *thd, COND *cond, Item::cond_result *cond_value)
if (!eq_cond)
return cond;
if (field->table->pos_in_table_list->outer_join)
if (field->table->pos_in_table_list->is_inner_table_of_outer_join())
{
// outer join: transform "col IS NULL" to "col IS NULL or col=0"
Item *or_cond= new(thd->mem_root) Item_cond_or(eq_cond, cond);