database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Sergei Golubchik
2022-10-02 22:14:21 +02:00
parent 2ab52cc0e5 3a2116241b
commit 900d7bf360
245 changed files with 9723 additions and 2458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sql/sql_parse.cc
View File

@@ -7308,7 +7308,6 @@ bool check_fk_parent_table_access(THD *thd,
if (key->type == Key::FOREIGN_KEY)
{
TABLE_LIST parent_table;
bool is_qualified_table_name;
Foreign_key *fk_key= (Foreign_key *)key;
LEX_CSTRING db_name;
LEX_CSTRING table_name= { fk_key->ref_table.str,
@@ -7325,7 +7324,6 @@ bool check_fk_parent_table_access(THD *thd,
if (fk_key->ref_db.str)
{
is_qualified_table_name= true;
if (!(db_name.str= (char *) thd->memdup(fk_key->ref_db.str,
fk_key->ref_db.length+1)))
return true;
@@ -7347,7 +7345,6 @@ bool check_fk_parent_table_access(THD *thd,
if (!(db_name.str= (char *) thd->memdup(create_db,
db_name.length+1)))
return true;
is_qualified_table_name= true;
if (check_db_name((LEX_STRING*) &db_name))
{
@@ -7359,8 +7356,6 @@ bool check_fk_parent_table_access(THD *thd,
{
if (thd->lex->copy_db_to(&db_name))
return true;
else
is_qualified_table_name= false;
}
}
@@ -7386,22 +7381,11 @@ bool check_fk_parent_table_access(THD *thd,
if (check_some_access(thd, privileges, &parent_table) ||
parent_table.grant.want_privilege)
{
if (is_qualified_table_name)
{
const size_t qualified_table_name_len= NAME_LEN + 1 + NAME_LEN + 1;
char *qualified_table_name= (char *) thd->alloc(qualified_table_name_len);
my_snprintf(qualified_table_name, qualified_table_name_len, "%s.%s",
db_name.str, table_name.str);
table_name.str= qualified_table_name;
}
my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0),
"REFERENCES",
thd->security_ctx->priv_user,
thd->security_ctx->host_or_ip,
table_name.str);
"REFERENCES",
thd->security_ctx->priv_user,
thd->security_ctx->host_or_ip,
db_name.str, table_name.str);
return true;
}
}