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 | 45f724ec545837392f877eda27a803d473e8b59f (patch) | |
| tree | 976db5058c7fdd791ea0d6dab9826f710269dbd0 /sql/sql_repl.cc | |
| parent | 5b178e9a2af23226828f9c71fa6b1b82db319a9e (diff) | |
| parent | f3985c649d65c2d932a6f74d22de3d2e6624d525 (diff) | |
| download | mariadb-git-45f724ec545837392f877eda27a803d473e8b59f.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_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 476c8aaaefb..5b3bf6bcac7 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1685,7 +1685,7 @@ int log_loaded_block(IO_CACHE* file) uchar* buffer= (uchar*) my_b_get_buffer_start(file); uint max_event_size= current_thd->variables.max_allowed_packet; lf_info= (LOAD_FILE_INFO*) file->arg; - if (lf_info->thd->current_stmt_binlog_row_based) + if (lf_info->thd->is_current_stmt_binlog_format_row()) DBUG_RETURN(0); if (lf_info->last_pos_in_file != HA_POS_ERROR && lf_info->last_pos_in_file >= my_b_get_pos_in_file(file)) |