diff options
| author | tnurnberg@sin.intern.azundris.com <> | 2007-09-15 04:09:38 +0200 |
|---|---|---|
| committer | tnurnberg@sin.intern.azundris.com <> | 2007-09-15 04:09:38 +0200 |
| commit | d5174aad89e82cc0140150144bde581842238c2e (patch) | |
| tree | e53fd604dfbb3db1190c5c65e2a83a9faa64e25c /netware | |
| parent | 8e22343c583651a48fe5dbb45711ed960e49b708 (diff) | |
| parent | 3c6ca8d6edf55764df93a831f61dc3855e82d91c (diff) | |
| download | mariadb-git-d5174aad89e82cc0140150144bde581842238c2e.tar.gz | |
Merge mysql.com:/home/tnurnberg/15327/50-15327
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; |