Commit 8f7f8b5a authored by Magnus Blåudd's avatar Magnus Blåudd

Merge

parent 9226c847
...@@ -94,15 +94,24 @@ DROP TABLE t1; ...@@ -94,15 +94,24 @@ DROP TABLE t1;
SET GLOBAL log_warnings = @old_log_warnings; SET GLOBAL log_warnings = @old_log_warnings;
let LOG_ERROR= `SELECT @@GLOBAL.log_error`; let $log_error= `SELECT @@GLOBAL.log_error`;
if(!$log_error)
{
# MySQL Server on windows is started with --console and thus
# does not know the location of its .err log, use default location
let $log_error = $MYSQLTEST_VARDIR/log/mysqld.1.err;
}
# Assign env variable LOG_ERROR
let LOG_ERROR=$log_error;
--echo # Count the number of times the "Unsafe" message was printed --echo # Count the number of times the "Unsafe" message was printed
--echo # to the error log. --echo # to the error log.
perl; perl;
$log_error= $ENV{'LOG_ERROR'}; use strict;
my $log_error= $ENV{'LOG_ERROR'} || die "LOG_ERROR not set";
open(FILE, "$log_error") or die("Unable to open $log_error: $!\n"); open(FILE, "$log_error") or die("Unable to open $log_error: $!\n");
$count = () = grep(/Bug#46265/g,<FILE>); my $count = () = grep(/Bug#46265/g,<FILE>);
print "Occurrences: $count\n"; print "Occurrences: $count\n";
close(FILE); close(FILE);
EOF EOF
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