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

Mxs 1665 keepalived masterdown test (#171)

Browse Source 
* add keepalived_masterdown test

* add missing cnfs
This commit is contained in:
Timofey Turenko
2018-03-16 15:14:14 +02:00
committed by GitHub
parent 391ec78a0b
commit 022c226d4b
16 changed files with 662 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
maxscale-system-test/mariadb_func.cpp
View File

@ -476,7 +476,6 @@ int find_field(MYSQL* conn, const char* sql, const char* field_name, char* value
unsigned int ret = 1;
unsigned long long int filed_i = 0;
unsigned long long int i = 0;
if (conn != NULL )
{
if (mysql_query(conn, sql) != 0)
@ -494,7 +493,6 @@ int find_field(MYSQL* conn, const char* sql, const char* field_name, char* value
else
{
num_fields = mysql_num_fields(res);
while ((field = mysql_fetch_field(res)) && ret != 0)
{
if (strstr(field->name, field_name) != NULL)
@ -509,6 +507,11 @@ int find_field(MYSQL* conn, const char* sql, const char* field_name, char* value
row = mysql_fetch_row(res);
sprintf(value, "%s", row[filed_i]);
}
else
{
sprintf(value, "%s", "");
ret = 1;
}
}
mysql_free_result(res);
do