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

Merge branch '2.1' into 2.1.7

Browse Source
This commit is contained in:
Johan Wikman
2017-09-11 12:28:02 +03:00
parent 5337a5092f f4cd2c62b6
commit faa1cc815d
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maxscale-system-test/CMakeLists.txt
View File

@ -109,7 +109,7 @@ add_test_executable(bug507.cpp bug507 replication LABELS readwritesplit LIGHT RE
add_test_executable(bug509.cpp bug509 galera LABELS readwritesplit GALERA_BACKEND) add_test_executable(bug509.cpp bug509 galera LABELS readwritesplit GALERA_BACKEND)
# Checks "SELECT * INTO OUTFILE" and "LOAD DATA LOCAL INFILE" # Checks "SELECT * INTO OUTFILE" and "LOAD DATA LOCAL INFILE"
add_test_executable(bug519.cpp bug519 replication LABELS readwritesplit HEAVY REPL_BACKEND) add_test_executable(bug519.cpp bug519 replication LABELS readwritesplit REPL_BACKEND)
# Regression case for the bug "'Current no. of conns' not going down" # Regression case for the bug "'Current no. of conns' not going down"
add_test_executable(bug529.cpp bug529 replication LABELS readwritesplit readconnroute maxscale REPL_BACKEND) add_test_executable(bug529.cpp bug529 replication LABELS readwritesplit readconnroute maxscale REPL_BACKEND)

7
maxscale-system-test/bug519.cpp
View File

@ -106,12 +106,7 @@ int main(int argc, char *argv[])
Test->try_query(Test->conn_slave, (char *) "SELECT * INTO OUTFILE '/tmp/t3.csv' FROM t1;"); Test->try_query(Test->conn_slave, (char *) "SELECT * INTO OUTFILE '/tmp/t3.csv' FROM t1;");
Test->tprintf("Copying t1.cvs from Maxscale machine:\n"); Test->tprintf("Copying t1.cvs from Maxscale machine:\n");
Test->copy_from_maxscale((char *) "/tmp/t1.csv", (char *) "./"); Test->repl->copy_from_node("/tmp/t1.csv", "./t1.csv", 0);
/*sprintf(str,
"scp -i %s -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=quiet %s@%s:/tmp/t1.csv ./",
Test->repl->sshkey[0], Test->repl->access_user[0], Test->repl->IP[0]);
Test->tprintf("%s\n", str);
system(str);*/
MYSQL *srv[2]; MYSQL *srv[2];

3
maxscale-system-test/mxs1110_16mb.cpp
View File

@ -13,6 +13,7 @@ int main(int argc, char *argv[])
{ {
TestConnections::skip_maxscale_start(true); TestConnections::skip_maxscale_start(true);
TestConnections * Test = new TestConnections(argc, argv); TestConnections * Test = new TestConnections(argc, argv);
Test->stop_maxscale();
Test->set_timeout(60); Test->set_timeout(60);
int chunk_size = 2500000; int chunk_size = 2500000;
int chunk_num = 5; int chunk_num = 5;
@ -26,6 +27,7 @@ int main(int argc, char *argv[])
Test->start_maxscale(); Test->start_maxscale();
Test->repl->execute_query_all_nodes( (char *) "set global max_allowed_packet=100000000"); Test->repl->execute_query_all_nodes( (char *) "set global max_allowed_packet=100000000");
Test->galera->execute_query_all_nodes( (char *) "set global max_allowed_packet=100000000");
Test->connect_maxscale(); Test->connect_maxscale();
Test->repl->connect(); Test->repl->connect();
@ -34,6 +36,7 @@ int main(int argc, char *argv[])
Test->repl->close_connections(); Test->repl->close_connections();
Test->close_maxscale_connections(); Test->close_maxscale_connections();
Test->repl->sync_slaves();
Test->connect_maxscale(); Test->connect_maxscale();
Test->tprintf("Checking data via RWSplit\n"); Test->tprintf("Checking data via RWSplit\n");
check_longblob_data(Test, Test->conn_rwsplit, chunk_size, chunk_num, 2); check_longblob_data(Test, Test->conn_rwsplit, chunk_size, chunk_num, 2);