bk commit into 5.0 tree (bell:1.1948)

[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.1948 05/10/28 00:56:44 bell@stripped +6 -0
  fixe of typos, comments & layout

  sql/table.h
    1.119 05/10/28 00:56:38 bell@stripped +2 -2
    typo fixed

  sql/table.cc
    1.200 05/10/28 00:56:37 bell@stripped +1 -3
    typo fixed
    layout fixed

  sql/sql_view.cc
    1.73 05/10/28 00:56:37 bell@stripped +0 -2
    layout fixed

  sql/sql_parse.cc
    1.511 05/10/28 00:56:37 bell@stripped +3 -2
    comment fixed

  sql/sql_acl.cc
    1.178 05/10/28 00:56:37 bell@stripped +8 -2
    comment fixed

  sql/item_func.cc
    1.264 05/10/28 00:56:37 bell@stripped +1 -1
    fixed typo

# 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-owner7-5.0

--- 1.263/sql/item_func.cc	2005-10-28 00:24:03 +03:00
+++ 1.264/sql/item_func.cc	2005-10-28 00:56:37 +03:00
@@ -4983,7 +4983,7 @@
       creation we do not infer into stored routine bodies and do not check
       privileges of its statements, which would probably be a good idea
       especially if the view has SQL SECURITY DEFINER and the used stored
-      procedure has SQL
+      procedure has SQL SECURITY DEFINER
     */
     Security_context *save_ctx;
     if (!(res= find_and_check_access(thd, EXECUTE_ACL, &save_ctx)))

--- 1.177/sql/sql_acl.cc	2005-10-28 00:24:03 +03:00
+++ 1.178/sql/sql_acl.cc	2005-10-28 00:56:37 +03:00
@@ -3522,8 +3522,14 @@
   DBUG_ASSERT(number > 0);
 
   /*
-    Iterate tables until first prelocking placeholder (if this query do not
-    have placeholders first_not_own_table is 0)
+    Walk through the list of tables that belong to the query and save the
+    requested access (orig_want_privilege) to be able to use it when
+    checking access rights to the underlying tables of a view. Our grant
+    system gradually eliminates checked bits from want_privilege and thus
+    after all checks are done we can no longer use it.
+    The check that first_not_own_table is not reached is for the case when
+    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 (i= 0, table= tables;
        table && table != first_not_own_table && i < number;

--- 1.510/sql/sql_parse.cc	2005-10-28 00:24:03 +03:00
+++ 1.511/sql/sql_parse.cc	2005-10-28 00:56:37 +03:00
@@ -5029,8 +5029,9 @@
   TABLE_LIST *org_tables= tables;
   TABLE_LIST *first_not_own_table= thd->lex->first_not_own_table();
   /*
-    Iterate tables until first prelocking placeholder (if this query do not
-    have placeholders first_not_own_table is 0)
+    The check that first_not_own_table is not reached is for the case when
+    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)
   {

--- 1.199/sql/table.cc	2005-10-28 00:18:11 +03:00
+++ 1.200/sql/table.cc	2005-10-28 00:56:37 +03:00
@@ -2419,7 +2419,7 @@
 
 
 /*
-  Load security context infoemation for this view
+  Load security context information for this view
 
   SYNOPSIS
     st_table_list::prepare_view_securety_context()
@@ -2517,9 +2517,7 @@
 
   DBUG_ASSERT(!prelocking_placeholder);
   if (prepare_view_securety_context(thd))
-  {
     DBUG_RETURN(TRUE);
-  }
   thd->security_ctx= find_view_security_context(thd);
   while ((tbl= tb++))
   {

--- 1.118/sql/table.h	2005-10-28 00:18:11 +03:00
+++ 1.119/sql/table.h	2005-10-28 00:56:38 +03:00
@@ -551,12 +551,12 @@
   st_table_list	*referencing_view;
   /*
     security  context (non-zero only for tables which belong
-    to view with SQL SEURITY DEFINER)
+    to view with SQL SEQURITY DEFINER)
   */
   Security_context *security_ctx;
   /*
     this view security context (non-zero only for views with
-    SQL SEURITY DEFINER)
+    SQL SEQURITY DEFINER)
   */
   Security_context *view_sctx;
   /*

--- 1.72/sql/sql_view.cc	2005-10-28 00:24:04 +03:00
+++ 1.73/sql/sql_view.cc	2005-10-28 00:56:37 +03:00
@@ -1139,9 +1139,7 @@
     old_lex->time_zone_tables_used= thd->lex->time_zone_tables_used;
   thd->lex= old_lex;
   if (!table->prelocking_placeholder && table->prepare_security(thd))
-  {
     DBUG_RETURN(1);
-  }
 
   DBUG_RETURN(0);