Commit 6a2ebf11 authored by davi@endora.local's avatar davi@endora.local
Browse files

Merge mysql.com:/Users/davi/mysql/bugs/34108-5.1 

into  mysql.com:/Users/davi/mysql/mysql-5.1-bugteam
parents e293389f 6a468737

mysql-test/suite/funcs_1/r/innodb_storedproc_06.result

+1 −3
Original line number Diff line number Diff line
@@ -132,9 +132,7 @@ drop user 'user_1'@'localhost'; 
DROP PROCEDURE sp3;

DROP FUNCTION fn1;

Warnings:

Error	1133	Can't find any matching row in the user table

Error	1269	Can't revoke all privileges for one or more of the requested users

Warning	1405	Failed to revoke all privileges to dropped routine

Warning	1403	There is no such grant defined for user 'user_1' on host 'localhost' on routine 'fn1'



Testcase 3.1.6.4:

-----------------

mysql-test/suite/funcs_1/r/memory_storedproc_06.result

+1 −3
Original line number Diff line number Diff line
@@ -132,9 +132,7 @@ drop user 'user_1'@'localhost'; 
DROP PROCEDURE sp3;

DROP FUNCTION fn1;

Warnings:

Error	1133	Can't find any matching row in the user table

Error	1269	Can't revoke all privileges for one or more of the requested users

Warning	1405	Failed to revoke all privileges to dropped routine

Warning	1403	There is no such grant defined for user 'user_1' on host 'localhost' on routine 'fn1'



Testcase 3.1.6.4:

-----------------

mysql-test/suite/funcs_1/r/myisam_storedproc_06.result

+1 −3
Original line number Diff line number Diff line
@@ -132,9 +132,7 @@ drop user 'user_1'@'localhost'; 
DROP PROCEDURE sp3;

DROP FUNCTION fn1;

Warnings:

Error	1133	Can't find any matching row in the user table

Error	1269	Can't revoke all privileges for one or more of the requested users

Warning	1405	Failed to revoke all privileges to dropped routine

Warning	1403	There is no such grant defined for user 'user_1' on host 'localhost' on routine 'fn1'



Testcase 3.1.6.4:

-----------------

mysql-test/suite/funcs_1/r/ndb_storedproc_06.result

+1 −3
Original line number Diff line number Diff line
@@ -132,9 +132,7 @@ drop user 'user_1'@'localhost'; 
DROP PROCEDURE sp3;

DROP FUNCTION fn1;

Warnings:

Error	1133	Can't find any matching row in the user table

Error	1269	Can't revoke all privileges for one or more of the requested users

Warning	1405	Failed to revoke all privileges to dropped routine

Warning	1403	There is no such grant defined for user 'user_1' on host 'localhost' on routine 'fn1'



Testcase 3.1.6.4:

-----------------

mysql-test/suite/funcs_1/storedproc/storedproc_06.inc

+4 −0
Original line number Diff line number Diff line
@@ -148,6 +148,10 @@ USE db_storedproc_1; 


drop user 'user_1'@'localhost';

DROP PROCEDURE sp3;

# This drop function shouldn't generated a warning as the

# privileges should have been removed when the user was

# dropped. Reported as Bug#36544 DROP USER does not remove

# stored function privileges

DROP FUNCTION fn1;