mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 22:34:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
5580 commits 2781 branches 343 tags 1.6 GiB
Commit graph

144 commits

Author SHA1 Message Date
Leif Walsh
958c447641 closes #5206 merge c++ changes to mainline 
git-svn-id: file:///svn/toku/tokudb@45903 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-17 00:00:59 -04:00
Yoni Fogel
3a208cebc4 closes [t:4913]. Modelines now synchronized in every source/header file (and always top two lines) 
git-svn-id: file:///svn/toku/tokudb@43762 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-17 00:00:36 -04:00
Leif Walsh
3719bf2c2f [t:4901] merging brt->ft rename to main 
git-svn-id: file:///svn/toku/tokudb@43686 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-17 00:00:35 -04:00
Bradley C. Kuszmaul
8b3036c56c close[t:4576] Get rid of c_del in the cxx code. Closes #4576. 
git-svn-id: file:///svn/toku/tokudb@40375 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-17 00:00:12 -04:00
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
78deef3cca close[t:3880] Fix the cxx compile. Refs #3880. 
git-svn-id: file:///svn/toku/tokudb@34017 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:47 -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
Rich Prohaska
439d156cdf #3535 remove DB_YESOVERWRITE on main. merge tokudb.3535 to main refs[t:3535] 
git-svn-id: file:///svn/toku/tokudb@31293 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:40 -04:00
Bradley C. Kuszmaul
70eb6ebabe Close #2945 (get rid of {{{db->set_bt_compare}}} in favor of {{{env->set_default_bt_compare}}}). 
Closes #2945.  close[t:2945]
{{{
svn merge -r 24888:24894 https://svn.tokutek.com/tokudb/toku/tokudb.2945
}}}
.


git-svn-id: file:///svn/toku/tokudb@24931 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:24 -04:00
Bradley C. Kuszmaul
1bfd207e32 Merge the fixes for #2862, #2861, and #2269 onto main. Fixes #2269, #2861, #2862. close[t:2269] close[t:2861] close[t:2862] 
{{{
svn merge -r 23006:23042 https://svn.tokutek.com/tokudb/toku/tokudb.2862b
}}}
.


