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

Add printout of file in which warning was detected

Browse Source 
Cleanup .progress, .reject, .log and .warnings files produced by mysqltest
This commit is contained in:
msvensson@neptunus.(none)
2006-10-06 00:57:10 +02:00
parent 15ffeaa093
commit ae4df31df4
3 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
client/mysqltest.c
View File

@ -818,6 +818,9 @@ void verbose_msg(const char *fmt, ...)
va_start(args, fmt); va_start(args, fmt);
fprintf(stderr, "mysqltest: "); fprintf(stderr, "mysqltest: ");
if (cur_file && cur_file != file_stack)
fprintf(stderr, "In included file \"%s\": ",
cur_file->file_name);
if (start_lineno != 0) if (start_lineno != 0)
fprintf(stderr, "At line %u: ", start_lineno); fprintf(stderr, "At line %u: ", start_lineno);
vfprintf(stderr, fmt, args); vfprintf(stderr, fmt, args);
@ -839,7 +842,15 @@ void warning_msg(const char *fmt, ...)
dynstr_append(&ds_warning_messages, "mysqltest: "); dynstr_append(&ds_warning_messages, "mysqltest: ");
if (start_lineno != 0) if (start_lineno != 0)
{ {
len= my_snprintf(buff, sizeof(buff), "Warning detected at line %d: ", dynstr_append(&ds_warning_messages, "Warning detected ");
if (cur_file && cur_file != file_stack)
{
len= my_snprintf(buff, sizeof(buff), "in included file %s ",
cur_file->file_name);
dynstr_append_mem(&ds_warning_messages,
buff, len);
}
len= my_snprintf(buff, sizeof(buff), "at line %d: ",
start_lineno); start_lineno);
dynstr_append_mem(&ds_warning_messages, dynstr_append_mem(&ds_warning_messages,
buff, len); buff, len);

4
mysql-test/include/ctype_like_escape.inc
View File

@ -11,8 +11,8 @@ insert into t1 values('ab_def');
insert into t1 values('abc_ef'); insert into t1 values('abc_ef');
insert into t1 values('abcd_f'); insert into t1 values('abcd_f');
insert into t1 values('abcde_'); insert into t1 values('abcde_');
-- should return ab_def # should return ab_def
select c1 as c1u from t1 where c1 like '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 '#'; select c1 as c2h from t1 where c1 like 'ab#_def' escape '#';
drop table t1; drop table t1;

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

@ -2704,15 +2704,16 @@ sub do_before_run_mysqltest($)
my $tinfo= shift; my $tinfo= shift;
my $tname= $tinfo->{'name'}; my $tname= $tinfo->{'name'};
# Remove old reject file # Remove old files produced by mysqltest
if ( $opt_suite eq "main" ) my $result_dir= "r";
if ( ! $opt_suite eq "main" )
{ {
unlink("r/$tname.reject"); $result_dir= "suite/$opt_suite/r";
}
else
{
unlink("suite/$opt_suite/r/$tname.reject");
} }
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 mtr_tonewfile($path_current_test_log,"$tname\n"); # Always tell where we are