Loading .bzrignore +1 −0 Original line number Diff line number Diff line Loading @@ -460,3 +460,4 @@ vio/test-sslserver vio/viotest-ssl Docs/mysql.xml mysql-test/r/rpl000001.eval Docs/safe-mysql.xml BUILD/compile-pentium-debug-max +1 −1 Original line number Diff line number Diff line Loading @@ -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" extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-embedded-server --with-openssl --enable-local-infile" . "$path/FINISH.sh" BitKeeper/etc/logging_ok +3 −0 Original line number Diff line number Diff line Loading @@ -8,6 +8,7 @@ arjen@co3064164-a.bitbike.com bell@sanja.is.com.ua davida@isil.mysql.com heikki@donna.mysql.fi heikki@hundin.mysql.fi jani@hynda.mysql.fi jani@janikt.pp.saunalahti.fi jani@rhols221.adsl.netsonic.fi Loading @@ -15,6 +16,7 @@ jcole@abel.spaceapes.com jcole@main.burghcom.com jcole@sarvik.tfr.cafe.ee jcole@tetra.spaceapes.com jorge@linux.jorge.mysql.com kaj@work.mysql.com miguel@light.local monty@bitch.mysql.fi Loading Loading @@ -43,3 +45,4 @@ tonu@volk.internalnet tonu@x153.internalnet tonu@x3.internalnet venu@work.mysql.com zak@linux.local Build-tools/Do-all-build-steps +1 −0 Original line number Diff line number Diff line Loading @@ -63,6 +63,7 @@ aclocal; autoheader; aclocal; automake; autoconf --with-low-memory \ --with-mit-threads=yes $EXTRA_CONFIG \ --enable-thread-safe-client \ --enable-local-infile \ --with-berkeley-db \ --with-innodb \ --with-vio \ Loading Build-tools/Do-compile +17 −11 Original line number Diff line number Diff line Loading @@ -3,30 +3,30 @@ 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_tmp=$opt_version_suffix=""; $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","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","version-suffix=s") || usage(); usage() if ($opt_help || $opt_Information); usage() if (!$opt_distribution); if ($opt_innodb || $opt_bdb) if (($opt_innodb || $opt_bdb) && $opt_version_suffix eq "") { $version_suffix="-max"; $opt_version_suffix="-max"; } chomp($host=`hostname`); $full_host_name=$host; info("Compiling MySQL$version_suffix at $host$suffix, stage: $opt_stage\n"); info("Compiling MySQL$opt_version_suffix at $host$suffix, stage: $opt_stage\n"); $connect_option= ($opt_tcpip ? "--host=$host" : ""); $host =~ /^([^.-]*)/; $host=$1 . $opt_suffix; $email="$opt_user\@mysql.com"; $pwd = `pwd`; chomp($pwd); $log="$pwd/Logs/$host$version_suffix.log"; $opt_distribution =~ /(mysql-[^\/]*)\.tar/; $log="$pwd/Logs/$host$opt_version_suffix.log"; $opt_distribution =~ /(mysql[^\/]*)\.tar/; $ver=$1; $gcc_version=which("gcc"); if (defined($gcc_version) && ! $opt_config_env) Loading Loading @@ -108,7 +108,7 @@ $|=1; select STDOUT; $|=1; safe_cd("$host"); safe_cd($host); if ($opt_stage == 0 && ! $opt_use_old_distribution) { safe_system("gunzip < $opt_distribution | $tar xf -"); Loading @@ -118,6 +118,7 @@ if ($opt_stage == 0 && ! $opt_use_old_distribution) system("touch timestamp; find . -newer timestamp -print | xargs touch; rm -f timestamp"); sleep(2); # Ensure that files we don't want to rebuild are newer than other files safe_cd($ver); foreach $name ("configure", "Docs/include.texi", "Docs/*.html", "Docs/manual.txt", "Docs/mysql.info", Loading @@ -125,9 +126,11 @@ if ($opt_stage == 0 && ! $opt_use_old_distribution) { system("touch $name"); } # Fix some file modes in BDB tables that makes life harder. system("chmod -R u+rw ."); } safe_cd($ver); safe_cd("$pwd/$host/$ver"); if ($opt_stage <= 1) { $opt_config_options.=" --with-low-memory" if ($opt_with_low_memory); Loading Loading @@ -156,7 +159,7 @@ if ($opt_stage <= 1) { $opt_config_options.= " --with-innodb" } check_system("$opt_config_env ./configure --prefix=/usr/local/mysql \"--with-comment=Official MySQL$version_suffix binary\" --with-extra-charsets=complex \"--with-server-suffix=$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") { safe_system("cp -r $pwd/$host/include-mysql/* $pwd/$host/$ver/include"); Loading Loading @@ -209,7 +212,7 @@ if ($opt_stage <= 4 && !$opt_no_test) safe_system("gunzip < $tar_file | $tar xf -"); } $tar_file =~ /(mysql-[^\/]*)\.tar/; $tar_file =~ /(mysql[^\/]*)\.tar/; $ver=$1; $test_dir="$pwd/$host/test/$ver"; $ENV{"LD_LIBRARY_PATH"}= "$test_dir/lib:" . $ENV{"LD_LIBRARY_PATH"}; Loading Loading @@ -361,6 +364,9 @@ To set up the environment, like 'CC=cc CXX=gcc CXXFLAGS=-O3' --dbd-options 'options' Options for Makefile.PL when configuring msql-mysql-modules. --version-suffix suffix Can be used to set a suffix (normally 'com' or '-max') for a distribution --with-low-memory Use less memory when compiling. Loading Loading
.bzrignore +1 −0 Original line number Diff line number Diff line Loading @@ -460,3 +460,4 @@ vio/test-sslserver vio/viotest-ssl Docs/mysql.xml mysql-test/r/rpl000001.eval Docs/safe-mysql.xml
BUILD/compile-pentium-debug-max +1 −1 Original line number Diff line number Diff line Loading @@ -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" extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-embedded-server --with-openssl --enable-local-infile" . "$path/FINISH.sh"
BitKeeper/etc/logging_ok +3 −0 Original line number Diff line number Diff line Loading @@ -8,6 +8,7 @@ arjen@co3064164-a.bitbike.com bell@sanja.is.com.ua davida@isil.mysql.com heikki@donna.mysql.fi heikki@hundin.mysql.fi jani@hynda.mysql.fi jani@janikt.pp.saunalahti.fi jani@rhols221.adsl.netsonic.fi Loading @@ -15,6 +16,7 @@ jcole@abel.spaceapes.com jcole@main.burghcom.com jcole@sarvik.tfr.cafe.ee jcole@tetra.spaceapes.com jorge@linux.jorge.mysql.com kaj@work.mysql.com miguel@light.local monty@bitch.mysql.fi Loading Loading @@ -43,3 +45,4 @@ tonu@volk.internalnet tonu@x153.internalnet tonu@x3.internalnet venu@work.mysql.com zak@linux.local
Build-tools/Do-all-build-steps +1 −0 Original line number Diff line number Diff line Loading @@ -63,6 +63,7 @@ aclocal; autoheader; aclocal; automake; autoconf --with-low-memory \ --with-mit-threads=yes $EXTRA_CONFIG \ --enable-thread-safe-client \ --enable-local-infile \ --with-berkeley-db \ --with-innodb \ --with-vio \ Loading
Build-tools/Do-compile +17 −11 Original line number Diff line number Diff line Loading @@ -3,30 +3,30 @@ 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_tmp=$opt_version_suffix=""; $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","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","version-suffix=s") || usage(); usage() if ($opt_help || $opt_Information); usage() if (!$opt_distribution); if ($opt_innodb || $opt_bdb) if (($opt_innodb || $opt_bdb) && $opt_version_suffix eq "") { $version_suffix="-max"; $opt_version_suffix="-max"; } chomp($host=`hostname`); $full_host_name=$host; info("Compiling MySQL$version_suffix at $host$suffix, stage: $opt_stage\n"); info("Compiling MySQL$opt_version_suffix at $host$suffix, stage: $opt_stage\n"); $connect_option= ($opt_tcpip ? "--host=$host" : ""); $host =~ /^([^.-]*)/; $host=$1 . $opt_suffix; $email="$opt_user\@mysql.com"; $pwd = `pwd`; chomp($pwd); $log="$pwd/Logs/$host$version_suffix.log"; $opt_distribution =~ /(mysql-[^\/]*)\.tar/; $log="$pwd/Logs/$host$opt_version_suffix.log"; $opt_distribution =~ /(mysql[^\/]*)\.tar/; $ver=$1; $gcc_version=which("gcc"); if (defined($gcc_version) && ! $opt_config_env) Loading Loading @@ -108,7 +108,7 @@ $|=1; select STDOUT; $|=1; safe_cd("$host"); safe_cd($host); if ($opt_stage == 0 && ! $opt_use_old_distribution) { safe_system("gunzip < $opt_distribution | $tar xf -"); Loading @@ -118,6 +118,7 @@ if ($opt_stage == 0 && ! $opt_use_old_distribution) system("touch timestamp; find . -newer timestamp -print | xargs touch; rm -f timestamp"); sleep(2); # Ensure that files we don't want to rebuild are newer than other files safe_cd($ver); foreach $name ("configure", "Docs/include.texi", "Docs/*.html", "Docs/manual.txt", "Docs/mysql.info", Loading @@ -125,9 +126,11 @@ if ($opt_stage == 0 && ! $opt_use_old_distribution) { system("touch $name"); } # Fix some file modes in BDB tables that makes life harder. system("chmod -R u+rw ."); } safe_cd($ver); safe_cd("$pwd/$host/$ver"); if ($opt_stage <= 1) { $opt_config_options.=" --with-low-memory" if ($opt_with_low_memory); Loading Loading @@ -156,7 +159,7 @@ if ($opt_stage <= 1) { $opt_config_options.= " --with-innodb" } check_system("$opt_config_env ./configure --prefix=/usr/local/mysql \"--with-comment=Official MySQL$version_suffix binary\" --with-extra-charsets=complex \"--with-server-suffix=$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") { safe_system("cp -r $pwd/$host/include-mysql/* $pwd/$host/$ver/include"); Loading Loading @@ -209,7 +212,7 @@ if ($opt_stage <= 4 && !$opt_no_test) safe_system("gunzip < $tar_file | $tar xf -"); } $tar_file =~ /(mysql-[^\/]*)\.tar/; $tar_file =~ /(mysql[^\/]*)\.tar/; $ver=$1; $test_dir="$pwd/$host/test/$ver"; $ENV{"LD_LIBRARY_PATH"}= "$test_dir/lib:" . $ENV{"LD_LIBRARY_PATH"}; Loading Loading @@ -361,6 +364,9 @@ To set up the environment, like 'CC=cc CXX=gcc CXXFLAGS=-O3' --dbd-options 'options' Options for Makefile.PL when configuring msql-mysql-modules. --version-suffix suffix Can be used to set a suffix (normally 'com' or '-max') for a distribution --with-low-memory Use less memory when compiling. Loading