diff options
| author | sasha@mysql.sashanet.com <> | 2001-06-01 21:15:15 -0600 |
|---|---|---|
| committer | sasha@mysql.sashanet.com <> | 2001-06-01 21:15:15 -0600 |
| commit | ad0b92f941745cfcca538220310e7e4e5ed546ee (patch) | |
| tree | 9ba066c59c8efe0b639b3b3003be8c3047bd5981 /sql/mysqld.cc | |
| parent | 68adfd2322884ccd54733680f74f31b51c1d0e36 (diff) | |
| download | mariadb-git-ad0b92f941745cfcca538220310e7e4e5ed546ee.tar.gz | |
do not show user/pass for slave unless running with show-slave-auth-info
cleanup of register_slave_on_master()
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 57fcb067cbc..41bee098c18 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -222,7 +222,8 @@ static bool opt_log,opt_update_log,opt_bin_log,opt_slow_log,opt_noacl, opt_disable_networking=0, opt_bootstrap=0,opt_skip_show_db=0, opt_ansi_mode=0,opt_myisam_log=0, opt_large_files=sizeof(my_off_t) > 4; -bool opt_sql_bin_update = 0, opt_log_slave_updates = 0, opt_safe_show_db=0; +bool opt_sql_bin_update = 0, opt_log_slave_updates = 0, opt_safe_show_db=0, + opt_show_slave_auth_info = 0; FILE *bootstrap_file=0; int segfaulted = 0; // ensure we do not enter SIGSEGV handler twice extern MASTER_INFO glob_mi; @@ -277,7 +278,7 @@ volatile ulong cached_thread_count=0; // replication parameters, if master_host is not NULL, we are a slave my_string master_user = (char*) "test", master_password = 0, master_host=0, master_info_file = (char*) "master.info"; -my_string report_user = (char*) "test", report_password = 0, report_host=0; +my_string report_user = 0, report_password = 0, report_host=0; const char *localhost=LOCAL_HOST; const char *delayed_user="DELAYED"; @@ -2485,7 +2486,8 @@ enum options { OPT_GEMINI_FLUSH_LOG, OPT_GEMINI_RECOVER, OPT_GEMINI_UNBUFFERED_IO, OPT_SKIP_SAFEMALLOC, OPT_SKIP_STACK_TRACE, OPT_SKIP_SYMLINKS, OPT_REPORT_HOST, - OPT_REPORT_USER, OPT_REPORT_PASSWORD, OPT_REPORT_PORT + OPT_REPORT_USER, OPT_REPORT_PASSWORD, OPT_REPORT_PORT, + OPT_SHOW_SLAVE_AUTH_INFO }; static struct option long_options[] = { @@ -2604,6 +2606,8 @@ static struct option long_options[] = { {"socket", required_argument, 0, (int) OPT_SOCKET}, {"server-id", required_argument, 0, (int) OPT_SERVER_ID}, {"set-variable", required_argument, 0, 'O'}, + {"show-slave-auth-info", no_argument, 0, + (int) OPT_SHOW_SLAVE_AUTH_INFO}, {"skip-bdb", no_argument, 0, (int) OPT_BDB_SKIP}, {"skip-innodb", no_argument, 0, (int) OPT_INNODB_SKIP}, {"skip-gemini", no_argument, 0, (int) OPT_GEMINI_SKIP}, @@ -3255,6 +3259,9 @@ static void get_options(int argc,char **argv) safemalloc_mem_limit = atoi(optarg); #endif break; + case OPT_SHOW_SLAVE_AUTH_INFO: + opt_show_slave_auth_info = 1; + break; case OPT_SOCKET: mysql_unix_port= optarg; break; |