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

1 files changed, 32 insertions, 31 deletions

diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index a2cfc0d0128..e0801e9f43a 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -349,7 +349,7 @@ size_t Lex_input_stream::get_body_utf8_maximum_length(THD *thd)
     "2" should be a reasonable multiplier that safely covers escaping needs.
   */
   return (m_buf_length / thd->variables.character_set_client->mbminlen) *
-          my_charset_utf8_bin.mbmaxlen * 2/*for escaping*/;
+          my_charset_utf8mb3_bin.mbmaxlen * 2/*for escaping*/;
 }
 
 
@@ -454,14 +454,14 @@ extern "C" {
   @param end    - the end of the destination string
   @returns      - a code according to the wc_mb() convension.
 */
-int my_wc_mb_utf8_with_escape(CHARSET_INFO *cs, my_wc_t escape, my_wc_t wc,
-                              uchar *str, uchar *end)
+int my_wc_mb_utf8mb3_with_escape(CHARSET_INFO *cs, my_wc_t escape, my_wc_t wc,
+                                 uchar *str, uchar *end)
 {
   DBUG_ASSERT(escape > 0);
   if (str + 1 >= end)
     return MY_CS_TOOSMALL2;  // Not enough space, need at least two bytes.
   *str= (uchar)escape;
-  int cnvres= my_charset_utf8_handler.wc_mb(cs, wc, str + 1, end);
+  int cnvres= my_charset_utf8mb3_handler.wc_mb(cs, wc, str + 1, end);
   if (cnvres > 0)
     return cnvres + 1;       // The character was normally put
   if (cnvres == MY_CS_ILUNI)
@@ -483,12 +483,12 @@ int my_wc_mb_utf8_with_escape(CHARSET_INFO *cs, my_wc_t escape, my_wc_t wc,
   @param end    - the end of the destination string
   @returns      - a code according to the wc_mb() conversion.
 */
-int my_wc_mb_utf8_opt_escape(CHARSET_INFO *cs,
-                             my_wc_t wc, my_wc_t escape, my_wc_t ewc,
-                             uchar *str, uchar *end)
+int my_wc_mb_utf8mb3_opt_escape(CHARSET_INFO *cs,
+                                my_wc_t wc, my_wc_t escape, my_wc_t ewc,
+                                uchar *str, uchar *end)
 {
-  return escape ? my_wc_mb_utf8_with_escape(cs, escape, ewc, str, end) :
-                  my_charset_utf8_handler.wc_mb(cs, wc, str, end);
+  return escape ? my_wc_mb_utf8mb3_with_escape(cs, escape, ewc, str, end) :
+                  my_charset_utf8mb3_handler.wc_mb(cs, wc, str, end);
 }
 
 /**
@@ -507,54 +507,55 @@ int my_wc_mb_utf8_opt_escape(CHARSET_INFO *cs,
   @param escape    - the escape character (backslash, or 0)
   @returns         - a code according to the wc_mb() convension.
 */
-int my_wc_mb_utf8_escape(CHARSET_INFO *cs, my_wc_t wc, uchar *str, uchar *end,
-                         my_wc_t sep, my_wc_t escape)
+int my_wc_mb_utf8mb3_escape(CHARSET_INFO *cs, my_wc_t wc,
+                            uchar *str, uchar *end,
+                            my_wc_t sep, my_wc_t escape)
 {
   DBUG_ASSERT(escape == 0 || escape == '\\');
   DBUG_ASSERT(sep == '"' || sep == '\'');
   switch (wc) {
-  case 0:      return my_wc_mb_utf8_opt_escape(cs, wc, escape, '0', str, end);
-  case '\t':   return my_wc_mb_utf8_opt_escape(cs, wc, escape, 't', str, end);
-  case '\r':   return my_wc_mb_utf8_opt_escape(cs, wc, escape, 'r', str, end);
-  case '\n':   return my_wc_mb_utf8_opt_escape(cs, wc, escape, 'n', str, end);
-  case '\032': return my_wc_mb_utf8_opt_escape(cs, wc, escape, 'Z', str, end);
+  case 0:      return my_wc_mb_utf8mb3_opt_escape(cs, wc, escape, '0', str, end);
+  case '\t':   return my_wc_mb_utf8mb3_opt_escape(cs, wc, escape, 't', str, end);
+  case '\r':   return my_wc_mb_utf8mb3_opt_escape(cs, wc, escape, 'r', str, end);
+  case '\n':   return my_wc_mb_utf8mb3_opt_escape(cs, wc, escape, 'n', str, end);
+  case '\032': return my_wc_mb_utf8mb3_opt_escape(cs, wc, escape, 'Z', str, end);
   case '\'':
   case '\"':
     if (wc == sep)
-      return my_wc_mb_utf8_with_escape(cs, wc, wc, str, end);
+      return my_wc_mb_utf8mb3_with_escape(cs, wc, wc, str, end);
   }
-  return my_charset_utf8_handler.wc_mb(cs, wc, str, end); // No escaping needed
+  return my_charset_utf8mb3_handler.wc_mb(cs, wc, str, end); // No escaping needed
 }
 
 
 /** wc_mb() compatible routines for all sql_mode and delimiter combinations */
-int my_wc_mb_utf8_escape_single_quote_and_backslash(CHARSET_INFO *cs,
+int my_wc_mb_utf8mb3_escape_single_quote_and_backslash(CHARSET_INFO *cs,
                                                     my_wc_t wc,
                                                     uchar *str, uchar *end)
 {
-  return my_wc_mb_utf8_escape(cs, wc, str, end, '\'', '\\');
+  return my_wc_mb_utf8mb3_escape(cs, wc, str, end, '\'', '\\');
 }
 
 
-int my_wc_mb_utf8_escape_double_quote_and_backslash(CHARSET_INFO *cs,
+int my_wc_mb_utf8mb3_escape_double_quote_and_backslash(CHARSET_INFO *cs,
                                                     my_wc_t wc,
                                                     uchar *str, uchar *end)
 {
-  return my_wc_mb_utf8_escape(cs, wc, str, end, '"', '\\');
+  return my_wc_mb_utf8mb3_escape(cs, wc, str, end, '"', '\\');
 }
 
 
-int my_wc_mb_utf8_escape_single_quote(CHARSET_INFO *cs, my_wc_t wc,
+int my_wc_mb_utf8mb3_escape_single_quote(CHARSET_INFO *cs, my_wc_t wc,
                                       uchar *str, uchar *end)
 {
-  return my_wc_mb_utf8_escape(cs, wc, str, end, '\'', 0);
+  return my_wc_mb_utf8mb3_escape(cs, wc, str, end, '\'', 0);
 }
 
 
-int my_wc_mb_utf8_escape_double_quote(CHARSET_INFO *cs, my_wc_t wc,
+int my_wc_mb_utf8mb3_escape_double_quote(CHARSET_INFO *cs, my_wc_t wc,
                                       uchar *str, uchar *end)
 {
-  return my_wc_mb_utf8_escape(cs, wc, str, end, '"', 0);
+  return my_wc_mb_utf8mb3_escape(cs, wc, str, end, '"', 0);
 }
 
 }; // End of extern "C"
@@ -568,10 +569,10 @@ my_charset_conv_wc_mb
 Lex_input_stream::get_escape_func(THD *thd, my_wc_t sep) const
 {
   return thd->backslash_escapes() ?
-         (sep == '"' ? my_wc_mb_utf8_escape_double_quote_and_backslash:
-                       my_wc_mb_utf8_escape_single_quote_and_backslash) :
-         (sep == '"' ? my_wc_mb_utf8_escape_double_quote:
-                       my_wc_mb_utf8_escape_single_quote);
+         (sep == '"' ? my_wc_mb_utf8mb3_escape_double_quote_and_backslash:
+                       my_wc_mb_utf8mb3_escape_single_quote_and_backslash) :
+         (sep == '"' ? my_wc_mb_utf8mb3_escape_double_quote:
+                       my_wc_mb_utf8mb3_escape_single_quote);
 }
 
 
@@ -611,7 +612,7 @@ void Lex_input_stream::body_utf8_append_escape(THD *thd,
   DBUG_ASSERT(m_body_utf8 + get_body_utf8_maximum_length(thd) >=
               m_body_utf8_ptr + txt->length * 2);
   uint32 cnv_length= my_convert_using_func(m_body_utf8_ptr, txt->length * 2,
-                                           &my_charset_utf8_general_ci,
+                                           &my_charset_utf8mb3_general_ci,
                                            get_escape_func(thd, sep),
                                            txt->str, txt->length,
                                            cs, cs->cset->mb_wc,