mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
f72611b4fa
Added initialization of all important global variables BUILD/SETUP.sh: build with readline client/mysqltest.c: Added variable SERVER_VERSION myisam/mi_key.c: Indentation change myisam/mi_open.c: After merge fix myisam/mi_range.c: After merge fix myisam/mi_rkey.c: After merge fix myisam/mi_search.c: After merge fix myisam/myisamdef.h: After merge fix mysql-test/include/not_embedded.inc: Fix test (because of wrong utf8 test) mysql-test/r/alter_table.result: Updated results after merge mysql-test/r/create.result: Updated results after merge mysql-test/r/ctype_recoding.result: Updated results after merge mysql-test/r/fulltext.result: Updated results after merge mysql-test/r/func_group.result: Updated results after merge mysql-test/r/group_by.result: Updated results after merge mysql-test/r/innodb.result: Updated results after merge mysql-test/r/join_outer.result: Updated results after merge mysql-test/r/null_key.result: Updated results after merge mysql-test/r/order_by.result: Updated results after merge mysql-test/r/query_cache.result: Updated results after merge mysql-test/r/repair.result: Updated results after merge mysql-test/r/rpl_flush_tables.result: Updated results after merge mysql-test/r/union.result: Updated results after merge mysql-test/r/update.result: Updated results after merge mysql-test/t/ansi.test: After merge fixes mysql-test/t/create.test: After merge fixes mysql-test/t/ctype_recoding.test: After merge fixes mysql-test/t/ctype_ujis.test: After merge fixes mysql-test/t/fulltext.test: After merge fixes mysql-test/t/innodb.test: After merge fixes mysql-test/t/join_outer.test: After merge fixes mysql-test/t/loaddata.test: After merge fixes mysql-test/t/order_by.test: After merge fixes mysql-test/t/rpl_flush_tables.test: After merge fixes mysql-test/t/status.test: After merge fixes mysql-test/t/subselect.test: After merge fixes sql/convert.cc: Code cleanup sql/field.cc: After merge fixes sql/filesort.cc: Remove compiler warning sql/item.cc: More efficient set_name() (no mallocs) sql/item_cmpfunc.cc: Code Code cleanup Item_bool_func2::fix_fields() added to get error handling right for cmp_charset sql/item_cmpfunc.h: New prototypes sql/item_func.cc: After merge fix sql/item_strfunc.cc: Faster check for BINARY sql/log_event.cc: Comment cleanup sql/mysql_priv.h: New prototypes and variables sql/mysqld.cc: Added initialization of all important global variables. Cleanup of variable declarations This is needed ot make the embedded version restartable sql/opt_sum.cc: After merge fix sql/set_var.cc: Code cleanup sql/sql_acl.cc: After merge fix Better error message sql/sql_db.cc: After merge fix sql/sql_derived.cc: After merge fix sql/sql_insert.cc: Indentation cleanups sql/sql_list.h: Added empty() to base_ilist sql/sql_parse.cc: After merge fix sql/sql_select.cc: After merge fix Fixed derived name handling in EXPLAIN sql/sql_show.cc: After merge fix sql/sql_string.cc: Made copy_and_convert global sql/sql_string.h: Made copy_and_convert global sql/sql_update.cc: After merge fix sql/sql_yacc.yy: After merge fix sql/thr_malloc.cc: Added sql_strmake_with_convert() sql/unireg.h: Added MAX_ALIAS_NAME strings/ctype-ujis.c: Fixed bug in converting to ujis
117 lines
2.8 KiB
C++
117 lines
2.8 KiB
C++
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult 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 */
|
|
|
|
|
|
/* Mallocs for used in threads */
|
|
|
|
#include "mysql_priv.h"
|
|
|
|
extern "C" {
|
|
void sql_alloc_error_handler(void)
|
|
{
|
|
THD *thd=current_thd;
|
|
if (thd) // QQ; To be removed
|
|
thd->fatal_error(); /* purecov: inspected */
|
|
sql_print_error(ER(ER_OUT_OF_RESOURCES));
|
|
}
|
|
}
|
|
|
|
void init_sql_alloc(MEM_ROOT *mem_root, uint block_size, uint pre_alloc)
|
|
{
|
|
init_alloc_root(mem_root, block_size, pre_alloc);
|
|
mem_root->error_handler=sql_alloc_error_handler;
|
|
}
|
|
|
|
|
|
gptr sql_alloc(uint Size)
|
|
{
|
|
MEM_ROOT *root=my_pthread_getspecific_ptr(MEM_ROOT*,THR_MALLOC);
|
|
char *ptr= (char*) alloc_root(root,Size);
|
|
return ptr;
|
|
}
|
|
|
|
|
|
gptr sql_calloc(uint size)
|
|
{
|
|
gptr ptr;
|
|
if ((ptr=sql_alloc(size)))
|
|
bzero((char*) ptr,size);
|
|
return ptr;
|
|
}
|
|
|
|
|
|
char *sql_strdup(const char *str)
|
|
{
|
|
uint len=(uint) strlen(str)+1;
|
|
char *pos;
|
|
if ((pos= (char*) sql_alloc(len)))
|
|
memcpy(pos,str,len);
|
|
return pos;
|
|
}
|
|
|
|
|
|
char *sql_strmake(const char *str,uint len)
|
|
{
|
|
char *pos;
|
|
if ((pos= (char*) sql_alloc(len+1)))
|
|
{
|
|
memcpy(pos,str,len);
|
|
pos[len]=0;
|
|
}
|
|
return pos;
|
|
}
|
|
|
|
|
|
gptr sql_memdup(const void *ptr,uint len)
|
|
{
|
|
char *pos;
|
|
if ((pos= (char*) sql_alloc(len)))
|
|
memcpy(pos,ptr,len);
|
|
return pos;
|
|
}
|
|
|
|
void sql_element_free(void *ptr __attribute__((unused)))
|
|
{} /* purecov: deadcode */
|
|
|
|
|
|
|
|
char *sql_strmake_with_convert(const char *str, uint32 arg_length,
|
|
CHARSET_INFO *from_cs,
|
|
uint32 max_res_length,
|
|
CHARSET_INFO *to_cs, uint32 *result_length)
|
|
{
|
|
char *pos;
|
|
uint32 new_length= to_cs->mbmaxlen*arg_length;
|
|
max_res_length--; // Reserve place for end null
|
|
|
|
set_if_smaller(new_length, max_res_length);
|
|
if (!(pos= sql_alloc(new_length+1)))
|
|
return pos; // Error
|
|
|
|
if ((from_cs == &my_charset_bin) || (to_cs == &my_charset_bin))
|
|
{
|
|
// Safety if to_cs->mbmaxlen > 0
|
|
new_length= min(arg_length, max_res_length);
|
|
memcpy(pos, str, new_length);
|
|
}
|
|
else
|
|
new_length= copy_and_convert((char*) pos, new_length, to_cs, str,
|
|
arg_length, from_cs);
|
|
pos[new_length]= 0;
|
|
*result_length= new_length;
|
|
return pos;
|
|
}
|
|
|