mirror of
				https://github.com/MariaDB/server.git
				synced 2025-10-31 15:50:51 +03:00 
			
		
		
		
	Now thd->mem_root is a pointer to thd->main_mem_root and THR_MALLOC is a pointer to thd->mem_root. This gives us the following benefits: - Allow us to easily detect if arena has already been swapped before (this fixes a bug in setup_conds() where arena was swaped twice in some cases) - Faster swaps of arenas (as we don't have to copy the whole MEM_ROOT) - We don't anymore have to call my_pthread_setspecific_ptr(THR_MALLOC,...) to change where memory is alloced. Now it's enough to set thd->mem_root client/mysqltest.c: Remove some not needed defines (Things like this should be done in config-win.h) include/config-win.h: Added popen() and pclose() compatibility macros mysql-test/t/rpl_failed_optimize-master.opt: Portability fix sql/ha_berkeley.cc: New thd->memroot handling sql/item_cmpfunc.cc: Simpler arena swapping code sql/item_func.cc: Simpler arena swapping code sql/item_subselect.cc: Simpler arena swapping code New thd->mem_root handling sql/item_sum.cc: New thd->mem_root handling sql/item_timefunc.cc: Fixed not-initalized usage errors found by valgrind sql/log_event.cc: New thd->mem_root handling sql/mysql_priv.h: New thd->mem_root handling sql/mysqld.cc: New thd->mem_root handling sql/opt_range.cc: New thd->mem_root handling sql/repl_failsafe.cc: New thd->mem_root handling sql/set_var.cc: New thd->mem_root handling sql/sql_acl.cc: New thd->mem_root handling sql/sql_base.cc: Simpler arena swapping code New thd->mem_root handling sql/sql_class.cc: New thd->mem_root handling sql/sql_class.h: Simpler arena swapping code New thd->mem_root handling sql/sql_db.cc: New thd->mem_root handling sql/sql_error.cc: New thd->mem_root handling sql/sql_help.cc: New thd->mem_root handling sql/sql_insert.cc: New thd->mem_root handling sql/sql_parse.cc: New thd->mem_root handling Added some extra checking of return value of new sql/sql_prepare.cc: New thd->mem_root handling sql/sql_select.cc: New thd->mem_root handling sql/sql_select.h: New thd->mem_root handling sql/sql_union.cc: Simpler arena swapping code sql/sql_yacc.yy: New thd->mem_root handling sql/table.cc: New thd->mem_root handling sql/thr_malloc.cc: New thd->mem_root handling tests/client_test.c: Added drop table to some tests Changed some table names to 't1'
		
			
				
	
	
		
			121 lines
		
	
	
		
			2.8 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			121 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
 | |
|   {
 | |
|     uint dummy_errors;
 | |
|     new_length= copy_and_convert((char*) pos, new_length, to_cs, str,
 | |
| 				 arg_length, from_cs, &dummy_errors);
 | |
|   }
 | |
|   pos[new_length]= 0;
 | |
|   *result_length= new_length;
 | |
|   return pos;
 | |
| }
 | |
| 
 |