database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code 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
parent 06a7352d33 5ab81ffe00
commit ea75a0b600
508 changed files with 12703 additions and 5123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_string.h
View File

@@ -543,7 +543,7 @@ public:
LEX_CSTRING tmp= {Ptr, str_length};
return tmp;
}
inline LEX_CSTRING *get_value(LEX_CSTRING *res)
inline LEX_CSTRING *get_value(LEX_CSTRING *res) const
{
res->str= Ptr;
res->length= str_length;