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

Uncrustify maxscale

Browse Source 
See script directory for method. The script to run in the top level
MaxScale directory is called maxscale-uncrustify.sh, which uses
another script, list-src, from the same directory (so you need to set
your PATH). The uncrustify version was 0.66.
This commit is contained in:
Niclas Antti
2018-09-09 22:26:19 +03:00
parent fa7ec95069
commit c447e5cf15
849 changed files with 35002 additions and 27238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
maxscale-system-test/galera_priority.cpp
View File

@ -17,13 +17,13 @@
using namespace std;
int check_server_id(TestConnections* test, char *node_id)
int check_server_id(TestConnections* test, char* node_id)
{
char str[1024];
int rval = 0;
if (execute_query(test->maxscales->conn_rwsplit[0], "BEGIN") ||
find_field(test->maxscales->conn_rwsplit[0], "SELECT @@server_id", "@@server_id", str) ||
execute_query(test->maxscales->conn_rwsplit[0], "COMMIT"))
if (execute_query(test->maxscales->conn_rwsplit[0], "BEGIN")
|| find_field(test->maxscales->conn_rwsplit[0], "SELECT @@server_id", "@@server_id", str)
|| execute_query(test->maxscales->conn_rwsplit[0], "COMMIT"))
{
test->tprintf("Failed to compare @@server_id.\n");
rval = 1;
@ -110,7 +110,8 @@ int simple_failover(TestConnections* test)
if ((myerrno = test->maxscales->connect_rwsplit(0)) == 0 && test->maxscales->conn_rwsplit[0])
{
test->tprintf("Connecting to rwsplit was expected to fail but it was"
" successful. Returned error was %d.\n", myerrno);
" successful. Returned error was %d.\n",
myerrno);
if (execute_query(test->maxscales->conn_rwsplit[0], "SELECT @@server_id") == 0)
{
test->tprintf("SELECT @@server_id was expected to fail but the query was successful.\n");
@ -160,9 +161,9 @@ int simple_failover(TestConnections* test)
return rval;
}
int main(int argc, char **argv)
int main(int argc, char** argv)
{
TestConnections *test = new TestConnections(argc, argv);
TestConnections* test = new TestConnections(argc, argv);
test->galera->verbose = false;
int rval1 = 0;
rval1 += simple_failover(test);