diff options
| author | unknown <lenz@mysql.com> | 2005-03-18 00:30:20 +0100 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2005-03-18 00:30:20 +0100 |
| commit | 116f1f646b304517ba269caf6f3faeff309b4144 (patch) | |
| tree | dff49b265ce486f35464ca07eefa54163dfa2ca2 /Build-tools | |
| parent | 63a2b47db7fb9c7409e667c42aea38745800a3bf (diff) | |
| download | mariadb-git-116f1f646b304517ba269caf6f3faeff309b4144.tar.gz | |
- fixed two merge errors
Diffstat (limited to 'Build-tools')
| -rwxr-xr-x | Build-tools/Do-compile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile index 346c1958979..2dd7f3d4826 100755 --- a/Build-tools/Do-compile +++ b/Build-tools/Do-compile @@ -377,8 +377,8 @@ system("cd $pwd/$host; perl $ENV{HOME}/my_md5sum $tar_file_lite > ${tar_file_lit # # Unpack the binary distribution # -if ($opt_stage <= 4 && !$opt_no_test) $global_step= "extract binary distribution"; +if ($opt_stage <= 4 && !$opt_no_test) { log_timestamp("START"); rm_all(<$pwd/$host/test/*>); @@ -396,8 +396,8 @@ $ENV{"LD_LIBRARY_PATH"}= ("$test_dir/lib" . # # Run the test suite # -if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest) $global_step= "tests in default mode"; +if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest) { log_timestamp("START"); my $flags= ""; |