Commit 4d1441da authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/jonas/src/mysql-4.1


configure.in:
  Auto merged
parents ef5c8dbf a27e68a8

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ ram@gw.mysql.r18.ru 
ram@gw.udmsearch.izhnet.ru

ram@mysql.r18.ru

ram@ram.(none)

ramil@mysql.com

ranger@regul.home.lan

rburnett@build.mysql.com

reggie@bob.(none)

acinclude.m4

+13 −3
Original line number Diff line number Diff line
@@ -194,6 +194,8 @@ dnl Define zlib paths to point at bundled zlib 
AC_DEFUN([MYSQL_USE_BUNDLED_ZLIB], [

ZLIB_INCLUDES="-I\$(top_srcdir)/zlib"

ZLIB_LIBS="\$(top_builddir)/zlib/libz.la"

dnl Omit -L$pkglibdir as it's always in the list of mysql_config deps.

ZLIB_DEPS="-lz"

zlib_dir="zlib"

AC_SUBST([zlib_dir])

mysql_cv_compress="yes"
@@ -235,8 +237,13 @@ dnl $prefix/lib. If zlib headers or binaries weren't found at $prefix, the 
dnl   macro bails out with error.

dnl 

dnl If the library was found, this function #defines HAVE_COMPRESS

dnl and configure variables ZLIB_INCLUDES (i.e. -I/path/to/zlib/include) and

dnl ZLIB_LIBS (i. e. -L/path/to/zlib/lib -lz).

dnl and configure variables ZLIB_INCLUDES (i.e. -I/path/to/zlib/include),

dnl ZLIB_LIBS (i. e. -L/path/to/zlib/lib -lz) and ZLIB_DEPS which is

dnl used in mysql_config and is always the same as ZLIB_LIBS except to

dnl when we use the bundled zlib. In the latter case ZLIB_LIBS points to the

dnl build dir ($top_builddir/zlib), while mysql_config must point to the

dnl installation dir ($pkglibdir), so ZLIB_DEPS is set to point to

dnl $pkglibdir.



AC_DEFUN([MYSQL_CHECK_ZLIB_WITH_COMPRESS], [

AC_MSG_CHECKING([for zlib compression library])
@@ -285,7 +292,11 @@ case $SYSTEM_TYPE in 
        ;;

    esac

    if test "$mysql_cv_compress" = "yes"; then

      if test "x$ZLIB_DEPS" = "x"; then

        ZLIB_DEPS="$ZLIB_LIBS"

      fi

      AC_SUBST([ZLIB_LIBS])

      AC_SUBST([ZLIB_DEPS])

      AC_SUBST([ZLIB_INCLUDES])

      AC_DEFINE([HAVE_COMPRESS], [1], [Define to enable compression support])

    fi
@@ -1039,7 +1050,6 @@ AC_MSG_CHECKING(for OpenSSL) 
      echo "You can't use the --all-static link option when using openssl."

      exit 1

    fi

    NON_THREADED_CLIENT_LIBS="$NON_THREADED_CLIENT_LIBS $openssl_libs"

  else

    AC_MSG_RESULT(no)

	if test ! -z "$openssl_includes"

client/mysqlcheck.c

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static void usage(void) 
  puts("and you are welcome to modify and redistribute it under the GPL license.\n");

  puts("This program can be used to CHECK (-c,-m,-C), REPAIR (-r), ANALYZE (-a)");

  puts("or OPTIMIZE (-o) tables. Some of the options (like -e or -q) can be");

  puts("used at the same time. It works on MyISAM and in some cases on BDB tables.");

  puts("used at the same time. Not all options are supported by all storage engines.");

  puts("Please consult the MySQL manual for latest information about the");

  puts("above. The options -c,-r,-a and -o are exclusive to each other, which");

  puts("means that the last option will be used, if several was specified.\n");

configure.in

+10 −6
Original line number Diff line number Diff line
@@ -924,9 +924,11 @@ if test "$ac_cv_header_termio_h" = "no" -a "$ac_cv_header_termios_h" = "no" 
then

  AC_CHECK_FUNC(gtty, , AC_CHECK_LIB(compat, gtty))

fi

# We make a special variable for client library's to avoid including

# thread libs in the client.

NON_THREADED_CLIENT_LIBS="$LIBS $ZLIB_LIBS"



# We make a special variable for non-threaded version of LIBS to avoid

# including thread libs into non-threaded version of MySQL client library.

# Later in this script LIBS will be augmented with a threads library.

NON_THREADED_LIBS="$LIBS"



AC_MSG_CHECKING([for int8])

case $SYSTEM_TYPE in
@@ -1502,7 +1504,7 @@ then 
  if test -f /usr/lib/libxnet.so -a "$SYSTEM_TYPE" = "sni-sysv4"

  then

    LIBS="-lxnet $LIBS"

    NON_THREADED_CLIENT_LIBS="$NON_THREADED_CLIENT_LIBS -lxnet"

    NON_THREADED_LIBS="-lxnet $NON_THREADED_LIBS"

    with_named_thread="-Kthread $LDFLAGS -lxnet"

    LD_FLAGS=""

    CFLAGS="-Kthread $CFLAGS"
@@ -2826,7 +2828,7 @@ dnl This probably should be cleaned up more - for now the threaded 
dnl client is just using plain-old libs.

sql_client_dirs="libmysql strings regex client"

linked_client_targets="linked_libmysql_sources"

CLIENT_LIBS=$NON_THREADED_CLIENT_LIBS



if test "$THREAD_SAFE_CLIENT" != "no"

then

  sql_client_dirs="libmysql_r $sql_client_dirs"
@@ -2834,9 +2836,11 @@ then 
  AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should be client be thread safe])

fi



CLIENT_LIBS="$CLIENT_LIBS $STATIC_NSS_FLAGS"

CLIENT_LIBS="$NON_THREADED_LIBS $openssl_libs $ZLIB_LIBS $STATIC_NSS_FLAGS"



AC_SUBST(CLIENT_LIBS)

AC_SUBST(NON_THREADED_LIBS)

AC_SUBST(STATIC_NSS_FLAGS)

AC_SUBST(sql_client_dirs)

AC_SUBST(linked_client_targets)

include/ft_global.h

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ void ft_free_stopwords(void); 
#define FT_SORTED 2

#define FT_EXPAND 4   /* query expansion */



FT_INFO *ft_init_search(uint,void *, uint, byte *, uint, byte *);

FT_INFO *ft_init_search(uint,void *, uint, byte *, uint,CHARSET_INFO *, byte *);

my_bool ft_boolean_check_syntax_string(const byte *);



#ifdef  __cplusplus