Commit 7fd0cc2d authored by unknown's avatar unknown
Browse files

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 

into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6331
parents d4a3d501 c940b515

mysql-test/r/ndb_insert.result

+29 −0
Original line number Diff line number Diff line
@@ -557,3 +557,32 @@ select * from t1 where pk1=1; 
pk1	b	c

1	2	3

DROP TABLE t1;

CREATE TABLE t1(a INT) ENGINE=ndb;

INSERT IGNORE INTO t1 VALUES (1);

INSERT IGNORE INTO t1 VALUES (1);

INSERT IGNORE INTO t1 SELECT a FROM t1;

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;

a

1

1

1

1

1

1

1

1

1

1

1

1

1

1

1

1

1

1

DROP TABLE t1;

mysql-test/t/ndb_insert.test

+15 −0
Original line number Diff line number Diff line
@@ -583,3 +583,18 @@ INSERT INTO t1 VALUES(1,1,1) ON DUPLICATE KEY UPDATE b=79; 
select * from t1 where pk1=1;



DROP TABLE t1;



#

# Bug #6331: problem with 'insert ignore'

#



CREATE TABLE t1(a INT) ENGINE=ndb;

INSERT IGNORE INTO t1 VALUES (1);

INSERT IGNORE INTO t1 VALUES (1);

INSERT IGNORE INTO t1 SELECT a FROM t1;

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;

DROP TABLE t1;

sql/ha_ndbcluster.cc

+2 −1
Original line number Diff line number Diff line
@@ -2650,6 +2650,7 @@ int ha_ndbcluster::extra(enum ha_extra_function operation) 
      m_use_write= TRUE;

    } else 

    {

      if (table->keys)

        m_ignore_dup_key_not_supported= TRUE;

    }

    break;