Merge branch '2.1' into 2.2

.gitignore

@@ -59,4 +59,5 @@ nbproject/
 
 # RBCommons
 .reviewboardrc
-
+# vscode
+.vscode

CONTRIBUTING.md

@@ -0,0 +1,26 @@
+# Contributing to Maxscale
+
+## Prerequisites
+
+Basically, in order for us to be able to accept a contribution, it must be
+licensed under [BSD-new](http://en.wikipedia.org/wiki/BSD_licenses). Upon
+request, we can also provide a _contributor agreement_ for you to sign.
+
+When you submit a pull request, add the following comment to your pull request.
+
+> I am contributing the new code of the whole pull request, including one or
+  several files that are either new files or modified ones, under the BSD-new
+  license.
+
+Without this comment, the pull request will not be accepted.
+
+## Practicalities
+
+* Please ensure that your pull-request has been made against the correct
+  branch. For bug fixes or minor improvements, use the default branch (at the
+  time of writing `2.1`).  For new features, use the `develop` branch.
+
+* Please ensure that your code follows our [Coding Style](https://github.com/mariadb-corporation/MaxScale/wiki/Coding-Style-and-Guidelines).
+  All new code should be formatted with the
+  [Astyle configuration](https://github.com/mariadb-corporation/MaxScale/wiki/Coding-Style-and-Guidelines#tldr)
+  provided with the MaxScale source code.

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,3 @@
+I am contributing the new code of the whole pull request, including one or
+several files that are either new files or modified ones, under the BSD-new
+license.

VERSION21.cmake

@@ -5,7 +5,7 @@
 
 set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version")
 set(MAXSCALE_VERSION_MINOR "1" CACHE STRING "Minor version")
-set(MAXSCALE_VERSION_PATCH "13" CACHE STRING "Patch version")
+set(MAXSCALE_VERSION_PATCH "14" CACHE STRING "Patch version")
 
 # This should only be incremented if a package is rebuilt
 set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number")

cmake/package.cmake

@@ -58,19 +58,25 @@ find_program(DEBBUILD dpkg-buildpackage)
 if(TARBALL)
   include(cmake/package_tgz.cmake)
 
-elseif (NOT ( ${RPMBUILD} STREQUAL "RPMBUILD-NOTFOUND" ) OR NOT ( ${DEBBUILD} STREQUAL "DEBBUILD-NOTFOUND" ))
+elseif(${RPMBUILD} MATCHES "NOTFOUND" AND ${DEBBUILD} MATCHES "NOTFOUND")
-  if(NOT ( ${RPMBUILD} STREQUAL "RPMBUILD-NOTFOUND" ) )
+  message(FATAL_ERROR "Could not automatically resolve the package generator and no generators "
+    "defined on the command line. Please install distribution specific packaging software or "
+    "define -DTARBALL=Y to build tar.gz packages.")
+else()
+
+  if(${DEBBUILD} MATCHES "NOTFOUND")
+    # No DEB packaging tools found, must be an RPM system
     include(cmake/package_rpm.cmake)
-  endif()
+  else()
-  if(NOT ( ${DEBBUILD} STREQUAL "DEBBUILD-NOTFOUND" ) )
+    # We have DEB packaging tools, must be a DEB system
+    if (NOT ${RPMBUILD} MATCHES "NOTFOUND")
+      # Debian based systems can have both RPM and DEB packaging tools
+      message(WARNING "Found both DEB and RPM packaging tools, generating DEB packages. If this is not correct, "
+        "remove the packaging tools for the package type you DO NOT want to create.")
+    endif()
     include(cmake/package_deb.cmake)
   endif()
 
   message(STATUS "You can install startup scripts and system configuration files for MaxScale by running the 'postinst' shell script located at ${CMAKE_INSTALL_PREFIX}.")
   message(STATUS "To remove these installed files, run the 'postrm' shell script located in the same folder.")
-
-else()
-  message(FATAL_ERROR "Could not automatically resolve the package generator and no generators "
-    "defined on the command line. Please install distribution specific packaging software or "
-    "define -DTARBALL=Y to build tar.gz packages.")
 endif()

maxscale-system-test/CMakeLists.txt

@@ -569,6 +569,10 @@ add_test_executable(mxs1516.cpp mxs1516 replication LABELS REPL_BACKEND)
  # https://jira.mariadb.org/browse/MXS-1542
 add_test_executable(mxs1542.cpp mxs1542 avro LABELS REPL_BACKEND)
 
+# MXS-1543: Avrorouter doesn't detect MIXED or STATEMENT format replication
+# https://jira.mariadb.org/browse/MXS-1543
+add_test_executable(mxs1543.cpp mxs1543 avro LABELS REPL_BACKEND)
+
  # MXS-1585: Crash in MaxScale 2.1.12
  # https://jira.mariadb.org/browse/MXS-1585
 add_test_executable(mxs1585.cpp mxs1585 mxs1585 LABELS REPL_BACKEND)

maxscale-system-test/mxs1543.cpp

@@ -0,0 +1,32 @@
+/**
+ * MXS-1543: https://jira.mariadb.org/browse/MXS-1543
+ *
+ * Avrorouter doesn't detect MIXED or STATEMENT format replication
+ */
+
+#include "testconnections.h"
+
+int main(int argc, char** argv)
+{
+    TestConnections::skip_maxscale_start(true);
+    TestConnections::check_nodes(false);
+    TestConnections test(argc, argv);
+
+    test.replicate_from_master();
+
+    test.repl->connect();
+    execute_query(test.repl->nodes[0], "CREATE OR REPLACE TABLE t1 (data VARCHAR(30))");
+    execute_query(test.repl->nodes[0], "INSERT INTO t1 VALUES ('ROW')");
+    execute_query(test.repl->nodes[0], "SET binlog_format=STATEMENT");
+    execute_query(test.repl->nodes[0], "FLUSH LOGS");
+    execute_query(test.repl->nodes[0], "INSERT INTO t1 VALUES ('STATEMENT')");
+    execute_query(test.repl->nodes[0], "SET binlog_format=ROW");
+    execute_query(test.repl->nodes[0], "FLUSH LOGS");
+    execute_query(test.repl->nodes[0], "INSERT INTO t1 VALUES ('ROW2')");
+
+    // Wait for the avrorouter to process the data
+    sleep(10);
+    test.check_log_err("Possible STATEMENT or MIXED", true);
+
+    return test.global_result;
+}

server/core/housekeeper.cc

@@ -21,6 +21,7 @@
 #include <maxscale/semaphore.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/thread.h>
+#include <maxscale/query_classifier.h>
 #include <maxscale/json_api.h>
 
 /**
@@ -52,20 +53,30 @@ static THREAD hk_thr_handle;
 
 static void hkthread(void *);
 
-bool hkinit()
+struct hkinit_result
 {
-    bool inited = false;
+    sem_t sem;
+    bool ok;
+};
 
-    if (thread_start(&hk_thr_handle, hkthread, NULL, 0) != NULL)
+bool
+hkinit()
+{
+    struct hkinit_result res;
+    sem_init(&res.sem, 0, 0);
+    res.ok = false;
+
+    if (thread_start(&hk_thr_handle, hkthread, &res, 0) != NULL)
     {
-        inited = true;
+        sem_wait(&res.sem);
     }
     else
     {
         MXS_ALERT("Failed to start housekeeper thread.");
     }
 
-    return inited;
+    sem_destroy(&res.sem);
+    return res.ok;
 }
 
 int hktask_add(const char *name, void (*taskfn)(void *), void *data, int frequency)
@@ -214,6 +225,16 @@ void hkthread(void *data)
     void *taskdata;
     int i;
 
+    struct hkinit_result* res = (struct hkinit_result*)data;
+    res->ok = qc_thread_init(QC_INIT_BOTH);
+
+    if (!res->ok)
+    {
+        MXS_ERROR("Could not initialize housekeeper thread.");
+    }
+
+    sem_post(&res->sem);
+
     while (!do_shutdown)
     {
         for (i = 0; i < 10; i++)
@@ -253,6 +274,7 @@ void hkthread(void *data)
         spinlock_release(&tasklock);
     }
 
+    qc_thread_end(QC_INIT_BOTH);
     MXS_NOTICE("Housekeeper shutting down.");
 }
 

server/core/mysql_binlog.cc

@@ -259,7 +259,7 @@ size_t datetime_sizes[] =
  */
 static void unpack_datetime(uint8_t *ptr, int length, struct tm *dest)
 {
-    int64_t val = 0;
+    uint64_t val = 0;
     uint32_t second, minute, hour, day, month, year;
 
     if (length == -1)
@@ -717,6 +717,7 @@ size_t unpack_decimal_field(uint8_t *ptr, uint8_t *metadata, double *val_float)
     int fpart2 = decimals - fpart1 * dec_dig;
     int ibytes = ipart1 * 4 + dig_bytes[ipart2];
     int fbytes = fpart1 * 4 + dig_bytes[fpart2];
+    int field_size = ibytes + fbytes;
 
     /** Remove the sign bit and store it locally */
     bool negative = (ptr[0] & 0x80) == 0;
@@ -735,7 +736,17 @@ size_t unpack_decimal_field(uint8_t *ptr, uint8_t *metadata, double *val_float)
         }
     }
 
-    int64_t val_i = unpack_bytes(ptr, ibytes);
+    int64_t val_i = 0;
+
+    if (ibytes > 8)
+    {
+        int extra = ibytes - 8;
+        ptr += extra;
+        ibytes -= extra;
+        ss_dassert(ibytes == 8);
+    }
+
+    val_i = unpack_bytes(ptr, ibytes);
     int64_t val_f = fbytes ? unpack_bytes(ptr + ibytes, fbytes) : 0;
 
     if (negative)
@@ -746,5 +757,5 @@ size_t unpack_decimal_field(uint8_t *ptr, uint8_t *metadata, double *val_float)
 
     *val_float = (double)val_i + ((double)val_f / (pow(10.0, decimals)));
 
-    return ibytes + fbytes;
+    return field_size;
 }

server/core/test/test_utils.h

@@ -20,6 +20,11 @@
 #include <maxscale/maxscale_test.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/config.h>
+#include <maxscale/query_classifier.h>
+#include <maxscale/paths.h>
+#include <maxscale/alloc.h>
+
+#include <sys/stat.h>
 
 #include "../internal/poll.h"
 #include "../internal/statistics.h"
@@ -28,15 +33,17 @@
 
 void init_test_env(char *path)
 {
-    int argc = 3;
-
-    const char* logdir = path ? path : TEST_LOG_DIR;
-
     config_get_global_options()->n_threads = 1;
 
     ts_stats_init();
-    mxs_log_init(NULL, logdir, MXS_LOG_TARGET_DEFAULT);
+    if (!mxs_log_init(NULL, NULL, MXS_LOG_TARGET_STDOUT))
+    {
+        exit(1);
+    }
     dcb_global_init();
+    set_libdir(MXS_STRDUP(TEST_DIR "/query_classifier/qc_sqlite/"));
+    qc_setup(NULL, QC_SQL_MODE_DEFAULT, NULL);
+    qc_process_init(QC_INIT_BOTH);
     poll_init();
     maxscale::MessageQueue::init();
     maxscale::Worker::init();

server/modules/routing/avrorouter/avro_file.c

@@ -23,6 +23,7 @@
  */
 
 #include "avrorouter.h"
+#include <maxscale/query_classifier.h>
 
 #include <binlog_common.h>
 #include <blr_constants.h>
@@ -1038,6 +1039,25 @@ void handle_query_event(AVRO_INSTANCE *router, REP_HEADER *hdr, int *pending_tra
     len = tmpsz;
     unify_whitespace(sql, len);
 
+    static bool warn_not_row_format = true;
+
+    if (warn_not_row_format)
+    {
+        GWBUF* buffer = gwbuf_alloc(len + 5);
+        gw_mysql_set_byte3(GWBUF_DATA(buffer), len + 1);
+        GWBUF_DATA(buffer)[4] = 0x03;
+        memcpy(GWBUF_DATA(buffer) + 5, sql, len);
+        qc_query_op_t op = qc_get_operation(buffer);
+        gwbuf_free(buffer);
+
+        if (op == QUERY_OP_UPDATE || op == QUERY_OP_INSERT || op == QUERY_OP_DELETE)
+        {
+            MXS_WARNING("Possible STATEMENT or MIXED format binary log. Check that "
+                        "'binlog_format' is set to ROW on the master.");
+            warn_not_row_format = false;
+        }
+    }
+
     if (is_create_table_statement(router, sql, len))
     {
         TABLE_CREATE *created = NULL;

server/modules/routing/avrorouter/avro_rbr.c

@@ -17,6 +17,7 @@
 #include <jansson.h>
 #include <maxscale/alloc.h>
 #include <strings.h>
+#include <signal.h>
 #include <maxscale/utils.h>
 
 #define WRITE_EVENT         0
@@ -107,6 +108,15 @@ bool handle_table_map_event(AVRO_INSTANCE *router, REP_HEADER *hdr, uint8_t *ptr
         TABLE_MAP *old = hashtable_fetch(router->table_maps, table_ident);
         TABLE_MAP *map = table_map_alloc(ptr, ev_len, create);
         MXS_ABORT_IF_NULL(map); // Fatal error at this point
+
+        if (old && old->id == map->id && old->version == map->version &&
+            strcmp(old->table, map->table) == 0 &&
+            strcmp(old->database, map->database) == 0)
+        {
+            table_map_free(map);
+            return true;
+        }
+
         char* json_schema = json_new_schema_from_table(map);
 
         if (json_schema)
@@ -487,6 +497,19 @@ int get_metadata_len(uint8_t type)
     }
 }
 
+// Make sure that both `i` and `trace` are defined before using this macro
+#define check_overflow(t) do \
+    { \
+        if (!(t)) \
+        { \
+            for (long x = 0; x < i;x++) \
+            { \
+                MXS_ALERT("%s", trace[x]); \
+            } \
+            raise(SIGABRT); \
+        } \
+    }while(false)
+
 /**
  * @brief Extract the values from a single row  in a row event
  *
@@ -503,7 +526,7 @@ uint8_t* process_row_event_data(TABLE_MAP *map, TABLE_CREATE *create, avro_value
 {
     int npresent = 0;
     avro_value_t field;
-    long ncolumns = map->columns;
+    long ncolumns = MXS_MIN(map->columns, create->columns);
     uint8_t *metadata = map->column_metadata;
     size_t metadata_offset = 0;
 
@@ -516,7 +539,10 @@ uint8_t* process_row_event_data(TABLE_MAP *map, TABLE_CREATE *create, avro_value
     ptr += (ncolumns + 7) / 8;
     ss_dassert(ptr < end);
 
-    for (long i = 0; i < map->columns && i < create->columns && npresent < ncolumns; i++)
+    char trace[ncolumns][768];
+    memset(trace, 0, sizeof(trace));
+
+    for (long i = 0; i < ncolumns && npresent < ncolumns; i++)
     {
         ss_debug(int rc = )avro_value_get_by_name(record, create->column_names[i], &field, NULL);
         ss_dassert(rc == 0);
@@ -526,7 +552,7 @@ uint8_t* process_row_event_data(TABLE_MAP *map, TABLE_CREATE *create, avro_value
             npresent++;
             if (bit_is_set(null_bitmap, ncolumns, i))
             {
-                MXS_INFO("[%ld] NULL", i);
+                sprintf(trace[i], "[%ld] NULL", i);
                 if (column_is_blob(map->column_types[i]))
                 {
                     uint8_t nullvalue = 0;
@@ -548,9 +574,9 @@ uint8_t* process_row_event_data(TABLE_MAP *map, TABLE_CREATE *create, avro_value
                     char strval[bytes * 2 + 1];
                     gw_bin2hex(strval, val, bytes);
                     avro_value_set_string(&field, strval);
-                    MXS_INFO("[%ld] ENUM: %lu bytes", i, bytes);
+                    sprintf(trace[i], "[%ld] ENUM: %lu bytes", i, bytes);
                     ptr += bytes;
-                    ss_dassert(ptr < end);
+                    check_overflow(ptr < end);
                 }
                 else
                 {
@@ -580,13 +606,13 @@ uint8_t* process_row_event_data(TABLE_MAP *map, TABLE_CREATE *create, avro_value
                         bytes = *ptr++;
                     }
 
-                    MXS_INFO("[%ld] CHAR: field: %d bytes, data: %d bytes", i, field_length, bytes);
+                    sprintf(trace[i], "[%ld] CHAR: field: %d bytes, data: %d bytes", i, field_length, bytes);
                     char str[bytes + 1];
                     memcpy(str, ptr, bytes);
                     str[bytes] = '\0';
                     avro_value_set_string(&field, str);
                     ptr += bytes;
-                    ss_dassert(ptr < end);
+                    check_overflow(ptr < end);
                 }
             }
             else if (column_is_bit(map->column_types[i]))
@@ -603,17 +629,17 @@ uint8_t* process_row_event_data(TABLE_MAP *map, TABLE_CREATE *create, avro_value
                     MXS_WARNING("BIT is not currently supported, values are stored as 0.");
                 }
                 avro_value_set_int(&field, value);
-                MXS_INFO("[%ld] BIT", i);
+                sprintf(trace[i], "[%ld] BIT", i);
                 ptr += bytes;
-                ss_dassert(ptr < end);
+                check_overflow(ptr < end);
             }
             else if (column_is_decimal(map->column_types[i]))
             {
                 double f_value = 0.0;
                 ptr += unpack_decimal_field(ptr, metadata + metadata_offset, &f_value);
                 avro_value_set_double(&field, f_value);
-                MXS_INFO("[%ld] DOUBLE", i);
+                sprintf(trace[i], "[%ld] DECIMAL", i);
-                ss_dassert(ptr < end);
+                check_overflow(ptr < end);
             }
             else if (column_is_variable_string(map->column_types[i]))
             {
@@ -630,13 +656,13 @@ uint8_t* process_row_event_data(TABLE_MAP *map, TABLE_CREATE *create, avro_value
                     ptr++;
                 }
 
-                MXS_INFO("[%ld] VARCHAR: field: %d bytes, data: %lu bytes", i, bytes, sz);
+                sprintf(trace[i], "[%ld] VARCHAR: field: %d bytes, data: %lu bytes", i, bytes, sz);
                 char buf[sz + 1];
                 memcpy(buf, ptr, sz);
                 buf[sz] = '\0';
                 ptr += sz;
                 avro_value_set_string(&field, buf);
-                ss_dassert(ptr < end);
+                check_overflow(ptr < end);
             }
             else if (column_is_blob(map->column_types[i]))
             {
@@ -644,7 +670,7 @@ uint8_t* process_row_event_data(TABLE_MAP *map, TABLE_CREATE *create, avro_value
                 uint64_t len = 0;
                 memcpy(&len, ptr, bytes);
                 ptr += bytes;
-                MXS_INFO("[%ld] BLOB: field: %d bytes, data: %lu bytes", i, bytes, len);
+                sprintf(trace[i], "[%ld] BLOB: field: %d bytes, data: %lu bytes", i, bytes, len);
                 if (len)
                 {
                     avro_value_set_bytes(&field, ptr, len);
@@ -655,7 +681,7 @@ uint8_t* process_row_event_data(TABLE_MAP *map, TABLE_CREATE *create, avro_value
                     uint8_t nullvalue = 0;
                     avro_value_set_bytes(&field, &nullvalue, 1);
                 }
-                ss_dassert(ptr < end);
+                check_overflow(ptr < end);
             }
             else if (column_is_temporal(map->column_types[i]))
             {
@@ -666,8 +692,8 @@ uint8_t* process_row_event_data(TABLE_MAP *map, TABLE_CREATE *create, avro_value
                                              create->column_lengths[i], &tm);
                 format_temporal_value(buf, sizeof(buf), map->column_types[i], &tm);
                 avro_value_set_string(&field, buf);
-                MXS_INFO("[%ld] %s: %s", i, column_type_to_string(map->column_types[i]), buf);
+                sprintf(trace[i], "[%ld] %s: %s", i, column_type_to_string(map->column_types[i]), buf);
-                ss_dassert(ptr < end);
+                check_overflow(ptr < end);
             }
             /** All numeric types (INT, LONG, FLOAT etc.) */
             else
@@ -677,11 +703,18 @@ uint8_t* process_row_event_data(TABLE_MAP *map, TABLE_CREATE *create, avro_value
                 ptr += unpack_numeric_field(ptr, map->column_types[i],
                                             &metadata[metadata_offset], lval);
                 set_numeric_field_value(&field, map->column_types[i], &metadata[metadata_offset], lval);
-                ss_dassert(ptr < end);
+                sprintf(trace[i], "[%ld] %s", i, column_type_to_string(map->column_types[i]));
+                check_overflow(ptr < end);
             }
             ss_dassert(metadata_offset <= map->column_metadata_size);
             metadata_offset += get_metadata_len(map->column_types[i]);
         }
+        else
+        {
+            sprintf(trace[i], "[%ld] %s: Not present", i, column_type_to_string(map->column_types[i]));
+        }
+
+        MXS_INFO("%s", trace[i]);
     }
 
     return ptr;

server/modules/routing/avrorouter/avro_schema.c

@@ -311,10 +311,6 @@ void save_avro_schema(const char *path, const char* schema, TABLE_MAP *map)
             }
         }
     }
