mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
16115af97c
Fixed problem with LIKE with latin1_de Added parsing support of UNSIGNED LONG LONG Docs/manual.texi: Changelog client/client_priv.h: Changed to use my_global.h client/completion_hash.cc: Changed to use my_global.h client/errmsg.c: Changed to use my_global.h client/get_password.c: Changed to use my_global.h client/mysqldump.c: Changed to use my_global.h client/mysqlshow.c: Changed to use my_global.h client/mysqltest.c: Changed to use my_global.h client/password.c: Changed to use my_global.h client/readline.cc: Changed to use my_global.h client/sql_string.cc: Changed to use my_global.h client/thimble.cc: Changed to use my_global.h client/thread_test.c: Changed to use my_global.h dbug/dbug.c: Changed to use my_global.h dbug/dbug_analyze.c: Changed to use my_global.h dbug/example1.c: Changed to use my_global.h dbug/example2.c: Changed to use my_global.h dbug/example3.c: Changed to use my_global.h dbug/factorial.c: Changed to use my_global.h dbug/main.c: Changed to use my_global.h dbug/sanity.c: Changed to use my_global.h extra/comp_err.c: Changed to use my_global.h extra/my_print_defaults.c: Changed to use my_global.h extra/perror.c: Changed to use my_global.h extra/replace.c: Changed to use my_global.h extra/resolve_stack_dump.c: Changed to use my_global.h extra/resolveip.c: Changed to use my_global.h fs/libmysqlfs.h: Changed to use my_global.h fs/mysqlcorbafs.h: Changed to use my_global.h heap/hp_test1.c: Changed to use my_global.h include/Makefile.am: Changed to use my_global.h include/m_ctype.h: Changed to use my_global.h include/my_base.h: Changed to use my_global.h innobase/include/univ.i: Changed to use my_global.h libmysql/dll.c: Changed to use my_global.h libmysql/errmsg.c: Changed to use my_global.h libmysql/get_password.c: Changed to use my_global.h libmysql/libmysql.c: Changed to use my_global.h libmysql/net.c: Changed to use my_global.h libmysql/password.c: Changed to use my_global.h libmysqld/lib_sql.cc: Changed to use my_global.h libmysqld/lib_vio.c: Changed to use my_global.h libmysqld/libmysqld.c: Changed to use my_global.h mysql-test/mysql-test-run.sh: Changed to use latin1 as default character set mysql-test/r/ctype_latin1_de.result: Changed to use my_global.h mysql-test/r/func_like.result: New test mysql-test/t/ctype_latin1_de.test: Added test of part keys mysql-test/t/func_like.test: New test mysys/checksum.c: Changed to use my_global.h mysys/getopt.c: Changed to use my_global.h mysys/getopt1.c: Changed to use my_global.h mysys/make-conf.c: Changed to use my_global.h mysys/my_alloc.c: Changed to use my_global.h mysys/my_clock.c: Changed to use my_global.h mysys/my_compress.c: Changed to use my_global.h mysys/mysys_priv.h: Changed to use my_global.h mysys/test_charset.c: Changed to use my_global.h mysys/testhash.c: Changed to use my_global.h mysys/thr_alarm.c: Changed to use my_global.h mysys/thr_mutex.c: Changed to use my_global.h regex/debug.c: Changed to use my_global.h regex/main.c: Changed to use my_global.h regex/regcomp.c: Changed to use my_global.h regex/regerror.c: Changed to use my_global.h regex/regexec.c: Changed to use my_global.h regex/regexp.c: Changed to use my_global.h regex/regfree.c: Changed to use my_global.h regex/reginit.c: Changed to use my_global.h sql/cache_manager.cc: Changed to use my_global.h sql/gen_lex_hash.cc: Changed to use my_global.h sql/ha_berkeley.cc: Fixed problem with UNIQUE keys that could contain NULL sql/ha_gemini.h: Changed to use my_global.h sql/handler.cc: Fixed problem after merge sql/item.cc: Added Item_unit sql/item.h: Added Item_uint sql/matherr.c: Changed to use my_global.h sql/md5.c: Changed to use my_global.h sql/mini_client.cc: Changed to use my_global.h sql/my_lock.c: Changed to use my_global.h sql/mysql_priv.h: Changed to use my_global.h sql/net_serv.cc: Changed to use my_global.h sql/password.c: Changed to use my_global.h sql/sql_lex.cc: Added parsing support of UNSIGNED LONG LONG sql/sql_show.cc: Changed to use my_global.h sql/sql_string.cc: Changed to use my_global.h sql/sql_yacc.yy: Added usage of Int_uint sql/stacktrace.c: Changed to use my_global.h sql/udf_example.cc: Changed to use my_global.h strings/atof.c: Changed to use my_global.h strings/bchange.c: Changed to use my_global.h strings/bcmp.c: Changed to use my_global.h strings/bfill.c: Changed to use my_global.h strings/bmove.c: Changed to use my_global.h strings/bmove512.c: Changed to use my_global.h strings/bmove_upp.c: Changed to use my_global.h strings/ctype-big5.c: Changed to use my_global.h strings/ctype-czech.c: Changed to use my_global.h strings/ctype-euc_kr.c: Changed to use my_global.h strings/ctype-gb2312.c: Changed to use my_global.h strings/ctype-gbk.c: Changed to use my_global.h strings/ctype-latin1_de.c: Fixed problem with LIKE strings/ctype-sjis.c: Changed to use my_global.h strings/ctype-tis620.c: Changed to use my_global.h strings/ctype-ujis.c: Changed to use my_global.h strings/ctype.c: Changed to use my_global.h strings/do_ctype.c: Changed to use my_global.h strings/int2str.c: Changed to use my_global.h strings/is_prefix.c: Changed to use my_global.h strings/llstr.c: Changed to use my_global.h strings/longlong2str.c: Changed to use my_global.h strings/r_strinstr.c: Changed to use my_global.h strings/str2int.c: Changed to use my_global.h strings/str_test.c: Changed to use my_global.h strings/strappend.c: Changed to use my_global.h strings/strcend.c: Changed to use my_global.h strings/strcont.c: Changed to use my_global.h strings/strend.c: Changed to use my_global.h strings/strfill.c: Changed to use my_global.h strings/strings-not-used.h: Changed to use my_global.h strings/strinstr.c: Changed to use my_global.h strings/strmake.c: Changed to use my_global.h strings/strmov.c: Changed to use my_global.h strings/strnlen.c: Changed to use my_global.h strings/strnmov.c: Changed to use my_global.h strings/strstr.c: Changed to use my_global.h strings/strto.c: Changed to use my_global.h strings/strtol.c: Changed to use my_global.h strings/strtoll.c: Changed to use my_global.h strings/strtoul.c: Changed to use my_global.h strings/strtoull.c: Changed to use my_global.h strings/strxmov.c: Changed to use my_global.h strings/strxnmov.c: Changed to use my_global.h strings/udiv.c: Changed to use my_global.h tools/mysqlmanager.c: Changed to use my_global.h vio/test-ssl.c: Changed to use my_global.h vio/test-sslclient.c: Changed to use my_global.h vio/test-sslserver.c: Changed to use my_global.h vio/test-ssl: Changed to use my_global.h vio/vio.c: Changed to use my_global.h vio/viosocket.c: Changed to use my_global.h vio/viossl.c: Changed to use my_global.h vio/viosslfactories.c: Changed to use my_global.h vio/viotest-ssl.c: Changed to use my_global.h
212 lines
5.5 KiB
C
212 lines
5.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 */
|
|
|
|
/* Routines to handle mallocing of results which will be freed the same time */
|
|
|
|
#include <my_global.h>
|
|
#include <my_sys.h>
|
|
#include <m_string.h>
|
|
|
|
void init_alloc_root(MEM_ROOT *mem_root, uint block_size, uint pre_alloc_size)
|
|
{
|
|
mem_root->free=mem_root->used=0;
|
|
mem_root->min_malloc=32;
|
|
mem_root->block_size=block_size-MALLOC_OVERHEAD-sizeof(USED_MEM)-8;
|
|
mem_root->error_handler=0;
|
|
#if !(defined(HAVE_purify) && defined(EXTRA_DEBUG))
|
|
if (pre_alloc_size)
|
|
{
|
|
if ((mem_root->free = mem_root->pre_alloc=
|
|
(USED_MEM*) my_malloc(pre_alloc_size+ ALIGN_SIZE(sizeof(USED_MEM)),
|
|
MYF(0))))
|
|
{
|
|
mem_root->free->size=pre_alloc_size+ALIGN_SIZE(sizeof(USED_MEM));
|
|
mem_root->free->left=pre_alloc_size;
|
|
mem_root->free->next=0;
|
|
}
|
|
}
|
|
#endif
|
|
}
|
|
|
|
gptr alloc_root(MEM_ROOT *mem_root,unsigned int Size)
|
|
{
|
|
#if defined(HAVE_purify) && defined(EXTRA_DEBUG)
|
|
reg1 USED_MEM *next;
|
|
Size+=ALIGN_SIZE(sizeof(USED_MEM));
|
|
|
|
if (!(next = (USED_MEM*) my_malloc(Size,MYF(MY_WME))))
|
|
{
|
|
if (mem_root->error_handler)
|
|
(*mem_root->error_handler)();
|
|
return((gptr) 0); /* purecov: inspected */
|
|
}
|
|
next->next=mem_root->used;
|
|
next->size= Size;
|
|
mem_root->used=next;
|
|
return (gptr) (((char*) next)+ALIGN_SIZE(sizeof(USED_MEM)));
|
|
#else
|
|
uint get_size,max_left;
|
|
gptr point;
|
|
reg1 USED_MEM *next;
|
|
reg2 USED_MEM **prev;
|
|
|
|
Size= ALIGN_SIZE(Size);
|
|
prev= &mem_root->free;
|
|
max_left=0;
|
|
for (next= *prev ; next && next->left < Size ; next= next->next)
|
|
{
|
|
if (next->left > max_left)
|
|
max_left=next->left;
|
|
prev= &next->next;
|
|
}
|
|
if (! next)
|
|
{ /* Time to alloc new block */
|
|
get_size= Size+ALIGN_SIZE(sizeof(USED_MEM));
|
|
if (max_left*4 < mem_root->block_size && get_size < mem_root->block_size)
|
|
get_size=mem_root->block_size; /* Normal alloc */
|
|
|
|
if (!(next = (USED_MEM*) my_malloc(get_size,MYF(MY_WME))))
|
|
{
|
|
if (mem_root->error_handler)
|
|
(*mem_root->error_handler)();
|
|
return((gptr) 0); /* purecov: inspected */
|
|
}
|
|
next->next= *prev;
|
|
next->size= get_size;
|
|
next->left= get_size-ALIGN_SIZE(sizeof(USED_MEM));
|
|
*prev=next;
|
|
}
|
|
point= (gptr) ((char*) next+ (next->size-next->left));
|
|
if ((next->left-= Size) < mem_root->min_malloc)
|
|
{ /* Full block */
|
|
*prev=next->next; /* Remove block from list */
|
|
next->next=mem_root->used;
|
|
mem_root->used=next;
|
|
}
|
|
return(point);
|
|
#endif
|
|
}
|
|
|
|
/* Mark all data in blocks free for reusage */
|
|
|
|
static inline void mark_blocks_free(MEM_ROOT* root)
|
|
{
|
|
reg1 USED_MEM *next;
|
|
reg2 USED_MEM **last;
|
|
|
|
/* iterate through (partially) free blocks, mark them free */
|
|
last= &root->free;
|
|
for (next= root->free; next; next= *(last= &next->next))
|
|
next->left= next->size - ALIGN_SIZE(sizeof(USED_MEM));
|
|
|
|
/* Combine the free and the used list */
|
|
*last= next=root->used;
|
|
|
|
/* now go through the used blocks and mark them free */
|
|
for (; next; next= next->next)
|
|
next->left= next->size - ALIGN_SIZE(sizeof(USED_MEM));
|
|
|
|
/* Now everything is set; Indicate that nothing is used anymore */
|
|
root->used= 0;
|
|
}
|
|
|
|
|
|
/*
|
|
Deallocate everything used by alloc_root or just move
|
|
used blocks to free list if called with MY_USED_TO_FREE
|
|
*/
|
|
|
|
void free_root(MEM_ROOT *root, myf MyFlags)
|
|
{
|
|
reg1 USED_MEM *next,*old;
|
|
DBUG_ENTER("free_root");
|
|
|
|
if (!root)
|
|
DBUG_VOID_RETURN; /* purecov: inspected */
|
|
if (MyFlags & MY_MARK_BLOCKS_FREE)
|
|
{
|
|
mark_blocks_free(root);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
if (!(MyFlags & MY_KEEP_PREALLOC))
|
|
root->pre_alloc=0;
|
|
|
|
for (next=root->used; next ;)
|
|
{
|
|
old=next; next= next->next ;
|
|
if (old != root->pre_alloc)
|
|
my_free((gptr) old,MYF(0));
|
|
}
|
|
for (next=root->free ; next ;)
|
|
{
|
|
old=next; next= next->next;
|
|
if (old != root->pre_alloc)
|
|
my_free((gptr) old,MYF(0));
|
|
}
|
|
root->used=root->free=0;
|
|
if (root->pre_alloc)
|
|
{
|
|
root->free=root->pre_alloc;
|
|
root->free->left=root->pre_alloc->size-ALIGN_SIZE(sizeof(USED_MEM));
|
|
root->free->next=0;
|
|
}
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
/*
|
|
Find block that contains an object and set the pre_alloc to it
|
|
*/
|
|
|
|
void set_prealloc_root(MEM_ROOT *root, char *ptr)
|
|
{
|
|
USED_MEM *next;
|
|
for (next=root->used; next ; next=next->next)
|
|
{
|
|
if ((char*) next <= ptr && (char*) next + next->size > ptr)
|
|
{
|
|
root->pre_alloc=next;
|
|
return;
|
|
}
|
|
}
|
|
for (next=root->free ; next ; next=next->next)
|
|
{
|
|
if ((char*) next <= ptr && (char*) next + next->size > ptr)
|
|
{
|
|
root->pre_alloc=next;
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
char *strdup_root(MEM_ROOT *root,const char *str)
|
|
{
|
|
uint len= (uint) strlen(str)+1;
|
|
char *pos;
|
|
if ((pos=alloc_root(root,len)))
|
|
memcpy(pos,str,len);
|
|
return pos;
|
|
}
|
|
|
|
|
|
char *memdup_root(MEM_ROOT *root,const char *str,uint len)
|
|
{
|
|
char *pos;
|
|
if ((pos=alloc_root(root,len)))
|
|
memcpy(pos,str,len);
|
|
return pos;
|
|
}
|