summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorPatrick Crews <patrick.crews@sun.com>2008-09-20 02:21:28 -0400
committerPatrick Crews <patrick.crews@sun.com>2008-09-20 02:21:28 -0400
commit2a419a562704c276127991e0c416c8d2745657a7 (patch)
treefd73369b0d9c0c567fcc1191a96a9ef6c799568b /mysql-test/include
parent47ba1e8196f79ada6f71d5dd311f7d13db9fcf58 (diff)
downloadmariadb-git-2a419a562704c276127991e0c416c8d2745657a7.tar.gz
Bug#38311 Some tests use 'rm' which is not portable
Substituted use of MTR's remove_file function in the tests Started with 5.0 tree and will clean up any offenders discovered during upmerge.
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/ndb_backup_print.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/include/ndb_backup_print.inc b/mysql-test/include/ndb_backup_print.inc
index 57fb279491c..7527f125686 100644
--- a/mysql-test/include/ndb_backup_print.inc
+++ b/mysql-test/include/ndb_backup_print.inc
@@ -1,6 +1,7 @@
--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults $ndb_restore_opts -b $the_backup_id -n 1 $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id $ndb_restore_filter > $MYSQLTEST_VARDIR/tmp/tmp.dat
--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults $ndb_restore_opts -b $the_backup_id -n 2 $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id $ndb_restore_filter >> $MYSQLTEST_VARDIR/tmp/tmp.dat
--exec sort $MYSQLTEST_VARDIR/tmp/tmp.dat
---exec rm -f $MYSQLTEST_VARDIR/tmp/tmp.dat
+--error 0,1
+--remove_file $MYSQLTEST_VARDIR/tmp/tmp.dat
--let ndb_restore_opts=
--let ndb_restore_filter=