summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <pekka@mysql.com>2004-12-04 15:17:13 +0100
committerunknown <pekka@mysql.com>2004-12-04 15:17:13 +0100
commitf8cdf570979c550ef04c53f691118ed2b1296a7c (patch)
treeb8b24663353b6d1240e58bf04f3b2605e0353f14
parent07fc5f781303ac2956b8205c1d297ae39ddf69c0 (diff)
downloadmariadb-git-f8cdf570979c550ef04c53f691118ed2b1296a7c.tar.gz
ndb: fix solaris (etc) ndb startup problem in mysql-test-run
ndb/src/common/util/NdbOut.cpp: avoid printf("%s", (char*)0)
-rw-r--r--ndb/src/common/util/NdbOut.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/ndb/src/common/util/NdbOut.cpp b/ndb/src/common/util/NdbOut.cpp
index fa74cb364f3..e20119a7987 100644
--- a/ndb/src/common/util/NdbOut.cpp
+++ b/ndb/src/common/util/NdbOut.cpp
@@ -54,7 +54,7 @@ NdbOut&
NdbOut::operator<<(unsigned long int v) { return *this << (Uint64) v; }
NdbOut&
-NdbOut::operator<<(const char* val){ m_out->print("%s", val); return * this; }
+NdbOut::operator<<(const char* val){ m_out->print("%s", val ? val : "(null)"); return * this; }
NdbOut&
NdbOut::operator<<(const void* val){ m_out->print("%p", val); return * this; }
NdbOut&