diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-10-06 01:00:35 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-10-06 01:00:35 +0200 |
| commit | 5c8da505963e1cc1100814912d45dccd5e454ce0 (patch) | |
| tree | e7f7202b93cf18506bd6c17b9a89056f7dba9b12 /mysql-test | |
| parent | 5bdc88183a9048d71fdb824c3ee204a1fb55ee17 (diff) | |
| parent | 78c5bc62c59b5b168fb0625a70cc465ead4e59ae (diff) | |
| download | mariadb-git-5c8da505963e1cc1100814912d45dccd5e454ce0.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/same_tools/my41-same_tools
into neptunus.(none):/home/msvensson/mysql/same_tools/my50-same_tools
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
Makefile.am:
Manual merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/include/ctype_like_escape.inc | 4 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 20 |
2 files changed, 13 insertions, 11 deletions
diff --git a/mysql-test/include/ctype_like_escape.inc b/mysql-test/include/ctype_like_escape.inc index ac97fbaa1a0..d4abc33c178 100644 --- a/mysql-test/include/ctype_like_escape.inc +++ b/mysql-test/include/ctype_like_escape.inc @@ -11,8 +11,8 @@ insert into t1 values('ab_def'); insert into t1 values('abc_ef'); insert into t1 values('abcd_f'); insert into t1 values('abcde_'); --- should return ab_def +# should return ab_def select c1 as c1u from t1 where c1 like 'ab\_def'; --- should return ab_def +# should return ab_def select c1 as c2h from t1 where c1 like 'ab#_def' escape '#'; drop table t1; diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 6c8befdafa6..23a9b30d76b 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1180,9 +1180,10 @@ sub check_mysqld_features () { # Look for version if ( $line =~ /^$exe_mysqld\s\sVer\s([0-9]*)\.([0-9]*)\.([0-9]*)/ ) { - print "Major: $1 Minor: $2 Build: $3\n"; + #print "Major: $1 Minor: $2 Build: $3\n"; $mysql_version_id= $1*10000 + $2*100 + $3; - print "mysql_version_id: $mysql_version_id\n"; + #print "mysql_version_id: $mysql_version_id\n"; + mtr_report("MySQL Version $1.$2.$3"); } } else @@ -2703,15 +2704,16 @@ sub do_before_run_mysqltest($) my $tinfo= shift; my $tname= $tinfo->{'name'}; - # Remove old reject file - if ( $opt_suite eq "main" ) + # Remove old files produced by mysqltest + my $result_dir= "r"; + if ( ! $opt_suite eq "main" ) { - unlink("r/$tname.reject"); - } - else - { - unlink("suite/$opt_suite/r/$tname.reject"); + $result_dir= "suite/$opt_suite/r"; } + unlink("$result_dir/$tname.reject"); + unlink("$result_dir/$tname.progress"); + unlink("$result_dir/$tname.log"); + unlink("$result_dir/$tname.warnings"); mtr_tonewfile($path_current_test_log,"$tname\n"); # Always tell where we are |