Commit ca96a3b4 authored by unknown's avatar unknown
Browse files

Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.0 

into krsna.patg.net:/home/patg/mysql-4.0


Build-tools/Do-compile:
  Auto merged
parents a3d48fc6 3e159f3f

BUILD/compile-pentium-valgrind-max

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ argument. 
path=`dirname $0`

. "$path/SETUP.sh"



extra_flags="$pentium_cflags $debug_cflags -USAFEMALLOC -DHAVE_purify"

extra_flags="$pentium_cflags $debug_cflags -USAFEMALLOC -UFORCE_INIT_OF_VARS -DHAVE_purify -DMYSQL_SERVER_SUFFIX=-valgrind-max"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs"

Build-tools/Do-compile

+27 −10
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ use Sys::Hostname; 
@config_options= ();

@make_options= ();



$opt_distribution=$opt_user=$opt_config_env="";

$opt_distribution=$opt_user=$opt_config_env=$opt_config_extra_env="";

$opt_dbd_options=$opt_perl_options=$opt_config_options=$opt_make_options=$opt_suffix="";

$opt_tmp=$opt_version_suffix="";

$opt_help=$opt_delete=$opt_debug=$opt_stage=$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_use_old_distribution=$opt_enable_shared=$opt_no_crash_me=$opt_no_strip=$opt_with_debug=$opt_no_benchmark=$opt_no_mysqltest=$opt_without_embedded=0;
@@ -17,6 +17,7 @@ GetOptions( 
	"bdb",

	"build-thread=i",

	"config-env=s" => \@config_env,

	"config-extra-env=s" => \@config_extra_env,

	"config-options=s" => \@config_options,

	"dbd-options=s",

	"debug",
@@ -79,6 +80,12 @@ if (@config_env > 0) 
	$opt_config_env= join(" ", @config_env);

}



if (@config_extra_env > 0)

{

	chomp(@config_extra_env);

	$opt_config_extra_env= join(" ", @config_extra_env);

}



$host= hostname();

chomp($uname=`uname`);

$full_host_name=$host;
@@ -89,6 +96,7 @@ $email="$opt_user\@mysql.com"; 
chomp($pwd = `pwd`);

$VER= basename($opt_distribution);

$VER=~ /mysql.*-([1-9]\.[0-9]{1,2}\.[0-9]{1,2}.*)\.tar*/; $version=$1;

$release="";			# Shut up perl

($major, $minor, $release) = split(/\./,$version);

$log="$pwd/Logs/$host-$major.$minor$opt_version_suffix.log";

$opt_distribution =~ /(mysql[^\/]*)\.tar/;
@@ -111,6 +119,8 @@ if (defined($gcc_version) && ! $opt_config_env) 
  }

}



$opt_config_env.=" $opt_config_extra_env";



$new_opt_tmp=0;

if ($opt_tmp)

{
@@ -154,6 +164,9 @@ select STDOUT; 
$|=1;



info("Compiling MySQL$opt_version_suffix at $host$opt_suffix, stage: $opt_stage\n");

info("LD_LIBRARY_PATH is $ENV{LD_LIBRARY_PATH}");

info("PATH is $ENV{PATH}");



log_timestamp();



if (-x "$host/bin/mysqladmin")
@@ -443,7 +456,7 @@ exit 0; 
sub usage

{

print <<EOF;

$0  version 1.5

$0  version 1.6



$0 takes the following options:
@@ -453,6 +466,10 @@ Compile with support for Berkeley DB tables 
--config-env <environment for configure>

To set up the environment, like 'CC=cc CXX=gcc CXXFLAGS=-O3'



--config-extra-env <environment for configure>

Additional flags for environment (not CC or CXX). Should be used when one

wants Do-compile to propose proper CC and CXX flags.



--config-options <options>

To add some extra options to configure (e.g. '--with-perl=yes')

Makefile.am

+1 −2
Original line number Diff line number Diff line
@@ -23,10 +23,9 @@ EXTRA_DIST = INSTALL-SOURCE README COPYING 
SUBDIRS =		. include @docs_dirs@ @readline_dir@ \

			@thread_dirs@ pstack @sql_client_dirs@ \

			@sql_server_dirs@ scripts man tests \

			BUILD @netware_dir@ os2 @libmysqld_dirs@ \

			BUILD netware os2 @libmysqld_dirs@ \

			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@





# Relink after clean

linked_sources = linked_client_sources linked_server_sources \

		 linked_libmysql_sources linked_libmysql_r_sources \

VC++Files/bdb/bdb.dsp

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ LIB32=xilink6.exe -lib 
# PROP Target_Dir ""

# ADD BASE CPP /nologo /G6 /MTd /W3 /Z7 /Od /Gf /I "../bdb/build_win32" /I "../bdb/include" /D "__WIN32__" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "_WINDOWS" /FD /c

# SUBTRACT BASE CPP /Fr

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../bdb/include" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /D MYSQL_SERVER_SUFFIX_MAX /Fo"max/" /Fd"max/" /FD /c

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../bdb/include" /D "NDEBUG" /D "DBUG_OFF" /D "_WINDOWS" /D MYSQL_SERVER_SUFFIX=-max /Fo"max/" /Fd"max/" /FD /c

# ADD BASE RSC /l 0x409 /d "_DEBUG"

# ADD RSC /l 0x409 /d "_DEBUG"

BSC32=bscmake.exe

VC++Files/client/mysql.dsp

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ LINK32=xilink6.exe 
# PROP Target_Dir ""

# ADD BASE CPP /nologo /G6 /MT /W3 /WX /O2 /I "../include" /I "../" /D "DBUG_OFF" /D "_CONSOLE" /D "_MBCS" /D "_WINDOWS" /D "NDEBUG" /FD /c

# SUBTRACT BASE CPP /YX

# ADD CPP /nologo /G6 /MT /W3 /WX /O2 /I "../include" /I "../" /D "_CONSOLE" /D "_WINDOWS" /D "MYSQL_COMMERCIAL_LICENSE" /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD /c

# ADD CPP /nologo /G6 /MT /W3 /WX /O2 /I "../include" /I "../" /D "_CONSOLE" /D "_WINDOWS" /D LICENSE=Commercial /D "DBUG_OFF" /D "_MBCS" /D "NDEBUG" /FD /c

# SUBTRACT CPP /YX

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"