Commit 98aec317 authored by paul@teton.kitebird.com's avatar paul@teton.kitebird.com
Browse files

Merge paul@work.mysql.com:/home/bk/mysql-4.0 

into teton.kitebird.com:/home/paul/mysql-4.0
parents d0e09ed8 68fc8f14

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -461,3 +461,4 @@ vio/viotest-ssl 
Docs/mysql.xml

mysql-test/r/rpl000001.eval

Docs/safe-mysql.xml

mysys/test_vsnprintf

BUILD/FINISH.sh

+1 −0
Original line number Diff line number Diff line 
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

BUILD/SETUP.sh

+4 −0
Original line number Diff line number Diff line
@@ -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"

BUILD/compile-pentium-debug-max

+1 −1
Original line number Diff line number Diff line
@@ -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"

Build-tools/Do-all-build-steps

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ gmake -j 2 
time gmake -j 2 distcheck \

 EXTRA_CONF_ARGS="--with-unix-socket-path=/var/tmp/mysql.sock --with-low-memory $EXTRA_CONFIG"



sh $BD/Build-tools/Do-rpm

sh $BD/Build-tools/Do-rpm $*



rm -f $TMP_SCRIPT

END