use consistent error messaging for IGNORE

1. the same message text for INSERT and INSERT IGNORE
2. no new warnings in UPDATE IGNORE yet (big change for 5.5)

and replace a commonly used expression with a
named constant

1 files changed, 0 insertions, 25 deletions

diff --git a/sql/handler.cc b/sql/handler.cc
index 1a318334ef3..d528c0aea7a 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -5463,28 +5463,3 @@ fl_create_iterator(enum handler_iterator_type type,
   }
 }
 #endif /*TRANS_LOG_MGM_EXAMPLE_CODE*/
-
-
-/**
-   Report a warning for FK constraint violation.
-
-   @param  thd     Thread handle.
-   @param  table   table on which the operation is performed.
-   @param  error   handler error number.
-*/
-void warn_fk_constraint_violation(THD *thd,TABLE *table, int error)
-{
-  String str;
-  switch(error) {
-  case HA_ERR_ROW_IS_REFERENCED:
-    table->file->get_error_message(error, &str);
-    push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
-                 ER_ROW_IS_REFERENCED_2, str.c_ptr_safe());
-    break;
-  case HA_ERR_NO_REFERENCED_ROW:
-    table->file->get_error_message(error, &str);
-    push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
-                 ER_NO_REFERENCED_ROW_2, str.c_ptr_safe());
-    break;
-  }
-}