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/mysql-4.1-maint

Browse Source 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
This commit is contained in:
unknown
2006-10-11 21:56:09 +02:00
parent 576fd5a5ee d6d4692372
commit e5c2eda470
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/mysqltest.c
View File

@ -1433,7 +1433,7 @@ void do_source(struct st_command *command)
#ifdef __WIN__ #ifdef __WIN__
/* Variables used for temuprary sh files used for emulating Unix on Windows */ /* Variables used for temporary sh files used for emulating Unix on Windows */
char tmp_sh_name[64], tmp_sh_cmd[70]; char tmp_sh_name[64], tmp_sh_cmd[70];
void init_tmp_sh_file() void init_tmp_sh_file()

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

@ -1418,7 +1418,7 @@ sub executable_setup () {
{ {
$exe_mysql_client_test= $exe_mysql_client_test=
mtr_exe_exists("$glob_basedir/libmysqld/examples/mysql_client_test_embedded", mtr_exe_exists("$glob_basedir/libmysqld/examples/mysql_client_test_embedded",
"$glob_basedir/tests/mysqltest_embedded"); "$path_client_bindir/mysql_client_test_embedded");
} }
else else
{ {
@ -3107,7 +3107,7 @@ sub mysqld_arguments ($$$$$) {
$prefix= "--server-arg="; $prefix= "--server-arg=";
} else { } else {
# We can't pass embedded server --no-defaults # We can't pass embedded server --no-defaults
mtr_add_arg($args, "%s--no-defaults", $prefix); mtr_add_arg($args, "--no-defaults");
} }
mtr_add_arg($args, "%s--console", $prefix); mtr_add_arg($args, "%s--console", $prefix);
@ -3529,7 +3529,12 @@ sub run_testcase_need_master_restart($)
# We try to find out if we are to restart the master(s) # We try to find out if we are to restart the master(s)
my $do_restart= 0; # Assumes we don't have to my $do_restart= 0; # Assumes we don't have to
if ( $tinfo->{'master_sh'} ) if ( $glob_use_embedded_server )
{
mtr_verbose("Never start or restart for embedded server");
return $do_restart;
}
elsif ( $tinfo->{'master_sh'} )
{ {
$do_restart= 1; # Always restart if script to run $do_restart= 1; # Always restart if script to run
mtr_verbose("Restart master: Always restart if script to run"); mtr_verbose("Restart master: Always restart if script to run");
@ -3591,7 +3596,12 @@ sub run_testcase_need_slave_restart($)
# We try to find out if we are to restart the slaves # We try to find out if we are to restart the slaves
my $do_slave_restart= 0; # Assumes we don't have to my $do_slave_restart= 0; # Assumes we don't have to
if ( $max_slave_num == 0) if ( $glob_use_embedded_server )
{
mtr_verbose("Never start or restart for embedded server");
return $do_slave_restart;
}
elsif ( $max_slave_num == 0)
{ {
mtr_verbose("Skip slave restart: No testcase use slaves"); mtr_verbose("Skip slave restart: No testcase use slaves");
} }