Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
76fabe81
Commit
76fabe81
authored
Oct 28, 2020
by
Vicențiu Ciorbaru
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Expose utf8mb4_bin charset for plugins
Cleanup other linker errors
parent
17ec6d6c
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
3 deletions
+4
-3
include/m_ctype.h
include/m_ctype.h
+1
-1
plugin/type_mysql_json/mysql_json.h
plugin/type_mysql_json/mysql_json.h
+1
-0
plugin/type_mysql_json/type.cc
plugin/type_mysql_json/type.cc
+1
-1
sql/sql_type.h
sql/sql_type.h
+1
-1
No files found.
include/m_ctype.h
View file @
76fabe81
...
@@ -1175,7 +1175,7 @@ extern struct charset_info_st my_charset_utf8mb3_general_nopad_ci;
...
@@ -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
;
...
...
plugin/type_mysql_json/mysql_json.h
View file @
76fabe81
...
@@ -41,4 +41,5 @@ enum JSONB_TYPES {
...
@@ -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 */
plugin/type_mysql_json/type.cc
View file @
76fabe81
...
@@ -21,7 +21,7 @@
...
@@ -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
{
{
...
...
sql/sql_type.h
View file @
76fabe81
...
@@ -3498,7 +3498,7 @@ class Vers_type_timestamp: public Vers_type_handler
...
@@ -3498,7 +3498,7 @@ class Vers_type_timestamp: public Vers_type_handler
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment