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, 14 insertions, 14 deletions

diff --git a/mysql-test/t/heap.test b/mysql-test/t/heap.test
index b47a5fc2033..3f91b9966e7 100644
--- a/mysql-test/t/heap.test
+++ b/mysql-test/t/heap.test
@@ -128,7 +128,7 @@ SELECT * FROM t1 WHERE b=NULL;
 explain SELECT * FROM t1 WHERE b IS NULL;
 SELECT * FROM t1 WHERE b<=>NULL;
 
---error ER_DUP_ENTRY_WITH_KEY_NAME
+--error ER_DUP_ENTRY
 INSERT INTO t1 VALUES (1,3);
 DROP TABLE t1;
 
@@ -270,7 +270,7 @@ explain select count(*) from t1 where v like 'a%';
 explain select count(*) from t1 where v between 'a' and 'a ';
 explain select count(*) from t1 where v between 'a' and 'a ' and v between 'a  ' and 'b\n';
 
---error ER_DUP_ENTRY_WITH_KEY_NAME
+--error ER_DUP_ENTRY
 alter table t1 add unique(v);
 select concat('*',v,'*',c,'*',t,'*') as qq from t1 where v='a' order by length(concat('*',v,'*',c,'*',t,'*'));
 explain select * from t1 where v='a';
@@ -296,17 +296,17 @@ drop table t1;
 
 create table t1 (a char(10), unique (a));
 insert into t1 values ('a');
---error ER_DUP_ENTRY_WITH_KEY_NAME
+--error ER_DUP_ENTRY
 insert into t1 values ('a ');
 
 alter table t1 modify a varchar(10);
---error ER_DUP_ENTRY_WITH_KEY_NAME
+--error ER_DUP_ENTRY
 insert into t1 values ('a '),('a  '),('a   '),('a         ');
---error ER_DUP_ENTRY_WITH_KEY_NAME
+--error ER_DUP_ENTRY
 insert into t1 values ('a     ');
---error ER_DUP_ENTRY_WITH_KEY_NAME
+--error ER_DUP_ENTRY
 insert into t1 values ('a          ');
---error ER_DUP_ENTRY_WITH_KEY_NAME
+--error ER_DUP_ENTRY
 insert into t1 values ('a ');
 update t1 set a='a      ' where a like 'a ';
 update t1 set a='a  ' where a like 'a      ';
@@ -357,7 +357,7 @@ explain select count(*) from t1 where v between 'a' and 'a ';
 --replace_column 9 #
 explain select count(*) from t1 where v between 'a' and 'a ' and v between 'a  ' and 'b\n';
 
---error ER_DUP_ENTRY_WITH_KEY_NAME
+--error ER_DUP_ENTRY
 alter table t1 add unique(v);
 select concat('*',v,'*',c,'*',t,'*') as qq from t1 where v='a' order by length(concat('*',v,'*',c,'*',t,'*'));
 # Number of rows is not constant for b-trees keys
@@ -372,17 +372,17 @@ drop table t1;
 
 create table t1 (a char(10), unique using btree (a)) engine=heap;
 insert into t1 values ('a');
---error ER_DUP_ENTRY_WITH_KEY_NAME
+--error ER_DUP_ENTRY
 insert into t1 values ('a ');
 
 alter table t1 modify a varchar(10);
---error ER_DUP_ENTRY_WITH_KEY_NAME
+--error ER_DUP_ENTRY
 insert into t1 values ('a '),('a  '),('a   '),('a         ');
---error ER_DUP_ENTRY_WITH_KEY_NAME
+--error ER_DUP_ENTRY
 insert into t1 values ('a     ');
---error ER_DUP_ENTRY_WITH_KEY_NAME
+--error ER_DUP_ENTRY
 insert into t1 values ('a          ');
---error ER_DUP_ENTRY_WITH_KEY_NAME
+--error ER_DUP_ENTRY
 insert into t1 values ('a ');
 update t1 set a='a      ' where a like 'a ';
 update t1 set a='a  ' where a like 'a      ';
@@ -432,7 +432,7 @@ create table t1 (a int not null, b int not null auto_increment,
 #
 create table t1 (c char(255), primary key(c(90)));
 insert into t1 values ("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz");
---error ER_DUP_ENTRY_WITH_KEY_NAME
+--error ER_DUP_ENTRY
 insert into t1 values ("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz");
 drop table t1;