bk commit into 5.1 tree (pekka:1.2232) BUG#20751

[pekka]

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.2232 06/07/03 12:13:57 pekka@stripped +2 -0
  ndb - bug#20751 : report also composite op in merge

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
    1.63 06/07/03 12:11:53 pekka@stripped +10 -3
    report even composite op in merge
    test case: test_event_merge --no-blobs --ops ic:dcic

  storage/ndb/test/ndbapi/test_event_merge.cpp
    1.13 06/07/03 12:10:28 pekka@stripped +10 -2
    cannot skip tables if ops specified

# 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

--- 1.62/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2006-06-21 16:13:20 +02:00
+++ 1.63/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2006-07-03 12:11:53 +02:00
@@ -1809,11 +1809,18 @@ NdbEventBuffer::insertDataL(NdbEventOper
       }
       // merge is on so we do not report blob part events
       if (! is_blob_event) {
-        // report actual operation, not composite
+        // report actual operation and the composite
         // there is no way to "fix" the flags for a composite op
         // since the flags represent multiple ops on multiple PKs
-        EventBufData_list::Gci_op g = { op, (1 << sdata->operation) };
-        bucket->m_data.add_gci_op(g);
+        // XXX fix by doing merge at end of epoch (extra mem cost)
+        {
+          EventBufData_list::Gci_op g = { op, (1 << sdata->operation) };
+          bucket->m_data.add_gci_op(g);
+        }
+        {
+          EventBufData_list::Gci_op g = { op, (1 << data->sdata->operation)
};
+          bucket->m_data.add_gci_op(g);
+        }
       }
     }
     DBUG_RETURN_EVENT(0);

--- 1.12/storage/ndb/test/ndbapi/test_event_merge.cpp	2006-06-21 16:11:52 +02:00
+++ 1.13/storage/ndb/test/ndbapi/test_event_merge.cpp	2006-07-03 12:10:28 +02:00
@@ -1535,11 +1535,19 @@ selecttables()
   uint i;
   for (i = 0; i < maxrun(); i++)
     run(i).skip = false;
+  if (g_opts.opstring != 0) {
+    ll1("using all tables due to fixed ops");
+    return;
+  }
   for (i = 0; i + 1 < maxrun(); i++)
     run(urandom(maxrun())).skip = true;
   uint cnt = 0;
-  for (i = 0; i < maxrun(); i++)
-    cnt += ! run(i).skip;
+  for (i = 0; i < maxrun(); i++) {
+    if (! run(i).skip) {
+      ll2("use table " << run(i).tabname);
+      cnt++;
+    }
+  }
   ll1("use " << cnt << "/" << maxrun() << " tables in this
loop");
 }