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:
Markus Mäkelä
2018-03-28 09:19:42 +03:00
parent 46ebf19223 3be2ee8b28
commit 6ec87ae9f2
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
maxscale-system-test/mxs1585.cpp
View File

@ -20,9 +20,7 @@ void* query_thr(void* data)
while (running) while (running)
{ {
if (mysql_query(mysql, "SET max_statement_time = 30") || if (mysql_query(mysql, "INSERT INTO test.mxs1585 VALUES (1)") ||
mysql_query(mysql, "SET sql_log_bin = 0") ||
mysql_query(mysql, "INSERT INTO test.mxs1585 VALUES (1)") ||
mysql_query(mysql, "DELETE FROM test.mxs1585 LIMIT 100")) mysql_query(mysql, "DELETE FROM test.mxs1585 LIMIT 100"))
{ {
break; break;
@ -68,6 +66,7 @@ int main(int argc, char** argv)
for (auto& a: threads) for (auto& a: threads)
{ {
test.set_timeout(60);
pthread_join(a, NULL); pthread_join(a, NULL);
} }