diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-10-16 12:43:24 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-10-16 21:40:30 +0400 |
| commit | 5a052ab6b11aadcf62bb3a7efb2acbe14355e0b1 (patch) | |
| tree | 571f4afce97785b8fffde8adaeb5b0ef82b3fc9d /plugin/type_inet/mysql-test/type_inet | |
| parent | 22b645ef5292387871b12b26fd550eed6e57aa2d (diff) | |
| download | mariadb-git-5a052ab6b11aadcf62bb3a7efb2acbe14355e0b1.tar.gz | |
Part1: MDEV-20837 Add MariaDB_FUNCTION_PLUGIN
- Defining MariaDB_FUNCTION_PLUGIN
- Changing the code in /plugins/type_inet/ and /plugins/type_test/
to use MariaDB_FUNCTION_PLUGIN instead of MariaDB_FUNCTION_COLLECTION_PLUGIN.
- Changing maturity for the INET6 data type plugin from experimental to alpha.
Diffstat (limited to 'plugin/type_inet/mysql-test/type_inet')
3 files changed, 101 insertions, 10 deletions
diff --git a/plugin/type_inet/mysql-test/type_inet/func_inet_plugin.result b/plugin/type_inet/mysql-test/type_inet/func_inet_plugin.result index 4663ae485e2..5cbce33048c 100644 --- a/plugin/type_inet/mysql-test/type_inet/func_inet_plugin.result +++ b/plugin/type_inet/mysql-test/type_inet/func_inet_plugin.result @@ -5,6 +5,7 @@ # MDEV-20768 Turn INET functions into a function collection plugin # SELECT +'----' AS `----`, PLUGIN_NAME, PLUGIN_VERSION, PLUGIN_STATUS, @@ -15,16 +16,96 @@ PLUGIN_LICENSE, PLUGIN_MATURITY, PLUGIN_AUTH_VERSION FROM INFORMATION_SCHEMA.PLUGINS -WHERE PLUGIN_TYPE='FUNCTION COLLECTION' - AND PLUGIN_NAME='func_inet'; -PLUGIN_NAME func_inet +WHERE PLUGIN_TYPE='FUNCTION' + AND PLUGIN_NAME IN +('inet_aton', +'inet_ntoa', +'inet6_aton', +'inet6_ntoa', +'is_ipv4', +'is_ipv6', +'is_ipv4_compat', +'is_ipv4_mapped') +ORDER BY PLUGIN_NAME; +---- ---- +PLUGIN_NAME inet6_aton PLUGIN_VERSION 1.0 PLUGIN_STATUS ACTIVE -PLUGIN_TYPE FUNCTION COLLECTION +PLUGIN_TYPE FUNCTION PLUGIN_AUTHOR MariaDB Corporation -PLUGIN_DESCRIPTION Function collection test +PLUGIN_DESCRIPTION Function INET6_ATON() PLUGIN_LICENSE GPL -PLUGIN_MATURITY Experimental +PLUGIN_MATURITY Alpha +PLUGIN_AUTH_VERSION 1.0 +---- ---- +PLUGIN_NAME inet6_ntoa +PLUGIN_VERSION 1.0 +PLUGIN_STATUS ACTIVE +PLUGIN_TYPE FUNCTION +PLUGIN_AUTHOR MariaDB Corporation +PLUGIN_DESCRIPTION Function INET6_NTOA() +PLUGIN_LICENSE GPL +PLUGIN_MATURITY Alpha +PLUGIN_AUTH_VERSION 1.0 +---- ---- +PLUGIN_NAME inet_aton +PLUGIN_VERSION 1.0 +PLUGIN_STATUS ACTIVE +PLUGIN_TYPE FUNCTION +PLUGIN_AUTHOR MariaDB Corporation +PLUGIN_DESCRIPTION Function INET_ATON() +PLUGIN_LICENSE GPL +PLUGIN_MATURITY Alpha +PLUGIN_AUTH_VERSION 1.0 +---- ---- +PLUGIN_NAME inet_ntoa +PLUGIN_VERSION 1.0 +PLUGIN_STATUS ACTIVE +PLUGIN_TYPE FUNCTION +PLUGIN_AUTHOR MariaDB Corporation +PLUGIN_DESCRIPTION Function INET_NTOA() +PLUGIN_LICENSE GPL +PLUGIN_MATURITY Alpha +PLUGIN_AUTH_VERSION 1.0 +---- ---- +PLUGIN_NAME is_ipv4 +PLUGIN_VERSION 1.0 +PLUGIN_STATUS ACTIVE +PLUGIN_TYPE FUNCTION +PLUGIN_AUTHOR MariaDB Corporation +PLUGIN_DESCRIPTION Function IS_IPV4() +PLUGIN_LICENSE GPL +PLUGIN_MATURITY Alpha +PLUGIN_AUTH_VERSION 1.0 +---- ---- +PLUGIN_NAME is_ipv4_compat +PLUGIN_VERSION 1.0 +PLUGIN_STATUS ACTIVE +PLUGIN_TYPE FUNCTION +PLUGIN_AUTHOR MariaDB Corporation +PLUGIN_DESCRIPTION Function IS_IPV4_COMPAT() +PLUGIN_LICENSE GPL +PLUGIN_MATURITY Alpha +PLUGIN_AUTH_VERSION 1.0 +---- ---- +PLUGIN_NAME is_ipv4_mapped +PLUGIN_VERSION 1.0 +PLUGIN_STATUS ACTIVE +PLUGIN_TYPE FUNCTION +PLUGIN_AUTHOR MariaDB Corporation +PLUGIN_DESCRIPTION Function IS_IPV4_MAPPED() +PLUGIN_LICENSE GPL +PLUGIN_MATURITY Alpha +PLUGIN_AUTH_VERSION 1.0 +---- ---- +PLUGIN_NAME is_ipv6 +PLUGIN_VERSION 1.0 +PLUGIN_STATUS ACTIVE +PLUGIN_TYPE FUNCTION +PLUGIN_AUTHOR MariaDB Corporation +PLUGIN_DESCRIPTION Function IS_IPV6() +PLUGIN_LICENSE GPL +PLUGIN_MATURITY Alpha PLUGIN_AUTH_VERSION 1.0 # # End of 10.5 tests diff --git a/plugin/type_inet/mysql-test/type_inet/func_inet_plugin.test b/plugin/type_inet/mysql-test/type_inet/func_inet_plugin.test index 8047e7f1513..45b462e8e82 100644 --- a/plugin/type_inet/mysql-test/type_inet/func_inet_plugin.test +++ b/plugin/type_inet/mysql-test/type_inet/func_inet_plugin.test @@ -8,6 +8,7 @@ --vertical_results SELECT + '----' AS `----`, PLUGIN_NAME, PLUGIN_VERSION, PLUGIN_STATUS, @@ -18,8 +19,17 @@ SELECT PLUGIN_MATURITY, PLUGIN_AUTH_VERSION FROM INFORMATION_SCHEMA.PLUGINS - WHERE PLUGIN_TYPE='FUNCTION COLLECTION' - AND PLUGIN_NAME='func_inet'; +WHERE PLUGIN_TYPE='FUNCTION' + AND PLUGIN_NAME IN + ('inet_aton', + 'inet_ntoa', + 'inet6_aton', + 'inet6_ntoa', + 'is_ipv4', + 'is_ipv6', + 'is_ipv4_compat', + 'is_ipv4_mapped') +ORDER BY PLUGIN_NAME; --horizontal_results --echo # diff --git a/plugin/type_inet/mysql-test/type_inet/type_inet6_plugin.result b/plugin/type_inet/mysql-test/type_inet/type_inet6_plugin.result index 8369ef07de8..d8287363dc5 100644 --- a/plugin/type_inet/mysql-test/type_inet/type_inet6_plugin.result +++ b/plugin/type_inet/mysql-test/type_inet/type_inet6_plugin.result @@ -22,9 +22,9 @@ PLUGIN_VERSION 1.0 PLUGIN_STATUS ACTIVE PLUGIN_TYPE DATA TYPE PLUGIN_AUTHOR MariaDB Corporation -PLUGIN_DESCRIPTION Data type TEST_INT8 +PLUGIN_DESCRIPTION Data type INET6 PLUGIN_LICENSE GPL -PLUGIN_MATURITY Experimental +PLUGIN_MATURITY Alpha PLUGIN_AUTH_VERSION 1.0 # # End of 10.5 tests |