Merge 10.4 into 10.5

1 files changed, 13 insertions, 9 deletions

diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index e7fe0b39e3a..8299a0b78df 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -3714,6 +3714,11 @@ mysql_execute_command(THD *thd)
   Json_writer_object trace_command(thd);
   Json_writer_array trace_command_steps(thd, "steps");
 
+  /* store old value of binlog format */
+  enum_binlog_format orig_binlog_format,orig_current_stmt_binlog_format;
+
+  thd->get_binlog_format(&orig_binlog_format,
+                         &orig_current_stmt_binlog_format);
 #ifdef WITH_WSREP
   if (WSREP(thd))
   {
@@ -3765,12 +3770,6 @@ mysql_execute_command(THD *thd)
 
   DBUG_ASSERT(thd->transaction->stmt.modified_non_trans_table == FALSE);
 
-  /* store old value of binlog format */
-  enum_binlog_format orig_binlog_format,orig_current_stmt_binlog_format;
-
-  thd->get_binlog_format(&orig_binlog_format,
-                         &orig_current_stmt_binlog_format);
-
   /*
     Assign system variables with values specified by the clause
     SET STATEMENT var1=value1 [, var2=value2, ...] FOR <statement>
@@ -7658,9 +7657,14 @@ void THD::reset_for_next_command(bool do_clear_error)
 
   save_prep_leaf_list= false;
 
-  DBUG_PRINT("debug",
-             ("is_current_stmt_binlog_format_row(): %d",
-              is_current_stmt_binlog_format_row()));
+#ifdef WITH_WSREP
+#if !defined(DBUG_OFF)
+  if (mysql_bin_log.is_open())
+#endif
+#endif
+    DBUG_PRINT("debug",
+               ("is_current_stmt_binlog_format_row(): %d",
+                 is_current_stmt_binlog_format_row()));
 
   DBUG_VOID_RETURN;
 }