Merge branch '2.2' into 2.3

2019-01-03 09:21:47 +02:00
parent 35d31801bb 8f0e4a3034
commit 26da72a41f
14 changed files with 235 additions and 148 deletions
--- a/maxscale-system-test/mxs657_restart.cpp
+++ b/maxscale-system-test/mxs657_restart.cpp
@ -6,7 +6,6 @@


 #include "testconnections.h"
-#include "sysbench_commands.h"
 #include "sql_t1.h"
 #include "get_com_select_insert.h"