Merge branch '2.2' into develop

server/modules/routing/binlogrouter/blr.c

@@ -646,11 +646,6 @@ createInstance(SERVICE *service, char **options)
             }
         }
     }
-    else
-    {
-        MXS_ERROR("%s: Error: No router options supplied for binlogrouter",
-                  service->name);
-    }
 
     inst->orig_masterid = 0;
     inst->mariadb10_gtid_domain = BLR_DEFAULT_GTID_DOMAIN_ID;
@@ -831,6 +826,7 @@ createInstance(SERVICE *service, char **options)
         ssl_cfg->ssl_init_done = false;
         ssl_cfg->ssl_method_type = SERVICE_SSL_TLS_MAX;
         ssl_cfg->ssl_cert_verify_depth = 9;
+        ssl_cfg->ssl_verify_peer_certificate = true;
 
         /** Set SSL pointer in in server struct */
         server->server_ssl = ssl_cfg;
@@ -872,10 +868,10 @@ createInstance(SERVICE *service, char **options)
     {
         if (rc == -1)
         {
-            MXS_ERROR("%s: master.ini file not found in %s."
-                      " Master registration cannot be started."
-                      " Configure with CHANGE MASTER TO ...",
-                      inst->service->name, inst->binlogdir);
+            MXS_WARNING("%s: master.ini file not found in %s."
+                        " Master registration cannot be started."
+                        " Configure with CHANGE MASTER TO ...",
+                        inst->service->name, inst->binlogdir);
         }
         else
         {

server/modules/routing/binlogrouter/blr.h

@@ -532,6 +532,7 @@ typedef struct router_slave
     char              *mariadb_gtid;  /*< MariaDB 10 Slave connects with GTID */
     sqlite3           *gtid_maps;     /*< GTID storage client handle, read only*/
     MARIADB_GTID_INFO f_info;         /*< GTID info for file name prefix */
+    bool              annotate_rows;  /*< MariaDB 10 Slave requests ANNOTATE_ROWS */
 #if defined(SS_DEBUG)
     skygw_chk_t     rses_chk_tail;
 #endif

server/modules/routing/binlogrouter/test/testbinlog.c

@@ -49,7 +49,7 @@
 #include <maxscale/version.h>
 
 // This isn't really a clean way of testing
-#include "../../../../core/maxscale/service.h"
+#include "../../../../core/internal/service.h"
 
 static void printVersion(const char *progname);
 static void printUsage(const char *progname);