summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqltest.result
diff options
context:
space:
mode:
authorMattias Jonsson <mattias.jonsson@oracle.com>2010-11-17 10:13:57 +0100
committerMattias Jonsson <mattias.jonsson@oracle.com>2010-11-17 10:13:57 +0100
commit21bc09c26b69e01ffa155886dc4622827678f3df (patch)
treea775c32621099d20b8031c0071fa8eafd6c1203d /mysql-test/r/mysqltest.result
parentdd0a6227c7bbf98467b29e6a49fe553c8b76b454 (diff)
downloadmariadb-git-21bc09c26b69e01ffa155886dc4622827678f3df.tar.gz
post-push fix, backported --replace_result patch
for --list_files in mysqltest. client/mysqltest.cc: Backported --replace_result for --list_files. mysql-test/r/mysqltest.result: updated test. mysql-test/t/mysqltest.test: added test for replace_result on list_files.
Diffstat (limited to 'mysql-test/r/mysqltest.result')
-rw-r--r--mysql-test/r/mysqltest.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
index 8afef65b66f..5acac076292 100644
--- a/mysql-test/r/mysqltest.result
+++ b/mysql-test/r/mysqltest.result
@@ -798,7 +798,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