bk commit into 5.0 tree (acurtis:1.1818)

[antony]

Below is the list of changes that have just been committed into a local
5.0 repository of acurtis. When acurtis 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.1818 05/03/09 01:13:11 acurtis@stripped +1 -0
  Fix test after merge

  mysql-test/r/information_schema.result
    1.37 05/03/09 01:12:52 acurtis@stripped +1 -1
    Fix test after merge

# 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:	acurtis
# Host:	pcgem.rdg.cyberkinetica.com
# Root:	/var/db/bk/work-acurtis/bug3788.4

--- 1.36/mysql-test/r/information_schema.result	2005-03-08 18:52:55 +00:00
+++ 1.37/mysql-test/r/information_schema.result	2005-03-09 01:12:52 +00:00
@@ -258,7 +258,7 @@
 sub1		
 show create function sub2;
 Function	sql_mode	Create Function
-sub2		CREATE FUNCTION `test`.`sub2`(i int) RETURNS int
+sub2		CREATE FUNCTION `test`.`sub2`(i int) RETURNS int(11)
 return i+1
 drop function sub2;
 show create procedure sel2;