Fix merge error.

MariaDB · Aug 4, 2015 · d71b584 · d71b584
1 parent 9a5787d
commit d71b584
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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);
 		}