Commit graph

6 commits

Author SHA1 Message Date
Rich Prohaska
ecea4fe712 merge tokudb.2603 to tokudb refs[t:2603]
git-svn-id: file:///svn/toku/tokudb@20244 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:12 -04:00
Rich Prohaska
52b5bafc07 merge 2578b to main refs[t:2578]
git-svn-id: file:///svn/toku/tokudb@20143 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:11 -04:00
Rich Prohaska
b7d19f5045 the brt_loader_sort_and_write_rows contract changed which caused the tests to fail. fix the tests closes[t:2593] #2593
git-svn-id: file:///svn/toku/tokudb@20059 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:10 -04:00
Yoni Fogel
7ae6cf5cee check error from system() to be gcc4 clean
git-svn-id: file:///svn/toku/tokudb@19948 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:10 -04:00
Rich Prohaska
0612028bcf fix the loader error callback and the pqueue-test closes[t:2576]
git-svn-id: file:///svn/toku/tokudb@19913 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:09 -04:00
Bradley C. Kuszmaul
28cc5d1ed9 Merge the changes from 2499d onto the main line. Fixes #2499. close[t:2499].
{{{
svn merge -r 19523:19895 https://svn.tokutek.com/tokudb/toku/tokudb.2499d
}}}
.


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