diff options
author | unknown <monty@mashka.mysql.fi> | 2003-03-15 04:41:57 +0200 |
---|---|---|
committer | unknown <monty@mashka.mysql.fi> | 2003-03-15 04:41:57 +0200 |
commit | 11117565a3682ea800d1b988775cd05ef78b4fb8 (patch) | |
tree | 872ca3e7569fe0db0147fd6f118af292b828ffc0 /tests/grant.res | |
parent | 13a5a24c6170921bb97796d96ca9f0ac20e5308e (diff) | |
parent | fcf035a0d85bc49c8c071246ce22a19f2fea395b (diff) | |
download | mariadb-git-11117565a3682ea800d1b988775cd05ef78b4fb8.tar.gz |
merge with 3.23 to get:
- Fix for empty table/column names
mysql-test/t/create.test:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/table.cc:
Auto merged
tests/grant.pl:
Auto merged
sql/filesort.cc:
merge with 3.23
sql/sql_table.cc:
merge with 3.23
tests/grant.res:
merge with 3.23
Diffstat (limited to 'tests/grant.res')
-rw-r--r-- | tests/grant.res | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/grant.res b/tests/grant.res index 822e9320f53..92d271cd864 100644 --- a/tests/grant.res +++ b/tests/grant.res @@ -195,7 +195,12 @@ update grant_test.test set b=3 where b=1 Error in execute: SELECT command denied to user: 'grant_user@localhost' for column 'b' in table 'test' update grant_test.test set b=b+1 Error in execute: SELECT command denied to user: 'grant_user@localhost' for column 'b' in table 'test' -select * from test +grant SELECT on *.* to grant_user@localhost +Connecting grant_user +update grant_test.test set b=b+1 +revoke SELECT on *.* from grant_user@localhost +Connecting grant_user +lect * from test Error in execute: select command denied to user: 'grant_user@localhost' for table 'test' grant select on grant_test.test to grant_user@localhost delete from grant_test.test where a=1 |