bk commit into 5.1 tree (mskold:1.2576)

[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-08-13 17:52:30+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.2871.33

  mysql-test/r/ndb_read_multi_range.result@stripped, 2007-08-13 17:47:42+02:00, mskold@stripped +0 -19
    MERGE: 1.3.2.4

  mysql-test/t/ndb_read_multi_range.test@stripped, 2007-08-13 17:51:47+02:00, mskold@stripped +1 -2
    merge
    MERGE: 1.4.2.4

  sql/ha_ndbcluster.cc@stripped, 2007-08-13 17:51:47+02:00, mskold@stripped +2 -3
    merge
    MERGE: 1.175.1.140

# 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.463/sql/ha_ndbcluster.cc	2007-08-13 17:52:42 +02:00
+++ 1.464/sql/ha_ndbcluster.cc	2007-08-13 17:52:42 +02:00
@@ -8520,7 +8520,8 @@ ha_ndbcluster::read_multi_range_first(KE
   if (uses_blob_value() ||
       (cur_index_type ==  UNIQUE_INDEX &&
        has_null_in_unique_index(active_index) &&
-       null_value_index_search(ranges, ranges+range_count, buffer)))
+       null_value_index_search(ranges, ranges+range_count, buffer))
+      || m_delete_cannot_batch || m_update_cannot_batch)
   {
     m_disable_multi_read= TRUE;
     DBUG_RETURN(handler::read_multi_range_first(found_range_p, 

--- 1.15/mysql-test/t/ndb_read_multi_range.test	2007-08-13 17:52:42 +02:00
+++ 1.16/mysql-test/t/ndb_read_multi_range.test	2007-08-13 17:52:42 +02:00
@@ -315,5 +315,26 @@ partition by key(a);
 insert into t2 values (1,1), (10,10);
 
 select * from t2 where a in (1,10) order by a;
-
 drop table t1, t2;
+
+#bug#30337
+
+create table t1 (id int primary key) engine ndb;
+insert into t1 values (1), (2), (3);
+
+create table t2 (id int primary key) engine ndb;
+insert into t2 select id from t1;
+
+delimiter |;
+create trigger kaboom after delete on t1
+for each row begin
+  delete from t2 where id=old.id;
+end|
+delimiter ;|
+
+select * from t1 order by id;
+delete from t1 where id in (1,2);
+select * from t2 order by id;
+
+drop trigger kaboom;
+drop table t1;