Bradley C. Kuszmaul
0a8c3413be
Closes #3320 move fast x1764 to main line.
...
{{{
svn merge -r29081:29083 https://svn.tokutek.com/tokudb/toku/tokudb.3320
}}}
close[t:3320] (Note that #3340 and #3341 cover moving this to 5.0.2 and 5.1.2)
.
git-svn-id: file:///svn/toku/tokudb@29108 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:37 -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
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
Bradley C. Kuszmaul
17e5214663
Refs #1529 .
...
git-svn-id: file:///svn/toku/tokudb@11223 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:48 -04:00
Bradley C. Kuszmaul
1ed3f26d65
Add #ident Id info to all the newbrt/*.c and newbrt/*.h files. Refs #1529 .
...
git-svn-id: file:///svn/toku/tokudb@11221 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:48 -04:00
Yoni Fogel
3b42b55489
Closes #1378 Merged all changes into main.
...
git-svn-id: file:///svn/toku/tokudb@9507 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:41 -04:00
Bradley C. Kuszmaul
0ee4e385f1
Merge all mainline patches into the 1195 branch. Fixes #1243 .
...
Details: I merged with
{{{
svn merge -r6585:7747 https://svn.tokutek.com/tokudb/toku/tokudb
}}}
then resolved conflicts. The most interesting conflict was the double inclusion of the {{{BLOCK_ALLOCATOR_HEADER_RESERVE}}} for {{{brt-internal.h}}}. The subversion merger got confused because the patch was applied with an extra space at the end of each line.
git-svn-id: file:///svn/toku/tokudb.1243@7750 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:26 -04:00
Rich Prohaska
5568466982
compile using gcc 4.3 (fedora 9) addresses #1195
...
git-svn-id: file:///svn/toku/tokudb.1195@7639 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:25 -04:00
Bradley C. Kuszmaul
0ed47ea357
CIL gets upset if includes are not in the same order, because int64_t gets typedefed to different things depending on what you include. So do all the includes in a standard way. Addresses #1185 .
...
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6439 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:20 -04:00
Rich Prohaska
1f05fe210f
port to 32 bit linux
...
git-svn-id: file:///svn/tokudb@5381 c7de825b-a66e-492c-adef-691d508d4ae1
2008-07-28 14:55:41 +00:00
Bradley C. Kuszmaul
3aafa0d873
Some files didn't merge right. Fixes #1021 .
...
git-svn-id: file:///svn/tokudb@5364 c7de825b-a66e-492c-adef-691d508d4ae1
2008-07-27 22:19:08 +00:00
