summaryrefslogtreecommitdiff
path: root/mysql-test/include/ps_modify.inc
diff options
context:
space:
mode:
authorjimw@rama.(none) <>2007-06-06 10:57:07 -0700
committerjimw@rama.(none) <>2007-06-06 10:57:07 -0700
commit3c93323d28e1daa6936c6060b738e6056cd4fb23 (patch)
tree14e9cb6702b9a4a6f6a762ef63264a1b2e3a9205 /mysql-test/include/ps_modify.inc
parent13adcedc90cbd18c3395e4158a036343be7659f0 (diff)
downloadmariadb-git-3c93323d28e1daa6936c6060b738e6056cd4fb23.tar.gz
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.
Diffstat (limited to 'mysql-test/include/ps_modify.inc')
-rw-r--r--mysql-test/include/ps_modify.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/include/ps_modify.inc b/mysql-test/include/ps_modify.inc
index 9e38671263f..f66f888261d 100644
--- a/mysql-test/include/ps_modify.inc
+++ b/mysql-test/include/ps_modify.inc
@@ -193,7 +193,7 @@ prepare stmt1 from 'insert into t1 values(6, ? )';
execute stmt1 using @arg00;
select a,b from t1 where b = @arg00;
# the second insert fails, because the first column is primary key
---error ER_DUP_ENTRY_WITH_KEY_NAME
+--error ER_DUP_ENTRY
execute stmt1 using @arg00;
set @arg00=NULL ;
prepare stmt1 from 'insert into t1 values(0, ? )';
@@ -272,7 +272,7 @@ execute stmt1 using @arg00, @arg01;
select * from t1 order by a;
set @arg00=81 ;
set @arg01=1 ;
---error ER_DUP_ENTRY_WITH_KEY_NAME
+--error ER_DUP_ENTRY
execute stmt1 using @arg00, @arg01;
## insert, autoincrement column and ' SELECT LAST_INSERT_ID() '