bzr push into mysql-5.0 branch (john.embretsen:2901 to 2902) Bug#52060

[John H. Embretsen]

 2902 John H. Embretsen	2011-02-09
      Backport to 5.0: Fix for Bug#52060 - test udf fails on Snow Leopard.
      Reverse DNS lookup of "localhost" returns "broadcasthost" on Snow Leopard (Mac), and NULL on most others.
      Simply ignore the output, as this is not an essential part of UDF testing.

    modified:
      mysql-test/r/udf.result
      mysql-test/t/udf.test
 2901 Jonathan Perkin	2011-02-08 [merge]
      Merge from mysql-5.0.92-release

    modified:
      README
      mysql-test/r/func_like.result
      mysql-test/r/func_misc.result
      mysql-test/r/grant.result
      mysql-test/r/innodb_mysql.result
      mysql-test/r/join.result
      mysql-test/r/subselect.result
      mysql-test/r/subselect4.result
      mysql-test/r/user_var.result
      mysql-test/t/func_like.test
      mysql-test/t/func_misc.test
      mysql-test/t/grant.test
      mysql-test/t/innodb_mysql.test
      mysql-test/t/join.test
      mysql-test/t/subselect.test
      mysql-test/t/subselect4.test
      mysql-test/t/user_var.test
      sql/field.cc
      sql/item_cmpfunc.cc
      sql/item_func.cc
      sql/item_func.h
      sql/sql_base.cc
      sql/sql_select.cc
      sql/sql_select.h
=== modified file 'mysql-test/r/udf.result'
--- a/mysql-test/r/udf.result	2009-04-14 17:20:13 +0000
+++ b/mysql-test/r/udf.result	2011-02-09 09:50:09 +0000
@@ -40,8 +40,6 @@ ERROR HY000: Wrong number of arguments t
 select reverse_lookup("127.0.0.1");
 select reverse_lookup(127,0,0,1);
 select reverse_lookup("localhost");
-reverse_lookup("localhost")
-NULL
 select avgcost();
 ERROR HY000: wrong number of arguments: AVGCOST() requires two arguments
 select avgcost(100,23.76);

=== modified file 'mysql-test/t/udf.test'
--- a/mysql-test/t/udf.test	2007-11-27 15:16:52 +0000
+++ b/mysql-test/t/udf.test	2011-02-09 09:50:09 +0000
@@ -51,14 +51,17 @@ select lookup("localhost");
 --error 0
 select reverse_lookup();
 
-# These two functions should return "localhost", but it's
+# These two function calls should return "localhost", but it's
 # depending on configuration, so just call them and don't log the result
 --disable_result_log
 select reverse_lookup("127.0.0.1");
 select reverse_lookup(127,0,0,1);
---enable_result_log
 
+# This function call may return different results depending on platform,
+# so ignore results (see Bug#52060).
 select reverse_lookup("localhost");
+--enable_result_log
+
 --error 0
 select avgcost();
 --error 0

No bundle (reason: useless for push emails).