Fix merge error.

d71b5840 · Jan Lindström · 9a5787db · d71b5840
Commit d71b5840 authored Aug 04, 2015 by Jan Lindström
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

storage/xtradb/dict/dict0dict.cc storage/xtradb/dict/dict0dict.cc +4 -0

No files found.
--- 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);
 		}