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

Merge branch '11.4' into 11.5

Browse source
This commit is contained in:
Oleksandr Byelkin 2024-08-05 17:50:18 +02:00
commit ea75a0b600
508 changed files with 12688 additions and 5108 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sql/field.h
View file

@ -4334,7 +4334,7 @@ private:
void sql_type(String &str) const override
{
Field_varstring::sql_type(str);
str.append(STRING_WITH_LEN(" /*!100301 COMPRESSED*/"));
str.append(STRING_WITH_LEN(" /*M!100301 COMPRESSED*/"));
}
uint32 max_display_length() const override { return field_length - 1; }
uint32 character_octet_length() const override { return field_length - 1; }
@ -4772,7 +4772,7 @@ private:
void sql_type(String &str) const override
{
Field_blob::sql_type(str);
str.append(STRING_WITH_LEN(" /*!100301 COMPRESSED*/"));
str.append(STRING_WITH_LEN(" /*M!100301 COMPRESSED*/"));
}
/*