bk commit into 5.0 tree (tnurnberg:1.2209)

[Tatjana A Nuernberg]

Below is the list of changes that have just been committed into a local
5.0 repository of tnurnberg. When tnurnberg 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@stripped, 2006-07-19 19:52:27+02:00, tnurnberg@stripped +1 -0
  Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0-release
  into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0
  MERGE: 1.2191.24.20

  sql/sql_insert.cc@stripped, 2006-07-19 19:52:21+02:00, tnurnberg@stripped +0 -0
    Auto merged
    MERGE: 1.194.3.1

# 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:	tnurnberg
# Host:	salvation.intern.azundris.com
# Root:	/home/tnurnberg/mysql-5.0/RESYNC

--- 1.196/sql/sql_insert.cc	2006-07-19 19:52:35 +02:00
+++ 1.197/sql/sql_insert.cc	2006-07-19 19:52:35 +02:00
@@ -836,11 +836,18 @@ static bool mysql_prepare_insert_check_t
   bool insert_into_view= (table_list->view != 0);
   DBUG_ENTER("mysql_prepare_insert_check_table");
 
+  /*
+     first table in list is the one we'll INSERT into, requires INSERT_ACL.
+     all others require SELECT_ACL only. the ACL requirement below is for
+     new leaves only anyway (view-constituents), so check for SELECT rather
+     than INSERT.
+  */
+
   if (setup_tables_and_check_access(thd, &thd->lex->select_lex.context,
                                     &thd->lex->select_lex.top_join_list,
                                     table_list, where, 
                                     &thd->lex->select_lex.leaf_tables,
-                                    select_insert, INSERT_ACL))
+                                    select_insert, SELECT_ACL))
     DBUG_RETURN(TRUE);
 
   if (insert_into_view && !fields.elements)