diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-01-16 04:53:57 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-01-16 04:53:57 +0200 |
| commit | 5ac71d4464f556f26c81172cb0fef679389beda8 (patch) | |
| tree | 5ea8b9104fb257ac546337a603dfc1beb8192ad6 /sql/mysqld.cc | |
| parent | 8e15768731c52b6bbb29d7bfe27bdd71c025a3a3 (diff) | |
| parent | 5fc1ba604e27b7d9eaa2977ef5b0c180f6f62565 (diff) | |
| download | mariadb-git-5ac71d4464f556f26c81172cb0fef679389beda8.tar.gz | |
Merge remote-tracking branch '10.0-galera' into 10.1
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index d540cc03d2a..0ebe146f1fa 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -480,6 +480,10 @@ ulong opt_binlog_rows_event_max_size; my_bool opt_master_verify_checksum= 0; my_bool opt_slave_sql_verify_checksum= 1; const char *binlog_format_names[]= {"MIXED", "STATEMENT", "ROW", NullS}; +#ifdef WITH_WSREP +const char *wsrep_binlog_format_names[]= + {"MIXED", "STATEMENT", "ROW", "NONE", NullS}; +#endif /* WITH_WSREP */ volatile sig_atomic_t calling_initgroups= 0; /**< Used in SIGSEGV handler. */ uint mysqld_port, test_flags, select_errors, dropping_tables, ha_open_options; uint mysqld_extra_port; |