diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-18 09:43:58 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-18 09:43:58 +0300 |
| commit | d0e3b0eea660061e8af8ad7d93c20ab1364cd5bb (patch) | |
| tree | 7d9ff52afcc5f1a48949dfa87dceaf1b8a2264aa | |
| parent | c995090a537b79b4ab92e7cae0f74560325965d5 (diff) | |
| parent | 7baa40dffae4c8175913ab58d320684f1d5f1bad (diff) | |
| download | mariadb-git-d0e3b0eea660061e8af8ad7d93c20ab1364cd5bb.tar.gz | |
Merge 10.1 into 10.2
| -rw-r--r-- | mysql-test/r/udf.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/udf.test | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/udf.result b/mysql-test/r/udf.result index 3a84caa828a..56bc2e26b2a 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 881e753de7d..7cdff2b6000 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(); |