Commit 8bb6c4d4 authored by unknown's avatar unknown
Browse files

Merge gvanderkelen@bk-internal.mysql.com:/home/bk/mysql-5.0 

into kriem.kemuri.org:/home/geert/MySQL/mysql-5.0


client/mysql.cc:
  Auto merged
parents fea116cf 05bfcf65

client/mysql.cc

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#include <locale.h>

#endif



const char *VER= "14.9";

const char *VER= "14.10";



/* Don't try to make a nice table if the data is too big */

#define MAX_COLUMN_LENGTH	     1024
@@ -237,7 +237,7 @@ static COMMANDS commands[] = { 
  { "connect",'r', com_connect,1,

    "Reconnect to the server. Optional arguments are db and host." },

  { "delimiter", 'd', com_delimiter,    1,

    "Set query delimiter. " },

    "Set statement delimiter. NOTE: Takes the rest of the line as new delimiter." },

#ifdef USE_POPEN

  { "edit",   'e', com_edit,   0, "Edit command with $EDITOR."},

#endif

config/ac-macros/misc.m4

+32 −3
Original line number Diff line number Diff line
@@ -34,10 +34,10 @@ undefine([AC_CV_NAME])dnl 
AC_DEFUN([MYSQL_TYPE_ACCEPT],

[ac_save_CXXFLAGS="$CXXFLAGS"

AC_CACHE_CHECK([base type of last arg to accept], mysql_cv_btype_last_arg_accept,

AC_LANG_SAVE

AC_LANG_CPLUSPLUS

AC_LANG_PUSH(C++)

if test "$ac_cv_prog_gxx" = "yes"

then

  # Add -Werror, remove -fbranch-probabilities (Bug #268)

  CXXFLAGS=`echo $CXXFLAGS -Werror | sed 's/-fbranch-probabilities//'`

fi

mysql_cv_btype_last_arg_accept=none
@@ -64,7 +64,7 @@ fi 
if test "$mysql_cv_btype_last_arg_accept" = "none"; then

mysql_cv_btype_last_arg_accept=int

fi)

AC_LANG_RESTORE

AC_LANG_POP(C++)

AC_DEFINE_UNQUOTED([SOCKET_SIZE_TYPE], [$mysql_cv_btype_last_arg_accept],

                   [The base type of the last arg to accept])

CXXFLAGS="$ac_save_CXXFLAGS"
@@ -90,6 +90,35 @@ then 
fi

])



#---START: Figure out whether to use 'struct rlimit' or 'struct rlimit64'

AC_DEFUN([MYSQL_TYPE_STRUCT_RLIMIT],

[ac_save_CXXFLAGS="$CXXFLAGS"

AC_CACHE_CHECK([struct type to use with setrlimit], mysql_cv_btype_struct_rlimit,

AC_LANG_PUSH(C++)

if test "$ac_cv_prog_gxx" = "yes"

then

  # Add -Werror, remove -fbranch-probabilities (Bug #268)

  CXXFLAGS=`echo $CXXFLAGS -Werror | sed 's/-fbranch-probabilities//'`

fi

mysql_cv_btype_struct_rlimit=none

[AC_TRY_COMPILE([#if defined(inline)

#undef inline

#endif

#include <stdlib.h>

#include <sys/resource.h>

],

[struct rlimit64 rl; setrlimit(RLIMIT_CORE, &rl);],

mysql_cv_btype_struct_rlimit="struct rlimit64")]

if test "$mysql_cv_btype_struct_rlimit" = "none"; then

mysql_cv_btype_struct_rlimit="struct rlimit"

fi)

AC_LANG_POP(C++)

AC_DEFINE_UNQUOTED([STRUCT_RLIMIT], [$mysql_cv_btype_struct_rlimit],

                   [The struct rlimit type to use with setrlimit])

CXXFLAGS="$ac_save_CXXFLAGS"

])

