database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1

Browse Source 
into  bk-internal.mysql.com:/users/gshchepa/mysql-5.1-opt


sql/item.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
This commit is contained in:
unknown
2007-08-23 21:38:24 +02:00
parent 7dd4e78958 43ab87e0d3
commit 30f5bb9ec8
21 changed files with 386 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_show.cc
View File

@ -3556,8 +3556,7 @@ static int get_schema_column_record(THD *thd, TABLE_LIST *tables,
col_access= get_column_grant(thd, &tables->grant,
db_name->str, table_name->str,
field->field_name) & COL_ACLS;
if (lex->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++)
@ -4350,6 +4349,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 (check_table_access(thd, TRIGGER_ACL, tables, 1))
goto ret;
#endif
for (event= 0; event < (int)TRG_EVENT_MAX; event++)
{
for (timing= 0; timing < (int)TRG_ACTION_MAX; timing++)
@ -4386,6 +4391,9 @@ static int get_schema_triggers_record(THD *thd, TABLE_LIST *tables,
}
}
}
#ifndef NO_EMBEDDED_ACCESS_CHECKS
ret:
#endif
DBUG_RETURN(0);
}