diff options
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 3233ffdc5d3..d6db9a4e230 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -676,7 +676,7 @@ int mysqld_server_started= 0; File_parser_dummy_hook file_parser_dummy_hook; /* replication parameters, if master_host is not NULL, we are a slave */ -uint report_port= MYSQL_PORT; +uint report_port= 0; ulong master_retry_count=0; char *master_info_file; char *relay_log_info_file, *report_user, *report_password, *report_host; @@ -2229,6 +2229,11 @@ static void network_init(void) set_ports(); + if (report_port == 0) + { + report_port= mysqld_port; + } + DBUG_ASSERT(report_port != 0); if (!opt_disable_networking && !opt_bootstrap) { if (mysqld_port) @@ -2746,10 +2751,6 @@ static void check_data_home(const char *path) #endif /* __WIN__ */ -#ifdef HAVE_LINUXTHREADS -#define UNSAFE_DEFAULT_LINUX_THREADS 200 -#endif - #if BACKTRACE_DEMANGLE #include <cxxabi.h> |