-    else
-    {
-        MXS_NOTICE("Schema version %d already exists: %s", map->version, filepath);
-    }
 }
 
 /**
@@ -421,28 +417,33 @@ static bool get_database_name(const char* sql, char* dest)
     if (ptr)
     {
         ptr--;
-        while (*ptr == '`' || isspace(*ptr))
+        while (ptr >= sql && (*ptr == '`' || isspace(*ptr)))
         {
             ptr--;
         }
 
-        while (*ptr != '`' && *ptr != '.' && !isspace(*ptr))
+        while (ptr >= sql && *ptr != '`' && *ptr != '.' && !isspace(*ptr))
         {
             ptr--;
         }
 
-        if (*ptr == '.')
+        while (ptr >= sql && (*ptr == '`' || isspace(*ptr)))
+        {
+            ptr--;
+        }
+
+        if (ptr >= sql && *ptr == '.')
         {
             // The query defines an explicit database
 
-            while (*ptr == '`' || *ptr == '.' || isspace(*ptr))
+            while (ptr >= sql && (*ptr == '`' || *ptr == '.' || isspace(*ptr)))
             {
                 ptr--;
             }
 
             const char* end = ptr + 1;
 
-            while (*ptr != '`' && *ptr != '.' && !isspace(*ptr))
+            while (ptr >= sql && *ptr != '`' && *ptr != '.' && !isspace(*ptr))
             {
                 ptr--;
             }
@@ -702,6 +703,21 @@ TABLE_CREATE* table_create_from_schema(const char* file, const char* db,
     return newtable;
 }
 
+int resolve_table_version(const char* db, const char* table)
+{
+    int version = 0;
+    char buf[PATH_MAX + 1];
+
+    do
+    {
+        version++;
+        snprintf(buf, sizeof(buf), "%s.%s.%06d.avsc", db, table, version);
+    }
+    while (access(buf, F_OK) == 0);
+
+    return version;
+}
+
 /**
  * @brief Handle a query event which contains a CREATE TABLE statement
  * @param sql Query SQL
@@ -757,7 +773,7 @@ TABLE_CREATE* table_create_alloc(const char* sql, int len, const char* db)
     {
         if ((rval = MXS_MALLOC(sizeof(TABLE_CREATE))))
         {
-            rval->version = 1;
+            rval->version = resolve_table_version(db, table);
             rval->was_used = false;
             rval->column_names = names;
             rval->column_lengths = lengths;
@@ -1139,7 +1155,7 @@ void read_alter_identifier(const char *sql, const char *end, char *dest, int siz
     int len = 0;
     const char *tok = get_tok(sql, &len, end); // ALTER
     if (tok && (tok = get_tok(tok + len, &len, end)) // TABLE
-                && (tok = get_tok(tok + len, &len, end))) // Table identifier
+        && (tok = get_tok(tok + len, &len, end))) // Table identifier
     {
         snprintf(dest, size, "%.*s", len, tok);
         remove_backticks(dest);
@@ -1445,6 +1461,8 @@ void table_map_free(TABLE_MAP *map)
     if (map)
     {
         MXS_FREE(map->column_types);
+        MXS_FREE(map->column_metadata);
+        MXS_FREE(map->null_bitmap);
         MXS_FREE(map->database);
         MXS_FREE(map->table);
         MXS_FREE(map);

server/modules/routing/maxinfo/maxinfo.c

@@ -63,7 +63,7 @@ static int maxinfo_statistics(INFO_INSTANCE *, INFO_SESSION *, GWBUF *);
 static int maxinfo_ping(INFO_INSTANCE *, INFO_SESSION *, GWBUF *);
 static int maxinfo_execute_query(INFO_INSTANCE *, INFO_SESSION *, char *);
 static int handle_url(INFO_INSTANCE *instance, INFO_SESSION *router_session, GWBUF *queue);
-
+static int maxinfo_send_ok(DCB *dcb);
 
 /* The router entry points */
 static  MXS_ROUTER *createInstance(SERVICE *service, char **options);
