Commit 2c45951d authored by unknown's avatar unknown
Browse files

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new


storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
parents f9140bdf 84992f54

mysql-test/r/ndb_insert.result

+27 −1
Original line number Diff line number Diff line
@@ -577,6 +577,25 @@ pk1 b c 
2	2	17

4	4	3

6	6	3

DELETE FROM t1;

CREATE UNIQUE INDEX bi ON t1(b);

INSERT INTO t1 VALUES 

(1,1,1),(2,2,2),(3,3,3),(4,4,4),(5,5,5),

(6,6,6),(7,7,7),(8,8,8),(9,9,9),(10,10,10);

INSERT INTO t1 VALUES(0,1,0),(21,21,21) ON DUPLICATE KEY UPDATE pk1=b+10,b=b+10;

select * from t1 order by pk1;

pk1	b	c

2	2	2

3	3	3

4	4	4

5	5	5

6	6	6

7	7	7

8	8	8

9	9	9

10	10	10

11	11	1

21	21	21

DROP TABLE t1;

CREATE TABLE t1(a INT) ENGINE=ndb;

INSERT IGNORE INTO t1 VALUES (1);
@@ -586,7 +605,7 @@ INSERT IGNORE INTO t1 SELECT a FROM t1; 
INSERT IGNORE INTO t1 SELECT a FROM t1;

INSERT IGNORE INTO t1 VALUES (1);

INSERT IGNORE INTO t1 VALUES (1);

SELECT * FROM t1;

SELECT * FROM t1 ORDER BY a;

a

1

1
@@ -606,4 +625,11 @@ a 
1

1

1

DELETE FROM t1;

CREATE UNIQUE INDEX ai ON t1(a);

INSERT IGNORE INTO t1 VALUES (1);

INSERT IGNORE INTO t1 VALUES (1);

SELECT * FROM t1 ORDER BY a;

a

1

DROP TABLE t1;

mysql-test/r/ndb_replace.result

+12 −0
Original line number Diff line number Diff line
@@ -19,3 +19,15 @@ gesuchnr benutzer_id 
2	1

3	2

drop table t1;

CREATE TABLE t1(i INT PRIMARY KEY AUTO_INCREMENT, 

j INT, 

k INT, 

UNIQUE INDEX(j)

) ENGINE = ndb;

INSERT  INTO t1 VALUES (1,1,23),(2,2,24);

REPLACE INTO t1 (j,k) VALUES (1,42);

REPLACE INTO t1 (i,j) VALUES (17,2);

SELECT * from t1 ORDER BY i;

i	j	k

3	1	42

17	2	24

mysql-test/r/rpl_ndb_insert_ignore.result

+4 −4
Original line number Diff line number Diff line
@@ -30,16 +30,16 @@ a b 
2	2

3	3

4	4

5	5

6	6

7	5

10	6

SELECT * FROM t1 ORDER BY a;

a	b

1	1

2	2

3	3

4	4

5	5

6	6

7	5

10	6

drop table t1;

CREATE TABLE t1 (

a int unsigned not null auto_increment primary key,

mysql-test/t/disabled.def

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ rpl_ndb_auto_inc : Bug#17086 
rpl_ndb_ddl             : master hangs

#rpl_ndb_delete_nowhere  : Bug#17400: delete & update of rows in table without pk fails

rpl_ndb_innodb2ndb      : Bug#18261: Cluster Replication: tests rpl_ndb_xxx2ndb fails

rpl_ndb_insert_ignore   : Bugs: #17431: INSERT IGNORE INTO returns failed: 1296

rpl_ndb_myisam2ndb      : Bug#18261: Cluster Replication: tests rpl_ndb_xxx2ndb fails

rpl_ndb_log             : result not deterministic, TBD if should remove

rpl_ndb_relay_space     : Bug#16993

mysql-test/t/ndb_insert.test

+14 −9
Original line number Diff line number Diff line
@@ -591,14 +591,14 @@ DELETE FROM t1 WHERE pk1 = 2 OR pk1 = 4 OR pk1 = 6; 
INSERT INTO t1 VALUES(1,1,1),(2,2,17),(3,4,5) ON DUPLICATE KEY UPDATE pk1=b;

select * from t1 where pk1 = b and b != c order by pk1;



# The following test case currently does not work

#DELETE FROM t1;

#CREATE UNIQUE INDEX bi ON t1(b);

#INSERT INTO t1 VALUES 

#(1,1,1),(2,2,2),(3,3,3),(4,4,4),(5,5,5),

#(6,6,6),(7,7,7),(8,8,8),(9,9,9),(10,10,10);

#INSERT INTO t1 VALUES(0,1,0),(21,21,21) ON DUPLICATE KEY UPDATE pk1=b+10,c=b+10;

#select * from t1 order by pk1;

# Test handling of duplicate unique

DELETE FROM t1;

CREATE UNIQUE INDEX bi ON t1(b);

INSERT INTO t1 VALUES 

(1,1,1),(2,2,2),(3,3,3),(4,4,4),(5,5,5),

(6,6,6),(7,7,7),(8,8,8),(9,9,9),(10,10,10);

INSERT INTO t1 VALUES(0,1,0),(21,21,21) ON DUPLICATE KEY UPDATE pk1=b+10,b=b+10;

select * from t1 order by pk1;



DROP TABLE t1;
@@ -614,7 +614,12 @@ INSERT IGNORE INTO t1 SELECT a FROM t1; 
INSERT IGNORE INTO t1 SELECT a FROM t1;

INSERT IGNORE INTO t1 VALUES (1);

INSERT IGNORE INTO t1 VALUES (1);

SELECT * FROM t1;

SELECT * FROM t1 ORDER BY a;

DELETE FROM t1;

CREATE UNIQUE INDEX ai ON t1(a);

INSERT IGNORE INTO t1 VALUES (1);

INSERT IGNORE INTO t1 VALUES (1);

SELECT * FROM t1 ORDER BY a;

DROP TABLE t1;



# End of 4.1 tests