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

mysql-5.5.31 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2013-05-07 13:05:09 +02:00
parent d4be9e7bc0 e5055e22f1
commit b381cf843c
264 changed files with 3748 additions and 1718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_string.cc
View File

@ -732,7 +732,7 @@ String *copy_if_not_alloced(String *to,String *from,uint32 from_length)
{
if (from->Alloced_length >= from_length)
return from;
if (from->alloced || !to || from == to)
if ((from->alloced && (from->Alloced_length != 0)) || !to || from == to)
{
(void) from->realloc(from_length);
return from;