mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge bk-internal:/home/bk/mysql-5.1-maint2
into shellback.(none):/home/msvensson/mysql/mysql-5.1-mtr
This commit is contained in:
@ -971,7 +971,7 @@ sub envsubst {
|
|||||||
|
|
||||||
if ( ! defined $ENV{$string} )
|
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};
|
return $ENV{$string};
|
||||||
|
@ -388,6 +388,11 @@ sub command_line_setup {
|
|||||||
|
|
||||||
usage("") if $opt_usage;
|
usage("") if $opt_usage;
|
||||||
|
|
||||||
|
# --------------------------------------------------------------------------
|
||||||
|
# Check mtr_build_thread and calculate baseport
|
||||||
|
# --------------------------------------------------------------------------
|
||||||
|
set_mtr_build_thread_ports($opt_mtr_build_thread);
|
||||||
|
|
||||||
if ( -d "../sql" )
|
if ( -d "../sql" )
|
||||||
{
|
{
|
||||||
$source_dist= 1;
|
$source_dist= 1;
|
||||||
|
Reference in New Issue
Block a user