mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
4343 commits 2774 branches 343 tags 1.6 GiB
Commit graph

67 commits

Author SHA1 Message Date
Zardosht Kasheff
07d38f9161 [t:4541], merge to main 
git-svn-id: file:///svn/toku/tokudb@41538 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-17 00:00:15 -04:00
Zardosht Kasheff
7942bcf209 [t:4028], merge to main 
git-svn-id: file:///svn/toku/tokudb@41142 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-17 00:00:13 -04:00
John Esmet
e1fcefad24 close[t:4432] merging 4432 to main - brt_msg_type now used correctly in the fifo and brt. 
git-svn-id: file:///svn/toku/tokudb@39177 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-17 00:00:07 -04:00
Zardosht Kasheff
4b54122313 [t:4375], merge to main 
git-svn-id: file:///svn/toku/tokudb@38666 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-17 00:00:04 -04:00
Zardosht Kasheff
fe693b1e55 [t:4357], [t:4364], [t:4365], merge fixes to main 
git-svn-id: file:///svn/toku/tokudb@38595 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-17 00:00:04 -04:00
Leif Walsh
784f47a841 [t:4002] Commiting HOT to main. 
git-svn-id: file:///svn/toku/tokudb@38549 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-17 00:00:03 -04:00
Rich Prohaska
922a7f4768 #4146 verify that fifo messages are sorted by msn closes[t:4146] 
git-svn-id: file:///svn/toku/tokudb@37171 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:57 -04:00
Rich Prohaska
9450008934 #4117 speed up brt_verify. merge to mainline refs[t:4117] 
git-svn-id: file:///svn/toku/tokudb@36980 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:57 -04:00
Rich Prohaska
0fe564b70f #4117 add a program to verify a db-benchmark file refs[t:4117] 
git-svn-id: file:///svn/toku/tokudb@36863 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:56 -04:00
Zardosht Kasheff
00e8c8c224 [t:3997], merge to main 
git-svn-id: file:///svn/toku/tokudb@36689 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:54 -04:00
Rich Prohaska
04d6214089 #4079 add last verification time to the brt header closes[t:4079] 
git-svn-id: file:///svn/toku/tokudb@36487 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:54 -04:00
Zardosht Kasheff
9948adca3c [t:3923], merge to main 
git-svn-id: file:///svn/toku/tokudb@35506 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:50 -04:00
Leif Walsh
d4b6b7efed [t:3889] [t:3890] merging IndexedAndVersionedBuffers to mainline 
git-svn-id: file:///svn/toku/tokudb@34348 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:48 -04:00
Zardosht Kasheff
1a5dbd80e5 [t:3645], merge to main 
git-svn-id: file:///svn/toku/tokudb@34156 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:48 -04:00
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
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
2379d061e9 [t:3564] Merge in barry's stuff to the main line. {{{svn merge -r32637:32693 ../tokudb.3564b+3312}}} Refs #3564. 
git-svn-id: file:///svn/toku/tokudb@32694 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:42 -04:00
Zardosht Kasheff
219331cc02 [t:3627], merge last of milestone 3 to main 
git-svn-id: file:///svn/toku/tokudb@32565 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:41 -04:00
Zardosht Kasheff
4a88cb22b4 [t:3644], merge cachetable changes for #3627 from tokudb.3627 to main 
git-svn-id: file:///svn/toku/tokudb@32519 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:41 -04:00
Zardosht Kasheff
cd757a485d [t:3641], merge refactoring of BRTNODE to main from tokudb.3627 
git-svn-id: file:///svn/toku/tokudb@32481 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:41 -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
80089f63a4 #3099 Merge 3099 onto the main line. 
{{{
svn merge -r28775:29048 https://svn.tokutek.com/tokudb/toku/tokudb.3099
}}}


