diff options
author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2020-10-28 21:33:20 +0200 |
---|---|---|
committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2020-10-29 15:01:33 +0200 |
commit | 76fabe816f6beb1698d9bc5e88c059608b8bcd8f (patch) | |
tree | a790bab1bc86ee253dfb54375fa7c9eb7c35f8fc /plugin/type_mysql_json | |
parent | 17ec6d6ce1620c927430ccc3b0d34dad78db983b (diff) | |
download | mariadb-git-76fabe816f6beb1698d9bc5e88c059608b8bcd8f.tar.gz |
Expose utf8mb4_bin charset for plugins
Cleanup other linker errors
Diffstat (limited to 'plugin/type_mysql_json')
-rw-r--r-- | plugin/type_mysql_json/mysql_json.h | 1 | ||||
-rw-r--r-- | plugin/type_mysql_json/type.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/plugin/type_mysql_json/mysql_json.h b/plugin/type_mysql_json/mysql_json.h index 79a784cbb6e..afbacafc9c8 100644 --- a/plugin/type_mysql_json/mysql_json.h +++ b/plugin/type_mysql_json/mysql_json.h @@ -41,4 +41,5 @@ enum JSONB_TYPES { bool parse_mysql_json_value(String *buffer, JSONB_TYPES type, const uchar *data, size_t len, size_t depth); + #endif /* MYSQL_JSON_INCLUDED */ diff --git a/plugin/type_mysql_json/type.cc b/plugin/type_mysql_json/type.cc index b267745a998..ec827a2182a 100644 --- a/plugin/type_mysql_json/type.cc +++ b/plugin/type_mysql_json/type.cc @@ -21,7 +21,7 @@ #include <mysqld_error.h> #include "mysql_json.h" -static const LEX_CSTRING empty_clex_str= {"", 0}; +const LEX_CSTRING empty_clex_str= {"", 0}; class Type_handler_mysql_json: public Type_handler_blob { |