merge 5.0->5.0-security
This commit is contained in:
commit
e2b44930cc
@ -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);
|
||||
|
@ -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);
|
||||
|
||||
# This function call may return different results depending on platform,
|
||||
# so ignore results (see Bug#52060).
|
||||
select reverse_lookup("localhost");
|
||||
--enable_result_log
|
||||
|
||||
select reverse_lookup("localhost");
|
||||
--error 0
|
||||
select avgcost();
|
||||
--error 0
|
||||
|
Loading…
x
Reference in New Issue
Block a user