database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

configure.in:

Browse Source 
Added --with-system-type=<systype> and --with-machine-type=<machtype>
  options, to be able to override the one detected, for --version strings
field.cc, field.h, listener.cc:
  C++ compatibility change for IBM VisualAge 6 and i5/OS


configure.in:
  Added --with-system-type=<systype> and --with-machine-type=<machtype>
  options, to be able to override the one detected, for --version strings
server-tools/instance-manager/listener.cc:
  C++ compatibility change for IBM VisualAge 6 and i5/OS
sql/field.cc:
  C++ compatibility change for IBM VisualAge 6 and i5/OS
sql/field.h:
  C++ compatibility change for IBM VisualAge 6 and i5/OS
This commit is contained in:
unknown
2007-06-20 14:00:28 +02:00
parent fe99cf3ac0
commit aeddf24a2f
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
configure.in
View File

@ -100,14 +100,22 @@ AC_DEFINE_UNQUOTED([NDB_VERSION_STATUS], ["$NDB_VERSION_STATUS"],
# Canonicalize the configuration name. # 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_SUBST(SYSTEM_TYPE)
AC_DEFINE_UNQUOTED([SYSTEM_TYPE], ["$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_SUBST(MACHINE_TYPE)
AC_DEFINE_UNQUOTED([MACHINE_TYPE], ["$MACHINE_TYPE"], AC_DEFINE_UNQUOTED([MACHINE_TYPE], ["$MACHINE_TYPE"],
[Machine type name, eg sun10]) [Machine type name, eg sparc])
# Detect intel x86 like processor # Detect intel x86 like processor
BASE_MACHINE_TYPE=$MACHINE_TYPE BASE_MACHINE_TYPE=$MACHINE_TYPE

4
server-tools/instance-manager/listener.cc
View File

@ -67,7 +67,7 @@ public:
~Listener_thread(); ~Listener_thread();
void run(); void run();
private: private:
static const int LISTEN_BACK_LOG_SIZE= 5; /* standard backlog size */ static const int LISTEN_BACK_LOG_SIZE;
ulong total_connection_count; ulong total_connection_count;
Thread_info thread_info; Thread_info thread_info;
@ -80,6 +80,8 @@ private:
int create_unix_socket(struct sockaddr_un &unix_socket_address); 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::Listener_thread(const Listener_thread_args &args) :
Listener_thread_args(args.thread_registry, args.options, args.user_map, Listener_thread_args(args.thread_registry, args.options, args.user_map,

1
sql/field.cc
View File

@ -6267,6 +6267,7 @@ Field *Field_string::new_field(MEM_ROOT *root, struct st_table *new_table,
is 2. is 2.
****************************************************************************/ ****************************************************************************/
const uint Field_varstring::MAX_SIZE= UINT_MAX16;
int Field_varstring::store(const char *from,uint length,CHARSET_INFO *cs) int Field_varstring::store(const char *from,uint length,CHARSET_INFO *cs)
{ {

2
sql/field.h
View File

@ -1116,7 +1116,7 @@ public:
The maximum space available in a Field_varstring, in bytes. See The maximum space available in a Field_varstring, in bytes. See
length_bytes. length_bytes.
*/ */
static const uint MAX_SIZE= UINT_MAX16; static const uint MAX_SIZE;
/* Store number of bytes used to store length (1 or 2) */ /* Store number of bytes used to store length (1 or 2) */
uint32 length_bytes; uint32 length_bytes;
Field_varstring(char *ptr_arg, Field_varstring(char *ptr_arg,