bk commit into 5.1 tree (jonas:1.2114) BUG#27748

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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-04-11 08:07:43+02:00, jonas@stripped +3 -0
  ndb - bug#27748 (wl2325-5.0)
    fix commit triggers on multi-update

  mysql-test/r/rpl_ndb_basic.result@stripped, 2007-04-11 08:07:41+02:00,
jonas@stripped +27 -0
    testcase

  mysql-test/t/rpl_ndb_basic.test@stripped, 2007-04-11 08:07:41+02:00,
jonas@stripped +32 -0
    testcase

  storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp@stripped, 2007-04-11 08:07:41+02:00,
jonas@stripped +6 -0
    Fix multi-update commit triggers

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/drop5p19

--- 1.4/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp	2007-04-11 08:07:46 +02:00
+++ 1.5/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp	2007-04-11 08:07:46 +02:00
@@ -390,6 +390,7 @@
 
   fragptr.p = regFragPtr;
   tabptr.p = regTabPtr;
+  Uint32 hashValue = firstOpPtr.p->hashValue;
 
   if (opType == ZINSERT_DELETE) {
     ljam();
@@ -412,6 +413,7 @@
 //--------------------------------------------------------------------
     Uint32 saveOpType = regOperPtr->optype;
     regOperPtr->optype = ZINSERT;
+    regOperPtr->hashValue = hashValue;
     operPtr.p = regOperPtr;
 
     checkDetachedTriggers(signal,
@@ -444,6 +446,8 @@
     befOpPtr.p->changeMask.clear();
     befOpPtr.p->changeMask.bitOR(attributeMask);
     befOpPtr.p->gci = regOperPtr->gci;
+    befOpPtr.p->optype = ZUPDATE;
+    befOpPtr.p->hashValue = hashValue;
     
     operPtr.p = befOpPtr.p;
     checkDetachedTriggers(signal,
@@ -477,11 +481,13 @@
     Uint32 fragPageId = befOpPtr.p->fragPageId;
     Uint32 pageIndex  = befOpPtr.p->pageIndex;
 
+    befOpPtr.p->optype = ZDELETE;
     befOpPtr.p->realPageId = befOpPtr.p->realPageIdC;
     befOpPtr.p->pageOffset = befOpPtr.p->pageOffsetC;
     befOpPtr.p->fragPageId = befOpPtr.p->fragPageIdC;
     befOpPtr.p->pageIndex  = befOpPtr.p->pageIndexC;
     befOpPtr.p->gci = regOperPtr->gci;
+    befOpPtr.p->hashValue = hashValue;
 
     operPtr.p = befOpPtr.p;
     checkDetachedTriggers(signal,

--- 1.2/mysql-test/r/rpl_ndb_basic.result	2007-04-11 08:07:46 +02:00
+++ 1.3/mysql-test/r/rpl_ndb_basic.result	2007-04-11 08:07:46 +02:00
@@ -24,6 +24,33 @@
 select * from t1 order by nid;
 nid	nom	prenom
 1	XYZ2	ABC2
+delete from t1;
+insert into t1 values(1,"AA", "AA");
+insert into t1 values(2,"BB", "BB");
+insert into t1 values(3,"CC", "CC");
+insert into t1 values(4,"DD", "DD");
+begin;
+delete from t1 where nid = 1;
+insert into t1 values (1,"A2", "A2");
+update t1 set nom="B2" where nid = 2;
+delete from t1 where nid = 2;
+update t1 set nom = "D2" where nid = 4;
+delete from t1 where nid = 4;
+insert into t1 values (4, "D3", "D3");
+update t1 set nom = "D4" where nid = 4;
+insert into t1 values (5, "EE", "EE");
+delete from t1 where nid = 5;
+commit;
+select * from t1 order by 1;
+nid	nom	prenom
+1	A2	A2
+3	CC	CC
+4	D4	D3
+select * from t1 order by 1;
+nid	nom	prenom
+1	A2	A2
+3	CC	CC
+4	D4	D3
 DROP table t1;
 CREATE TABLE `t1` ( `nid` int(11) NOT NULL default '0',
 `nom` char(4) default NULL,

--- 1.2/mysql-test/t/rpl_ndb_basic.test	2007-04-11 08:07:46 +02:00
+++ 1.3/mysql-test/t/rpl_ndb_basic.test	2007-04-11 08:07:46 +02:00
@@ -36,6 +36,38 @@
 select * from t1 order by nid;
 
 --connection master
+delete from t1;
+insert into t1 values(1,"AA", "AA");
+insert into t1 values(2,"BB", "BB");
+insert into t1 values(3,"CC", "CC");
+insert into t1 values(4,"DD", "DD");
+
+begin;
+# delete+insert = update
+delete from t1 where nid = 1;
+insert into t1 values (1,"A2", "A2");
+
+# update+delete = delete
+update t1 set nom="B2" where nid = 2;
+delete from t1 where nid = 2;
+
+# multi-update
+update t1 set nom = "D2" where nid = 4;
+delete from t1 where nid = 4;
+insert into t1 values (4, "D3", "D3");
+update t1 set nom = "D4" where nid = 4;
+
+# insert+delete = nothing
+insert into t1 values (5, "EE", "EE");
+delete from t1 where nid = 5;
+
+commit;
+select * from t1 order by 1;
+--sync_slave_with_master
+--connection slave
+select * from t1 order by 1;
+--connection master
+
 DROP table t1;
 
 ##################################################################