Skip to content

M
MariaDB
Commit ffb5d1d7 authored by unknown's avatar unknown
Browse files
Options

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/Users/kent/mysql/bk/mysql-4.1
parents 8963d671 154862a9
Show whitespace changes
Inline Side-by-side
Showing with 176 additions and 115 deletions
client/mysqltest.c
View file @ ffb5d1d7
...@@ -572,7 +572,7 @@ static void abort_not_supported_test() ...@@ -572,7 +572,7 @@ static void abort_not_supported_test()
printf("skipped\n"); printf("skipped\n");
free_used_memory(); free_used_memory();
my_end(MY_CHECK_ERROR); my_end(MY_CHECK_ERROR);
exit(2); exit(62);
} }
static void verbose_msg(const char* fmt, ...) static void verbose_msg(const char* fmt, ...)
...@@ -2597,6 +2597,8 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags) ...@@ -2597,6 +2597,8 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags)
if (!disable_result_log) if (!disable_result_log)
{ {
ulong affected_rows; /* Ok to be undef if 'disable_info' is set */
if (res) if (res)
{ {
MYSQL_FIELD *field= mysql_fetch_fields(res); MYSQL_FIELD *field= mysql_fetch_fields(res);
...@@ -2619,6 +2621,13 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags) ...@@ -2619,6 +2621,13 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags)
append_result(ds, res); append_result(ds, res);
} }
/*
Need to call mysql_affected_rows() before the new
query to find the warnings
*/
if (!disable_info)
affected_rows= (ulong)mysql_affected_rows(mysql);
/* Add all warnings to the result */ /* Add all warnings to the result */
if (!disable_warnings && mysql_warning_count(mysql)) if (!disable_warnings && mysql_warning_count(mysql))
{ {
...@@ -2641,7 +2650,7 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags) ...@@ -2641,7 +2650,7 @@ static int run_query_normal(MYSQL* mysql, struct st_query* q, int flags)
if (!disable_info) if (!disable_info)
{ {
char buf[40]; char buf[40];
sprintf(buf,"affected rows: %lu\n",(ulong) mysql_affected_rows(mysql)); sprintf(buf,"affected rows: %lu\n", affected_rows);
dynstr_append(ds, buf); dynstr_append(ds, buf);
if (mysql_info(mysql)) if (mysql_info(mysql))
{ {
...@@ -3522,6 +3531,12 @@ int main(int argc, char **argv) ...@@ -3522,6 +3531,12 @@ int main(int argc, char **argv)
if (q->query == q->query_buf) if (q->query == q->query_buf)
q->query += q->first_word_len + 1; q->query += q->first_word_len + 1;
display_result_vertically= (q->type==Q_QUERY_VERTICAL); display_result_vertically= (q->type==Q_QUERY_VERTICAL);
if (save_file[0])
{
strmov(q->record_file,save_file);
q->require_file=require_file;
save_file[0]=0;
}
error|= run_query(&cur_con->mysql, q, QUERY_REAP|QUERY_SEND); error|= run_query(&cur_con->mysql, q, QUERY_REAP|QUERY_SEND);
display_result_vertically= old_display_result_vertically; display_result_vertically= old_display_result_vertically;
break; break;
......
mysql-test/lib/init_db.sql
View file @ ffb5d1d7
USE mysql; use mysql;
set table_type=myisam;
CREATE TABLE db ( CREATE TABLE db (
Host char(60) binary DEFAULT '' NOT NULL, Host char(60) binary DEFAULT '' NOT NULL,
...@@ -193,7 +194,7 @@ INSERT INTO time_zone_name (Name, Time_Zone_id) VALUES ...@@ -193,7 +194,7 @@ INSERT INTO time_zone_name (Name, Time_Zone_id) VALUES
CREATE TABLE time_zone ( CREATE TABLE time_zone (
Time_zone_id int unsigned NOT NULL auto_increment, Time_zone_id int unsigned NOT NULL auto_increment,
Use_leap_seconds enum('Y','N') DEFAULT 'N' NOT NULL, Use_leap_seconds enum('Y','N') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,
PRIMARY KEY TzId (Time_zone_id) PRIMARY KEY TzId (Time_zone_id)
) engine=MyISAM ) engine=MyISAM
CHARACTER SET utf8 CHARACTER SET utf8
......
mysql-test/lib/mtr_process.pl
View file @ ffb5d1d7
...@@ -344,7 +344,7 @@ sub mtr_kill_leftovers () { ...@@ -344,7 +344,7 @@ sub mtr_kill_leftovers () {
# We scan the "var/run/" directory for other process id's to kill # We scan the "var/run/" directory for other process id's to kill
# FIXME $path_run_dir or something # FIXME $path_run_dir or something
my $rundir= "$::glob_mysql_test_dir/var/run"; my $rundir= "$::opt_vardir/run";
if ( -d $rundir ) if ( -d $rundir )
{ {
......
mysql-test/lib/mtr_report.pl
View file @ ffb5d1d7
...@@ -89,9 +89,10 @@ sub mtr_report_test_passed ($) { ...@@ -89,9 +89,10 @@ sub mtr_report_test_passed ($) {
my $tinfo= shift; my $tinfo= shift;
my $timer= ""; my $timer= "";
if ( $::opt_timer and -f "$::glob_mysql_test_dir/var/log/timer" ) if ( $::opt_timer and -f "$::opt_vardir/log/timer" )
{ {
$timer= mtr_fromfile("$::glob_mysql_test_dir/var/log/timer"); $timer= mtr_fromfile("$::opt_vardir/log/timer");
$::glob_tot_real_time += $timer;
$timer= sprintf "%12s", $timer; $timer= sprintf "%12s", $timer;
} }
$tinfo->{'result'}= 'MTR_RES_PASSED'; $tinfo->{'result'}= 'MTR_RES_PASSED';
...@@ -177,8 +178,8 @@ sub mtr_report_stats ($) { ...@@ -177,8 +178,8 @@ sub mtr_report_stats ($) {
# Report if there was any fatal warnings/errors in the log files # Report if there was any fatal warnings/errors in the log files
# #
unlink("$::glob_mysql_test_dir/var/log/warnings"); unlink("$::opt_vardir/log/warnings");
unlink("$::glob_mysql_test_dir/var/log/warnings.tmp"); unlink("$::opt_vardir/log/warnings.tmp");
# Remove some non fatal warnings from the log files # Remove some non fatal warnings from the log files
# FIXME what is going on ????? ;-) # FIXME what is going on ????? ;-)
...@@ -196,11 +197,11 @@ sub mtr_report_stats ($) { ...@@ -196,11 +197,11 @@ sub mtr_report_stats ($) {
# found_error=1 # found_error=1
# } # }
# done # done
# unlink("$::glob_mysql_test_dir/var/log/warnings.tmp"); # unlink("$::opt_vardir/log/warnings.tmp");
# if ( $found_error= "1" ) # if ( $found_error= "1" )
# { # {
# print "WARNING: Got errors/warnings while running tests. Please examine\n" # print "WARNING: Got errors/warnings while running tests. Please examine\n"
# print "$::glob_mysql_test_dir/var/log/warnings for details.\n" # print "$::opt_vardir/log/warnings for details.\n"
# } # }
# } # }
} }
......
mysql-test/mysql-test-run.pl
View file @ ffb5d1d7
...@@ -84,7 +84,7 @@ use Sys::Hostname; ...@@ -84,7 +84,7 @@ use Sys::Hostname;
#use Carp; #use Carp;
use IO::Socket; use IO::Socket;
use IO::Socket::INET; use IO::Socket::INET;
#use Data::Dumper; use Data::Dumper;
use strict; use strict;
#use diagnostics; #use diagnostics;
...@@ -177,6 +177,7 @@ our $path_timefile; ...@@ -177,6 +177,7 @@ our $path_timefile;
our $path_manager_log; # Used by mysqldadmin our $path_manager_log; # Used by mysqldadmin
our $path_slave_load_tmpdir; # What is this?! our $path_slave_load_tmpdir; # What is this?!
our $path_my_basedir; our $path_my_basedir;
our $opt_vardir; # A path but set directly on cmd line
our $opt_tmpdir; # A path but set directly on cmd line our $opt_tmpdir; # A path but set directly on cmd line
our $opt_usage; our $opt_usage;
...@@ -447,8 +448,6 @@ sub initial_setup () { ...@@ -447,8 +448,6 @@ sub initial_setup () {
$glob_basedir= dirname($glob_mysql_test_dir); $glob_basedir= dirname($glob_mysql_test_dir);
$glob_mysql_bench_dir= "$glob_basedir/mysql-bench"; # FIXME make configurable $glob_mysql_bench_dir= "$glob_basedir/mysql-bench"; # FIXME make configurable
$path_timefile= "$glob_mysql_test_dir/var/log/mysqltest-time";
# needs to be same length to test logging (FIXME what???) # needs to be same length to test logging (FIXME what???)
$path_slave_load_tmpdir= "../../var/tmp"; $path_slave_load_tmpdir= "../../var/tmp";
...@@ -469,11 +468,6 @@ sub command_line_setup () { ...@@ -469,11 +468,6 @@ sub command_line_setup () {
# These are defaults for things that are set on the command line # These are defaults for things that are set on the command line
$opt_suite= "main"; # Special default suite $opt_suite= "main"; # Special default suite
$opt_tmpdir= "$glob_mysql_test_dir/var/tmp";
# FIXME maybe unneded?
$path_manager_log= "$glob_mysql_test_dir/var/log/manager.log";
$opt_current_test= "$glob_mysql_test_dir/var/log/current_test";
my $opt_master_myport= 9306; my $opt_master_myport= 9306;
my $opt_slave_myport= 9308; my $opt_slave_myport= 9308;
$opt_ndbcluster_port= 9350; $opt_ndbcluster_port= 9350;
...@@ -549,6 +543,7 @@ sub command_line_setup () { ...@@ -549,6 +543,7 @@ sub command_line_setup () {
'unified-diff|udiff' => \$opt_udiff, 'unified-diff|udiff' => \$opt_udiff,
'user-test=s' => \$opt_user_test, 'user-test=s' => \$opt_user_test,
'user=s' => \$opt_user, 'user=s' => \$opt_user,
'vardir=s' => \$opt_vardir,
'verbose' => \$opt_verbose, 'verbose' => \$opt_verbose,
'wait-timeout=i' => \$opt_wait_timeout, 'wait-timeout=i' => \$opt_wait_timeout,
'warnings|log-warnings' => \$opt_warnings, 'warnings|log-warnings' => \$opt_warnings,
...@@ -564,51 +559,35 @@ sub command_line_setup () { ...@@ -564,51 +559,35 @@ sub command_line_setup () {
@opt_cases= @ARGV; @opt_cases= @ARGV;
# Put this into a hash, will be a C struct # --------------------------------------------------------------------------
# Set the "var/" directory, as it is the base for everything else
$master->[0]->{'path_myddir'}= "$glob_mysql_test_dir/var/master-data"; # --------------------------------------------------------------------------
$master->[0]->{'path_myerr'}= "$glob_mysql_test_dir/var/log/master.err";
$master->[0]->{'path_mylog'}= "$glob_mysql_test_dir/var/log/master.log";
$master->[0]->{'path_mypid'}= "$glob_mysql_test_dir/var/run/master.pid";
$master->[0]->{'path_mysock'}= "$opt_tmpdir/master.sock";
$master->[0]->{'path_myport'}= $opt_master_myport;
$master->[0]->{'start_timeout'}= 400; # enough time create innodb tables
$master->[0]->{'ndbcluster'}= 1; # ndbcluster not started
$master->[1]->{'path_myddir'}= "$glob_mysql_test_dir/var/master1-data"; if ( ! $opt_vardir )
$master->[1]->{'path_myerr'}= "$glob_mysql_test_dir/var/log/master1.err"; {
$master->[1]->{'path_mylog'}= "$glob_mysql_test_dir/var/log/master1.log"; $opt_vardir= "$glob_mysql_test_dir/var";
$master->[1]->{'path_mypid'}= "$glob_mysql_test_dir/var/run/master1.pid"; }
$master->[1]->{'path_mysock'}= "$opt_tmpdir/master1.sock";
$master->[1]->{'path_myport'}= $opt_master_myport + 1;
$master->[1]->{'start_timeout'}= 400; # enough time create innodb tables
$slave->[0]->{'path_myddir'}= "$glob_mysql_test_dir/var/slave-data"; if ( $opt_vardir !~ m,^/, )
$slave->[0]->{'path_myerr'}= "$glob_mysql_test_dir/var/log/slave.err"; {
$slave->[0]->{'path_mylog'}= "$glob_mysql_test_dir/var/log/slave.log"; # Make absolute path, relative test dir
$slave->[0]->{'path_mypid'}= "$glob_mysql_test_dir/var/run/slave.pid"; $opt_vardir= "$glob_mysql_test_dir/$opt_vardir";
$slave->[0]->{'path_mysock'}= "$opt_tmpdir/slave.sock"; }
$slave->[0]->{'path_myport'}= $opt_slave_myport;
$slave->[0]->{'start_timeout'}= 400;
$slave->[1]->{'path_myddir'}= "$glob_mysql_test_dir/var/slave1-data"; # --------------------------------------------------------------------------
$slave->[1]->{'path_myerr'}= "$glob_mysql_test_dir/var/log/slave1.err"; # If not set, set these to defaults
$slave->[1]->{'path_mylog'}= "$glob_mysql_test_dir/var/log/slave1.log"; # --------------------------------------------------------------------------
$slave->[1]->{'path_mypid'}= "$glob_mysql_test_dir/var/run/slave1.pid";
$slave->[1]->{'path_mysock'}= "$opt_tmpdir/slave1.sock";
$slave->[1]->{'path_myport'}= $opt_slave_myport + 1;
$slave->[1]->{'start_timeout'}= 300;
$slave->[2]->{'path_myddir'}= "$glob_mysql_test_dir/var/slave2-data"; $opt_tmpdir= "$opt_vardir/tmp" unless $opt_tmpdir;
$slave->[2]->{'path_myerr'}= "$glob_mysql_test_dir/var/log/slave2.err"; # FIXME maybe not needed?
$slave->[2]->{'path_mylog'}= "$glob_mysql_test_dir/var/log/slave2.log"; $path_manager_log= "$opt_vardir/log/manager.log"
$slave->[2]->{'path_mypid'}= "$glob_mysql_test_dir/var/run/slave2.pid"; unless $path_manager_log;
$slave->[2]->{'path_mysock'}= "$opt_tmpdir/slave2.sock"; $opt_current_test= "$opt_vardir/log/current_test"
$slave->[2]->{'path_myport'}= $opt_slave_myport + 2; unless $opt_current_test;
$slave->[2]->{'start_timeout'}= 300;
# --------------------------------------------------------------------------
# Do sanity checks of command line arguments # Do sanity checks of command line arguments
# --------------------------------------------------------------------------
if ( $opt_extern and $opt_local ) if ( $opt_extern and $opt_local )
{ {
...@@ -621,13 +600,6 @@ sub command_line_setup () { ...@@ -621,13 +600,6 @@ sub command_line_setup () {
$opt_socket= "/tmp/mysql.sock"; # FIXME $opt_socket= "/tmp/mysql.sock"; # FIXME
} }
if ( $opt_extern )
{
$glob_use_running_server= 1;
$opt_skip_rpl= 1; # We don't run rpl test cases
$master->[0]->{'path_mysock'}= $opt_socket;
}
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Look at the command line options and set script flags # Look at the command line options and set script flags
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
...@@ -746,6 +718,58 @@ sub command_line_setup () { ...@@ -746,6 +718,58 @@ sub command_line_setup () {
} }
} }
# Put this into a hash, will be a C struct
$master->[0]->{'path_myddir'}= "$opt_vardir/master-data";
$master->[0]->{'path_myerr'}= "$opt_vardir/log/master.err";
$master->[0]->{'path_mylog'}= "$opt_vardir/log/master.log";
$master->[0]->{'path_mypid'}= "$opt_vardir/run/master.pid";
$master->[0]->{'path_mysock'}= "$opt_tmpdir/master.sock";
$master->[0]->{'path_myport'}= $opt_master_myport;
$master->[0]->{'start_timeout'}= 400; # enough time create innodb tables
$master->[0]->{'ndbcluster'}= 1; # ndbcluster not started
$master->[1]->{'path_myddir'}= "$opt_vardir/master1-data";
$master->[1]->{'path_myerr'}= "$opt_vardir/log/master1.err";
$master->[1]->{'path_mylog'}= "$opt_vardir/log/master1.log";
$master->[1]->{'path_mypid'}= "$opt_vardir/run/master1.pid";
$master->[1]->{'path_mysock'}= "$opt_tmpdir/master1.sock";
$master->[1]->{'path_myport'}= $opt_master_myport + 1;
$master->[1]->{'start_timeout'}= 400; # enough time create innodb tables
$slave->[0]->{'path_myddir'}= "$opt_vardir/slave-data";
$slave->[0]->{'path_myerr'}= "$opt_vardir/log/slave.err";
$slave->[0]->{'path_mylog'}= "$opt_vardir/log/slave.log";
$slave->[0]->{'path_mypid'}= "$opt_vardir/run/slave.pid";
$slave->[0]->{'path_mysock'}= "$opt_tmpdir/slave.sock";
$slave->[0]->{'path_myport'}= $opt_slave_myport;
$slave->[0]->{'start_timeout'}= 400;
$slave->[1]->{'path_myddir'}= "$opt_vardir/slave1-data";
$slave->[1]->{'path_myerr'}= "$opt_vardir/log/slave1.err";
$slave->[1]->{'path_mylog'}= "$opt_vardir/log/slave1.log";
$slave->[1]->{'path_mypid'}= "$opt_vardir/run/slave1.pid";
$slave->[1]->{'path_mysock'}= "$opt_tmpdir/slave1.sock";
$slave->[1]->{'path_myport'}= $opt_slave_myport + 1;
$slave->[1]->{'start_timeout'}= 300;
$slave->[2]->{'path_myddir'}= "$opt_vardir/slave2-data";
$slave->[2]->{'path_myerr'}= "$opt_vardir/log/slave2.err";
$slave->[2]->{'path_mylog'}= "$opt_vardir/log/slave2.log";
$slave->[2]->{'path_mypid'}= "$opt_vardir/run/slave2.pid";
$slave->[2]->{'path_mysock'}= "$opt_tmpdir/slave2.sock";
$slave->[2]->{'path_myport'}= $opt_slave_myport + 2;
$slave->[2]->{'start_timeout'}= 300;
if ( $opt_extern )
{
$glob_use_running_server= 1;
$opt_skip_rpl= 1; # We don't run rpl test cases
$master->[0]->{'path_mysock'}= $opt_socket;
}
$path_timefile= "$opt_vardir/log/mysqltest-time";
} }
...@@ -892,8 +916,8 @@ sub executable_setup () { ...@@ -892,8 +916,8 @@ sub executable_setup () {
} }
$path_ndb_backup_dir= $path_ndb_backup_dir=
"$glob_mysql_test_dir/var/ndbcluster-$opt_ndbcluster_port"; "$opt_vardir/ndbcluster-$opt_ndbcluster_port";
$file_ndb_testrun_log= "$glob_mysql_test_dir/var/log/ndb_testrun.log"; $file_ndb_testrun_log= "$opt_vardir/log/ndb_testrun.log";
} }
...@@ -981,7 +1005,7 @@ sub kill_running_server () { ...@@ -981,7 +1005,7 @@ sub kill_running_server () {
# leftovers from previous runs. # leftovers from previous runs.
mtr_report("Killing Possible Leftover Processes"); mtr_report("Killing Possible Leftover Processes");
mkpath("$glob_mysql_test_dir/var/log"); # Needed for mysqladmin log mkpath("$opt_vardir/log"); # Needed for mysqladmin log
mtr_kill_leftovers(); mtr_kill_leftovers();
ndbcluster_stop(); ndbcluster_stop();
...@@ -995,15 +1019,20 @@ sub kill_and_cleanup () { ...@@ -995,15 +1019,20 @@ sub kill_and_cleanup () {
mtr_report("Removing Stale Files"); mtr_report("Removing Stale Files");
rmtree("$glob_mysql_test_dir/var/log"); if ( -l $opt_vardir and ! unlink($opt_vardir) )
rmtree("$glob_mysql_test_dir/var/ndbcluster-$opt_ndbcluster_port"); {
rmtree("$glob_mysql_test_dir/var/run"); mtr_error("Can't remove soft link \"$opt_vardir\"");
rmtree("$glob_mysql_test_dir/var/tmp"); }
rmtree("$opt_vardir/log");
rmtree("$opt_vardir/ndbcluster-$opt_ndbcluster_port");
rmtree("$opt_vardir/run");
rmtree("$opt_vardir/tmp");
mkpath("$glob_mysql_test_dir/var/log"); mkpath("$opt_vardir/log");
mkpath("$glob_mysql_test_dir/var/run"); mkpath("$opt_vardir/run");
mkpath("$glob_mysql_test_dir/var/tmp"); mkpath("$opt_vardir/tmp");
mkpath($opt_tmpdir); mkpath($opt_tmpdir) if $opt_tmpdir ne "$opt_vardir/tmp";
# FIXME do we really need to create these all, or are they # FIXME do we really need to create these all, or are they
# created for us when tables are created? # created for us when tables are created?
...@@ -1027,6 +1056,16 @@ sub kill_and_cleanup () { ...@@ -1027,6 +1056,16 @@ sub kill_and_cleanup () {
rmtree("$slave->[2]->{'path_myddir'}"); rmtree("$slave->[2]->{'path_myddir'}");
mkpath("$slave->[2]->{'path_myddir'}/mysql"); mkpath("$slave->[2]->{'path_myddir'}/mysql");
mkpath("$slave->[2]->{'path_myddir'}/test"); mkpath("$slave->[2]->{'path_myddir'}/test");
# To make some old test cases work, we create a soft
# link from the old "var" location to the new one
if ( ! $glob_win32 and $opt_vardir ne "$glob_mysql_test_dir/var" )
{
# FIXME why bother with the above, why not always remove all of var?!
rmtree("$glob_mysql_test_dir/var"); # Clean old var, FIXME or rename it?!
symlink($opt_vardir, "$glob_mysql_test_dir/var");
}
} }
...@@ -1050,7 +1089,7 @@ sub ndbcluster_install () { ...@@ -1050,7 +1089,7 @@ sub ndbcluster_install () {
if ( mtr_run("$glob_mysql_test_dir/ndb/ndbcluster", if ( mtr_run("$glob_mysql_test_dir/ndb/ndbcluster",
["--port=$opt_ndbcluster_port", ["--port=$opt_ndbcluster_port",
"--port-base=$ndbcluster_port_base", "--port-base=$ndbcluster_port_base",
"--data-dir=$glob_mysql_test_dir/var", "--data-dir=$opt_vardir",
$ndbcluster_opts, $ndbcluster_opts,
"--initial"], "--initial"],
"", "", "", "") ) "", "", "", "") )
...@@ -1074,7 +1113,7 @@ sub ndbcluster_start () { ...@@ -1074,7 +1113,7 @@ sub ndbcluster_start () {
# FIXME, we want to _append_ output to file $file_ndb_testrun_log instead of /dev/null # FIXME, we want to _append_ output to file $file_ndb_testrun_log instead of /dev/null
if ( mtr_run("$glob_mysql_test_dir/ndb/ndbcluster", if ( mtr_run("$glob_mysql_test_dir/ndb/ndbcluster",
["--port=$opt_ndbcluster_port", ["--port=$opt_ndbcluster_port",
"--data-dir=$glob_mysql_test_dir/var"], "--data-dir=$opt_vardir"],
"", "/dev/null", "", "") ) "", "/dev/null", "", "") )
{ {
mtr_error("Error ndbcluster_start"); mtr_error("Error ndbcluster_start");
...@@ -1094,7 +1133,7 @@ sub ndbcluster_stop () { ...@@ -1094,7 +1133,7 @@ sub ndbcluster_stop () {
# FIXME, we want to _append_ output to file $file_ndb_testrun_log instead of /dev/null # FIXME, we want to _append_ output to file $file_ndb_testrun_log instead of /dev/null
mtr_run("$glob_mysql_test_dir/ndb/ndbcluster", mtr_run("$glob_mysql_test_dir/ndb/ndbcluster",
["--port=$opt_ndbcluster_port", ["--port=$opt_ndbcluster_port",
"--data-dir=$glob_mysql_test_dir/var", "--data-dir=$opt_vardir",
"--stop"], "--stop"],
"", "/dev/null", "", ""); "", "/dev/null", "", "");
...@@ -1497,15 +1536,15 @@ sub run_testcase ($) { ...@@ -1497,15 +1536,15 @@ sub run_testcase ($) {
{ {
mtr_report_test_passed($tinfo); mtr_report_test_passed($tinfo);
} }
elsif ( $res == 2 ) elsif ( $res == 62 )
{ {
# Testcase itself tell us to skip this one # Testcase itself tell us to skip this one
mtr_report_test_skipped($tinfo); mtr_report_test_skipped($tinfo);
} }
else else
{ {
# Test case failed # Test case failed, if in control mysqltest returns 1
if ( $res > 2 ) if ( $res != 1 )
{ {
mtr_tofile($path_timefile, mtr_tofile($path_timefile,
"mysqltest returned unexpected code $res, " . "mysqltest returned unexpected code $res, " .
...@@ -1566,17 +1605,17 @@ sub do_before_start_master ($$) { ...@@ -1566,17 +1605,17 @@ sub do_before_start_master ($$) {
$tname ne "rpl_crash_binlog_ib_3b") $tname ne "rpl_crash_binlog_ib_3b")
{ {
# FIXME we really want separate dir for binlogs # FIXME we really want separate dir for binlogs
foreach my $bin ( glob("$glob_mysql_test_dir/var/log/master*-bin.*") ) foreach my $bin ( glob("$opt_vardir/log/master*-bin.*") )
{ {
unlink($bin); unlink($bin);
} }
} }
# Remove old master.info and relay-log.info files # Remove old master.info and relay-log.info files
unlink("$glob_mysql_test_dir/var/master-data/master.info"); unlink("$opt_vardir/master-data/master.info");
unlink("$glob_mysql_test_dir/var/master-data/relay-log.info"); unlink("$opt_vardir/master-data/relay-log.info");
unlink("$glob_mysql_test_dir/var/master1-data/master.info"); unlink("$opt_vardir/master1-data/master.info");
unlink("$glob_mysql_test_dir/var/master1-data/relay-log.info"); unlink("$opt_vardir/master1-data/relay-log.info");
# Run master initialization shell script if one exists # Run master initialization shell script if one exists
if ( $init_script ) if ( $init_script )
...@@ -1603,13 +1642,13 @@ sub do_before_start_slave ($$) { ...@@ -1603,13 +1642,13 @@ sub do_before_start_slave ($$) {
$tname ne "rpl_crash_binlog_ib_3b" ) $tname ne "rpl_crash_binlog_ib_3b" )
{ {
# FIXME we really want separate dir for binlogs # FIXME we really want separate dir for binlogs
foreach my $bin ( glob("$glob_mysql_test_dir/var/log/slave*-bin.*") ) foreach my $bin ( glob("$opt_vardir/log/slave*-bin.*") )
{ {
unlink($bin); unlink($bin);
} }
# FIXME really master?! # FIXME really master?!
unlink("$glob_mysql_test_dir/var/slave-data/master.info"); unlink("$opt_vardir/slave-data/master.info");
unlink("$glob_mysql_test_dir/var/slave-data/relay-log.info"); unlink("$opt_vardir/slave-data/relay-log.info");
} }
# Run slave initialization shell script if one exists # Run slave initialization shell script if one exists
...@@ -1623,8 +1662,8 @@ sub do_before_start_slave ($$) { ...@@ -1623,8 +1662,8 @@ sub do_before_start_slave ($$) {
} }
} }
`rm -f $glob_mysql_test_dir/var/slave-data/log.*`; `rm -f $opt_vardir/slave-data/log.*`;
# unlink("$glob_mysql_test_dir/var/slave-data/log.*"); # unlink("$opt_vardir/slave-data/log.*");
} }
sub mysqld_arguments ($$$$$) { sub mysqld_arguments ($$$$$) {
...@@ -1670,8 +1709,7 @@ sub mysqld_arguments ($$$$$) { ...@@ -1670,8 +1709,7 @@ sub mysqld_arguments ($$$$$) {
if ( $type eq 'master' ) if ( $type eq 'master' )
{ {
mtr_add_arg($args, "%s--log-bin=%s/var/log/master-bin", $prefix, mtr_add_arg($args, "%s--log-bin=%s/log/master-bin", $prefix, $opt_vardir);
$glob_mysql_test_dir);
mtr_add_arg($args, "%s--pid-file=%s", $prefix, mtr_add_arg($args, "%s--pid-file=%s", $prefix,
$master->[$idx]->{'path_mypid'}); $master->[$idx]->{'path_mypid'});
mtr_add_arg($args, "%s--port=%d", $prefix, mtr_add_arg($args, "%s--port=%d", $prefix,
...@@ -1695,8 +1733,8 @@ sub mysqld_arguments ($$$$$) { ...@@ -1695,8 +1733,8 @@ sub mysqld_arguments ($$$$$) {
# FIXME slave get this option twice?! # FIXME slave get this option twice?!
mtr_add_arg($args, "%s--exit-info=256", $prefix); mtr_add_arg($args, "%s--exit-info=256", $prefix);
mtr_add_arg($args, "%s--init-rpl-role=slave", $prefix); mtr_add_arg($args, "%s--init-rpl-role=slave", $prefix);
mtr_add_arg($args, "%s--log-bin=%s/var/log/slave%s-bin", $prefix, mtr_add_arg($args, "%s--log-bin=%s/log/slave%s-bin", $prefix,
$glob_mysql_test_dir, $sidx); # FIXME use own dir for binlogs $opt_vardir, $sidx); # FIXME use own dir for binlogs
mtr_add_arg($args, "%s--log-slave-updates", $prefix); mtr_add_arg($args, "%s--log-slave-updates", $prefix);
# FIXME option duplicated for slave # FIXME option duplicated for slave
mtr_add_arg($args, "%s--log=%s", $prefix, mtr_add_arg($args, "%s--log=%s", $prefix,
...@@ -1706,8 +1744,8 @@ sub mysqld_arguments ($$$$$) { ...@@ -1706,8 +1744,8 @@ sub mysqld_arguments ($$$$$) {
$slave->[$idx]->{'path_mypid'}); $slave->[$idx]->{'path_mypid'});
mtr_add_arg($args, "%s--port=%d", $prefix, mtr_add_arg($args, "%s--port=%d", $prefix,
$slave->[$idx]->{'path_myport'}); $slave->[$idx]->{'path_myport'});
mtr_add_arg($args, "%s--relay-log=%s/var/log/slave%s-relay-bin", $prefix, mtr_add_arg($args, "%s--relay-log=%s/log/slave%s-relay-bin", $prefix,
$glob_mysql_test_dir, $sidx); $opt_vardir, $sidx);
mtr_add_arg($args, "%s--report-host=127.0.0.1", $prefix); mtr_add_arg($args, "%s--report-host=127.0.0.1", $prefix);
mtr_add_arg($args, "%s--report-port=%d", $prefix, mtr_add_arg($args, "%s--report-port=%d", $prefix,
$slave->[$idx]->{'path_myport'}); $slave->[$idx]->{'path_myport'});
...@@ -1745,13 +1783,13 @@ sub mysqld_arguments ($$$$$) { ...@@ -1745,13 +1783,13 @@ sub mysqld_arguments ($$$$$) {
{ {
if ( $type eq 'master' ) if ( $type eq 'master' )
{ {
mtr_add_arg($args, "%s--debug=d:t:i:A,%s/var/log/master%s.trace", mtr_add_arg($args, "%s--debug=d:t:i:A,%s/log/master%s.trace",
$prefix, $glob_mysql_test_dir, $sidx); $prefix, $opt_vardir, $sidx);
} }
if ( $type eq 'slave' ) if ( $type eq 'slave' )
{ {
mtr_add_arg($args, "%s--debug=d:t:i:A,%s/var/log/slave%s.trace", mtr_add_arg($args, "%s--debug=d:t:i:A,%s/log/slave%s.trace",
$prefix, $glob_mysql_test_dir, $sidx); $prefix, $opt_vardir, $sidx);
} }
} }
...@@ -2003,7 +2041,7 @@ sub run_mysqltest ($$) { ...@@ -2003,7 +2041,7 @@ sub run_mysqltest ($$) {
if ( $opt_debug ) if ( $opt_debug )
{ {
$cmdline_mysqldump .= $cmdline_mysqldump .=
" --debug=d:t:A,$glob_mysql_test_dir/var/log/mysqldump.trace"; " --debug=d:t:A,$opt_vardir/log/mysqldump.trace";
} }
my $cmdline_mysqlbinlog= my $cmdline_mysqlbinlog=
...@@ -2012,7 +2050,7 @@ sub run_mysqltest ($$) { ...@@ -2012,7 +2050,7 @@ sub run_mysqltest ($$) {
if ( $opt_debug ) if ( $opt_debug )
{ {
$cmdline_mysqlbinlog .= $cmdline_mysqlbinlog .=
" --debug=d:t:A,$glob_mysql_test_dir/var/log/mysqlbinlog.trace"; " --debug=d:t:A,$opt_vardir/log/mysqlbinlog.trace";
} }
my $cmdline_mysql= my $cmdline_mysql=
...@@ -2075,13 +2113,13 @@ sub run_mysqltest ($$) { ...@@ -2075,13 +2113,13 @@ sub run_mysqltest ($$) {
{ {
$exe= "strace"; # FIXME there are ktrace, .... $exe= "strace"; # FIXME there are ktrace, ....
mtr_add_arg($args, "-o"); mtr_add_arg($args, "-o");
mtr_add_arg($args, "%s/var/log/mysqltest.strace", $glob_mysql_test_dir); mtr_add_arg($args, "%s/log/mysqltest.strace", $opt_vardir);
mtr_add_arg($args, "$exe_mysqltest"); mtr_add_arg($args, "$exe_mysqltest");
} }
if ( $opt_timer ) if ( $opt_timer )
{ {
mtr_add_arg($args, "--timer-file=%s/var/log/timer", $glob_mysql_test_dir); mtr_add_arg($args, "--timer-file=%s/log/timer", $opt_vardir);
} }
if ( $opt_big_test ) if ( $opt_big_test )
...@@ -2106,8 +2144,7 @@ sub run_mysqltest ($$) { ...@@ -2106,8 +2144,7 @@ sub run_mysqltest ($$) {
if ( $opt_debug ) if ( $opt_debug )
{ {
mtr_add_arg($args, "--debug=d:t:A,%s/var/log/mysqltest.trace", mtr_add_arg($args, "--debug=d:t:A,%s/log/mysqltest.trace", $opt_vardir);
$glob_mysql_test_dir);
} }
if ( $opt_with_openssl ) if ( $opt_with_openssl )
...@@ -2129,7 +2166,7 @@ sub run_mysqltest ($$) { ...@@ -2129,7 +2166,7 @@ sub run_mysqltest ($$) {
mysqld_arguments($args,'master',0,$tinfo->{'master_opt'},[]); mysqld_arguments($args,'master',0,$tinfo->{'master_opt'},[]);
} }
return mtr_run_test($exe_mysqltest,$args,$tinfo->{'path'},"",$path_timefile,""); return mtr_run_test($exe,$args,$tinfo->{'path'},"",$path_timefile,"");
} }
############################################################################## ##############################################################################
......
mysql-test/mysql-test-run.sh
View file @ ffb5d1d7
...@@ -569,10 +569,7 @@ if [ x$SOURCE_DIST = x1 ] ; then ...@@ -569,10 +569,7 @@ if [ x$SOURCE_DIST = x1 ] ; then
NDB_MGM="$BASEDIR/ndb/src/mgmclient/ndb_mgm" NDB_MGM="$BASEDIR/ndb/src/mgmclient/ndb_mgm"
if [ -n "$USE_PURIFY" ] ; then if [ -n "$USE_PURIFY" ] ; then
PSUP="$MYSQL_TEST_DIR/purify.suppress" PSUP="$MYSQL_TEST_DIR/suppress.purify"
echo "suppress UMR rw_read_held; mi_open; ha_myisam::open64; handler::ha_open; openfrm" > $PSUP
echo "suppress UMR my_end; main" >> $PSUP
echo "suppress UMR _doprnt; fprintf; my_end; main" >> $PSUP
PURIFYOPTIONS="-windows=no -log-file=%v.purifylog -append-logfile -add-suppression-files=$PSUP" PURIFYOPTIONS="-windows=no -log-file=%v.purifylog -append-logfile -add-suppression-files=$PSUP"
if [ -f "${MYSQL_TEST}-purify" ] ; then if [ -f "${MYSQL_TEST}-purify" ] ; then
MYSQL_TEST="${MYSQL_TEST}-purify" MYSQL_TEST="${MYSQL_TEST}-purify"
...@@ -1660,11 +1657,11 @@ run_testcase () ...@@ -1660,11 +1657,11 @@ run_testcase ()
$ECHO "$RES$RES_SPACE [ pass ] $TIMER" $ECHO "$RES$RES_SPACE [ pass ] $TIMER"
else else
# why the following ``if'' ? That is why res==1 is special ? # why the following ``if'' ? That is why res==1 is special ?
if [ $res = 2 ]; then if [ $res = 62 ]; then
skip_inc skip_inc
$ECHO "$RES$RES_SPACE [ skipped ]" $ECHO "$RES$RES_SPACE [ skipped ]"
else else
if [ $res -gt 2 ]; then if [ $res -ne 1 ]; then
$ECHO "mysqltest returned unexpected code $res, it has probably crashed" >> $TIMEFILE $ECHO "mysqltest returned unexpected code $res, it has probably crashed" >> $TIMEFILE
fi fi
total_inc total_inc
......
mysql-test/suppress.purify 0 → 100644
View file @ ffb5d1d7
suppress UMR rw_read_held; mi_open; ha_myisam::open64; handler::ha_open; openfrm
suppress UMR my_end; main
suppress UMR _doprnt; fprintf; my_end; main
suppress umr rw_read_held; mi_open
suppress umr _putmsg; putmsg; _tx_sndudata
suppress umr rw_read_held; Query_cache::store_query(THD*,st_table_list*); mysql_execute_command(THD*)
suppress sig ...; _select; select; handle_connections_sockets; main; _start
suppress sig ...; read; vio_read; my_real_read(st_net*,unsigned long*); my_net_read; do_command(THD*)
suppress sig ...; read; vio_read; my_real_read(st_net*,unsigned long*); my_net_read; net_safe_read
suppress sig ...; write; vio_write; net_real_write; net_write_buff(st_net*,const char*,unsigned long); my_net_write
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7