database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.2 (up to commit ef00ac4c86) into 10.3

Browse Source
This commit is contained in:
Alexander Barkov
2019-09-04 09:55:59 +04:00
parent a071e0e029 ef00ac4c86
commit 7e08ac0b41
44 changed files with 1825 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_string.h
View File

@ -232,6 +232,11 @@ public:
return skr;
}
size_t lengthsp() const
{
return str_charset->cset->lengthsp(str_charset, Ptr, str_length);
}
void set(String &str,size_t offset,size_t arg_length)
{
DBUG_ASSERT(&str != this);