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:
Esa Korhonen
2018-03-16 11:55:54 +02:00
parent d32db326e4 2178667245
commit 6afd57122d
4 changed files with 44 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,9 +18,9 @@ int main(int argc, char *argv[])
for (int i = 0; i < 2; i++)
{
char result[1024];
test.add_result(test.maxscales->get_maxadmin_param(0, "show dbusers \"RW Split Router\"", "User names:", result),
test.add_result(test.maxscales->ssh_node_f(0, true, "maxadmin show dbusers \"RW Split Router\"|grep 'User names'"),
"Old style objects in maxadmin commands should succeed");
test.add_result(test.maxscales->get_maxadmin_param(0, "show dbusers RW-Split-Router", "User names:", result),
test.add_result(test.maxscales->ssh_node_f(0, true, "maxadmin show dbusers RW-Split-Router|grep 'User names'"),
"New style objects in maxadmin commands should succeed");
}

8
maxscale-system-test/rwsplit_readonly.cpp
View File

@ -259,10 +259,14 @@ int main(int argc, char *argv[])
/** Prepare for tests */
Test->stop_timeout();
Test->maxscales->connect_maxscale(0);
execute_query_silent(Test->maxscales->conn_rwsplit[0], "DROP TABLE IF EXISTS test.readonly\n");
execute_query_silent(Test->maxscales->conn_rwsplit[0], "CREATE TABLE test.readonly(id int)\n");
execute_query_silent(Test->maxscales->conn_rwsplit[0], "DROP TABLE IF EXISTS test.readonly");
execute_query_silent(Test->maxscales->conn_rwsplit[0], "CREATE TABLE test.readonly(id int)");
Test->maxscales->close_maxscale_connections(0);
Test->repl->connect();
Test->repl->sync_slaves();
Test->repl->disconnect();
/** Basic tests */
test_basic(Test);