mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
Removed some old Makefiles to avoid name conflict on Mac OS X
Changed in client library character-set-dir -> character-sets-dir Docs/manual.texi: Snmall update to ALTER TABLE and MyISAM tables client/mysql.cc: Moved SSL info to 'status' libmysql/libmysql.c: Fixed character-set-dir -> character-sets-dir sql/sql_string.cc: Small optimization
This commit is contained in:
@ -40,19 +40,16 @@ extern void sql_element_free(void *ptr);
|
||||
bool String::real_alloc(uint32 arg_length)
|
||||
{
|
||||
arg_length=ALIGN_SIZE(arg_length+1);
|
||||
str_length=0;
|
||||
if (Alloced_length < arg_length)
|
||||
{
|
||||
free();
|
||||
if (!(Ptr=(char*) my_malloc(arg_length,MYF(MY_WME))))
|
||||
{
|
||||
str_length=0;
|
||||
return TRUE;
|
||||
}
|
||||
Alloced_length=arg_length;
|
||||
alloced=1;
|
||||
}
|
||||
Ptr[0]=0;
|
||||
str_length=0;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user