Add tests from develop

Added tests from develop. The test results need to be modified for 2.0.

maxscale-system-test/mariadb_tests_hartmut.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# This is required by one of the tests
+#
+# TODO: Don't test correctness of routing with mysqltest
+#
+./non_native_setup $1
+master_id=`echo "SELECT @@server_id" | mysql -u$node_user -p$node_password -h $node_000_network $ssl_options -P $node_000_port | tail -n1`
+echo "--disable_query_log" > Hartmut_tests/maxscale-mysqltest/testconf.inc
+echo "SET @TMASTER_ID=$master_id;" >> Hartmut_tests/maxscale-mysqltest/testconf.inc
+echo "--enable_query_log" >> Hartmut_tests/maxscale-mysqltest/testconf.inc
+
+./mysqltest_driver.sh $1 Hartmut_tests/maxscale-mysqltest 4006
+
+ret=$?
+./copy_logs.sh $1
+
+exit $ret