bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:3705)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.0/ based on revid:frazer@stripped

 3705 Magnus Blåudd	2010-08-19
      ndb
       - remove useless global variable and use the NDB_APPLY_TABLE defihne directly

    modified:
      storage/ndb/tools/restore/consumer.cpp
      storage/ndb/tools/restore/consumer.hpp
      storage/ndb/tools/restore/consumer_restore.cpp
=== modified file 'storage/ndb/tools/restore/consumer.cpp'
--- a/storage/ndb/tools/restore/consumer.cpp	2009-05-26 18:53:34 +0000
+++ b/storage/ndb/tools/restore/consumer.cpp	2010-08-19 14:16:35 +0000
@@ -18,8 +18,6 @@
 
 #include "consumer.hpp"
 
-const char *Ndb_apply_table=  NDB_APPLY_TABLE;
-
 #ifdef USE_MYSQL
 int
 BackupConsumer::create_table_string(const TableS & table,

=== modified file 'storage/ndb/tools/restore/consumer.hpp'
--- a/storage/ndb/tools/restore/consumer.hpp	2010-01-13 08:56:02 +0000
+++ b/storage/ndb/tools/restore/consumer.hpp	2010-08-19 14:16:35 +0000
@@ -23,7 +23,6 @@
 #include "ndb_nodegroup_map.h"
 
 #include "../../../../sql/ha_ndbcluster_tables.h"
-extern const char *Ndb_apply_table;
 
 class BackupConsumer {
 public:

=== modified file 'storage/ndb/tools/restore/consumer_restore.cpp'
--- a/storage/ndb/tools/restore/consumer_restore.cpp	2010-07-02 10:52:27 +0000
+++ b/storage/ndb/tools/restore/consumer_restore.cpp	2010-08-19 14:16:35 +0000
@@ -784,10 +784,10 @@ BackupRestore::update_apply_status(const
   m_ndb->setSchemaName("def");
 
   NdbDictionary::Dictionary *dict= m_ndb->getDictionary();
-  const NdbDictionary::Table *ndbtab= dict->getTable(Ndb_apply_table);
+  const NdbDictionary::Table *ndbtab= dict->getTable(NDB_APPLY_TABLE);
   if (!ndbtab)
   {
-    err << Ndb_apply_table << ": "
+    err << NDB_APPLY_TABLE << ": "
 	<< dict->getNdbError() << endl;
     return false;
   }
@@ -808,7 +808,7 @@ BackupRestore::update_apply_status(const
   }
   if (apply_table_format == 0)
   {
-    err << Ndb_apply_table << " has wrong format\n";
+    err << NDB_APPLY_TABLE << " has wrong format\n";
     return false;
   }
 
@@ -827,14 +827,14 @@ BackupRestore::update_apply_status(const
   NdbTransaction * trans= m_ndb->startTransaction();
   if (!trans)
   {
-    err << Ndb_apply_table << ": "
+    err << NDB_APPLY_TABLE << ": "
 	<< m_ndb->getNdbError() << endl;
     return false;
   }
   NdbOperation * op= trans->getNdbOperation(ndbtab);
   if (!op)
   {
-    err << Ndb_apply_table << ": "
+    err << NDB_APPLY_TABLE << ": "
 	<< trans->getNdbError() << endl;
     goto err;
   }
@@ -842,7 +842,7 @@ BackupRestore::update_apply_status(const
       op->equal(0u, (const char *)&server_id, sizeof(server_id)) ||
       op->setValue(1u, (const char *)&epoch, sizeof(epoch)))
   {
-    err << Ndb_apply_table << ": "
+    err << NDB_APPLY_TABLE << ": "
 	<< op->getNdbError() << endl;
     goto err;
   }
@@ -851,13 +851,13 @@ BackupRestore::update_apply_status(const
        op->setValue(3u, (const char *)&zero, sizeof(zero)) ||
        op->setValue(4u, (const char *)&zero, sizeof(zero))))
   {
-    err << Ndb_apply_table << ": "
+    err << NDB_APPLY_TABLE << ": "
 	<< op->getNdbError() << endl;
     goto err;
   }
   if (trans->execute(NdbTransaction::Commit))
   {
-    err << Ndb_apply_table << ": "
+    err << NDB_APPLY_TABLE << ": "
 	<< trans->getNdbError() << endl;
     goto err;
   }

Attachment: [text/bzr-bundle] bzr/[e-mail]