bzr push into mysql-5.1-telco-7.0 branch (jonas:4191 to 4192)

[jonas oreland]

 4192 jonas oreland	2011-02-15
      ndb - fix a few compiler warnings

    modified:
      storage/ndb/src/common/debugger/signaldata/FsRef.cpp
      storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp
      storage/ndb/src/kernel/blocks/lgman.cpp
      storage/ndb/src/kernel/error/ErrorReporter.cpp
 4191 jonas oreland	2011-02-10
      ndb - move loading of disk-page and getting log-buffer into own subroutines in DbtupCommit

    modified:
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
=== modified file 'storage/ndb/src/common/debugger/signaldata/FsRef.cpp'
--- a/storage/ndb/src/common/debugger/signaldata/FsRef.cpp	2011-02-01 23:27:25 +0000
+++ b/storage/ndb/src/common/debugger/signaldata/FsRef.cpp	2011-02-15 08:46:20 +0000
@@ -38,7 +38,7 @@ printFSREF(FILE * output, const Uint32 *
     fprintf(output, "No error");
     break;
   default:
-    fprintf(output, ndbd_exit_message(sig->getErrorCode(sig->errorCode), &cl));
+    fprintf(output, "%s", ndbd_exit_message(sig->getErrorCode(sig->errorCode), &cl));
     break;
   }
   fprintf(output, "\n");

=== modified file 'storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp'
--- a/storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp	2011-02-01 23:27:25 +0000
+++ b/storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp	2011-02-15 08:46:20 +0000
@@ -77,7 +77,7 @@ SHM_Transporter::checkConnected(){
 		    "shmctl(%d, IPC_STAT) errno: %d(%s). ", shmId,
 		    errno, strerror(errno));
     make_error_info(buf+r, sizeof(buf)-r);
-    DBUG_PRINT("error",(buf));
+    DBUG_PRINT("error",("%s", buf));
     switch (errno)
     {
     case EACCES:

=== modified file 'storage/ndb/src/kernel/blocks/lgman.cpp'
--- a/storage/ndb/src/kernel/blocks/lgman.cpp	2011-01-30 20:56:00 +0000
+++ b/storage/ndb/src/kernel/blocks/lgman.cpp	2011-02-15 08:46:20 +0000
@@ -369,8 +369,8 @@ Lgman::execDUMP_STATE_ORD(Signal* signal
                            !ptr.p->m_log_buffer_waiters.isEmpty(),
                            !ptr.p->m_log_sync_waiters.isEmpty());
       if (signal->theData[0] == 12001)
-        infoEvent(tmp);
-      ndbout_c(tmp);
+        infoEvent("%s", tmp);
+      ndbout_c("%s", tmp);
 
       BaseString::snprintf(tmp, sizeof(tmp),
                            "   callback_buffer_words: %u"
@@ -379,8 +379,8 @@ Lgman::execDUMP_STATE_ORD(Signal* signal
                            ptr.p->m_free_buffer_words,
                            ptr.p->m_free_file_words);
       if (signal->theData[0] == 12001)
-        infoEvent(tmp);
-      ndbout_c(tmp);
+        infoEvent("%s", tmp);
+      ndbout_c("%s", tmp);
       if (!ptr.p->m_log_buffer_waiters.isEmpty())
       {
 	Ptr<Log_waiter> waiter;
@@ -392,8 +392,8 @@ Lgman::execDUMP_STATE_ORD(Signal* signal
                              waiter.p->m_size,
                              FREE_BUFFER_MARGIN);
         if (signal->theData[0] == 12001)
-          infoEvent(tmp);
-        ndbout_c(tmp);
+          infoEvent("%s", tmp);
+        ndbout_c("%s", tmp);
       }
       if (!ptr.p->m_log_sync_waiters.isEmpty())
       {
@@ -407,8 +407,8 @@ Lgman::execDUMP_STATE_ORD(Signal* signal
                              waiter.i,
                              waiter.p->m_sync_lsn);
         if (signal->theData[0] == 12001)
-          infoEvent(tmp);
-        ndbout_c(tmp);
+          infoEvent("%s", tmp);
+        ndbout_c("%s", tmp);
 	
 	while(!waiter.isNull())
 	{

=== modified file 'storage/ndb/src/kernel/error/ErrorReporter.cpp'
--- a/storage/ndb/src/kernel/error/ErrorReporter.cpp	2011-02-01 23:27:25 +0000
+++ b/storage/ndb/src/kernel/error/ErrorReporter.cpp	2011-02-15 08:46:20 +0000
@@ -239,8 +239,8 @@ ErrorReporter::handleError(int messageID
   
   WriteMessage(messageID, problemData, objRef, nst);
 
-  g_eventLogger->info(problemData);
-  g_eventLogger->info(objRef);
+  g_eventLogger->info("%s", problemData);
+  g_eventLogger->info("%s", objRef);
 
   NdbShutdown(messageID, nst);
   exit(1); // kill warning

No bundle (reason: useless for push emails).