merge with 4.1

1 files changed, 6 insertions, 0 deletions

diff --git a/ndb/include/util/BaseString.hpp b/ndb/include/util/BaseString.hpp
index a1bb91ea9c5..066a24f294e 100644
--- a/ndb/include/util/BaseString.hpp
+++ b/ndb/include/util/BaseString.hpp
@@ -177,6 +177,12 @@ public:
    * Trim string from <i>delim</i>
    */
   static char* trim(char * src, const char * delim);
+
+  /**
+   * snprintf on some platforms need special treatment
+   */
+  static int snprintf(char *str, size_t size, const char *format, ...);
+  static int vsnprintf(char *str, size_t size, const char *format, va_list ap);
 private:
   char* m_chr;
   unsigned m_len;