diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-02-10 12:07:16 +0200 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-02-10 12:07:16 +0200 |
| commit | 779c42ddb6ab54960cce482d89037c132e850068 (patch) | |
| tree | 0176bae8126842a12665b46d7f2b69199252a673 | |
| parent | bc35f8cdf1a98e0a1d97c807b4bb9e11937a92c6 (diff) | |
| parent | d9a768f7668f8935ec12fed5b3ede1ac354b7853 (diff) | |
| download | mariadb-git-779c42ddb6ab54960cce482d89037c132e850068.tar.gz | |
merge 5.0->5.0-security
| -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 |