List:Commits« Previous MessageNext Message »
From:jonas Date:January 5 2006 10:45am
Subject:bk commit into 5.1 tree (jonas:1.1987)
View as plain text  
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
  1.1987 06/01/05 11:45:22 jonas@stripped +5 -0
  ndb dd -
    fix commit triggers (for event & backup)

  storage/ndb/test/run-test/daily-devel-tests.txt
    1.26 06/01/05 11:45:19 jonas@stripped +2 -2
    Only run 2 loops to make test finish within 2500 secs.

  storage/ndb/test/ndbapi/test_event.cpp
    1.13 06/01/05 11:45:19 jonas@stripped +12 -0
    Add drop of shadow table

  storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
    1.18 06/01/05 11:45:19 jonas@stripped +10 -5
    Fix tup commit triggers for dd

  storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
    1.15 06/01/05 11:45:19 jonas@stripped +3 -5
    Fix tup commit triggers for dd

  storage/ndb/tools/ndb_error_reporter
    1.2 06/01/05 09:58:50 jonas@stripped +0 -0
    Rename: ndb/tools/ndb_error_reporter -> storage/ndb/tools/ndb_error_reporter

# 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/51-dd

--- 1.25/storage/ndb/test/run-test/daily-devel-tests.txt	2005-09-15 10:42:06 +02:00
+++ 1.26/storage/ndb/test/run-test/daily-devel-tests.txt	2006-01-05 11:45:19 +01:00
@@ -206,12 +206,12 @@
 #
 max-time: 2500
 cmd: test_event
-args: -n EventOperationApplier
+args: -n EventOperationApplier -l 2
 
 #
 max-time: 2500
 cmd: test_event
-args: -n EventOperationApplier_NR
+args: -n EventOperationApplier_NR -l 2
 
 #
 max-time: 2500

--- 1.14/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp	2006-01-04 16:27:59 +01:00
+++ 1.15/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp	2006-01-05 11:45:19 +01:00
@@ -154,11 +154,8 @@
   {
     Local_key disk;
     memcpy(&disk, ptr->get_disk_ref_ptr(regTabPtr), sizeof(disk));
-    Ptr<GlobalPage> disk_page;
-    m_global_page_pool.getPtr(disk_page, 
-			      regOperPtr->m_commit_disk_callback_page);
     disk_page_free(signal, regTabPtr, regFragPtr, 
-		   &disk, *(PagePtr*)&disk_page, gci);
+		   &disk, *(PagePtr*)&m_pgman.m_ptr, gci);
   }
 
   if (regTabPtr->m_bits & Tablerec::TR_RowGCI)
@@ -523,9 +520,10 @@
   
   if(!tuple_ptr)
   {
-    req_struct.m_tuple_ptr= tuple_ptr = (Tuple_header*)
+    tuple_ptr = (Tuple_header*)
       get_ptr(&page, &regOperPtr.p->m_tuple_location,regTabPtr.p);
   }
+  req_struct.m_tuple_ptr = tuple_ptr;
   
   if(get_tuple_state(regOperPtr.p) == TUPLE_PREPARED)
   {

--- 1.17/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp	2006-01-04 16:27:59 +01:00
+++ 1.18/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp	2006-01-05 11:45:19 +01:00
@@ -580,7 +580,12 @@
   {
     regOperPtr->op_struct.op_type = ZUPDATE;
   }
-
+  
+  /**
+   * Set disk page
+   */
+  req_struct->m_disk_page_ptr.i = m_pgman.m_ptr.i;
+  
   ndbrequire(regOperPtr->is_first_operation());
   triggerList.first(trigPtr);
   while (trigPtr.i != RNIL) {
@@ -817,8 +822,8 @@
 //--------------------------------------------------------------------
 // Read Primary Key Values
 //--------------------------------------------------------------------
-  if (regTabPtr->need_expand(false)) // no disk 
-    prepare_read(req_struct, regTabPtr, false); // setup varsize
+  if (regTabPtr->need_expand()) 
+    prepare_read(req_struct, regTabPtr, true);
   
   int ret = readAttributes(req_struct,
 			   &tableDescriptor[regTabPtr->readKeyArray].tabDescr,
@@ -902,8 +907,8 @@
       req_struct->m_tuple_ptr= (Tuple_header*)ptr;
     }
 
-    if (regTabPtr->need_expand(false)) // no disk 
-      prepare_read(req_struct, regTabPtr, false); // setup varsize
+    if (regTabPtr->need_expand()) // no disk 
+      prepare_read(req_struct, regTabPtr, true);
     
     int ret = readAttributes(req_struct,
 			     &readBuffer[0],

--- 1.12/storage/ndb/test/ndbapi/test_event.cpp	2005-11-05 22:55:37 +01:00
+++ 1.13/storage/ndb/test/ndbapi/test_event.cpp	2006-01-05 11:45:19 +01:00
@@ -343,6 +343,16 @@
   return NDBT_FAILED;
 }
 
+int runDropShadowTable(NDBT_Context* ctx, NDBT_Step* step)
+{
+  const NdbDictionary::Table *table= ctx->getTab();
+  char buf[1024];
+  sprintf(buf, "%s_SHADOW", table->getName());
+  
+  GETNDB(step)->getDictionary()->dropTable(buf);
+  return NDBT_OK;
+}
+
 int runCreateDropEventOperation(NDBT_Context* ctx, NDBT_Step* step)
 {
   int loops = ctx->getNumLoops();
@@ -1443,6 +1453,7 @@
   STEP(runEventMixedLoad);
   FINALIZER(runDropEvent);
   FINALIZER(runVerify);
+  FINALIZER(runDropShadowTable);
 }
 TESTCASE("EventOperationApplier_NR", 
 	 "Verify that if we apply the data we get from event "
@@ -1455,6 +1466,7 @@
   STEP(runRestarter);
   FINALIZER(runDropEvent);
   FINALIZER(runVerify);
+  FINALIZER(runDropShadowTable);
 }
 TESTCASE("Multi", 
 	 "Verify that we can work with all tables in parallell"
Thread
bk commit into 5.1 tree (jonas:1.1987)jonas5 Jan