Merged and resolved conflicts:

{{{
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

src/tests/Makefile

@@ -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
 
 

src/tests/helgrind2.c

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