database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca

Browse Source 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
This commit is contained in:
kent@mysql.com
2005-06-10 21:31:39 +02:00
parent a822c1ffed a2073df284
commit 00ddd2c700
4 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/lib/mtr_cases.pl
View File

@ -171,8 +171,8 @@ sub collect_one_test_case($$$$$) {
my $slave_sh= "$testdir/$tname-slave.sh"; my $slave_sh= "$testdir/$tname-slave.sh";
my $disabled= "$testdir/$tname.disabled"; my $disabled= "$testdir/$tname.disabled";
$tinfo->{'master_opt'}= []; $tinfo->{'master_opt'}= ["--default-time-zone=+3:00"];
$tinfo->{'slave_opt'}= []; $tinfo->{'slave_opt'}= ["--default-time-zone=+3:00"];
$tinfo->{'slave_mi'}= []; $tinfo->{'slave_mi'}= [];
if ( -f $master_opt_file ) if ( -f $master_opt_file )
@ -180,9 +180,9 @@ sub collect_one_test_case($$$$$) {
$tinfo->{'master_restart'}= 1; # We think so for now $tinfo->{'master_restart'}= 1; # We think so for now
# This is a dirty hack from old mysql-test-run, we use the opt file # This is a dirty hack from old mysql-test-run, we use the opt file
# to flag other things as well, it is not a opt list at all # to flag other things as well, it is not a opt list at all
my $extra_master_opt= mtr_get_opts_from_file($master_opt_file); $tinfo->{'master_opt'}= mtr_get_opts_from_file($master_opt_file);
foreach my $opt (@$extra_master_opt) foreach my $opt (@{$tinfo->{'master_opt'}})
{ {
my $value; my $value;
@ -191,7 +191,7 @@ sub collect_one_test_case($$$$$) {
if ( defined $value ) if ( defined $value )
{ {
$tinfo->{'timezone'}= $value; $tinfo->{'timezone'}= $value;
$extra_master_opt= []; $tinfo->{'master_opt'}= [];
$tinfo->{'master_restart'}= 0; $tinfo->{'master_restart'}= 0;
last; last;
} }
@ -206,13 +206,11 @@ sub collect_one_test_case($$$$$) {
{ {
$tinfo->{'result_file'}.= $::opt_result_ext; $tinfo->{'result_file'}.= $::opt_result_ext;
} }
$extra_master_opt= []; $tinfo->{'master_opt'}= [];
$tinfo->{'master_restart'}= 0; $tinfo->{'master_restart'}= 0;
last; last;
} }
} }
$tinfo->{'master_opt'}= $extra_master_opt;
} }
if ( -f $slave_opt_file ) if ( -f $slave_opt_file )

2
mysql-test/lib/mtr_process.pl
View File

@ -669,6 +669,8 @@ sub mtr_mysqladmin_shutdown () {
last; # If we got here, we are done last; # If we got here, we are done
} }
sleep(5) if $::glob_win32; # FIXME next startup fails if no sleep
return $res; return $res;
} }

18
mysql-test/mysql-test-run.pl
View File

@ -204,7 +204,7 @@ our $opt_bench= 0;
our $opt_small_bench= 0; our $opt_small_bench= 0;
our $opt_big_test= 0; # Send --big-test to mysqltest our $opt_big_test= 0; # Send --big-test to mysqltest
our $opt_extra_mysqld_opt; # FIXME not handled our @opt_extra_mysqld_opt;
our $opt_compress; our $opt_compress;
our $opt_current_test; our $opt_current_test;
@ -500,7 +500,7 @@ sub command_line_setup () {
'record' => \$opt_record, 'record' => \$opt_record,
# ??? # ???
'mysqld=s' => \$opt_extra_mysqld_opt, 'mysqld=s' => \@opt_extra_mysqld_opt,
# Run test on running server # Run test on running server
'extern' => \$opt_extern, 'extern' => \$opt_extern,
@ -953,13 +953,25 @@ sub environment_setup () {
$ENV{'LC_COLLATE'}= "C"; $ENV{'LC_COLLATE'}= "C";
$ENV{'USE_RUNNING_SERVER'}= $glob_use_running_server; $ENV{'USE_RUNNING_SERVER'}= $glob_use_running_server;
$ENV{'MYSQL_TEST_DIR'}= $glob_mysql_test_dir; $ENV{'MYSQL_TEST_DIR'}= $glob_mysql_test_dir;
$ENV{'MYSQL_TEST_WINDIR'}= $glob_mysql_test_dir;
$ENV{'MASTER_MYSOCK'}= $master->[0]->{'path_mysock'}; $ENV{'MASTER_MYSOCK'}= $master->[0]->{'path_mysock'};
$ENV{'MASTER_WINMYSOCK'}= $master->[0]->{'path_mysock'};
$ENV{'MASTER_MYSOCK1'}= $master->[1]->{'path_mysock'}; $ENV{'MASTER_MYSOCK1'}= $master->[1]->{'path_mysock'};
$ENV{'MASTER_MYPORT'}= $master->[0]->{'path_myport'}; $ENV{'MASTER_MYPORT'}= $master->[0]->{'path_myport'};
$ENV{'MASTER_MYPORT1'}= $master->[1]->{'path_myport'}; $ENV{'MASTER_MYPORT1'}= $master->[1]->{'path_myport'};
$ENV{'SLAVE_MYPORT'}= $slave->[0]->{'path_myport'}; $ENV{'SLAVE_MYPORT'}= $slave->[0]->{'path_myport'};
# $ENV{'MYSQL_TCP_PORT'}= '@MYSQL_TCP_PORT@'; # FIXME # $ENV{'MYSQL_TCP_PORT'}= '@MYSQL_TCP_PORT@'; # FIXME
$ENV{'MYSQL_TCP_PORT'}= 3306; $ENV{'MYSQL_TCP_PORT'}= 3306;
if ( $glob_cygwin_perl )
{
foreach my $key ('MYSQL_TEST_WINDIR','MASTER_MYSOCK')
{
$ENV{$key}= `cygpath -w $ENV{$key}`;
$ENV{$key} =~ s,\\,\\\\,g;
chomp($ENV{$key});
}
}
} }
@ -1850,7 +1862,7 @@ sub mysqld_arguments ($$$$$) {
} }
} }
foreach my $arg ( @$extra_opt ) foreach my $arg ( @opt_extra_mysqld_opt, @$extra_opt )
{ {
mtr_add_arg($args, "%s%s", $prefix, $arg); mtr_add_arg($args, "%s%s", $prefix, $arg);
} }

3
mysql-test/mysql-test-run.sh
View File

@ -170,7 +170,8 @@ cd ..
BASEDIR=`pwd` BASEDIR=`pwd`
cd $CWD cd $CWD
MYSQL_TEST_DIR=$BASEDIR/mysql-test MYSQL_TEST_DIR=$BASEDIR/mysql-test
export MYSQL_TEST_DIR MYSQL_TEST_WINDIR=$MYSQL_TEST_DIR
export MYSQL_TEST_DIR MYSQL_TEST_WINDIR
STD_DATA=$MYSQL_TEST_DIR/std_data STD_DATA=$MYSQL_TEST_DIR/std_data
hostname=`hostname` # Installed in the mysql privilege table hostname=`hostname` # Installed in the mysql privilege table