Merge branch '11.7' into 11.8

sql/sql_lex.h

@@ -3141,6 +3141,13 @@ public:
   /* Query Plan Footprint of a currently running select  */
   Explain_query *explain;
 
+  /*
+    If true, query optimizer has encountered an unrecoverable error when doing
+    once-per-statement optimization and it is not safe to re-execute this
+    statement.
+  */
+  bool needs_reprepare{false};
+
   /*
     LEX which represents current statement (conventional, SP or PS)
 
@@ -4621,7 +4628,11 @@ public:
       case SQLCOM_LOAD:
         return duplicates == DUP_REPLACE;
       default:
-        return false;
+        /*
+          Row injections (i.e. row binlog events and BINLOG statements) should
+          generate history.
+        */
+        return is_stmt_row_injection();
     }
   }