summaryrefslogtreecommitdiff
path: root/acconfig.h
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2002-02-14 18:58:24 +0200
committerunknown <monty@hundin.mysql.fi>2002-02-14 18:58:24 +0200
commit03facd7d8e7f30581892e0467469c1c562b3f86f (patch)
tree9f6476af645cdeb53eefe6ca4f6bc6f4ac04bf84 /acconfig.h
parent866e38069061f44dbd1fe7a9b0fdc7e1ee7a0e58 (diff)
parent9d5d3834c076edcd398ee3834a7c62db030a6bdf (diff)
downloadmariadb-git-03facd7d8e7f30581892e0467469c1c562b3f86f.tar.gz
merge with 3.23.49
BitKeeper/etc/logging_ok: auto-union acconfig.h: Auto merged Docs/manual.texi: Auto merged client/client_priv.h: Auto merged include/mysql.h: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/row/row0mysql.c: Auto merged mysql-test/t/comments.test: Auto merged sql/sql_lex.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_parse.cc: Auto merged sql/unireg.cc: Auto merged sql/unireg.h: Auto merged
Diffstat (limited to 'acconfig.h')
-rw-r--r--acconfig.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/acconfig.h b/acconfig.h
index 128e567a927..02be1ace0c6 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -21,6 +21,9 @@
/* Version of .frm files */
#undef DOT_FRM_VERSION
+/* If LOAD DATA LOCAL INFILE should be enabled by default */
+#undef ENABLED_LOCAL_INFILE
+
/* READLINE: */
#undef FIONREAD_IN_SYS_IOCTL