mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
8b3993bc01
Docs/Makefile.am: Removed typo Docs/internals.texi: Added documentation about filesort Docs/manual.texi: Lots of changes, including information about the password in the mysql.user table config.h.in: ***MISSING WEAVE*** heap/hp_rnext.c: Fix of reading of read-next include/config-win.h: Fix for Ia64 include/global.h: Fix for Ia64 include/my_base.h: Fix for Ia64 include/myisam.h: New repair options isam/_dynrec.c: Typo fixes isam/_search.c: Fix for Ia64 merge/rrnd.c: Fix of ORDER BY for MERGE tables myisam/ft_eval.c: Fix for Ia64 myisam/ft_parser.c: Fix for Ia64 myisam/ft_static.c: Portability fixes myisam/mi_check.c: Fix for Ia64 + delay key creation myisam/mi_locking.c: Portability fixes myisam/myisamdef.h: Fixes for automatic table repair myisam/myisampack.c: Version number increment myisammrg/myrg_rrnd.c: Fix of ORDER BY for mymerge tables mysql.proj: Updated mysys/charset.c: Fix for Ia64 mysys/mf_casecnv.c: Fix for Ia64 mysys/mf_pack.c: Fix for Ia64 mysys/mf_path.c: Fix for Ia64 mysys/mf_wfile.c: Fix for Ia64 mysys/my_alloc.c: Fix for Ia64 mysys/my_lib.c: Fix for Ia64 mysys/my_lread.c: Fix for Ia64 mysys/my_lwrite.c: Fix for Ia64 mysys/my_winthread.c: Fix for Ia64 mysys/string.c: Fix for Ia64 mysys/thr_alarm.c: Fix for Ia64 mysys/thr_rwlock.c: Fix of scheduler bug for systems without rw_locks regex/regcomp.c: Fix for Ia64 regex/regex.h: Fix for Ia64 regex/regex2.h: Fix for Ia64 scripts/mysqlhotcopy.sh: Explicit version number (because of bitkeeper) sql-bench/bench-init.pl.sh: New help message sql-bench/server-cfg.sh: Updates for postgreSQL 7.0 sql/ChangeLog: Changelog sql/field.cc: Fix of datetime function handling sql/filesort.cc: More comments sql/gen_lex_hash.cc: More options sql/ha_berkeley.cc: Fix for part key reading sql/ha_berkeley.h: Indentation sql/ha_myisam.cc: Fix for delayed key creation sql/ha_myisam.h: Fix for delayed key creation sql/handler.h: Fix for delayed key creation sql/item_func.cc: Fix of crash when using constant expression with UDF functions in WHERE sql/item_timefunc.cc: Fix of datetime function handling sql/mini_client.cc: Portability fix sql/mysql_priv.h: Optimization of select initialization sql/mysqld.cc: Portability fixes, thread cache and min argument for connect_timeout sql/sql_load.cc: Delayed key handling sql/sql_parse.cc: Portability fixes and select initialization optimization sql/sql_select.cc: Small optimization + more comments sql/sql_table.cc: Fix default value adding to blob with alter table + delayed index creation sql/sql_yacc.yy: Optimized select initialization sql/structs.h: Fix for part key read strings/ctype-sjis.c: Fix for Ia64 strings/ctype-tis620.c: Fix for Ia64 strings/t_ctype.h: bk fix support-files/mysql.spec.sh: Added comment vio/viotest-ssl.cc: bk fix vio/viotest-sslconnect.cc: bk fix vio/viotest.cc: bk fix BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
117 lines
3.3 KiB
C
117 lines
3.3 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)
|
|
{
|
|
char *new_ptr;
|
|
uint length=(uint) strlen(append)+1;
|
|
if (str->length+length > str->max_length)
|
|
{
|
|
uint new_length=(str->length+length+str->alloc_increment-1)/
|
|
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-1;
|
|
return FALSE;
|
|
}
|
|
|
|
void dynstr_free(DYNAMIC_STRING *str)
|
|
{
|
|
if (str->str)
|
|
{
|
|
my_free(str->str,MYF(MY_WME));
|
|
str->str=0;
|
|
}
|
|
}
|