Commit graph

5 commits

Author SHA1 Message Date
Bradley C. Kuszmaul
f62b35b745 Merge the backtrace onto the mainline. Refs #2387. [t:2387].
{{{
svn merge -r 18063:18082 https://svn.tokutek.com/tokudb/toku/tokudb.2387
}}}


git-svn-id: file:///svn/toku/tokudb@18084 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:01 -04:00
Yoni Fogel
324c278a31 Addresses #2257 refs[t:2257] Merge windows port back into main.
git-svn-id: file:///svn/toku/tokudb@16673 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:56 -04:00
Bradley C. Kuszmaul
1c2996546d Merge in [11215], Refs #1672. Consolidate tdiff. Fixes #1673.
git-svn-id: file:///svn/toku/tokudb@11217 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:48 -04:00
Rich Prohaska
8eaa912f33 merge generalized worker threads from the 1183 branch. addresses #1183
git-svn-id: file:///svn/toku/tokudb@8902 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:38 -04:00
Bradley C. Kuszmaul
2f856f7d29 Candidate fix for #1374 (wrong db.h include file for BDB versions of code.) Addresses #1374.
git-svn-id: file:///svn/toku/tokudb@8667 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:37 -04:00
Renamed from include/toku_assert.h (Browse further)