database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2023-02-10 13:03:01 +02:00
parent 70a515df43 c41c79650a
commit 6aec87544c
285 changed files with 2180 additions and 1546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_string.h
View File

@@ -804,7 +804,7 @@ public:
class String: public Charset, public Binary_string
{
public:
String() { }
String() = default;
String(size_t length_arg) :Binary_string(length_arg)
{ }
/*
@@ -818,9 +818,7 @@ public:
String(char *str, size_t len, CHARSET_INFO *cs)
: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)
{