Commit graph

28 commits

Author SHA1 Message Date
Bradley C. Kuszmaul
6cc79aee9d close[t:4273] Fix #4273. {{{svn merge -r 37842:37875 ../tokudb.4273}}}.
git-svn-id: file:///svn/toku/tokudb@37891 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:59 -04:00
Bradley C. Kuszmaul
bfb7900fef [t:3620] Merge #3620 to main, and delete tokudb.3620. Refs #3620.
git-svn-id: file:///svn/toku/tokudb@32348 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:41 -04:00
Bradley C. Kuszmaul
866597e6d1 [t:3586] [t:3604] Merge icc onto main. Refs #3586, #3604.
git-svn-id: file:///svn/toku/tokudb@32232 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:40 -04:00
Bradley C. Kuszmaul
798429c3cb Fixes #2276. closes[t:2276]
git-svn-id: file:///svn/toku/tokudb@16801 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:57 -04:00
Bradley C. Kuszmaul
a3a8d8cce6 Merge from 2212 branch. Fixes #2212. Fixes[t:2212].
git-svn-id: file:///svn/toku/tokudb@16106 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:55 -04:00
Rich Prohaska
07c509c3c4 fix the build of db-benchmark-test-cxx closes[t:2174]
git-svn-id: file:///svn/toku/tokudb@15814 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:58:52 -04:00
Bradley C. Kuszmaul
1c2996546d Merge in [11215], Refs #1672. Consolidate tdiff. Fixes #1673.
git-svn-id: file:///svn/toku/tokudb@11217 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
Yoni Fogel
f470a45bcf Revert "Addresses #1298"
This reverts commit 5fa57d593d531a7ddc2f59afa4b082da46b00bbf.

git-svn-id: file:///svn/toku/tokudb@9229 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:40 -04:00
Yoni Fogel
566d68bfa5 Addresses #1298
make local (at top level) skips tests

git-svn-id: file:///svn/toku/tokudb@9227 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:40 -04:00
Bradley C. Kuszmaul
2f856f7d29 Candidate fix for #1374 (wrong db.h include file for BDB versions of code.) Addresses #1374.
git-svn-id: file:///svn/toku/tokudb@8667 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:37 -04:00
Bradley C. Kuszmaul
141ef2eaa5 Clean up the MAYBEATSIGN and verbosity stuff. Fixes #1365.
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8573 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
Bradley C. Kuszmaul
db2039c0db Compile better on linux, and more dlmalloc fixing. Addresses #1343.
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8553 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
ce6b171044 Merge the multihreaded writer changes as
{{{
svn merge -r 5899:5987 https://svn.tokutek.com/tokudb/tokudb
}}}
and resolve the conflicts.


git-svn-id: file:///svn/tokudb.1131b@5988 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:17 -04:00
Bradley C. Kuszmaul
430aa86333 Add -lz. Addresses #1131.
git-svn-id: file:///svn/tokudb.1131@5954 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:57:16 -04:00
Bradley C. Kuszmaul
7828ced3a8 Finish up the pretty output. Fixes #811.
git-svn-id: file:///svn/tokudb@3926 c7de825b-a66e-492c-adef-691d508d4ae1
2008-05-13 02:35:50 +00:00
Rich Prohaska
9909fe2d1e use gcc-4.2 on debian4
git-svn-id: file:///svn/tokudb@3891 c7de825b-a66e-492c-adef-691d508d4ae1
2008-05-09 15:08:09 +00:00
Bradley C. Kuszmaul
83d416fa09 Merge the 558 branch back to the main with
{{{
svn merge -r3061:3225 https://svn.tokutek.com/tokudb/tokudb.558
}}}

Fixes #630.
Addresses #558.


git-svn-id: file:///svn/tokudb@3226 c7de825b-a66e-492c-adef-691d508d4ae1
2008-04-02 23:40:36 +00:00
Rich Prohaska
07047bdfd0 rename libdb.so to libtokudb.so. closes #150
git-svn-id: file:///svn/tokudb@2230 c7de825b-a66e-492c-adef-691d508d4ae1
2008-02-10 03:50:15 +00:00
Rich Prohaska
6880c16767 builds take too long with check-x, so disable for now
git-svn-id: file:///svn/tokudb@2228 c7de825b-a66e-492c-adef-691d508d4ae1
2008-02-09 22:57:33 +00:00
Rich Prohaska
49e5333ad5 lock init with set_lk_max_locks. closes #371
git-svn-id: file:///svn/tokudb@2224 c7de825b-a66e-492c-adef-691d508d4ae1
2008-02-09 16:54:01 +00:00
Rich Prohaska
369da65117 add check target. addresses #299
git-svn-id: file:///svn/tokudb@1845 c7de825b-a66e-492c-adef-691d508d4ae1
2008-01-24 15:39:26 +00:00
Rich Prohaska
63f80c0cd6 make build-coverage. addresses #277
git-svn-id: file:///svn/tokudb@1729 c7de825b-a66e-492c-adef-691d508d4ae1
2008-01-18 14:43:32 +00:00
Rich Prohaska
f6e80ed817 fix build for bdb 4.5 addresses #133
git-svn-id: file:///svn/tokudb@1326 c7de825b-a66e-492c-adef-691d508d4ae1
2007-12-22 17:06:40 +00:00
Rich Prohaska
3ba63a3c99 add -lpthread to build with BDB 4.3. addresses #210
git-svn-id: file:///svn/tokudb@1280 c7de825b-a66e-492c-adef-691d508d4ae1
2007-12-20 15:21:21 +00:00
Bradley C. Kuszmaul
a1ede89ae2 We have a basic C++ interface. I'm going to call this finished, until we find out that more is needed. Fixes #197.
git-svn-id: file:///svn/tokudb@1214 c7de825b-a66e-492c-adef-691d508d4ae1
2007-12-18 19:37:59 +00:00
Rich Prohaska
ad106f2713 change the db-benchmark-test/Makefile to allow C or C++ compilation using the C interface
add db-benchmark-test-cxx to use the C++ interface


git-svn-id: file:///svn/tokudb@1195 c7de825b-a66e-492c-adef-691d508d4ae1
2007-12-18 16:24:53 +00:00