Post-review fix for bug #14927.

4abab51c · igor@rurik.mysql.com · cc2fae52 · 4abab51c
Commit 4abab51c authored Feb 02, 2006 by igor@rurik.mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

sql/sql_select.cc sql/sql_select.cc +6 -0

No files found.
--- 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)))