Merge remote-tracking branch 'origin/5.5' into 10.0

1 files changed, 2 insertions, 1 deletions

diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc
index d8ecdc9a2ee..a1683435708 100644
--- a/sql/opt_subselect.cc
+++ b/sql/opt_subselect.cc
@@ -5937,6 +5937,7 @@ bool JOIN::choose_tableless_subquery_plan()
           functions produce empty subquery result. There is no need to further
           rewrite the subquery because it will not be executed at all.
         */
+        exec_const_cond= 0;
         return FALSE;
       }
 
@@ -5968,6 +5969,6 @@ bool JOIN::choose_tableless_subquery_plan()
       tmp_having= having;
     }
   }
-  exec_const_cond= conds;
+  exec_const_cond= zero_result_cause ? 0 : conds;
   return FALSE;
 }