diff --git a/mysql-test/t/partition.test b/mysql-test/t/partition.test
index d5ce7c5b797..8cfcc059920 100644
--- a/mysql-test/t/partition.test
+++ b/mysql-test/t/partition.test
@@ -1202,6 +1202,8 @@ drop database db99;
 #
 #BUG 17138 Problem with stored procedure and analyze partition
 #
+drop procedure mysqltest_1 if exists;
+
 create table t1 (a int)
 partition by list (a)
 (partition p0 values in (0));
@@ -1209,7 +1211,7 @@ partition by list (a)
 insert into t1 values (0);
 delimiter //;
 
-create procedure po ()
+create procedure mysqltest_1 ()
 begin
   begin
     declare continue handler for sqlexception begin end;
@@ -1219,7 +1221,9 @@ begin
   execute stmt1;
 end//
 
-call po()//
+call mysqltest_1()//
 delimiter ;//
 drop table t1;
+drop procedure mysqltest_1;
+
 --echo End of 5.1 tests
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h
index a994931843b..4261e9604b5 100644
--- a/sql/ha_ndbcluster.h
+++ b/sql/ha_ndbcluster.h
@@ -654,9 +654,9 @@ class ha_ndbcluster: public handler
   int get_default_no_partitions(ulonglong max_rows);
   bool get_no_parts(const char *name, uint *no_parts);
   void set_auto_partitions(partition_info *part_info);
-  virtual bool cannot_ignore_error(int error, uint flags)
+  virtual bool is_fatal_error(int error, uint flags)
   {
-    if (!handler::cannot_ignore_error(error, flags))
+    if (!handler::is_fatal_error(error, flags))
       return FALSE;
     if (error == HA_ERR_NO_PARTITION_FOUND)
       return FALSE;
diff --git a/sql/ha_partition.h b/sql/ha_partition.h
index 2bf9811827f..4b85ddd2def 100644
--- a/sql/ha_partition.h
+++ b/sql/ha_partition.h
@@ -302,9 +302,9 @@ public:
   virtual void start_bulk_insert(ha_rows rows);
   virtual int end_bulk_insert();
 
-  virtual bool cannot_ignore_error(int error, uint flags)
+  virtual bool is_fatal_error(int error, uint flags)
   {
-    if (!handler::cannot_ignore_error(error, flags))
+    if (!handler::is_fatal_error(error, flags))
       return FALSE;
     if (error == HA_ERR_NO_PARTITION_FOUND)
       return FALSE;
diff --git a/sql/handler.h b/sql/handler.h
index 048657e419b..3e42938b5a3 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -216,11 +216,6 @@
 #define HA_BLOCK_LOCK		256	/* unlock when reading some records */
 #define HA_OPEN_TEMPORARY	512
 
-	/* Errors on write which is recoverable  (Key exist) */
-#define HA_WRITE_SKIP 121		/* Duplicate key on write */
-#define HA_READ_CHECK 123		/* Update with is recoverable */
-#define HA_CANT_DO_THAT 131		/* Databasehandler can't do it */
-
 	/* Some key definitions */
 #define HA_KEY_NULL_LENGTH	1
 #define HA_KEY_BLOB_LENGTH	2
@@ -984,7 +979,7 @@ public:
 #define HA_CHECK_DUPP_KEY 1
 #define HA_CHECK_DUPP_UNIQUE 2
 #define HA_CHECK_DUPP (HA_CHECK_DUPP_KEY + HA_CHECK_DUPP_UNIQUE)
-  virtual bool cannot_ignore_error(int error, uint flags)
+  virtual bool is_fatal_error(int error, uint flags)
   {
     if (!error ||
         ((flags & HA_CHECK_DUPP_KEY) &&
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index ff37ceaa6fe..caaa111645a 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -2663,7 +2663,7 @@ bool Item_sum_count_distinct::add()
     return tree->unique_add(table->record[0] + table->s->null_bytes);
   }
   if ((error= table->file->ha_write_row(table->record[0])) &&
-      table->file->cannot_ignore_error(error, HA_CHECK_DUPP))
+      table->file->is_fatal_error(error, HA_CHECK_DUPP))
     return TRUE;
   return FALSE;
 }
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index e231c00c678..18591052a1f 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -2049,7 +2049,7 @@ static int replace_user_table(THD *thd, TABLE *table, const LEX_USER &combo,
   }
   else if ((error=table->file->ha_write_row(table->record[0]))) // insert
   {						// This should never happen
-    if (table->file->cannot_ignore_error(error, HA_CHECK_DUPP))
+    if (table->file->is_fatal_error(error, HA_CHECK_DUPP))
     {
       table->file->print_error(error,MYF(0));	/* purecov: deadcode */
       error= -1;				/* purecov: deadcode */
@@ -2171,7 +2171,7 @@ static int replace_db_table(TABLE *table, const char *db,
   }
   else if (rights && (error= table->file->ha_write_row(table->record[0])))
   {
-    if (table->file->cannot_ignore_error(error, HA_CHECK_DUPP_KEY))
+    if (table->file->is_fatal_error(error, HA_CHECK_DUPP_KEY))
       goto table_error; /* purecov: deadcode */
   }
 
@@ -2743,7 +2743,7 @@ static int replace_table_table(THD *thd, GRANT_TABLE *grant_table,
   else
   {
     error=table->file->ha_write_row(table->record[0]);
-    if (table->file->cannot_ignore_error(error, HA_CHECK_DUPP_KEY))
+    if (table->file->is_fatal_error(error, HA_CHECK_DUPP_KEY))
       goto table_error;				/* purecov: deadcode */
   }
 
@@ -2861,7 +2861,7 @@ static int replace_routine_table(THD *thd, GRANT_NAME *grant_name,
   else
   {
     error=table->file->ha_write_row(table->record[0]);
-    if (table->file->cannot_ignore_error(error, HA_CHECK_DUPP_KEY))
+    if (table->file->is_fatal_error(error, HA_CHECK_DUPP_KEY))
       goto table_error;
   }
 
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 0e43eba4dcc..bb6378eece9 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -976,15 +976,16 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
     while ((error=table->file->ha_write_row(table->record[0])))
     {
       uint key_nr;
-      if (error != HA_WRITE_SKIP)
+      bool is_duplicate_key_error;
+      if (table->file->is_fatal_error(error, HA_CHECK_DUPP))
 	goto err;
       table->file->restore_auto_increment(); // it's too early here! BUG#20188
-      if (info->ignore &&
-          !table->file->cannot_ignore_error(error, 0))
+      is_duplicate_key_error= table->file->is_fatal_error(error, 0);
+      if (info->ignore && !is_duplicate_key_error)
         goto ok_or_after_trg_err;
       if ((int) (key_nr = table->file->get_dup_key(error)) < 0)
       {
-	error=HA_WRITE_SKIP;			/* Database can't find key */
+	error=HA_ERR_FOUND_DUPP_KEY;         /* Database can't find key */
 	goto err;
       }
       /* Read all columns for the row we are going to replace */
@@ -1066,7 +1067,7 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
                                               table->record[0])))
 	{
           if (info->ignore &&
-              !table->file->cannot_ignore_error(error, HA_CHECK_DUPP_KEY))
+              !table->file->is_fatal_error(error, HA_CHECK_DUPP_KEY))
             goto ok_or_after_trg_err;
           goto err;
 	}
@@ -1152,7 +1153,7 @@ int write_record(THD *thd, TABLE *table,COPY_INFO *info)
   else if ((error=table->file->ha_write_row(table->record[0])))
   {
     if (!info->ignore ||
-        table->file->cannot_ignore_error(error, HA_CHECK_DUPP))
+        table->file->is_fatal_error(error, HA_CHECK_DUPP))
       goto err;
     table->file->restore_auto_increment();
   }
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index add4746c819..89ca6c7dc6c 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -9354,7 +9354,7 @@ bool create_myisam_from_heap(THD *thd, TABLE *table, TMP_TABLE_PARAM *param,
   /* copy row that filled HEAP table */
   if ((write_err=new_table.file->write_row(table->record[0])))
   {
-    if (new_table.file->cannot_ignore_error(write_err, HA_CHECK_DUPP) ||
+    if (new_table.file->is_fatal_error(write_err, HA_CHECK_DUPP) ||
 	!ignore_last_dupp_key_error)
       goto err;
   }
@@ -10777,7 +10777,7 @@ end_write(JOIN *join, JOIN_TAB *join_tab __attribute__((unused)),
       join->found_records++;
       if ((error=table->file->write_row(table->record[0])))
       {
-        if (table->file->cannot_ignore_error(error, HA_CHECK_DUPP))
+        if (table->file->is_fatal_error(error, HA_CHECK_DUPP))
 	  goto end;
 	if (create_myisam_from_heap(join->thd, table, &join->tmp_table_param,
 				    error,1))
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index e6ccaa2d9f2..3bf4c0bd99b 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -6269,9 +6269,10 @@ copy_data_between_tables(TABLE *from,TABLE *to,
     if ((error=to->file->ha_write_row((byte*) to->record[0])))
     {
       if (!ignore ||
-          to->file->cannot_ignore_error(error, HA_CHECK_DUPP))
+          handle_duplicates != DUP_REPLACE || /* Currently always false */
+          to->file->is_fatal_error(error, HA_CHECK_DUPP))
       {
-         if (error == HA_ERR_FOUND_DUPP_KEY)
+         if (!to->file->is_fatal_error(error, HA_CHECK_DUPP))
          {
            uint key_nr= to->file->get_dup_key(error);
            if ((int) key_nr >= 0)
diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index 5ad5ecc6556..fd4529090d4 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -65,7 +65,7 @@ bool select_union::send_data(List<Item> &values)
   if ((error= table->file->ha_write_row(table->record[0])))
   {
     /* create_myisam_from_heap will generate error if needed */
-    if (table->file->cannot_ignore_error(error, HA_CHECK_DUPP) &&
+    if (table->file->is_fatal_error(error, HA_CHECK_DUPP) &&
         create_myisam_from_heap(thd, table, &tmp_table_param, error, 1))
       return 1;
   }
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index 0fb221b25a7..414c2b353b3 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -542,13 +542,13 @@ int mysql_update(THD *thd,
           }
 	}
  	else if (!ignore ||
-                 table->file->cannot_ignore_error(error, HA_CHECK_DUPP_KEY))
+                 table->file->is_fatal_error(error, HA_CHECK_DUPP_KEY))
 	{
           /*
             If (ignore && error is ignorable) we don't have to
             do anything; otherwise...
           */
-          if (table->file->cannot_ignore_error(error, HA_CHECK_DUPP_KEY))
+          if (table->file->is_fatal_error(error, HA_CHECK_DUPP_KEY))
             thd->fatal_error(); /* Other handler errors are fatal */
 	  table->file->print_error(error,MYF(0));
 	  error= 1;
@@ -1424,13 +1424,13 @@ bool multi_update::send_data(List<Item> &not_used_values)
 	{
 	  updated--;
           if (!ignore ||
-              table->file->cannot_ignore_error(error, HA_CHECK_DUPP_KEY))
+              table->file->is_fatal_error(error, HA_CHECK_DUPP_KEY))
 	  {
             /*
               If (ignore && error == is ignorable) we don't have to
               do anything; otherwise...
             */
-            if (table->file->cannot_ignore_error(error, HA_CHECK_DUPP_KEY))
+            if (table->file->is_fatal_error(error, HA_CHECK_DUPP_KEY))
               thd->fatal_error(); /* Other handler errors are fatal */
 	    table->file->print_error(error,MYF(0));
 	    DBUG_RETURN(1);
@@ -1459,7 +1459,7 @@ bool multi_update::send_data(List<Item> &not_used_values)
       /* Write row, ignoring duplicated updates to a row */
       if ((error= tmp_table->file->ha_write_row(tmp_table->record[0])))
       {
-        if (tmp_table->file->cannot_ignore_error(error, HA_CHECK_DUPP) &&
+        if (tmp_table->file->is_fatal_error(error, HA_CHECK_DUPP) &&
             create_myisam_from_heap(thd, tmp_table,
                                          tmp_table_param + offset, error, 1))
 	{
@@ -1583,7 +1583,7 @@ int multi_update::do_updates(bool from_send_error)
 						    table->record[0])))
 	{
 	  if (!ignore ||
-              table->file->cannot_ignore_error(local_error, HA_CHECK_DUPP_KEY))
+              table->file->is_fatal_error(local_error, HA_CHECK_DUPP_KEY))
 	    goto err;
 	}
 	updated++;