Commit d44aef01 authored by unknown's avatar unknown

Use --enable-local-infile as default


Build-tools/Do-compile:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
parents 5fa6df30 4c164621
...@@ -8,6 +8,6 @@ c_warnings="$c_warnings $debug_extra_warnings" ...@@ -8,6 +8,6 @@ c_warnings="$c_warnings $debug_extra_warnings"
cxx_warnings="$cxx_warnings $debug_extra_warnings" cxx_warnings="$cxx_warnings $debug_extra_warnings"
extra_configs="$pentium_configs $debug_configs" extra_configs="$pentium_configs $debug_configs"
extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-embedded-server --with-openssl" extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-embedded-server --with-openssl --enable-local-infile"
. "$path/FINISH.sh" . "$path/FINISH.sh"
...@@ -63,6 +63,7 @@ aclocal; autoheader; aclocal; automake; autoconf ...@@ -63,6 +63,7 @@ aclocal; autoheader; aclocal; automake; autoconf
--with-low-memory \ --with-low-memory \
--with-mit-threads=yes $EXTRA_CONFIG \ --with-mit-threads=yes $EXTRA_CONFIG \
--enable-thread-safe-client \ --enable-thread-safe-client \
--enable-local-infile \
--with-berkeley-db \ --with-berkeley-db \
--with-innodb \ --with-innodb \
--with-vio \ --with-vio \
......
...@@ -159,7 +159,7 @@ if ($opt_stage <= 1) ...@@ -159,7 +159,7 @@ if ($opt_stage <= 1)
{ {
$opt_config_options.= " --with-innodb" $opt_config_options.= " --with-innodb"
} }
check_system("$opt_config_env ./configure --prefix=/usr/local/mysql \"--with-comment=Official MySQL$opt_version_suffix binary\" --with-extra-charsets=complex \"--with-server-suffix=$opt_version_suffix\" --enable-thread-safe-client $opt_config_options","Thank you for choosing MySQL"); check_system("$opt_config_env ./configure --prefix=/usr/local/mysql \"--with-comment=Official MySQL$opt_version_suffix binary\" --with-extra-charsets=complex \"--with-server-suffix=$opt_version_suffix\" --enable-thread-safe-client --enable-local-infile $opt_config_options","Thank you for choosing MySQL");
if (-d "$pwd/$host/include-mysql") if (-d "$pwd/$host/include-mysql")
{ {
safe_system("cp -r $pwd/$host/include-mysql/* $pwd/$host/$ver/include"); safe_system("cp -r $pwd/$host/include-mysql/* $pwd/$host/$ver/include");
......
...@@ -174,6 +174,7 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-/bin:/usr/bin}\" \ ...@@ -174,6 +174,7 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-/bin:/usr/bin}\" \
./configure \ ./configure \
$* \ $* \
--enable-assembler \ --enable-assembler \
--enable-local-infile \
--with-mysqld-user=%{mysqld_user} \ --with-mysqld-user=%{mysqld_user} \
--with-unix-socket-path=/var/lib/mysql/mysql.sock \ --with-unix-socket-path=/var/lib/mysql/mysql.sock \
--prefix=/ \ --prefix=/ \
......
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