database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1

Browse Source 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
This commit is contained in:
jani/jamppa@bk-internal.mysql.com
2007-01-25 12:28:00 +01:00
parent f05c519a6b d1a1bf0a32
commit dd6292d6d1
61 changed files with 293 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/t/ndb_basic.test
View File

@ -792,7 +792,7 @@ drop table t1,t2;
# insert ignore
create table t1 (a int not null primary key, b int not null) engine=ndb;
insert into t1 values (1,10), (2,20), (3,30);
--error 1062
--error ER_DUP_ENTRY_WITH_KEY_NAME
insert into t1 set a=1, b=100;
insert ignore into t1 set a=1, b=100;
select * from t1 order by a;
@ -805,12 +805,12 @@ create table t1 (a int not null primary key, b int not null) engine=ndb;
create table t2 (c int not null primary key, d int not null) engine=ndb;
insert into t1 values (1,10), (2,10), (3,30), (4, 30);
insert into t2 values (1,10), (2,10), (3,30), (4, 30);
--error 1062
--error ER_DUP_ENTRY_WITH_KEY_NAME
update t1 set a = 1 where a = 3;
select * from t1 order by a;
update t1 set b = 1 where a > 1 order by a desc limit 1;
select * from t1 order by a;
--error 1062
--error ER_DUP_ENTRY_WITH_KEY_NAME
update t1,t2 set a = 1, c = 1 where a = 3 and c = 3;
select * from t1 order by a;
update ignore t1,t2 set a = 1, c = 1 where a = 3 and c = 3;