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 | 806a06fdbdc19edd596a0b4c5ef54b1c546f5b20 (patch) | |
| tree | 808e79a60bd6ef6a37714172df3a6b1f8c06b1b3 /ndb/test/ndbapi/lmc-bench/src/user/macros.h | |
| parent | 572899e0362f08755a82603a36a27628fb88a5d0 (diff) | |
| parent | 5edb391973f235890e3e6eb771e7d0fa3102b24a (diff) | |
| download | mariadb-git-806a06fdbdc19edd596a0b4c5ef54b1c546f5b20.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/test/ndbapi/lmc-bench/src/user/macros.h')
| -rw-r--r-- | ndb/test/ndbapi/lmc-bench/src/user/macros.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ndb/test/ndbapi/lmc-bench/src/user/macros.h b/ndb/test/ndbapi/lmc-bench/src/user/macros.h index beb4352c269..363f247b93f 100644 --- a/ndb/test/ndbapi/lmc-bench/src/user/macros.h +++ b/ndb/test/ndbapi/lmc-bench/src/user/macros.h @@ -17,8 +17,7 @@ #ifndef MACROS_H #define MACROS_H -#include <stdlib.h> -#include <stdio.h> +#include <ndb_global.h> #include <NdbOut.hpp> #define ERROR(x) {ndbout_c((x)); } |