From de768469b9dfa036f51c2cb26ac038bcf4828a71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Tue, 27 Mar 2018 11:29:38 +0300 Subject: [PATCH] Fix hanging of mxs1585 The test appears to hang when the `SET sql_log_bin = 0` statement is executed. Removing this seems to fix it and is OK as that's not what the test aims to check. --- maxscale-system-test/mxs1585.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/maxscale-system-test/mxs1585.cpp b/maxscale-system-test/mxs1585.cpp index de800a171..280dcd817 100644 --- a/maxscale-system-test/mxs1585.cpp +++ b/maxscale-system-test/mxs1585.cpp @@ -20,9 +20,8 @@ void* query_thr(void* data) while (running) { - if (mysql_query(mysql, "SET sql_log_bin = 0") || - mysql_query(mysql, "INSERT INTO test.mxs1585 VALUES (1)") || - mysql_query(mysql, "DELETE FROM test.mxs1585")) + if (mysql_query(mysql, "INSERT INTO test.mxs1585 VALUES (1)") || + mysql_query(mysql, "DELETE FROM test.mxs1585 LIMIT 100")) { break; } @@ -66,6 +65,7 @@ int main(int argc, char** argv) for (auto& a: threads) { + test.set_timeout(60); pthread_join(a, NULL); }