diff options
author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-10-30 13:22:52 +0200 |
---|---|---|
committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-10-30 13:22:52 +0200 |
commit | b0fe082b365d989fcf905e5c40c3fe60fd756858 (patch) | |
tree | 46aa5d206fd37adfce09bff6bbc95bf458167128 /sql/wsrep_mysqld.cc | |
parent | 93ff64ebd7a7b2a534acc3ee8bf14cbfd8658d0f (diff) | |
parent | 2ee9343c873ad31c2dd0d2175dec2ef3b48ca5ba (diff) | |
download | mariadb-git-b0fe082b365d989fcf905e5c40c3fe60fd756858.tar.gz |
Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera
Diffstat (limited to 'sql/wsrep_mysqld.cc')
-rw-r--r-- | sql/wsrep_mysqld.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index bfd22ff1900..16241a9f41f 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -58,6 +58,7 @@ ulong wsrep_max_ws_size = 1073741824UL;//max ws (RBR buffer) size ulong wsrep_max_ws_rows = 65536; // max number of rows in ws int wsrep_to_isolation = 0; // # of active TO isolation threads my_bool wsrep_certify_nonPK = 1; // certify, even when no primary key +ulong wsrep_certification_rules = WSREP_CERTIFICATION_RULES_STRICT; long wsrep_max_protocol_version = 3; // maximum protocol version to use ulong wsrep_forced_binlog_format = BINLOG_FORMAT_UNSPEC; my_bool wsrep_recovery = 0; // recovery |