Commit 2b2645d9 authored by unknown's avatar unknown
Browse files

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

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


configure.in:
  Auto merged
parents df1dc775 2c0acb32

BUILD/compile-pentium-debug

+1 −1
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"

. "$path/SETUP.sh" $@ --with-debug=full



extra_flags="$pentium_cflags $debug_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

BUILD/compile-pentium-debug-max

+1 −1
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh"

. "$path/SETUP.sh" $@ --with-debug=full



extra_flags="$pentium_cflags $debug_cflags $max_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

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
@@ -918,9 +918,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
@@ -1497,7 +1499,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"
@@ -2444,7 +2446,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"
@@ -2452,9 +2454,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