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

18 files changed, 24 insertions, 56 deletions

diff --git a/ndb/test/ndbapi/lmc-bench/async-src/generator/asyncGenerator.cpp b/ndb/test/ndbapi/lmc-bench/async-src/generator/asyncGenerator.cpp
index 25eb1830de9..84a93414712 100644
--- a/ndb/test/ndbapi/lmc-bench/async-src/generator/asyncGenerator.cpp
+++ b/ndb/test/ndbapi/lmc-bench/async-src/generator/asyncGenerator.cpp
@@ -18,8 +18,7 @@
 * I N C L U D E D   F I L E S                                  *
 ***************************************************************/
 
-#include <stdio.h>
-#include <string.h>
+#include <ndb_global.h>
 
 #include "dbGenerator.h"
 #include <NdbApi.hpp>
diff --git a/ndb/test/ndbapi/lmc-bench/async-src/generator/mainAsyncGenerator.cpp b/ndb/test/ndbapi/lmc-bench/async-src/generator/mainAsyncGenerator.cpp
index d7506c9dd2c..f613c66d07b 100644
--- a/ndb/test/ndbapi/lmc-bench/async-src/generator/mainAsyncGenerator.cpp
+++ b/ndb/test/ndbapi/lmc-bench/async-src/generator/mainAsyncGenerator.cpp
@@ -14,10 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <NdbUnistd.h>
+#include <ndb_global.h>
 
 #include <NdbHost.h>
 #include <NdbSleep.h>
diff --git a/ndb/test/ndbapi/lmc-bench/async-src/user/macros.h b/ndb/test/ndbapi/lmc-bench/async-src/user/macros.h
index c049cdbad33..22b7f564490 100644
--- a/ndb/test/ndbapi/lmc-bench/async-src/user/macros.h
+++ b/ndb/test/ndbapi/lmc-bench/async-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));}
diff --git a/ndb/test/ndbapi/lmc-bench/async-src/user/ndb_error.hpp b/ndb/test/ndbapi/lmc-bench/async-src/user/ndb_error.hpp
index 91a061c7cf4..9e6c5e55e73 100644
--- a/ndb/test/ndbapi/lmc-bench/async-src/user/ndb_error.hpp
+++ b/ndb/test/ndbapi/lmc-bench/async-src/user/ndb_error.hpp
@@ -17,7 +17,7 @@
 #ifndef NDB_ERROR_H
 #define NDB_ERROR_H
 
-#include <stdio.h>
+#include <ndb_global.h>
 #include <NdbOut.hpp>
 #include "userInterface.h"
 #include <NdbError.hpp>
diff --git a/ndb/test/ndbapi/lmc-bench/async-src/user/userInterface.cpp b/ndb/test/ndbapi/lmc-bench/async-src/user/userInterface.cpp
index ece82628ba7..fdbc229cc98 100644
--- a/ndb/test/ndbapi/lmc-bench/async-src/user/userInterface.cpp
+++ b/ndb/test/ndbapi/lmc-bench/async-src/user/userInterface.cpp
@@ -18,9 +18,7 @@
 * I N C L U D E D   F I L E S                                  *
 ***************************************************************/
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
+#include <ndb_global.h>
 #include <time.h>
 
 #include "ndb_schema.hpp"
@@ -31,7 +29,6 @@
 #include <NdbTick.h>
 #include <NdbApi.hpp>
 #include <NdbOut.hpp>
-#include <NdbStdio.h> 
 
 /***************************************************************
 * L O C A L   C O N S T A N T S                                *
diff --git a/ndb/test/ndbapi/lmc-bench/include/testDefinitions.h b/ndb/test/ndbapi/lmc-bench/include/testDefinitions.h
index c6ad11016b2..2f4aeb30975 100644
--- a/ndb/test/ndbapi/lmc-bench/include/testDefinitions.h
+++ b/ndb/test/ndbapi/lmc-bench/include/testDefinitions.h
@@ -23,12 +23,6 @@
 
 #include <ndb_types.h>
 
-/***************************************************************
-* M A C R O S                                                  *
-***************************************************************/
-
-typedef Uint32 uint32;
-
 /***************************************************************/
 /* C O N S T A N T S                                           */
 /***************************************************************/
