Manual merge of 5.0.11 changes into 5.1.1 - use "local" files in cases of conflict.

storage/ndb/tools/ndb_condig.cpp:
  Auto merged
configure.in:
  No version change in merge.
storage/ndb/tools/Makefile.am:
  No filename change in merge.

server-tools/instance-manager/Makefile.am

@@ -77,7 +77,8 @@ mysqlmanager_SOURCES=	command.cc command.h mysqlmanager.cc \
 			buffer.h buffer.cc parse.cc parse.h \
 			guardian.cc guardian.h \
 			parse_output.cc parse_output.h \
-                        mysql_manager_error.h
+                        mysql_manager_error.h \
+                        portability.h
 
 mysqlmanager_LDADD=	liboptions.a \
 			libnet.a \

server-tools/instance-manager/guardian.cc

@@ -25,7 +25,7 @@
 #include "instance.h"
 #include "mysql_manager_error.h"
 #include "log.h"
-#include "port.h"
+#include "portability.h"
 
 #include <string.h>
 #include <sys/types.h>

server-tools/instance-manager/instance.cc

@@ -27,7 +27,7 @@
 #include "log.h"
 #include "instance_map.h"
 #include "priv.h"
-#include "port.h"
+#include "portability.h"
 #ifndef __WIN__
 #include <sys/wait.h>
 #endif

server-tools/instance-manager/instance_options.h

@@ -19,7 +19,7 @@
 #include <my_global.h>
 #include <my_sys.h>
 #include "parse.h"
-#include "port.h"
+#include "portability.h"
 
 #ifdef __GNUC__
 #pragma interface

server-tools/instance-manager/listener.cc

@@ -33,7 +33,7 @@
 #include "instance_map.h"
 #include "log.h"
 #include "mysql_connection.h"
-#include "port.h"
+#include "portability.h"
 
 
 /*

server-tools/instance-manager/log.cc

@@ -17,7 +17,7 @@
 #include <my_global.h>
 
 #include "log.h"
-#include "port.h"
+#include "portability.h"
 #include <stdarg.h>
 #include <m_string.h>
 #include <my_sys.h>

server-tools/instance-manager/mysqlmanager.vcproj

@@ -271,7 +271,7 @@
 				RelativePath=".\parse_output.h">
 			</File>
 			<File
-				RelativePath=".\port.h">
+				RelativePath=".\portability.h">
 			</File>
 			<File
 				RelativePath=".\priv.h">

server-tools/instance-manager/options.cc

@@ -21,7 +21,7 @@
 #include "options.h"
 
 #include "priv.h"
-#include "port.h"
+#include "portability.h"
 #include <my_sys.h>
 #include <my_getopt.h>
 #include <m_string.h>

server-tools/instance-manager/parse_output.cc

@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <my_sys.h>
 #include <m_string.h>
-#include "port.h"
+#include "portability.h"
 
 
 /*

server-tools/instance-manager/port.h → server-tools/instance-manager/portability.h

-#ifndef INCLUDES_MYSQL_INSTANCE_MANAGER_PORT_H
-#define INCLUDES_MYSQL_INSTANCE_MANAGER_PORT_H
+#ifndef INCLUDES_MYSQL_INSTANCE_MANAGER_PORTABILITY_H
+#define INCLUDES_MYSQL_INSTANCE_MANAGER_PORTABILITY_H
 
 #ifdef __WIN__
 
@@ -20,6 +20,6 @@ typedef int pid_t;
 
 #endif /* __WIN__ */
 
-#endif  /* INCLUDES_MYSQL_INSTANCE_MANAGER_PORT_H */
+#endif  /* INCLUDES_MYSQL_INSTANCE_MANAGER_PORTABILITY_H */
 
 

server-tools/instance-manager/priv.cc

@@ -16,7 +16,7 @@
 
 #include <my_global.h>
 #include "priv.h"
-#include "port.h"
+#include "portability.h"
 
 /* the pid of the manager process (of the signal thread on the LinuxThreads) */
 pid_t manager_pid;

server-tools/instance-manager/priv.h

@@ -18,7 +18,7 @@
 
 #include <sys/types.h>
 #ifdef __WIN__
-#include "port.h"
+#include "portability.h"
 #else
 #include <unistd.h>
 #endif