bk commit into 5.0 tree (joreland:1.1884)

[jonas.oreland]

Below is the list of changes that have just been committed into a local
5.0 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.1884 05/07/22 12:28:17 joreland@stripped +2 -0
  Merge mysql.com:/home/jonas/src/mysql-5.0
  into  mysql.com:/home/jonas/src/mysql-5.0-push

  ndb/tools/restore/restore_main.cpp
    1.31 05/07/22 12:28:12 joreland@stripped +0 -0
    Auto merged

  ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
    1.9 05/07/22 12:28:12 joreland@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:	joreland
# Host:	eel.(none)
# Root:	/home/jonas/src/mysql-5.0-push/RESYNC

--- 1.30/ndb/tools/restore/restore_main.cpp	2005-07-14 19:52:41 +02:00
+++ 1.31/ndb/tools/restore/restore_main.cpp	2005-07-22 12:28:12 +02:00
@@ -318,7 +318,7 @@
   
   if (ga_restore || ga_print) 
   {
-    if (ga_restore) 
+    if(_restore_data || _print_data)
     {
       RestoreDataIterator dataIter(metaData, &free_data_callback);
       
@@ -365,7 +365,10 @@
       
       for (i= 0; i < g_consumers.size(); i++)
 	g_consumers[i]->endOfTuples();
+    }
 
+    if(_restore_data || _print_log)
+    {
       RestoreLogIterator logIter(metaData);
       if (!logIter.readHeader())
       {
@@ -389,6 +392,10 @@
       logIter.validateFooter(); //not implemented
       for (i= 0; i < g_consumers.size(); i++)
 	g_consumers[i]->endOfLogEntrys();
+    }
+    
+    if(_restore_data)
+    {
       for(i = 0; i<metaData.getNoOfTables(); i++)
       {
 	if (checkSysTable(metaData[i]->getTableName()))

--- 1.8/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp	2005-07-19 03:59:56 +02:00
+++ 1.9/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp	2005-07-22 12:28:12 +02:00
@@ -607,7 +607,7 @@
     for everybody else.
     */
     signal->theData[0] = trigPtr->triggerId;
-    signal->theData[1] = regOperPtr->fragId;
+    signal->theData[1] = regOperPtr->fragId >> 1; // send "real" frag id
     EXECUTE_DIRECT(BACKUP, GSN_BACKUP_TRIG_REQ, signal, 2);
     ljamEntry();
     if (signal->theData[0] == 0) {