database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge moonbone.local:/mnt/gentoo64/work/22331-bug-5.0-opt-mysql

Browse Source 
into  moonbone.local:/mnt/gentoo64/work/25373-bug-5.0-opt-mysql
This commit is contained in:
evgen@moonbone.local
2007-03-07 22:22:19 +03:00
parent b81b814cd1 7afa5f1c5a
commit c4fc9c5ef9
8 changed files with 74 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sql/sql_select.cc
View File

@ -749,7 +749,6 @@ JOIN::optimize()
}
{
Item::cond_result having_value;
having= optimize_cond(this, having, join_list, &having_value);
if (thd->net.report_error)
{
@ -757,6 +756,10 @@ JOIN::optimize()
DBUG_PRINT("error",("Error from optimize_cond"));
DBUG_RETURN(1);
}
if (select_lex->where)
select_lex->cond_value= cond_value;
if (select_lex->having)
select_lex->having_value= having_value;
if (cond_value == Item::COND_FALSE || having_value == Item::COND_FALSE ||
(!unit->select_limit_cnt && !(select_options & OPTION_FOUND_ROWS)))
@ -897,6 +900,7 @@ JOIN::optimize()
conds->update_used_tables();
DBUG_EXECUTE("where", print_where(conds, "after substitute_best_equal"););
}
/*
Permorm the the optimization on fields evaluation mentioned above
for all on expressions.
@ -7606,6 +7610,9 @@ static COND* substitute_for_best_equal_field(COND *cond,
break;
}
}
if (!((Item_cond*)cond)->argument_list()->elements)
cond= new Item_int(cond->val_bool());
}
else if (cond->type() == Item::FUNC_ITEM &&
((Item_cond*) cond)->functype() == Item_func::MULT_EQUAL_FUNC)
@ -15324,10 +15331,13 @@ void st_select_lex::print(THD *thd, String *str)
Item *cur_where= where;
if (join)
cur_where= join->conds;
if (cur_where)
if (cur_where || cond_value != Item::COND_UNDEF)
{
str->append(STRING_WITH_LEN(" where "));
cur_where->print(str);
if (cur_where)
cur_where->print(str);
else
str->append(cond_value != Item::COND_FALSE ? "1" : "0");
}
// group by & olap
@ -15353,10 +15363,13 @@ void st_select_lex::print(THD *thd, String *str)
if (join)
cur_having= join->having;
if (cur_having)
if (cur_having || having_value != Item::COND_UNDEF)
{
str->append(STRING_WITH_LEN(" having "));
cur_having->print(str);
if (cur_having)
cur_having->print(str);
else
str->append(having_value != Item::COND_FALSE ? "1" : "0");
}
if (order_list.elements)