mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge
This commit is contained in:
@ -496,14 +496,25 @@ sub command_line_setup () {
|
|||||||
my $im_mysqld1_port= 9312;
|
my $im_mysqld1_port= 9312;
|
||||||
my $im_mysqld2_port= 9314;
|
my $im_mysqld2_port= 9314;
|
||||||
|
|
||||||
|
#
|
||||||
|
# To make it easier for different devs to work on the same host,
|
||||||
|
# an environment variable can be used to control all ports. A small
|
||||||
|
# number is to be used, 0 - 16 or similar.
|
||||||
|
#
|
||||||
|
# Note the MASTER_MYPORT has to be set the same in all 4.x and 5.x
|
||||||
|
# versions of this script, else a 4.0 test run might conflict with a
|
||||||
|
# 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.
|
||||||
|
#
|
||||||
if ( $ENV{'MTR_BUILD_THREAD'} )
|
if ( $ENV{'MTR_BUILD_THREAD'} )
|
||||||
{
|
{
|
||||||
$opt_master_myport= $ENV{'MTR_BUILD_THREAD'} * 40 + 8120;
|
# Up to two masters, up to three slaves
|
||||||
$opt_slave_myport= $opt_master_myport + 16;
|
$opt_master_myport= $ENV{'MTR_BUILD_THREAD'} * 10 + 10000; # and 1
|
||||||
$opt_ndbcluster_port= $opt_master_myport + 24;
|
$opt_slave_myport= $opt_master_myport + 2;
|
||||||
$im_port= $opt_master_myport + 10;
|
$opt_ndbcluster_port= $opt_master_myport + 3; # and 4 5
|
||||||
$im_mysqld1_port= $opt_master_myport + 12;
|
$im_port= $opt_master_myport + 6;
|
||||||
$im_mysqld2_port= $opt_master_myport + 14;
|
$im_mysqld1_port= $opt_master_myport + 7;
|
||||||
|
$im_mysqld2_port= $opt_master_myport + 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
# Read the command line
|
# Read the command line
|
||||||
|
@ -244,8 +244,13 @@ MYSQL_MANAGER_USER=root
|
|||||||
# an environment variable can be used to control all ports. A small
|
# an environment variable can be used to control all ports. A small
|
||||||
# number is to be used, 0 - 16 or similar.
|
# number is to be used, 0 - 16 or similar.
|
||||||
#
|
#
|
||||||
|
# Note the MASTER_MYPORT has to be set the same in all 4.x and 5.x
|
||||||
|
# versions of this script, else a 4.0 test run might conflict with a
|
||||||
|
# 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.
|
||||||
|
#
|
||||||
if [ -n "$MTR_BUILD_THREAD" ] ; then
|
if [ -n "$MTR_BUILD_THREAD" ] ; then
|
||||||
MASTER_MYPORT=`expr $MTR_BUILD_THREAD '*' 5 + 10000`
|
MASTER_MYPORT=`expr $MTR_BUILD_THREAD '*' 10 + 10000`
|
||||||
MYSQL_MANAGER_PORT=`expr $MASTER_MYPORT + 2`
|
MYSQL_MANAGER_PORT=`expr $MASTER_MYPORT + 2`
|
||||||
SLAVE_MYPORT=`expr $MASTER_MYPORT + 3`
|
SLAVE_MYPORT=`expr $MASTER_MYPORT + 3`
|
||||||
NDBCLUSTER_PORT=`expr $MASTER_MYPORT + 4`
|
NDBCLUSTER_PORT=`expr $MASTER_MYPORT + 4`
|
||||||
|
Reference in New Issue
Block a user