diff options
| author | bell@sanja.is.com.ua <> | 2005-10-31 22:14:27 +0200 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2005-10-31 22:14:27 +0200 |
| commit | c54d129224234342942dc0b7549dbf969c624ebc (patch) | |
| tree | 2fe29852e1f4b1f8aad1961fd544fa3a44400487 /sql/table.cc | |
| parent | 1137a376a7262134672364cc3c73029864d9b1f7 (diff) | |
| download | mariadb-git-c54d129224234342942dc0b7549dbf969c624ebc.tar.gz | |
postreview fixes
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/table.cc b/sql/table.cc index 75c04389411..539c416c369 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= thd->security_ctx; Security_context *new_sctx= table_ref->security_ctx; bool res; @@ -2675,12 +2675,10 @@ Natural_join_column::check_grants(THD *thd, const char *name, uint length) 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 |