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

merge

parents b5a4f89e ed8fc0b0

Docs/manual.texi

+2 −0
Original line number Diff line number Diff line
@@ -49055,6 +49055,8 @@ not yet 100% confident in this code. 
@node News-3.23.50, News-3.23.49, News-3.23.x, News-3.23.x

@appendixsubsec Changes in release 3.23.50

@itemize @bullet

Fixed core-dump bug when reading client groups from option files using

@code{mysql_options()}.

@item

Memory leak (16 bytes per every @strong{corrupted} table) closed.

@item

acinclude.m4

+5 −4
Original line number Diff line number Diff line
@@ -846,21 +846,21 @@ dnl --------------------------------------------------------------------------- 


AC_DEFUN([MYSQL_CHECK_BDB], [

  AC_ARG_WITH([berkeley-db],

              [\

              [

  --with-berkeley-db[=DIR]

                          Use BerkeleyDB located in DIR],

              [bdb="$withval"],

              [bdb=no])



  AC_ARG_WITH([berkeley-db-includes],

              [\

              [

  --with-berkeley-db-includes=DIR

                          Find Berkeley DB headers in DIR],

              [bdb_includes="$withval"],

              [bdb_includes=default])



  AC_ARG_WITH([berkeley-db-libs],

              [\

              [

  --with-berkeley-db-libs=DIR

                          Find Berkeley DB libraries in DIR],

              [bdb_libs="$withval"],
@@ -1108,7 +1108,7 @@ dnl --------------------------------------------------------------------------- 


AC_DEFUN([MYSQL_CHECK_INNODB], [

  AC_ARG_WITH([innodb],

              [\

              [

  --without-innodb        Do not include the InnoDB table handler],

              [innodb="$withval"],

              [innodb=yes])
@@ -1182,6 +1182,7 @@ dnl END OF MYSQL_CHECK_INNODB SECTION 
dnl ---------------------------------------------------------------------------



dnl ---------------------------------------------------------------------------



dnl Got this from the GNU tar 1.13.11 distribution

dnl by Paul Eggert <eggert@twinsun.com>

dnl ---------------------------------------------------------------------------

configure.in

+10 −3
Original line number Diff line number Diff line
@@ -603,15 +603,22 @@ AC_ARG_WITH(mysqld-user, 
    )

AC_SUBST(MYSQLD_USER)



# compile with strings functions in assembler

# If we should allove LOAD DATA LOCAL

AC_MSG_CHECKING(if we should should enable LOAD DATA LOCAL by default)

AC_ARG_ENABLE(local-infile,

    [  --enable-local-infile

                          If LOAD DATA LOCAL INFILE is enabled by default.],

    [ ENABLED_LOCAL_INFILE=$enablewal ],

    [ ENABLED_LOCAL_INFILE=$enableval ],

    [ ENABLED_LOCAL_INFILE=no ]

    )



AC_SUBST(ENABLE_LOCAL_INFILE)

if test "$ENABLED_LOCAL_INFILE" = "yes"

then

  AC_MSG_RESULT([yes])

  AC_DEFINE([ENABLED_LOCAL_INFILE])

else

  AC_MSG_RESULT([no])

fi



# Use Paul Eggerts macros from GNU tar to check for large file support.

MYSQL_SYS_LARGEFILE