Commit f3d4e9b1 authored by jcole@tetra.spaceapes.com's avatar jcole@tetra.spaceapes.com
Browse files

conflict fixed

parents 3afd3ada 18053685

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-vio --with-openssl --with-embedded-server"

extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-embedded-server"



. "$path/FINISH.sh"

BUILD/compile-pentium-max

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ extra_configs="$pentium_configs" 
strip=yes



extra_configs="$extra_configs --with-innodb --with-berkeley-db \

 --enable-thread-safe-client"

 --enable-thread-safe-client --with-openssl --with-vio"



. "$path/FINISH.sh"

BitKeeper/etc/logging_ok

+3 −1
Original line number Diff line number Diff line 
Administrator@fred.

Miguel@light.local

Sinisa@sinisa.nasamreza.org

davida@isil.mysql.com

heikki@donna.mysql.fi
@@ -26,6 +28,6 @@ tim@threads.polyesthetic.msg 
tim@white.box

tim@work.mysql.com

tonu@hundin.mysql.fi

tonu@volk.internalnet

tonu@x153.internalnet

tonu@x3.internalnet
 
tonu@volk.internalnet

Build-tools/Do-compile

+5 −3
Original line number Diff line number Diff line
@@ -4,10 +4,10 @@ use Getopt::Long; 
$opt_distribution=$opt_user=$opt_result=$opt_config_options=$opt_config_env="";

$opt_dbd_options=$opt_perl_options=$opt_suffix="";

$opt_tmp=$version_suffix="";

$opt_help=$opt_Information=$opt_no_delete=$opt_delete=$opt_debug=$opt_stage=$opt_rsh_mail=$opt_no_test=$opt_no_perl=$opt_with_low_memory=$opt_fast_benchmark=$opt_static_client=$opt_static_server=$opt_static_perl=$opt_sur=$opt_with_small_disk=$opt_local_perl=$opt_tcpip=$opt_build_thread=$opt_no_mysqltest=$opt_use_old_distribution=$opt_enable_shared=$opt_no_crash_me=$opt_no_strip=0;

$opt_help=$opt_Information=$opt_delete=$opt_debug=$opt_stage=$opt_rsh_mail=$opt_no_test=$opt_no_perl=$opt_with_low_memory=$opt_fast_benchmark=$opt_static_client=$opt_static_server=$opt_static_perl=$opt_sur=$opt_with_small_disk=$opt_local_perl=$opt_tcpip=$opt_build_thread=$opt_no_mysqltest=$opt_use_old_distribution=$opt_enable_shared=$opt_no_crash_me=$opt_no_strip=0;

$opt_innodb=$opt_bdb=0;



GetOptions("Information","help","distribution=s","user=s","result=s","no-delete","delete","no-test","no-mysqltest","perl-files=s","debug","config-options=s","config-env=s","stage=i","rsh-mail","with-low-memory","fast-benchmark","tmp=s","static-client","static-server","static-perl","no-perl","local-perl","perl-options=s","sur","with-small-disk","dbd-options=s","tcpip","suffix=s","build-thread=i","innodb","bdb","use-old-distribution","enable-shared","no-crash-me","no-strip") || usage();

GetOptions("Information","help","distribution=s","user=s","result=s","delete","no-test","no-mysqltest","perl-files=s","debug","config-options=s","config-env=s","stage=i","rsh-mail","with-low-memory","fast-benchmark","tmp=s","static-client","static-server","static-perl","no-perl","local-perl","perl-options=s","sur","with-small-disk","dbd-options=s","tcpip","suffix=s","build-thread=i","innodb","bdb","use-old-distribution","enable-shared","no-crash-me","no-strip") || usage();



usage() if ($opt_help || $opt_Information);

usage() if (!$opt_distribution);
@@ -113,6 +113,8 @@ if ($opt_stage <= 1) 
  $opt_config_options.=" --with-low-memory" if ($opt_with_low_memory);

  # Fix files if this is in another timezone than work.mysql.com

  unlink("config.cache");

  unlink("bdb/build_unix/config.cache");

  unlink("innobase/config.cache");

  log_system("$make clean") if ($opt_use_old_distribution);

  if ($opt_static_server)

  {
@@ -143,7 +145,7 @@ if ($opt_stage <= 1) 


if ($opt_stage <= 2)

{

  unlink($opt_distribution) if (!$opt_delete && !$opt_use_old_distribution);

  unlink($opt_distribution) if ($opt_delete && !$opt_use_old_distribution);

  safe_system("$make");

}

Build-tools/Do-rpm

+1 −3
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ if [ $? != 0 ]; then 
 tail $log

fi 



if [ ! x$local_build=x1 ]; then

if [ x$local_build != x1 ]; then



 # Build perl RPM (we currently need to be root to do this and that is

 # not possible)
@@ -228,5 +228,3 @@ if [ ! x$local_build=x1 ]; then 
 #scp $owner@$bmachine:$rpmdir/SRPMS/Perl*-*.rpm $bpath/NEW-RPMS

fi 

)  > $log 2>&1