bk commit into 5.1 tree (mskold:1.2504)

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 repository of marty. When marty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-05-02 11:05:48+02:00, mskold@stripped +3 -0
  Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
  into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
  MERGE: 1.1810.2864.24

  mysql-test/r/ndb_insert.result@stripped, 2007-05-02 11:00:05+02:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.8.1.3

  mysql-test/t/ndb_insert.test@stripped, 2007-05-02 11:00:05+02:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.12.1.1

  sql/ha_ndbcluster.cc@stripped, 2007-05-02 11:05:24+02:00, mskold@stripped +1 -40
    Using local (will hand merge).
    MERGE: 1.175.1.136

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mskold
# Host:	linux.site
# Root:	/windows/Linux_space/MySQL/mysql-5.1-new-ndb/RESYNC

--- 1.12/mysql-test/r/ndb_insert.result	2007-05-02 11:06:00 +02:00
+++ 1.13/mysql-test/r/ndb_insert.result	2007-05-02 11:06:00 +02:00
@@ -649,3 +649,11 @@ pk	a
 6	NULL
 7	4
 DROP TABLE t1;
+create table t1(a int primary key, b int, unique key(b)) engine=ndb;
+insert ignore into t1 values (1,0), (2,0), (2,null), (3,null);
+select * from t1 order by a;
+a	b
+1	0
+2	NULL
+3	NULL
+drop table t1;

--- 1.13/mysql-test/t/ndb_insert.test	2007-05-02 11:06:00 +02:00
+++ 1.14/mysql-test/t/ndb_insert.test	2007-05-02 11:06:00 +02:00
@@ -630,4 +630,13 @@ INSERT IGNORE INTO t1 VALUES (4,NULL),(5
 SELECT * FROM t1 ORDER BY pk;
 DROP TABLE t1;
 
+#
+# Bug #27980  	INSERT IGNORE wrongly ignores NULLs in unique index
+#
+
+create table t1(a int primary key, b int, unique key(b)) engine=ndb;
+insert ignore into t1 values (1,0), (2,0), (2,null), (3,null);
+select * from t1 order by a;
+drop table t1;
+
 # End of 4.1 tests