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 branch '10.0' into 10.1

Browse Source
This commit is contained in:
Sergei Golubchik
2016-03-21 13:02:53 +01:00
parent e7cf898d6d 22ebf3cb45
commit 3b0c7ac1f9
142 changed files with 383 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_string.cc
View File

@ -76,9 +76,9 @@ bool String::real_alloc(uint32 length)
@retval false Either the copy operation is complete or, if the size of the
new buffer is smaller than the currently allocated buffer (if one exists),
no allocation occured.
no allocation occurred.
@retval true An error occured when attempting to allocate memory.
@retval true An error occurred when attempting to allocate memory.
*/
bool String::realloc_raw(uint32 alloc_length)
{