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 branch '10.11' into 11.1

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-08-03 09:32:42 +02:00
parent 7ead48a72b 0e8fb977b0
commit 80abd847da
461 changed files with 12085 additions and 5128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_string.h
View File

@@ -585,7 +585,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;