1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Post-review fix for bug #14927.

Browse Source
This commit is contained in:
igor@rurik.mysql.com 2006-02-02 20:37:58 -08:00
parent cc2fae5244
commit 4abab51c24
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_select.cc
View File

@ -504,6 +504,12 @@ JOIN::optimize()
{ {
Item::cond_result having_value; Item::cond_result having_value;
having= optimize_cond(thd, having, &having_value); having= optimize_cond(thd, having, &having_value);
if (thd->net.report_error)
{
error= 1;
DBUG_PRINT("error",("Error from optimize_cond"));
DBUG_RETURN(1);
}
if (cond_value == Item::COND_FALSE || having_value == Item::COND_FALSE || if (cond_value == Item::COND_FALSE || having_value == Item::COND_FALSE ||
(!unit->select_limit_cnt && !(select_options & OPTION_FOUND_ROWS))) (!unit->select_limit_cnt && !(select_options & OPTION_FOUND_ROWS)))