From 8f3a1228e661fec8d5a86dc4b8bb06dbd0a100dc Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Tue, 2 Jun 2020 10:50:30 +0300 Subject: [PATCH 1/2] 2.3 Update maintenance release number --- VERSION23.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION23.cmake b/VERSION23.cmake index 3293f0230..291781ef2 100644 --- a/VERSION23.cmake +++ b/VERSION23.cmake @@ -5,7 +5,7 @@ set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version") set(MAXSCALE_VERSION_MINOR "3" CACHE STRING "Minor version") -set(MAXSCALE_VERSION_PATCH "20" CACHE STRING "Patch version") +set(MAXSCALE_VERSION_PATCH "21" CACHE STRING "Patch version") # This should only be incremented if a package is rebuilt set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number") From 5380bd65f1ca6f986e5e47de334a9586f438d31b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Wed, 3 Jun 2020 09:54:45 +0300 Subject: [PATCH 2/2] Detect dropped system tables If a test breaks the system by dropping a system database, the replication check wouldn't detect it. --- maxscale-system-test/maxtest/src/mariadb_nodes.cc | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/maxscale-system-test/maxtest/src/mariadb_nodes.cc b/maxscale-system-test/maxtest/src/mariadb_nodes.cc index 3aeaca796..83a926fed 100644 --- a/maxscale-system-test/maxtest/src/mariadb_nodes.cc +++ b/maxscale-system-test/maxtest/src/mariadb_nodes.cc @@ -726,10 +726,21 @@ int Mariadb_nodes::check_replication() if ((res = get_versions()) != 0) { cout << "Failed to get versions" << endl; + return 1; } for (int i = 0; i < N && res == 0; i++) { + if (mysql_query(nodes[i], "SELECT COUNT(*) FROM mysql.user") == 0) + { + mysql_free_result(mysql_store_result(nodes[i])); + } + else + { + cout << mysql_error(nodes[i]) << endl; + res = 1; + } + if (i == master) { if (!check_master_node(nodes[i])) @@ -782,8 +793,7 @@ bool Mariadb_nodes::fix_replication() if (check_replication() == 0) { cout << "Replication is fixed" << endl; - flush_hosts(); - rval = true; + rval = flush_hosts(); } else {