diff options
| author | John H. Embretsen <john.embretsen@oracle.com> | 2011-02-09 10:50:09 +0100 |
|---|---|---|
| committer | John H. Embretsen <john.embretsen@oracle.com> | 2011-02-09 10:50:09 +0100 |
| commit | d9a768f7668f8935ec12fed5b3ede1ac354b7853 (patch) | |
| tree | f6e618f1a0020e2de4981d62f2928d4c4e286933 | |
| parent | d2495d17961995cf661ff7e1e89738b922fefe93 (diff) | |
| download | mariadb-git-d9a768f7668f8935ec12fed5b3ede1ac354b7853.tar.gz | |
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.
| -rw-r--r-- | mysql-test/r/udf.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/udf.test | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/mysql-test/r/udf.result b/mysql-test/r/udf.result index 92185962d1f..27cd8e640f3 100644 --- a/mysql-test/r/udf.result +++ b/mysql-test/r/udf.result @@ -40,8 +40,6 @@ ERROR HY000: Wrong number of arguments to reverse_lookup; Use the source 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); diff --git a/mysql-test/t/udf.test b/mysql-test/t/udf.test index 648494b3df9..3633c77be0d 100644 --- a/mysql-test/t/udf.test +++ b/mysql-test/t/udf.test @@ -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 |