mirror of
https://github.com/MariaDB/server.git
synced 2025-02-02 12:01:42 +01:00
Merge
scripts/mysqld_safe.sh: Auto merged storage/ndb/tools/Makefile.am: Auto merged
This commit is contained in:
commit
1658694741
1 changed files with 11 additions and 0 deletions
|
@ -546,6 +546,10 @@ sub command_line_setup () {
|
||||||
# 5.1 test run, even if different MTR_BUILD_THREAD is used. This means
|
# 5.1 test run, even if different MTR_BUILD_THREAD is used. This means
|
||||||
# all port numbers might not be used in this version of the script.
|
# all port numbers might not be used in this version of the script.
|
||||||
#
|
#
|
||||||
|
# Also note the limiteation of ports we are allowed to hand out. This
|
||||||
|
# differs between operating systems and configuration, see
|
||||||
|
# http://www.ncftp.com/ncftpd/doc/misc/ephemeral_ports.html
|
||||||
|
# But a fairly safe range seems to be 5001 - 32767
|
||||||
if ( $ENV{'MTR_BUILD_THREAD'} )
|
if ( $ENV{'MTR_BUILD_THREAD'} )
|
||||||
{
|
{
|
||||||
# Up to two masters, up to three slaves
|
# Up to two masters, up to three slaves
|
||||||
|
@ -558,6 +562,13 @@ sub command_line_setup () {
|
||||||
$im_mysqld2_port= $opt_master_myport + 9;
|
$im_mysqld2_port= $opt_master_myport + 9;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ( $opt_master_myport < 5001 or $opt_master_myport + 10 >= 32767 )
|
||||||
|
{
|
||||||
|
mtr_error("MTR_BUILD_THREAD number results in a port",
|
||||||
|
"outside 5001 - 32767",
|
||||||
|
"($opt_master_myport - $opt_master_myport + 10)");
|
||||||
|
}
|
||||||
|
|
||||||
# Read the command line
|
# Read the command line
|
||||||
# Note: Keep list, and the order, in sync with usage at end of this file
|
# Note: Keep list, and the order, in sync with usage at end of this file
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue