Bug #28842 Different 'duplicate key' error code between 5.0 and 5.1

  The patch for WL 1563 added a new duplicate key error message so that the
  key name could be provided instead of the key number. But the error code
  for the new message was used even though that did not need to change.

  This could cause unnecessary problems for applications that used the old
  ER_DUP_ENTRY error code to detect duplicate key errors.


mysql-test/t/auto_increment.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/create.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/create_select_tmp.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/ctype_ucs2_def.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/ctype_utf8.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/delayed.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/heap.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/heap_btree.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/heap_hash.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/innodb.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/insert_select.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/insert_update.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/join_outer.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/key.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/merge.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/myisam.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/ndb_basic.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/ndb_charset.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/ndb_index_unique.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/ndb_insert.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/ndb_replace.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/ndb_update.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/replace.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/rpl_err_ignoredtable.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/rpl_ndb_do_table.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/rpl_row_create_table.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/rpl_sp.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/show_check.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/sp-error.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/sp.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/sp_trans.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/sp_trans_log.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/temp_table.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/type_binary.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/type_bit.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/type_bit_innodb.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/type_blob.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/t/type_varchar.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/r/create.result:
  Update ER_DUP_ENTRY-related error message values
mysql-test/r/rpl_sp.result:
  Update ER_DUP_ENTRY-related error message values
mysql-test/r/sp.result:
  Update ER_DUP_ENTRY-related error message values
mysql-test/include/mix1.inc:
  Update ER_DUP_ENTRY-related error message values
mysql-test/include/mix2.inc:
  Update ER_DUP_ENTRY-related error message values
mysql-test/include/ps_modify.inc:
  Update ER_DUP_ENTRY-related error message values
mysql-test/include/query_cache.inc:
  Update ER_DUP_ENTRY-related error message values
mysql-test/include/varchar.inc:
  Update ER_DUP_ENTRY-related error message values
mysql-test/extra/binlog_tests/insert_select-binlog.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/extra/rpl_tests/rpl_auto_increment.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/extra/rpl_tests/rpl_foreign_key.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/extra/rpl_tests/rpl_insert_delayed.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/extra/rpl_tests/rpl_insert_id.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/extra/rpl_tests/rpl_insert_id_pk.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/extra/rpl_tests/rpl_loaddata.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/extra/rpl_tests/rpl_row_basic.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test:
  Update ER_DUP_ENTRY-related error message values
mysql-test/extra/rpl_tests/rpl_trig004.test:
  Update ER_DUP_ENTRY-related error message values
sql/handler.cc:
  Restore use of ER_DUP_ENTRY error code even when ER_DUP_ENTRY_WITH_KEY_NAME
  error message is being used. (Bug #28842)

1 files changed, 1 insertions, 1 deletions

diff --git a/mysql-test/t/delayed.test b/mysql-test/t/delayed.test
index a44288da9ec..396c06f43e7 100644
--- a/mysql-test/t/delayed.test
+++ b/mysql-test/t/delayed.test
@@ -184,7 +184,7 @@ INSERT INTO t1 VALUES(  49, 71), (NULL, 72), (NULL, 73);
 INSERT INTO t1 VALUES(NULL, 81), (NULL, 82), (NULL, 83);
 # Create a duplicate value.
 SET insert_id= 114;
---error ER_DUP_ENTRY_WITH_KEY_NAME
+--error ER_DUP_ENTRY
 INSERT INTO t1 VALUES(NULL, 91);
 INSERT INTO t1 VALUES           (NULL, 92), (NULL, 93);
 # Check what we have now