Commit graph

6 commits

Author SHA1 Message Date
Bradley C. Kuszmaul
885c83300b [t:3604] Merge everything from the tokudb.3312c+3524+msn branch. Refs #3604.
git-svn-id: file:///svn/toku/tokudb@32294 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:40 -04:00
Bradley C. Kuszmaul
7e7e93103c #3316 #3318 #3339
* #3316 quicklz is now part of the brt layer (but it won't be enabled for compression in 5.0.2, #3339)
 * #3318 (add valgrind suppresseions)
{{{
svn merge -r28917:29103 https://svn.tokutek.com/tokudb/toku/tokudb.3316
}}}
.
[t:3316] [t:3318] [t:3339]


git-svn-id: file:///svn/toku/tokudb@29107 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:37 -04:00
Bradley C. Kuszmaul
80089f63a4 #3099 Merge 3099 onto the main line.
{{{
svn merge -r28775:29048 https://svn.tokutek.com/tokudb/toku/tokudb.3099
}}}


git-svn-id: file:///svn/toku/tokudb@29055 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:37 -04:00
Barry Perlman
036c8d6b54 [t:3236] [t:3238] Merge tokudb.3236+3238 to main.
git-svn-id: file:///svn/toku/tokudb@28070 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:36 -04:00
Barry Perlman
01940509cd [t:3228] Use new BRT_LAYOUT_VERSION to allow for later decisions.
git-svn-id: file:///svn/toku/tokudb@27617 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:35 -04:00
Barry Perlman
548d03d70e [t:2892] Merge upgrade logic to main. Merge command was svn merge --accept=postpone -r25293:HEAD ../tokudb.main+2892 .
git-svn-id: file:///svn/toku/tokudb@25303 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:25 -04:00