Merge branch '2.3' into 2.4

This commit is contained in:
Johan Wikman
2020-10-28 11:45:36 +02:00
4 changed files with 11 additions and 5 deletions

View File

@ -34,7 +34,8 @@ dir="$src_dir/masking/$1"
user=skysql
test_name=masking_user
mysqltest --host=${maxscale_000_network} --port=$port \
mysqltest --no-defaults \
--host=${maxscale_000_network} --port=$port \
--user=$user --password=$maxscale_password \
--logdir=$logdir \
--test-file=$dir/t/$test_name.test \
@ -50,7 +51,8 @@ fi
user=maxskysql
test_name=masking_user
mysqltest --host=${maxscale_000_network} --port=$port \
mysqltest --no-defaults \
--host=${maxscale_000_network} --port=$port \
--user=$user --password=$maxscale_password \
--logdir=$logdir \
--test-file=$dir/t/$test_name.test \