MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:dlenev Date:December 7 2005 1:55pm
Subject:bk commit into 5.0 tree (dlenev:1.1986) BUG#11555
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of dlenev. When dlenev 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
  1.1986 05/12/07 16:55:16 dlenev@stripped +1 -0
  Fixed sp-error.test result after merging fix for bug #11555 "Stored procedures:
  current SP tables locking make impossible view security" with main tree.

  mysql-test/r/sp-error.result
    1.98 05/12/07 16:55:08 dlenev@stripped +31 -31
    Fixed test result after merging fix for bug #11555 "Stored procedures: current
    SP tables locking make impossible view security" with main tree.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	dlenev
# Host:	brandersnatch.site
# Root:	/home/dlenev/src/mysql-5.0-bg11555-2

--- 1.97/mysql-test/r/sp-error.result	2005-12-07 14:38:13 +03:00
+++ 1.98/mysql-test/r/sp-error.result	2005-12-07 16:55:08 +03:00
@@ -1057,6 +1057,37 @@
 mysqltest2	p1	PROCEDURE	root@localhost	0000-00-00 00:00:00	0000-00-00 00:00:00	DEFINER	
 drop database mysqltest2;
 use test;
+DROP FUNCTION IF EXISTS bug13012|
+CREATE FUNCTION bug13012() RETURNS INT
+BEGIN
+REPAIR TABLE t1;
+RETURN 1;
+END|
+ERROR 0A000: Not allowed to return a result set from a function
+CREATE FUNCTION bug13012() RETURNS INT
+BEGIN
+BACKUP TABLE t1 TO '/tmp';
+RETURN 1;
+END|
+ERROR 0A000: Not allowed to return a result set from a function
+CREATE FUNCTION bug13012() RETURNS INT
+BEGIN
+RESTORE TABLE t1 FROM '/tmp';
+RETURN 1;
+END|
+ERROR 0A000: Not allowed to return a result set from a function
+create table t1 (a int)|
+CREATE PROCEDURE bug13012_1() REPAIR TABLE t1|
+CREATE FUNCTION bug13012_2() RETURNS INT
+BEGIN
+CALL bug13012_1();
+RETURN 1;
+END|
+SELECT bug13012_2()|
+ERROR 0A000: Not allowed to return a result set from a function
+drop table t1|
+drop procedure bug13012_1|
+drop function bug13012_2|
 drop function if exists bug11555_1;
 drop function if exists bug11555_2;
 drop view if exists v1, v2, v3, v4;
@@ -1097,34 +1128,3 @@
 drop function bug11555_1;
 drop table t1;
 drop view v1;
-DROP FUNCTION IF EXISTS bug13012|
-CREATE FUNCTION bug13012() RETURNS INT
-BEGIN
-REPAIR TABLE t1;
-RETURN 1;
-END|
-ERROR 0A000: Not allowed to return a result set from a function
-CREATE FUNCTION bug13012() RETURNS INT
-BEGIN
-BACKUP TABLE t1 TO '/tmp';
-RETURN 1;
-END|
-ERROR 0A000: Not allowed to return a result set from a function
-CREATE FUNCTION bug13012() RETURNS INT
-BEGIN
-RESTORE TABLE t1 FROM '/tmp';
-RETURN 1;
-END|
-ERROR 0A000: Not allowed to return a result set from a function
-create table t1 (a int)|
-CREATE PROCEDURE bug13012_1() REPAIR TABLE t1|
-CREATE FUNCTION bug13012_2() RETURNS INT
-BEGIN
-CALL bug13012_1();
-RETURN 1;
-END|
-SELECT bug13012_2()|
-ERROR 0A000: Not allowed to return a result set from a function
-drop table t1|
-drop procedure bug13012_1|
-drop function bug13012_2|
Thread
bk commit into 5.0 tree (dlenev:1.1986) BUG#11555dlenev7 Dec