diff options
| author | Mats Kindahl <mats@sun.com> | 2008-10-06 10:27:36 +0200 |
|---|---|---|
| committer | Mats Kindahl <mats@sun.com> | 2008-10-06 10:27:36 +0200 |
| commit | bcaf5e0cf55fe87bf77fde836a8913ec170d7085 (patch) | |
| tree | 7bac6ffa1fec91510d6ec0791124a707d0f29e3a /mysql-test/r/grant2.result | |
| parent | 08399602a61dc9561773e178b8eabfb99b1ce945 (diff) | |
| parent | 9daa56fd5ce3ccd33c32b5a505ac1d2b2c437460 (diff) | |
| download | mariadb-git-bcaf5e0cf55fe87bf77fde836a8913ec170d7085.tar.gz | |
Merging 5.1 main into 5.1-rpl.
Diffstat (limited to 'mysql-test/r/grant2.result')
| -rw-r--r-- | mysql-test/r/grant2.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/grant2.result b/mysql-test/r/grant2.result index 098f35e3fa0..0c3bd2f48aa 100644 --- a/mysql-test/r/grant2.result +++ b/mysql-test/r/grant2.result @@ -435,7 +435,7 @@ USE db1; SELECT c FROM t2; ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for column 'c' in table 't2' SELECT * FROM t2; -ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for column 'c' in table 't2' +ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for table 't2' SELECT * FROM t1 JOIN t2 USING (b); ERROR 42000: SELECT command denied to user 'mysqltest1'@'localhost' for column 'c' in table 't2' DROP TABLE db1.t1, db1.t2; |