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

49 commits

Author SHA1 Message Date
Leif Walsh
8d0368fd2f [t:3983] merging auto-upgrade to mainline 
git-svn-id: file:///svn/toku/tokudb@41591 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-17 00:00:17 -04:00
Barry Perlman
7d828bbd29 [t:4050] #4050 Merge tokudb.4050 to merge, done with command svn merge -r36213:HEAD tokudb.4050 tokudb 
git-svn-id: file:///svn/toku/tokudb@36808 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:55 -04:00
Rich Prohaska
28877528fb #3678 use clean or mvcc leaf entries when appropriate refs[t:3678] 
git-svn-id: file:///svn/toku/tokudb@32718 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:42 -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
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
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
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
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
Barry Perlman
08c0ded0e1 Improve comments. (Comment changes only.) 
git-svn-id: file:///svn/toku/tokudb@25673 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:30 -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
35800b4c8b [t:3008], modify comments a bit 
git-svn-id: file:///svn/toku/tokudb@25194 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:25 -04:00
Zardosht Kasheff
c9eb09c1f7 [t:3008], modify comments a bit 
git-svn-id: file:///svn/toku/tokudb@25193 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:25 -04:00
Zardosht Kasheff
2c6ca1d18d [t:3008], comment changes 
git-svn-id: file:///svn/toku/tokudb@25186 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:24 -04:00
Zardosht Kasheff
97d689d64e [t:3008], more comments 
git-svn-id: file:///svn/toku/tokudb@25154 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:24 -04:00
Zardosht Kasheff
e654cbdb55 [t:3008], add comments to leafentry struct describing format 
git-svn-id: file:///svn/toku/tokudb@25153 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
0151b36fdd [t:2811], move some accessors from ule.h to leafentry.h 
git-svn-id: file:///svn/toku/tokudb@25012 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:24 -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
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
Rich Prohaska
c1b0e91b95 new block format with a header checksum and sub block checksums. merge -c 18916:head from 2351.ptq to main refs[t:2351] 
git-svn-id: file:///svn/toku/tokudb@18961 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:05 -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
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
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
Yoni Fogel
049c7625a3 Addresses #1765 Merge [12079] into main (pthreads-win32 for windows) 
git-svn-id: file:///svn/toku/tokudb@12081 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:53 -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
4860352fb8 Addresses #1611 toku_htod32 and toku_dtoh32 replace htonl and ntohl (for internal use). 
d stands for disk-byte-order (as opposed to n for network-byte-order)
Disk-byte-order set as Intel byte order for now

git-svn-id: file:///svn/toku/tokudb@10694 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:46 -04:00
Rich Prohaska
4f46b25a02 rename to toku_portability.h addresses #1269 
git-svn-id: file:///svn/toku/tokudb.1032b@7952 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:29 -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
Rich Prohaska
a12ca96fba use toku_htonl. closes #1247 
git-svn-id: file:///svn/toku/tokudb.1032b@7850 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:29 -04:00
Rich Prohaska
0d44815bf5 merge some tokudb.1032 into 1032b. addresses #1032 
git-svn-id: file:///svn/toku/tokudb.1032b@7778 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:27 -04:00
Bradley C. Kuszmaul
5d2267731f Try to build a LESWITCHCALL that works with both icc on windows, and on icc and gcc on linux. Addresses #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6492 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:22 -04:00
Yoni Fogel
9cf3e69508 Addresses #1185 
Fix bug with W-intel compiler and variadic macros.

git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6488 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:22 -04:00
Bradley C. Kuszmaul
32eca1b0c8 Fix variadic macro to be right again? Must put space before comma. Addresses #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6474 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:21 -04:00
Yoni Fogel
5d7a5dfaa3 Addresses #1185 
Modified makefile to be more modular with icc and gcc options.
Modified portability.h with some stubs and some real portability code

Removed named variadic macros for unnamed variadic macros (c99 only supports unnamed)
Removed ', ## __VAR_ARGS__' in favor of ', __VAR_ARGS__' due to apparent bug in the intel compiler (on windows at least)
__ICC means the linux intel compiler, __ICL means the windows intel compiler
__INTEL_COMPILER is set by both
Removed some include files (for windows) that don't exist.

git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6473 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:21 -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
31da3f370b Get rid of some compiler warnings. Addresses #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6370 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:19 -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
Rich Prohaska
da3b69356c merge branch 838 to main. addresses #838 
git-svn-id: file:///svn/tokudb@4493 c7de825b-a66e-492c-adef-691d508d4ae1
 2008-06-12 13:53:39 +00:00
Bradley C. Kuszmaul
e9323991d7 {{{ 
svn delete tokudb.872
cd tokudb
svn merge -r4187:4233 https://svn.tokutek.com/tokudb/tokudb.872
}}}

Fixes #849, #872.
Addresses #820.


git-svn-id: file:///svn/tokudb@4234 c7de825b-a66e-492c-adef-691d508d4ae1
 2008-05-29 03:12:59 +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
Bradley C. Kuszmaul
22cf859734 Write leafentry code, and get things to compile. Make it more compatible with -Wconversion. Addresses #558. 
git-svn-id: file:///svn/tokudb@3270 c7de825b-a66e-492c-adef-691d508d4ae1
 2008-04-04 18:22:01 +00:00
Bradley C. Kuszmaul
7e5dfd3e5d Write leafentry code, and get things to compile. Addresses #558. 
git-svn-id: file:///svn/tokudb@3269 c7de825b-a66e-492c-adef-691d508d4ae1
 2008-04-04 18:03:03 +00:00