Commit 27c02506 authored by mskold/marty@mysql.com/quadfish.(none)'s avatar mskold/marty@mysql.com/quadfish.(none)
Browse files

bug#21072 Duplicate key error in NDB references wrong key: Return correct key... 

bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts
parent 88fc48fd

mysql-test/r/ndb_charset.result

+4 −4
Original line number Diff line number Diff line
@@ -112,9 +112,9 @@ unique key(a) 
) engine=ndb;

insert into t1 values(1, 'aAa');

insert into t1 values(2, 'aaa');

ERROR 23000: Duplicate entry '' for key 0

ERROR 23000: Duplicate entry 'aaa' for key 2

insert into t1 values(3, 'AAA');

ERROR 23000: Duplicate entry '' for key 0

ERROR 23000: Duplicate entry 'AAA' for key 2

select * from t1 order by p;

p	a

1	aAa
@@ -138,9 +138,9 @@ unique key(a) 
) engine=ndb;

insert into t1 values (1,'A'),(2,'b '),(3,'C  '),(4,'d      '),(5,'E'),(6,'f');

insert into t1 values(99,'b');

ERROR 23000: Duplicate entry '' for key 0

ERROR 23000: Duplicate entry 'b' for key 2

insert into t1 values(99,'a         ');

ERROR 23000: Duplicate entry '' for key 0

ERROR 23000: Duplicate entry 'a         ' for key 2

select a,length(a) from t1 order by a;

a	length(a)

A	1

mysql-test/r/ndb_index_unique.result

+7 −7
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ select * from t1 where b = 4 order by a; 
a	b	c

3	4	6

insert into t1 values(8, 2, 3);

ERROR 23000: Duplicate entry '' for key 0

ERROR 23000: Duplicate entry '2' for key 2

select * from t1 order by a;

a	b	c

1	2	3
@@ -89,7 +89,7 @@ a b c 
1	1	1

4	4	NULL

insert into t1 values(5,1,1);

ERROR 23000: Duplicate entry '' for key 0

ERROR 23000: Duplicate entry '1-1' for key 2

drop table t1;

CREATE TABLE t2 (

a int unsigned NOT NULL PRIMARY KEY,
@@ -112,7 +112,7 @@ select * from t2 where b = 4 order by a; 
a	b	c

3	4	6

insert into t2 values(8, 2, 3);

ERROR 23000: Duplicate entry '' for key 0

ERROR 23000: Duplicate entry '2-3' for key 2

select * from t2 order by a;

a	b	c

1	2	3
@@ -135,7 +135,7 @@ a b c 
8	2	3

create unique index bi using hash on t2(b);

insert into t2 values(9, 3, 1);

ERROR 23000: Duplicate entry '' for key 0

ERROR 23000: Duplicate entry '3' for key 3

alter table t2 drop index bi;

insert into t2 values(9, 3, 1);

select * from t2 order by a;
@@ -225,7 +225,7 @@ pk a 
3	NULL

4	4

insert into t1 values (5,0);

ERROR 23000: Duplicate entry '' for key 0

ERROR 23000: Duplicate entry '0' for key 2

select * from t1 order by pk;

pk	a

-1	NULL
@@ -258,7 +258,7 @@ pk a b c 
0	NULL	18	NULL

1	3	19	abc

insert into t2 values(2,3,19,'abc');

ERROR 23000: Duplicate entry '' for key 0

ERROR 23000: Duplicate entry '3-abc' for key 2

select * from t2 order by pk;

pk	a	b	c

-1	1	17	NULL
@@ -678,7 +678,7 @@ create table t1 (a int primary key, b varchar(1000) not null, unique key (b)) 
engine=ndb charset=utf8;

insert into t1 values (1, repeat(_utf8 0xe288ab6474, 200));

insert into t1 values (2, repeat(_utf8 0xe288ab6474, 200));

ERROR 23000: Duplicate entry '' for key 0

ERROR 23000: Duplicate entry '∫dt∫dt∫dt∫dt∫dt∫dt∫dt∫dt∫dt∫dt∫dt∫dt∫d' for key 2

select a, sha1(b) from t1;

a	sha1(b)

1	08f5d02c8b8bc244f275bdfc22c42c5cab0d9d7d

mysql-test/r/ndb_update.result

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ pk1 b c 
2	2	2

4	1	1

UPDATE t1 set pk1 = 1, c = 2 where pk1 = 4;

ERROR 23000: Duplicate entry '' for key 0

ERROR 23000: Duplicate entry '2' for key 2

UPDATE IGNORE t1 set pk1 = 1, c = 2 where pk1 = 4;

select * from t1 order by pk1;

pk1	b	c

ndb/include/kernel/signaldata/TcKeyRef.hpp

+2 −1
Original line number Diff line number Diff line
@@ -40,12 +40,13 @@ class TcKeyRef { 
  friend bool printTCKEYREF(FILE *, const Uint32 *, Uint32, Uint16);

  

public:

  STATIC_CONST( SignalLength = 4 );

  STATIC_CONST( SignalLength = 5 );



private:

  Uint32 connectPtr;

  Uint32 transId[2];

  Uint32 errorCode;

  Uint32 errorData;

};



#endif

ndb/include/kernel/signaldata/TcRollbackRep.hpp

+2 −1
Original line number Diff line number Diff line
@@ -38,12 +38,13 @@ class TcRollbackRep { 
  friend bool printTCROLBACKREP(FILE *, const Uint32 *, Uint32, Uint16);

  

public:

  STATIC_CONST( SignalLength = 4 );

  STATIC_CONST( SignalLength = 5 );



private:

  Uint32 connectPtr;

  Uint32 transId[2];

  Uint32 returnCode;

  Uint32 errorData;

};



#endif