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

Merge branch '2.3' into develop

Browse Source
This commit is contained in:
Johan Wikman
2019-05-14 12:33:50 +03:00
parent 22a9e20f1f b7d948db3f
commit c09617cd82
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -360,7 +360,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 # MXS-1980: Support Galera cluster nodes as masters for Binlog Router
# https://jira.mariadb.org/browse/MXS-1980 # 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 # # END: Galera tests #

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

@ -285,6 +285,10 @@ void setup_galera(TestConnections& test)
for (int i = 0; i < gc.N; ++i) for (int i = 0; i < gc.N; ++i)
{ {
gc.stash_server_settings(i); gc.stash_server_settings(i);
// https://mariadb.com/kb/en/library/using-mariadb-gtids-with-mariadb-galera-cluster/#wsrep-gtid-mode
gc.add_server_setting(i, "wsrep_gtid_mode=ON");
gc.add_server_setting(i, "wsrep_gtid_domain_id=13");
gc.add_server_setting(i, "gtid_domain_id=0");
gc.add_server_setting(i, "log_slave_updates=1"); gc.add_server_setting(i, "log_slave_updates=1");
gc.add_server_setting(i, "log_bin=galera-cluster"); gc.add_server_setting(i, "log_bin=galera-cluster");
} }
@ -488,9 +492,9 @@ int main(int argc, char* argv[])
{ {
if (setup_blr(test, pMaxscale, gtid, approach)) 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); ms.connect(slave_index);
MYSQL* pSlave = ms.nodes[slave_index]; MYSQL* pSlave = ms.nodes[slave_index];

2
server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
View File

@ -1413,8 +1413,6 @@ int gw_MySQLAccept(DCB* dcb)
{ {
MySQLSendHandshake(dcb); MySQLSendHandshake(dcb);
} }
return 1;
} }
static int gw_error_client_event(DCB* dcb) static int gw_error_client_event(DCB* dcb)