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

Merge test changes from 2.3

Browse Source
This commit is contained in:
Timofey Turenko
2019-12-16 20:01:35 +02:00
parent e3402c42cc aa801c74c5
commit a2eafc2381
31 changed files with 88 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maxscale-system-test/mysqlmon_rejoin_manual2.cpp
View File

@ -112,7 +112,7 @@ int main(int argc, char** argv)
const char CHANGE_CMD_FMT[] = "CHANGE MASTER TO MASTER_HOST = '%s', MASTER_PORT = %d, "
"MASTER_USE_GTID = current_pos, MASTER_USER='repl', MASTER_PASSWORD = 'repl';";
char cmd[256];
snprintf(cmd, sizeof(cmd), CHANGE_CMD_FMT, test.repl->IP[3], test.repl->port[3]);
snprintf(cmd, sizeof(cmd), CHANGE_CMD_FMT, test.repl->IP_private[3], test.repl->port[3]);
mysql_query(nodes[0], cmd);
mysql_query(nodes[0], "START SLAVE;");
test.maxscales->wait_for_monitor();