diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-12-04 10:32:43 +0200 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2013-12-04 10:32:43 +0200 |
| commit | 496e22cf3bd2a481fd3502d86e5a4e8228bf9823 (patch) | |
| tree | 80549f8005fcf3236bfa004a5aea35e4e67b36ca /sql/wsrep_binlog.h | |
| parent | 45f484b8381a5923aec9c704e54c7f7bcfa02a40 (diff) | |
| parent | 26f56089c734852dc31d98fd73e1d8f1750bd1a8 (diff) | |
| download | mariadb-git-496e22cf3bd2a481fd3502d86e5a4e8228bf9823.tar.gz | |
merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6
and a number of fixes to make this buildable.
Run also few short multi-master high conflict rate tests, with no issues
Diffstat (limited to 'sql/wsrep_binlog.h')
| -rw-r--r-- | sql/wsrep_binlog.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/wsrep_binlog.h b/sql/wsrep_binlog.h index 6de73b2f5ee..408cc9b425c 100644 --- a/sql/wsrep_binlog.h +++ b/sql/wsrep_binlog.h @@ -46,4 +46,8 @@ int wsrep_write_cache (wsrep_t* wsrep, /* Dump replication buffer to disk */ void wsrep_dump_rbr_buf(THD *thd, const void* rbr_buf, size_t buf_len); +int wsrep_binlog_close_connection(THD* thd); +int wsrep_binlog_savepoint_set(THD *thd, void *sv); +int wsrep_binlog_savepoint_rollback(THD *thd, void *sv); + #endif /* WSREP_BINLOG_H */ |