5 files changed, 16 insertions, 1 deletions
diff --git a/ndb/include/logger/LogHandler.hpp b/ndb/include/logger/LogHandler.hpp
index 8b9aa43d7a9..efb87bb3104 100644
--- a/ndb/include/logger/LogHandler.hpp
+++ b/ndb/include/logger/LogHandler.hpp
@@ -135,7 +135,7 @@ public:
    *
    * @param str the error string.
    */
-  void setErrorStr(char* str);
+  void setErrorStr(const char* str);
 
   /**
    * Parse logstring parameters
diff --git a/ndb/include/ndb_global.h.in b/ndb/include/ndb_global.h.in
index 122b0edc400..f1eed73f71a 100644
--- a/ndb/include/ndb_global.h.in
+++ b/ndb/include/ndb_global.h.in
@@ -132,4 +132,10 @@ extern "C" {
 #define PATH_MAX 1024
 #endif
 
+#if defined(_lint) || defined(FORCE_INIT_OF_VARS)
+#define LINT_SET_PTR = {0,0}
+#else
+#define LINT_SET_PTR
+#endif
+
 #endif
diff --git a/ndb/include/util/InputStream.hpp b/ndb/include/util/InputStream.hpp
index 4d7d06aeaa3..56c43686df1 100644
--- a/ndb/include/util/InputStream.hpp
+++ b/ndb/include/util/InputStream.hpp
@@ -25,6 +25,7 @@
  */
 class InputStream {
 public:
+  virtual ~InputStream() {}
   virtual char* gets(char * buf, int bufLen) = 0;
 };
 
diff --git a/ndb/include/util/OutputStream.hpp b/ndb/include/util/OutputStream.hpp
index c7e009d4537..a834b577bb3 100644
--- a/ndb/include/util/OutputStream.hpp
+++ b/ndb/include/util/OutputStream.hpp
@@ -25,6 +25,7 @@
  */
 class OutputStream {
 public:
+  virtual ~OutputStream() {}
   virtual int print(const char * fmt, ...) = 0;
   virtual int println(const char * fmt, ...) = 0;
   virtual void flush() {};
diff --git a/ndb/include/util/SimpleProperties.hpp b/ndb/include/util/SimpleProperties.hpp
index 438426fb62b..b29e65e21da 100644
--- a/ndb/include/util/SimpleProperties.hpp
+++ b/ndb/include/util/SimpleProperties.hpp
@@ -151,6 +151,7 @@ public:
     ValueType m_type;
   protected:
     Reader();
+    virtual ~Reader() {}
     virtual void reset() = 0;
     
     virtual bool step(Uint32 len) = 0;
@@ -169,6 +170,7 @@ public:
     bool add(Uint16 key, const char * value);
     bool add(Uint16 key, const void* value, int len);
   protected:
+    virtual ~Writer() {}
     virtual bool reset() = 0;
     virtual bool putWord(Uint32 val) = 0;
     virtual bool putWords(const Uint32 * src, Uint32 len) = 0;
@@ -184,6 +186,7 @@ class SimplePropertiesLinearReader : public SimpleProperties::Reader {
 public:
   SimplePropertiesLinearReader(const Uint32 * src, Uint32 len);
   
+  virtual ~SimplePropertiesLinearReader() {}
   virtual void reset();
   virtual bool step(Uint32 len);
   virtual bool getWord(Uint32 * dst);
@@ -202,6 +205,7 @@ class LinearWriter : public SimpleProperties::Writer {
 public:
   LinearWriter(Uint32 * src, Uint32 len);
   
+  virtual ~LinearWriter() {}
   virtual bool reset();
   virtual bool putWord(Uint32 val);
   virtual bool putWords(const Uint32 * src, Uint32 len);
@@ -219,6 +223,7 @@ class UtilBufferWriter : public SimpleProperties::Writer {
 public:
   UtilBufferWriter(class UtilBuffer & buf);
   
+  virtual ~UtilBufferWriter() {}
   virtual bool reset();
   virtual bool putWord(Uint32 val);
   virtual bool putWords(const Uint32 * src, Uint32 len);
@@ -238,6 +243,7 @@ public:
   SimplePropertiesSectionReader(struct SegmentedSectionPtr &,
 				class SectionSegmentPool &);
   
+  virtual ~SimplePropertiesSectionReader() {}
   virtual void reset();
   virtual bool step(Uint32 len);
   virtual bool getWord(Uint32 * dst);
@@ -270,6 +276,7 @@ class SimplePropertiesSectionWriter : public SimpleProperties::Writer {
 public:
   SimplePropertiesSectionWriter(class SectionSegmentPool &);
 
+  virtual ~SimplePropertiesSectionWriter() {}
   virtual bool reset();
   virtual bool putWord(Uint32 val);
   virtual bool putWords(const Uint32 * src, Uint32 len);