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

Format all files

Browse Source 
Formatted all files with uncrustify.
This commit is contained in:
Markus Mäkelä
2018-10-29 14:06:58 +02:00
parent 8d1b26060a
commit 906d8cee5b
9 changed files with 46 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
maxscale-system-test/mxs1980_blr_galera_server_ids.cpp
View File

@ -404,7 +404,6 @@ bool test_multiple_masters(TestConnections& test, MYSQL* pSlave)
return test.global_result == 0; return test.global_result == 0;
} }
} }
int main(int argc, char* argv[]) int main(int argc, char* argv[])

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

@ -21,7 +21,8 @@ int main(int argc, char** argv)
test.maxscales->connect(); test.maxscales->connect();
Row server1 = get_row(test.maxscales->conn_rwsplit[0], "SELECT @@server_id, @@last_insert_id, id FROM test.t1"); Row server1 = get_row(test.maxscales->conn_rwsplit[0],
"SELECT @@server_id, @@last_insert_id, id FROM test.t1");
Row server2 = get_row(test.maxscales->conn_rwsplit[0], "SELECT @@server_id, id FROM test.t2"); Row server2 = get_row(test.maxscales->conn_rwsplit[0], "SELECT @@server_id, id FROM test.t2");
Row server3 = get_row(test.maxscales->conn_rwsplit[0], "SELECT @@server_id, id FROM test.t3"); Row server3 = get_row(test.maxscales->conn_rwsplit[0], "SELECT @@server_id, id FROM test.t3");
Row server4 = get_row(test.maxscales->conn_rwsplit[0], "SELECT @@server_id, id FROM test.t4"); Row server4 = get_row(test.maxscales->conn_rwsplit[0], "SELECT @@server_id, id FROM test.t4");
@ -29,10 +30,14 @@ int main(int argc, char** argv)
test.maxscales->disconnect(); test.maxscales->disconnect();
test.repl->connect(); test.repl->connect();
test.expect(server1[0] == test.repl->get_server_id_str(0), "First query without hint should go to server1, the master"); test.expect(server1[0] == test.repl->get_server_id_str(0),
test.expect(server2[0] == test.repl->get_server_id_str(1), "Second query without hint should go to server2, the slave"); "First query without hint should go to server1, the master");
test.expect(server3[0] == test.repl->get_server_id_str(2), "First query with hint should go to server3, the first unmonitored server"); test.expect(server2[0] == test.repl->get_server_id_str(1),
test.expect(server4[0] == test.repl->get_server_id_str(3), "Second query with hint should go to server4, the second unmonitored server"); "Second query without hint should go to server2, the slave");
test.expect(server3[0] == test.repl->get_server_id_str(2),
"First query with hint should go to server3, the first unmonitored server");
test.expect(server4[0] == test.repl->get_server_id_str(3),
"Second query with hint should go to server4, the second unmonitored server");
test.repl->disconnect(); test.repl->disconnect();
return test.global_result; return test.global_result;

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

@ -626,7 +626,9 @@ void TestConnections::process_template(int m, const char* template_name, const c
if (backend_ssl) if (backend_ssl)
{ {
ss << " -e \"s|type=server|type=server\\nssl=required\\nssl_cert=/###access_homedir###/certs/client-cert.pem\\nssl_key=/###access_homedir###/certs/client-key.pem\\nssl_ca_cert=/###access_homedir###/certs/ca.pem|g\" "; ss
<<
" -e \"s|type=server|type=server\\nssl=required\\nssl_cert=/###access_homedir###/certs/client-cert.pem\\nssl_key=/###access_homedir###/certs/client-key.pem\\nssl_ca_cert=/###access_homedir###/certs/ca.pem|g\" ";
} }
ss << " -e \"s/###threads###/" << threads << "/\" "; ss << " -e \"s/###threads###/" << threads << "/\" ";