Bradley C. Kuszmaul
5c3ec7de12
Revert the murmur checksum. Addresses #1021 .
...
{{{
svn merge https://svn.tokutek.com/tokudb/tokudb.1021@5184 https://svn.tokutek.com/tokudb/tokudb.1021@5107
}}}
and fix a simple conflict.
git-svn-id: file:///svn/tokudb@5275 c7de825b-a66e-492c-adef-691d508d4ae1
2008-07-23 03:47:05 +00:00
Bradley C. Kuszmaul
66cd2fdd01
Merge is tokudb.1021 changes. Addresses #1021 .
...
{{{
svn merge -r5107:5184 https://svn.tokutek.com/tokudb/tokudb.1021
}}}
git-svn-id: file:///svn/tokudb@5214 c7de825b-a66e-492c-adef-691d508d4ae1
2008-07-20 14:08:55 +00:00
Rich Prohaska
da3b69356c
merge branch 838 to main. addresses #838
...
git-svn-id: file:///svn/tokudb@4493 c7de825b-a66e-492c-adef-691d508d4ae1
2008-06-12 13:53:39 +00:00
Bradley C. Kuszmaul
e9323991d7
{{{
...
svn delete tokudb.872
cd tokudb
svn merge -r4187:4233 https://svn.tokutek.com/tokudb/tokudb.872
}}}
Fixes #849 , #872 .
Addresses #820 .
git-svn-id: file:///svn/tokudb@4234 c7de825b-a66e-492c-adef-691d508d4ae1
2008-05-29 03:12:59 +00:00
Bradley C. Kuszmaul
33b252772a
Merge in the OMT and its integration into the main line.
...
{{{
$ cd tokudb
$ svn merge -r3533:3571 https://svn.tokutek.com/tokudb/tokudb.724
}}}
There remain a few problems with recovery, but the main line has problems with recovery, so let's bite the bullet and move forward.
Fixes #729 , #724 .
git-svn-id: file:///svn/tokudb@3572 c7de825b-a66e-492c-adef-691d508d4ae1
2008-04-22 20:39:50 +00:00
Bradley C. Kuszmaul
6298988642
Merge the tokudb.558 branch back to to the main branch with:
...
{{{
svn merge -r3272:3320 https://svn.tokutek.com/tokudb/tokudb.558
}}}
No conflicts.
git-svn-id: file:///svn/tokudb@3322 c7de825b-a66e-492c-adef-691d508d4ae1
2008-04-07 01:30:25 +00:00
Bradley C. Kuszmaul
22cf859734
Write leafentry code, and get things to compile. Make it more compatible with -Wconversion. Addresses #558 .
...
git-svn-id: file:///svn/tokudb@3270 c7de825b-a66e-492c-adef-691d508d4ae1
2008-04-04 18:22:01 +00:00
Bradley C. Kuszmaul
7e5dfd3e5d
Write leafentry code, and get things to compile. Addresses #558 .
...
git-svn-id: file:///svn/tokudb@3269 c7de825b-a66e-492c-adef-691d508d4ae1
2008-04-04 18:03:03 +00:00
