diff options
| author | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-09-17 11:34:57 +0300 |
|---|---|---|
| committer | Seppo Jaakola <seppo.jaakola@codership.com> | 2012-09-17 11:34:57 +0300 |
| commit | 0892c7ec5d7bbca00e042047c4220e6830491c37 (patch) | |
| tree | 0fb649686d90bf6062f8db82106e6b2663727110 /sql/wsrep_mysqld.h | |
| parent | 5f76c15a3b5c4f39370fe21764088ee88dab9f47 (diff) | |
| download | mariadb-git-0892c7ec5d7bbca00e042047c4220e6830491c37.tar.gz | |
References lp:1051808 - merged with lp:codership-mysql 5.5.27 based trunk
patched with: bzr diff lp:codership-mysql/5.5 -r3779..3790
Diffstat (limited to 'sql/wsrep_mysqld.h')
| -rw-r--r-- | sql/wsrep_mysqld.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h index ce74cef4e64..af6c66609d4 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -143,6 +143,7 @@ extern void wsrep_recover(); extern void wsrep_init_startup(bool first); extern void wsrep_close_client_connections(my_bool wait_to_end); +extern int wsrep_wait_committing_connections_close(int wait_time); extern void wsrep_close_applier(THD *thd); extern void wsrep_wait_appliers_close(THD *thd); extern void wsrep_close_applier_threads(int count); @@ -176,7 +177,7 @@ extern wsrep_seqno_t wsrep_locked_seqno; // This is a workaround. It also prefixes all messages with "WSREP" #define WSREP_LOG(fun, ...) \ { \ - char msg[256] = {'\0'}; \ + char msg[1024] = {'\0'}; \ snprintf(msg, sizeof(msg) - 1, ## __VA_ARGS__); \ fun("WSREP: %s", msg); \ } |