Commit graph

10 commits

Author SHA1 Message Date
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
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
be70861bf3 fix the data races in toku_malloc and toku_free. closes #1369
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8620 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:35 -04:00
Bradley C. Kuszmaul
0dfc3aa50d Some fixes for recovery (#1364). Also some temporary fixes for #1277. Addresses #1364, #1277.
Delete the 1364 branch, so I can restart it.
On the 1343 branch, I did:
{{{
svn merge -r 8586:8595 https://svn.tokutek.com/tokudb/toku/tokudb.1032b+1343+1364
}}}


git-svn-id: file:///svn/toku/tokudb.1032b+1343@8596 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:35 -04:00
Bradley C. Kuszmaul
fe0a157971 Cleaned up. Note that some stuff moved into the windows directory with symlinks from linux (since I know that symlinks work in linux, but maybe not in windows.) Addresses #1348.
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8560 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
017d4f8cc3 Separate out the common malloc into newbrt/memory.c, and put the os-specific stuff into windows and linux subdirs. Things are broken. Addresses #1343.
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8559 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
0adc9f9bd8 Separate out the common malloc into newbrt/memory.c, and put the os-specific stuff into windows and linux subdirs. Addresses #1343.
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8558 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
f66b523f89 Merge all stuff from source:tokudb/toku/tokudb.1032 since the creation of this branch at [8452] to the present [8556], as
{{{
svn merge -r 8452:8556 https://svn.tokutek.com/tokudb/toku/tokudb.1032b/
}}}
And resolve conflicts.

It compiles, and we'll see if it runs.

Addresses #1032, #1343.


git-svn-id: file:///svn/toku/tokudb.1032b+1343@8557 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:34 -04:00
Rich Prohaska
3962a69628 move toku_malloc to portability layer. addresses #1342
git-svn-id: file:///svn/toku/tokudb.1032b@8425 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:32 -04:00
Rich Prohaska
6fdbf9bf15 move toku_malloc to the port layer. closes #1342
git-svn-id: file:///svn/toku/tokudb.1032b@8423 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:32 -04:00
Renamed from newbrt/memory.c (Browse further)