mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 23:04:20 +01:00
ee7f125d5f
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) client/mysql.cc: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysql_upgrade.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqladmin.cc: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqlbinlog.cc: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqlcheck.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqldump.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqlimport.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqlmanagerc.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear configure.in: Bug #15327: configure: --with-tcp-port option being partially ignored If MYSQL_TCP_PORT defaulted in configure (factory default 3306 at the time of this writing), set MYSQL_TCP_PORT to factory default, then clear factory default after. That way, we lose no information, and we can distinguish between "defaulted" and the pathological case "builder specifically configured a port that coincides with factory default." This can in theory happen if builder configures and builds several servers from a script (--with-tcp-port=3306, --with-tcp-port=3316, --with-tcp-port=3326). Not all that probable, but much preferable to having more "magic" happen in the server when we can solve this without any guesswork. client/mysqlshow.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear client/mysqltest.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear include/mysql_version.h.in: Bug #15327: configure: --with-tcp-port option being partially ignored make factory default for TCP port available as MYSQL_PORT_DEFAULT if build-time configured with a different default. (0 if unchanged) libmysql/libmysql.c: Bug #15327: configure: --with-tcp-port option being partially ignored initialize default tcp port for client, like so: - if user configured --with-tcp-port, use that value as default - otherwise assume "use a good default": search mysqld/tcp in /etc/services; if that doesn't exist, use factory default (3306) - environment variable MYSQL_TCP_PORT overrides this default - command-line option overrides all of the above mysql-test/Makefile.am: Bug #15327: configure: --with-tcp-port option being partially ignored make factory default for TCP port available as MYSQL_TCP_PORT_DEFAULT if build-time configured with a different default. (0 if unchanged) mysql-test/mysql-test-run-shell.sh: Bug #15327: configure: --with-tcp-port option being partially ignored set up MYSQL_TCP_PORT if not already set in environment: - if user configured --with-tcp-port, use that value as default - otherwise assume "use a good default": search mysqld/tcp in /etc/services; if that doesn't exist, use factory default (3306) netware/mysql_test_run.c: Bug #15327: configure: --with-tcp-port option being partially ignored account for non-standard default port-no. configured at build-time netware/mysqld_safe.c: Bug #15327: configure: --with-tcp-port option being partially ignored account for non-standard default port-no. configured at build-time scripts/Makefile.am: Bug #15327: configure: --with-tcp-port option being partially ignored make factory default for TCP port available as MYSQL_TCP_PORT_DEFAULT if build-time configured with a different default. (0 if unchanged) scripts/mysql_config.sh: Bug #15327: configure: --with-tcp-port option being partially ignored set up MYSQL_TCP_PORT if not already set in environment: - if user configured --with-tcp-port, use that value as default - otherwise assume "use a good default": search mysqld/tcp in /etc/services; if that doesn't exist, use factory default (3306) scripts/mysql_fix_privilege_tables.sh: Bug #15327: configure: --with-tcp-port option being partially ignored clarifying notice only scripts/mysqld_safe-watch.sh: Bug #15327: configure: --with-tcp-port option being partially ignored account for non-standard default port-no. configured at build-time server-tools/instance-manager/priv.h: Bug #15327: configure: --with-tcp-port option being partially ignored account for non-standard default port-no. configured at build-time sql/mysqld.cc: Bug #15327: configure: --with-tcp-port option being partially ignored if builder specifically requested a default port, use that (even if it coincides with our factory default). only if they didn't do we check /etc/services (and, failing on that, fall back to the factory default of 3306). either default can be overridden by the environment variable MYSQL_TCP_PORT, which in turn can be overridden with command line options. tests/mysql_client_test.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear tests/ssl_test.c: Bug #15327: configure: --with-tcp-port option being partially ignored account for non-standard default port-no. configured at build-time tests/thread_test.c: Bug #15327: configure: --with-tcp-port option being partially ignored make help on --port a little more clear
94 lines
2.7 KiB
C
94 lines
2.7 KiB
C
/* Copyright (C) 2004-2006 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#ifndef INCLUDES_MYSQL_INSTANCE_MANAGER_PRIV_H
|
|
#define INCLUDES_MYSQL_INSTANCE_MANAGER_PRIV_H
|
|
|
|
#include <sys/types.h>
|
|
#ifdef __WIN__
|
|
#include "portability.h"
|
|
#else
|
|
#include <unistd.h>
|
|
#endif
|
|
#include "my_pthread.h"
|
|
|
|
/* IM-wide platform-independent defines */
|
|
#define SERVER_DEFAULT_PORT MYSQL_PORT
|
|
#define DEFAULT_MONITORING_INTERVAL 20
|
|
#define DEFAULT_PORT 2273
|
|
/* three-week timeout should be enough */
|
|
#define LONG_TIMEOUT ((ulong) 3600L*24L*21L)
|
|
|
|
/* the pid of the manager process (of the signal thread on the LinuxThreads) */
|
|
extern pid_t manager_pid;
|
|
|
|
#ifndef __WIN__
|
|
/*
|
|
This flag is set if mysqlmanager has detected that it is running on the
|
|
system using LinuxThreads
|
|
*/
|
|
extern bool linuxthreads;
|
|
#endif
|
|
|
|
extern const char mysqlmanager_version[];
|
|
extern const int mysqlmanager_version_length;
|
|
|
|
/* MySQL client-server protocol version: substituted from configure */
|
|
extern const unsigned char protocol_version;
|
|
|
|
/*
|
|
These variables are used in MySQL subsystem to work with mysql clients
|
|
To be moved to a config file/options one day.
|
|
*/
|
|
|
|
|
|
/* Buffer length for TCP/IP and socket communication */
|
|
extern unsigned long net_buffer_length;
|
|
|
|
|
|
/* Maximum allowed incoming/ougoung packet length */
|
|
extern unsigned long max_allowed_packet;
|
|
|
|
|
|
/*
|
|
Number of seconds to wait for more data from a connection before aborting
|
|
the read
|
|
*/
|
|
extern unsigned long net_read_timeout;
|
|
|
|
|
|
/*
|
|
Number of seconds to wait for a block to be written to a connection
|
|
before aborting the write.
|
|
*/
|
|
extern unsigned long net_write_timeout;
|
|
|
|
|
|
/*
|
|
If a read on a communication port is interrupted, retry this many times
|
|
before giving up.
|
|
*/
|
|
extern unsigned long net_retry_count;
|
|
|
|
extern unsigned int test_flags;
|
|
extern unsigned long bytes_sent, bytes_received;
|
|
extern unsigned long mysqld_net_retry_count;
|
|
extern unsigned long open_files_limit;
|
|
|
|
|
|
int set_stacksize_n_create_thread(pthread_t *thread, pthread_attr_t *attr,
|
|
void *(*start_routine)(void *), void *arg);
|
|
|
|
#endif // INCLUDES_MYSQL_INSTANCE_MANAGER_PRIV_H
|