summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqltest.result
diff options
context:
space:
mode:
authorMattias Jonsson <mattias.jonsson@oracle.com>2010-11-17 10:41:54 +0100
committerMattias Jonsson <mattias.jonsson@oracle.com>2010-11-17 10:41:54 +0100
commit2db0a406fd726e5bbbfef1ea9c01df12c24441fc (patch)
tree1cf822f308aa600910c303b01380d0c59330a884 /mysql-test/r/mysqltest.result
parentb2d56f31070ff9d074eb973fc690aaa8ab20aea1 (diff)
parent21bc09c26b69e01ffa155886dc4622827678f3df (diff)
downloadmariadb-git-2db0a406fd726e5bbbfef1ea9c01df12c24441fc.tar.gz
merge
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 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