git-svn-id: file:///svn/toku/tokudb@23046 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:21 -04:00
Bradley C. Kuszmaul
e0bf7cb3e4 Fixes #2851. (cxx tests now work concurrently). close[t:2851] 
git-svn-id: file:///svn/toku/tokudb@22727 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:21 -04:00
Rich Prohaska
2248b6205c #2740 refs[t:2740] fix the cxx permissions test (which depends on the underlying inames) 
git-svn-id: file:///svn/toku/tokudb@21309 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:19 -04:00
Rich Prohaska
23c57550fb fix the cxx permissions test closes[t:2377] 
git-svn-id: file:///svn/toku/tokudb@19615 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:07 -04:00
Rich Prohaska
081fe6767e fix the cxx permissions tests refs[t:2377] 
git-svn-id: file:///svn/toku/tokudb@17854 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:00 -04:00
Bradley C. Kuszmaul
ea77448b07 Improve make clean in cxx. Refs #2326. [t:2285] 
git-svn-id: file:///svn/toku/tokudb@17174 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:59 -04:00
Bradley C. Kuszmaul
3f97de8b98 Fix #2326 (cxx/check_test_get_not_found failed). close[t:2326] 
git-svn-id: file:///svn/toku/tokudb@17173 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:59 -04:00
Bradley C. Kuszmaul
df060cd5bd Make the cxx tests succeed. Fixes #2285. close[t:2285] 
git-svn-id: file:///svn/toku/tokudb@17148 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:59 -04:00
Bradley C. Kuszmaul
5991c07b98 Fixes #2291. closes[t:2291] 
git-svn-id: file:///svn/toku/tokudb@16857 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:57 -04:00
Bradley C. Kuszmaul
2df222064a More fixes. This may actually result in a fix for #2285 but #2284 is blocking the fix. Refs #2285, [t:2285] 
git-svn-id: file:///svn/toku/tokudb@16843 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:57 -04:00
Bradley C. Kuszmaul
8c8162ede4 things don't really work without an environment. Refs #2285, [t:2285] 
git-svn-id: file:///svn/toku/tokudb@16842 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:57 -04:00
Bradley C. Kuszmaul
bb06a5a944 test_errpfx was setting two data dirs. exceptions is broken out to its worn rule (and is failing because of #2284). exceptions was also operating in the cwd, instead of a subdir. The reverse_compare_fun was failing because it wasing cwd for some calls instead of the subdir. Refs #2285, #2284. [t:2285] [t:2284] 
git-svn-id: file:///svn/toku/tokudb@16835 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:57 -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
Bradley C. Kuszmaul
6222ec9492 fixes[t:2213] Fixes #2213. 
git-svn-id: file:///svn/toku/tokudb@16069 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:55 -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
Rich Prohaska
6cd0d57e45 fix a couple of the failing cxx tests refs[t:2014] 
git-svn-id: file:///svn/toku/tokudb@15047 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:04 -04:00
Rich Prohaska
0024eb77ab link to the shared tokudb lib to pick up the lib constructor refs[t:2014] 
git-svn-id: file:///svn/toku/tokudb@15046 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:04 -04:00
Yoni Fogel
001bc6f4c3 Addresses #1976 refs[t:1976] Add warnings for code hygiene that windows compiler requires. 
Cleaned up code to remove warnings.

git-svn-id: file:///svn/toku/tokudb@14306 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:00 -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
Bradley C. Kuszmaul
6c211758b1 Merge 1767 into main line (including 1768 and 1627 fixes) and delete 1767 branch. Fixes #1767. Refs #1768, 1627. 
git-svn-id: file:///svn/toku/tokudb@12140 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:53 -04:00
Bradley C. Kuszmaul
0982c11fbf Remove spurious cxx test output. Fixes #1675. 
git-svn-id: file:///svn/toku/tokudb@11230 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:48 -04:00
Yoni Fogel
6561bd1af8 Addresses #1510 Final merge into main. Delete #1510 branch. 
svn merge -r 11048:11110 ../tokudb.1510

git-svn-id: file:///svn/toku/tokudb@11112 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:47 -04:00
Yoni Fogel
a223e28aa5 Closes #1606 Replace 2&> with 2> in cxx/tests/Makefile 
git-svn-id: file:///svn/toku/tokudb@10651 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:46 -04:00
Bradley C. Kuszmaul
dbc0a3bae5 Delete .dirty files (patch from 1510). Fixes #1564. 
git-svn-id: file:///svn/toku/tokudb@10337 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:44 -04:00
Bradley C. Kuszmaul
5d9be4ddf1 Merge the simplified logging back to the main line, and get rid of the tokudb.1493a branch. Closes #1493. 
git-svn-id: file:///svn/toku/tokudb@9719 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:42 -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
c1ea905c09 Clean up the dirty flags when deleting the tdb files. Addresses #1396. 
git-svn-id: file:///svn/toku/tokudb@9208 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:40 -04:00
Rich Prohaska
c730d763b7 fix build on fedora 9 
git-svn-id: file:///svn/toku/tokudb@8872 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:38 -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
ccac8cbcac Make cxx compile. Addresses #1032, #1343, #1328. 
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8459 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:34 -04:00
Rich Prohaska
32e6287593 fix the 1032b build on linux 
git-svn-id: file:///svn/toku/tokudb.1032b@8415 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:32 -04:00
Bradley C. Kuszmaul
6232f7a211 Fixes #1322. 
git-svn-id: file:///svn/toku/tokudb.1032b@8301 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:31 -04:00
Rich Prohaska
987c03b986 merge tokudb revision 7776-7883 to toudb.1032b. closes #1260 
git-svn-id: file:///svn/toku/tokudb.1032b@7888 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:29 -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
Rich Prohaska
a19234e8d1 merge intel c++ changes from changeset 6813. addresses #1185 
git-svn-id: file:///svn/toku/tokudb.1195@7730 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:25 -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