database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Fix return code from check-warnings to indicate if test failed or not.

Browse Source 
No more string matching


mysql-test/include/check-warnings.test:
  Check return value from check_warnings and call skip if ok
mysql-test/include/mtr_check.sql:
  Improve readability
mysql-test/include/mtr_warnings.sql:
  Add out parameter for result.
  Increase the max_allowed_packet variable so the load_file works
  even if the server is started with low such value
This commit is contained in:
unknown
2008-04-09 14:38:42 +02:00
parent fc0de68e00
commit 5242048883
4 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2568,22 +2568,16 @@ sub run_check_warnings ($$) {
if ( $res == 0 )
{
my $report= mtr_grab_file($errfile);
if ($report ne "OK\nOK\n")
{
# Log to var/log/warnings file
mtr_tofile("$opt_vardir/log/warnings",
# Log to var/log/warnings file
mtr_tofile("$opt_vardir/log/warnings",
$tname."\n",
$report);
$res= 1;
$tinfo->{'warnings'}.= $report;
}
$res= 1;
$tinfo->{'warnings'}.= $report;
}
elsif ( $res == 62 )
{
# One of the features needed to run check_warnings.test was not
# available, check skipped
elsif ( $res == 62 ) {
# Test case was ok and called "skip"
$res= 0;
}
elsif ( $res )