bk commit into 3.23 tree

Below is the list of changes that have just been committed into a local
3.23 repository of Sinisa. When Sinisa 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1366 03/04/29 18:24:33 Sinisa@xxxxxxxxxxxxxxxxxxxx +1 -0
  Porting back security fix from 4.0.
  
  All tests plus grant.pl test passed.

  sql/sql_base.cc
    1.105 03/04/29 18:24:30 Sinisa@xxxxxxxxxxxxxxxxxxxx +3 -2
    Porting back security fix from 4.0.
    
    All tests plus grant.pl test passed.

# 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: Sinisa
# Host: sinisa.nasamreza.org
# Root: /mnt/work/mysql

--- 1.104/sql/sql_base.cc       Thu Mar 13 16:43:42 2003
+++ 1.105/sql/sql_base.cc       Tue Apr 29 18:24:30 2003
@@ -1878,8 +1878,9 @@
   for (; tables ; tables=tables->next)
   {
     TABLE *table=tables->table;
-    if (grant_option && !thd->master_access &&
-       check_grant_all_columns(thd,SELECT_ACL,table) )
+    if (grant_option && !(table->grant.privilege &
+                         table->grant.want_privilege) &&
+       check_grant_all_columns(thd,SELECT_ACL,table))
       DBUG_RETURN(-1);
     if (!table_name || (!strcmp(table_name,tables->alias) &&
                        (!db_name || !tables->db ||

-- 
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe:    
http://lists.mysql.com/internals?unsub=gcdmd-internals@xxxxxxxxxxx