Merge branch '2.3' into 2.4

system-test/cache_basic.sh

@@ -18,7 +18,8 @@ function run_test
     echo $test_name
     logdir=log_$test_name
     mkdir -p $logdir
-    mysqltest --host=${maxscale_000_network} --port=$port \
+    mysqltest --no-defaults \
+              --host=${maxscale_000_network} --port=$port \
               --user=$user --password=$password \
               --logdir=$logdir \
               --test-file=$dir/t/$test_name.test \

system-test/cnf/maxscale.cnf.template.mxs421_events

@@ -4,6 +4,8 @@ threads=###threads###
 #event.authentication_failure.facility=LOG_AUTH
 #event.authentication_failure.level=LOG_ERR
 
+syslog=true
+
 [MySQL-Monitor]
 type=monitor
 module=mysqlmon
@@ -21,7 +23,7 @@ password=skysql
 
 [RW-Split-Listener]
 type=listener
-service=RW Split Router
+service=RW-Split-Router
 protocol=MySQLClient
 port=4006
 

system-test/masking_user.sh

@@ -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 \

system-test/mysqltest_driver.sh

@@ -47,7 +47,8 @@ for t in `ls $2/t/*.test|xargs -L 1 basename`
 do
     printf "$t:"
     test_name=${t%%.test}
-    mysqltest --host=${maxscale_000_network} --port=$port \
+    mysqltest --no-defaults \
+              --host=${maxscale_000_network} --port=$port \
               --user=$user --password=$password \
               --logdir=log_$1 \
               --test-file=$2/t/$test_name.test \