Merge test changes from 2.3

2019-12-16 20:01:35 +02:00
parent e3402c42cc aa801c74c5
commit a2eafc2381
31 changed files with 88 additions and 90 deletions
--- a/maxscale-system-test/mariadb_func.cpp
+++ b/maxscale-system-test/mariadb_func.cpp
@ -474,7 +474,7 @@ int get_conn_num(MYSQL* conn, std::string ip, std::string hostname, std::string
                    row = mysql_fetch_row(res);
                    if ((row[2] != NULL ) && (row[3] != NULL))
                    {
-                        if (strstr(row[2], ip.c_str()) && strstr(row[3], db.c_str()))
+                        if ((strcmp(strtok(row[2], ":"), ip.c_str()) == 0) && strstr(row[3], db.c_str()))
                        {
                            conn_num++;
                        }