Commit 50ceb464 authored by unknown's avatar unknown
Browse files

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.
parents fa695c21 5615eae1

server-tools/instance-manager/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include "instance_map.h"

#include "log.h"

#include "mysql_connection.h"

#include "port.h"

#include "portability.h"





/*