diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 60b9cb47946..6a2c8e17185 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1297,7 +1297,7 @@ mysql_execute_command(THD *thd)
     that is not a SHOW command or a select that only access local
     variables, but for now this is probably good enough.
   */
-  if (tables)
+  if (tables || lex->select_lex.next_select_in_list())
     mysql_reset_errors(thd);
   /*
     Save old warning count to be able to send to client how many warnings we