diff options
| author | unknown <knielsen@knielsen-hq.org> | 2011-05-07 15:48:45 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2011-05-07 15:48:45 +0200 |
| commit | 4f59833c0c04c6bf232d218fa5dc545e826e847b (patch) | |
| tree | 059cb928bad8142c62ab691452f23294ef72e98f /sql/mysqld.cc | |
| parent | 10d7496079a533a88c522d466809b152b964d225 (diff) | |
| parent | 799be22b19632cd910b325b136ad8f3fc3a79612 (diff) | |
| download | mariadb-git-4f59833c0c04c6bf232d218fa5dc545e826e847b.tar.gz | |
Merge MWL#180 into main MariaDB 5.3.
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 68140ae1b5a..2e4ce2c6be6 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -602,6 +602,8 @@ my_bool opt_noacl; my_bool sp_automatic_privileges= 1; 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}; TYPELIB binlog_format_typelib= { array_elements(binlog_format_names) - 1, "", @@ -4659,6 +4661,7 @@ int main(int argc, char **argv) #ifndef DBUG_OFF test_lc_time_sz(); + srand(time(NULL)); #endif /* @@ -6077,7 +6080,9 @@ enum options_mysqld OPT_SLOW_QUERY_LOG_FILE, OPT_IGNORE_BUILTIN_INNODB, OPT_BINLOG_DIRECT_NON_TRANS_UPDATE, - OPT_DEFAULT_CHARACTER_SET_OLD + OPT_DEFAULT_CHARACTER_SET_OLD, + OPT_MASTER_VERIFY_CHECKSUM, + OPT_SLAVE_SQL_VERIFY_CHECKSUM }; @@ -6940,6 +6945,19 @@ each time the SQL thread starts.", "not stop for operations that are idempotent. In STRICT mode, replication " "will stop on any unexpected difference between the master and the slave.", &slave_exec_mode_str, &slave_exec_mode_str, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, + {"master-verify-checksum", OPT_MASTER_VERIFY_CHECKSUM, + "Force checksum verification of logged events in binary log before " + "sending them to slaves or printing them in output of SHOW BINLOG EVENTS. " + "Disabled by default.", + &opt_master_verify_checksum, &opt_master_verify_checksum, + 0, GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0}, + {"slave-sql-verify-checksum", OPT_SLAVE_SQL_VERIFY_CHECKSUM, + "Force checksum verification of replication events after reading them " + "from relay log. Note: Events are always checksum-verified by slave on " + "receiving them from the network before writing them to the relay " + "log. Enabled by default.", + &opt_slave_sql_verify_checksum, &opt_slave_sql_verify_checksum, + 0, GET_BOOL, OPT_ARG, 1, 0, 0, 0, 0, 0}, #endif {"slow-query-log", OPT_SLOW_LOG, "Enable/disable slow query log. See also '--log-slow-queries'", |