diff options
| author | unknown <sasha@mysql.sashanet.com> | 2002-04-15 17:12:02 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2002-04-15 17:12:02 -0600 |
| commit | 668ddf17e43ccd7ddf916a88edf5ef42973d395c (patch) | |
| tree | b49e5cdb7d55160a5dc579e778b1cadca20f99cd /sql/mysqld.cc | |
| parent | a2ce6c71b836c627e71fe37f0aa312b11e59f571 (diff) | |
| parent | 74fccd18016a841faee48808c7bcfdf284b7ec98 (diff) | |
| download | mariadb-git-668ddf17e43ccd7ddf916a88edf5ef42973d395c.tar.gz | |
Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/reiser-data/mysql-4.0
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 3fd58d6a03a..3f57d12559d 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -227,6 +227,11 @@ SHOW_COMP_OPTION have_query_cache=SHOW_OPTION_NO; #endif bool opt_skip_slave_start = 0; // If set, slave is not autostarted + +/* if set, some standard measures to enforce + slave data intergity will not be performed + */ +bool opt_reckless_slave = 0; static bool opt_do_pstack = 0; static ulong opt_specialflag=SPECIAL_ENGLISH; static ulong back_log,connect_timeout,concurrency; @@ -2741,6 +2746,7 @@ enum options { OPT_RPL_RECOVERY_RANK,OPT_INIT_RPL_ROLE, OPT_RELAY_LOG, OPT_RELAY_LOG_INDEX, OPT_RELAY_LOG_INFO_FILE, OPT_SLAVE_SKIP_ERRORS, OPT_DES_KEY_FILE, OPT_LOCAL_INFILE, + OPT_RECKLESS_SLAVE, OPT_SSL_SSL, OPT_SSL_KEY, OPT_SSL_CERT, OPT_SSL_CA, OPT_SSL_CAPATH, OPT_SSL_CIPHER }; @@ -2851,6 +2857,7 @@ static struct option long_options[] = { #endif {"pid-file", required_argument, 0, (int) OPT_PID_FILE}, {"port", required_argument, 0, 'P'}, + {"reckless-slave", no_argument, 0, (int) OPT_RECKLESS_SLAVE}, {"replicate-do-db", required_argument, 0, (int) OPT_REPLICATE_DO_DB}, {"replicate-do-table", required_argument, 0, (int) OPT_REPLICATE_DO_TABLE}, @@ -3941,6 +3948,10 @@ static void get_options(int argc,char **argv) opt_slow_log=1; opt_slow_logname=optarg; break; + case (int)OPT_RECKLESS_SLAVE: + opt_reckless_slave = 1; + init_slave_skip_errors("all"); + break; case (int)OPT_SKIP_SLAVE_START: opt_skip_slave_start = 1; break; |