Commits · 05384e8c833b7b56a7453831194ced7655c86202 · nexedi / MariaDB

17 Apr, 2013 40 commits

Rich Prohaska authored Nov 13, 2008

git-svn-id: file:///svn/toku/tokudb.1032b@7870 c7de825b-a66e-492c-adef-691d508d4ae1

05384e8c

def the db_create functions in an include file for icc. closes #1264 · a4654226
Rich Prohaska authored Nov 13, 2008
```
git-svn-id: file:///svn/toku/tokudb.1032b@7869 c7de825b-a66e-492c-adef-691d508d4ae1
```
a4654226
def the db_create functions in an include file for icc. closes #1264 · 0e562176
Rich Prohaska authored Nov 13, 2008
```
git-svn-id: file:///svn/toku/tokudb.1032b@7868 c7de825b-a66e-492c-adef-691d508d4ae1
```
0e562176

addresses #1032 · 6793b58e

Zardosht Kasheff authored Nov 13, 2008

report change from 1032 branch

git-svn-id: file:///svn/toku/tokudb.1032b@7865 c7de825b-a66e-492c-adef-691d508d4ae1

6793b58e

use toku_htonl. closes #1247 · 0b450025

Rich Prohaska authored Nov 13, 2008

git-svn-id: file:///svn/toku/tokudb.1032b@7850 c7de825b-a66e-492c-adef-691d508d4ae1

0b450025

compile on windows addresses #1253 · 9a42f8fa
Rich Prohaska authored Nov 13, 2008
```
git-svn-id: file:///svn/toku/tokudb.1032b@7847 c7de825b-a66e-492c-adef-691d508d4ae1
```
9a42f8fa
include portability.h before db.h. addresses #1032 · 4f3e9055
Rich Prohaska authored Nov 13, 2008
```
git-svn-id: file:///svn/toku/tokudb.1032b@7845 c7de825b-a66e-492c-adef-691d508d4ae1
```
4f3e9055
include stdint.h before db.h. addresses #1032 · 1f5d3019
Rich Prohaska authored Nov 13, 2008
```
git-svn-id: file:///svn/toku/tokudb.1032b@7844 c7de825b-a66e-492c-adef-691d508d4ae1
```
1f5d3019
compile on windows addresses #1253 · 37d8fe77
Rich Prohaska authored Nov 13, 2008
```
git-svn-id: file:///svn/toku/tokudb.1032b@7843 c7de825b-a66e-492c-adef-691d508d4ae1
```
37d8fe77

imp toku_os_ closes #1253 · 07f218f3

Rich Prohaska authored Nov 13, 2008

git-svn-id: file:///svn/toku/tokudb.1032b@7838 c7de825b-a66e-492c-adef-691d508d4ae1

07f218f3

imp toku_os_ closes #1253 · a2b028cf

Rich Prohaska authored Nov 13, 2008

git-svn-id: file:///svn/toku/tokudb.1032b@7837 c7de825b-a66e-492c-adef-691d508d4ae1

a2b028cf

