Commit 4ebef052 authored by unknown's avatar unknown
Browse files

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 

into  rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.1-opt


mysql-test/r/grant.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents 036314d9 cab41266

mysql-test/r/grant.result

+20 −0
Original line number Diff line number Diff line
@@ -1037,4 +1037,24 @@ REVOKE EXECUTE ON PROCEDURE p1 FROM 1234567890abcdefGHIKL@localhost; 
ERROR HY000: String '1234567890abcdefGHIKL' is too long for user name (should be no longer than 16)

REVOKE EXECUTE ON PROCEDURE t1 FROM some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY;

ERROR HY000: String '1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY' is too long for host name (should be no longer than 60)

CREATE USER bug23556@localhost;

CREATE DATABASE bug23556;

GRANT SELECT ON bug23556.* TO bug23556@localhost;

USE bug23556;

CREATE TABLE t1 (a INT PRIMARY KEY);

INSERT INTO t1 VALUES (1),(2),(3),(4),(5);

GRANT DELETE ON t1 TO bug23556@localhost;

USE bug23556;

TRUNCATE t1;

ERROR 42000: DROP command denied to user 'bug23556'@'localhost' for table 't1'

USE bug23556;

REVOKE DELETE ON t1 FROM bug23556@localhost;

GRANT DROP ON t1 TO bug23556@localhost;

USE bug23556;

TRUNCATE t1;

USE bug23556;

DROP TABLE t1;

USE test;

DROP DATABASE bug23556;

DROP USER bug23556@localhost;

End of 5.0 tests

mysql-test/r/trigger-grant.result

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ CREATE TABLE t1(num_value INT); 
CREATE TABLE t2(user_str TEXT);



---> connection: default

GRANT INSERT, DELETE ON mysqltest_db1.t1 TO mysqltest_dfn@localhost;

GRANT INSERT, DELETE ON mysqltest_db1.t2 TO mysqltest_dfn@localhost;

GRANT INSERT, DROP ON mysqltest_db1.t1 TO mysqltest_dfn@localhost;

GRANT INSERT, DROP ON mysqltest_db1.t2 TO mysqltest_dfn@localhost;



---> connection: default

GRANT SUPER ON *.* TO mysqltest_dfn@localhost;

mysql-test/t/grant.test

+35 −0
Original line number Diff line number Diff line
@@ -939,4 +939,39 @@ REVOKE EXECUTE ON PROCEDURE p1 FROM 1234567890abcdefGHIKL@localhost; 


--error ER_WRONG_STRING_LENGTH

REVOKE EXECUTE ON PROCEDURE t1 FROM some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY;





#

# BUG#23556: TRUNCATE TABLE still maps to DELETE

#

CREATE USER bug23556@localhost;

CREATE DATABASE bug23556;

GRANT SELECT ON bug23556.* TO bug23556@localhost;

connect (bug23556,localhost,bug23556,,bug23556);



connection default;

USE bug23556;

CREATE TABLE t1 (a INT PRIMARY KEY); INSERT INTO t1 VALUES (1),(2),(3),(4),(5);

GRANT DELETE ON t1 TO bug23556@localhost;



connection bug23556;

USE bug23556;

--error ER_TABLEACCESS_DENIED_ERROR

TRUNCATE t1;



connection default;

USE bug23556;

REVOKE DELETE ON t1 FROM bug23556@localhost;

GRANT DROP ON t1 TO bug23556@localhost;



connection bug23556;

USE bug23556;

TRUNCATE t1;



connection default;

USE bug23556;

DROP TABLE t1;

USE test;

DROP DATABASE bug23556;

DROP USER bug23556@localhost;

--echo End of 5.0 tests

mysql-test/t/trigger-grant.test

+2 −2
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ CREATE TABLE t2(user_str TEXT); 
--echo

--echo ---> connection: default



GRANT INSERT, DELETE ON mysqltest_db1.t1 TO mysqltest_dfn@localhost;

GRANT INSERT, DELETE ON mysqltest_db1.t2 TO mysqltest_dfn@localhost;

GRANT INSERT, DROP ON mysqltest_db1.t1 TO mysqltest_dfn@localhost;

GRANT INSERT, DROP ON mysqltest_db1.t2 TO mysqltest_dfn@localhost;



#

# Check that the user must have TRIGGER privilege to create a trigger.

sql/sql_parse.cc

+1 −1
Original line number Diff line number Diff line
@@ -3555,7 +3555,7 @@ mysql_execute_command(THD *thd) 
      break;

    }

    DBUG_ASSERT(first_table == all_tables && first_table != 0);

    if (check_one_table_access(thd, DELETE_ACL, all_tables))

    if (check_one_table_access(thd, DROP_ACL, all_tables))

      goto error;

    /*

      Don't allow this within a transaction because we want to use