mariadb/mysys/string.c
unknown fc4a3ef7c1 Fixed bug when having many binary log files
Fixed bug when deleting keys with possible NULL values
many changes to mysqltest


Docs/Makefile.am:
  Don't print warnings when making ..dvi
Docs/manual.texi:
  Documented changes
acinclude.m4:
  Fixed bug in detecting BDB version 3.2.3g
client/mysqltest.c:
  Added TODO
  Cleanups
  Free all memory and close all files on exit
configure.in:
  New release
include/my_sys.h:
  Added new function needed for mysqltest.c
myisam/mi_create.c:
  Cleanup
myisam/mi_delete.c:
  Fixed bug when deleting keys with NULL
myisam/mi_search.c:
  cleanup
myisam/myisamchk.c:
  Added info about fulltext to -D
mysql-test/mysql-test-run.sh:
  Use less memory for mysqld
  Don't remove timefile if only testing one test
  Send option --debug to mysqltest
mysql-test/r/fulltext.result:
  New tests
mysql-test/r/func_math.result:
  Make test portable
mysql-test/t/fulltext.test:
  New tests
mysql-test/t/func_math.test:
  Make test portable
mysys/mf_iocache2.c:
  Fixed bug when reading over buffers
mysys/string.c:
  Added new function needed for mysqltest.c
mysys/typelib.c:
  cleanup
scripts/make_binary_distribution.sh:
  Added option suffix
  Removed some warnings for missing files
scripts/mysql_install_db.sh:
  Fixed type
scripts/safe_mysqld.sh:
  Also read options from 'server' group
sql-bench/Results/ATIS-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark run
sql-bench/Results/RUN-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark run
sql-bench/Results/alter-table-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark run
sql-bench/Results/big-tables-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark run
sql-bench/Results/connect-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark run
sql-bench/Results/create-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark run
sql-bench/Results/insert-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark run
sql-bench/Results/select-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark run
sql-bench/Results/wisconsin-mysql-Linux_2.2.13_SMP_alpha:
  New benchmark run
sql-bench/bench-init.pl.sh:
  Added missing option '--silent'
sql/mysqld.cc:
  Added warnings
  Print backtraces even if 'current_thd' is not active
support-files/mysql.spec.sh:
  Removed duplicate entry
2001-01-08 00:04:30 +02:00

127 lines
3.5 KiB
C

/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
MA 02111-1307, USA */
/*
Code for handling strings with can grow dynamicly.
Copyright Monty Program KB.
By monty.
*/
#include "mysys_priv.h"
#include <m_string.h>
my_bool init_dynamic_string(DYNAMIC_STRING *str, const char *init_str,
uint init_alloc, uint alloc_increment)
{
uint length;
DBUG_ENTER("init_dynamic_string");
if (!alloc_increment)
alloc_increment=128;
length=1;
if (init_str && (length= (uint) strlen(init_str)+1) < init_alloc)
init_alloc=((length+alloc_increment-1)/alloc_increment)*alloc_increment;
if (!init_alloc)
init_alloc=alloc_increment;
if (!(str->str=(char*) my_malloc(init_alloc,MYF(MY_WME))))
DBUG_RETURN(TRUE);
str->length=length-1;
if (init_str)
memcpy(str->str,init_str,length);
str->max_length=init_alloc;
str->alloc_increment=alloc_increment;
DBUG_RETURN(FALSE);
}
my_bool dynstr_set(DYNAMIC_STRING *str, const char *init_str)
{
uint length;
DBUG_ENTER("dynstr_set");
if (init_str && (length= (uint) strlen(init_str)+1) > str->max_length)
{
str->max_length=((length+str->alloc_increment-1)/str->alloc_increment)*
str->alloc_increment;
if (!str->max_length)
str->max_length=str->alloc_increment;
if (!(str->str=(char*) my_realloc(str->str,str->max_length,MYF(MY_WME))))
DBUG_RETURN(TRUE);
}
if (init_str)
{
str->length=length-1;
memcpy(str->str,init_str,length);
}
else
str->length=0;
DBUG_RETURN(FALSE);
}
my_bool dynstr_realloc(DYNAMIC_STRING *str, ulong additional_size)
{
DBUG_ENTER("dynstr_realloc");
if (!additional_size) DBUG_RETURN(FALSE);
if (str->length + additional_size > str->max_length)
{
str->max_length=((str->length + additional_size+str->alloc_increment-1)/
str->alloc_increment)*str->alloc_increment;
if (!(str->str=(char*) my_realloc(str->str,str->max_length,MYF(MY_WME))))
DBUG_RETURN(TRUE);
}
DBUG_RETURN(FALSE);
}
my_bool dynstr_append(DYNAMIC_STRING *str, const char *append)
{
return dynstr_append_mem(str,append,strlen(append));
}
my_bool dynstr_append_mem(DYNAMIC_STRING *str, const char *append,
uint length)
{
char *new_ptr;
if (str->length+length >= str->max_length)
{
uint new_length=(str->length+length+str->alloc_increment)/
str->alloc_increment;
new_length*=str->alloc_increment;
if (!(new_ptr=(char*) my_realloc(str->str,new_length,MYF(MY_WME))))
return TRUE;
str->str=new_ptr;
str->max_length=new_length;
}
memcpy(str->str + str->length,append,length);
str->length+=length;
str->str[str->length]=0; /* Safety for C programs */
return FALSE;
}
void dynstr_free(DYNAMIC_STRING *str)
{
if (str->str)
{
my_free(str->str,MYF(MY_WME));
str->str=0;
}
}