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

Merge branch '10.6' into 10.7

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-10-29 19:22:04 +02:00
parent dd9da61dcf 6414374178
commit 1ebfa2af62
141 changed files with 2878 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sql/sql_show.cc
View File

@ -6054,6 +6054,15 @@ static int get_schema_column_record(THD *thd, TABLE_LIST *tables,
show_table->use_all_columns(); // Required for default
restore_record(show_table, s->default_values);
#ifndef NO_EMBEDDED_ACCESS_CHECKS
check_access(thd, SELECT_ACL, db_name->str,
&tables->grant.privilege, 0, 0, MY_TEST(tables->schema_table));
if (is_temporary_table(tables))
{
tables->grant.privilege|= TMP_TABLE_ACLS;
}
#endif
for (; (field= *ptr) ; ptr++)
{
if(field->invisible > INVISIBLE_USER)
@ -6073,14 +6082,13 @@ static int get_schema_column_record(THD *thd, TABLE_LIST *tables,
restore_record(table, s->default_values);
#ifndef NO_EMBEDDED_ACCESS_CHECKS
ulonglong col_access;
check_access(thd,SELECT_ACL, db_name->str,
&tables->grant.privilege, 0, 0, MY_TEST(tables->schema_table));
col_access= get_column_grant(thd, &tables->grant,
db_name->str, table_name->str,
field->field_name.str) & COL_ACLS;
if (!tables->schema_table && !col_access)
ulonglong col_access=
get_column_grant(thd, &tables->grant, db_name->str, table_name->str,
field->field_name.str) & COL_ACLS;
if (!col_access && !tables->schema_table)
continue;
char *end= tmp;
for (uint bitnr=0; col_access ; col_access>>=1,bitnr++)
{