diff options
| author | Bjorn Munch <bjorn.munch@oracle.com> | 2010-12-17 10:37:46 +0100 |
|---|---|---|
| committer | Bjorn Munch <bjorn.munch@oracle.com> | 2010-12-17 10:37:46 +0100 |
| commit | 2c8bccadcc3edcbbd024ae0799194e50a9eb504e (patch) | |
| tree | bbcd9502194edb630ca91ac6306c79ed4d605ca0 /mysql-test/r/mysqltest.result | |
| parent | 5a95f0aeb11729f869961de3269f44369b706f83 (diff) | |
| parent | 33827e7dbfc177ef52718f63eaf87e005ab3e8b5 (diff) | |
| download | mariadb-git-2c8bccadcc3edcbbd024ae0799194e50a9eb504e.tar.gz | |
merge from 5.5 main
Diffstat (limited to 'mysql-test/r/mysqltest.result')
| -rw-r--r-- | mysql-test/r/mysqltest.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result index 6d3ba819bcc..c3b6d22ef38 100644 --- a/mysql-test/r/mysqltest.result +++ b/mysql-test/r/mysqltest.result @@ -838,7 +838,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 |