diff options
| author | unknown <tnurnberg@sin.intern.azundris.com> | 2007-09-15 04:09:38 +0200 |
|---|---|---|
| committer | unknown <tnurnberg@sin.intern.azundris.com> | 2007-09-15 04:09:38 +0200 |
| commit | 682c22846fe5aaf35762a21daf2ba29162b1fc4c (patch) | |
| tree | e53fd604dfbb3db1190c5c65e2a83a9faa64e25c /netware | |
| parent | 866225919c303f36e83b6af10e3908bcb39bda62 (diff) | |
| parent | ee7f125d5f42fd653cb09cf5b15ae9384b7d9248 (diff) | |
| download | mariadb-git-682c22846fe5aaf35762a21daf2ba29162b1fc4c.tar.gz | |
Merge mysql.com:/home/tnurnberg/15327/50-15327
into mysql.com:/home/tnurnberg/15327/51-15327
BitKeeper/deleted/.del-mysqld_safe-watch.sh~37cbc9a97ffd2555:
Auto merged
BitKeeper/deleted/.del-mysqlmanagerc.c~4f6e3499e68508f6:
Auto merged
client/mysql_upgrade.c:
Auto merged
configure.in:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run-shell.sh:
Auto merged
netware/mysql_test_run.c:
Auto merged
scripts/Makefile.am:
Auto merged
scripts/mysql_fix_privilege_tables.sh:
Auto merged
server-tools/instance-manager/priv.h:
Auto merged
client/mysql.cc:
manual merge
client/mysqladmin.cc:
manual merge
client/mysqlbinlog.cc:
manual merge
client/mysqlcheck.c:
manual merge
client/mysqldump.c:
manual merge
client/mysqlimport.c:
manual merge
client/mysqlshow.c:
manual merge
client/mysqltest.c:
manual merge
sql/mysqld.cc:
manual merge
tests/mysql_client_test.c:
manual merge
tests/thread_test.c:
manual merge
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; |