postreview fixes

5 files changed, 8 insertions, 14 deletions

diff --git a/sql/item_func.cc b/sql/item_func.cc
index df25c3c97fa..ce2256290fa 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -4756,13 +4756,12 @@ Item_func_sp::execute(Item **itp)
   THD *thd= current_thd;
   int res= -1;
   Sub_statement_state statement_state;
-  Security_context *save_security_ctx= 0, *save_ctx_func;
+  Security_context *save_security_ctx= thd->security_ctx, *save_ctx_func;
 
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
   if (context->security_ctx)
   {
     /* Set view definer security context */
-    save_security_ctx= thd->security_ctx;
     thd->security_ctx= context->security_ctx;
   }
 #endif
@@ -4787,8 +4786,7 @@ Item_func_sp::execute(Item **itp)
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
   sp_restore_security_context(thd, save_ctx_func);
 error:
-  if (save_security_ctx)
-    thd->security_ctx= save_security_ctx;
+  thd->security_ctx= save_security_ctx;
 #else
 error:
 #endif
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index bc8b9ba2efb..2b5945b74af 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -3532,7 +3532,7 @@ bool check_grant(THD *thd, ulong want_access, TABLE_LIST *tables,
     of other queries). For simple queries first_not_own_table is 0.
   */
   for (i= 0, table= tables;
-       table && table != first_not_own_table && i < number;
+       table != first_not_own_table && i < number;
        table= table->next_global, i++)
   {
     /* Remove SHOW_VIEW_ACL, because it will be checked during making view */
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 2da0f7e2ce0..5ffed6c6f82 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -2705,16 +2705,14 @@ static bool check_grant_column_in_sctx(THD *thd, GRANT_INFO *grant,
 {
   if (!check_grants)
     return FALSE;
-  Security_context *save_security_ctx= 0;
+  Security_context *save_security_ctx= thd->security_ctx;
   bool res;
   if (sctx)
   {
-    save_security_ctx= thd->security_ctx;
     thd->security_ctx= sctx;
   }
   res= check_grant_column(thd, grant, db, table, name, length);
-  if (save_security_ctx)
-    thd->security_ctx= save_security_ctx;
+  thd->security_ctx= save_security_ctx;
   return res;
 }
 #endif
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 1882965fd1e..51d655334f8 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -5033,7 +5033,7 @@ check_table_access(THD *thd, ulong want_access,TABLE_LIST *tables,
     the given table list refers to the list for prelocking (contains tables
     of other queries). For simple queries first_not_own_table is 0.
   */
-  for (; tables && tables != first_not_own_table; tables= tables->next_global)
+  for (; tables != first_not_own_table; tables= tables->next_global)
   {
     if (tables->schema_table && 
         (want_access & ~(SELECT_ACL | EXTRA_ACL | FILE_ACL)))
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