Below is the list of changes that have just been committed into a local
5.1 repository of davi. When davi does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2008-05-06 15:43:13-03:00, davi@stripped +6 -0
Bug#34108 "Drop function" (test "storedproc_06") returns different message (all handlers)
The problem is that the patch for Bug 33464 didn't update the
results of the test cases which caused the problem.
Dropping a stored routine also revoke privileges for all users
on the stored routine and errors about missing grants are converted
into warnings. Before Bug 33464 such errors could be incorrectly
returned to the user, which would later trigger a assertion due to
multiple errors being set.
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result@stripped, 2008-05-06 15:43:03-03:00, davi@stripped +1 -3
Update test case result, grants were already dropped.
mysql-test/suite/funcs_1/r/memory_storedproc_06.result@stripped, 2008-05-06 15:43:03-03:00, davi@stripped +1 -3
Update test case result, grants were already dropped.
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result@stripped, 2008-05-06 15:43:03-03:00, davi@stripped +1 -3
Update test case result, grants were already dropped.
mysql-test/suite/funcs_1/r/ndb_storedproc_06.result@stripped, 2008-05-06 15:43:03-03:00, davi@stripped +1 -3
Update test case result, grants were already dropped.
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc@stripped, 2008-05-06 15:43:03-03:00, davi@stripped +4 -0
Add comment regarding bug revealed by test case.
mysql-test/suite/funcs_1/t/disabled.def@stripped, 2008-05-06 15:43:03-03:00, davi@stripped +0 -5
Re-enable test cases, bug has been fixed.
diff -Nrup a/mysql-test/suite/funcs_1/r/innodb_storedproc_06.result b/mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
--- a/mysql-test/suite/funcs_1/r/innodb_storedproc_06.result 2008-03-31 18:34:57 -03:00
+++ b/mysql-test/suite/funcs_1/r/innodb_storedproc_06.result 2008-05-06 15:43:03 -03:00
@@ -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:
-----------------
diff -Nrup a/mysql-test/suite/funcs_1/r/memory_storedproc_06.result b/mysql-test/suite/funcs_1/r/memory_storedproc_06.result
--- a/mysql-test/suite/funcs_1/r/memory_storedproc_06.result 2008-03-31 18:34:57 -03:00
+++ b/mysql-test/suite/funcs_1/r/memory_storedproc_06.result 2008-05-06 15:43:03 -03:00
@@ -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:
-----------------
diff -Nrup a/mysql-test/suite/funcs_1/r/myisam_storedproc_06.result b/mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
--- a/mysql-test/suite/funcs_1/r/myisam_storedproc_06.result 2008-03-31 18:34:57 -03:00
+++ b/mysql-test/suite/funcs_1/r/myisam_storedproc_06.result 2008-05-06 15:43:03 -03:00
@@ -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:
-----------------
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_storedproc_06.result b/mysql-test/suite/funcs_1/r/ndb_storedproc_06.result
--- a/mysql-test/suite/funcs_1/r/ndb_storedproc_06.result 2008-04-01 08:18:29 -03:00
+++ b/mysql-test/suite/funcs_1/r/ndb_storedproc_06.result 2008-05-06 15:43:03 -03:00
@@ -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:
-----------------
diff -Nrup a/mysql-test/suite/funcs_1/storedproc/storedproc_06.inc b/mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
--- a/mysql-test/suite/funcs_1/storedproc/storedproc_06.inc 2008-03-31 18:34:58 -03:00
+++ b/mysql-test/suite/funcs_1/storedproc/storedproc_06.inc 2008-05-06 15:43:03 -03:00
@@ -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;
diff -Nrup a/mysql-test/suite/funcs_1/t/disabled.def b/mysql-test/suite/funcs_1/t/disabled.def
--- a/mysql-test/suite/funcs_1/t/disabled.def 2008-03-07 16:18:12 -03:00
+++ b/mysql-test/suite/funcs_1/t/disabled.def 2008-05-06 15:43:03 -03:00
@@ -9,8 +9,3 @@
# Don't use any TAB characters for whitespace.
#
##############################################################################
-
-innodb_storedproc_06 : bug#33464 DROP FUNCTION let server hang
-myisam_storedproc_06 : bug#33464 DROP FUNCTION let server hang
-memory_storedproc_06 : bug#33464 DROP FUNCTION let server hang
-ndb_storedproc_06 : bug#33464 DROP FUNCTION let server hang
| Thread |
|---|
| • bk commit into 5.1 tree (davi:1.2609) BUG#34108 | Davi Arnaut | 6 May |
