MDEV-19897 Rename source code variable names from utf8 to utf8mb3

6 files changed, 19 insertions, 19 deletions

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= "Георги";