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

Fix for --enable-local-infile

parent 668d09cc

Docs/manual.texi

+2 −0
Original line number Diff line number Diff line
@@ -46890,6 +46890,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 −5
Original line number Diff line number Diff line
@@ -643,21 +643,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"],
@@ -905,7 +905,7 @@ dnl --------------------------------------------------------------------------- 


AC_DEFUN([MYSQL_CHECK_INNODB], [

  AC_ARG_WITH([innodb],

              [\

              [

  --with-innodb         Use Innodb],

              [innodb="$withval"],

              [innodb=no])
@@ -985,7 +985,7 @@ dnl --------------------------------------------------------------------------- 


AC_DEFUN([MYSQL_CHECK_GEMINI], [

  AC_ARG_WITH([gemini],

              [\

              [

  --with-gemini[=DIR] Use Gemini DB located in DIR],

              [gemini="$withval"],

              [gemini=no])

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

libmysql/libmysql.c

+1 −1
Original line number Diff line number Diff line
@@ -712,7 +712,7 @@ static void mysql_read_default_options(struct st_mysql_options *options, 
	  *end=0;				/* Remove '=' */

	}

	/* Change all '_' in variable name to '-' */

	for (end= *option ; (end= strcend(end,'_')) ; )

	for (end= *option ; *(end= strcend(end,'_')) ; )

	  *end= '-';

	switch (find_type(*option+2,&option_types,2)) {

	case 1:				/* port */