From e48fb6a0710506dfbf6ed2af3464db4708ca8555 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Tue, 11 Jul 2017 22:27:42 +0300 Subject: [PATCH] Assume that the `test` database exists The tests should not drop the test database and then recreate it. This adds an unnecessary burden on replication which will cause false positives when replication is not fast enough. This is commit `2410c23e6664bef7e449dfd5a767121f309559fe` from develop cherry-picked to 2.1. --- maxscale-system-test/bug529.cpp | 3 --- maxscale-system-test/bug649.cpp | 3 +-- maxscale-system-test/short_sessions.cpp | 2 -- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/maxscale-system-test/bug529.cpp b/maxscale-system-test/bug529.cpp index 5f5de6d36..0607cd740 100644 --- a/maxscale-system-test/bug529.cpp +++ b/maxscale-system-test/bug529.cpp @@ -150,10 +150,7 @@ int main(int argc, char *argv[]) Test->repl->connect(); conn = Test->open_rwsplit_connection(); - execute_query(conn, (char *) "DROP DATABASE IF EXISTS test"); - execute_query(conn, (char *) "CREATE DATABASE test"); execute_query(conn, (char *) "USE test;"); - create_t1(conn); mysql_close(conn); Test->tprintf("Table t1 is created\n"); diff --git a/maxscale-system-test/bug649.cpp b/maxscale-system-test/bug649.cpp index a414a6ea7..fbb95d594 100644 --- a/maxscale-system-test/bug649.cpp +++ b/maxscale-system-test/bug649.cpp @@ -126,8 +126,7 @@ int main(int argc, char *argv[]) /** Clean up */ Test->repl->connect(); - execute_query(Test->repl->nodes[0], "DROP DATABASE test"); - execute_query(Test->repl->nodes[0], "CREATE DATABASE test"); + execute_query(Test->repl->nodes[0], "DROP TABLE IF EXISTS t1;"); int rval = Test->global_result; delete Test; diff --git a/maxscale-system-test/short_sessions.cpp b/maxscale-system-test/short_sessions.cpp index 6eb25789e..3b7df1ee5 100644 --- a/maxscale-system-test/short_sessions.cpp +++ b/maxscale-system-test/short_sessions.cpp @@ -24,8 +24,6 @@ int main(int argc, char *argv[]) test.repl->connect(); MYSQL *conn = test.open_rwsplit_connection(); - execute_query(conn, "DROP DATABASE IF EXISTS test;"); - execute_query(conn, "CREATE DATABASE test;"); execute_query(conn, "USE test;"); create_t1(conn); mysql_close(conn);