mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-04 14:15:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.4 into 10.5

Browse source
This commit is contained in:
Marko Mäkelä 2019-09-06 17:16:40 +03:00
commit 4081b7b27a
750 changed files with 8329 additions and 9231 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sql/sql_string.h
View file

@ -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;