summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
Diffstat (limited to 'storage')
-rw-r--r--storage/cassandra/ha_cassandra.cc4
-rw-r--r--storage/connect/ha_connect.cc4
-rw-r--r--storage/connect/libdoc.cpp8
-rw-r--r--storage/connect/tabext.cpp2
-rw-r--r--storage/connect/tabutil.cpp2
-rw-r--r--storage/connect/tabxml.cpp2
-rw-r--r--storage/innobase/handler/ha_innodb.cc2
-rw-r--r--storage/perfschema/pfs_defaults.cc8
-rw-r--r--storage/perfschema/pfs_engine_table.cc6
-rw-r--r--storage/perfschema/table_session_connect.cc2
-rw-r--r--storage/perfschema/table_setup_actors.cc8
-rw-r--r--storage/perfschema/table_setup_objects.cc6
-rw-r--r--storage/perfschema/unittest/pfs_connect_attr-t.cc8
-rw-r--r--storage/spider/spd_db_mysql.cc4
-rw-r--r--storage/spider/spd_db_oracle.cc4
-rw-r--r--storage/spider/spd_table.cc30
-rw-r--r--storage/spider/spd_trx.cc18
17 files changed, 59 insertions, 59 deletions
diff --git a/storage/cassandra/ha_cassandra.cc b/storage/cassandra/ha_cassandra.cc
index fbce6b61f17..e0127ba752a 100644
--- a/storage/cassandra/ha_cassandra.cc
+++ b/storage/cassandra/ha_cassandra.cc
@@ -1104,7 +1104,7 @@ bool cassandra_to_dyncol_strUTF8(const char *cass_data,
MEM_ROOT *mem_root __attribute__((unused)))
{
return cassandra_to_dyncol_strStr(cass_data, cass_data_len, value,
- &my_charset_utf8_unicode_ci);
+ &my_charset_utf8mb3_unicode_ci);
}
bool dyncol_to_cassandraUTF8(DYNAMIC_COLUMN_VALUE *value,
@@ -1112,7 +1112,7 @@ bool dyncol_to_cassandraUTF8(DYNAMIC_COLUMN_VALUE *value,
void* buff, void **freemem)
{
return dyncol_to_cassandraStr(value, cass_data, cass_data_len,
- buff, freemem, &my_charset_utf8_unicode_ci);
+ buff, freemem, &my_charset_utf8mb3_unicode_ci);
}
bool cassandra_to_dyncol_strUUID(const char *cass_data,
diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc
index 7aff7796490..2474cb05b62 100644
--- a/storage/connect/ha_connect.cc
+++ b/storage/connect/ha_connect.cc
@@ -5294,7 +5294,7 @@ static char *encode(PGLOBAL g, const char *cnm)
char *buf= (char*)PlugSubAlloc(g, NULL, strlen(cnm) * 3);
uint dummy_errors;
uint32 len= copy_and_convert(buf, strlen(cnm) * 3,
- &my_charset_utf8_general_ci,
+ &my_charset_utf8mb3_general_ci,
cnm, strlen(cnm),
&my_charset_latin1,
&dummy_errors);
@@ -6331,7 +6331,7 @@ int ha_connect::create(const char *name, TABLE *table_arg,
DBUG_RETURN(HA_ERR_INTERNAL_ERROR);
} // endif charset
- if (type == TAB_XML && data_charset != &my_charset_utf8_general_ci) {
+ if (type == TAB_XML && data_charset != &my_charset_utf8mb3_general_ci) {
my_printf_error(ER_UNKNOWN_ERROR,
"DATA_CHARSET='%s' is not supported for TABLE_TYPE=XML",
MYF(0), options->data_charset);
diff --git a/storage/connect/libdoc.cpp b/storage/connect/libdoc.cpp
index 9b30b315441..a0a18c84817 100644
--- a/storage/connect/libdoc.cpp
+++ b/storage/connect/libdoc.cpp
@@ -765,8 +765,8 @@ int LIBXMLDOC::Decode(xmlChar *cnt, char *buf, int n)
{
const char *txt = (const char *)cnt;
uint dummy_errors;
- uint32 len= copy_and_convert(buf, n, &my_charset_utf8_general_ci, txt,
- strlen(txt), &my_charset_utf8_general_ci,
+ uint32 len= copy_and_convert(buf, n, &my_charset_utf8mb3_general_ci, txt,
+ strlen(txt), &my_charset_utf8mb3_general_ci,
&dummy_errors);
buf[len]= '\0';
return 0;
@@ -777,8 +777,8 @@ int LIBXMLDOC::Decode(xmlChar *cnt, char *buf, int n)
/******************************************************************/
xmlChar *LIBXMLDOC::Encode(PGLOBAL g, char *txt)
{
- const CHARSET_INFO *ics= &my_charset_utf8_general_ci;
- const CHARSET_INFO *ocs= &my_charset_utf8_general_ci;
+ const CHARSET_INFO *ics= &my_charset_utf8mb3_general_ci;
+ const CHARSET_INFO *ocs= &my_charset_utf8mb3_general_ci;
size_t i = strlen(txt);
size_t o = i * ocs->mbmaxlen / ics->mbmaxlen + 1;
char *buf;
diff --git a/storage/connect/tabext.cpp b/storage/connect/tabext.cpp
index aaf14f123c6..5f803aa1269 100644
--- a/storage/connect/tabext.cpp
+++ b/storage/connect/tabext.cpp
@@ -278,7 +278,7 @@ int TDBEXT::Decode(PCSZ txt, char *buf, size_t n)
uint dummy_errors;
uint32 len = copy_and_convert(buf, n, &my_charset_latin1,
txt, strlen(txt),
- &my_charset_utf8_general_ci,
+ &my_charset_utf8mb3_general_ci,
&dummy_errors);
buf[len] = '\0';
return 0;
diff --git a/storage/connect/tabutil.cpp b/storage/connect/tabutil.cpp
index 325f36b1e19..b82e98204dd 100644
--- a/storage/connect/tabutil.cpp
+++ b/storage/connect/tabutil.cpp
@@ -674,7 +674,7 @@ char *PRXCOL::Decode(PGLOBAL g, const char *cnm)
uint32 len= copy_and_convert(buf, strlen(cnm) + 1,
&my_charset_latin1,
cnm, strlen(cnm),
- &my_charset_utf8_general_ci,
+ &my_charset_utf8mb3_general_ci,
&dummy_errors);
buf[len]= '\0';
return buf;
diff --git a/storage/connect/tabxml.cpp b/storage/connect/tabxml.cpp
index 19490d350e8..6ea01285a61 100644
--- a/storage/connect/tabxml.cpp
+++ b/storage/connect/tabxml.cpp
@@ -694,7 +694,7 @@ PTDB TDBXML::Clone(PTABS t)
/***********************************************************************/
const CHARSET_INFO *TDBXML::data_charset()
{
- return &my_charset_utf8_general_ci;
+ return &my_charset_utf8mb3_general_ci;
} // end of data_charset
/***********************************************************************/
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index 23e860f9da2..fce893cb68c 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -9770,7 +9770,7 @@ ha_innobase::ft_init_ext(
buf_tmp_used = innobase_convert_string(
buf_tmp, sizeof(buf_tmp) - 1,
- &my_charset_utf8_general_ci,
+ &my_charset_utf8mb3_general_ci,
query, query_len, (CHARSET_INFO*) char_set,
&num_errors);
diff --git a/storage/perfschema/pfs_defaults.cc b/storage/perfschema/pfs_defaults.cc
index 4171786ea68..194877e0e38 100644
--- a/storage/perfschema/pfs_defaults.cc
+++ b/storage/perfschema/pfs_defaults.cc
@@ -42,17 +42,17 @@ void install_default_setup(PSI_bootstrap *boot)
/* LF_HASH needs a thread, for PINS */
psi->set_thread(psi_thread);
- String percent("%", 1, &my_charset_utf8_bin);
+ String percent("%", 1, &my_charset_utf8mb3_bin);
/* Enable all users on all hosts by default */
insert_setup_actor(&percent, &percent, &percent);
/* Disable system tables by default */
- String mysql_db("mysql", 5, &my_charset_utf8_bin);
+ String mysql_db("mysql", 5, &my_charset_utf8mb3_bin);
insert_setup_object(OBJECT_TYPE_TABLE, &mysql_db, &percent, false, false);
/* Disable performance/information schema tables. */
- String PS_db("performance_schema", 18, &my_charset_utf8_bin);
- String IS_db("information_schema", 18, &my_charset_utf8_bin);
+ String PS_db("performance_schema", 18, &my_charset_utf8mb3_bin);
+ String IS_db("information_schema", 18, &my_charset_utf8mb3_bin);
insert_setup_object(OBJECT_TYPE_TABLE, &PS_db, &percent, false, false);
insert_setup_object(OBJECT_TYPE_TABLE, &IS_db, &percent, false, false);
diff --git a/storage/perfschema/pfs_engine_table.cc b/storage/perfschema/pfs_engine_table.cc
index b133988e908..75ba41e9dd4 100644
--- a/storage/perfschema/pfs_engine_table.cc
+++ b/storage/perfschema/pfs_engine_table.cc
@@ -368,7 +368,7 @@ void PFS_engine_table::set_field_char_utf8(Field *f, const char* str,
{
DBUG_ASSERT(f->real_type() == MYSQL_TYPE_STRING);
Field_string *f2= (Field_string*) f;
- f2->store(str, len, &my_charset_utf8_bin);
+ f2->store(str, len, &my_charset_utf8mb3_bin);
}
void PFS_engine_table::set_field_varchar_utf8(Field *f, const char* str,
@@ -376,7 +376,7 @@ void PFS_engine_table::set_field_varchar_utf8(Field *f, const char* str,
{
DBUG_ASSERT(f->real_type() == MYSQL_TYPE_VARCHAR);
Field_varstring *f2= (Field_varstring*) f;
- f2->store(str, len, &my_charset_utf8_bin);
+ f2->store(str, len, &my_charset_utf8mb3_bin);
}
void PFS_engine_table::set_field_longtext_utf8(Field *f, const char* str,
@@ -384,7 +384,7 @@ void PFS_engine_table::set_field_longtext_utf8(Field *f, const char* str,
{
DBUG_ASSERT(f->real_type() == MYSQL_TYPE_BLOB);
Field_blob *f2= (Field_blob*) f;
- f2->store(str, len, &my_charset_utf8_bin);
+ f2->store(str, len, &my_charset_utf8mb3_bin);
}
void PFS_engine_table::set_field_enum(Field *f, ulonglong value)
diff --git a/storage/perfschema/table_session_connect.cc b/storage/perfschema/table_session_connect.cc
index 74b953b034e..b296726ef79 100644
--- a/storage/perfschema/table_session_connect.cc
+++ b/storage/perfschema/table_session_connect.cc
@@ -73,7 +73,7 @@ bool parse_length_encoded_string(const char **ptr,
if (*ptr - start_ptr + data_length > input_length)
return true;
- copy_length= copier.well_formed_copy(&my_charset_utf8_bin, dest, dest_size,
+ copy_length= copier.well_formed_copy(&my_charset_utf8mb3_bin, dest, dest_size,
from_cs, *ptr, data_length, nchars_max);
*copied_len= copy_length;
(*ptr)+= data_length;
diff --git a/storage/perfschema/table_setup_actors.cc b/storage/perfschema/table_setup_actors.cc
index b5058f8cd85..e7c20341e94 100644
--- a/storage/perfschema/table_setup_actors.cc
+++ b/storage/perfschema/table_setup_actors.cc
@@ -56,9 +56,9 @@ int table_setup_actors::write_row(TABLE *table, unsigned char *buf,
Field **fields)
{
Field *f;
- String user_data("%", 1, &my_charset_utf8_bin);
- String host_data("%", 1, &my_charset_utf8_bin);
- String role_data("%", 1, &my_charset_utf8_bin);
+ String user_data("%", 1, &my_charset_utf8mb3_bin);
+ String host_data("%", 1, &my_charset_utf8mb3_bin);
+ String role_data("%", 1, &my_charset_utf8mb3_bin);
String *user= &user_data;
String *host= &host_data;
String *role= &role_data;
@@ -248,7 +248,7 @@ int table_setup_actors::delete_row_values(TABLE *table,
{
DBUG_ASSERT(m_row_exists);
- CHARSET_INFO *cs= &my_charset_utf8_bin;
+ CHARSET_INFO *cs= &my_charset_utf8mb3_bin;
String user(m_row.m_username, m_row.m_username_length, cs);
String role(m_row.m_rolename, m_row.m_rolename_length, cs);
String host(m_row.m_hostname, m_row.m_hostname_length, cs);
diff --git a/storage/perfschema/table_setup_objects.cc b/storage/perfschema/table_setup_objects.cc
index e15c55b41ae..98de9b22416 100644
--- a/storage/perfschema/table_setup_objects.cc
+++ b/storage/perfschema/table_setup_objects.cc
@@ -72,8 +72,8 @@ int table_setup_objects::write_row(TABLE *table, unsigned char *buf,
int result;
Field *f;
enum_object_type object_type= OBJECT_TYPE_TABLE;
- String object_schema_data("%", 1, &my_charset_utf8_bin);
- String object_name_data("%", 1, &my_charset_utf8_bin);
+ String object_schema_data("%", 1, &my_charset_utf8mb3_bin);
+ String object_name_data("%", 1, &my_charset_utf8mb3_bin);
String *object_schema= &object_schema_data;
String *object_name= &object_name_data;
enum_yes_no enabled_value= ENUM_YES;
@@ -312,7 +312,7 @@ int table_setup_objects::delete_row_values(TABLE *table,
{
DBUG_ASSERT(m_row_exists);
- CHARSET_INFO *cs= &my_charset_utf8_bin;
+ CHARSET_INFO *cs= &my_charset_utf8mb3_bin;
enum_object_type object_type= OBJECT_TYPE_TABLE;
String object_schema(m_row.m_schema_name, m_row.m_schema_name_length, cs);
String object_name(m_row.m_object_name, m_row.m_object_name_length, cs);
diff --git a/storage/perfschema/unittest/pfs_connect_attr-t.cc b/storage/perfschema/unittest/pfs_connect_attr-t.cc
index 3dd62ca5662..c0adabc18bc 100644
--- a/storage/perfschema/unittest/pfs_connect_attr-t.cc
+++ b/storage/perfschema/unittest/pfs_connect_attr-t.cc
@@ -40,7 +40,7 @@ void test_blob_parser()
unsigned char packet[10000], *ptr;
uint name_len, value_len, idx, packet_length;
bool result;
- const CHARSET_INFO *cs= &my_charset_utf8_bin;
+ const CHARSET_INFO *cs= &my_charset_utf8mb3_bin;
diag("test_blob_parser");
@@ -157,7 +157,7 @@ void test_multibyte_lengths()
char name[100], value[4096];
uint name_len, value_len;
bool result;
- const CHARSET_INFO *cs= &my_charset_utf8_bin;
+ const CHARSET_INFO *cs= &my_charset_utf8mb3_bin;
unsigned char var_len_packet[] = {
252, 2, 0, 'k', '1',
@@ -190,7 +190,7 @@ void test_utf8_parser()
char name[33 * 6], value[1024 * 6], packet[1500 * 6], *ptr;
uint name_len, value_len;
bool result;
- const CHARSET_INFO *cs= &my_charset_utf8_bin;
+ const CHARSET_INFO *cs= &my_charset_utf8mb3_bin;
/* note : this is encoded in utf-8 */
const char *attr1= "Георги";
@@ -242,7 +242,7 @@ void test_utf8_parser_bad_encoding()
char name[33 * 3], value[1024 * 3], packet[1500 * 3], *ptr;
uint name_len, value_len;
bool result;
- const CHARSET_INFO *cs= &my_charset_utf8_bin;
+ const CHARSET_INFO *cs= &my_charset_utf8mb3_bin;
/* note : this is encoded in utf-8 */
const char *attr= "Георги";
diff --git a/storage/spider/spd_db_mysql.cc b/storage/spider/spd_db_mysql.cc
index 58351195a61..3b89f5e64f2 100644
--- a/storage/spider/spd_db_mysql.cc
+++ b/storage/spider/spd_db_mysql.cc
@@ -47,7 +47,7 @@
#include "spd_sys_table.h"
#include "spd_table.h"
-extern struct charset_info_st *spd_charset_utf8_bin;
+extern struct charset_info_st *spd_charset_utf8mb3_bin;
extern bool volatile *spd_abort_loop;
extern handlerton *spider_hton_ptr;
@@ -1857,7 +1857,7 @@ int spider_db_mbase::init()
DBUG_ENTER("spider_db_mbase::init");
DBUG_PRINT("info",("spider this=%p", this));
if (
- my_hash_init(&lock_table_hash, spd_charset_utf8_bin, 32, 0, 0,
+ my_hash_init(&lock_table_hash, spd_charset_utf8mb3_bin, 32, 0, 0,
(my_hash_get_key) spider_link_get_key, 0, 0)
) {
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
diff --git a/storage/spider/spd_db_oracle.cc b/storage/spider/spd_db_oracle.cc
index 773c6b90ed9..8577dbb7f97 100644
--- a/storage/spider/spd_db_oracle.cc
+++ b/storage/spider/spd_db_oracle.cc
@@ -48,7 +48,7 @@
#include "spd_sys_table.h"
#include "spd_table.h"
-extern struct charset_info_st *spd_charset_utf8_bin;
+extern struct charset_info_st *spd_charset_utf8mb3_bin;
extern handlerton *spider_hton_ptr;
extern pthread_mutex_t spider_open_conn_mutex;
@@ -1148,7 +1148,7 @@ int spider_db_oracle::init()
DBUG_ENTER("spider_db_oracle::init");
DBUG_PRINT("info",("spider this=%p", this));
if (
- my_hash_init(&lock_table_hash, spd_charset_utf8_bin, 32, 0, 0,
+ my_hash_init(&lock_table_hash, spd_charset_utf8mb3_bin, 32, 0, 0,
(my_hash_get_key) spider_link_get_key, 0, 0)
) {
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
diff --git a/storage/spider/spd_table.cc b/storage/spider/spd_table.cc
index d6aa9356c6d..3c8ec286998 100644
--- a/storage/spider/spd_table.cc
+++ b/storage/spider/spd_table.cc
@@ -119,7 +119,7 @@ uint *spd_db_att_xid_cache_split_num;
pthread_mutex_t *spd_db_att_LOCK_xid_cache;
HASH *spd_db_att_xid_cache;
#endif
-struct charset_info_st *spd_charset_utf8_bin;
+struct charset_info_st *spd_charset_utf8mb3_bin;
const char **spd_defaults_extra_file;
const char **spd_defaults_file;
const char **spd_mysqld_unix_port;
@@ -6088,7 +6088,7 @@ SPIDER_PARTITION_SHARE *spider_get_pt_share(
}
if(
- my_hash_init(&partition_share->pt_handler_hash, spd_charset_utf8_bin,
+ my_hash_init(&partition_share->pt_handler_hash, spd_charset_utf8mb3_bin,
32, 0, 0, (my_hash_get_key) spider_pt_handler_share_get_key, 0, 0)
) {
*error_num = HA_ERR_OUT_OF_MEM;
@@ -6929,8 +6929,8 @@ int spider_db_init(
GetProcAddress(current_module, "?xid_cache@@3Ust_hash@@A");
#endif
#endif
- spd_charset_utf8_bin = (struct charset_info_st *)
- GetProcAddress(current_module, "my_charset_utf8_bin");
+ spd_charset_utf8mb3_bin = (struct charset_info_st *)
+ GetProcAddress(current_module, "my_charset_utf8mb3_bin");
spd_defaults_extra_file = (const char **)
GetProcAddress(current_module, "my_defaults_extra_file");
spd_defaults_file = (const char **)
@@ -6962,7 +6962,7 @@ int spider_db_init(
spd_db_att_xid_cache = &xid_cache;
#endif
#endif
- spd_charset_utf8_bin = &my_charset_utf8_bin;
+ spd_charset_utf8mb3_bin = &my_charset_utf8mb3_bin;
spd_defaults_extra_file = &my_defaults_extra_file;
spd_defaults_file = &my_defaults_file;
spd_mysqld_unix_port = (const char **) &mysqld_unix_port;
@@ -7097,7 +7097,7 @@ int spider_db_init(
#endif
goto error_mem_calc_mutex_init;
- if (my_hash_init(&spider_open_tables, spd_charset_utf8_bin, 32, 0, 0,
+ if (my_hash_init(&spider_open_tables, spd_charset_utf8mb3_bin, 32, 0, 0,
(my_hash_get_key) spider_tbl_get_key, 0, 0))
goto error_open_tables_hash_init;
@@ -7106,7 +7106,7 @@ int spider_db_init(
spider_open_tables,
spider_open_tables.array.max_element *
spider_open_tables.array.size_of_element);
- if (my_hash_init(&spider_init_error_tables, spd_charset_utf8_bin, 32, 0, 0,
+ if (my_hash_init(&spider_init_error_tables, spd_charset_utf8mb3_bin, 32, 0, 0,
(my_hash_get_key) spider_tbl_get_key, 0, 0))
goto error_init_error_tables_hash_init;
@@ -7116,7 +7116,7 @@ int spider_db_init(
spider_init_error_tables.array.max_element *
spider_init_error_tables.array.size_of_element);
#ifdef WITH_PARTITION_STORAGE_ENGINE
- if (my_hash_init(&spider_open_pt_share, spd_charset_utf8_bin, 32, 0, 0,
+ if (my_hash_init(&spider_open_pt_share, spd_charset_utf8mb3_bin, 32, 0, 0,
(my_hash_get_key) spider_pt_share_get_key, 0, 0))
goto error_open_pt_share_hash_init;
@@ -7126,7 +7126,7 @@ int spider_db_init(
spider_open_pt_share.array.max_element *
spider_open_pt_share.array.size_of_element);
#endif
- if (my_hash_init(&spider_lgtm_tblhnd_share_hash, spd_charset_utf8_bin,
+ if (my_hash_init(&spider_lgtm_tblhnd_share_hash, spd_charset_utf8mb3_bin,
32, 0, 0,
(my_hash_get_key) spider_lgtm_tblhnd_share_hash_get_key,
0, 0))
@@ -7137,11 +7137,11 @@ int spider_db_init(
spider_lgtm_tblhnd_share_hash,
spider_lgtm_tblhnd_share_hash.array.max_element *
spider_lgtm_tblhnd_share_hash.array.size_of_element);
- if (my_hash_init(&spider_open_connections, spd_charset_utf8_bin, 32, 0, 0,
+ if (my_hash_init(&spider_open_connections, spd_charset_utf8mb3_bin, 32, 0, 0,
(my_hash_get_key) spider_conn_get_key, 0, 0))
goto error_open_connections_hash_init;
- if (my_hash_init(&spider_ipport_conns, spd_charset_utf8_bin, 32, 0, 0,
+ if (my_hash_init(&spider_ipport_conns, spd_charset_utf8mb3_bin, 32, 0, 0,
(my_hash_get_key) spider_ipport_conn_get_key,
spider_free_ipport_conn, 0))
goto error_ipport_conn__hash_init;
@@ -7152,7 +7152,7 @@ int spider_db_init(
spider_open_connections.array.max_element *
spider_open_connections.array.size_of_element);
#if defined(HS_HAS_SQLCOM) && defined(HAVE_HANDLERSOCKET)
- if (my_hash_init(&spider_hs_r_conn_hash, spd_charset_utf8_bin, 32, 0, 0,
+ if (my_hash_init(&spider_hs_r_conn_hash, spd_charset_utf8mb3_bin, 32, 0, 0,
(my_hash_get_key) spider_conn_get_key, 0, 0))
goto error_hs_r_conn_hash_init;
@@ -7161,7 +7161,7 @@ int spider_db_init(
spider_hs_r_conn_hash,
spider_hs_r_conn_hash.array.max_element *
spider_hs_r_conn_hash.array.size_of_element);
- if (my_hash_init(&spider_hs_w_conn_hash, spd_charset_utf8_bin, 32, 0, 0,
+ if (my_hash_init(&spider_hs_w_conn_hash, spd_charset_utf8mb3_bin, 32, 0, 0,
(my_hash_get_key) spider_conn_get_key, 0, 0))
goto error_hs_w_conn_hash_init;
@@ -7171,7 +7171,7 @@ int spider_db_init(
spider_hs_w_conn_hash.array.max_element *
spider_hs_w_conn_hash.array.size_of_element);
#endif
- if (my_hash_init(&spider_allocated_thds, spd_charset_utf8_bin, 32, 0, 0,
+ if (my_hash_init(&spider_allocated_thds, spd_charset_utf8mb3_bin, 32, 0, 0,
(my_hash_get_key) spider_allocated_thds_get_key, 0, 0))
goto error_allocated_thds_hash_init;
@@ -7233,7 +7233,7 @@ int spider_db_init(
roop_count++)
{
if (my_hash_init(&spider_udf_table_mon_list_hash[roop_count],
- spd_charset_utf8_bin, 32, 0, 0,
+ spd_charset_utf8mb3_bin, 32, 0, 0,
(my_hash_get_key) spider_udf_tbl_mon_list_key, 0, 0))
goto error_init_udf_table_mon_list_hash;
diff --git a/storage/spider/spd_trx.cc b/storage/spider/spd_trx.cc
index 876dda19561..91ddb8d354c 100644
--- a/storage/spider/spd_trx.cc
+++ b/storage/spider/spd_trx.cc
@@ -49,7 +49,7 @@ extern uint *spd_db_att_xid_cache_split_num;
extern pthread_mutex_t *spd_db_att_LOCK_xid_cache;
extern HASH *spd_db_att_xid_cache;
#endif
-extern struct charset_info_st *spd_charset_utf8_bin;
+extern struct charset_info_st *spd_charset_utf8mb3_bin;
extern handlerton *spider_hton_ptr;
extern SPIDER_DBTON spider_dbton[SPIDER_DBTON_SIZE];
@@ -1228,7 +1228,7 @@ SPIDER_TRX *spider_get_trx(
}
if (
- my_hash_init(&trx->trx_conn_hash, spd_charset_utf8_bin, 32, 0, 0,
+ my_hash_init(&trx->trx_conn_hash, spd_charset_utf8mb3_bin, 32, 0, 0,
(my_hash_get_key) spider_conn_get_key, 0, 0)
)
goto error_init_hash;
@@ -1240,7 +1240,7 @@ SPIDER_TRX *spider_get_trx(
trx->trx_conn_hash.array.size_of_element);
if (
- my_hash_init(&trx->trx_another_conn_hash, spd_charset_utf8_bin, 32, 0, 0,
+ my_hash_init(&trx->trx_another_conn_hash, spd_charset_utf8mb3_bin, 32, 0, 0,
(my_hash_get_key) spider_conn_get_key, 0, 0)
)
goto error_init_another_hash;
@@ -1253,7 +1253,7 @@ SPIDER_TRX *spider_get_trx(
#if defined(HS_HAS_SQLCOM) && defined(HAVE_HANDLERSOCKET)
if (
- my_hash_init(&trx->trx_hs_r_conn_hash, spd_charset_utf8_bin, 32, 0, 0,
+ my_hash_init(&trx->trx_hs_r_conn_hash, spd_charset_utf8mb3_bin, 32, 0, 0,
(my_hash_get_key) spider_conn_get_key, 0, 0)
)
goto error_hs_r_init_hash;
@@ -1265,7 +1265,7 @@ SPIDER_TRX *spider_get_trx(
trx->trx_hs_r_conn_hash.array.size_of_element);
if (
- my_hash_init(&trx->trx_hs_w_conn_hash, spd_charset_utf8_bin, 32, 0, 0,
+ my_hash_init(&trx->trx_hs_w_conn_hash, spd_charset_utf8mb3_bin, 32, 0, 0,
(my_hash_get_key) spider_conn_get_key, 0, 0)
)
goto error_hs_w_init_hash;
@@ -1279,7 +1279,7 @@ SPIDER_TRX *spider_get_trx(
#if defined(HS_HAS_SQLCOM) && defined(HAVE_HANDLERSOCKET)
if (
- my_hash_init(&trx->trx_direct_hs_r_conn_hash, spd_charset_utf8_bin, 32,
+ my_hash_init(&trx->trx_direct_hs_r_conn_hash, spd_charset_utf8mb3_bin, 32,
0, 0, (my_hash_get_key) spider_conn_get_key, 0, 0)
)
goto error_direct_hs_r_init_hash;
@@ -1291,7 +1291,7 @@ SPIDER_TRX *spider_get_trx(
trx->trx_direct_hs_r_conn_hash.array.size_of_element);
if (
- my_hash_init(&trx->trx_direct_hs_w_conn_hash, spd_charset_utf8_bin, 32,
+ my_hash_init(&trx->trx_direct_hs_w_conn_hash, spd_charset_utf8mb3_bin, 32,
0, 0, (my_hash_get_key) spider_conn_get_key, 0, 0)
)
goto error_direct_hs_w_init_hash;
@@ -1304,7 +1304,7 @@ SPIDER_TRX *spider_get_trx(
#endif
if (
- my_hash_init(&trx->trx_alter_table_hash, spd_charset_utf8_bin, 32, 0, 0,
+ my_hash_init(&trx->trx_alter_table_hash, spd_charset_utf8mb3_bin, 32, 0, 0,
(my_hash_get_key) spider_alter_tbl_get_key, 0, 0)
)
goto error_init_alter_hash;
@@ -1316,7 +1316,7 @@ SPIDER_TRX *spider_get_trx(
trx->trx_alter_table_hash.array.size_of_element);
if (
- my_hash_init(&trx->trx_ha_hash, spd_charset_utf8_bin, 32, 0, 0,
+ my_hash_init(&trx->trx_ha_hash, spd_charset_utf8mb3_bin, 32, 0, 0,
(my_hash_get_key) spider_trx_ha_get_key, 0, 0)
)
goto error_init_trx_ha_hash;
View Lorry Controller Status