bk commit into 6.0 tree (thek:1.2635)

[kpettersson]

Below is the list of changes that have just been committed into a local
6.0 repository of thek.  When thek 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, 2008-04-16 10:56:54+02:00, thek@adventure.(none) +2 -0
  Code clean up
  Reverted bad choice of parameter name. The parameter is in deed a 
  privilege requirement, but the introduction of this concept through
  a bug patch is not supported by the bug-patching-process.

  sql/mysql_priv.h@stripped, 2008-04-16 10:56:49+02:00, thek@adventure.(none) +1 -1
    revert bad choice of parameter name.

  sql/sql_parse.cc@stripped, 2008-04-16 10:56:49+02:00, thek@adventure.(none) +4 -3
    revert bad choice of parameter name.

diff -Nrup a/sql/mysql_priv.h b/sql/mysql_priv.h
--- a/sql/mysql_priv.h	2008-04-10 10:54:14 +02:00
+++ b/sql/mysql_priv.h	2008-04-16 10:56:49 +02:00
@@ -1115,7 +1115,7 @@ bool reload_acl_and_cache(THD *thd, ulon
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
 bool check_access(THD *thd, ulong access, const char *db, ulong *save_priv,
 		  bool no_grant, bool no_errors, bool schema_db);
-bool check_table_access(THD *thd, ulong requirements, TABLE_LIST *tables,
+bool check_table_access(THD *thd, ulong want_access, TABLE_LIST *tables,
                         bool no_errors,
                         bool any_combination_of_privileges_will_do,
 			uint number);
diff -Nrup a/sql/sql_parse.cc b/sql/sql_parse.cc
--- a/sql/sql_parse.cc	2008-04-10 10:54:14 +02:00
+++ b/sql/sql_parse.cc	2008-04-16 10:56:49 +02:00
@@ -5187,7 +5187,7 @@ static bool check_show_access(THD *thd, 
 */
 
 bool
-check_table_access(THD *thd, ulong requirements,TABLE_LIST *tables,
+check_table_access(THD *thd, ulong want_access,TABLE_LIST *tables,
 		   bool no_errors, bool any_combination_of_privileges_will_do,
                    uint number)
 {
@@ -5200,10 +5200,11 @@ check_table_access(THD *thd, ulong requi
     the given table list refers to the list for prelocking (contains tables
     of other queries). For simple queries first_not_own_table is 0.
   */
+  ulong save_want_access= want_access;
   for (; i < number && tables != first_not_own_table && tables;
        tables= tables->next_global, i++)
   {
-    ulong want_access= requirements;
+    want_access= save_want_access;
     if (tables->security_ctx)
       sctx= tables->security_ctx;
     else
@@ -5251,7 +5252,7 @@ check_table_access(THD *thd, ulong requi
       goto deny;
   }
   thd->security_ctx= backup_ctx;
-  return check_grant(thd,requirements,org_tables,
+  return check_grant(thd,save_want_access,org_tables,
                      any_combination_of_privileges_will_do,
                      number, no_errors);
 deny: