1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge error.

Browse Source
This commit is contained in:
Jan Lindström 2015-08-04 08:33:31 +03:00
parent 9a5787db51
commit d71b584069
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storage/xtradb/dict/dict0dict.cc
View File

@ -3453,6 +3453,10 @@ dict_foreign_find_index(
index, types_idx, index, types_idx,
check_charsets, check_null, check_charsets, check_null,
error, err_col_no,err_index)) { error, err_col_no,err_index)) {
if (error) {
*error = DB_SUCCESS;
}
return(index); return(index);
} }