bzr push into mysql-5.1 branch (jonas:2876)

[Jonas Oreland]

 2876 Jonas Oreland	2008-10-03
      ndb - fix compiler warnings
modified:
  storage/ndb/src/common/debugger/SignalLoggerManager.cpp
  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
  storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
  storage/ndb/src/kernel/blocks/suma/Suma.cpp
  storage/ndb/src/mgmsrv/Services.cpp
  storage/ndb/src/mgmsrv/main.cpp

=== modified file 'storage/ndb/src/common/debugger/SignalLoggerManager.cpp'
--- a/storage/ndb/src/common/debugger/SignalLoggerManager.cpp	2008-10-01 07:23:17 +0000
+++ b/storage/ndb/src/common/debugger/SignalLoggerManager.cpp	2008-10-03 08:22:13 +0000
@@ -22,6 +22,7 @@
 #include <NdbTick.h>
 #include <NdbEnv.h>
 
+#ifdef VM_TRACE_TIME
 static char* mytime()
 {
   NDB_TICKS t = NdbTick_CurrentMillisecond();
@@ -31,7 +32,7 @@ static char* mytime()
   sprintf(buf, "%u.%03u", s, ms);
   return buf;
 }
-
+#endif
 SignalLoggerManager::SignalLoggerManager()
 {
   for (int i = 0; i < NO_OF_BLOCKS; i++){

=== modified file 'storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2008-10-02 21:58:44 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2008-10-03 08:22:13 +0000
@@ -110,6 +110,7 @@ extern EventLogger * g_eventLogger;
   } while (specNodePtr.i != RNIL);                                      \
 }
 
+#if 0
 static
 Uint32
 oldPrevLcpNo(Uint32 lcpNo){
@@ -117,6 +118,7 @@ oldPrevLcpNo(Uint32 lcpNo){
     return MAX_LCP_STORED - 1;
   return lcpNo - 1;
 }
+#endif
 
 static
 Uint32

=== modified file 'storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp	2008-09-30 15:10:29 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp	2008-10-03 08:22:13 +0000
@@ -176,7 +176,7 @@ Dbtup::dealloc_tuple(Signal* signal,
     * ptr->get_mm_gci(regTabPtr) = gci;
   }
 }
-
+#if 0
 static void dump_buf_hex(unsigned char *p, Uint32 bytes)
 {
   char buf[3001];
@@ -194,6 +194,8 @@ static void dump_buf_hex(unsigned char *
   }
   ndbout_c("%8p: %s", p, buf);
 }
+#endif
+
 void
 Dbtup::commit_operation(Signal* signal,
 			Uint32 gci,

=== modified file 'storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp	2008-04-03 12:30:16 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp	2008-10-03 08:22:13 +0000
@@ -280,6 +280,7 @@ Dbtup::setUpQueryRoutines(Tablerec *regT
   }
 }
 
+#if 0
 /* Dump a byte buffer, for debugging. */
 static void dump_buf_hex(unsigned char *p, Uint32 bytes)
 {
@@ -298,6 +299,7 @@ static void dump_buf_hex(unsigned char *
   }
   ndbout_c("%8p: %s", p, buf);
 }
+#endif
 
 static
 inline

=== modified file 'storage/ndb/src/kernel/blocks/suma/Suma.cpp'
--- a/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2008-10-02 21:58:44 +0000
+++ b/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2008-10-03 08:22:13 +0000
@@ -5633,7 +5633,7 @@ Suma::execCREATE_NODEGROUP_IMPL_REQ(Sign
   }
   return;
 
-error:
+//error:
   CreateNodegroupImplRef *ref =
     (CreateNodegroupImplRef*)signal->getDataPtrSend();
   ref->senderRef = reference();
@@ -5710,7 +5710,7 @@ Suma::execDROP_NODEGROUP_IMPL_REQ(Signal
   }
   return;
 
-error:
+//error:
   DropNodegroupImplRef *ref =
     (DropNodegroupImplRef*)signal->getDataPtrSend();
   ref->senderRef = reference();

=== modified file 'storage/ndb/src/mgmsrv/Services.cpp'
--- a/storage/ndb/src/mgmsrv/Services.cpp	2008-09-17 13:23:21 +0000
+++ b/storage/ndb/src/mgmsrv/Services.cpp	2008-10-03 08:22:13 +0000
@@ -1836,7 +1836,7 @@ MgmApiSession::drop_nodegroup(Parser_t::
     result.assfmt("error: %d", res);
   }
 
-end:
+//end:
   m_output->println("drop nodegroup reply");
   m_output->println("result: %s", result.c_str());
   m_output->println("");

=== modified file 'storage/ndb/src/mgmsrv/main.cpp'
--- a/storage/ndb/src/mgmsrv/main.cpp	2008-08-21 06:33:18 +0000
+++ b/storage/ndb/src/mgmsrv/main.cpp	2008-10-03 08:22:13 +0000
@@ -83,9 +83,6 @@ bool g_RestartServer= false;
 static MgmtSrvr* mgm;
 static MgmtSrvr::MgmtOpts opts;
 
-static int opt_daemon;
-static int opt_non_interactive;
-
 static struct my_option my_long_options[] =
 {
   NDB_STD_OPTS("ndb_mgmd"),