mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged and resolved conflicts:

Browse source 
{{{
svn merge -r7857:8080 https://svn.tokutek.com/tokudb/toku/tokudb
}}}
Addresses #1032, #1289.


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

5
src/tests/Makefile
View file

@ -192,6 +192,11 @@ $(ALL_TESTS):
INVERTER=;test $$? -ne 0
# Any test that should fail, we invert the result by using MAYBEINVERTER
$(SHOULD_FAIL): MAYBEINVERTER=$(INVERTER)
HERE = src/tests HERE = src/tests

1
src/tests/helgrind2.c
View file

@ -8,7 +8,6 @@
#include <memory.h> #include <memory.h>
#include "test.h" #include "test.h"
DB_ENV *env; DB_ENV *env;
DB *db; DB *db;