diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-07-20 08:56:09 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-07-20 08:56:09 +0300 |
| commit | a481de30bb972f055cff088a84a211c1acd5be38 (patch) | |
| tree | 680d500eddf7b51bd2086218a01a42b28efa1f51 /sql/log.cc | |
| parent | e8a2a751212a04e835b2b03408132ecbbab52410 (diff) | |
| parent | 59fca5806af65c8379a993f9e604cb0b20a76e2b (diff) | |
| download | mariadb-git-a481de30bb972f055cff088a84a211c1acd5be38.tar.gz | |
Merge tag 'mariadb-5.5.57' into 5.5-galera
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/log.cc b/sql/log.cc index f8333fbe3cf..d7aebb4ccf7 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -4995,13 +4995,20 @@ int THD::binlog_write_table_map(TABLE *table, bool is_transactional, IO_CACHE *file= cache_mngr->get_binlog_cache_log(use_trans_cache(this, is_transactional)); + binlog_cache_data *cache_data= + cache_mngr->get_binlog_cache_data(use_trans_cache(this, is_transactional)); + if (with_annotate && *with_annotate) { Annotate_rows_log_event anno(current_thd, is_transactional, false); /* Annotate event should be written not more than once */ *with_annotate= 0; if ((error= anno.write(file))) + { + if (my_errno == EFBIG) + cache_data->set_incident(); DBUG_RETURN(error); + } } if ((error= the_event.write(file))) DBUG_RETURN(error); |