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
3722 commits 2778 branches 343 tags 1.6 GiB
Commit graph

132 commits

Author SHA1 Message Date
Leif Walsh
ed07802061 [t:3646] merging changes from tokudb.3646b. fixes #3646 
git-svn-id: file:///svn/toku/tokudb@32975 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:44 -04:00
Zardosht Kasheff
b9623f06fa [t:3724], [t:3717], [t:3727], merge fixes to main 
git-svn-id: file:///svn/toku/tokudb@32829 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:43 -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
c584efd770 [t:3266], per CR comments, collapse two functions into one 
git-svn-id: file:///svn/toku/tokudb@29159 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:37 -04:00
Zardosht Kasheff
11d8840d79 [t:3266], rename toku_change_descriptor to toku_brt_change_descriptor, per CR comments 
git-svn-id: file:///svn/toku/tokudb@29158 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:37 -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
Rich Prohaska
6131fab3c3 #3185 merge from the tokudb.3185 branch to main refs[t:3185] 
git-svn-id: file:///svn/toku/tokudb@27723 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:35 -04:00
Barry Perlman
3d521297d8 [t:3113] Fix symbol name in function signature. 
git-svn-id: file:///svn/toku/tokudb@27503 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:35 -04:00
Barry Perlman
83e823e2e6 [t:3113] During recovery, do not use latest version of rollback log file, 
but use latest version that was checkpointed at or before the last complete checkpoint.

git-svn-id: file:///svn/toku/tokudb@27338 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:35 -04:00
Barry Perlman
bfafd3dcd1 [t:2843] Move require_local_checkpoint() function to brt.c, remove inclusion of brt-internal.h from src/indexer.c. 
git-svn-id: file:///svn/toku/tokudb@25767 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:31 -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
Barry Perlman
31d6bb23be [t:2892] Remove conditional compilation that is unnecessary and incompatible with Windows compiler. 
git-svn-id: file:///svn/toku/tokudb@25330 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
Rich Prohaska
7606a0eb32 #2953 merge update_multiple to main refs[t:2953] 
git-svn-id: file:///svn/toku/tokudb@25124 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
Rich Prohaska
b4281f36b4 #2946 merge le-cursor's to main 
git-svn-id: file:///svn/toku/tokudb@24142 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:23 -04:00
Bradley C. Kuszmaul
bb5579a145 Merge 2948 changes to main: Start putting upsert into brt layer (Refs #2948). Also add unused attributes (Closes #2950). [t:2948] close[t:2950] 
{{{
svn merge -c 24081 https://svn.tokutek.com/tokudb/toku/tokudb.2948
}}}
.


git-svn-id: file:///svn/toku/tokudb@24083 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:23 -04:00
Bradley C. Kuszmaul
0c071258d7 Use a fast version of brt_is_empty. Refs #2919. [t:2919] 
git-svn-id: file:///svn/toku/tokudb@23694 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
Yoni Fogel
0b0c76392a closes[t:1398] [t:2861] Remove more heaviside code (include straddle hacks) from newbrt 
git-svn-id: file:///svn/toku/tokudb@23060 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
Bradley C. Kuszmaul
684da3b6ba Merge changes to remove heaviside and straddle from the ydb layer. Fixes #2865. [t:2865]. 
{{{
svn merge -c22808 https://svn.tokutek.com/tokudb/toku/tokudb.2861
}}}
.


git-svn-id: file:///svn/toku/tokudb@22809 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:21 -04:00
Yoni Fogel
a9c554b353 [t:2641] Merge DB_READCOMMITTED bugfix (r20839) to main. 
git-svn-id: file:///svn/toku/tokudb@20863 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:18 -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
661106bce3 Merge some changes back to main line (Refs #2623, #2631). [t:2623] [t:2631] 
{{{
svn merge -r 20381:20412 https://svn.tokutek.com/tokudb/toku/tokudb.2623
}}}
.


git-svn-id: file:///svn/toku/tokudb@20413 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:13 -04:00
Bradley C. Kuszmaul
5e75d244c1 Merge #2623 changes onto main line. The new test fails, but I need to get a merge from main again. Refs #2623. [t:2623] 
{{{
svn merge -r 20348:20378 https://svn.tokutek.com/tokudb/toku/tokudb.2623
}}}
.


git-svn-id: file:///svn/toku/tokudb@20379 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:13 -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
Yoni Fogel
8c34dda452 closes[t:2440] Merge #2440 to main. 
closes[t:2512] merge #2512 to main
Delete dev branch

git-svn-id: file:///svn/toku/tokudb@19439 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:06 -04:00
Yoni Fogel
1bf7a7a403 closes[t:2449] [t:2484] Merge #2449 changes to main. 
Rollback logs are now checkpointed.  There are no rolltmp files.


git-svn-id: file:///svn/toku/tokudb@19167 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:05 -04:00
Yoni Fogel
667e46d60c closes[t:2483] Fix recovery bug in loader. 
checkpoint_lsn written to headers made by loader are now the fsynced 'load' log entry's lsn instead of MAX_UINT64

git-svn-id: file:///svn/toku/tokudb@19136 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:05 -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
b4d376d908 Merge all the changes from tokudb.2370. We hope to deprecate 2370. 
{{{
svn merge -r17811:18633 https://svn.tokutek.com/tokudb/toku/tokudb.2370
}}}
Refs #2370. [t:2370]


git-svn-id: file:///svn/toku/tokudb@18637 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:03 -04:00
Yoni Fogel
b3f5306b41 [t:2249] Merge #2249 to main. 
'load' entry and rollback/recovery,
single filename for brtloader and rest of brt
test-fsync

git-svn-id: file:///svn/toku/tokudb@18617 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:03 -04:00
Yoni Fogel
c6510b33fe closes[t:2463] Merge #2463 changes (r18552,18555) to main to fix race condition 
with CACHEFILE->fd

git-svn-id: file:///svn/toku/tokudb@18612 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:02 -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
83f0f54ea4 closes[t:2408] Merge branch #2408 back to main. Delete dev branch. 
git-svn-id: file:///svn/toku/tokudb@18163 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:01 -04:00
Rich Prohaska
1c7b2bce90 merge parallel block compressor from 3.0.4 to main closes[t:2371] 
git-svn-id: file:///svn/toku/tokudb@18038 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:00 -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
Bradley C. Kuszmaul
56d2c6fdf8 Merge 2216 onto main (from 16706-17293) as 
{{{
svn merge -r16706:17293 https://svn.tokutek.com/tokudb/toku/tokudb.2216
}}}

Refs #2216. [t:2216]


git-svn-id: file:///svn/toku/tokudb@17299 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:59 -04:00
Yoni Fogel
838e0e5b1c [t:2318] Merge #2318 back to main up to r17166 
git-svn-id: file:///svn/toku/tokudb@17178 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:59 -04:00
Yoni Fogel
9557f27e82 Addresses #2249 [t:2249] Merge DB_ENV->put_multiple branch back onto main. 
Fixed some makefile issues, ported recovery tests to use toku_hard_crash_on_purpose(), fixed db-benchmark-test to use default name
for 0th db

git-svn-id: file:///svn/toku/tokudb@16936 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:58 -04:00
Yoni Fogel
7d6f6fef69 Closes #2180 closes[t:2180] Recovery forces 'fcreate' in rollback log (when replaying fcreate log entry) 
git-svn-id: file:///svn/toku/tokudb@15841 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:52 -04:00
Yoni Fogel
18c2c68f7c Addresses #2164 refs[t:2164] Zombie locking contract now enforced in rename/remove 
Checkpoint holds entire brt open (as zombie if necessary) instead of just holding open the cachefile.

git-svn-id: file:///svn/toku/tokudb.2037b@15740 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:06 -04:00
Yoni Fogel
a522ceda16 Closes #2153 refs[t:2153] fopen logged only once (unless closed and reopened). Removed logger from cachefile_close, 
removed txnid from logging of fopen.

git-svn-id: file:///svn/toku/tokudb.2037b@15691 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:06 -04:00
Yoni Fogel
580f5caafb Addresses #2037 refs[t:2037] Merged #2037 back into main 
git-svn-id: file:///svn/toku/tokudb@15562 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:04 -04:00
Rich Prohaska
46ae126764 panic brt's if recovery fails close[t:2035] 
git-svn-id: file:///svn/toku/tokudb@14783 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:03 -04:00
Yoni Fogel
1f0a5815b1 Closes #1862 closes[t:1862] LSNs are logged/chosen during the actual close, if closed during recovery, the LSN is passed into close. 
git-svn-id: file:///svn/toku/tokudb@14686 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:02 -04:00
Rich Prohaska
9d4f1ee78e fix some recovery tests close[t:2005] close[t:2010] 
git-svn-id: file:///svn/toku/tokudb@14546 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:02 -04:00