mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merging with mysql-5.1-bugfixing.

Browse source
This commit is contained in:
Mats Kindahl 2010-03-22 13:12:57 +01:00
commit cd7d8f98f8
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/r/udf.result
View file

@ -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(127,0,0,1); select reverse_lookup(127,0,0,1);
select reverse_lookup("localhost"); select reverse_lookup("localhost");
reverse_lookup("localhost")
NULL
select avgcost(); select avgcost();
ERROR HY000: Can't initialize function 'avgcost'; wrong number of arguments: AVGCOST() requires two arguments ERROR HY000: Can't initialize function 'avgcost'; wrong number of arguments: AVGCOST() requires two arguments
select avgcost(100,23.76); select avgcost(100,23.76);

7
mysql-test/t/udf.test
View file

@ -51,14 +51,17 @@ select lookup("localhost");
--error ER_CANT_INITIALIZE_UDF --error ER_CANT_INITIALIZE_UDF
select reverse_lookup(); 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 # depending on configuration, so just call them and don't log the result
--disable_result_log --disable_result_log
select reverse_lookup("127.0.0.1"); select reverse_lookup("127.0.0.1");
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 --enable_result_log
select reverse_lookup("localhost");
--error ER_CANT_INITIALIZE_UDF --error ER_CANT_INITIALIZE_UDF
select avgcost(); select avgcost();
--error ER_CANT_INITIALIZE_UDF --error ER_CANT_INITIALIZE_UDF