diff options
| author | Sven Sandberg <sven.sandberg@sun.com> | 2009-07-14 22:12:27 +0200 |
|---|---|---|
| committer | Sven Sandberg <sven.sandberg@sun.com> | 2009-07-14 22:12:27 +0200 |
| commit | 86a3e213acf220868c35c77058a2d42fcb6298e1 (patch) | |
| tree | 976db5058c7fdd791ea0d6dab9826f710269dbd0 /sql/sql_load.cc | |
| parent | ed3b0a69cfbc5778f000df4d2e46baa1f1173c57 (diff) | |
| parent | 41783de54966481dd295aae95a2bfc8f6302a940 (diff) | |
| download | mariadb-git-86a3e213acf220868c35c77058a2d42fcb6298e1.tar.gz | |
Merged fix for BUG#39934 up a few revisions.
NOTE: This undoes changes by BUG#42829 in sql_class.cc:binlog_query().
I will revert the change in a post-push fix (the binlog filter should
be checked in sql_base.cc:decide_logging_format()).
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 1758a6df5f9..466c49fb875 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -518,7 +518,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, version for the binary log to mark that table maps are invalid after this point. */ - if (thd->current_stmt_binlog_row_based) + if (thd->is_current_stmt_binlog_format_row()) thd->binlog_flush_pending_rows_event(true); else { |