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
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
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
Yoni Fogel
c7fa6070ef
Addresses #1866 refs [t:1866] Disable implicit promotion on query
...
Added option to easily toggle implicit promotion on query
Disabled for now because of tickets [t:1903] [t:1906]
git-svn-id: file:///svn/toku/tokudb@13679 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:57 -04:00
Yoni Fogel
3e9fcd103b
Addresses #1125 refs [t:1125] Add two tests for nested transactions at ydb layer.
...
Shuffled around some constants at the newbrt layer, extracted tokuconst.h
git-svn-id: file:///svn/toku/tokudb@13670 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:57 -04:00
