Bug#36035041: the fix for bug110801 on 8.0.35 is incomplete

roylyseng · dahlerlend · commit 8964d2619fcf · 2023-12-08T08:39:39.000+01:00
The fix for bug#35328028/110801 was successfully pushed to 8.2,
however the push to 8.0.35 was incomplete.

This patch fixes this problem by pushing the remaining part of the fix,
including the test case, to 8.0.

Change-Id: I2e17e1055e872a936d05c70aaaab0fb61935de0e
diff --git a/sql/sp_instr.cc b/sql/sp_instr.cc
@@ -762,13 +762,6 @@ bool sp_lex_instr::validate_lex_and_execute_core(THD *thd, uint *nextp,
     */
     if (stmt_reprepare_observer == nullptr || thd->is_fatal_error() ||
         thd->killed || thd->get_stmt_da()->mysql_errno() != ER_NEED_REPREPARE) {
-      /*
-        If an error occurred before execution, make sure next execution is
-        started with a clean statement:
-      */
-      if (m_lex->is_metadata_used() && !m_lex->is_exec_started()) {
-        invalidate();
-      }
       return true;
     }
     /*
