Merge branch '2.2' into develop

VERSION22.cmake

@@ -5,7 +5,7 @@
 
 set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version")
 set(MAXSCALE_VERSION_MINOR "2" CACHE STRING "Minor version")
-set(MAXSCALE_VERSION_PATCH "12" CACHE STRING "Patch version")
+set(MAXSCALE_VERSION_PATCH "13" CACHE STRING "Patch version")
 
 # This should only be incremented if a package is rebuilt
 set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number")

maxscale-system-test/Documentation/RELEASE.md

@@ -229,8 +229,9 @@ Br,
 
 ## 9. Send release email to mailing list
 
-Email maxscale@googlegroups.com with a mail containing the following. Replace
-`x.y.z` with the correct version.
+After the KB has been updated and the binaries are visible on the downloads
+page, email maxscale@googlegroups.com with a mail containing the
+following. Replace `x.y.z` with the correct version.
 
 Subject: `MariaDB MaxScale x.y.z available for download`
 

maxscale-system-test/mxs791_galera.sh

@@ -4,14 +4,14 @@
 ## @file mxs791.sh Simple connect test in bash
 ## - connects to Maxscale, checks that defined in cmd line DB is selected
 
-rp=`realpath $0`
+srcdir=$(dirname $(realpath $0))
 export test_dir=`pwd`
 export test_name="mxs791_galera.sh"
 echo test name is $test_name
 
-$test_dir/mxs791_base.sh
+$srcdir/mxs791_base.sh
 
 res=$?
 
-$test_dir/copy_logs.sh $test_name
+$srcdir/copy_logs.sh $test_name
 exit $res