diff options
| author | unknown <kaa@polly.(none)> | 2007-10-24 21:39:00 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.(none)> | 2007-10-24 21:39:00 +0400 |
| commit | c8282d7b6b9524604c00cd09b27db5b621232fd3 (patch) | |
| tree | 2b77d176292fcbb7078135c6552f5abef52fd3fe /mysql-test | |
| parent | 17e9db8cdbb787b9a1798e05e9ec520067491d90 (diff) | |
| parent | c58cebf683d05aac4f4f8d7087c8fa780ecf0c79 (diff) | |
| download | mariadb-git-c8282d7b6b9524604c00cd09b27db5b621232fd3.tar.gz | |
Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
mysql-test/suite/binlog/t/binlog_killed.test:
Auto merged
mysys/my_write.c:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/binlog/t/binlog_killed.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/binlog/t/binlog_killed.test b/mysql-test/suite/binlog/t/binlog_killed.test index 6c0b4b46a4e..0b3c64eb5d8 100644 --- a/mysql-test/suite/binlog/t/binlog_killed.test +++ b/mysql-test/suite/binlog/t/binlog_killed.test @@ -242,7 +242,7 @@ drop function bug27563; drop function bug27565; } -system rm $MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog ; +remove_file $MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog ; drop table t1,t2,t3; |