Commit 3f40c19d authored by unknown's avatar unknown
Browse files

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
parents 42c2a2cb 83d75d49

sql/sql_class.h

+3 −1
Original line number Diff line number Diff line
@@ -1570,8 +1570,10 @@ 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);