mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 03:17:20 +02:00
Merge bk-internal:/home/bk/mysql-5.1-maint2
into shellback.(none):/home/msvensson/mysql/mysql-5.1-mtr mysql-test/mysql-test-run.pl: Auto merged
This commit is contained in:
commit
bd172e5044
2 changed files with 6 additions and 1 deletions
|
|
@ -971,7 +971,7 @@ sub envsubst {
|
|||
|
||||
if ( ! defined $ENV{$string} )
|
||||
{
|
||||
mtr_error("opt file referense \$$string that is unknown");
|
||||
mtr_error(".opt file references '$string' which is not set");
|
||||
}
|
||||
|
||||
return $ENV{$string};
|
||||
|
|
|
|||
|
|
@ -388,6 +388,11 @@ sub command_line_setup {
|
|||
|
||||
usage("") if $opt_usage;
|
||||
|
||||
# --------------------------------------------------------------------------
|
||||
# Check mtr_build_thread and calculate baseport
|
||||
# --------------------------------------------------------------------------
|
||||
set_mtr_build_thread_ports($opt_mtr_build_thread);
|
||||
|
||||
if ( -d "../sql" )
|
||||
{
|
||||
$source_dist= 1;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue