diff options
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sql/table.cc b/sql/table.cc index 75c04389411..a18ff4397d1 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -2654,7 +2654,7 @@ Natural_join_column::check_grants(THD *thd, const char *name, uint length) GRANT_INFO *grant; const char *db_name; const char *table_name; - Security_context *save_security_ctx= 0; + Security_context *save_security_ctx; Security_context *new_sctx= table_ref->security_ctx; bool res; @@ -2673,14 +2673,11 @@ Natural_join_column::check_grants(THD *thd, const char *name, uint length) table_name= table_ref->table->s->table_name; } + save_security_ctx= thd->security_ctx; if (new_sctx) - { - save_security_ctx= thd->security_ctx; thd->security_ctx= new_sctx; - } res= check_grant_column(thd, grant, db_name, table_name, name, length); - if (save_security_ctx) - thd->security_ctx= save_security_ctx; + thd->security_ctx= save_security_ctx; return res; } #endif |