diff options
| author | unknown <df@pippilotta.erinye.com> | 2007-07-19 23:30:26 +0200 |
|---|---|---|
| committer | unknown <df@pippilotta.erinye.com> | 2007-07-19 23:30:26 +0200 |
| commit | 25491503fb274e7c6718bbe791fc33e3d4eeface (patch) | |
| tree | 845b67ddffbaa1ff03d48af7f4e265bebc5c8f78 | |
| parent | 2163d202352d19605a36a833010d45f6428ae2bb (diff) | |
| parent | b35eceb94427989aa1f764d40e8025bfd85b676a (diff) | |
| download | mariadb-git-25491503fb274e7c6718bbe791fc33e3d4eeface.tar.gz | |
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.44mysql-5.0.46
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.46
configure.in:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
| -rw-r--r-- | configure.in | 16 | ||||
| -rw-r--r-- | server-tools/instance-manager/listener.cc | 4 |
2 files changed, 15 insertions, 5 deletions
diff --git a/configure.in b/configure.in index 5f02b5eae63..2bf3e43caae 100644 --- a/configure.in +++ b/configure.in @@ -100,14 +100,22 @@ AC_DEFINE_UNQUOTED([NDB_VERSION_STATUS], ["$NDB_VERSION_STATUS"], # Canonicalize the configuration name. -SYSTEM_TYPE="$host_vendor-$host_os" -MACHINE_TYPE="$host_cpu" + +# Check whether --with-system-type or --without-system-type was given. +AC_ARG_WITH(system-type, + [ --with-system-type Set the system type, like "sun-solaris10"], + [SYSTEM_TYPE="$withval"], + [SYSTEM_TYPE="$host_vendor-$host_os"]) +AC_ARG_WITH(machine-type, + [ --with-machine-type Set the machine type, like "powerpc"], + [MACHINE_TYPE="$withval"], + [MACHINE_TYPE="$host_cpu"]) AC_SUBST(SYSTEM_TYPE) AC_DEFINE_UNQUOTED([SYSTEM_TYPE], ["$SYSTEM_TYPE"], - [Name of system, eg solaris]) + [Name of system, eg sun-solaris]) AC_SUBST(MACHINE_TYPE) AC_DEFINE_UNQUOTED([MACHINE_TYPE], ["$MACHINE_TYPE"], - [Machine type name, eg sun10]) + [Machine type name, eg sparc]) # Detect intel x86 like processor BASE_MACHINE_TYPE=$MACHINE_TYPE diff --git a/server-tools/instance-manager/listener.cc b/server-tools/instance-manager/listener.cc index a055d98656c..a950ecf4ed3 100644 --- a/server-tools/instance-manager/listener.cc +++ b/server-tools/instance-manager/listener.cc @@ -67,7 +67,7 @@ public: ~Listener_thread(); void run(); private: - static const int LISTEN_BACK_LOG_SIZE= 5; /* standard backlog size */ + static const int LISTEN_BACK_LOG_SIZE; ulong total_connection_count; Thread_info thread_info; @@ -80,6 +80,8 @@ private: int create_unix_socket(struct sockaddr_un &unix_socket_address); }; +const int Listener_thread::LISTEN_BACK_LOG_SIZE = 5; /* standard backlog size */ + Listener_thread::Listener_thread(const Listener_thread_args &args) : Listener_thread_args(args.thread_registry, args.options, args.user_map, |