diff options
| author | Magnus Blåudd <magnus.blaudd@sun.com> | 2009-10-08 14:00:43 +0200 |
|---|---|---|
| committer | Magnus Blåudd <magnus.blaudd@sun.com> | 2009-10-08 14:00:43 +0200 |
| commit | ec025c694bbaf268479e705f77c096ce13a1c983 (patch) | |
| tree | fd9b11972894b361cf93ab4b2c014ee009009f1c /mysql-test | |
| parent | 9279d2a5c0bc61d15d9a94149189dd2f40e74868 (diff) | |
| download | mariadb-git-ec025c694bbaf268479e705f77c096ce13a1c983.tar.gz | |
BUG#47129 fix small bug in test
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test b/mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test index 656eaae5721..21c11d5a3df 100644 --- a/mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test +++ b/mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test @@ -94,22 +94,22 @@ DROP TABLE t1; SET GLOBAL log_warnings = @old_log_warnings; -let $log_error= `SELECT @@GLOBAL.log_error`; -if(!$log_error) +let $log_error_= `SELECT @@GLOBAL.log_error`; +if(!`select LENGTH('$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; + let $log_error_ = $MYSQLTEST_VARDIR/log/mysqld.1.err; } # Assign env variable LOG_ERROR -let LOG_ERROR=$log_error; +let LOG_ERROR=$log_error_; --echo # Count the number of times the "Unsafe" message was printed --echo # to the error log. perl; use strict; - my $log_error= $ENV{'LOG_ERROR'} || die "LOG_ERROR not set"; + my $log_error= $ENV{'LOG_ERROR'} or die "LOG_ERROR not set"; open(FILE, "$log_error") or die("Unable to open $log_error: $!\n"); my $count = () = grep(/Bug#46265/g,<FILE>); print "Occurrences: $count\n"; |