Commit 8fc6d351 authored by tim@threads.polyesthetic.msg's avatar tim@threads.polyesthetic.msg
Browse files

Merge work:/home/bk/mysql-4.0 

into threads.polyesthetic.msg:/usr/local/src/my/4
parents e582fef3 e8fd84c4

.bzrignore

+35 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ Docs/manual_toc.html 
Docs/my_sys.doc

Docs/mysql.info

INSTALL-SOURCE

Logs/*

MIRRORS

Makefile

Makefile.in
@@ -64,7 +65,33 @@ bdb/build_unix/* 
bdb/build_vxworks/db.h

bdb/build_vxworks/db_int.h

bdb/build_win32/db.h

bdb/build_win32/db_archive.dsp

bdb/build_win32/db_checkpoint.dsp

bdb/build_win32/db_deadlock.dsp

bdb/build_win32/db_dll.dsp

bdb/build_win32/db_dump.dsp

bdb/build_win32/db_int.h

bdb/build_win32/db_java.dsp

bdb/build_win32/db_load.dsp

bdb/build_win32/db_printlog.dsp

bdb/build_win32/db_recover.dsp

bdb/build_win32/db_stat.dsp

bdb/build_win32/db_static.dsp

bdb/build_win32/db_tcl.dsp

bdb/build_win32/db_upgrade.dsp

bdb/build_win32/db_verify.dsp

bdb/build_win32/ex_access.dsp

bdb/build_win32/ex_btrec.dsp

bdb/build_win32/ex_env.dsp

bdb/build_win32/ex_lock.dsp

bdb/build_win32/ex_mpool.dsp

bdb/build_win32/ex_tpcb.dsp

bdb/build_win32/excxx_access.dsp

bdb/build_win32/excxx_btrec.dsp

bdb/build_win32/excxx_env.dsp

bdb/build_win32/excxx_lock.dsp

bdb/build_win32/excxx_mpool.dsp

bdb/build_win32/excxx_tpcb.dsp

bdb/build_win32/include.tcl

bdb/build_win32/libdb.rc

bdb/db/crdel_auto.c
@@ -72,6 +99,8 @@ bdb/db/db_auto.c 
bdb/dist/config.hin

bdb/dist/configure

bdb/dist/tags

bdb/dist/template/db_server_proc

bdb/dist/template/gen_client_ret

bdb/dist/template/rec_btree

bdb/dist/template/rec_crdel

bdb/dist/template/rec_db
@@ -85,6 +114,8 @@ bdb/include/btree_auto.h 
bdb/include/crdel_auto.h

bdb/include/db_auto.h

bdb/include/db_server.h

bdb/include/gen_client_ext.h

bdb/include/gen_server_ext.h

bdb/include/hash_auto.h

bdb/include/log_auto.h

bdb/include/qam_auto.h
@@ -94,11 +125,15 @@ bdb/log/log_auto.c 
bdb/qam/qam_auto.c

bdb/rpc_client/db_server_clnt.c

bdb/rpc_client/gen_client.c

bdb/rpc_server/db_server.x

bdb/rpc_server/db_server_proc.sed

bdb/rpc_server/db_server_svc.c

bdb/rpc_server/db_server_xdr.c

bdb/rpc_server/gen_db_server.c

bdb/test/include.tcl

bdb/test/logtrack.list

bdb/txn/txn_auto.c

binary/*

client/insert_test

client/mysql

client/mysqladmin

BitKeeper/etc/logging_ok

+4 −0
Original line number Diff line number Diff line
@@ -5,7 +5,11 @@ jcole@main.burghcom.com 
jcole@tetra.spaceapes.com

monty@donna.mysql.fi

monty@work.mysql.com

mwagner@evoq.mwagner.org

paul@central.snake.net

root@x3.internalnet

sasha@mysql.sashanet.com

serg@serg.mysql.com

tim@threads.polyesthetic.msg

tim@work.mysql.com

tonu@x3.internalnet

Build-tools/Do-compile

+67 −22
Original line number Diff line number Diff line
@@ -3,22 +3,29 @@ 
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="";

$opt_help=$opt_Information=$opt_no_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=0;

GetOptions("Information","help","distribution=s","user=s","result=s","no-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") || usage();

$opt_tmp=$version_suffix="";

$opt_help=$opt_Information=$opt_no_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=0;

$opt_innodb=$opt_bdb=0;



GetOptions("Information","help","distribution=s","user=s","result=s","no-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") || usage();



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

usage() if (!$opt_distribution);



if ($opt_innodb || $opt_bdb)

{

  $version_suffix="-max";

}



chomp($host=`hostname`);

$full_host_name=$host;

print "$host: Compiling MySQL at $host$suffix, stage: $opt_stage\n"  if ($opt_debug);

print "$host: Compiling MySQL$version_suffix at $host$suffix, stage: $opt_stage\n"  if ($opt_debug);

$connect_option= ($opt_tcpip ? "--host=$host" : "");

$host =~ /^([^.-]*)/;

$host=$1 . $opt_suffix;

$email="$opt_user\@mysql.com";

$pwd = `pwd`; chomp($pwd);

$log="$pwd/Logs/$host.log";

$log="$pwd/Logs/$host$version_suffix.log";

$opt_distribution =~ /(mysql-[^\/]*)\.tar/;

$ver=$1;

$gcc_version=which("gcc");
@@ -72,13 +79,16 @@ if ($opt_stage == 0) 
    log_system("$host/bin/mysqladmin --no-defaults -u root -P 9306 -h $host -s shutdown");

    log_system("$host/bin/mysqladmin --no-defaults -u root -P 9307 -h $host -s shutdown");

  }

  if (!$opt_use_old_distribution)

  {

    system("mkdir $host") if (! -d $host);

  system("mkdir $bench_tmpdir") if (! -d $bench_tmpdir);

    system("touch $host/mysql-fix-for-glob");

    rm_all(<$host/mysql-*>);

    system("mkdir $host/bin") if (! -d "$host/bin");

  }

  system("mkdir $bench_tmpdir") if (! -d $bench_tmpdir);

  rm_all("$host/test");

  system("mkdir $host/test") if (! -d "$host/test");

  system("mkdir $host/bin") if (! -d "$host/bin");

  system("mkdir Logs") if (! -d "Logs");

  system("mv $log ${log}-old") if (-f $log);

  unlink($log);
@@ -91,7 +101,7 @@ select STDOUT; 
$|=1;



safe_cd("$host");

if ($opt_stage == 0)

if ($opt_stage == 0 && ! $opt_use_old_distribution)

{

  safe_system("gunzip < $opt_distribution | $tar xf -");

}
@@ -100,6 +110,7 @@ if ($opt_stage <= 1) 
{

  $opt_config_options.=" --with-low-memory" if ($opt_with_low_memory);

  unlink("config.cache");

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

  if ($opt_static_server)

  {

    $opt_config_options.=" --with-mysqld-ldflags=-all-static";
@@ -109,7 +120,15 @@ if ($opt_stage <= 1) 
    $opt_config_options.=" --with-client-ldflags=-all-static";

  }

  $opt_config_options.= " --disable-shared"; # Default for binary versions

  check_system("$opt_config_env ./configure --prefix=/usr/local/mysql \"--with-comment=Official MySQL binary\" --with-extra-charsets=complex $opt_config_options","Thank you for choosing MySQL");

  if ($opt_bdb)

  {

    $opt_config_options.= " --with-berkeley-db"

  }

  if ($opt_innodb)

  {

    $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\" $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");
@@ -118,7 +137,7 @@ if ($opt_stage <= 1) 


if ($opt_stage <= 2)

{

  unlink($opt_distribution) if (!$opt_no_delete);

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

  safe_system("$make");

}
@@ -140,19 +159,21 @@ if ($opt_stage <= 3) 
# Unpack and test the binary distrubtion

#



if ($opt_stage <= 4 && !$opt_no_test)

{

  rm_all(<$pwd/$host/test/*>);

  safe_cd("$pwd/$host/test");

$tar_file=<$pwd/$host/*.tar.gz>;

if (!defined($tar_file))

{

  $tar_file=<$pwd/$host/*.tgz>;

}

if ($opt_stage <= 4 && !$opt_no_test)

{

  rm_all(<$pwd/$host/test/*>);

  safe_cd("$pwd/$host/test");

  safe_system("gunzip < $tar_file | $tar xf -");

}



$test_dir=<$pwd/$host/test/$ver-*>;

$tar_file =~ /(mysql-[^\/]*)\.tar/;

$ver=$1;

$test_dir="$pwd/$host/test/$ver";



if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest)

{
@@ -164,12 +185,22 @@ if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest) 


if ($opt_stage <= 6 && !$opt_no_test)

{

  my $extra;

  safe_cd($test_dir);

  log_system("./bin/mysqladmin --no-defaults -u root -S $mysql_unix_port -s shutdown") || info("There was no mysqld running\n");

  sleep(2);

  log_system("rm -f  ./data/mysql/*");

  check_system("scripts/mysql_install_db --no-defaults --skip-locking","https://order");

  safe_system("./bin/mysqld --no-defaults --basedir . --datadir ./data --skip-locking >> $log 2>&1 &");

  $extra="";

  if ($opt_bdb)

  {

    $extra.=" -O bdb_cache_size=16M";

  }

  if ($opt_innodb)

  {

    $extra.=" --innodb_data_file_path=ibdata1:100M";

  }

  safe_system("./bin/mysqld --no-defaults --basedir . --datadir ./data --skip-locking $extra >> $log 2>&1 &");

  sleep(2);

}
@@ -219,6 +250,14 @@ if ($opt_stage <= 9 && !$opt_no_test) 
  log_system("rm -f output/*");

  $tmp= $opt_fast_benchmark ? "--fast --user root --small-test" : "";

  check_system("perl ./run-all-tests --log --die-on-errors $connect_option $tmp","RUN-mysql");

  if ($opt_bdb)

  {

    check_system("perl ./run-all-tests --log --suffix=\"_bdb\" --die-on-errors $connect_option $tmp --create-option=\"type=bdb\"","RUN-mysql");

  }

  if ($opt_innodb)

  {

    check_system("perl ./run-all-tests --log --suffix=\"_innodb\" --die-on-errors $connect_option $tmp --create-option=\"type=innodb\"","RUN-mysql");

  }

}



if ($opt_stage <= 10 && $opt_result)
@@ -240,13 +279,19 @@ exit 0; 
sub usage

{

print <<EOF;

$0  version 1.1

$0  version 1.2



$0 takes the following options:



--help or --Information

Show this help



--innodb

Compile with support for Innodb tables



--bdb

Compile with support for Berkeley DB tables



--user 'user_name'

Mail 'user_name'\@analytikerna.se if something went wrong.

If user is empty then no mail is sent.

Build-tools/Do-patch-file

+1 −1
Original line number Diff line number Diff line
@@ -40,5 +40,5 @@ chmod a+r,o-w $RESULT binary/* 
mv $RESULT $PATCH_DIR

cp binary/mysqlcom-* binary/mysql*win* /net/web/home/production/data/nweb/customer/Downloads

rm binary/mysqlcom-*

mv binary/*Max* $RESULT_DIR_MAX

mv binary/*Max* binary/*-max* $RESULT_DIR_MAX

cp binary/* $RESULT_DIR

Docs/manual.texi

+536 −202

File changed.

Preview size limit exceeded, changes collapsed.