database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Expose utf8mb4_bin charset for plugins

Browse Source 
Cleanup other linker errors
This commit is contained in:
Vicențiu Ciorbaru
2020-10-28 21:33:20 +02:00
parent 17ec6d6ce1
commit 76fabe816f
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/m_ctype.h
View File

@ -1175,7 +1175,7 @@ extern struct charset_info_st my_charset_utf8mb3_general_nopad_ci;
extern struct charset_info_st my_charset_utf8mb3_general_mysql500_ci; extern struct charset_info_st my_charset_utf8mb3_general_mysql500_ci;
extern struct charset_info_st my_charset_utf8mb3_unicode_ci; extern struct charset_info_st my_charset_utf8mb3_unicode_ci;
extern struct charset_info_st my_charset_utf8mb3_unicode_nopad_ci; extern struct charset_info_st my_charset_utf8mb3_unicode_nopad_ci;
extern struct charset_info_st my_charset_utf8mb4_bin; extern MYSQL_PLUGIN_IMPORT struct charset_info_st my_charset_utf8mb4_bin;
extern struct charset_info_st my_charset_utf8mb4_general_ci; extern struct charset_info_st my_charset_utf8mb4_general_ci;
extern struct charset_info_st my_charset_utf8mb4_nopad_bin; extern struct charset_info_st my_charset_utf8mb4_nopad_bin;
extern struct charset_info_st my_charset_utf8mb4_general_nopad_ci; extern struct charset_info_st my_charset_utf8mb4_general_nopad_ci;

1
plugin/type_mysql_json/mysql_json.h
View File

@ -41,4 +41,5 @@ enum JSONB_TYPES {
bool parse_mysql_json_value(String *buffer, JSONB_TYPES type, const uchar *data, bool parse_mysql_json_value(String *buffer, JSONB_TYPES type, const uchar *data,
size_t len, size_t depth); size_t len, size_t depth);
#endif /* MYSQL_JSON_INCLUDED */ #endif /* MYSQL_JSON_INCLUDED */

2
plugin/type_mysql_json/type.cc
View File

@ -21,7 +21,7 @@
#include <mysqld_error.h> #include <mysqld_error.h>
#include "mysql_json.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 class Type_handler_mysql_json: public Type_handler_blob
{ {

2
sql/sql_type.h
View File

@ -3498,7 +3498,7 @@ public:
const Column_definition *row_start, const Column_definition *row_start,
const Column_definition *row_end) const; const Column_definition *row_end) const;
}; };
extern Vers_type_timestamp vers_type_timestamp; extern MYSQL_PLUGIN_IMPORT Vers_type_timestamp vers_type_timestamp;
class Vers_type_trx: public Vers_type_handler class Vers_type_trx: public Vers_type_handler