1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge 5.0->5.0-security

Browse Source
This commit is contained in:
Georgi Kodinov 2011-02-10 12:07:16 +02:00
commit e2b44930cc
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

@ -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(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: wrong number of arguments: AVGCOST() requires two arguments ERROR HY000: 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 0 --error 0
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 0 --error 0
select avgcost(); select avgcost();
--error 0 --error 0