diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-10-07 20:28:33 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-10 22:27:36 +0200 |
| commit | 8596b70f96fc543c2e1cac4bc8cbe58dcc4004e5 (patch) | |
| tree | 97cbad5b3a374450947696f6d635a80878b9c321 /sql/wsrep_mysqld.h | |
| parent | d103e359f875e53b7e34fe0c0d58ba9f36b9af50 (diff) | |
| download | mariadb-git-8596b70f96fc543c2e1cac4bc8cbe58dcc4004e5.tar.gz | |
cleanup: simplify the usage of WSREP_FORMAT macro
Diffstat (limited to 'sql/wsrep_mysqld.h')
| -rw-r--r-- | sql/wsrep_mysqld.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/wsrep_mysqld.h b/sql/wsrep_mysqld.h index 67f26548043..236dfa8884f 100644 --- a/sql/wsrep_mysqld.h +++ b/sql/wsrep_mysqld.h @@ -169,8 +169,11 @@ extern wsrep_seqno_t wsrep_locked_seqno; #define WSREP_EMULATE_BINLOG(thd) \ (WSREP(thd) && wsrep_emulate_bin_log) -// MySQL logging functions don't seem to understand long long length modifer. -// This is a workaround. It also prefixes all messages with "WSREP" +#define WSREP_FORMAT(my_format) \ + ((wsrep_forced_binlog_format != BINLOG_FORMAT_UNSPEC) \ + ? wsrep_forced_binlog_format : (ulong)(my_format)) + +// prefix all messages with "WSREP" #define WSREP_LOG(fun, ...) \ do { \ char msg[1024] = {'\0'}; \ @@ -309,6 +312,7 @@ int wsrep_create_trigger_query(THD *thd, uchar** buf, size_t* buf_len); #define WSREP_ON (0) #define WSREP_EMULATE_BINLOG(thd) (0) #define WSREP_CLIENT(thd) (0) +#define WSREP_FORMAT(my_format) ((ulong)my_format) #define wsrep_emulate_bin_log (0) #define wsrep_xid_seqno(X) (0) #define wsrep_to_isolation (0) |