database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2023-02-10 12:02:11 +02:00
parent a9eb272f91 cacea31687
commit c41c79650a
277 changed files with 2048 additions and 1500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_string.h
View File

@ -739,7 +739,7 @@ public:
class String: public Charset, public Binary_string
{
public:
String() { }
String() = default;
String(size_t length_arg)
:Binary_string(length_arg)
{ }
@ -760,10 +760,7 @@ public:
:Charset(cs),
Binary_string(str, len)
{ }
String(const String &str)
:Charset(str),
Binary_string(str)
{ }
String(const String &str) = default;
void set(String &str,size_t offset,size_t arg_length)
{