@@ -62,14 +56,14 @@ typedef char   GroupName[GROUP_NAME_LENGTH];
 typedef char   ChangedBy[CHANGED_BY_LENGTH];
 typedef char   ChangedTime[CHANGED_TIME_LENGTH];
 typedef char   SessionDetails[SESSION_DETAILS_LENGTH];
-typedef uint32 ServerId;
-typedef uint32 ServerBit;
-typedef uint32 GroupId;
-typedef uint32 Location;
-typedef uint32 Permission;
-
-typedef uint32 Counter;
-typedef uint32 ActiveSessions;
+typedef Uint32 ServerId;
+typedef Uint32 ServerBit;
+typedef Uint32 GroupId;
+typedef Uint32 Location;
+typedef Uint32 Permission;
+
+typedef Uint32 Counter;
+typedef Uint32 ActiveSessions;
 typedef unsigned int BranchExecuted;
 typedef unsigned int DoRollback;
 
diff --git a/ndb/test/ndbapi/lmc-bench/src/generator/dbGenerator.c b/ndb/test/ndbapi/lmc-bench/src/generator/dbGenerator.c
index eedcd914d85..7484c7647f5 100644
--- a/ndb/test/ndbapi/lmc-bench/src/generator/dbGenerator.c
+++ b/ndb/test/ndbapi/lmc-bench/src/generator/dbGenerator.c
@@ -18,8 +18,7 @@
 * I N C L U D E D   F I L E S                                  *
 ***************************************************************/
 
-#include <stdio.h>
-#include <string.h>
+#include <ndb_global.h>
 #include "dbGenerator.h"
 
 /***************************************************************
diff --git a/ndb/test/ndbapi/lmc-bench/src/generator/mainGenerator.c b/ndb/test/ndbapi/lmc-bench/src/generator/mainGenerator.c
index 6ddf0a47775..4a31db0b4e9 100644
--- a/ndb/test/ndbapi/lmc-bench/src/generator/mainGenerator.c
+++ b/ndb/test/ndbapi/lmc-bench/src/generator/mainGenerator.c
@@ -14,11 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <pthread.h>     
+#include <ndb_global.h>
 
 #include <NdbHost.h>
 #include <NdbSleep.h>
diff --git a/ndb/test/ndbapi/lmc-bench/src/populator/dbPopulate.c b/ndb/test/ndbapi/lmc-bench/src/populator/dbPopulate.c
index 9f8629ec1f0..42fbb52f3b2 100644
--- a/ndb/test/ndbapi/lmc-bench/src/populator/dbPopulate.c
+++ b/ndb/test/ndbapi/lmc-bench/src/populator/dbPopulate.c
@@ -18,9 +18,7 @@
 * I N C L U D E D   F I L E S                                  *
 ***************************************************************/
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <ndb_global.h>
 
 #include "userInterface.h"
 
diff --git a/ndb/test/ndbapi/lmc-bench/src/populator/mainPopulate.c b/ndb/test/ndbapi/lmc-bench/src/populator/mainPopulate.c
index 9dde902d006..838ac8a7196 100644
--- a/ndb/test/ndbapi/lmc-bench/src/populator/mainPopulate.c
+++ b/ndb/test/ndbapi/lmc-bench/src/populator/mainPopulate.c
@@ -14,9 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <ndb_global.h>
 
 #include "userInterface.h"
 #include "dbPopulate.h"
diff --git a/ndb/test/ndbapi/lmc-bench/src/user/localDbPrepare.c b/ndb/test/ndbapi/lmc-bench/src/user/localDbPrepare.c
index ca8a64ab59c..dd100507016 100644
--- a/ndb/test/ndbapi/lmc-bench/src/user/localDbPrepare.c
+++ b/ndb/test/ndbapi/lmc-bench/src/user/localDbPrepare.c
@@ -18,7 +18,7 @@
 * I N C L U D E D   F I L E S                                  *
 ***************************************************************/
 
