Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl

into  mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl

mysql-test/include/rpl_udf.inc

@@ -45,6 +45,7 @@ sync_with_master;
 # 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
 

mysql-test/r/rpl_udf.result

@@ -22,8 +22,8 @@ affected rows: 2
 "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 @@ affected rows: 2
 "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;