Merge 10.1 into 10.2

This commit is contained in:
Marko Mäkelä 2020-05-18 09:43:58 +03:00
commit d0e3b0eea6
2 changed files with 4 additions and 4 deletions

View file

@ -30,9 +30,9 @@ lookup("127.0.0.1")
127.0.0.1
select lookup(127,0,0,1);
ERROR HY000: Can't initialize function 'lookup'; Wrong arguments to lookup; Use the source
select lookup("localhost");
lookup("localhost")
127.0.0.1
select lookup("localhost") rlike '^127\.\\d+\.\\d+.\\d+$';
lookup("localhost") rlike '^127\.\\d+\.\\d+.\\d+$'
1
select reverse_lookup();
ERROR HY000: Can't initialize function 'reverse_lookup'; Wrong number of arguments to reverse_lookup; Use the source
select reverse_lookup("127.0.0.1");

View file

@ -47,7 +47,7 @@ select lookup();
select lookup("127.0.0.1");
--error ER_CANT_INITIALIZE_UDF
select lookup(127,0,0,1);
select lookup("localhost");
select lookup("localhost") rlike '^127\.\\d+\.\\d+.\\d+$';
--error ER_CANT_INITIALIZE_UDF
select reverse_lookup();