Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060721184912|58688

mysql-test/r/sp.result

@@ -2383,6 +2383,16 @@ Warning	1329	No data - zero rows fetched, selected, or processed
 drop procedure bug4579_1|
 drop procedure bug4579_2|
 drop table t3|
+drop procedure if exists bug2773|
+create function bug2773() returns int return null|
+create table t3 as select bug2773()|
+show create table t3|
+Table	Create Table
+t3	CREATE TABLE `t3` (
+  `bug2773()` int(11) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+drop table t3|
+drop function bug2773|
 drop procedure if exists bug3788|
 create function bug3788() returns date return cast("2005-03-04" as date)|
 select bug3788()|

mysql-test/t/sp.test

@@ -2828,8 +2828,6 @@ drop procedure bug4579_1|
 drop procedure bug4579_2|
 drop table t3|
 
-# MASV : Disable test case until bug#21039 is fixed
---disable_parsing
 #
 # BUG#2773: Function's data type ignored in stored procedures
 #
@@ -2842,7 +2840,6 @@ create table t3 as select bug2773()|
 show create table t3|
 drop table t3|
 drop function bug2773|
---enable_parsing
 
 #
 # BUG#3788: Stored procedure packet error