diff options
| author | tnurnberg@mysql.com/sin.intern.azundris.com <> | 2007-09-13 16:19:46 +0200 |
|---|---|---|
| committer | tnurnberg@mysql.com/sin.intern.azundris.com <> | 2007-09-13 16:19:46 +0200 |
| commit | 3c6ca8d6edf55764df93a831f61dc3855e82d91c (patch) | |
| tree | 602e3e9d9862d8866b20f7d497d64c91d470ea4e /tests/ssl_test.c | |
| parent | 4a52b5c88547a01f33b2566d4503f6eef7f082bc (diff) | |
| download | mariadb-git-3c6ca8d6edf55764df93a831f61dc3855e82d91c.tar.gz | |
Bug #15327: configure: --with-tcp-port option being partially ignored
make sure that if builder configured with a non-standard (!= 3306)
default TCP port that value actually gets used throughout. if they
didn't configure a value, assume "use a sensible default", which
will be read from /etc/services or, failing that, from the factory
default. That makes the order of preference
- command-line option
- my.cnf, where applicable
- $MYSQL_TCP_PORT environment variable
- /etc/services (unless configured --with-tcp-port)
- default port (--with-tcp-port=... or factory default)
Diffstat (limited to 'tests/ssl_test.c')
| -rw-r--r-- | tests/ssl_test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ssl_test.c b/tests/ssl_test.c index 136f0a83cbe..ad6bc925cc6 100644 --- a/tests/ssl_test.c +++ b/tests/ssl_test.c @@ -44,7 +44,7 @@ int main(int argc, char **argv) "../SSL/MySQL-client-cert.pem", "../SSL/MySQL-ca-cert.pem", 0, 0); #endif - if (!(sock = mysql_real_connect(&mysql,"127.0.0.1",0,0,argv[1],3306,NULL,0))) + if (!(sock = mysql_real_connect(&mysql,"127.0.0.1",0,0,argv[1],MYSQL_PORT,NULL,0))) { fprintf(stderr,"Couldn't connect to engine!\n%s\n\n",mysql_error(&mysql)); perror(""); |