Closes #1790 Merge changes from 2.0.1 into main

svn merge --accept=postpone -r 12461:12467 ../../mysql.branches/2.0.1/tokudb/

git-svn-id: file:///svn/toku/tokudb@12468 c7de825b-a66e-492c-adef-691d508d4ae1

newbrt/rwlock.h

@@ -5,6 +5,7 @@
 #ident "Copyright (c) 2007, 2008, 2009 Tokutek Inc.  All rights reserved."
 #ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
 
+#include <toku_assert.h>
 
 //Use case:
 // A read lock is acquired by threads that get and pin an entry in the

src/tests/Makefile

@@ -227,7 +227,7 @@ TDBVGRIND=$(VGRIND)
 
 ifeq ($(OS_CHOICE),windows)
 ifdef BDBDIR
-%.bdb$(BINSUF): INCLUDEDIRS=-I$(BDBDIR)/include
+%.bdb$(BINSUF): INCLUDEDIRS=-I$(BDBDIR)/include -I$(TOKUROOT)newbrt
 %.bdb$(BINSUF): RPATH_DIRS=$(BDBDIR)/lib
 endif
 ifeq ($(DEBUG),0)