bk commit into 5.1 tree (mats:1.2538)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats 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, 2007-03-30 14:05:34+02:00, mats@romeo.(none) +2 -0
  Patching tests to make them pass on all platforms.

  mysql-test/include/rpl_udf.inc@stripped, 2007-03-30 14:05:26+02:00, mats@romeo.(none) +1 -0
    Adding a replace on the slave side as well to make test pass on both
    Unix and Windows.

  mysql-test/r/rpl_udf.result@stripped, 2007-03-30 14:05:26+02:00, mats@romeo.(none) +4 -4
    Result change

# 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:	mats
# Host:	romeo.(none)
# Root:	/home/bk/w3464-mysql-5.1-new-rpl

--- 1.2/mysql-test/include/rpl_udf.inc	2007-03-30 14:05:42 +02:00
+++ 1.3/mysql-test/include/rpl_udf.inc	2007-03-30 14:05:42 +02:00
@@ -45,6 +45,7 @@
 # Check to see that UDF CREATE statements were replicated
 --echo "Running on the slave"
 --enable_info
+--replace_column 3 UDF_LIB
 SELECT * FROM mysql.func;
 --disable_info
 

--- 1.3/mysql-test/r/rpl_udf.result	2007-03-30 14:05:42 +02:00
+++ 1.4/mysql-test/r/rpl_udf.result	2007-03-30 14:05:42 +02:00
@@ -22,8 +22,8 @@
 "Running on the slave"
 SELECT * FROM mysql.func;
 name	ret	dl	type
-myfunc_double	1	udf_example.so	function
-myfunc_int	2	udf_example.so	function
+myfunc_double	1	UDF_LIB	function
+myfunc_int	2	UDF_LIB	function
 affected rows: 2
 "Running on the master"
 CREATE TABLE t1(sum INT, price FLOAT(24)) ENGINE=MyISAM;
@@ -174,8 +174,8 @@
 "Running on the slave"
 SELECT * FROM mysql.func;
 name	ret	dl	type
-myfunc_int	2	udf_example.so	function
-myfunc_double	1	udf_example.so	function
+myfunc_int	2	UDF_LIB	function
+myfunc_double	1	UDF_LIB	function
 affected rows: 2
 "Running on the master"
 CREATE TABLE t1(sum INT, price FLOAT(24)) ENGINE=MyISAM;