From c82831cc100aee7ba3e3dbe1ea52869e19044243 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Wed, 8 Feb 2017 09:29:26 +0200
Subject: [PATCH] Fix merge conflict

An old define name caused the build to fail.
---
 server/modules/routing/avrorouter/avro_file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/modules/routing/avrorouter/avro_file.c b/server/modules/routing/avrorouter/avro_file.c
index e91bec5b4..4ab4aae93 100644
--- a/server/modules/routing/avrorouter/avro_file.c
+++ b/server/modules/routing/avrorouter/avro_file.c
@@ -70,7 +70,7 @@ bool avro_open_binlog(const char *binlogdir, const char *file, int *dest)
     {
         if (errno != ENOENT)
         {
-            char err[STRERROR_BUFLEN];
+            char err[MXS_STRERROR_BUFLEN];
             MXS_ERROR("Failed to open binlog file %s: %d, %s", path, errno,
                       strerror_r(errno, err, sizeof(err)));
         }