@@ -348,7 +348,7 @@ execute(MXS_ROUTER *rinstance, MXS_ROUTER_SESSION *router_session, GWBUF *queue)
         switch (MYSQL_COMMAND(queue))
         {
         case MXS_COM_PING:
-            rc = maxinfo_ping(instance, session, queue);
+            rc = maxinfo_send_ok(session->dcb);
             break;
         case MXS_COM_STATISTICS:
             rc = maxinfo_statistics(instance, session, queue);
@@ -622,7 +622,7 @@ maxinfo_execute_query(INFO_INSTANCE *instance, INFO_SESSION *session, char *sql)
         respond_starttime(session->dcb);
         return 1;
     }
-    if (strcasecmp(sql, "set names 'utf8'") == 0)
+    if (strncasecmp(sql, "set names", 9) == 0)
     {
         return maxinfo_send_ok(session->dcb);
     }
@@ -630,6 +630,10 @@ maxinfo_execute_query(INFO_INSTANCE *instance, INFO_SESSION *session, char *sql)
     {
         return maxinfo_send_ok(session->dcb);
     }
+    if (strncasecmp(sql, "set @@session", 13) == 0)
+    {
+        return maxinfo_send_ok(session->dcb);
+    }
     if (strncasecmp(sql, "set autocommit", 14) == 0)
     {
         return maxinfo_send_ok(session->dcb);

server/modules/routing/maxinfo/maxinfo_exec.c

@@ -354,6 +354,13 @@ exec_flush(DCB *dcb, MAXINFO_TREE *tree)
     int i;
     char errmsg[120];
 
+    sprintf(errmsg, "Unsupported flush command '%s'", tree->value);
+    if(!tree)
+    {
+        maxinfo_send_error(dcb, 0, errmsg);
+        MXS_ERROR("%s", errmsg);
+        return;
+    }
     for (i = 0; flush_commands[i].name; i++)
     {
         if (strcasecmp(flush_commands[i].name, tree->value) == 0)
@@ -366,7 +373,6 @@ exec_flush(DCB *dcb, MAXINFO_TREE *tree)
     {
         tree->value[80] = 0;
     }
-    sprintf(errmsg, "Unsupported flush command '%s'", tree->value);
     maxinfo_send_error(dcb, 0, errmsg);
     MXS_ERROR("%s", errmsg);
 }