merge mysql-5.1->mysql-5.5

This commit is contained in:
Georgi Kodinov 2011-03-09 16:04:50 +02:00
commit 01f218e896
7 changed files with 454 additions and 56 deletions

View file

@ -149,10 +149,6 @@ 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;