Merge branch 'MXS-544' into develop-MXS-544-merge

2016-03-03 21:39:39 +02:00
parent 1a2bd8b234 1ebb998056
commit d3da98b58f
42 changed files with 3075 additions and 2294 deletions
--- a/server/modules/routing/debugcmd.c
+++ b/server/modules/routing/debugcmd.c
@ -926,7 +926,7 @@ convert_arg(int mode, char *arg, int arg_type)
 int
 execute_cmd(CLI_SESSION *cli)
 {
-    DCB           *dcb = cli->session->client;
+    DCB           *dcb = cli->session->client_dcb;
    int            argc, i, j, found = 0;
    char          *args[MAXARGS + 1];
    unsigned long  arg1, arg2, arg3;