Commit 4038188c authored by unknown's avatar unknown
Browse files

Merge rurik.mysql.com:/home/igor/mysql-5.0 

into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
parents 6a0695fe ccb796a9

mysql-test/r/sp-security.result

+12 −0
Original line number Diff line number Diff line
@@ -251,3 +251,15 @@ drop procedure mysqltest_1.p1; 
drop database mysqltest_1;

revoke usage on *.* from mysqltest_1@localhost;

drop user mysqltest_1@localhost;

drop function if exists bug12812|

create function bug12812() returns char(2)

begin

return 'ok';

end;

create user user_bug12812@localhost IDENTIFIED BY 'ABC'|

SELECT test.bug12812()|

ERROR 42000: execute command denied to user 'user_bug12812'@'localhost' for routine 'test.bug12812'

CREATE VIEW v1 AS SELECT test.bug12812()|

ERROR 42000: execute command denied to user 'user_bug12812'@'localhost' for routine 'test.bug12812'

DROP USER user_bug12812@localhost|

drop function bug12812|

mysql-test/r/sp.result

+0 −12
Original line number Diff line number Diff line
@@ -3206,18 +3206,6 @@ set f1= concat( 'hello', f1 ); 
return f1;

end|

drop function bug9048|

drop function if exists bug12812|

create function bug12812() returns char(2)

begin

return 'ok';

end;

create user user_bug12812@localhost IDENTIFIED BY 'ABC'|

SELECT test.bug12812()|

ERROR 42000: execute command denied to user 'user_bug12812'@'localhost' for routine 'test.bug12812'

CREATE VIEW v1 AS SELECT test.bug12812()|

ERROR 42000: execute command denied to user 'user_bug12812'@'localhost' for routine 'test.bug12812'

DROP USER user_bug12812@localhost|

drop function bug12812|

drop procedure if exists bug12849_1|

create procedure bug12849_1(inout x char) select x into x|

set @var='a'|

mysql-test/t/sp-security.test

+24 −0
Original line number Diff line number Diff line
@@ -412,4 +412,28 @@ drop database mysqltest_1; 
revoke usage on *.* from mysqltest_1@localhost;

drop user mysqltest_1@localhost;



#

# BUG#12812 create view calling a function works without execute right

#           on function

delimiter |;

--disable_warnings

drop function if exists bug12812|

--enable_warnings

create function bug12812() returns char(2)

begin

  return 'ok';

end;

create user user_bug12812@localhost IDENTIFIED BY 'ABC'|

--replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK

connect (test_user_12812,localhost,user_bug12812,ABC,test)|

--error 1370

SELECT test.bug12812()|

--error 1370

CREATE VIEW v1 AS SELECT test.bug12812()|

# Cleanup

connection default|

disconnect test_user_12812|

DROP USER user_bug12812@localhost|

drop function bug12812|

delimiter ;|

# End of 5.0 bugs.

mysql-test/t/sp.test

+0 −22
Original line number Diff line number Diff line
@@ -4037,28 +4037,6 @@ begin 
end|

drop function bug9048|



#

# BUG#12812 create view calling a function works without execute right

#           on function

--disable_warnings

drop function if exists bug12812|

--enable_warnings

create function bug12812() returns char(2)

begin

  return 'ok';

end;

create user user_bug12812@localhost IDENTIFIED BY 'ABC'|

--replace_result $MASTER_MYPORT MYSQL_PORT $MASTER_MYSOCK MYSQL_SOCK

connect (test_user_12812,localhost,user_bug12812,ABC,test)|

--error 1370

SELECT test.bug12812()|

--error 1370

CREATE VIEW v1 AS SELECT test.bug12812()|

# Cleanup

connection default|

disconnect test_user_12812|

DROP USER user_bug12812@localhost|

drop function bug12812|

# Bug #12849 Stored Procedure: Crash on procedure call with CHAR type

# 'INOUT' parameter

#