summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Black <daniel@linux.ibm.com>2020-05-18 16:37:51 +1000
committerGitHub <noreply@github.com>2020-05-18 09:37:51 +0300
commit7baa40dffae4c8175913ab58d320684f1d5f1bad (patch)
treee2f46548b39cd9784d573c3e98ed68709dac1066
parent3df297271a02ef13babae6ff6a7e47a6bdb7d538 (diff)
downloadmariadb-git-7baa40dffae4c8175913ab58d320684f1d5f1bad.tar.gz
MDEV-21976: mtr main.udf - broaden localhost (#1543)
Localhost, depending on the platform can return any 127.0.0.1/8 address.
-rw-r--r--mysql-test/r/udf.result6
-rw-r--r--mysql-test/t/udf.test2
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/udf.result b/mysql-test/r/udf.result
index bcfc9941db9..c74b89a1b96 100644
--- a/mysql-test/r/udf.result
+++ b/mysql-test/r/udf.result
@@ -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");
diff --git a/mysql-test/t/udf.test b/mysql-test/t/udf.test
index 4ee412f80d8..e9ba8e941e3 100644
--- a/mysql-test/t/udf.test
+++ b/mysql-test/t/udf.test
@@ -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();