List:Commits« Previous MessageNext Message »
From:pem Date:January 31 2006 3:27pm
Subject:bk commit into 5.0 tree (pem:1.2019) BUG#14270
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of pem. When pem 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.2019 06/01/31 16:27:57 pem@stripped +2 -0
  Added test case for BUG#14270: Stored procedures: crash if load index
    which was fixed by earlier changesets; LOAD INDEX is not allowed in functions.
    Also testing CACHE INDEX, while OPTIMIZE and CHECK were covered by existing tests already.

  mysql-test/t/sp-error.test
    1.102 06/01/31 16:27:43 pem@stripped +29 -0
    New test case for BUG#14270.

  mysql-test/r/sp-error.result
    1.101 06/01/31 16:27:43 pem@stripped +16 -0
    Updated result for new test case (BUG#14270).

# 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:	pem
# Host:	pem.mysql.com
# Root:	/extern/mysql/work/cantrepeat/mysql-5.0

--- 1.100/mysql-test/r/sp-error.result	2006-01-19 11:48:01 +01:00
+++ 1.101/mysql-test/r/sp-error.result	2006-01-31 16:27:43 +01:00
@@ -1147,3 +1147,19 @@
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment
 test	 bug15658	PROCEDURE	root@localhost	0000-00-00 00:00:00	0000-00-00 00:00:00	DEFINER	
 drop procedure ` bug15658`;
+drop function if exists bug14270;
+drop table if exists t1;
+create table t1 (s1 int primary key);
+create function bug14270() returns int
+begin
+load index into cache t1;
+return 1;
+end|
+ERROR 0A000: Not allowed to return a result set from a function
+create function bug14270() returns int
+begin
+cache index t1 key (`primary`) in keycache1;
+return 1;
+end|
+ERROR 0A000: Not allowed to return a result set from a function
+drop table t1;

--- 1.101/mysql-test/t/sp-error.test	2006-01-11 15:10:57 +01:00
+++ 1.102/mysql-test/t/sp-error.test	2006-01-31 16:27:43 +01:00
@@ -1644,6 +1644,35 @@
 
 
 #
+# BUG#14270: Stored procedures: crash if load index
+#
+--disable_warnings
+drop function if exists bug14270;
+drop table if exists t1;
+--enable_warnings
+
+create table t1 (s1 int primary key);
+
+delimiter |;
+--error ER_SP_NO_RETSET
+create function bug14270() returns int
+begin
+  load index into cache t1;
+  return 1;
+end|
+
+--error ER_SP_NO_RETSET
+create function bug14270() returns int
+begin
+  cache index t1 key (`primary`) in keycache1;
+  return 1;
+end|
+delimiter ;|
+
+drop table t1;
+
+
+#
 # BUG#NNNN: New bug synopsis
 #
 #--disable_warnings
Thread
bk commit into 5.0 tree (pem:1.2019) BUG#14270pem31 Jan