Zardosht Kasheff
357b4981c2
[t:4768], [t:4829], [t:4834], [t:4511], [t:4513], merge fixes to main
...
git-svn-id: file:///svn/toku/tokudb@43396 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:27 -04:00
Zardosht Kasheff
7942bcf209
[t:4028], merge to main
...
git-svn-id: file:///svn/toku/tokudb@41142 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:13 -04:00
Zardosht Kasheff
19b7090fb6
[t:4456], merge to main
...
git-svn-id: file:///svn/toku/tokudb@39504 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-17 00:00:09 -04:00
Zardosht Kasheff
00e8c8c224
[t:3997], merge to main
...
git-svn-id: file:///svn/toku/tokudb@36689 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:54 -04:00
Zardosht Kasheff
9948adca3c
[t:3923], merge to main
...
git-svn-id: file:///svn/toku/tokudb@35506 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:50 -04:00
Zardosht Kasheff
1a5dbd80e5
[t:3645], merge to main
...
git-svn-id: file:///svn/toku/tokudb@34156 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:48 -04:00
Leif Walsh
b669ec96d6
[t:3635] [t:3764] [t:3757] [t:3749] merging tokudb.3635+prefetch into mainline, pending testing, fixes #3635 , #3764 , #3757 , #3749
...
git-svn-id: file:///svn/toku/tokudb@33537 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:46 -04:00
Leif Walsh
c181410661
[t:3666] add id tags to tests which were missing it, fixes #3666
...
git-svn-id: file:///svn/toku/tokudb@32940 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:44 -04:00
Zardosht Kasheff
b90f894d14
[t:3651], merge to main
...
git-svn-id: file:///svn/toku/tokudb@32620 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:41 -04:00
Zardosht Kasheff
4a88cb22b4
[t:3644], merge cachetable changes for #3627 from tokudb.3627 to main
...
git-svn-id: file:///svn/toku/tokudb@32519 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:41 -04:00
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
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
Yoni Fogel
b3f5306b41
[t:2249] Merge #2249 to main.
...
'load' entry and rollback/recovery,
single filename for brtloader and rest of brt
test-fsync
git-svn-id: file:///svn/toku/tokudb@18617 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:03 -04:00
Yoni Fogel
c6510b33fe
closes[t:2463] Merge #2463 changes (r18552,18555) to main to fix race condition
...
with CACHEFILE->fd
git-svn-id: file:///svn/toku/tokudb@18612 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -04:00
Bradley C. Kuszmaul
178820a688
Merge changes from 2216a to main (except possibly for the windows subdirectory, which Yoni will do separately).
...
2216a is no longer valid.
Refs #2216 . [t:2216].
{{{
svn merge -r17301:18179 https://svn.tokutek.com/tokudb/toku/tokudb.2216a/src/tests
}}}
git-svn-id: file:///svn/toku/tokudb@18181 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:01 -04:00
Rich Prohaska
45eed6a919
merge tokudb.1183 to main. addresses #1183
...
git-svn-id: file:///svn/toku/tokudb@9061 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:38 -04:00
