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

Merge branch '2.1' into 2.2

Browse Source
This commit is contained in:
Markus Mäkelä
2017-10-03 14:30:06 +03:00
parent 27ccf0877c 9280f1a5d7
commit bd39284f9c
39 changed files with 685 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
maxscale-system-test/testconnections.h
View File

@ -220,7 +220,7 @@ public:
* @param prefix file name prefix
* @return 0 if success
*/
int copy_mariadb_logs(Mariadb_nodes *repl, char * prefix);
int copy_mariadb_logs(Mariadb_nodes *repl, const char* prefix);
/**
* @brief no_backend_log_copy if true logs from backends are not copied (needed if case of Aurora RDS backend or similar)
@ -700,7 +700,7 @@ public:
* @param snapshot_name name of snapshot to revert
* @return 0 in case of success or mdbci error code in case of error
*/
int revert_snapshot(char * snapshot_name);
int revert_snapshot(const char* snapshot_name);
/**
* @brief Test a bad configuration