mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Get things to compile. Addresses #1343.

Browse source 
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8555 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Bradley C. Kuszmaul 2013-04-16 23:57:34 -04:00 • committed by Yoni Fogel
parent db2039c0db
commit a83d6d833c
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/Makefile.include
View file

@ -286,6 +286,9 @@ cscope.out: cscope.files $(TOKUROOT)*/*.[ch] $(TOKUROOT)*/*/*.[ch] $(TOKUROOT)*/
.PHONY: clean clean-default .PHONY: clean clean-default
clean: clean-default clean: clean-default
%.dir.clean:
$(MAYBEATSIGN)cd $* && $(MAKE) -k clean
clean-default: clean-default:
$(MAYBEATSIGN)rm -f $(BINS) *.$(AEXT) *.$(SOEXT) *.$(OEXT) $(MAYBEATSIGN)rm -f $(BINS) *.$(AEXT) *.$(SOEXT) *.$(OEXT)
$(MAYBEATSIGN)rm -f *.bb *.bbg *.da *.gcov *.gcno *.gcda $(MAYBEATSIGN)rm -f *.bb *.bbg *.da *.gcov *.gcno *.gcda

5
src/tests/test_set_func_malloc.c
View file

@ -10,7 +10,9 @@
#include <toku_portability.h> #include <toku_portability.h>
#include <memory.h> #include <memory.h>
#include <db.h> #include <db.h>
#ifdef USE_TDB
#include <dlmalloc.h> #include <dlmalloc.h>
#endif
#include "test.h" #include "test.h"
static int malloc_counter=0; static int malloc_counter=0;
@ -78,6 +80,7 @@ test1 (void)
toku_free(x); assert(malloc_counter==1 && free_counter==1 && realloc_counter==1); toku_free(x); assert(malloc_counter==1 && free_counter==1 && realloc_counter==1);
} }
#ifdef USE_TDB
r = db_env_set_func_malloc(dlmalloc); assert(r==0); r = db_env_set_func_malloc(dlmalloc); assert(r==0);
r = db_env_set_func_realloc(dlrealloc); assert(r==0); r = db_env_set_func_realloc(dlrealloc); assert(r==0);
r = db_env_set_func_free(dlfree); assert(r==0); r = db_env_set_func_free(dlfree); assert(r==0);
@ -87,7 +90,7 @@ test1 (void)
x = toku_realloc(x, 6); assert(x); x = toku_realloc(x, 6); assert(x);
toku_free(x); toku_free(x);
} }
#endif
} }
int int