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
Rich Prohaska
3ba245cda6
#3043 merge changes from code review to main refs[t:3043]
...
git-svn-id: file:///svn/toku/tokudb@25904 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:31 -04:00
Dave Wells
f31a90e9e9
merge indexer to main refs #2843 [t:2843]
...
git-svn-id: file:///svn/toku/tokudb@25593 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:29 -04:00
Zardosht Kasheff
f613162833
[t:3008], modify comments
...
git-svn-id: file:///svn/toku/tokudb@25152 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:24 -04:00
Zardosht Kasheff
0151b36fdd
[t:2811], move some accessors from ule.h to leafentry.h
...
git-svn-id: file:///svn/toku/tokudb@25012 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:24 -04:00
Zardosht Kasheff
17eccfed9b
[t:2935], merge to main
...
git-svn-id: file:///svn/toku/tokudb@24885 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:23 -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
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
bca71dc119
Addresses #1862 refs[t:1862] Return ULE_DEBUG to 0 (accidentally set it to 1 in r1862)
...
git-svn-id: file:///svn/toku/tokudb@14704 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:02 -04:00
Yoni Fogel
1f0a5815b1
Closes #1862 closes[t:1862] LSNs are logged/chosen during the actual close, if closed during recovery, the LSN is passed into close.
...
git-svn-id: file:///svn/toku/tokudb@14686 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:02 -04:00
Yoni Fogel
110754f57c
Addresses #1125 Merged nested transactions from temporary merge branch into main.
...
Current tests fail (not regressions, they fail as of 13461)
* {{{x1.tdbrun}}}
* {{{test_log(2,3,4,5,6,7,8,9,10).recover}}}
* {{{test-recover(1,2,3).tdbrun}}}
* {{{test1324.tdbrun}}}
ULE_DEBUG disabled (defined to 0) Can be re-enabled for test purposes (set to 1).
refs [t:1125]
Merging into the temp branch (tokudb.main_13461+1125)
{{{svn merge --accept=postpone -r 12527:13461 ../tokudb.1125 ./}}}
Merging into main
{{{svn merge --accept=postpone -r13462:13463 ../tokudb.main_13461+1125/ ./}}}
git-svn-id: file:///svn/toku/tokudb@13464 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:56 -04:00
