mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
10e22c346a
Some changes to the prepared statement protocol to make it easier to use and faster. Makefile.am: Fix to make dist to work with cmd-line-utils client/mysql.cc: Portability fixes client/mysqlbinlog.cc: Portabiliy fixes and remove usafe of FILE configure.in: Fix to make dist to work with cmd-line-utils heap/_check.c: Portability fixes include/config-win.h: Portability fixes include/m_ctype.h: Indentation cleanup include/my_list.h: Portability fixes include/mysql.h: Cleanup of BIND structure include/violite.h: Portability fixes innobase/dict/dict0dict.c: Portability fixes innobase/dict/dict0load.c: Portability fixes innobase/include/os0proc.h: Portability fixes (Heikki, please check) innobase/os/os0proc.c: Portability fixes (Heikki, please check) innobase/ut/ut0ut.c: Portability fixes isam/pack_isam.c: Portability fixes libmysql/libmysql.c: Portability fixes Remove obscure usage of the length parameter for prepared statements. libmysql/libmysql.def: Remove not existing functions libmysqld/lib_sql.cc: Remove compiler warning mysql-test/r/explain.result: Fix after merge mysql-test/r/join.result: Fix after merge mysys/my_once.c: Portability fix mysys/tree.c: Portability fixes sql/field.cc: Portability fixes sql/filesort.cc: move assert.h to mysql_priv.h sql/ha_berkeley.cc: move assert.h to mysql_priv.h sql/ha_innodb.cc: move assert.h to mysql_priv.h sql/item.cc: move assert.h to mysql_priv.h Fixed syntax error sql/item_cmpfunc.cc: move assert.h to mysql_priv.h sql/item_func.cc: move assert.h to mysql_priv.h sql/item_row.cc: move assert.h to mysql_priv.h sql/item_strfunc.cc: Portability fix sql/item_subselect.cc: Portability fix sql/item_sum.cc: move assert.h to mysql_priv.h sql/lex.h: Portability fix sql/lock.cc: move assert.h to mysql_priv.h sql/log.cc: move assert.h to mysql_priv.h sql/log_event.cc: Portability fix sql/mf_iocache.cc: move assert.h to mysql_priv.h sql/mysql_priv.h: move assert.h to mysql_priv.h sql/mysqld.cc: move assert.h to mysql_priv.h sql/opt_range.cc: move assert.h to mysql_priv.h sql/password.c: Portability fix sql/protocol.cc: move assert.h to mysql_priv.h sql/set_var.cc: Portability fix sql/slave.cc: move assert.h to mysql_priv.h sql/spatial.cc: Portability fix sql/sql_acl.cc: move assert.h to mysql_priv.h sql/sql_base.cc: move assert.h to mysql_priv.h sql/sql_cache.cc: move assert.h to mysql_priv.h sql/sql_class.cc: move assert.h to mysql_priv.h sql/sql_handler.cc: move assert.h to mysql_priv.h sql/sql_help.cc: Removed compiler warning sql/sql_lex.cc: Portability fix sql/sql_lex.h: Portability fix sql/sql_parse.cc: move assert.h to mysql_priv.h sql/sql_prepare.cc: move assert.h to mysql_priv.h sql/sql_repl.cc: move assert.h to mysql_priv.h sql/sql_select.cc: move assert.h to mysql_priv.h sql/sql_string.cc: Portability fix sql/sql_string.h: Portability fix sql/sql_table.cc: move assert.h to mysql_priv.h sql/sql_yacc.yy: Portability fix Remove not accessed code strings/ctype-bin.c: Portability fix strings/ctype-mb.c: Portability fix strings/ctype.c: Portability fix tests/client_test.c: A
121 lines
2.8 KiB
C
121 lines
2.8 KiB
C
/* Copyright (C) 2000 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program 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 General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/* Not MT-SAFE */
|
|
|
|
#ifdef SAFEMALLOC /* We don't need SAFEMALLOC here */
|
|
#undef SAFEMALLOC
|
|
#endif
|
|
|
|
#include "mysys_priv.h"
|
|
#include "my_static.h"
|
|
#include "mysys_err.h"
|
|
#include <m_string.h>
|
|
|
|
/*
|
|
Alloc for things we don't nead to free
|
|
|
|
SYNOPSIS
|
|
my_once_alloc()
|
|
Size
|
|
MyFlags
|
|
|
|
NOTES
|
|
No DBUG_ENTER... here to get smaller dbug-startup
|
|
*/
|
|
|
|
gptr my_once_alloc(unsigned int Size, myf MyFlags)
|
|
{
|
|
uint get_size,max_left;
|
|
gptr point;
|
|
reg1 USED_MEM *next;
|
|
reg2 USED_MEM **prev;
|
|
|
|
Size= ALIGN_SIZE(Size);
|
|
prev= &my_once_root_block;
|
|
max_left=0;
|
|
for (next=my_once_root_block ; 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 < my_once_extra && get_size < my_once_extra)
|
|
get_size=my_once_extra; /* Normal alloc */
|
|
|
|
if ((next = (USED_MEM*) malloc(get_size)) == 0)
|
|
{
|
|
my_errno=errno;
|
|
if (MyFlags & (MY_FAE+MY_WME))
|
|
my_error(EE_OUTOFMEMORY, MYF(ME_BELL+ME_WAITTANG),get_size);
|
|
return((gptr) 0);
|
|
}
|
|
DBUG_PRINT("test",("my_once_malloc %u byte malloced",get_size));
|
|
next->next= 0;
|
|
next->size= get_size;
|
|
next->left= get_size-ALIGN_SIZE(sizeof(USED_MEM));
|
|
*prev=next;
|
|
}
|
|
point= (gptr) ((char*) next+ (next->size-next->left));
|
|
next->left-= Size;
|
|
|
|
return(point);
|
|
} /* my_once_alloc */
|
|
|
|
|
|
char *my_once_strdup(const char *src,myf myflags)
|
|
{
|
|
uint len=strlen(src)+1;
|
|
char *dst=my_once_alloc(len, myflags);
|
|
if (dst)
|
|
memcpy(dst, src, len);
|
|
return dst;
|
|
}
|
|
|
|
|
|
char *my_once_memdup(const char *src, uint len, myf myflags)
|
|
{
|
|
char *dst=my_once_alloc(len, myflags);
|
|
if (dst)
|
|
memcpy(dst, src, len);
|
|
return dst;
|
|
}
|
|
|
|
|
|
/*
|
|
Deallocate everything used by my_once_alloc
|
|
|
|
SYNOPSIS
|
|
my_once_free()
|
|
*/
|
|
|
|
void my_once_free(void)
|
|
{
|
|
reg1 USED_MEM *next,*old;
|
|
DBUG_ENTER("my_once_free");
|
|
|
|
for (next=my_once_root_block ; next ; )
|
|
{
|
|
old=next; next= next->next ;
|
|
free((gptr) old);
|
|
}
|
|
my_once_root_block=0;
|
|
|
|
DBUG_VOID_RETURN;
|
|
} /* my_once_free */
|