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

Partially revert 4ba011266843857bbd3201e5b925a47e88e1808f

Browse Source 
Add back leading operator enforcement.
This commit is contained in:
Markus Mäkelä
2018-09-20 15:26:51 +03:00
parent d8d0b1a29c
commit 71ffef5708
95 changed files with 1395 additions and 1392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -948,8 +948,8 @@ int TestConnections::start_binlog(int m)
repl->stop_nodes();
binlog
= open_conn_no_db(maxscales->binlog_port[m], maxscales->IP[m], repl->user_name, repl->password, ssl);
binlog =
open_conn_no_db(maxscales->binlog_port[m], maxscales->IP[m], repl->user_name, repl->password, ssl);
execute_query(binlog, "stop slave");
execute_query(binlog, "reset slave all");
mysql_close(binlog);
@ -1015,8 +1015,8 @@ int TestConnections::start_binlog(int m)
add_result(maxscales->start_maxscale(m), "Maxscale start failed\n");
tprintf("Connecting to MaxScale binlog router (with any DB)\n");
binlog
= open_conn_no_db(maxscales->binlog_port[m], maxscales->IP[m], repl->user_name, repl->password, ssl);
binlog =
open_conn_no_db(maxscales->binlog_port[m], maxscales->IP[m], repl->user_name, repl->password, ssl);
add_result(mysql_errno(binlog), "Error connection to binlog router %s\n", mysql_error(binlog));
@ -1562,8 +1562,8 @@ int TestConnections::create_connections(int m,
printf("Galera \n");
}
galera_conn[i]
= open_conn(4016, maxscales->IP[m], maxscales->user_name, maxscales->password, ssl);
galera_conn[i] =
open_conn(4016, maxscales->IP[m], maxscales->user_name, maxscales->password, ssl);
if (mysql_errno(galera_conn[i]) != 0)
{
local_result++;