#---END:



AC_DEFUN([MYSQL_TIMESPEC_TS],

[AC_CACHE_CHECK([if struct timespec has a ts_sec member], mysql_cv_timespec_ts,

[AC_TRY_COMPILE([#include <pthread.h>

config/ac-macros/openssl.m4

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [ 
 if test -z "$OPENSSL_LIB" -o -z "$OPENSSL_INCLUDE" ; then

   echo "Could not find an installation of OpenSSL"

   if test -n "$OPENSSL_LIB" ; then

    if test "$IS_LINUX" = "true"; then

    if test "$TARGET_LINUX" = "true"; then

      echo "Looks like you've forgotten to install OpenSSL development RPM"

    fi

   fi

configure.in

+99 −64
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ AC_PREREQ(2.50)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.5-beta)

AM_INIT_AUTOMAKE(mysql, 5.0.6-beta)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -17,7 +17,7 @@ SHARED_LIB_VERSION=14:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=4

NDB_VERSION_BUILD=6

NDB_VERSION_STATUS="beta"



# Set all version vars based on $VERSION. How do we do this more elegant ?
@@ -383,15 +383,16 @@ AC_MSG_CHECKING("if we should use 'skip-locking' as default for $target_os") 
if expr "$target_os" : "[[Ll]]inux.*" > /dev/null

then

  MYSQLD_DEFAULT_SWITCHES="--skip-locking"

  IS_LINUX="true"

  AC_MSG_RESULT("yes");

  TARGET_LINUX="true"

  AC_MSG_RESULT("yes")

  AC_DEFINE([TARGET_OS_LINUX], [1], [Whether we build for Linux])

else

  MYSQLD_DEFAULT_SWITCHES=""

  IS_LINUX="false"

  AC_MSG_RESULT("no");

  TARGET_LINUX="false"

  AC_MSG_RESULT("no")

fi

AC_SUBST(MYSQLD_DEFAULT_SWITCHES)

AC_SUBST(IS_LINUX)

AC_SUBST(TARGET_LINUX)



dnl Find paths to some shell programs

AC_PATH_PROG(LN, ln, ln)
@@ -580,7 +581,7 @@ AC_SUBST(NOINST_LDFLAGS) 
# (this is true on the MySQL build machines to avoid NSS problems)

#



if test "$IS_LINUX" = "true" -a "$static_nss" = ""

if test "$TARGET_LINUX" = "true" -a "$static_nss" = ""

then

  tmp=`nm /usr/lib/libc.a  | grep _nss_files_getaliasent_r`

  if test -n "$tmp"
@@ -747,7 +748,7 @@ AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init)) 
MYSQL_CHECK_ZLIB_WITH_COMPRESS



# For large pages support

if test "$IS_LINUX" = "true"

if test "$TARGET_LINUX" = "true"

then

  # For SHM_HUGETLB on Linux

  AC_CHECK_DECLS(SHM_HUGETLB,
@@ -805,7 +806,7 @@ struct request_info *req; 
])

AC_SUBST(WRAPLIBS)



if test "$IS_LINUX" = "true"; then

if test "$TARGET_LINUX" = "true"; then

  AC_MSG_CHECKING([for atomic operations])



  atom_ops=
@@ -849,7 +850,7 @@ int main() 
    [ USE_PSTACK=no ])

  pstack_libs=

  pstack_dirs=

  if test "$USE_PSTACK" = yes -a "$IS_LINUX" = "true" -a "$BASE_MACHINE_TYPE" = "i386"

  if test "$USE_PSTACK" = yes -a "$TARGET_LINUX" = "true" -a "$BASE_MACHINE_TYPE" = "i386"

  then

    have_libiberty= have_libbfd=

    my_save_LIBS="$LIBS"
@@ -1231,11 +1232,36 @@ esac 
# We have to check libc last because else it fails on Solaris 2.6



with_posix_threads="no"

# Hack for DEC-UNIX (OSF1)

# Search thread lib on Linux

if test "$with_named_thread" = "no"

then

    AC_MSG_CHECKING("Linux threads")

    if test "$TARGET_LINUX" = "true"

    then

        AC_MSG_RESULT("starting")

        # use getconf to check glibc contents

        AC_MSG_CHECKING("getconf GNU_LIBPTHREAD_VERSION")

        case `getconf GNU_LIBPTHREAD_VERSION | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ` in

        NPTL* )

                AC_MSG_RESULT("NPTL")

                AC_DEFINE([HAVE_NPTL], [1], [NPTL threads implementation])

                with_named_thread="-lpthread"

                ;;

        LINUXTHREADS* )

                AC_MSG_RESULT("Linuxthreads")

                AC_DEFINE([HAVE_LINUXTHREADS], [1], 

                      [Whether we are using Xavier Leroy's LinuxThreads])

                with_named_thread="-lpthread"

                ;;

        * )

                AC_MSG_RESULT("unknown")

                ;;

        esac

        if test "$with_named_thread" = "no"

        then

          # old method, check headers

          # Look for LinuxThreads.

  AC_MSG_CHECKING("LinuxThreads")

          AC_MSG_CHECKING("LinuxThreads in header file comment")

          res=`grep Linuxthreads /usr/include/pthread.h 2>/dev/null | wc -l`

          if test "$res" -gt 0

          then
@@ -1251,41 +1277,48 @@ then 
          else

            AC_MSG_RESULT("Not found")

            # If this is a linux machine we should barf

      if test "$IS_LINUX" = "true"

      then

	AC_MSG_ERROR([This is a linux system and Linuxthreads was not

found. On linux Linuxthreads should be used.  Please install Linuxthreads

(or a new glibc) and try again.  See the Installation chapter in the

Reference Manual for more information.])

            AC_MSG_ERROR([This is a Linux system without a working getconf, 

and Linuxthreads was not found. Please install it (or a new glibc) and try again.  

See the Installation chapter in the Reference Manual for more information.])

          fi

        else

            AC_MSG_RESULT("no need to check headers")

        fi

        

        AC_MSG_CHECKING("for pthread_create in -lpthread");

        ac_save_LIBS="$LIBS"

        LIBS="$LIBS -lpthread"

        AC_TRY_LINK( [#include <pthread.h>],

              [ (void) pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],

              AC_MSG_RESULT("yes"),

              [ AC_MSG_RESULT("no")

                AC_MSG_ERROR([

This is a Linux system claiming to support threads, either Linuxthreads or NPTL, but linking a test program failed.  

Please install one of these (or a new glibc) and try again.  

See the Installation chapter in the Reference Manual for more information.]) ]

              )

        LIBS="$ac_save_LIBS"

    else

	AC_MSG_CHECKING("DEC threads")

        AC_MSG_RESULT("no")

    fi  # "$TARGET_LINUX" 

fi  # "$with_named_thread" = "no" -a "$with_mit_threads" = "no"





# Hack for DEC-UNIX (OSF1 -> Tru64)

if test "$with_named_thread" = "no" -a "$with_mit_threads" = "no"

then

    AC_MSG_CHECKING("DEC threads post OSF/1 3.2")

    if test -f /usr/shlib/libpthread.so -a -f /usr/lib/libmach.a -a -f /usr/ccs/lib/cmplrs/cc/libexc.a

    then

      with_named_thread="-lpthread -lmach -lexc"

      CFLAGS="$CFLAGS -D_REENTRANT"

      CXXFLAGS="$CXXFLAGS -D_REENTRANT"

	  AC_DEFINE(HAVE_DEC_THREADS, [1],

                    [Whether we are using DEC threads])

      AC_DEFINE(HAVE_DEC_THREADS, [1], [Whether we are using DEC threads])

      AC_MSG_RESULT("yes")

    else

      AC_MSG_RESULT("no")

	  AC_MSG_CHECKING("DEC 3.2 threads")

          if test -f /usr/shlib/libpthreads.so -a -f /usr/lib/libmach.a -a -f /usr/ccs/lib/cmplrs/cc/libexc.a

	  then

	    with_named_thread="-lpthreads -lmach -lc_r"

	    AC_DEFINE(HAVE_DEC_THREADS, [1])

            AC_DEFINE([HAVE_DEC_3_2_THREADS], [1],

                      [Whether we are using OSF1 DEC threads on 3.2])

            with_osf32_threads="yes"

            MYSQLD_DEFAULT_SWITCHES="--skip-thread-priority"

	    AC_MSG_RESULT("yes")

	  else

	    AC_MSG_RESULT("no")

          fi

	fi

     fi

   fi

fi

    fi  # DEC threads

fi  # "$with_named_thread" = "no" -a "$with_mit_threads" = "no"





dnl This is needed because -lsocket has to come after the thread
@@ -1696,7 +1729,7 @@ fi 
AC_SUBST(COMPILATION_COMMENT)



AC_MSG_CHECKING("need of special linking flags")

if test "$IS_LINUX" = "true" -a "$ac_cv_prog_gcc" = "yes" -a "$all_is_static" != "yes"

if test "$TARGET_LINUX" = "true" -a "$ac_cv_prog_gcc" = "yes" -a "$all_is_static" != "yes"

then

  LDFLAGS="$LDFLAGS -rdynamic"

  AC_MSG_RESULT("-rdynamic")
@@ -1754,6 +1787,8 @@ AC_C_BIGENDIAN 
MYSQL_TYPE_ACCEPT



#---END:

# Figure out what type of struct rlimit to use with setrlimit

MYSQL_TYPE_STRUCT_RLIMIT

# Find where the stack goes

MYSQL_STACK_DIRECTION

# We want to skip alloca on irix unconditionally. It may work on some version..
@@ -1914,7 +1949,7 @@ CFLAGS="$ORG_CFLAGS" 
# Sanity check: We chould not have any fseeko symbol unless

# large_file_support=yes

AC_CHECK_FUNC(fseeko,

[if test "$large_file_support" = no -a "$IS_LINUX" = "true";

[if test "$large_file_support" = no -a "$TARGET_LINUX" = "true";

then

  AC_MSG_ERROR("Found fseeko symbol but large_file_support is not enabled!");

fi]

heap/hp_hash.c

+11 −0
Original line number Diff line number Diff line
@@ -255,6 +255,9 @@ ulong hp_hashnr(register HP_KEYDEF *keydef, register const byte *key) 
      if (*pos)					/* Found null */

      {

	nr^= (nr << 1) | 1;

	/* Add key pack length (2) to key for VARCHAR segments */

        if (seg->type == HA_KEYTYPE_VARTEXT1)

          key+= 2;

	continue;

      }

      pos++;
@@ -390,6 +393,9 @@ ulong hp_hashnr(register HP_KEYDEF *keydef, register const byte *key) 
      if (*pos)

      {

	nr^= (nr << 1) | 1;

	/* Add key pack length (2) to key for VARCHAR segments */

        if (seg->type == HA_KEYTYPE_VARTEXT1)

          key+= 2;

	continue;

      }

      pos++;
@@ -584,8 +590,13 @@ int hp_key_cmp(HP_KEYDEF *keydef, const byte *rec, const byte *key) 
      if (found_null != (int) *key++)

	return 1;

      if (found_null)

      {

        /* Add key pack length (2) to key for VARCHAR segments */

        if (seg->type == HA_KEYTYPE_VARTEXT1)

          key+= 2;

	continue;

      }

    }

    if (seg->type == HA_KEYTYPE_TEXT)

    {

      CHARSET_INFO *cs= seg->charset;