diff options
Diffstat (limited to 'sql/wsrep_binlog.cc')
| -rw-r--r-- | sql/wsrep_binlog.cc | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/sql/wsrep_binlog.cc b/sql/wsrep_binlog.cc index 9602dd698eb..85c1deb0d71 100644 --- a/sql/wsrep_binlog.cc +++ b/sql/wsrep_binlog.cc @@ -13,6 +13,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA. */ +#include "mariadb.h" #include "wsrep_binlog.h" #include "wsrep_priv.h" #include "log.h" @@ -30,13 +31,13 @@ int wsrep_write_cache_buf(IO_CACHE *cache, uchar **buf, size_t *buf_len) { *buf= NULL; *buf_len= 0; - my_off_t const saved_pos(my_b_tell(cache)); + DBUG_ENTER("wsrep_write_cache_buf"); if (reinit_io_cache(cache, READ_CACHE, 0, 0, 0)) { WSREP_ERROR("failed to initialize io-cache"); - return ER_ERROR_ON_WRITE; + DBUG_RETURN(ER_ERROR_ON_WRITE); } uint length = my_b_bytes_in_cache(cache); @@ -85,7 +86,7 @@ int wsrep_write_cache_buf(IO_CACHE *cache, uchar **buf, size_t *buf_len) goto cleanup; } - return 0; + DBUG_RETURN(0); error: if (reinit_io_cache(cache, WRITE_CACHE, saved_pos, 0, 0)) @@ -96,7 +97,7 @@ cleanup: my_free(*buf); *buf= NULL; *buf_len= 0; - return ER_ERROR_ON_WRITE; + DBUG_RETURN(ER_ERROR_ON_WRITE); } #define STACK_SIZE 4096 /* 4K - for buffer preallocated on the stack: @@ -120,6 +121,7 @@ wsrep_append_data(wsrep_t* const wsrep, struct wsrep_buf const buff = { data, len }; wsrep_status_t const rc(wsrep->append_data(wsrep, ws, &buff, 1, WSREP_DATA_ORDERED, true)); + DBUG_DUMP("buff", (uchar*) data, len); if (rc != WSREP_OK) { WSREP_WARN("append_data() returned %d", rc); @@ -143,11 +145,12 @@ static int wsrep_write_cache_once(wsrep_t* const wsrep, size_t* const len) { my_off_t const saved_pos(my_b_tell(cache)); + DBUG_ENTER("wsrep_write_cache_once"); if (reinit_io_cache(cache, READ_CACHE, 0, 0, 0)) { WSREP_ERROR("failed to initialize io-cache"); - return ER_ERROR_ON_WRITE; + DBUG_RETURN(ER_ERROR_ON_WRITE); } int err(WSREP_OK); @@ -229,7 +232,7 @@ cleanup: } my_free(heap_buf); - return err; + DBUG_RETURN(err); } /* @@ -246,11 +249,12 @@ static int wsrep_write_cache_inc(wsrep_t* const wsrep, size_t* const len) { my_off_t const saved_pos(my_b_tell(cache)); + DBUG_ENTER("wsrep_write_cache_inc"); if (reinit_io_cache(cache, READ_CACHE, 0, 0, 0)) { WSREP_ERROR("failed to initialize io-cache"); - return WSREP_TRX_ERROR; + DBUG_RETURN(WSREP_TRX_ERROR); } int err(WSREP_OK); @@ -294,7 +298,7 @@ cleanup: WSREP_ERROR("failed to reinitialize io-cache"); } - return err; + DBUG_RETURN(err); } /* @@ -423,7 +427,7 @@ void wsrep_dump_rbr_direct(THD* thd, IO_CACHE* cache) break; } } while ((bytes_in_cache= my_b_fill(cache))); - if(cache->error == -1) + if (cache->error == -1) { WSREP_ERROR("RBR inconsistent"); goto cleanup; @@ -452,8 +456,8 @@ void wsrep_dump_rbr_buf_with_header(THD *thd, const void *rbr_buf, File file; IO_CACHE cache; - Log_event_writer writer(&cache); - Format_description_log_event *ev=NULL; + Log_event_writer writer(&cache, 0); + Format_description_log_event *ev= 0; longlong thd_trx_seqno= (long long)wsrep_thd_trx_seqno(thd); int len= snprintf(NULL, 0, "%s/GRA_%lld_%lld_v2.log", |