From 23603ca7cb37ae226d778c63923080b39b92c1ff Mon Sep 17 00:00:00 2001 From: "joerg@mysql.com" <> Date: Fri, 5 Aug 2005 16:35:04 +0200 Subject: [PATCH 1/3] Reset the version to 5.0.11 (this is within the updated clone). --- configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 8c591bfddf8..8a5220dbf38 100644 --- a/configure.in +++ b/configure.in @@ -6,7 +6,7 @@ AC_PREREQ(2.57)dnl Minimum Autoconf version required. AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM # Don't forget to also update the NDB lines below. -AM_INIT_AUTOMAKE(mysql, 5.0.12-beta) +AM_INIT_AUTOMAKE(mysql, 5.0.11-beta) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 @@ -17,7 +17,7 @@ SHARED_LIB_VERSION=15:0:0 # ndb version NDB_VERSION_MAJOR=5 NDB_VERSION_MINOR=0 -NDB_VERSION_BUILD=12 +NDB_VERSION_BUILD=11 NDB_VERSION_STATUS="beta" # Set all version vars based on $VERSION. How do we do this more elegant ? From 19ad0933f98894df518dcc3a0b6bec785041da99 Mon Sep 17 00:00:00 2001 From: "kent@mysql.com" <> Date: Fri, 5 Aug 2005 19:29:13 +0200 Subject: [PATCH 2/3] client_priv.h: Removed ending comma in enum Makefile.am: config.cpp => ndb_config.cpp, solves link problems on case insensitive OS ndb_config.cpp: Rename: ndb/tools/config.cpp -> ndb/tools/ndb_config.cpp --- client/client_priv.h | 2 +- ndb/tools/Makefile.am | 2 +- ndb/tools/{config.cpp => ndb_config.cpp} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename ndb/tools/{config.cpp => ndb_config.cpp} (100%) diff --git a/client/client_priv.h b/client/client_priv.h index 997f9ffe552..74bc0b41006 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -50,5 +50,5 @@ enum options_client OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING, #endif OPT_TRIGGERS, - OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE, + OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE }; diff --git a/ndb/tools/Makefile.am b/ndb/tools/Makefile.am index 0ad8a01b9e2..17b71f7e33c 100644 --- a/ndb/tools/Makefile.am +++ b/ndb/tools/Makefile.am @@ -33,7 +33,7 @@ ndb_restore_SOURCES = restore/restore_main.cpp \ restore/Restore.cpp \ ../test/src/NDBT_ResultRow.cpp $(tools_common_sources) -ndb_config_SOURCES = config.cpp \ +ndb_config_SOURCES = ndb_config.cpp \ ../src/mgmsrv/Config.cpp \ ../src/mgmsrv/ConfigInfo.cpp \ ../src/mgmsrv/InitConfigFileParser.cpp diff --git a/ndb/tools/config.cpp b/ndb/tools/ndb_config.cpp similarity index 100% rename from ndb/tools/config.cpp rename to ndb/tools/ndb_config.cpp From 294aa66d920ebc8c83f5d2edf2bfa0b14c9a6a2f Mon Sep 17 00:00:00 2001 From: "joerg@mysql.com" <> Date: Fri, 5 Aug 2005 20:44:52 +0200 Subject: [PATCH 3/3] New "Instance Manager" code: Rename "port.h" to "portability.h" to avoid conflict with system header file name, and include the file in "Makefile.am". --- server-tools/instance-manager/Makefile.am | 3 ++- server-tools/instance-manager/guardian.cc | 2 +- server-tools/instance-manager/instance.cc | 2 +- server-tools/instance-manager/instance_options.h | 2 +- server-tools/instance-manager/listener.cc | 2 +- server-tools/instance-manager/log.cc | 2 +- server-tools/instance-manager/mysqlmanager.vcproj | 2 +- server-tools/instance-manager/options.cc | 2 +- server-tools/instance-manager/parse_output.cc | 2 +- server-tools/instance-manager/{port.h => portability.h} | 6 +++--- server-tools/instance-manager/priv.cc | 2 +- server-tools/instance-manager/priv.h | 2 +- 12 files changed, 15 insertions(+), 14 deletions(-) rename server-tools/instance-manager/{port.h => portability.h} (63%) diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am index 68c9d5b7d18..4de0aac3d23 100644 --- a/server-tools/instance-manager/Makefile.am +++ b/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 \ diff --git a/server-tools/instance-manager/guardian.cc b/server-tools/instance-manager/guardian.cc index 4c8f67bd64e..b8580711524 100644 --- a/server-tools/instance-manager/guardian.cc +++ b/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 #include diff --git a/server-tools/instance-manager/instance.cc b/server-tools/instance-manager/instance.cc index 0ebd5802af9..dee3c2d4e38 100644 --- a/server-tools/instance-manager/instance.cc +++ b/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 #endif diff --git a/server-tools/instance-manager/instance_options.h b/server-tools/instance-manager/instance_options.h index a5a38ff1221..dc62d277a43 100644 --- a/server-tools/instance-manager/instance_options.h +++ b/server-tools/instance-manager/instance_options.h @@ -19,7 +19,7 @@ #include #include #include "parse.h" -#include "port.h" +#include "portability.h" #ifdef __GNUC__ #pragma interface diff --git a/server-tools/instance-manager/listener.cc b/server-tools/instance-manager/listener.cc index 0c928e76c8c..790770be09e 100644 --- a/server-tools/instance-manager/listener.cc +++ b/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" /* diff --git a/server-tools/instance-manager/log.cc b/server-tools/instance-manager/log.cc index 2a363312fed..3f54bc0649a 100644 --- a/server-tools/instance-manager/log.cc +++ b/server-tools/instance-manager/log.cc @@ -17,7 +17,7 @@ #include #include "log.h" -#include "port.h" +#include "portability.h" #include #include #include diff --git a/server-tools/instance-manager/mysqlmanager.vcproj b/server-tools/instance-manager/mysqlmanager.vcproj index 5263deae6a9..2ab9a4878c1 100644 --- a/server-tools/instance-manager/mysqlmanager.vcproj +++ b/server-tools/instance-manager/mysqlmanager.vcproj @@ -271,7 +271,7 @@ RelativePath=".\parse_output.h"> + RelativePath=".\portability.h"> diff --git a/server-tools/instance-manager/options.cc b/server-tools/instance-manager/options.cc index 5d8483d3b0b..a9d31457d98 100644 --- a/server-tools/instance-manager/options.cc +++ b/server-tools/instance-manager/options.cc @@ -21,7 +21,7 @@ #include "options.h" #include "priv.h" -#include "port.h" +#include "portability.h" #include #include #include diff --git a/server-tools/instance-manager/parse_output.cc b/server-tools/instance-manager/parse_output.cc index 4b3a8b75ca1..98074c47d64 100644 --- a/server-tools/instance-manager/parse_output.cc +++ b/server-tools/instance-manager/parse_output.cc @@ -21,7 +21,7 @@ #include #include #include -#include "port.h" +#include "portability.h" /* diff --git a/server-tools/instance-manager/port.h b/server-tools/instance-manager/portability.h similarity index 63% rename from server-tools/instance-manager/port.h rename to server-tools/instance-manager/portability.h index 3b1c3e2ad93..133d99eb111 100644 --- a/server-tools/instance-manager/port.h +++ b/server-tools/instance-manager/portability.h @@ -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 */ diff --git a/server-tools/instance-manager/priv.cc b/server-tools/instance-manager/priv.cc index 496992aa43b..02a788ec469 100644 --- a/server-tools/instance-manager/priv.cc +++ b/server-tools/instance-manager/priv.cc @@ -16,7 +16,7 @@ #include #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; diff --git a/server-tools/instance-manager/priv.h b/server-tools/instance-manager/priv.h index 0f4c9be9a11..ce9d54293c7 100644 --- a/server-tools/instance-manager/priv.h +++ b/server-tools/instance-manager/priv.h @@ -18,7 +18,7 @@ #include #ifdef __WIN__ -#include "port.h" +#include "portability.h" #else #include #endif