diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-04-28 14:52:24 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-04-28 14:52:24 +0200 |
| commit | b1e00b6be81c80b09d11085d77d86978e26df988 (patch) | |
| tree | bb1fdd7363fbf2580572ac9a56dbd4c933cc4c0d /mysql-test/t/udf.test | |
| parent | 1f683a7270e63abfadce20c6f51370621ff065e1 (diff) | |
| parent | c9cfd2df5f2f58c2cdf716999ebea252c307333f (diff) | |
| download | mariadb-git-b1e00b6be81c80b09d11085d77d86978e26df988.tar.gz | |
Merge MySQL 5.1.46 into MariaDB.
Still two test failures to be solved: main.myisam and main.subselect.
Diffstat (limited to 'mysql-test/t/udf.test')
| -rw-r--r-- | mysql-test/t/udf.test | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/t/udf.test b/mysql-test/t/udf.test index 642f77fd741..283bb1a833c 100644 --- a/mysql-test/t/udf.test +++ b/mysql-test/t/udf.test @@ -51,11 +51,14 @@ 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); + +# This function call may return different results depending on platform, +# so ignore results (see Bug#52060). select reverse_lookup("localhost"); --enable_result_log |