diff options
author | Alexander Barkov <bar@mariadb.com> | 2019-10-08 08:05:21 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.com> | 2019-10-08 08:05:21 +0400 |
commit | 04a5dab2edce4f6dbe24e0fef64d4621bcbfa9bd (patch) | |
tree | 8c7772a9410c3ad3448ede7b6881ec7e19ffc8b5 /sql | |
parent | 6afb2a37fd186318dee1467a7a9bc92179bcb601 (diff) | |
download | mariadb-git-bb-mdev-274.tar.gz |
MDEV-274 The data type for IPv6/IPv4 addresses in MariaDBbb-mdev-274
Diffstat (limited to 'sql')
-rw-r--r-- | sql/opt_range.cc | 2 | ||||
-rw-r--r-- | sql/opt_range.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 8dae20fc30f..a2eee4e196b 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -405,7 +405,7 @@ bool get_quick_keys(PARAM *param,QUICK_RANGE_SELECT *quick,KEY_PART *key, uchar *max_key,uint max_key_flag); static bool eq_tree(SEL_ARG* a,SEL_ARG *b); -static SEL_ARG null_element(SEL_ARG::IMPOSSIBLE); +SEL_ARG null_element(SEL_ARG::IMPOSSIBLE); static bool null_part_in_key(KEY_PART *key_part, const uchar *key, uint length); static bool is_key_scan_ror(PARAM *param, uint keynr, uint8 nparts); diff --git a/sql/opt_range.h b/sql/opt_range.h index 73def7bde92..a504e35bf45 100644 --- a/sql/opt_range.h +++ b/sql/opt_range.h @@ -598,6 +598,7 @@ public: SEL_ARG *clone_tree(RANGE_OPT_PARAM *param); }; +extern MYSQL_PLUGIN_IMPORT SEL_ARG null_element; class SEL_ARG_IMPOSSIBLE: public SEL_ARG { |