database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merge from 5.1 main

Browse Source
This commit is contained in:
Bjorn Munch
2011-03-11 10:07:34 +01:00
parent 037d9fae72 ba85e3cf54
commit 782b44bc7f
10 changed files with 533 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
View File

@ -128,8 +128,6 @@ root@localhost db_storedproc_1
drop user 'user_1'@'localhost';
DROP PROCEDURE sp3;
DROP FUNCTION fn1;
Warnings:
Warning 1403 There is no such grant defined for user 'user_1' on host 'localhost' on routine 'fn1'
Testcase 3.1.6.4:
-----------------

2
mysql-test/suite/funcs_1/r/memory_storedproc_06.result
View File

@ -129,8 +129,6 @@ root@localhost db_storedproc_1
drop user 'user_1'@'localhost';
DROP PROCEDURE sp3;
DROP FUNCTION fn1;
Warnings:
Warning 1403 There is no such grant defined for user 'user_1' on host 'localhost' on routine 'fn1'
Testcase 3.1.6.4:
-----------------

2
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
View File

@ -129,8 +129,6 @@ root@localhost db_storedproc_1
drop user 'user_1'@'localhost';
DROP PROCEDURE sp3;
DROP FUNCTION fn1;
Warnings:
Warning 1403 There is no such grant defined for user 'user_1' on host 'localhost' on routine 'fn1'
Testcase 3.1.6.4:
-----------------

4
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
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;