Merge 10.4 into 10.5

1 files changed, 8 insertions, 0 deletions

diff --git a/sql/sql_string.h b/sql/sql_string.h
index 1eac2200625..deff81f3333 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -149,6 +149,10 @@ public:
   {
     return m_charset->cset->numchars(m_charset, str, end);
   }
+  size_t lengthsp(const char *str, size_t length) const
+  {
+    return m_charset->cset->lengthsp(m_charset, str, length);
+  }
   size_t charpos(const char *str, const char *end, size_t pos) const
   {
     return m_charset->cset->charpos(m_charset, str, end, pos);
@@ -929,6 +933,10 @@ public:
       return (int) i;
     return (int) Charset::charpos(ptr() + offset, end(), (size_t) i);
   }
+  size_t lengthsp() const
+  {
+    return Charset::lengthsp(Ptr, str_length);
+  }
 
   void print(String *to) const;
   void print_with_conversion(String *to, CHARSET_INFO *cs) const;