mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
joerg@mysql.com 2005-08-15 19:51:01 +02:00
commit 880bbb0406
12 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
server-tools/instance-manager/Makefile.am
View file

@ -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 \

2
server-tools/instance-manager/guardian.cc
View file

@ -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>

2
server-tools/instance-manager/instance.cc
View file

@ -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

2
server-tools/instance-manager/instance_options.h
View file

@ -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

2
server-tools/instance-manager/listener.cc
View file

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

2
server-tools/instance-manager/log.cc
View file

@ -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>

2
server-tools/instance-manager/mysqlmanager.vcproj
View file

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

2
server-tools/instance-manager/options.cc
View file

@ -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>

2
server-tools/instance-manager/parse_output.cc
View file

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

6
server-tools/instance-manager/port.h → server-tools/instance-manager/portability.h
View file

@ -1,5 +1,5 @@
#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 */

2
server-tools/instance-manager/priv.cc
View file

@ -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;

2
server-tools/instance-manager/priv.h
View file

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