bk commit into 5.1 tree (msvensson:1.2236)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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, 2006-07-26 14:27:52+02:00, msvensson@neptunus.(none) +2 -0
  Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060721184912|58688

  mysql-test/r/sp.result@stripped, 2006-07-26 14:27:51+02:00, msvensson@neptunus.(none) +0 -0
    Exclude

  mysql-test/t/sp.test@stripped, 2006-07-26 14:27:51+02:00, msvensson@neptunus.(none) +0 -0
    Exclude

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint

--- 1.211/mysql-test/r/sp.result	2006-07-26 14:27:58 +02:00
+++ 1.212/mysql-test/r/sp.result	2006-07-26 14:27:58 +02:00
@@ -2383,6 +2383,16 @@ Warning	1329	No data - zero rows fetched
 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()|

--- 1.194/mysql-test/t/sp.test	2006-07-26 14:27:58 +02:00
+++ 1.195/mysql-test/t/sp.test	2006-07-26 14:27:58 +02:00
@@ -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