Commit 95edb7dd authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 

into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
parents c52165de b0570148

mysql-test/r/ndb_read_multi_range.result

+17 −0
Original line number Diff line number Diff line
@@ -442,3 +442,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
@@ -272,3 +272,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

+172 −35

File changed.

Preview size limit exceeded, changes collapsed.

sql/ha_ndbcluster.h

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ typedef struct st_ndbcluster_share { 
  char *table_name;

  Ndb::TupleIdRange tuple_id_range;

#ifdef HAVE_NDB_BINLOG

  uint32 connect_count;

  uint32 flags;

  NdbEventOperation *op;

  NdbEventOperation *op_old; // for rename table

sql/ha_ndbcluster_binlog.cc

+150 −7

File changed.

Preview size limit exceeded, changes collapsed.