diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-12-16 18:44:17 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-12-16 18:44:17 +0200 |
| commit | 74e2520cd94200e326715a7733d2583a185bc6a7 (patch) | |
| tree | a0d8f4957cf9d256a3cc3445c7db25384f97e249 /mysql-test/r/mysqltest.result | |
| parent | 8b1571d80341770818404c9cc9ed4b362ffe5710 (diff) | |
| parent | 33827e7dbfc177ef52718f63eaf87e005ab3e8b5 (diff) | |
| download | mariadb-git-74e2520cd94200e326715a7733d2583a185bc6a7.tar.gz | |
merge mysql-5.5->mysql-5.5-bugteam
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 |