Merge branch '2.2' into develop

This commit is contained in:
Markus Mäkelä
2018-05-18 12:45:15 +03:00
6 changed files with 28 additions and 1 deletions

View File

@ -703,6 +703,10 @@ add_test_executable(mxs1828_double_local_infile.cpp mxs1828_double_local_infile
# https://jira.mariadb.org/browse/MXS-1831
add_test_executable(mxs1831_unknown_param.cpp mxs1831_unknown_param replication LABELS REPL_BACKEND)
# MXS-1873: Large session commands cause errors
# https://jira.mariadb.org/browse/MXS-1873
add_test_executable(mxs1873_large_sescmd.cpp mxs1873_large_sescmd replication LABELS readwritesplit REPL_BACKEND)
# 'namedserverfilter' test
add_test_executable(namedserverfilter.cpp namedserverfilter namedserverfilter LABELS namedserverfilter LIGHT REPL_BACKEND)

View File

@ -0,0 +1,20 @@
/**
* MXS-1873: Large session commands cause errors
*
* https://jira.mariadb.org/browse/MXS-1873
*/
#include "testconnections.h"
int main(int argc, char** argv)
{
TestConnections test(argc, argv);
test.maxscales->connect();
test.try_query(test.maxscales->conn_rwsplit[0],
"SET STATEMENT max_statement_time=30 FOR SELECT seq FROM seq_0_to_100000");
test.try_query(test.maxscales->conn_rwsplit[0], "SELECT 1");
test.maxscales->disconnect();
return test.global_result;
}