git-svn-id: file:///svn/toku/tokudb@29055 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:37 -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
Bradley C. Kuszmaul
bab85ba037 Fixes #3207. Don't use assert() in verify_brt_node. [t:3207] 
git-svn-id: file:///svn/toku/tokudb@27468 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:35 -04:00
Bradley C. Kuszmaul
703dbc4784 Candidate fix for #3173. Refs #3173. [t:3173] 
git-svn-id: file:///svn/toku/tokudb@27114 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:34 -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
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
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
Bradley C. Kuszmaul
17e5214663 Refs #1529. 
git-svn-id: file:///svn/toku/tokudb@11223 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:48 -04:00
Bradley C. Kuszmaul
1ed3f26d65 Add #ident Id info to all the newbrt/*.c and newbrt/*.h files. Refs #1529. 
git-svn-id: file:///svn/toku/tokudb@11221 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:48 -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
Rich Prohaska
45eed6a919 merge tokudb.1183 to main. addresses #1183 
git-svn-id: file:///svn/toku/tokudb@9061 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:38 -04:00
Bradley C. Kuszmaul
e875d7109e Make some tests run better. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7615 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
2dd4dd7b0d the splitting works again. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7054 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:23 -04:00
Bradley C. Kuszmaul
cd8840f04d Get rid of icc warnings (with port-win warnings.) Addresss #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6466 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:21 -04:00
Bradley C. Kuszmaul
0ed47ea357 CIL gets upset if includes are not in the same order, because int64_t gets typedefed to different things depending on what you include. So do all the includes in a standard way. Addresses #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6439 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:20 -04:00
Rich Prohaska
02c73ee328 compile newbrt with icc. addresses #1185 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6330 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:19 -04:00
Bradley C. Kuszmaul
7ba939a031 Manage the header not in the cachetable. This will help with #1054. Addresses #1000, #1054, #1080, #1131. 
git-svn-id: file:///svn/tokudb.1131b+1080a@6128 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:18 -04:00
Bradley C. Kuszmaul
616abc829e Incorporate blocknum code from 1080a. Runs a little, need a big run on coyote. Addresses #1000, #1080, #1131. 
git-svn-id: file:///svn/tokudb.1131b+1080a@6025 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:18 -04:00
Bradley C. Kuszmaul
9b7fdbcfd0 Convert from crc to x1764. Fixes #1021. 
git-svn-id: file:///svn/tokudb@5363 c7de825b-a66e-492c-adef-691d508d4ae1
 2008-07-27 22:16:49 +00:00
Bradley C. Kuszmaul
5c3ec7de12 Revert the murmur checksum. Addresses #1021. 
{{{
svn merge https://svn.tokutek.com/tokudb/tokudb.1021@5184 https://svn.tokutek.com/tokudb/tokudb.1021@5107  
}}}
and fix a simple conflict.


git-svn-id: file:///svn/tokudb@5275 c7de825b-a66e-492c-adef-691d508d4ae1
 2008-07-23 03:47:05 +00:00
Bradley C. Kuszmaul
66cd2fdd01 Merge is tokudb.1021 changes. Addresses #1021. 
{{{
svn merge -r5107:5184 https://svn.tokutek.com/tokudb/tokudb.1021
}}}


git-svn-id: file:///svn/tokudb@5214 c7de825b-a66e-492c-adef-691d508d4ae1
 2008-07-20 14:08:55 +00:00
Bradley C. Kuszmaul
5cddfeee5c Get rid of {{{toku_keycompare}}} in favor of {{{brt->compare_fun}}} in {{{brt.c}}}. Fixes #9. 
git-svn-id: file:///svn/tokudb@4650 c7de825b-a66e-492c-adef-691d508d4ae1
 2008-06-19 11:32:25 +00:00
Bradley C. Kuszmaul
f714e3e873 Merge in the final hash shortcuts. 
{{{
svn merge -r4633:4638 https://svn.tokutek.com/tokudb/tokudb.906
}}}

Addresses #906.


git-svn-id: file:///svn/tokudb@4639 c7de825b-a66e-492c-adef-691d508d4ae1
 2008-06-18 21:38:01 +00:00
Bradley C. Kuszmaul
4db5b5063c Did 
{{{
svn merge -r4556:4568 https://svn.tokutek.com/tokudb/tokudb.906
}}}
to incorporate the hash improvements.

Addresses #906.


git-svn-id: file:///svn/tokudb@4596 c7de825b-a66e-492c-adef-691d508d4ae1
 2008-06-17 17:05:19 +00:00
Bradley C. Kuszmaul
8489ae2389 Change the {{{LEAFENTRY}}} to {{{OMTVALUE}}} when using the omt, and also change the type of {{{OMTVALUE}}} to {{{void*}}} so we can have two different OMTs coexisting. Fixes #750. 
git-svn-id: file:///svn/tokudb@3645 c7de825b-a66e-492c-adef-691d508d4ae1
 2008-04-25 13:45:55 +00:00
Bradley C. Kuszmaul
33b252772a Merge in the OMT and its integration into the main line. 
{{{
$ cd tokudb
$ svn merge -r3533:3571 https://svn.tokutek.com/tokudb/tokudb.724
}}}
 
There remain a few problems with recovery, but the main line has problems with recovery, so let's bite the bullet and move forward.

Fixes #729, #724.


git-svn-id: file:///svn/tokudb@3572 c7de825b-a66e-492c-adef-691d508d4ae1
 2008-04-22 20:39:50 +00:00
Bradley C. Kuszmaul
6298988642 Merge the tokudb.558 branch back to to the main branch with: 
{{{
svn merge -r3272:3320 https://svn.tokutek.com/tokudb/tokudb.558
}}}
No conflicts.


git-svn-id: file:///svn/tokudb@3322 c7de825b-a66e-492c-adef-691d508d4ae1
 2008-04-07 01:30:25 +00:00