diff options
author | unknown <monty@mysql.com/nosik.monty.fi> | 2006-11-01 23:35:58 +0200 |
---|---|---|
committer | unknown <monty@mysql.com/nosik.monty.fi> | 2006-11-01 23:35:58 +0200 |
commit | a316aebc6e3015b8d5dc8efec5e8049f98e929a4 (patch) | |
tree | 18ac281ba4001d275c2121fc2fe06a09af5e1215 /sql | |
parent | 2fec8851f654083522c6982da462dee49ffb0caa (diff) | |
download | mariadb-git-a316aebc6e3015b8d5dc8efec5e8049f98e929a4.tar.gz |
bug#23110 Some NDB tests assert randomly on mixed mode binlog: Don't reset binlog format for NDB binlog injector thread
Diffstat (limited to 'sql')
-rw-r--r-- | sql/sql_class.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 502ac3d2259..04d8ec11e5b 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1572,8 +1572,11 @@ 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); |