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

fix privileges for old style privileges tables on fly (as it do mysql_fix_privilege_tables dut if we have not it run)

Browse Source 
fixed forgoten test


mysql-test/r/ps_1general.result:
  SHOW TABLE putput changed
sql/sql_acl.cc:
  fix privileges for old style privileges tables on fly (as it do mysql_fix_privilege_tables dut if we have not it run)
This commit is contained in:
unknown 2004-10-10 18:51:02 +03:00
parent 8b026230ff
commit 65ed693681
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,8 +252,8 @@ mysql
test
prepare stmt4 from ' show tables from test like ''t2%'' ';
execute stmt4;
Tables_in_test (t2%) table_type
t2 BASE TABLE
Tables_in_test (t2%)
t2
prepare stmt4 from ' show columns from t2 from test like ''a%'' ';
execute stmt4;
Field Type Null Key Default Extra

6
sql/sql_acl.cc
View File

@ -301,6 +301,12 @@ my_bool acl_init(THD *org_thd, bool dont_read_acl_tables)
{
uint next_field;
user.access= get_access(table,3,&next_field) & GLOBAL_ACLS;
/*
if it is pre 5.0.1 privilege table then map CREATE privilege on
CREATE VIEW & SHOW VIEW privileges
*/
if (table->fields <= 31 && (user.access & CREATE_ACL))
user.access|= (CREATE_VIEW_ACL | SHOW_VIEW_ACL);
user.sort= get_sort(2,user.host.hostname,user.user);
user.hostname_length= (user.host.hostname ?
(uint) strlen(user.host.hostname) : 0);