bk commit into 5.0 tree (bell:1.1958)

[sanja]

Below is the list of changes that have just been committed into a local
5.0 repository of bell. When bell does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1958 05/10/31 22:14:27 bell@stripped +5 -0
  postreview fixes

  sql/table.cc
    1.201 05/10/31 22:11:29 bell@stripped +2 -4
    some optimisation

  sql/sql_parse.cc
    1.512 05/10/31 22:11:29 bell@stripped +1 -1
    some optimisation

  sql/sql_base.cc
    1.314 05/10/31 22:11:29 bell@stripped +2 -4
    some optimisation

  sql/sql_acl.cc
    1.179 05/10/31 22:11:29 bell@stripped +1 -1
    some optimisation

  sql/item_func.cc
    1.266 05/10/31 22:11:29 bell@stripped +2 -4
    some optimisation

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	bell
# Host:	sanja.is.com.ua
# Root:	/home/bell/mysql/bk/work-owner-5.0

--- 1.265/sql/item_func.cc	2005-10-28 20:17:33 +03:00
+++ 1.266/sql/item_func.cc	2005-10-31 22:11:29 +02:00
@@ -4756,13 +4756,12 @@
   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 @@
 #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

--- 1.178/sql/sql_acl.cc	2005-10-28 00:56:37 +03:00
+++ 1.179/sql/sql_acl.cc	2005-10-31 22:11:29 +02:00
@@ -3532,7 +3532,7 @@
     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 */

--- 1.313/sql/sql_base.cc	2005-10-28 00:24:03 +03:00
+++ 1.314/sql/sql_base.cc	2005-10-31 22:11:29 +02:00
@@ -2705,16 +2705,14 @@
 {
   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

--- 1.511/sql/sql_parse.cc	2005-10-28 00:56:37 +03:00
+++ 1.512/sql/sql_parse.cc	2005-10-31 22:11:29 +02:00
@@ -5033,7 +5033,7 @@
     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)))

--- 1.200/sql/table.cc	2005-10-28 00:56:37 +03:00
+++ 1.201/sql/table.cc	2005-10-31 22:11:29 +02:00
@@ -2654,7 +2654,7 @@
   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 @@
 
   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