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 mysql-5.0-bugteam -> mysql-5.1-bugteam.

Browse Source
This commit is contained in:
Alexey Kopytov
2009-02-06 12:53:20 +03:00
parent 4cd0e2fac4 b30239bc1a
commit a8c98eb953
5 changed files with 20 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sql/sql_string.cc
View File

@ -72,26 +72,26 @@ bool String::realloc(uint32 alloc_length)
if (alloced)
{
if ((new_ptr= (char*) my_realloc(Ptr,len,MYF(MY_WME))))
new_ptr[alloc_length]= 0;
{
Ptr=new_ptr;
Alloced_length=len;
}
else
return TRUE; // Signal error
return TRUE; // Signal error
}
else if ((new_ptr= (char*) my_malloc(len,MYF(MY_WME))))
{
if (str_length > len - 1)
str_length= 0;
if (str_length) // Avoid bugs in memcpy on AIX
memcpy(new_ptr, Ptr, str_length);
new_ptr[str_length]= 0;
memcpy(new_ptr,Ptr,str_length);
new_ptr[str_length]=0;
Ptr=new_ptr;
Alloced_length=len;
alloced=1;
}
else
return TRUE; // Signal error
Ptr= new_ptr;
Alloced_length= len;
}
else
Ptr[alloc_length]= 0;
Ptr[alloc_length]=0; // This make other funcs shorter
return FALSE;
}