Commit 1e7ac5a0 authored by unknown's avatar unknown
Browse files

Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint 

into  naruto.:C:/cpp/mysql-5.0-maint
parents 2bcd92a4 a4f74b86

BUILD/check-cpu

+27 −3
Original line number Diff line number Diff line
@@ -5,9 +5,13 @@ 
#



check_cpu () {

  if test -r /proc/cpuinfo ; then

  CPUINFO=/proc/cpuinfo

  if test -n "$TEST_CPUINFO" ; then

    CPUINFO=$TEST_CPUINFO

  fi

  if test -r "$CPUINFO" -a "$CPUINFO" != " " ; then

    # on Linux (and others?) we can get detailed CPU information out of /proc

    cpuinfo="cat /proc/cpuinfo"

    cpuinfo="cat $CPUINFO"



    # detect CPU family

    cpu_family=`$cpuinfo | grep 'family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1`
@@ -33,6 +37,7 @@ check_cpu () { 
    done

  else

    # Fallback when there is no /proc/cpuinfo

    CPUINFO=" "

    case "`uname -s`" in

      FreeBSD|OpenBSD)

        cpu_family=`uname -m`;
@@ -84,6 +89,18 @@ check_cpu () { 
    *Pentium*M*pro*)

      cpu_arg="pentium-m";

    ;;

    *Celeron\(R\)*\ M*)

      cpu_arg="pentium-m";

    ;;

    *Celeron*Coppermine*)

      cpu_arg="pentium3"

    ;;

    *Celeron\(R\)*)

      cpu_arg="pentium4"

    ;;

    *Celeron*)

      cpu_arg="pentium2";

    ;;

    *Athlon*64*)

      cpu_arg="athlon64";

      ;;
@@ -121,6 +138,13 @@ check_cpu () { 




  if test -z "$cpu_arg" ; then

    if test "$CPUINFO" != " " ; then

      # fallback to uname if necessary

      TEST_CPUINFO=" "

      check_cpu_cflags=""

      check_cpu

      return

    fi

    echo "BUILD/check-cpu: Oops, could not find out what kind of cpu this machine is using." >&2

    check_cpu_cflags=""

    return

BitKeeper/etc/collapsed

+8 −0
Original line number Diff line number Diff line
@@ -30,4 +30,12 @@ 
4554b3722d71SbPiI2Gx-RhbZjmuIQ

4558b3d73Cxjlb7Wv1oytdSTthxDfw

45771031yRCoM_ZfONdYchPvVEgLRg

459a60d8rIxeTuhB3j_QsOwLGdcpng

459a61c9OS8PzIsdviZJDkybJ1y1uA

459a70691aYIfU2ohV0a3P5iTLpO2A

459a7422KF_P7PuU3YQ5qG6ZLEVpiA

459a74e4nRcXppMSBYeQQ5efDkTADg

45ae6628gqKTsUFfnoNExadETVIkbA

45ba4faf2oqu6eR8fqecR3LfSNcYUg

45ba5238-NKl80QVXzdGo8hO9M75Xg

45c0fdfb2mz6NdOIsLenJtf6_ZelTA

cmd-line-utils/readline/display.c

+12 −0
Original line number Diff line number Diff line
@@ -524,6 +524,17 @@ rl_redisplay () 
      wrap_offset = prompt_invis_chars_first_line = 0;

    }



#if defined (HANDLE_MULTIBYTE)	  

#define CHECK_INV_LBREAKS() \

      do { \

	if (newlines >= (inv_lbsize - 2)) \

	  { \

	    inv_lbsize *= 2; \

	    inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \

            _rl_wrapped_line = (int *)xrealloc (_rl_wrapped_line, inv_lbsize * sizeof (int)); \

	  } \

      } while (0)

#else

#define CHECK_INV_LBREAKS() \

      do { \

	if (newlines >= (inv_lbsize - 2)) \
@@ -532,6 +543,7 @@ rl_redisplay () 
	    inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \

	  } \

      } while (0)

#endif



#if defined (HANDLE_MULTIBYTE)	  

#define CHECK_LPOS() \

cmd-line-utils/readline/undo.c

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ _rl_fix_last_undo_of_type (type, start, end) 


  for (rl = rl_undo_list; rl; rl = rl->next)

    {

      if (rl->what == (uint) type)

      if (rl->what == (unsigned int) type)

	{

	  rl->start = start;

	  rl->end = end;

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -2524,9 +2524,9 @@ linked_client_targets="linked_libmysql_sources" 


if test "$THREAD_SAFE_CLIENT" = "no"

then

  sql_client_dirs="strings regex mysys extra libmysql client"

  sql_client_dirs="strings regex mysys dbug extra libmysql client"

else

  sql_client_dirs="strings regex mysys extra libmysql libmysql_r client"

  sql_client_dirs="strings regex mysys dbug extra libmysql libmysql_r client"

  linked_client_targets="$linked_client_targets linked_libmysql_r_sources"

  AC_CONFIG_FILES(libmysql_r/Makefile)

  AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should be client be thread safe])