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

Merge shellback.(none):/home/msvensson/mysql/work/my50-work

Browse Source 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
This commit is contained in:
msvensson@shellback.(none)
2006-09-19 19:11:41 +02:00
parent 1515818276 883a3809c9
commit d3d7c74954
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1720,14 +1720,15 @@ sub initialize_servers () {
sub mysql_install_db () { sub mysql_install_db () {
# FIXME not exactly true I think, needs improvements # FIXME not exactly true I think, needs improvements
install_db('master', $master->[0]->{'path_myddir'}); install_db('master1', $master->[0]->{'path_myddir'});
install_db('master', $master->[1]->{'path_myddir'});
install_db('master2', $master->[1]->{'path_myddir'});
if ( $use_slaves ) if ( $use_slaves )
{ {
install_db('slave', $slave->[0]->{'path_myddir'}); install_db('slave1', $slave->[0]->{'path_myddir'});
install_db('slave', $slave->[1]->{'path_myddir'}); install_db('slave2', $slave->[1]->{'path_myddir'});
install_db('slave', $slave->[2]->{'path_myddir'}); install_db('slave3', $slave->[2]->{'path_myddir'});
} }
if ( ! $opt_skip_im ) if ( ! $opt_skip_im )
@ -1803,6 +1804,12 @@ sub install_db ($$) {
mtr_add_arg($args, "--skip-ndbcluster"); mtr_add_arg($args, "--skip-ndbcluster");
mtr_add_arg($args, "--skip-bdb"); mtr_add_arg($args, "--skip-bdb");
if ( $opt_debug )
{
mtr_add_arg($args, "--debug=d:t:i:A,%s/log/bootstrap_%s.trace",
$opt_vardir_trace, $type);
}
if ( ! $opt_netware ) if ( ! $opt_netware )
{ {
mtr_add_arg($args, "--language=%s", $path_language); mtr_add_arg($args, "--language=%s", $path_language);
@ -2399,7 +2406,7 @@ sub do_before_start_slave ($$) {
sub mysqld_arguments ($$$$$$) { sub mysqld_arguments ($$$$$$) {
my $args= shift; my $args= shift;
my $type= shift; # master/slave/bootstrap my $type= shift; # master/slave
my $idx= shift; my $idx= shift;
my $extra_opt= shift; my $extra_opt= shift;
my $slave_master_info= shift; my $slave_master_info= shift;
@ -2628,7 +2635,7 @@ sub mysqld_arguments ($$$$$$) {
############################################################################## ##############################################################################
sub mysqld_start ($$$$$) { sub mysqld_start ($$$$$) {
my $type= shift; # master/slave/bootstrap my $type= shift; # master/slave
my $idx= shift; my $idx= shift;
my $extra_opt= shift; my $extra_opt= shift;
my $slave_master_info= shift; my $slave_master_info= shift;
@ -2649,7 +2656,7 @@ sub mysqld_start ($$$$$) {
} }
else else
{ {
$exe= $exe_mysqld; mtr_error("Unknown 'type' passed to mysqld_start");
} }
mtr_init_args(\$args); mtr_init_args(\$args);