diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2009-09-08 00:50:10 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2009-09-08 00:50:10 +0400 |
| commit | 29f0dcb56337a3e352ad7a70dcff6b25bb605325 (patch) | |
| tree | 84935c21dc958724ae7dcbeeca0c0f08986fc430 /mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test | |
| parent | 915a624cbcb58a10a2cfb2e2e4fd5029191fa86a (diff) | |
| parent | 8a2454f8e9fce648272577fcf8006ae6e6806cf9 (diff) | |
| download | mariadb-git-29f0dcb56337a3e352ad7a70dcff6b25bb605325.tar.gz | |
Merge MySQL->MariaDB
* Finished Monty and Jani's merge
* Some InnoDB tests still fail (because it's old xtradb code run against
newer testsuite). They are expected to go after mergning with the latest
xtradb.
Diffstat (limited to 'mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test')
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test b/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test index 076b5469363..7515249fe0c 100644 --- a/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test +++ b/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test @@ -246,7 +246,7 @@ connection master; # We should be gold by the time, so I will get rid of our file. ---exec rm $MYSQLTEST_VARDIR/tmp/remote.sql +--remove_file $MYSQLTEST_VARDIR/tmp/remote.sql ################### End Bug 17654 ###################### # What is the point of this test? It seems entirely pointless. It @@ -351,9 +351,9 @@ FLUSH LOGS; --diff_files $MYSQLTEST_VARDIR/tmp/local.sql $MYSQLTEST_VARDIR/tmp/remote.sql ---exec rm $MYSQLTEST_VARDIR/tmp/remote.sql +--remove_file $MYSQLTEST_VARDIR/tmp/remote.sql ---exec rm $MYSQLTEST_VARDIR/tmp/local.sql +--remove_file $MYSQLTEST_VARDIR/tmp/local.sql DROP TABLE IF EXISTS t1, t2, t3, t04, t05, t4, t5; sync_slave_with_master; |