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/t/grant2.test | |
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/t/grant2.test')
-rw-r--r-- | mysql-test/t/grant2.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/grant2.test b/mysql-test/t/grant2.test index afdd2793207..21de3e349cf 100644 --- a/mysql-test/t/grant2.test +++ b/mysql-test/t/grant2.test @@ -606,7 +606,7 @@ connection conn1; USE db1; --error ER_COLUMNACCESS_DENIED_ERROR SELECT c FROM t2; ---error ER_COLUMNACCESS_DENIED_ERROR +--error ER_TABLEACCESS_DENIED_ERROR SELECT * FROM t2; --error ER_COLUMNACCESS_DENIED_ERROR SELECT * FROM t1 JOIN t2 USING (b); |