Commit c13baf70 authored by unknown's avatar unknown

Fix for --enable-local-infile


Docs/manual.texi:
  Changelog
acinclude.m4:
  Cleanup --help output
libmysql/libmysql.c:
  Fix for reading option groups in client
parent d6998363
...@@ -46890,6 +46890,8 @@ not yet 100% confident in this code. ...@@ -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 @node News-3.23.50, News-3.23.49, News-3.23.x, News-3.23.x
@appendixsubsec Changes in release 3.23.50 @appendixsubsec Changes in release 3.23.50
@itemize @bullet @itemize @bullet
Fixed core-dump bug when reading client groups from option files using
@code{mysql_options()}.
@item @item
Memory leak (16 bytes per every @strong{corrupted} table) closed. Memory leak (16 bytes per every @strong{corrupted} table) closed.
@item @item
...@@ -643,21 +643,21 @@ dnl --------------------------------------------------------------------------- ...@@ -643,21 +643,21 @@ dnl ---------------------------------------------------------------------------
AC_DEFUN([MYSQL_CHECK_BDB], [ AC_DEFUN([MYSQL_CHECK_BDB], [
AC_ARG_WITH([berkeley-db], AC_ARG_WITH([berkeley-db],
[\ [
--with-berkeley-db[=DIR] --with-berkeley-db[=DIR]
Use BerkeleyDB located in DIR], Use BerkeleyDB located in DIR],
[bdb="$withval"], [bdb="$withval"],
[bdb=no]) [bdb=no])
AC_ARG_WITH([berkeley-db-includes], AC_ARG_WITH([berkeley-db-includes],
[\ [
--with-berkeley-db-includes=DIR --with-berkeley-db-includes=DIR
Find Berkeley DB headers in DIR], Find Berkeley DB headers in DIR],
[bdb_includes="$withval"], [bdb_includes="$withval"],
[bdb_includes=default]) [bdb_includes=default])
AC_ARG_WITH([berkeley-db-libs], AC_ARG_WITH([berkeley-db-libs],
[\ [
--with-berkeley-db-libs=DIR --with-berkeley-db-libs=DIR
Find Berkeley DB libraries in DIR], Find Berkeley DB libraries in DIR],
[bdb_libs="$withval"], [bdb_libs="$withval"],
...@@ -905,7 +905,7 @@ dnl --------------------------------------------------------------------------- ...@@ -905,7 +905,7 @@ dnl ---------------------------------------------------------------------------
AC_DEFUN([MYSQL_CHECK_INNODB], [ AC_DEFUN([MYSQL_CHECK_INNODB], [
AC_ARG_WITH([innodb], AC_ARG_WITH([innodb],
[\ [
--with-innodb Use Innodb], --with-innodb Use Innodb],
[innodb="$withval"], [innodb="$withval"],
[innodb=no]) [innodb=no])
...@@ -985,7 +985,7 @@ dnl --------------------------------------------------------------------------- ...@@ -985,7 +985,7 @@ dnl ---------------------------------------------------------------------------
AC_DEFUN([MYSQL_CHECK_GEMINI], [ AC_DEFUN([MYSQL_CHECK_GEMINI], [
AC_ARG_WITH([gemini], AC_ARG_WITH([gemini],
[\ [
--with-gemini[=DIR] Use Gemini DB located in DIR], --with-gemini[=DIR] Use Gemini DB located in DIR],
[gemini="$withval"], [gemini="$withval"],
[gemini=no]) [gemini=no])
......
...@@ -603,15 +603,22 @@ AC_ARG_WITH(mysqld-user, ...@@ -603,15 +603,22 @@ AC_ARG_WITH(mysqld-user,
) )
AC_SUBST(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, AC_ARG_ENABLE(local-infile,
[ --enable-local-infile [ --enable-local-infile
If LOAD DATA LOCAL INFILE is enabled by default.], If LOAD DATA LOCAL INFILE is enabled by default.],
[ ENABLED_LOCAL_INFILE=$enablewal ], [ ENABLED_LOCAL_INFILE=$enableval ],
[ ENABLED_LOCAL_INFILE=no ] [ 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. # Use Paul Eggerts macros from GNU tar to check for large file support.
MYSQL_SYS_LARGEFILE MYSQL_SYS_LARGEFILE
......
...@@ -712,7 +712,7 @@ static void mysql_read_default_options(struct st_mysql_options *options, ...@@ -712,7 +712,7 @@ static void mysql_read_default_options(struct st_mysql_options *options,
*end=0; /* Remove '=' */ *end=0; /* Remove '=' */
} }
/* Change all '_' in variable name to '-' */ /* Change all '_' in variable name to '-' */
for (end= *option ; (end= strcend(end,'_')) ; ) for (end= *option ; *(end= strcend(end,'_')) ; )
*end= '-'; *end= '-';
switch (find_type(*option+2,&option_types,2)) { switch (find_type(*option+2,&option_types,2)) {
case 1: /* port */ case 1: /* port */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment