Commit fd0952ff authored by unknown's avatar unknown
Browse files

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work-5.1.15-and-opt-merge 

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build


sql/mysqld.cc:
  Auto merged
parents d3ecf748 0f1a3537

BUILD/SETUP.sh

+9 −1
Original line number Diff line number Diff line
@@ -139,9 +139,17 @@ fi 
#

base_configs="--prefix=$prefix --enable-assembler "

base_configs="$base_configs --with-extra-charsets=complex "

base_configs="$base_configs --enable-thread-safe-client --with-readline "

base_configs="$base_configs --enable-thread-safe-client "

base_configs="$base_configs --with-big-tables"



if test -d "$path/../cmd-line-utils/readline"

then

    base_configs="$base_configs --with-readline"

elif test -d "$path/../cmd-line-utils/libedit"

then

    base_configs="$base_configs --with-libedit"

fi



static_link="--with-mysqld-ldflags=-all-static "

static_link="$static_link --with-client-ldflags=-all-static"

# we need local-infile in all binaries for rpl000001

configure.in

+15 −2
Original line number Diff line number Diff line
@@ -2354,6 +2354,7 @@ readline_basedir="" 
readline_dir=""

readline_h_ln_cmd=""

readline_link=""

want_to_use_readline="no"



if expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null

then
@@ -2379,6 +2380,7 @@ then 
    readline_link="\$(top_builddir)/cmd-line-utils/readline/libreadline.a"

    readline_h_ln_cmd="\$(LN) -s \$(top_srcdir)/cmd-line-utils/readline readline"

    compile_readline=yes

    want_to_use_readline="yes"

    AC_DEFINE_UNQUOTED(USE_NEW_READLINE_INTERFACE, 1)

else

    # Use system readline library
@@ -2388,10 +2390,12 @@ else 
    MYSQL_CHECK_NEW_RL_INTERFACE

    MYSQL_CHECK_READLINE_DECLARES_HIST_ENTRY

    AC_LANG_RESTORE

    if [test "$mysql_cv_new_rl_interface" = "yes"]

    if [test "$mysql_cv_new_rl_interface" = "yes"] && [test -d "./cmd-line-utils/readline"]

    then

        # Use the new readline interface

        # Use the new readline interface, but only if the package includes a bundled libreadline

        # this way we avoid linking commercial source with GPL readline

        readline_link="-lreadline"

        want_to_use_readline="yes"

    elif [test "$mysql_cv_libedit_interface" = "yes"]

    then

        # Use libedit
@@ -2402,6 +2406,15 @@ else 
          versions of libedit or readline])

    fi

fi



# if there is no readline, but we want to build with readline, we fail

if [test "$want_to_use_readline" = "yes"] && [test ! -d "./cmd-line-utils/readline"]

then

    AC_MSG_ERROR([This commercially licensed MySQL source package can't

          be built with libreadline. Please use --with-libedit to use

          the bundled version of libedit instead.])

fi



#

# if either readline or libedit is enabled - generate Makefile's for both

# (to make sure both are included in 'make dist')