mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
3799 commits 2778 branches 343 tags 1.6 GiB
Commit graph

39 commits

Author SHA1 Message Date
Leif Walsh
32a778c43f [t:3315] merge indexed buffers work into mainline 
git-svn-id: file:///svn/toku/tokudb@33979 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:47 -04:00
Zardosht Kasheff
f392523514 [t:3436], [t:3782], merge ydb level bulk fetch to main line 
git-svn-id: file:///svn/toku/tokudb@33770 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:46 -04:00
Bradley C. Kuszmaul
885c83300b [t:3604] Merge everything from the tokudb.3312c+3524+msn branch. Refs #3604. 
git-svn-id: file:///svn/toku/tokudb@32294 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:40 -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
Zardosht Kasheff
a927dc1fc9 [t:3347], merge fractal tree piece of HCAD to main 
git-svn-id: file:///svn/toku/tokudb@29146 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:37 -04:00
Barry Perlman
036c8d6b54 [t:3236] [t:3238] Merge tokudb.3236+3238 to main. 
git-svn-id: file:///svn/toku/tokudb@28070 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:36 -04:00
Barry Perlman
37f0a697b3 [t:3034] Update engine status for new functionality. 
git-svn-id: file:///svn/toku/tokudb@26444 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:33 -04:00
Zardosht Kasheff
fd80a2a081 [t:3088], fix bug 
git-svn-id: file:///svn/toku/tokudb@26086 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:32 -04:00
Rich Prohaska
3ba245cda6 #3043 merge changes from code review to main refs[t:3043] 
git-svn-id: file:///svn/toku/tokudb@25904 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:31 -04:00
Zardosht Kasheff
42b7cbd920 [t:2811], make names of XXX_is_del functions consistent 
git-svn-id: file:///svn/toku/tokudb@25690 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:30 -04:00
Dave Wells
f31a90e9e9 merge indexer to main refs #2843 [t:2843] 
git-svn-id: file:///svn/toku/tokudb@25593 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:29 -04:00
Zardosht Kasheff
fbdca53647 [t:2892], remove #if BRT_LAYOUT... 
git-svn-id: file:///svn/toku/tokudb@25394 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:26 -04:00
Zardosht Kasheff
2f88373f31 [t:2892], undo bad checkin 
git-svn-id: file:///svn/toku/tokudb@25393 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:26 -04:00
Zardosht Kasheff
89668ba2e5 [t:2892], remove some more #if from macros 
git-svn-id: file:///svn/toku/tokudb@25392 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:26 -04:00
Barry Perlman
548d03d70e [t:2892] Merge upgrade logic to main. Merge command was svn merge --accept=postpone -r25293:HEAD ../tokudb.main+2892 . 
git-svn-id: file:///svn/toku/tokudb@25303 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:25 -04:00
Zardosht Kasheff
249838df05 [t:3008], more comments 
git-svn-id: file:///svn/toku/tokudb@25156 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:24 -04:00
Zardosht Kasheff
f613162833 [t:3008], modify comments 
git-svn-id: file:///svn/toku/tokudb@25152 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:24 -04:00
Zardosht Kasheff
2ef50f2e96 [t:3008], rename attributes to type 
git-svn-id: file:///svn/toku/tokudb@25148 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:24 -04:00
Zardosht Kasheff
17eccfed9b [t:2935], merge to main 
git-svn-id: file:///svn/toku/tokudb@24885 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:23 -04:00
Zardosht Kasheff
ab10d38d38 [t:2811], add some comments for file organization 
git-svn-id: file:///svn/toku/tokudb@23809 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:23 -04:00
Rich Prohaska
5484d70495 #2934 closes[t:2934] add --optimize to db-benchmark, fix the leafentry print function 
git-svn-id: file:///svn/toku/tokudb@23806 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:23 -04:00
Zardosht Kasheff
4d54bbb80b [t:2811], add comments as result of Bradley's CR 
git-svn-id: file:///svn/toku/tokudb@23766 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:23 -04:00
Zardosht Kasheff
c14837af5b [t:2811], remove unneeded leafentry accessor 
git-svn-id: file:///svn/toku/tokudb@23609 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:22 -04:00
Zardosht Kasheff
cc91ea8ca4 [t:2811], merge to main \!\!\! 
git-svn-id: file:///svn/toku/tokudb@23495 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:22 -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
Yoni Fogel
c9b2b066dd [t:2561] Merge tokudb.2561b to main. Disabled auto-upgrade and auto-upgrade tests 
git-svn-id: file:///svn/toku/tokudb@20778 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:17 -04:00
Bradley C. Kuszmaul
fe23612513 Merge in changes. Refs #2608, #2609, and #2610. [t:2608] [t:2609] [t:2610] 
{{{
svn merge -r 20187:20196 https://svn.tokutek.com/tokudb/toku/tokudb.2571
}}}
.


