summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqltest.result
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-01-25 11:24:42 +0100
committerSergei Golubchik <sergii@pisem.net>2013-01-25 11:24:42 +0100
commit672b293860318b290374757f9b6a7f90b8942570 (patch)
tree6e1b4784e1d01890a1f9c5e3b88fe54ee773ba6b /mysql-test/r/mysqltest.result
parent32151409c13ddc09ebda7cd02fdfe40db290503e (diff)
parentde10e214115ecc89087386ecad8bddee2a1e1608 (diff)
downloadmariadb-git-672b293860318b290374757f9b6a7f90b8942570.tar.gz
5.3 merge
client/mysqltest.cc: make --error to work for --change_user errors
Diffstat (limited to 'mysql-test/r/mysqltest.result')
-rw-r--r--mysql-test/r/mysqltest.result6
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
index fdb3029059f..a3043aed711 100644
--- a/mysql-test/r/mysqltest.result
+++ b/mysql-test/r/mysqltest.result
@@ -935,9 +935,9 @@ a int(11) YES NULL
b varchar(255) YES NULL
c datetime YES NULL
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)
+mysqltest: At line 1: query 'change_user root,,inexistent' failed: 1049: Unknown database 'inexistent'
+mysqltest: At line 1: query 'change_user inexistent,,test' failed: 1045: Access denied for user 'inexistent'@'localhost' (using password: NO)
+mysqltest: At line 1: query 'change_user root,inexistent,test' failed: 1045: Access denied for user 'root'@'localhost' (using password: YES)
REPLACED_FILE1.txt
file1.txt
file2.txt