database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.1 into 10.2

Browse Source
This commit is contained in:
Marko Mäkelä
2020-05-18 09:43:58 +03:00
parent c995090a53 7baa40dffa
commit d0e3b0eea6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/udf.result
View File

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

2
mysql-test/t/udf.test
View File

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