diff options
| author | tnurnberg@sin.intern.azundris.com <> | 2007-09-15 05:12:02 +0200 |
|---|---|---|
| committer | tnurnberg@sin.intern.azundris.com <> | 2007-09-15 05:12:02 +0200 |
| commit | f3b1822c7a086b18e1456e9e3bd19d7a9eae710c (patch) | |
| tree | dac824d5a046aa0ae331c72bd20721e861592563 /netware | |
| parent | f26d69e01a6ffbae92c202c800981e1b102e0eda (diff) | |
| parent | cc3f0af2e199487c8b2cebd6c7b525168ad5a7a7 (diff) | |
| download | mariadb-git-f3b1822c7a086b18e1456e9e3bd19d7a9eae710c.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into mysql.com:/home/tnurnberg/15327/51-15327
Diffstat (limited to 'netware')
| -rw-r--r-- | netware/mysql_test_run.c | 3 | ||||
| -rw-r--r-- | netware/mysqld_safe.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/netware/mysql_test_run.c b/netware/mysql_test_run.c index 774aa61bea4..e2aabec0fca 100644 --- a/netware/mysql_test_run.c +++ b/netware/mysql_test_run.c @@ -1169,7 +1169,8 @@ void setup(char *file) setenv("MYSQL_BINLOG", file_path, 1); setenv("MASTER_MYPORT", "9306", 1); setenv("SLAVE_MYPORT", "9307", 1); - setenv("MYSQL_TCP_PORT", "3306", 1); + snprintf(file_path, PATH_MAX*2, "%d", MYSQL_PORT); + setenv("MYSQL_TCP_PORT", file_path, 1); snprintf(file_path, PATH_MAX*2, "%s/mysql_client_test --no-defaults --testcase--user=root --port=%u ", bin_dir, master_port); setenv("MYSQL_CLIENT_TEST",file_path,1); snprintf(file_path, PATH_MAX*2, "%s/mysql --no-defaults --user=root --port=%u ", bin_dir, master_port); diff --git a/netware/mysqld_safe.c b/netware/mysqld_safe.c index 9db8a441ca3..00e7d1bcd51 100644 --- a/netware/mysqld_safe.c +++ b/netware/mysqld_safe.c @@ -189,7 +189,7 @@ void start_defaults(int argc, char *argv[]) snprintf(address, PATH_MAX, "0.0.0.0");
// port
- snprintf(port, PATH_MAX, "3306");
+ snprintf(port, PATH_MAX, "%d", MYSQL_PORT); // default option
default_option[0]= NULL; |