Merge mysql.com:/home/jonas/src/mysql-5.0

into  mysql.com:/home/jonas/src/mysql-5.0-push


ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Auto merged
ndb/tools/restore/restore_main.cpp:
  Auto merged

3 files changed, 11 insertions, 2 deletions

diff --git a/ndb/tools/restore/Restore.cpp b/ndb/tools/restore/Restore.cpp
index b53255820db..60fbf7f8ceb 100644
--- a/ndb/tools/restore/Restore.cpp
+++ b/ndb/tools/restore/Restore.cpp
@@ -646,7 +646,7 @@ bool RestoreDataIterator::readFragmentHeader(int & ret)
   }
 
   info << "_____________________________________________________" << endl
-       << "Restoring data in table: " << m_currentTable->getTableName() 
+       << "Processing data in table: " << m_currentTable->getTableName() 
        << "(" << Header.TableId << ") fragment " 
        << Header.FragmentNo << endl;
   
diff --git a/ndb/tools/restore/consumer_printer.hpp b/ndb/tools/restore/consumer_printer.hpp
index 7cbc924e364..e47bc56f874 100644
--- a/ndb/tools/restore/consumer_printer.hpp
+++ b/ndb/tools/restore/consumer_printer.hpp
@@ -29,6 +29,8 @@ public:
     m_print_log = false;
     m_print_data = false;
     m_print_meta = false;
+    m_logCount = 0;
+    m_dataCount = 0;  
   }
   
   virtual bool table(const TableS &);
diff --git a/ndb/tools/restore/restore_main.cpp b/ndb/tools/restore/restore_main.cpp
index d980f29057b..62fccfa3082 100644
--- a/ndb/tools/restore/restore_main.cpp
+++ b/ndb/tools/restore/restore_main.cpp
@@ -318,7 +318,7 @@ main(int argc, char** argv)
   
   if (ga_restore || ga_print) 
   {
-    if (ga_restore) 
+    if(_restore_data || _print_data)
     {
       RestoreDataIterator dataIter(metaData, &free_data_callback);
       
@@ -365,7 +365,10 @@ main(int argc, char** argv)
       
       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 @@ main(int argc, char** argv)
       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()))