diff --git a/launch.bat b/launch.bat index b2b33e0..196f74c 100755 --- a/launch.bat +++ b/launch.bat @@ -56,14 +56,17 @@ setx TEST_DB_HOST localhost setx TEST_DB_PASSWORD "" setx TEST_DB_DATABASE %d% setx TEST_DB_PORT 3306 +setx TEST_DB_ADD_PORT 3405 setx TEST_REQUIRE_TLS 0 + REM setx does not change current env. set TEST_DB_USER=root set TEST_DB_HOST=localhost set TEST_DB_PASSWORD= set TEST_DB_DATABASE=%d% set TEST_DB_PORT=3306 +set TEST_DB_ADD_PORT=3405 set TEST_REQUIRE_TLS=0 @@ -72,6 +75,7 @@ echo export TEST_DB_HOST=localhost >> settestenv.sh echo export TEST_DB_PASSWORD= >> settestenv.sh echo export TEST_DB_DATABASE=%d% >> settestenv.sh echo export TEST_DB_PORT=3306 >> settestenv.sh +echo export TEST_DB_ADD_PORT=3405 >> settestenv.sh echo export TEST_REQUIRE_TLS=0 >> settestenv.sh dir . diff --git a/launch.sh b/launch.sh index 1d2fe12..4c90d1e 100755 --- a/launch.sh +++ b/launch.sh @@ -142,6 +142,7 @@ install_repo () { install_local () { echo "install local version" if [ "$TRAVIS_OS_NAME" == "linux" ] ; then + export TEST_DB_ADD_PORT=3405 sudo apt update echo "mariadb-server-${VERSION} mysql-server/root_password password ${TEST_DB_PASSWORD}" | sudo debconf-set-selections echo "mariadb-server-${VERSION} mysql-server/root_password_again password ${TEST_DB_PASSWORD}" | sudo debconf-set-selections @@ -247,6 +248,7 @@ launch_docker () { echo "launch docker" export TEST_REQUIRE_TLS=0 export TEST_DB_PORT=3305 + export TEST_DB_ADD_PORT=3405 export ENTRYPOINT=$PROJ_PATH/travis/sql export ENTRYPOINT_PAM=$PROJ_PATH/travis/pam if [ "$TYPE" == 'mariadb-es' ] || [ "$TYPE" == 'mariadb-es-test' ]; then @@ -257,6 +259,7 @@ launch_docker () { export PACKET_SIZE_VAL="${PACKET_SIZE}M" export INNODB_LOG_FILE_SIZE="${PACKET_SIZE}0M" + export ADDITIONAL_CONF="--extra-port=3405" if [ "$TYPE" == mysql ] ; then echo "configuring mysql additional type" diff --git a/travis/unix.cnf b/travis/unix.cnf index 9f70092..71ff46b 100644 --- a/travis/unix.cnf +++ b/travis/unix.cnf @@ -7,3 +7,4 @@ ssl_cert=/etc/ssl/mariadb/server.pem ssl_key=/etc/ssl/mariadb/server.key local_infile=1 log_error=mariadb.err +extra_port=3405 \ No newline at end of file diff --git a/travis/unix_no_ssl.cnf b/travis/unix_no_ssl.cnf index d922d3e..c74ee72 100644 --- a/travis/unix_no_ssl.cnf +++ b/travis/unix_no_ssl.cnf @@ -4,3 +4,4 @@ character_set_server=utf8mb4 collation_server=utf8mb4_unicode_ci local_infile=1 log_error=mariadb.err +extra_port=3405 diff --git a/travis/win.cnf b/travis/win.cnf index 92df797..079095b 100644 --- a/travis/win.cnf +++ b/travis/win.cnf @@ -6,3 +6,4 @@ character_set_server=utf8mb4 collation_server=utf8mb4_unicode_ci enable-named-pipe socket=namedpipe +extra_port=3405 \ No newline at end of file