Commit graph

9 commits

Author SHA1 Message Date
Zardosht Kasheff
2f88373f31 [t:2892], undo bad checkin
git-svn-id: file:///svn/toku/tokudb@25393 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:26 -04:00
Zardosht Kasheff
89668ba2e5 [t:2892], remove some more #if from macros
git-svn-id: file:///svn/toku/tokudb@25392 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:26 -04:00
Zardosht Kasheff
b9542a506e [t:2811], undo change that went in merge that should not have
git-svn-id: file:///svn/toku/tokudb@23584 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:22 -04:00
Zardosht Kasheff
cc91ea8ca4 [t:2811], merge to main \!\!\!
git-svn-id: file:///svn/toku/tokudb@23495 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:22 -04:00
Rich Prohaska
d9985ad0cf #2840 refs[t:2840] add debug prints to the loader to help fix the dbufio read row problem, also remove the assert on this error path
git-svn-id: file:///svn/toku/tokudb@22673 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:20 -04:00
Rich Prohaska
c37567705f #2738 refs[t:2738] merge dbufio bug fix to main
git-svn-id: file:///svn/toku/tokudb@21260 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:19 -04:00
Yoni Fogel
7eb67d825b Windows port: ENODATA->TOKUDB_NO_DATA, disable unreachable code warning, disabled trace_mem for windows
git-svn-id: file:///svn/toku/tokudb@20400 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:13 -04:00
Bradley C. Kuszmaul
fe23612513 Merge in changes. Refs #2608, #2609, and #2610. [t:2608] [t:2609] [t:2610]
{{{
svn merge -r 20187:20196 https://svn.tokutek.com/tokudb/toku/tokudb.2571
}}}
.


git-svn-id: file:///svn/toku/tokudb@20197 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:11 -04:00
Bradley C. Kuszmaul
042be43d29 Merge in the double buffered io abstraction. It's not in the loader yet. Refs #2571. [t:2571]
{{{
svn merge -r 20089:20155 https://svn.tokutek.com/tokudb/toku/tokudb.2571
}}}
.


git-svn-id: file:///svn/toku/tokudb@20156 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:11 -04:00