diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2009-11-10 20:45:15 +0200 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2009-11-10 20:45:15 +0200 |
| commit | 7eb789a723582a503e6c7b18afee5b92d39dbbd5 (patch) | |
| tree | 4673f5dde3aac3f1173eb33cbd96a67269d48499 /sql/sql_acl.cc | |
| parent | 19c380aaff1f1f3c0d21ac0c18904c21d7bdce76 (diff) | |
| parent | 3c1e1f6d6c7caa8916a03ac9594ff950e6b380e3 (diff) | |
| download | mariadb-git-7eb789a723582a503e6c7b18afee5b92d39dbbd5.tar.gz | |
merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade fail and are under treatment
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 89ba9bc091b..b3a05e21d32 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -4072,8 +4072,7 @@ bool check_column_grant_in_table_ref(THD *thd, TABLE_LIST * table_ref, db_name= table_ref->view_db.str; table_name= table_ref->view_name.str; if (table_ref->belong_to_view && - (thd->lex->sql_command == SQLCOM_SHOW_FIELDS || - thd->lex->sql_command == SQLCOM_SHOW_CREATE)) + thd->lex->sql_command == SQLCOM_SHOW_FIELDS) { view_privs= get_column_grant(thd, grant, db_name, table_name, name); if (view_privs & VIEW_ANY_ACL) |