Bradley C. Kuszmaul
476cbe26e6
merge fast rwlocks onto main line. Fixes #2841 . close[t:2841]
...
git-svn-id: file:///svn/toku/tokudb@23676 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:22 -04:00
Bradley C. Kuszmaul
754576bbc7
Merge changes from tokudb.2826. Fixes #2826 . close[t:2826]
...
git-svn-id: file:///svn/toku/tokudb@22664 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:20 -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
53d376d7c3
Add keywords. [t:2468]. Refs #2468 .
...
git-svn-id: file:///svn/toku/tokudb@18673 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:03 -04:00
Rich Prohaska
6f6974aae9
port fairsched from 2.2.0 to main (for linux only) refs[t:2083]
...
git-svn-id: file:///svn/toku/tokudb@15573 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:04 -04:00
Rich Prohaska
6e3ddb3d14
port get_processor_frequency from 2.2.0 to main refs[t:2083]
...
git-svn-id: file:///svn/toku/tokudb@15130 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:04 -04:00
Yoni Fogel
bc9fd74c80
Merge 2.0.0 back into main
...
svn merge --accept=postpone -r 12123:12373 ../../mysql.branches/2.0.0/tokudb/
git-svn-id: file:///svn/toku/tokudb@12375 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:53 -04:00
Bradley C. Kuszmaul
d6ab1513e8
Merge the tokudb.1665 branch into the main line. Fixes #1665 .
...
{{{
svn merge -r 11185:11261 https://svn.tokutek.com/tokudb/toku/tokudb.1665
}}}
git-svn-id: file:///svn/toku/tokudb@11264 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:48 -04:00
Rich Prohaska
2911855051
use __restrict on linux to accomodate c++ programs. closes #1678
...
git-svn-id: file:///svn/toku/tokudb@11262 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:48 -04:00
Yoni Fogel
8f2b0a7e11
Addresses #1510 Merge of 1510 (so far) back into main
...
Several fixes are included, particulary db remove after db truncate (with descriptor) does not crash anymore.
svn merge -r 10931:11019 ../tokudb.1510
git-svn-id: file:///svn/toku/tokudb@11020 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:47 -04:00
Rich Prohaska
c5cdf8f895
fixup some portability include files. addresses #1269
...
git-svn-id: file:///svn/toku/tokudb.1032b@8018 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:29 -04:00
Rich Prohaska
0d44815bf5
merge some tokudb.1032 into 1032b. addresses #1032
...
git-svn-id: file:///svn/toku/tokudb.1032b@7778 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:27 -04:00
