From 7e1edb01dbb4756c88f9c93f188f03eb8d11142c Mon Sep 17 00:00:00 2001
From: unknown <sasha@mysql.sashanet.com>
Date: Sat, 2 Mar 2002 12:45:44 -0700
Subject: load local fix overrun sentry in my_vsnprintf() test will not be
 pushed yet

BUILD/FINISH.sh:
  load local fix
BUILD/SETUP.sh:
  load local fix
BUILD/compile-pentium-debug-max:
  load local fix
configure.in:
  load local fix
mysys/my_vsnprintf.c:
  added overrun sentry to the test
---
 BUILD/FINISH.sh                 | 1 +
 BUILD/SETUP.sh                  | 4 ++++
 BUILD/compile-pentium-debug-max | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'BUILD')

diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh
index fbeaf1e3c68..82f31a14dc4 100644
--- a/BUILD/FINISH.sh
+++ b/BUILD/FINISH.sh
@@ -1,5 +1,6 @@
 cflags="$c_warnings $extra_flags"
 cxxflags="$cxx_warnings $base_cxxflags $extra_flags"
+extra_configs="$extra_configs $local_infile_configs"
 configure="./configure $base_configs $extra_configs"
 for arg
 do
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh
index a69cdcb14fd..8c523fc4877 100644
--- a/BUILD/SETUP.sh
+++ b/BUILD/SETUP.sh
@@ -57,6 +57,10 @@ static_link="--with-mysqld-ldflags=-all-static --with-client-ldflags=-all-static
 alpha_configs=""	# Not used yet
 pentium_configs=""
 sparc_configs=""
+# we need local-infile in all binaries for rpl000001
+# if you need to disable local-infile in the client, write a build script
+# and unset local_infile_configs
+local_infile_configs="--enable-local-infile"
 
 debug_configs="--with-debug"
 
diff --git a/BUILD/compile-pentium-debug-max b/BUILD/compile-pentium-debug-max
index d320f968c4e..1684686ce8c 100755
--- a/BUILD/compile-pentium-debug-max
+++ b/BUILD/compile-pentium-debug-max
@@ -8,6 +8,6 @@ c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
 extra_configs="$pentium_configs $debug_configs"
 
-extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-embedded-server --with-openssl --enable-local-infile"
+extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-embedded-server --with-openssl"
 
 . "$path/FINISH.sh"
-- 
cgit v1.2.1