bk commit into 4.0 tree (1.1451)

Below is the list of changes that have just been committed into a local
4.0 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.1451 03/04/29 14:13:22 Sinisa@xxxxxxxxxxxxxxxxxxxx +3 -0
  code cleanup

  sql/sql_base.cc
    1.156 03/04/29 14:13:15 Sinisa@xxxxxxxxxxxxxxxxxxxx +2 -1
    committing a fix in order to pull new stuff

  mysql-test/t/innodb.test
    1.41 03/04/29 14:13:15 Sinisa@xxxxxxxxxxxxxxxxxxxx +1 -1
    fixing test

  mysql-test/r/innodb.result
    1.63 03/04/29 14:13:15 Sinisa@xxxxxxxxxxxxxxxxxxxx +1 -0
    fixing result

# 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-4.0

--- 1.155/sql/sql_base.cc       Thu Mar 13 18:52:53 2003
+++ 1.156/sql/sql_base.cc       Tue Apr 29 14:13:15 2003
@@ -1984,7 +1984,8 @@
                        (!db_name || !strcmp(tables->db,db_name))))
     {
       /* Ensure that we have access right to all columns */
-      if (grant_option && !thd->master_access &&
+      if (grant_option && !((thd->master_access | table->grant.privilege) & 
+                          table->grant.want_privilege)  &&
          check_grant_all_columns(thd,SELECT_ACL,table) )
        DBUG_RETURN(-1);
       Field **ptr=table->field,*field;

--- 1.62/mysql-test/r/innodb.result     Sat Apr 26 16:44:39 2003
+++ 1.63/mysql-test/r/innodb.result     Tue Apr 29 14:13:15 2003
@@ -1219,6 +1219,7 @@
 1      2
 1      3
 2      1
+drop table t1;
 create table t1 (a int not null auto_increment primary key, b int, c int, 
key(c)) type=innodb;
 create table t2 (a int not null auto_increment primary key, b int);
 insert into t1 (b) values (null),(null),(null),(null),(null),(null),(null);

--- 1.40/mysql-test/t/innodb.test       Sat Apr 26 16:44:39 2003
+++ 1.41/mysql-test/t/innodb.test       Tue Apr 29 14:13:15 2003
@@ -809,7 +809,7 @@
 create table t1  ( pk         int primary key,    parent     int not null,    
child      int not null,       index (parent)  ) type = innodb;
 insert into t1 values   (1,0,4),  (2,1,3),  (3,2,1),  (4,1,2);
 select distinct  parent,child   from t1   order by parent;
-drop table t1,t2;
+drop table t1;
 
 #
 # Test that MySQL priorities clustered indexes

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