From d19ae82a635426347bb5c3072edb76cdd40a9a06 Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Fri, 24 Mar 2017 09:29:53 +0200
Subject: [PATCH] Fix rebase

---
 server/core/config.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/core/config.cc b/server/core/config.cc
index 2aa5bd456..1e1789f5b 100644
--- a/server/core/config.cc
+++ b/server/core/config.cc
@@ -2571,7 +2571,7 @@ int create_new_service(CONFIG_CONTEXT *obj)
 
         if (val && *endptr == '\0')
         {
-            service_set_retry_interval(obj->element, val);
+            service_set_retry_interval(service, val);
         }
         else
         {