bug#23110 Some NDB tests assert randomly on mixed mode binlog: Don't reset...

bug#23110  Some NDB tests assert randomly on mixed mode binlog: Don't reset binlog format for NDB binlog injector thread

sql/sql_class.h

@@ -1572,8 +1572,11 @@ class THD :public Statement,
       or trigger is decided when it starts executing, depending for example on
       the caller (for a stored function: if caller is SELECT or
       INSERT/UPDATE/DELETE...).
+
+      Don't reset binlog format for NDB binlog injector thread.
     */
-    if ((temporary_tables == NULL) && (in_sub_stmt == 0))
+    if ((temporary_tables == NULL) && (in_sub_stmt == 0) &&
+        (system_thread != SYSTEM_THREAD_NDBCLUSTER_BINLOG))
     {
       current_stmt_binlog_row_based= 
         test(variables.binlog_format == BINLOG_FORMAT_ROW);