1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed case when frivileges check switched off (BUG#4631)

Browse Source 
mysql-test/r/view.result:
  test made more environment independed
mysql-test/t/view.test:
  test made more environment independed
sql/sql_acl.cc:
  fixed case when frivileges check switched off
This commit is contained in:
unknown 2004-07-20 01:01:02 +03:00
parent 7d91d3f0bf
commit f0957bcc61
6 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/view.result
View File

@ -1,5 +1,5 @@
drop table if exists t1,t2;
drop view if exists v1,v2,v3,v4,v5,v6;
drop table if exists t1,t2,v1,v2,v3,v4,v5,v6;
drop view if exists t1,t2,v1,v2,v3,v4,v5,v6;
drop database if exists mysqltest;
use test;
create view v1 (c,d) as select a,b from t1;

6
mysql-test/r/view_skip_grants.result Normal file
View File

@ -0,0 +1,6 @@
drop table if exists t1,v1;
drop view if exists t1,v1;
use test;
create table t1 (field1 INT);
CREATE VIEW v1 AS SELECT field1 FROM t1;
drop view v1;

4
mysql-test/t/view.test
View File

@ -1,6 +1,6 @@
--disable_warnings
drop table if exists t1,t2;
drop view if exists v1,v2,v3,v4,v5,v6;
drop table if exists t1,t2,v1,v2,v3,v4,v5,v6;
drop view if exists t1,t2,v1,v2,v3,v4,v5,v6;
drop database if exists mysqltest;
--enable_warnings
use test;

1
mysql-test/t/view_skip_grants-master.opt Normal file
View File

@ -0,0 +1 @@
--skip-grant-tables

14
mysql-test/t/view_skip_grants.test Normal file
View File

@ -0,0 +1,14 @@
--disable_warnings
drop table if exists t1,v1;
drop view if exists t1,v1;
--enable_warnings
use test;
#
# test that we can create VIEW if privileges check switched off
#
create table t1 (field1 INT);
CREATE VIEW v1 AS SELECT field1 FROM t1;
drop view v1;
drop table t1

5
sql/sql_acl.cc
View File

@ -3838,6 +3838,11 @@ void fill_effective_table_privileges(THD *thd, GRANT_INFO *grant,
{
/* global privileges */
grant->privilege= thd->master_access;
/* if privileges ignored (--skip-grant-tables) above is enough */
if (!grant_option)
return;
/* db privileges */
grant->privilege|= acl_get(thd->host, thd->ip, thd->priv_user, db, 0);
/* table privileges */