List:Commits« Previous MessageNext Message »
From:pekka Date:January 21 2006 10:57am
Subject:bk commit into 5.1 tree (pekka:1.2073)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of pekka. When pekka 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
  1.2073 06/01/21 11:57:15 pekka@stripped +1 -0
  Merge mysql.com:/space/pekka/ndb/version/my51
  into  mysql.com:/space/pekka/ndb/version/my51-rbr

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.34 06/01/21 11:56:55 pekka@stripped +0 -0
    Auto merged

# 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:	pekka
# Host:	orca.ndb.mysql.com
# Root:	/space/pekka/ndb/version/my51-rbr/RESYNC

--- 1.33/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2006-01-19 14:00:03 +01:00
+++ 1.34/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2006-01-21 11:56:55 +01:00
@@ -1576,23 +1576,23 @@
 
 static struct Ev_t {
   enum {
-    INS = NdbDictionary::Event::_TE_INSERT,
-    DEL = NdbDictionary::Event::_TE_DELETE,
-    UPD = NdbDictionary::Event::_TE_UPDATE,
-    NUL = NdbDictionary::Event::_TE_NUL,
-    ERR = 255
+    enum_INS = NdbDictionary::Event::_TE_INSERT,
+    enum_DEL = NdbDictionary::Event::_TE_DELETE,
+    enum_UPD = NdbDictionary::Event::_TE_UPDATE,
+    enum_NUL = NdbDictionary::Event::_TE_NUL,
+    enum_ERR = 255
   };
   int t1, t2, t3;
 } ev_t[] = {
-  { Ev_t::INS, Ev_t::INS, Ev_t::ERR },
-  { Ev_t::INS, Ev_t::DEL, Ev_t::NUL }, //ok
-  { Ev_t::INS, Ev_t::UPD, Ev_t::INS }, //ok
-  { Ev_t::DEL, Ev_t::INS, Ev_t::UPD }, //ok
-  { Ev_t::DEL, Ev_t::DEL, Ev_t::ERR },
-  { Ev_t::DEL, Ev_t::UPD, Ev_t::ERR },
-  { Ev_t::UPD, Ev_t::INS, Ev_t::ERR },
-  { Ev_t::UPD, Ev_t::DEL, Ev_t::DEL }, //ok
-  { Ev_t::UPD, Ev_t::UPD, Ev_t::UPD }  //ok
+  { Ev_t::enum_INS, Ev_t::enum_INS, Ev_t::enum_ERR },
+  { Ev_t::enum_INS, Ev_t::enum_DEL, Ev_t::enum_NUL }, //ok
+  { Ev_t::enum_INS, Ev_t::enum_UPD, Ev_t::enum_INS }, //ok
+  { Ev_t::enum_DEL, Ev_t::enum_INS, Ev_t::enum_UPD }, //ok
+  { Ev_t::enum_DEL, Ev_t::enum_DEL, Ev_t::enum_ERR },
+  { Ev_t::enum_DEL, Ev_t::enum_UPD, Ev_t::enum_ERR },
+  { Ev_t::enum_UPD, Ev_t::enum_INS, Ev_t::enum_ERR },
+  { Ev_t::enum_UPD, Ev_t::enum_DEL, Ev_t::enum_DEL }, //ok
+  { Ev_t::enum_UPD, Ev_t::enum_UPD, Ev_t::enum_UPD }  //ok
 };
 
 /*
@@ -1644,7 +1644,7 @@
 
   int t1 = data->sdata->operation;
   int t2 = sdata->operation;
-  if (t1 == Ev_t::NUL)
+  if (t1 == Ev_t::enum_NUL)
     DBUG_RETURN_EVENT(copy_data(sdata, ptr2, data));
 
   Ev_t* tp = 0;
@@ -1655,7 +1655,7 @@
       break;
     }
   }
-  assert(tp != 0 && tp->t3 != Ev_t::ERR);
+  assert(tp != 0 && tp->t3 != Ev_t::enum_ERR);
 
   // save old data
   EventBufData olddata = *data;
@@ -1697,7 +1697,7 @@
     }
 
     // merge after values, new version overrides
-    if (tp->t3 != Ev_t::DEL)
+    if (tp->t3 != Ev_t::enum_DEL)
     {
       AttributeHeader ah;
       Uint32 i = ptr[0].sz;
@@ -1746,7 +1746,7 @@
     }
 
     // merge before values, old version overrides
-    if (tp->t3 != Ev_t::INS)
+    if (tp->t3 != Ev_t::enum_INS)
     {
       AttributeHeader ah;
       Uint32 k = 0;
Thread
bk commit into 5.1 tree (pekka:1.2073)pekka21 Jan