List:Internals« Previous MessageNext Message »
From:sanja Date:March 23 2004 3:15pm
Subject:bk commit into 3.23 tree (1.1435)
View as plain text  
Below is the list of changes that have just been committed into a local
3.23 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1435 04/03/23 17:15:20 bell@stripped +2 -0
  used right table for grants check (BUG#3270)

  sql/sql_parse.cc
    1.161 04/03/23 17:15:18 bell@stripped +1 -1
    used right table for grants check (BUG#3270)

  mysql-test/t/alter_table.test
    1.8 04/03/23 17:15:18 bell@stripped +19 -0
    test for BUG#3270 added

# 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-alter-3.23

--- 1.160/sql/sql_parse.cc	Mon Sep 29 22:42:20 2003
+++ 1.161/sql/sql_parse.cc	Tue Mar 23 17:15:18 2004
@@ -1446,7 +1446,7 @@
 	  tmp_table.real_name=lex->name;
 	  tmp_table.db=lex->db;
 	  tmp_table.grant.privilege=priv;
-	  if (check_grant(thd,INSERT_ACL | CREATE_ACL,tables))
+	  if (check_grant(thd,INSERT_ACL | CREATE_ACL, &tmp_table))
 	    goto error;
 	}
       }

--- 1.7/mysql-test/t/alter_table.test	Fri Feb  6 13:28:57 2004
+++ 1.8/mysql-test/t/alter_table.test	Tue Mar 23 17:15:18 2004
@@ -3,6 +3,8 @@
 #
 
 drop table if exists t1;
+drop database if exists mysqltest;
+
 create table t1 (
 col1 int not null auto_increment primary key,
 col2 varchar(30) not null,
@@ -98,4 +100,21 @@
 select * from t1;
 select * from mysqltest.t1;
 drop table t1;
+drop database mysqltest;
+
+#
+# Rights for renaming test (Bug #3270)
+#
+connect (root,localhost,root,,test,0,mysql-master.sock);
+connection root;
+--disable_warnings
+create database mysqltest;
+--enable_warnings
+create table mysqltest.t1 (a int,b int,c int);
+grant all on mysqltest.t1 to mysqltest_1@localhost;
+connect (user1,localhost,mysqltest_1,,mysqltest,0,mysql-master.sock);
+connection user1;
+-- error 1142
+alter table t1 rename t2;
+connection root;
 drop database mysqltest;
Thread
bk commit into 3.23 tree (1.1435)sanja23 Mar