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-04-23 14:05:52 +03:00
parent ac7d1198fb d67320e06a
commit f4bdf3012d
59 changed files with 172 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,7 +102,7 @@ void Mariadb_nodes::close_connections()
int Mariadb_nodes::read_env()
void Mariadb_nodes::read_env()
{
char * env;
char env_name[64];
@ -207,7 +207,7 @@ int Mariadb_nodes::read_env()
}
}
int Mariadb_nodes::print_env()
void Mariadb_nodes::print_env()
{
for (int i = 0; i < N; i++)
{
@ -255,7 +255,7 @@ int Mariadb_nodes::find_master()
return master_node;
}
int Mariadb_nodes::change_master(int NewMaster, int OldMaster)
void Mariadb_nodes::change_master(int NewMaster, int OldMaster)
{
for (int i = 0; i < N; i++)
{