mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reverted to previous error codes, since some common tests depend in it

Browse source
This commit is contained in:
mskold@mysql.com 2006-03-10 09:57:00 +01:00
parent 596f2ae03e
commit fb3286312f
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
mysql-test/r/ndb_index_unique.result
View file

@ -22,7 +22,7 @@ select * from t1 where b = 4 order by a;
a b c a b c
3 4 6 3 4 6
insert into t1 values(8, 2, 3); insert into t1 values(8, 2, 3);
ERROR 23000: Can't write, because of unique constraint, to table 't1' ERROR 23000: Duplicate entry '8' for key 'PRIMARY'
select * from t1 order by a; select * from t1 order by a;
a b c a b c
1 2 3 1 2 3
@ -93,7 +93,7 @@ a b c
1 1 1 1 1 1
4 4 NULL 4 4 NULL
insert into t1 values(5,1,1); insert into t1 values(5,1,1);
ERROR 23000: Can't write, because of unique constraint, to table 't1' ERROR 23000: Duplicate entry '5' for key 'PRIMARY'
drop table t1; drop table t1;
CREATE TABLE t2 ( CREATE TABLE t2 (
a int unsigned NOT NULL PRIMARY KEY, a int unsigned NOT NULL PRIMARY KEY,
@ -116,7 +116,7 @@ select * from t2 where b = 4 order by a;
a b c a b c
3 4 6 3 4 6
insert into t2 values(8, 2, 3); insert into t2 values(8, 2, 3);
ERROR 23000: Can't write, because of unique constraint, to table 't2' ERROR 23000: Duplicate entry '8' for key 'PRIMARY'
select * from t2 order by a; select * from t2 order by a;
a b c a b c
1 2 3 1 2 3
@ -181,7 +181,7 @@ pk a
3 NULL 3 NULL
4 4 4 4
insert into t1 values (5,0); insert into t1 values (5,0);
ERROR 23000: Can't write, because of unique constraint, to table 't1' ERROR 23000: Duplicate entry '5' for key 'PRIMARY'
select * from t1 order by pk; select * from t1 order by pk;
pk a pk a
-1 NULL -1 NULL
@ -214,7 +214,7 @@ pk a b c
0 NULL 18 NULL 0 NULL 18 NULL
1 3 19 abc 1 3 19 abc
insert into t2 values(2,3,19,'abc'); insert into t2 values(2,3,19,'abc');
ERROR 23000: Can't write, because of unique constraint, to table 't2' ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
select * from t2 order by pk; select * from t2 order by pk;
pk a b c pk a b c
-1 1 17 NULL -1 1 17 NULL
@ -634,7 +634,7 @@ create table t1 (a int primary key, b varchar(1000) not null, unique key (b))
engine=ndb charset=utf8; engine=ndb charset=utf8;
insert into t1 values (1, repeat(_utf8 0xe288ab6474, 200)); insert into t1 values (1, repeat(_utf8 0xe288ab6474, 200));
insert into t1 values (2, repeat(_utf8 0xe288ab6474, 200)); insert into t1 values (2, repeat(_utf8 0xe288ab6474, 200));
ERROR 23000: Can't write, because of unique constraint, to table 't1' ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
select a, sha1(b) from t1; select a, sha1(b) from t1;
a sha1(b) a sha1(b)
1 08f5d02c8b8bc244f275bdfc22c42c5cab0d9d7d 1 08f5d02c8b8bc244f275bdfc22c42c5cab0d9d7d

12
mysql-test/t/ndb_index_unique.test
View file

@ -22,7 +22,7 @@ select * from t1 where b = 4 order by b;
insert into t1 values(7,8,3); insert into t1 values(7,8,3);
select * from t1 where b = 4 order by a; select * from t1 where b = 4 order by a;
-- error 1169 -- error 1062
insert into t1 values(8, 2, 3); insert into t1 values(8, 2, 3);
select * from t1 order by a; select * from t1 order by a;
delete from t1 where a = 1; delete from t1 where a = 1;
@ -59,7 +59,7 @@ select * from t1 use index (bc) where b IS NULL and c IS NULL order by a;
select * from t1 use index (bc) where b IS NULL and c = 2 order by a; select * from t1 use index (bc) where b IS NULL and c = 2 order by a;
select * from t1 use index (bc) where b < 4 order by a; select * from t1 use index (bc) where b < 4 order by a;
select * from t1 use index (bc) where b IS NOT NULL order by a; select * from t1 use index (bc) where b IS NOT NULL order by a;
-- error 1169 -- error 1062
insert into t1 values(5,1,1); insert into t1 values(5,1,1);
drop table t1; drop table t1;
@ -82,7 +82,7 @@ select * from t2 where c = 6;
insert into t2 values(7,8,3); insert into t2 values(7,8,3);
select * from t2 where b = 4 order by a; select * from t2 where b = 4 order by a;
-- error 1169 -- error 1062
insert into t2 values(8, 2, 3); insert into t2 values(8, 2, 3);
select * from t2 order by a; select * from t2 order by a;
delete from t2 where a = 1; delete from t2 where a = 1;
@ -133,7 +133,7 @@ insert into t1 values (-1,NULL), (0,0), (1,NULL),(2,2),(3,NULL),(4,4);
select * from t1 order by pk; select * from t1 order by pk;
--error 1169 --error 1062
insert into t1 values (5,0); insert into t1 values (5,0);
select * from t1 order by pk; select * from t1 order by pk;
delete from t1 where a = 0; delete from t1 where a = 0;
@ -152,7 +152,7 @@ insert into t2 values (-1,1,17,NULL),(0,NULL,18,NULL),(1,3,19,'abc');
select * from t2 order by pk; select * from t2 order by pk;
--error 1169 --error 1062
insert into t2 values(2,3,19,'abc'); insert into t2 values(2,3,19,'abc');
select * from t2 order by pk; select * from t2 order by pk;
delete from t2 where c IS NOT NULL; delete from t2 where c IS NOT NULL;
@ -321,7 +321,7 @@ create table t1 (a int primary key, b varchar(1000) not null, unique key (b))
engine=ndb charset=utf8; engine=ndb charset=utf8;
insert into t1 values (1, repeat(_utf8 0xe288ab6474, 200)); insert into t1 values (1, repeat(_utf8 0xe288ab6474, 200));
--error 1169 --error 1062
insert into t1 values (2, repeat(_utf8 0xe288ab6474, 200)); insert into t1 values (2, repeat(_utf8 0xe288ab6474, 200));
select a, sha1(b) from t1; select a, sha1(b) from t1;

2
storage/ndb/src/ndbapi/ndberror.c
View file

@ -112,7 +112,7 @@ ErrorBundle ErrorCodes[] = {
{ 630, HA_ERR_FOUND_DUPP_KEY, CV, "Tuple already existed when attempting to insert" }, { 630, HA_ERR_FOUND_DUPP_KEY, CV, "Tuple already existed when attempting to insert" },
{ 839, DMEC, CV, "Illegal null attribute" }, { 839, DMEC, CV, "Illegal null attribute" },
{ 840, DMEC, CV, "Trying to set a NOT NULL attribute to NULL" }, { 840, DMEC, CV, "Trying to set a NOT NULL attribute to NULL" },
{ 893, HA_ERR_FOUND_DUPP_UNIQUE, CV, "Constraint violation e.g. duplicate value in unique index" }, { 893, HA_ERR_FOUND_DUPP_KEY, CV, "Constraint violation e.g. duplicate value in unique index" },
/** /**
* Node recovery errors * Node recovery errors