diff options
| author | Mattias Jonsson <mattias.jonsson@oracle.com> | 2010-11-17 10:41:54 +0100 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@oracle.com> | 2010-11-17 10:41:54 +0100 |
| commit | 7dde08a842906e8d18b0a0899eff1840d09831db (patch) | |
| tree | 1cf822f308aa600910c303b01380d0c59330a884 | |
| parent | 15e5eaef5bfc1489d7aa8d2b32d54778ad12c054 (diff) | |
| parent | d25e3389f488e4f8b9e53cbd4030848127ff5355 (diff) | |
| download | mariadb-git-7dde08a842906e8d18b0a0899eff1840d09831db.tar.gz | |
merge
| -rw-r--r-- | mysql-test/r/mysqltest.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/mysqltest.test | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index cff845a2819..c2585d035d3 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -799,7 +799,7 @@ drop table t1; mysqltest: At line 1: change user failed: Unknown database 'inexistent' mysqltest: At line 1: change user failed: Access denied for user 'inexistent'@'localhost' (using password: NO) mysqltest: At line 1: change user failed: Access denied for user 'root'@'localhost' (using password: YES) -file1.txt +REPLACED_FILE1.txt file1.txt file2.txt file11.txt diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index 8fb05e52cdc..a8804ecaf34 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -2499,6 +2499,8 @@ write_file $MYSQLTEST_VARDIR/tmp/testdir/file1.txt; hello EOF +# Verify that --replace_result also work on list_files +--replace_result file REPLACED_FILE list_files $MYSQLTEST_VARDIR/tmp/testdir; # list_files gets the directory list before creating the new file list_files_write_file $MYSQLTEST_VARDIR/tmp/testdir/file2.txt $MYSQLTEST_VARDIR/tmp/testdir *; |