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

Fixes after manual merge

Browse Source
This commit is contained in:
unknown
2006-02-02 23:56:08 -08:00
parent 8300149963
commit ac21d0294d
3 changed files with 7 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_select.cc
View File

@ -628,7 +628,7 @@ JOIN::optimize()
{
Item::cond_result having_value;
having= optimize_cond(thd, having, &having_value);
having= optimize_cond(this, having, join_list, &having_value);
if (thd->net.report_error)
{
error= 1;
@ -641,7 +641,7 @@ JOIN::optimize()
{ /* Impossible cond */
DBUG_PRINT("info", (having_value == Item::COND_FALSE ?
"Impossible HAVING" : "Impossible WHERE"));
zero_result_cause= ?
zero_result_cause= having_value == Item::COND_FALSE ?
"Impossible HAVING" : "Impossible WHERE";
error= 0;
DBUG_RETURN(0);