summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorunknown <monty@tik.mysql.fi>2002-02-13 21:53:26 +0200
committerunknown <monty@tik.mysql.fi>2002-02-13 21:53:26 +0200
commit33d2d76549f8ccf037f733c61e2b9c17500fe738 (patch)
treed9a4ab04b8347c3969351b9c33b0c3f55c2f0145 /configure.in
parent501650c5b16a4c7cf7b673b19f9a2ae9c319e24f (diff)
downloadmariadb-git-33d2d76549f8ccf037f733c61e2b9c17500fe738.tar.gz
Made LOAD DATA LOCAL INFILE more secure
Docs/manual.texi: Changelog sql/sql_yacc.yy: optimization BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in12
1 files changed, 10 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index 33d6443275d..f11e2354dfd 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT(sql/mysqld.cc)
AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line!
-AM_INIT_AUTOMAKE(mysql, 3.23.48)
+AM_INIT_AUTOMAKE(mysql, 3.23.49)
AM_CONFIG_HEADER(config.h)
PROTOCOL_VERSION=10
@@ -518,7 +518,7 @@ AC_ARG_ENABLE(thread-safe-client,
[ THREAD_SAFE_CLIENT=no ]
)
-# Make thread safe client
+# compile with strings functions in assembler
AC_ARG_ENABLE(assembler,
[ --enable-assembler Use assembler versions of some string
functions if available.],
@@ -583,6 +583,14 @@ AC_ARG_WITH(mysqld-user,
)
AC_SUBST(MYSQLD_USER)
+# compile with strings functions in assembler
+AC_ARG_ENABLE(local-infile,
+ [ --enable-local-infile
+ If LOAD DATA LOCAL INFILE is enabled by default.],
+ [ ENABLED_LOCAL_INFILE=$enablewal ],
+ [ ENABLED_LOCAL_INFILE=no ]
+ )
+
# Use Paul Eggerts macros from GNU tar to check for large file support.
MYSQL_SYS_LARGEFILE