git-svn-id: file:///svn/toku/tokudb@20197 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:11 -04:00
Bradley C. Kuszmaul
28cc5d1ed9 Merge the changes from 2499d onto the main line. Fixes #2499. close[t:2499]. 
{{{
svn merge -r 19523:19895 https://svn.tokutek.com/tokudb/toku/tokudb.2499d
}}}
.


git-svn-id: file:///svn/toku/tokudb@19902 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:09 -04:00
Zardosht Kasheff
a87006b10c [t:2494], merge read committed to main 
git-svn-id: file:///svn/toku/tokudb@19073 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:05 -04:00
Bradley C. Kuszmaul
178820a688 Merge changes from 2216a to main (except possibly for the windows subdirectory, which Yoni will do separately). 
2216a is no longer valid.
Refs #2216. [t:2216].
{{{
svn merge -r17301:18179 https://svn.tokutek.com/tokudb/toku/tokudb.2216a/src/tests
}}}



git-svn-id: file:///svn/toku/tokudb@18181 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:01 -04:00
Yoni Fogel
adf3e7ae95 [t:2350] Added DB_NOOVERWRITE_NO_ERROR flag for DB->put. 
Will return EINVAL for ENV->put_multiple.

Has same semantics as INSERT IGNORE in mysql.
(equivalently) Has same semantics as DB_NOOVERWRITE except that it returns 0 if there is a duplicate key error
instead of DB_KEYEXISTS

git-svn-id: file:///svn/toku/tokudb@17682 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:00 -04:00
Yoni Fogel
1b8ee601f3 Addresses #1737 refs[t:1737] Optimized le_has_xids 
In the case where |XIDS| <= num xids in leafentry, and outermost uncommitted xid matches, and |XIDS|>2

git-svn-id: file:///svn/toku/tokudb@14588 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:02 -04:00
Yoni Fogel
465065c60c Addresses #1737 refs[t:1737] Mega abort/mega commit messages coded 
These messages are broadcast to an entire dictionary, aborting/committing a particular transaction only.

git-svn-id: file:///svn/toku/tokudb@14571 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:02 -04:00
Barry Perlman
d69c552f03 Addresses #1987 refs[t:1987] Fully replace (rename) BRT_CMD with BRT_MSG (same struct) for consistency 
git-svn-id: file:///svn/toku/tokudb@14372 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:00 -04:00
Rich Prohaska
68dc93d09b fix some linux icc issues close[t:1975] 
git-svn-id: file:///svn/toku/tokudb@14305 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:00 -04:00
Yoni Fogel
fee19e875a Addresses #1924 refs[t:1924] Initial version of upgrade (10->11) logic is complete 
git-svn-id: file:///svn/toku/tokudb@13938 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:58 -04:00
Yoni Fogel
13aa2ed352 Addresses #1866 Implement implicit promotion on query (for slow and shortcut versions) 
refs [t:1866]

git-svn-id: file:///svn/toku/tokudb@13560 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:56 -04:00
Yoni Fogel
ab3ca24e9d Addresses #1125 Fix a couple of off-by-one errors with xids (max level of nested transactions) 
Added tests that check all message types/changes you can do to a non-existant leafentry
Added tests that check all message types/changes you can do to a committed (insert) leafentry

git-svn-id: file:///svn/toku/tokudb@13529 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:56 -04:00
Yoni Fogel
110754f57c Addresses #1125 Merged nested transactions from temporary merge branch into main. 
Current tests fail (not regressions, they fail as of 13461)
 * {{{x1.tdbrun}}}
 * {{{test_log(2,3,4,5,6,7,8,9,10).recover}}}
 * {{{test-recover(1,2,3).tdbrun}}}
 * {{{test1324.tdbrun}}}
ULE_DEBUG disabled (defined to 0)  Can be re-enabled for test purposes (set to 1).
refs [t:1125]
Merging into the temp branch (tokudb.main_13461+1125)
{{{svn merge --accept=postpone -r 12527:13461 ../tokudb.1125 ./}}}

Merging into main
{{{svn merge --accept=postpone -r13462:13463 ../tokudb.main_13461+1125/ ./}}}


git-svn-id: file:///svn/toku/tokudb@13464 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:56 -04:00