diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 27c8ac126fa..f996ca82970 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -504,6 +504,12 @@ JOIN::optimize()
   {
     Item::cond_result 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 || 
         (!unit->select_limit_cnt && !(select_options & OPTION_FOUND_ROWS)))