Commit 1c19f191 authored by joerg@trift2.'s avatar joerg@trift2.
Browse files

Merge trift2.:/MySQL/M50/mysql-5.0 

into  trift2.:/MySQL/M50/push-5.0
parents 948ba7b7 f4e73e7c

configure.in

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

server-tools/instance-manager/listener.cc

+3 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ class Listener_thread: public Listener_thread_args 
  ~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 @@ class Listener_thread: public Listener_thread_args 
  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,

sql/field.cc

+1 −0
Original line number Diff line number Diff line
@@ -6270,6 +6270,7 @@ Field *Field_string::new_field(MEM_ROOT *root, struct st_table *new_table, 
  is 2.

****************************************************************************/



const uint Field_varstring::MAX_SIZE= UINT_MAX16;



int Field_varstring::store(const char *from,uint length,CHARSET_INFO *cs)

{

sql/field.h

+1 −1
Original line number Diff line number Diff line
@@ -1116,7 +1116,7 @@ class Field_varstring :public Field_longstr { 
    The maximum space available in a Field_varstring, in bytes. See

    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) */

  uint32 length_bytes;

  Field_varstring(char *ptr_arg,