bk commit into 5.1 tree (mskold:1.2345)

[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, 2006-11-10 11:20:02+01:00, mskold@stripped +4 -0
  Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
  into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
  MERGE: 1.1810.2280.1

  mysql-test/r/ndb_index_unique.result@stripped, 2006-11-10 11:13:37+01:00, mskold@stripped +0 -34
    Using local
    will re-generate
    MERGE: 1.16.1.4

  mysql-test/t/ndb_index_unique.test@stripped, 2006-11-10 11:13:26+01:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.17.1.1

  sql/ha_ndbcluster.cc@stripped, 2006-11-10 11:18:47+01:00, mskold@stripped +42 -193
    Using local
    will merge manually
    MERGE: 1.175.61.1

  sql/ha_ndbcluster.h@stripped, 2006-11-10 11:19:41+01:00, mskold@stripped +1 -18
    Using local
    will merge manually
    MERGE: 1.82.4.8

# 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/RESYNC

--- 1.23/mysql-test/t/ndb_index_unique.test	2006-11-10 11:20:13 +01:00
+++ 1.24/mysql-test/t/ndb_index_unique.test	2006-11-10 11:20:13 +01:00
@@ -91,13 +91,26 @@ select * from t2 order by a;
 
 drop table t2;
 
--- error 1121
 CREATE TABLE t2 (
   a int unsigned NOT NULL PRIMARY KEY,
   b int unsigned not null,
   c int unsigned,
   UNIQUE (b, c) USING HASH	
 ) engine=ndbcluster;
+
+
+insert t2 values(1,1,NULL),(2,2,2),(3,3,NULL),(4,4,4),(5,5,NULL),(6,6,6),(7,7,NULL),(8,3,NULL),(9,3,NULL);
+
+select * from t2 where c IS NULL order by a;
+select * from t2 where b = 3 AND c IS NULL order by a;
+select * from t2 where (b = 3 OR b = 5) AND c IS NULL order by a;
+set @old_ecpd = @@session.engine_condition_pushdown;
+set engine_condition_pushdown = true;
+explain select * from t2 where (b = 3 OR b = 5) AND c IS NULL AND a < 9 order by a;
+select * from t2 where (b = 3 OR b = 5) AND c IS NULL AND a < 9 order by a;
+set engine_condition_pushdown = @old_ecpd;
+
+drop table t2;
 
 #
 # Show use of PRIMARY KEY USING HASH indexes