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

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2018-08-30 11:36:58 +03:00
parent 9c3dc76fa9 4c5e18b4f0
commit a13e95951b
47 changed files with 323 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -230,9 +230,9 @@ int Mariadb_nodes::find_master()
while ((found == 0) && (i < N))
{
if (find_field(
nodes[i], (char *) "show slave status;",
(char *) "Master_Host", &str[0]
) == 0 )
nodes[i], (char *) "show slave status;",
(char *) "Master_Host", &str[0]
) == 0 )
{
found = 1;
strcpy(master_IP, str);
@ -714,7 +714,7 @@ static bool multi_source_replication(MYSQL *conn, int node)
MYSQL_RES *res;
if (mysql_query(conn, "SHOW ALL SLAVES STATUS") == 0 &&
(res = mysql_store_result(conn)))
(res = mysql_store_result(conn)))
{
if (mysql_num_rows(res) == 1)
{