diff options
| author | monty@hundin.mysql.fi <> | 2001-10-03 16:27:20 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-10-03 16:27:20 +0300 |
| commit | f5a53594c81c403e3cd13a13b8d2f82165f8f873 (patch) | |
| tree | a4b8a436366c890cbd0ab542240abc59d08dca6f /sql/mysqld.cc | |
| parent | 4e5028663233ea24fff868f086cde080a67aaa8d (diff) | |
| download | mariadb-git-f5a53594c81c403e3cd13a13b8d2f82165f8f873.tar.gz | |
Added usage of --master-retry-count to make mysql-test-run safer.
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 435ee51a0e0..2207fe81e94 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -276,7 +276,7 @@ const char *localhost=LOCAL_HOST; const char *delayed_user="DELAYED"; uint master_port = MYSQL_PORT, master_connect_retry = 60; -ulong max_tmp_tables,max_heap_table_size; +ulong max_tmp_tables,max_heap_table_size,master_retry_count=0; ulong bytes_sent = 0L, bytes_received = 0L; bool opt_endinfo,using_udf_functions,low_priority_updates, locked_in_memory; @@ -2534,6 +2534,7 @@ enum options { OPT_MASTER_HOST, OPT_MASTER_USER, OPT_MASTER_PASSWORD, OPT_MASTER_PORT, OPT_MASTER_INFO_FILE, OPT_MASTER_CONNECT_RETRY, + OPT_MASTER_RETRY_COUNT, OPT_SQL_BIN_UPDATE_SAME, OPT_REPLICATE_DO_DB, OPT_REPLICATE_IGNORE_DB, OPT_LOG_SLAVE_UPDATES, OPT_BINLOG_DO_DB, OPT_BINLOG_IGNORE_DB, @@ -2635,6 +2636,7 @@ static struct option long_options[] = { {"master-password", required_argument, 0, (int) OPT_MASTER_PASSWORD}, {"master-port", required_argument, 0, (int) OPT_MASTER_PORT}, {"master-connect-retry", required_argument, 0, (int) OPT_MASTER_CONNECT_RETRY}, + {"master-retry-count", required_argument, 0, (int) OPT_MASTER_RETRY_COUNT}, {"master-info-file", required_argument, 0, (int) OPT_MASTER_INFO_FILE}, {"myisam-recover", optional_argument, 0, (int) OPT_MYISAM_RECOVER}, {"memlock", no_argument, 0, (int) OPT_MEMLOCK}, @@ -3859,6 +3861,9 @@ static void get_options(int argc,char **argv) case OPT_MASTER_CONNECT_RETRY: master_connect_retry= atoi(optarg); break; + case OPT_MASTER_RETRY_COUNT: + master_retry_count= atoi(optarg); + break; case OPT_SAFE_SHOW_DB: opt_safe_show_db=1; break; |