hcq/MaxScale
hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2475 Fix mxs1980_blr_galera_server_ids test

Browse Source 
At some point the replicating slave had been changed to be
a Galera node. Won't work as the Galera node is a master.
This commit is contained in:
Johan Wikman 2019-05-13 09:42:45 +03:00
parent b10fc196a1
commit 79cfd7183d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maxscale-system-test/CMakeLists.txt
View File

@ -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 #

4
maxscale-system-test/mxs1980_blr_galera_server_ids.cpp
View File

@ -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];