diff options
| author | unknown <serg@serg.mylan> | 2004-07-20 00:53:24 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-07-20 00:53:24 +0200 |
| commit | eee5f15b92f71c74ce315932770a603e4deef477 (patch) | |
| tree | b39cfbb54d66b05cd075839aa58dc3215c8d4146 /Build-tools | |
| parent | d57d78ac10980e28344f285bdbc986fa3ee3496e (diff) | |
| parent | b940ae1012b00e74e2155c4e35ca7872bed278e3 (diff) | |
| download | mariadb-git-eee5f15b92f71c74ce315932770a603e4deef477.tar.gz | |
manual merged (blame me!)
Build-tools/Do-compile:
Auto merged
Docs/Makefile.am:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/include/lock0lock.h:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/include/sync0arr.h:
Auto merged
innobase/include/trx0trx.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/sync/sync0arr.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
mysql-test/r/innodb.result:
to be fixed after the merge
Diffstat (limited to 'Build-tools')
| -rwxr-xr-x | Build-tools/Do-compile | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile index f47ae794b00..e6e71582c74 100755 --- a/Build-tools/Do-compile +++ b/Build-tools/Do-compile @@ -171,6 +171,17 @@ info("PATH is $ENV{PATH}"); log_timestamp(); +$md5_result= safe_system("perl $ENV{HOME}/my_md5sum -c ${opt_distribution}.md5"); + +if ($md5_result != 0) +{ + abort("MD5 check failed for $opt_distribution!"); +} +else +{ + info("SUCCESS: MD5 checks for $opt_distribution"); +} + if (-x "$host/bin/mysqladmin") { log_system("$host/bin/mysqladmin $mysqladmin_args -S $mysql_unix_port -s shutdown"); @@ -204,17 +215,6 @@ if ($opt_stage == 0) safe_cd($host); if ($opt_stage == 0 && ! $opt_use_old_distribution) { - $md5_result= safe_system("./my_md5sum -c ${opt_distribution}.md5"); - - if ($md5_result != 0) - { - abort("MD5 failed for $opt_distribution!"); - } - else - { - info("SUCCESS: MD5 checks for $opt_distribution"); - } - safe_system("gunzip < $opt_distribution | $tar xf -"); # Fix file times; This is needed because the time for files may be @@ -343,7 +343,9 @@ $tar_file=<$pwd/$host/mysql*.t*gz>; abort ("Could not find tarball!") unless ($tar_file); # Generate the MD5 for the binary distribution -safe_system("./my_md5sum $tar_file > ${tar_file}.md5}"); +$tar_file=~ /(mysql[^\/]*)\.(tar\.gz|tgz)/; +$tar_file_lite= "$1.$2"; +system("cd $pwd/$host; perl $ENV{HOME}/my_md5sum $tar_file_lite > ${tar_file_lite}.md5"); # # Unpack the binary distribution |