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 |
|
Yoni Fogel
|
324c278a31
|
Addresses #2257 refs[t:2257] Merge windows port back into main.
git-svn-id: file:///svn/toku/tokudb@16673 c7de825b-a66e-492c-adef-691d508d4ae1
|
2013-04-16 23:58:56 -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 |
|
Yoni Fogel
|
049c7625a3
|
Addresses #1765 Merge [12079] into main (pthreads-win32 for windows)
git-svn-id: file:///svn/toku/tokudb@12081 c7de825b-a66e-492c-adef-691d508d4ae1
|
2013-04-16 23:57:53 -04:00 |
|
Yoni Fogel
|
91fd49318c
|
Windows ports Addresses #1665
git-svn-id: file:///svn/toku/tokudb@11337 c7de825b-a66e-492c-adef-691d508d4ae1
|
2013-04-16 23:57:50 -04:00 |
|
Yoni Fogel
|
c743484ba1
|
Addresses #1665 minicron-test is quiet unless verbose is on
git-svn-id: file:///svn/toku/tokudb@11302 c7de825b-a66e-492c-adef-691d508d4ae1
|
2013-04-16 23:57:49 -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 |
|