Merge branch '2.2' into 2.2-mrm

2017-11-09 09:41:58 +02:00
parent 3a13469691 3dbd201a86
commit e68f16b099
4 changed files with 74 additions and 4 deletions
--- a/server/modules/routing/binlogrouter/blr.c
+++ b/server/modules/routing/binlogrouter/blr.c
@ -784,7 +784,7 @@ createInstance(SERVICE *service, char **options)
               "'tree' mode using GTID domain_id and server_id");

    /* Enable MariaDB the GTID maps store */
-    if (inst->mariadb10_compat && inst->mariadb10_master_gtid)
+    if (inst->mariadb10_compat)
    {
        /* Create/Open R/W GTID sqlite3 storage */
        if (!blr_open_gtid_maps_storage(inst))