bk commit into 5.1 tree (mskold:1.2331) BUG#23110

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 repository of marty. When marty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-10-27 12:44:03+02:00, mskold@stripped +1 -0
  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@stripped, 2006-10-27 12:43:07+02:00, mskold@stripped +3 -1
    bug#23110  Some NDB tests assert randomly on mixed mode binlog: don't reset binlog format for NDB binlog injector thread

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mskold
# Host:	linux.site
# Root:	/windows/Linux_space/MySQL/mysql-5.1-new-ndb

--- 1.322/sql/sql_class.h	2006-10-27 12:44:20 +02:00
+++ 1.323/sql/sql_class.h	2006-10-27 12:44:20 +02:00
@@ -1570,8 +1570,10 @@ public:
       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);