database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Fixes for MyISAM and packed keys + AIX

Browse Source 
Docs/manual.texi:
  Updated changelog
client/mysql.cc:
  Free all memory, even if we can't connect to the server
include/config-win.h:
  Ensure that we don't use SAFE_MUTEX on windows
include/my_pthread.h:
  Optimze struct for Ia64
include/myisam.h:
  Hack for debugging BIG tables
myisam/mi_check.c:
  Hack for debugging BIG tables
myisam/mi_search.c:
  Fixed bug in packed keys
myisam/myisamchk.c:
  Hack for debugging BIG tables
mysys/thr_mutex.c:
  Make safe_mutex safe for windows
scripts/safe_mysqld.sh:
  Fix nice test and echo output
sql/share/Makefile.am:
  Fix character sets
sql/sql_string.cc:
  Fixes for AIX (which can't handle that the length argument is 0)
This commit is contained in:
unknown
2000-09-22 01:46:26 +03:00
parent 5e955288bc
commit 5f12486229
12 changed files with 71 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
sql/sql_string.cc
View File

@ -81,7 +81,8 @@ bool String::realloc(uint32 alloc_length)
}
else if ((new_ptr= (char*) my_malloc(len,MYF(MY_WME))))
{
memcpy(new_ptr,Ptr,str_length);
if (str_length) // Avoid bugs in memcpy on AIX
memcpy(new_ptr,Ptr,str_length);
new_ptr[str_length]=0;
Ptr=new_ptr;
Alloced_length=len;
@ -221,8 +222,8 @@ bool String::copy(const char *str,uint32 arg_length)
{
if (alloc(arg_length))
return TRUE;
str_length=arg_length;
memcpy(Ptr,str,arg_length);
if ((str_length=arg_length))
memcpy(Ptr,str,arg_length);
Ptr[arg_length]=0;
return FALSE;
}
@ -251,17 +252,21 @@ void String::strip_sp()
bool String::append(const String &s)
{
if (realloc(str_length+s.length()))
return TRUE;
memcpy(Ptr+str_length,s.ptr(),s.length());
str_length+=s.length();
if (s.length())
{
if (realloc(str_length+s.length()))
return TRUE;
memcpy(Ptr+str_length,s.ptr(),s.length());
str_length+=s.length();
}
return FALSE;
}
bool String::append(const char *s,uint32 arg_length)
{
if (!arg_length) // Default argument
arg_length= (uint32) strlen(s);
if (!(arg_length= (uint32) strlen(s)))
return FALSE;
if (realloc(str_length+arg_length))
return TRUE;
memcpy(Ptr+str_length,s,arg_length);
@ -398,7 +403,8 @@ bool String::replace(uint32 offset,uint32 arg_length,const String &to)
{
if (diff < 0)
{
memcpy(Ptr+offset,to.ptr(),to.length());
if (to.length())
memcpy(Ptr+offset,to.ptr(),to.length());
bmove(Ptr+offset+to.length(),Ptr+offset+arg_length,
str_length-offset-arg_length);
}
@ -411,7 +417,8 @@ bool String::replace(uint32 offset,uint32 arg_length,const String &to)
bmove_upp(Ptr+str_length+diff,Ptr+str_length,
str_length-offset-arg_length);
}
memcpy(Ptr+offset,to.ptr(),to.length());
if (to.length())
memcpy(Ptr+offset,to.ptr(),to.length());
}
str_length+=(uint32) diff;
}
@ -502,8 +509,8 @@ String *copy_if_not_alloced(String *to,String *from,uint32 from_length)
}
if (to->realloc(from_length))
return from; // Actually an error
to->str_length=min(from->str_length,from_length);
memcpy(to->Ptr,from->Ptr,to->str_length);
if ((to->str_length=min(from->str_length,from_length)))
memcpy(to->Ptr,from->Ptr,to->str_length);
return to;
}