Commit 822fd77a authored by mskold/marty@linux.site's avatar mskold/marty@linux.site
Browse files

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
parents e57ae669 06b3c9a8

mysql-test/r/ndb_read_multi_range.result

+19 −0
Original line number Diff line number Diff line
@@ -405,3 +405,22 @@ a b 
1	1

10	10

drop table t2;

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;

create trigger kaboom after delete on t1

for each row begin

delete from t2 where id=old.id;

end|

select * from t1 order by id;

id

1

2

3

delete from t1 where id in (1,2);

select * from t2 order by id;

id

3

drop trigger kaboom;

drop table t1;

mysql-test/t/ndb_read_multi_range.test

+22 −0
Original line number Diff line number Diff line
@@ -291,3 +291,25 @@ insert into t2 values (1,1), (10,10); 
select * from t2 use index (ab) where a in(1,10) order by a;



drop table 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;

sql/ha_ndbcluster.cc

+2 −1
Original line number Diff line number Diff line
@@ -6470,7 +6470,8 @@ ha_ndbcluster::read_multi_range_first(KEY_MULTI_RANGE **found_range_p, 
  if (uses_blob_value(m_retrieve_all_fields) ||

      (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,