diff options
| author | Mats Kindahl <mats@sun.com> | 2010-03-22 13:12:57 +0100 |
|---|---|---|
| committer | Mats Kindahl <mats@sun.com> | 2010-03-22 13:12:57 +0100 |
| commit | cd7d8f98f8191641b0fe0e47cdc2427d8426f78e (patch) | |
| tree | 94e31ab5306d44bd1d32ce340ac9ec2a2f7e2136 /mysql-test | |
| parent | f172ddd655e8eda8be988c6f1365867da2dd27d7 (diff) | |
| parent | be16e48633b316732fbfc4e172966edd2b090ab5 (diff) | |
| download | mariadb-git-cd7d8f98f8191641b0fe0e47cdc2427d8426f78e.tar.gz | |
Merging with mysql-5.1-bugfixing.
Diffstat (limited to 'mysql-test')
| -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 601b364fbbe..4104ca44e66 100644 --- a/mysql-test/r/udf.result +++ b/mysql-test/r/udf.result @@ -38,8 +38,6 @@ ERROR HY000: Can't initialize function 'reverse_lookup'; Wrong number of argumen 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: Can't initialize function 'avgcost'; 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 7bf252040e5..9295969c05f 100644 --- a/mysql-test/t/udf.test +++ b/mysql-test/t/udf.test @@ -51,14 +51,17 @@ select lookup("localhost"); --error ER_CANT_INITIALIZE_UDF 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 ER_CANT_INITIALIZE_UDF select avgcost(); --error ER_CANT_INITIALIZE_UDF |