From 85c752d15ca2ab0d30295bc88a5f4841e173f115 Mon Sep 17 00:00:00 2001
From: Mark Riddoch <Mark.Riddoch@skysql.com>
Date: Wed, 4 Feb 2015 12:15:34 +0000
Subject: [PATCH] Updated error handlign in lien with new requirements of the
 core

---
 server/modules/routing/binlog/blr.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/server/modules/routing/binlog/blr.c b/server/modules/routing/binlog/blr.c
index 727de4645..271651c49 100644
--- a/server/modules/routing/binlog/blr.c
+++ b/server/modules/routing/binlog/blr.c
@@ -977,6 +977,24 @@ ROUTER_INSTANCE	*router = (ROUTER_INSTANCE *)instance;
 int		error, len;
 char		msg[85], *errmsg;
 
+	if (action == ERRACT_RESET)
+	{
+		backend_dcb->dcb_errhandle_called = false;
+		return;
+	}
+
+	/** Don't handle same error twice on same DCB */
+        if (backend_dcb->dcb_errhandle_called)
+	{
+		/** we optimistically assume that previous call succeed */
+		*succp = true;
+		return;
+	}
+	else
+	{
+		backend_dcb->dcb_errhandle_called = true;
+	}
+
 	len = sizeof(error);
 	if (router->master && getsockopt(router->master->fd, SOL_SOCKET, SO_ERROR, &error, &len) == 0 && error != 0)
 	{