diff options
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 2cb1135d319..dc7ec37a23d 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -1858,12 +1858,7 @@ void handler::print_error(int error, myf errflag) str.length(max_length-4); str.append(STRING_WITH_LEN("...")); } -#ifdef XXX_TO_BE_DONE_BY_A_FOLLOWUP_OF_WL1563 - my_printf_error(ER_DUP_ENTRY, "Duplicate entry '%s' for key '%s'", - MYF(0), str.c_ptr(), table->key_info[key_nr].name); -#else - my_error(ER_DUP_ENTRY, MYF(0), str.c_ptr(), key_nr+1); -#endif + my_error(ER_DUP_ENTRY, MYF(0), str.c_ptr(), table->key_info[key_nr].name); DBUG_VOID_RETURN; } textno=ER_DUP_KEY; |