mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 07:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
4099 commits 2776 branches 343 tags 1.6 GiB
Commit graph

23 commits

Author SHA1 Message Date
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
9c2b243e67 Make it work with gcc 4.4.2. 
git-svn-id: file:///svn/toku/tokudb@16822 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:57 -04:00
Rich Prohaska
8ce671ca1f fix the cxx build on the 2037b branch closes[t:2167] 
git-svn-id: file:///svn/toku/tokudb.2037b@15759 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:06 -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
0ee4e385f1 Merge all mainline patches into the 1195 branch. Fixes #1243. 
Details:  I merged with
{{{
svn merge -r6585:7747 https://svn.tokutek.com/tokudb/toku/tokudb
}}}
then resolved conflicts.  The most interesting conflict was the double inclusion of the {{{BLOCK_ALLOCATOR_HEADER_RESERVE}}} for {{{brt-internal.h}}}.   The subversion merger got confused because the patch was applied with an extra space at the end of each line.


git-svn-id: file:///svn/toku/tokudb.1243@7750 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:26 -04:00
Bradley C. Kuszmaul
ab7a3ca9d3 Quiet down the cxx makefile. Addresses #13. 
git-svn-id: file:///svn/tokudb@5286 c7de825b-a66e-492c-adef-691d508d4ae1
 2008-07-23 12:55:37 +00:00
Bradley C. Kuszmaul
9e82871d21 Clean up the makefiles a little more. Addresses #630. 
git-svn-id: file:///svn/tokudb@3252 c7de825b-a66e-492c-adef-691d508d4ae1
 2008-04-03 20:41:53 +00:00
Bradley C. Kuszmaul
7075d9fe53 Fix up Makefile and svn:ignore properties. Addresess #630. 
I did:
{{{
svn merge -r3229:3230 https://svn.tokutek.com/tokudb/tokudb.558
}}}


git-svn-id: file:///svn/tokudb@3231 c7de825b-a66e-492c-adef-691d508d4ae1
 2008-04-03 03:12: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
95416f09a8 add GCOV_FLAGS var to Makefiles. addresses #277 
git-svn-id: file:///svn/tokudb@1693 c7de825b-a66e-492c-adef-691d508d4ae1
 2008-01-16 17:41:47 +00:00
Bradley C. Kuszmaul
9d70992a1d Clean up the valgrind memory leaks (caused by lots of subtle c++ bugs. Addresse #215 
git-svn-id: file:///svn/tokudb@1320 c7de825b-a66e-492c-adef-691d508d4ae1
 2007-12-21 19:59:31 +00:00
Bradley C. Kuszmaul
b533ea01dd Move db_cxx.h to include dir, and fix valgrind issues. Fixes #197. 
git-svn-id: file:///svn/tokudb@1218 c7de825b-a66e-492c-adef-691d508d4ae1
 2007-12-18 20:39:02 +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
Bradley C. Kuszmaul
f87b4e5d7d Make db_create work a little more under c++. Addresses #197. 
git-svn-id: file:///svn/tokudb@1196 c7de825b-a66e-492c-adef-691d508d4ae1
 2007-12-18 16:34:48 +00:00
Bradley C. Kuszmaul
37b42e21ea Make db_create work under c++. Addresses #197. 
git-svn-id: file:///svn/tokudb@1194 c7de825b-a66e-492c-adef-691d508d4ae1
 2007-12-18 16:22:21 +00:00
Bradley C. Kuszmaul
686d25d567 More fiddling around with c++. Addresses #197. 
git-svn-id: file:///svn/tokudb@1177 c7de825b-a66e-492c-adef-691d508d4ae1
 2007-12-18 01:31:34 +00:00
Bradley C. Kuszmaul
bf69b71745 test1 compiles 
git-svn-id: file:///svn/tokudb@1176 c7de825b-a66e-492c-adef-691d508d4ae1
 2007-12-18 00:57:28 +00:00
Bradley C. Kuszmaul
a58dc6af93 Start trying to write a c++ interface. Addresses #197. 
git-svn-id: file:///svn/tokudb@1175 c7de825b-a66e-492c-adef-691d508d4ae1
 2007-12-17 22:00:54 +00:00