-#include <stdio.h>
+#include <ndb_global.h>
 
 #include "userInterface.h"
 #include "userHandle.h"
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)); }
diff --git a/ndb/test/ndbapi/lmc-bench/src/user/ndb_error.hpp b/ndb/test/ndbapi/lmc-bench/src/user/ndb_error.hpp
index 5f792342ed9..b3aaeac822e 100644
--- a/ndb/test/ndbapi/lmc-bench/src/user/ndb_error.hpp
+++ b/ndb/test/ndbapi/lmc-bench/src/user/ndb_error.hpp
@@ -17,7 +17,6 @@
 #ifndef NDB_ERROR_H
 #define NDB_ERROR_H
 
-#include <stdio.h>
 #include <NdbOut.hpp>
 
 #define error_handler(x,y, z) { \
diff --git a/ndb/test/ndbapi/lmc-bench/src/user/ndb_user_populate.cpp b/ndb/test/ndbapi/lmc-bench/src/user/ndb_user_populate.cpp
index 6a35bccd064..ce3a76cdd59 100644
--- a/ndb/test/ndbapi/lmc-bench/src/user/ndb_user_populate.cpp
+++ b/ndb/test/ndbapi/lmc-bench/src/user/ndb_user_populate.cpp
@@ -19,7 +19,7 @@ extern "C" {
 #include "user_populate.h"
 }
 
-#include <stdio.h>
+#include <ndb_global.h>
 #include <NdbApi.hpp>
 
 #include "ndb_schema.hpp"
diff --git a/ndb/test/ndbapi/lmc-bench/src/user/old/userInterface.c b/ndb/test/ndbapi/lmc-bench/src/user/old/userInterface.c
index c68f287f5dd..bacf1861dde 100644
--- a/ndb/test/ndbapi/lmc-bench/src/user/old/userInterface.c
+++ b/ndb/test/ndbapi/lmc-bench/src/user/old/userInterface.c
@@ -18,10 +18,7 @@
 * I N C L U D E D   F I L E S                                  *
 ***************************************************************/
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/time.h>
+#include <ndb_global.h>
 
 #include "userInterface.h"
 #include "userHandle.h"
diff --git a/ndb/test/ndbapi/lmc-bench/src/user/old/userTransaction.c b/ndb/test/ndbapi/lmc-bench/src/user/old/userTransaction.c
index 17069b0a042..a2f4787bb0c 100644
--- a/ndb/test/ndbapi/lmc-bench/src/user/old/userTransaction.c
+++ b/ndb/test/ndbapi/lmc-bench/src/user/old/userTransaction.c
@@ -18,8 +18,7 @@
 * I N C L U D E D   F I L E S                                  *
 ***************************************************************/
 
-#include <stdio.h>
-#include <string.h>
+#include <ndb_global.h>
 #include <time.h>
 
 #include "sql.h"
diff --git a/ndb/test/ndbapi/lmc-bench/src/user/userInterface.cpp b/ndb/test/ndbapi/lmc-bench/src/user/userInterface.cpp
index fc3f6955a47..67c4e037215 100644
--- a/ndb/test/ndbapi/lmc-bench/src/user/userInterface.cpp
+++ b/ndb/test/ndbapi/lmc-bench/src/user/userInterface.cpp
@@ -18,9 +18,7 @@
 * I N C L U D E D   F I L E S                                  *
 ***************************************************************/
 
-#include <NdbStdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
+#include <ndb_global.h>
 #ifndef NDB_WIN32
 #include <sys/time.h>
 #endif
diff --git a/ndb/test/ndbapi/lmc-bench/src/user/userTransaction.c b/ndb/test/ndbapi/lmc-bench/src/user/userTransaction.c
index 17069b0a042..a2f4787bb0c 100644
--- a/ndb/test/ndbapi/lmc-bench/src/user/userTransaction.c
+++ b/ndb/test/ndbapi/lmc-bench/src/user/userTransaction.c
@@ -18,8 +18,7 @@
 * I N C L U D E D   F I L E S                                  *
 ***************************************************************/
 
-#include <stdio.h>
-#include <string.h>
+#include <ndb_global.h>
 #include <time.h>
 
 #include "sql.h"