diff options
| author | unknown <gluh@eagle.(none)> | 2007-08-20 11:25:45 +0500 |
|---|---|---|
| committer | unknown <gluh@eagle.(none)> | 2007-08-20 11:25:45 +0500 |
| commit | d48e35b983d1970a1bca2e670553040f3426a5a6 (patch) | |
| tree | 8968d093c085bddf5c229b6f1cbe435fc8922e4e /sql | |
| parent | 92abaeee0c05ba5e1b074a4aff308789d4ecee12 (diff) | |
| parent | 29ee5ed0a04a2db4e5e23a359a3acf9b4e474ab0 (diff) | |
| download | mariadb-git-d48e35b983d1970a1bca2e670553040f3426a5a6.tar.gz | |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_show.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 05a847b3830..e21de81fbdb 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -2684,8 +2684,7 @@ static int get_schema_column_record(THD *thd, TABLE_LIST *tables, col_access= get_column_grant(thd, &tables->grant, base_name, file_name, field->field_name) & COL_ACLS; - if (lex->orig_sql_command != SQLCOM_SHOW_FIELDS && - !tables->schema_table && !col_access) + if (!tables->schema_table && !col_access) continue; end= tmp; for (uint bitnr=0; col_access ; col_access>>=1,bitnr++) @@ -3381,6 +3380,12 @@ static int get_schema_triggers_record(THD *thd, TABLE_LIST *tables, { Table_triggers_list *triggers= tables->table->triggers; int event, timing; + +#ifndef NO_EMBEDDED_ACCESS_CHECKS + if (!(thd->security_ctx->master_access & SUPER_ACL)) + goto ret; +#endif + for (event= 0; event < (int)TRG_EVENT_MAX; event++) { for (timing= 0; timing < (int)TRG_ACTION_MAX; timing++) @@ -3407,6 +3412,7 @@ static int get_schema_triggers_record(THD *thd, TABLE_LIST *tables, } } } +ret: DBUG_RETURN(0); } |