diff options
author | unknown <monty@narttu.mysql.fi> | 2007-01-22 19:18:22 +0200 |
---|---|---|
committer | unknown <monty@narttu.mysql.fi> | 2007-01-22 19:18:22 +0200 |
commit | a043cd152da16624b74ec9ee4d259b4570ef4dcd (patch) | |
tree | e1f7760d143c61bab6297ac28959e5b752a764ed /mysql-test/t/myisam.test | |
parent | 10f4f15e83f19d85cae4bff9240973c216ea98c7 (diff) | |
parent | b4f80eedf3c25773d1e116ab915138096ec713f3 (diff) | |
download | mariadb-git-a043cd152da16624b74ec9ee4d259b4570ef4dcd.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
BUILD/SETUP.sh:
Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
Auto merged
mysql-test/extra/rpl_tests/rpl_row_basic.test:
Auto merged
mysql-test/include/mix1.inc:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
mysql-test/t/delayed.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/insert_select.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/ndb_index_unique.test:
Auto merged
mysql-test/t/rpl_row_create_table.test:
Auto merged
mysql-test/t/rpl_sp.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/type_binary.test:
Auto merged
mysql-test/t/type_varchar.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/rpl_sp.result:
Manual merge
mysql-test/t/ndb_update.test:
Manual merge
sql/share/errmsg.txt:
Manual merge
Diffstat (limited to 'mysql-test/t/myisam.test')
-rw-r--r-- | mysql-test/t/myisam.test | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test index 0898f7d9896..e0cdad052b1 100644 --- a/mysql-test/t/myisam.test +++ b/mysql-test/t/myisam.test @@ -453,9 +453,9 @@ create table t1 (a int not null auto_increment primary key, b text not null, uni insert into t1 (b) values ('a'),('b'),('c'); select concat(b,'.') from t1; update t1 set b='b ' where a=2; ---error 1062 +--error ER_DUP_ENTRY_WITH_KEY_NAME update t1 set b='b ' where a > 1; ---error 1062 +--error ER_DUP_ENTRY_WITH_KEY_NAME insert into t1 (b) values ('b'); select * from t1; delete from t1 where b='b'; |