summaryrefslogtreecommitdiff
path: root/mysql-test/t/mysqladmin.test
diff options
context:
space:
mode:
authorunknown <msvensson@pilot.(none)>2007-08-07 11:40:03 +0200
committerunknown <msvensson@pilot.(none)>2007-08-07 11:40:03 +0200
commit04e8c93c20a5517cfd57ef71ea91a3cea531828b (patch)
treee9e07f451521296d8b4d85f29d8e2b5f274785ca /mysql-test/t/mysqladmin.test
parent841ae6731f7979b10ec7493e2802e769bd5c01a5 (diff)
downloadmariadb-git-04e8c93c20a5517cfd57ef71ea91a3cea531828b.tar.gz
Bug#20037 mysqltest requires cygwin on windows(part 1, new mysqltest commands)
- Update comments - Make "write_file" fail if file already exist - Remove temporary files created by test cases client/mysqltest.c: Improve function comments Make write_file fail if file already exist mysql-test/r/mysqltest.result: Update test result after adding new test and updating description of argumements to chmod mysql-test/t/bootstrap.test: Remove temporary file created by testcase mysql-test/t/mysql.test: Remove temporary file created by testcase mysql-test/t/mysqladmin.test: Remove temporary file created by testcase mysql-test/t/mysqltest.test: Remove temporary file created by testcase Add test to show that "write_file" fails if file already exist mysql-test/t/sp-destruct.test: Remove temporary file created by testcase
Diffstat (limited to 'mysql-test/t/mysqladmin.test')
-rw-r--r--mysql-test/t/mysqladmin.test3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/t/mysqladmin.test b/mysql-test/t/mysqladmin.test
index 3fa03fa910e..839ecf00b60 100644
--- a/mysql-test/t/mysqladmin.test
+++ b/mysql-test/t/mysqladmin.test
@@ -20,7 +20,7 @@ EOF
--replace_regex /.*mysqladmin.*: unknown/mysqladmin: unknown/
--error 7
--exec $MYSQLADMIN --defaults-file=$MYSQLTEST_VARDIR/tmp/bug10608.cnf -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root --password= ping 2>&1
-
+remove_file $MYSQLTEST_VARDIR/tmp/bug10608.cnf;
# When mysqladmin finds "loose-database" in .cnf file it shall print
# a warning and continue
@@ -32,3 +32,4 @@ EOF
--replace_regex /Warning: .*mysqladmin.*: unknown/Warning: mysqladmin: unknown/
--exec $MYSQLADMIN --defaults-file=$MYSQLTEST_VARDIR/tmp/bug10608.cnf -S $MASTER_MYSOCK -P $MASTER_MYPORT -u root --password= ping 2>&1
+remove_file $MYSQLTEST_VARDIR/tmp/bug10608.cnf;