diff options
| author | unknown <monty@narttu.mysql.fi> | 2007-01-24 19:53:51 +0200 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2007-01-24 19:53:51 +0200 |
| commit | a6d1d8ca54e82b9a84414c6cdcb6ce9df700eaea (patch) | |
| tree | 1fffcb8ab2b0f92e34d57ea11f25b47b092772ac /mysql-test/t/replace.test | |
| parent | b0ff1cd2ca8a6449cdbcf5cce89898409f69d609 (diff) | |
| parent | c871b72e21ace779772ea429f6417048f4a78c87 (diff) | |
| download | mariadb-git-a6d1d8ca54e82b9a84414c6cdcb6ce9df700eaea.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
Diffstat (limited to 'mysql-test/t/replace.test')
| -rw-r--r-- | mysql-test/t/replace.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/replace.test b/mysql-test/t/replace.test index 269854fb180..4e88379241c 100644 --- a/mysql-test/t/replace.test +++ b/mysql-test/t/replace.test @@ -25,9 +25,9 @@ drop table t1; create table t1 (a tinyint not null auto_increment primary key, b char(20) default "default_value"); insert into t1 values (126,"first"),(63, "middle"),(0,"last"); ---error 1062 +--error ER_DUP_ENTRY_WITH_KEY_NAME insert into t1 values (0,"error"); ---error 1062 +--error ER_DUP_ENTRY_WITH_KEY_NAME replace into t1 values (0,"error"); replace into t1 values (126,"first updated"); replace into t1 values (63,default); |