Commit cf8e664a authored by Bradley C. Kuszmaul's avatar Bradley C. Kuszmaul Committed by Yoni Fogel

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
parent b9191f1b
Branches unavailable
Tags unavailable
No related merge requests found
......@@ -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
......
......@@ -8,7 +8,6 @@
#include <memory.h>
#include "test.h"
DB_ENV *env;
DB *db;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment