Commit 3fc4f073 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

parents 390e5768 384ae2ef

BUILD/compile-pentium-debug-max

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ c_warnings="$c_warnings $debug_extra_warnings" 
cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs"



extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-vio --with-openssl --with-embedded-server"

extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-embedded-server"



. "$path/FINISH.sh"

Docs/manual.texi

+224 −119

File changed.

Preview size limit exceeded, changes collapsed.

acinclude.m4

+9 −6
Original line number Diff line number Diff line
@@ -715,6 +715,8 @@ AC_MSG_CHECKING(for OpenSSL) 
              [openssl="$withval"],

              [openssl=no])



  openssl_libs=""

  openssl_includes=""

  if test "$openssl" = "yes"

  then

    if test -n "$vio_dir"
@@ -722,14 +724,12 @@ AC_MSG_CHECKING(for OpenSSL) 
      AC_MSG_RESULT(yes)

      openssl_libs="-L/usr/local/ssl/lib -lssl -lcrypto"

      openssl_includes="-I/usr/local/ssl/include"

      AC_DEFINE(HAVE_OPENSSL)

    else

      AC_MSG_ERROR([OpenSSL requires Virtual IO support (--with-vio)])

      AC_MSG_RESULT(disabled because --with-vio wasn not used)

    fi

    AC_DEFINE(HAVE_OPENSSL)

  else

    AC_MSG_RESULT(no)

    openssl_libs=""

    openssl_includes=""

  fi

  NON_THREADED_CLIENT_LIBS="$NON_THREADED_CLIENT_LIBS $openssl_libs"

  AC_SUBST(openssl_libs)
@@ -748,16 +748,19 @@ dnl Call MYSQL_CHECK_ORBIT even if mysqlfs == no, so that @orbit_*@ 
dnl get substituted.

  MYSQL_CHECK_ORBIT



  AC_MSG_CHECKING(if we should build MySQLFS)

  fs_dirs=""

  if test "$mysqlfs" = "yes"

  then

    if test -n "$orbit_exec_prefix"

    then

      fs_dirs=fs

      AC_MSG_RESULT([yes])

    else

      AC_MSG_ERROR([mysqlfs requires ORBit, the CORBA ORB])

      AC_MSG_RESULT(disabled because ORBIT, the CORBA ORB, was not found)

    fi

  else

    fs_dirs=

    AC_MSG_RESULT([no])

  fi

  AC_SUBST([fs_dirs])

])

configure.in

+7 −3
Original line number Diff line number Diff line
@@ -1758,11 +1758,15 @@ AC_ARG_WITH(extra-tools, 
    [with_tools=yes]

)



tools_dirs=""

if test "$with_tools" = "yes"

then

  tools_dirs="tools"

  if test "$THREAD_SAFE_CLIENT" = "no"

  then

    echo "Warning: extra-tools disabled because --enable-thread-safe-client wasn't used"

  else

  tools_dirs=""

    tools_dirs="tools"

  fi

fi

AC_SUBST(tools_dirs)

include/m_ctype.h

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ extern CHARSET_INFO *default_charset_info; 
extern CHARSET_INFO *find_compiled_charset(uint cs_number);

extern CHARSET_INFO *find_compiled_charset_by_name(const char *name);

extern CHARSET_INFO  compiled_charsets[];

extern uint compiled_charset_number(const char *name);

extern const char *compiled_charset_name(uint charset_number);



#define MY_CHARSET_UNDEFINED 0

#define MY_CHARSET_CURRENT (default_charset_info->number)