From d71b584069ff950ea642b8efd1561244b826a61e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= <jan.lindstrom@mariadb.com>
Date: Tue, 4 Aug 2015 08:33:31 +0300
Subject: [PATCH] Fix merge error.

---
 storage/xtradb/dict/dict0dict.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/storage/xtradb/dict/dict0dict.cc b/storage/xtradb/dict/dict0dict.cc
index 5791890056d..7b6166b15fb 100644
--- a/storage/xtradb/dict/dict0dict.cc
+++ b/storage/xtradb/dict/dict0dict.cc
@@ -3453,6 +3453,10 @@ dict_foreign_find_index(
 			    index, types_idx,
 			    check_charsets, check_null,
 			    error, err_col_no,err_index)) {
+			if (error) {
+				*error = DB_SUCCESS;
+			}
+
 			return(index);
 		}