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

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

Browse Source 
No more string matching
This commit is contained in:
msvensson@shellback.(none)
2008-04-09 14:38:42 +02:00
parent d348362d24
commit f4661f34a6
4 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/include/check-warnings.test
View File

@ -4,5 +4,9 @@
# for unexpected warnings found in the servers error log
#
--disable_query_log
call mtr.check_warnings();
call mtr.check_warnings(@result);
if (`select @result = 0`){
skip OK;
}
echo Found warnings;
--enable_query_log

2
mysql-test/include/mtr_check.sql
View File

@ -19,7 +19,7 @@ BEGIN
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA;
-- The test database should not contain any tables
SELECT table_name FROM INFORMATION_SCHEMA.TABLES
SELECT table_name AS tables_in_test FROM INFORMATION_SCHEMA.TABLES
WHERE table_schema='test';
-- Show "mysql" database, tables and columns

8
mysql-test/include/mtr_warnings.sql
View File

@ -208,7 +208,7 @@ INSERT INTO global_supressions VALUES
-- Procedure that uses the above created tables to check
-- the servers error log for warnings
--
CREATE DEFINER=root@localhost PROCEDURE check_warnings()
CREATE DEFINER=root@localhost PROCEDURE check_warnings(OUT result INT)
BEGIN
-- Don't write these queries to binlog
@ -225,6 +225,7 @@ BEGIN
FROM information_schema.global_variables
WHERE variable_name='LOG_ERROR';
SET @@session.max_allowed_packet= 1024*1024*1024;
SET @text= load_file(@log_error);
-- select @text;
@ -269,8 +270,11 @@ BEGIN
SELECT line as log_error
FROM suspect_lines WHERE supressed=0;
SELECT * FROM test_supressions;
-- Return 2 -> check failed
SELECT 2 INTO result;
ELSE
SELECT "OK";
-- Return 0 -> OK
SELECT 0 INTO RESULT;
END IF;
-- Cleanup for next test

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

@ -2568,8 +2568,6 @@ 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",
$tname."\n",
@ -2577,13 +2575,9 @@ sub run_check_warnings ($$) {
$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 )