diff options
author | tulin@build.mysql.com <> | 2004-05-10 17:40:57 +0200 |
---|---|---|
committer | tulin@build.mysql.com <> | 2004-05-10 17:40:57 +0200 |
commit | ff4018aa8ac58411e76e40f8c06536ef21ae8454 (patch) | |
tree | 808e79a60bd6ef6a37714172df3a6b1f8c06b1b3 /ndb/src/mgmapi/mgmapi.cpp | |
parent | 6fffe5907751ad862f4c684bcfc4969ad7d5e6d5 (diff) | |
parent | bb9f7a9375d7f0bfa08e345d0faf7dfb9a6eb618 (diff) | |
download | mariadb-git-ff4018aa8ac58411e76e40f8c06536ef21ae8454.tar.gz |
merge resolve
Diffstat (limited to 'ndb/src/mgmapi/mgmapi.cpp')
-rw-r--r-- | ndb/src/mgmapi/mgmapi.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/ndb/src/mgmapi/mgmapi.cpp b/ndb/src/mgmapi/mgmapi.cpp index 4c1355e8e46..fcdfe943fb1 100644 --- a/ndb/src/mgmapi/mgmapi.cpp +++ b/ndb/src/mgmapi/mgmapi.cpp @@ -14,17 +14,13 @@ 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 <NdbTCP.h> #include "mgmapi.h" #include "mgmapi_debug.h" #include <socket_io.h> -#include <stdlib.h> - -#include <string.h> -#include <NdbStdio.h> -#include <NdbString.h> -#include <errno.h> #include <NdbOut.hpp> #include <SocketServer.hpp> #include <Parser.hpp> |