Merge branch '2.0' into 2.1

2017-06-14 13:29:35 +03:00
parent 2990edc424 9285283ac5
commit 4c9fc1a39e
15 changed files with 213 additions and 174 deletions
--- a/maxscale-system-test/fwf_prepared_stmt.cpp
+++ b/maxscale-system-test/fwf_prepared_stmt.cpp
@ -47,7 +47,8 @@ int main(int argc, char** argv)
    test.add_result(!mysql_stmt_prepare(stmt, query, strlen(query)), "Binary protocol preparation should fail");
    mysql_stmt_close(stmt);

-    test.try_query(test.conn_rwsplit, "DROP TABLE test.t1");
+    test.repl->connect();
+    test.try_query(test.repl->nodes[0], "DROP TABLE test.t1");

    return test.global_result;
 }