database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

merge

Browse Source 
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-all-build-steps:
  Auto merged
Build-tools/Do-compile:
  Auto merged
Build-tools/Do-rpm:
  Auto merged
Docs/manual.texi:
  Auto merged
include/hash.h:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
mysys/array.c:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/mf_qsort.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
scripts/mysqlhotcopy.sh:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
strings/Makefile.am:
  Auto merged
This commit is contained in:
unknown
2002-03-06 19:53:31 +02:00
parent a5deff2bc9 d6998363af
commit b707a1ab6b
29 changed files with 354 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libmysql/libmysql.c
View File

@@ -1338,7 +1338,7 @@ mysql_init(MYSQL *mysql)
/*
Only enable LOAD DATA INFILE by default if configured with
--with-enabled-local-inflile
--enable-local-infile
*/
#ifdef ENABLED_LOCAL_INFILE
mysql->options.client_flag|= CLIENT_LOCAL_FILES;