diff options
| author | unknown <tulin@build.mysql.com> | 2004-05-10 17:40:57 +0200 |
|---|---|---|
| committer | unknown <tulin@build.mysql.com> | 2004-05-10 17:40:57 +0200 |
| commit | 3c58a197b6cd36fa275ef281204ed9e5e5748abd (patch) | |
| tree | 808e79a60bd6ef6a37714172df3a6b1f8c06b1b3 /ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp | |
| parent | 3ff2fcc9f11c796a610eae8e0584d082e3f5067c (diff) | |
| parent | d092cfb1c18ab8e48e462d26f3c751dc5e0e573b (diff) | |
| download | mariadb-git-3c58a197b6cd36fa275ef281204ed9e5e5748abd.tar.gz | |
merge resolve
extra/perror.c:
Auto merged
ndb/include/debugger/SignalLoggerManager.hpp:
Auto merged
ndb/include/ndb_version.h:
Auto merged
ndb/src/common/portlib/unix/NdbMem.c:
Auto merged
ndb/src/common/portlib/unix/NdbThread.c:
Auto merged
ndb/src/common/util/Parser.cpp:
Auto merged
ndb/src/common/util/getarg.c:
Auto merged
ndb/src/common/util/version.c:
Auto merged
ndb/src/kernel/blocks/backup/restore/Restore.cpp:
Auto merged
ndb/src/kernel/blocks/dbutil/DbUtil.cpp:
Auto merged
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Auto merged
ndb/src/kernel/ndb-main/Main.cpp:
Auto merged
ndb/src/mgmapi/test/keso.c:
Auto merged
ndb/src/mgmclient/test_cpcd/test_cpcd.cpp:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp')
| -rw-r--r-- | ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp b/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp index 22f67d15659..44ee11717b4 100644 --- a/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp +++ b/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp @@ -14,6 +14,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <ndb_global.h> + #include "LogHandlerListUnitTest.hpp" #include <ConsoleLogHandler.hpp> @@ -22,9 +24,6 @@ #include <NdbOut.hpp> -#include <stdio.h> -#include <assert.h> - typedef bool (*TESTFUNC)(const char*); typedef struct { |