fix some icc linux problems. addresses #1032 · 9875dc58
Rich Prohaska authored Nov 13, 2008
```
git-svn-id: file:///svn/toku/tokudb.1032b@7836 c7de825b-a66e-492c-adef-691d508d4ae1
```
9875dc58
merge 1032 src/tests to 1032b. addresses #1032 · 0acaed51
Rich Prohaska authored Nov 13, 2008
```
git-svn-id: file:///svn/toku/tokudb.1032b@7835 c7de825b-a66e-492c-adef-691d508d4ae1
```
0acaed51
merge 1032 to 1032b. addresses #1032 · 1002ded5
Rich Prohaska authored Nov 12, 2008
```
git-svn-id: file:///svn/toku/tokudb.1032b@7824 c7de825b-a66e-492c-adef-691d508d4ae1
```
1002ded5
merge 1032 to 1032b. addresses #1231 · 9e06e600
Rich Prohaska authored Nov 12, 2008
```
git-svn-id: file:///svn/toku/tokudb.1032b@7815 c7de825b-a66e-492c-adef-691d508d4ae1
```
9e06e600
merge 1032 to 1032b. addresses #1231 · e9c99ea9
Rich Prohaska authored Nov 12, 2008
```
git-svn-id: file:///svn/toku/tokudb.1032b@7814 c7de825b-a66e-492c-adef-691d508d4ae1
```
e9c99ea9
merge 1032 to 1032b. addresses #1231 · 93462fa4
Rich Prohaska authored Nov 12, 2008
```
git-svn-id: file:///svn/toku/tokudb.1032b@7813 c7de825b-a66e-492c-adef-691d508d4ae1
```
93462fa4
test with icc on linux. addresses #1032 · c5da83fe
Rich Prohaska authored Nov 12, 2008
```
git-svn-id: file:///svn/toku/tokudb.1032b@7810 c7de825b-a66e-492c-adef-691d508d4ae1
```
c5da83fe
found a bug in the test with icc on linux. addresses #1032 · 7bac08be
Rich Prohaska authored Nov 12, 2008
```
git-svn-id: file:///svn/toku/tokudb.1032b@7809 c7de825b-a66e-492c-adef-691d508d4ae1
```
7bac08be
merge 1032 into 1032b. addresses #1032 · ec4cd630
Rich Prohaska authored Nov 12, 2008
```
git-svn-id: file:///svn/toku/tokudb.1032b@7804 c7de825b-a66e-492c-adef-691d508d4ae1
```
ec4cd630
merge brt_truncate into 1032b. addresses #1032 · 0a5a3951
Rich Prohaska authored Nov 12, 2008
```
git-svn-id: file:///svn/toku/tokudb.1032b@7803 c7de825b-a66e-492c-adef-691d508d4ae1
```
0a5a3951
turn off the cachetable writer threads on windows for now. addresses #1023 · 75bfcdc1
Rich Prohaska authored Nov 11, 2008
```
git-svn-id: file:///svn/toku/tokudb.1032b@7788 c7de825b-a66e-492c-adef-691d508d4ae1
```
75bfcdc1
merge 1032 into 1032b. addresses #1032 · 94d5dcd4
Rich Prohaska authored Nov 11, 2008
```
git-svn-id: file:///svn/toku/tokudb.1032b@7787 c7de825b-a66e-492c-adef-691d508d4ae1
```
94d5dcd4
there is no brt_flush. addresses #1032 · f41b1eab
Rich Prohaska authored Nov 11, 2008
```
git-svn-id: file:///svn/toku/tokudb.1032b@7786 c7de825b-a66e-492c-adef-691d508d4ae1
```
f41b1eab
merge 1032 into 1032b. addresses #1032 · a9876849
Rich Prohaska authored Nov 11, 2008
```
git-svn-id: file:///svn/toku/tokudb.1032b@7782 c7de825b-a66e-492c-adef-691d508d4ae1
```
a9876849
merge 1032 into 1032b. addresses #1032 · 73510a8f
Rich Prohaska authored Nov 11, 2008
```
git-svn-id: file:///svn/toku/tokudb.1032b@7781 c7de825b-a66e-492c-adef-691d508d4ae1
```
73510a8f
more merging of 1032 to 1032b. addresses #1032 · 8e5f1d86
Rich Prohaska authored Nov 11, 2008
```
git-svn-id: file:///svn/toku/tokudb.1032b@7779 c7de825b-a66e-492c-adef-691d508d4ae1
```
8e5f1d86
merge some tokudb.1032 into 1032b. addresses #1032 · 3d2f1b62
Rich Prohaska authored Nov 11, 2008
```
git-svn-id: file:///svn/toku/tokudb.1032b@7778 c7de825b-a66e-492c-adef-691d508d4ae1
```
3d2f1b62

fix an icc warning on eng32 · 86b3b2b2

Rich Prohaska authored Nov 11, 2008

git-svn-id: file:///svn/toku/tokudb@7758 c7de825b-a66e-492c-adef-691d508d4ae1

86b3b2b2

Merge all mainline patches into the 1195 branch. Fixes #1243. · e5a97fb2

Bradley C. Kuszmaul authored Nov 11, 2008

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

e5a97fb2

Remove printf. Addresses #1195. · 222e3a36
Bradley C. Kuszmaul authored Nov 10, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7731 c7de825b-a66e-492c-adef-691d508d4ae1
```
222e3a36
merge intel c++ changes from changeset 6813. addresses #1185 · 5f772b51
Rich Prohaska authored Nov 10, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7730 c7de825b-a66e-492c-adef-691d508d4ae1
```
5f772b51
merge ticket 1200 changeset 6617 to the tokudb.1195 branch. addresses #1200 adresses #1195 · 71871aa0
Rich Prohaska authored Nov 08, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7705 c7de825b-a66e-492c-adef-691d508d4ae1
```
71871aa0
fix icc 32 bit warnings. addresses #1195 · 54206832
Rich Prohaska authored Nov 08, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7704 c7de825b-a66e-492c-adef-691d508d4ae1
```
54206832
fix icc compile issues. addresses #1195 · 2d4f7748
Rich Prohaska authored Nov 08, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7703 c7de825b-a66e-492c-adef-691d508d4ae1
```
2d4f7748
Get rid of a memory leak. Addresses #1195. · 0489447a
Bradley C. Kuszmaul authored Nov 07, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7685 c7de825b-a66e-492c-adef-691d508d4ae1
```
0489447a
play around with /proc/status. closes #1239 · c2720771
Rich Prohaska authored Nov 07, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7682 c7de825b-a66e-492c-adef-691d508d4ae1
```
c2720771
merge read uncommited changes to the dev branch. addresses #1201 · c96e94ee
Rich Prohaska authored Nov 07, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7681 c7de825b-a66e-492c-adef-691d508d4ae1
```
c96e94ee

Failed to generate a new splitk if we didn't merge (in one case). Makes... · c2ef1a3a

Bradley C. Kuszmaul authored Nov 07, 2008

Failed to generate a new splitk if we didn't merge (in one case).  Makes {{{test_dup_delete}}} run.  Addresses #1195.

git-svn-id: file:///svn/toku/tokudb.1195@7680 c7de825b-a66e-492c-adef-691d508d4ae1

c2ef1a3a

free diskblocks. Addresses #1195. · 4232a577
Bradley C. Kuszmaul authored Nov 07, 2008
```
git-svn-id: file:///svn/toku/tokudb.1195@7679 c7de825b-a66e-492c-adef-691d508d4ae1
```
4232a577