From 79cfd7183df54db1c73ac02d5e34d0a8fa462599 Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Mon, 13 May 2019 09:42:45 +0300 Subject: [PATCH] MXS-2475 Fix mxs1980_blr_galera_server_ids test At some point the replicating slave had been changed to be a Galera node. Won't work as the Galera node is a master. --- maxscale-system-test/CMakeLists.txt | 2 +- maxscale-system-test/mxs1980_blr_galera_server_ids.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/maxscale-system-test/CMakeLists.txt b/maxscale-system-test/CMakeLists.txt index 0a8a4b75f..6c2c4fff6 100644 --- a/maxscale-system-test/CMakeLists.txt +++ b/maxscale-system-test/CMakeLists.txt @@ -362,7 +362,7 @@ add_test_executable(pers_01.cpp pers_01 pers_01 LABELS maxscale REPL_BACKEND rea # MXS-1980: Support Galera cluster nodes as masters for Binlog Router # https://jira.mariadb.org/browse/MXS-1980 -add_test_executable(mxs1980_blr_galera_server_ids.cpp mxs1980_blr_galera_server_ids mxs1980_blr_galera_server_ids LABELS binlogrouter GALERA_BACKEND) +add_test_executable(mxs1980_blr_galera_server_ids.cpp mxs1980_blr_galera_server_ids mxs1980_blr_galera_server_ids LABELS binlogrouter GALERA_BACKEND REPL_BACKEND) ############################################ # END: Galera tests # diff --git a/maxscale-system-test/mxs1980_blr_galera_server_ids.cpp b/maxscale-system-test/mxs1980_blr_galera_server_ids.cpp index 96cd49e67..ad7dc338c 100644 --- a/maxscale-system-test/mxs1980_blr_galera_server_ids.cpp +++ b/maxscale-system-test/mxs1980_blr_galera_server_ids.cpp @@ -488,9 +488,9 @@ int main(int argc, char* argv[]) { if (setup_blr(test, pMaxscale, gtid, approach)) { - int slave_index = test.galera->N - 1; // We use the last slave. + int slave_index = test.repl->N - 1; // We use the last slave. - Mariadb_nodes& ms = *test.galera; + Mariadb_nodes& ms = *test.repl; ms.connect(slave_index); MYSQL* pSlave = ms.nodes[slave_index];