Commit 8d975637 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
parents 3f064efb c9950f26

mysql-test/r/ndb_read_multi_range.result

+17 −0
Original line number Diff line number Diff line
@@ -381,3 +381,20 @@ SELECT id, tag, doc, type FROM t1 WHERE id IN ('flipper','sakila'); 
id	tag	doc	type

sakila	1	Some text goes here	text

DROP TABLE t1;

CREATE TABLE t1 (

var1 int(2) NOT NULL,

var2 int(2) NOT NULL,

PRIMARY KEY  (var1)

) ENGINE=ndbcluster DEFAULT CHARSET=ascii CHECKSUM=1;

CREATE TABLE t2 (

var1 int(2) NOT NULL,

var2 int(2) NOT NULL,

PRIMARY KEY  (var1)

) ENGINE=MyISAM DEFAULT CHARSET=ascii CHECKSUM=1;

CREATE TRIGGER testtrigger

AFTER UPDATE ON t1 FOR EACH ROW BEGIN

REPLACE INTO t2 SELECT * FROM t1 WHERE t1.var1 = NEW.var1;END|

INSERT INTO t1 VALUES (1,1),(2,2),(3,3);

UPDATE t1 SET var2 = 9 WHERE var1 IN(1,2,3);

DROP TRIGGER testtrigger;

DROP TABLE t1, t2;

mysql-test/t/ndb_read_multi_range.test

+29 −0
Original line number Diff line number Diff line
@@ -253,3 +253,32 @@ SELECT id, tag, doc, type FROM t1 WHERE id IN ('flipper','orka'); 
SELECT id, tag, doc, type FROM t1 WHERE id IN ('flipper','sakila');



DROP TABLE t1;



#bug#25522

CREATE TABLE t1 (

       var1 int(2) NOT NULL,

       var2 int(2) NOT NULL,

       PRIMARY KEY  (var1)

     ) ENGINE=ndbcluster DEFAULT CHARSET=ascii CHECKSUM=1;





CREATE TABLE t2 (

       var1 int(2) NOT NULL,

       var2 int(2) NOT NULL,

       PRIMARY KEY  (var1)

     ) ENGINE=MyISAM DEFAULT CHARSET=ascii CHECKSUM=1;





DELIMITER |;

CREATE TRIGGER testtrigger

     AFTER UPDATE ON t1 FOR EACH ROW BEGIN

     REPLACE INTO t2 SELECT * FROM t1 WHERE t1.var1 = NEW.var1;END|

DELIMITER ;|



INSERT INTO t1 VALUES (1,1),(2,2),(3,3);



UPDATE t1 SET var2 = 9 WHERE var1 IN(1,2,3);



DROP TRIGGER testtrigger;



DROP TABLE t1, t2;

sql/ha_ndbcluster.cc

+5 −2
Original line number Diff line number Diff line
@@ -3882,11 +3882,10 @@ int ha_ndbcluster::start_stmt(THD *thd, thr_lock_type lock_type) 
      ERR_RETURN(ndb->getNdbError());

    no_uncommitted_rows_reset(thd);

    thd_ndb->stmt= trans;

    thd_ndb->query_state&= NDB_QUERY_NORMAL;

    trans_register_ha(thd, FALSE, &ndbcluster_hton);

  }

  thd_ndb->query_state&= NDB_QUERY_NORMAL;

  m_active_trans= trans;



  // Start of statement

  m_retrieve_all_fields= FALSE;

  m_retrieve_primary_key= FALSE;
@@ -6528,7 +6527,11 @@ ha_ndbcluster::read_multi_range_next(KEY_MULTI_RANGE ** multi_range_found_p) 
  }

  

  if (multi_range_curr == multi_range_end)

  {

    Thd_ndb *thd_ndb= get_thd_ndb(current_thd);

    thd_ndb->query_state&= NDB_QUERY_NORMAL;

    DBUG_RETURN(HA_ERR_END_OF_FILE);

  }

  

  /**

   * Read remaining ranges