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

73 commits

Author SHA1 Message Date
Bradley C. Kuszmaul
489e8c7b5f close[t:3994] {{{svn merge -r36763:36780 ../tokudb.3994c}}}. Closes #3994. 
git-svn-id: file:///svn/toku/tokudb@36781 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:55 -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
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
2004c26cdd [t:3738], make dsn into a struct 
git-svn-id: file:///svn/toku/tokudb@32906 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:43 -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
9c34a98ae4 [t:3706] Fixup the bools a little. Refs #3706. 
git-svn-id: file:///svn/toku/tokudb@32766 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:43 -04:00
Bradley C. Kuszmaul
223071f1e2 close[t:3706] Deprecate BOOL. Refs #3706. 
git-svn-id: file:///svn/toku/tokudb@32750 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
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
Rich Prohaska
daaf3a035f #2977 compile libtokudb.so with icc 12.0.3 refs[t:2977] 
git-svn-id: file:///svn/toku/tokudb@30158 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:39 -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
Rich Prohaska
43e5039e58 #3011 remove *extra from *multiple functions and callbacks refs[t:3011] 
git-svn-id: file:///svn/toku/tokudb@25627 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
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
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
Barry Perlman
9b57707611 Closes #2498 [t:2498] Made DICTIONARY_ID 64 bits. 
git-svn-id: file:///svn/toku/tokudb@20383 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
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
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
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
Rich Prohaska
f9ac445e55 delete logging cruft closes[t:2189] 
git-svn-id: file:///svn/toku/tokudb@15929 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:53 -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
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
0860425ef6 Addresses #1987 refs[t:1987] API and implementation of broadcast commit (all xids) message. 
Cleaned up BRT_CMD vs BRT_MSG, removed logger from query path.

git-svn-id: file:///svn/toku/tokudb@14376 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:00 -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
1a7354b892 merge recovery key compare function to main. close[t:1966] 
git-svn-id: file:///svn/toku/tokudb@14218 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:59 -04:00
Yoni Fogel
1563110816 Addresses #1866 refs [t:1866] Default oldest living txnid is now TXNID_NONE_LIVING (0) 
Fix bug where assert was hit when transactions are off.
Cleaned up some code.

git-svn-id: file:///svn/toku/tokudb@13625 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:56 -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
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
Bradley C. Kuszmaul
1a48d75807 Merge in the 1390 fixes, and delete 1390. Fixes #1390. 
{{{
svn merge -r10820:HEAD https://svn.tokutek.com/tokudb/toku/tokudb.1390
}}}


git-svn-id: file:///svn/toku/tokudb@11192 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:48 -04:00
Yoni Fogel
8f2b0a7e11 Addresses #1510 Merge of 1510 (so far) back into main 
Several fixes are included, particulary db remove after db truncate (with descriptor) does not crash anymore.
svn merge -r 10931:11019 ../tokudb.1510

git-svn-id: file:///svn/toku/tokudb@11020 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:47 -04:00
Yoni Fogel
dab780fdbd Addresses #1510 Merge tokud.main+1510 back into main 
svn merge --accept=postpone -r 10895:10898 ../tokudb.main+1510
Previously on tokudb.main+1510:
svn merge --accept=postpone -r 10317:10892 ../tokudb.1510

git-svn-id: file:///svn/toku/tokudb@10899 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:47 -04:00
Yoni Fogel
3cec87fc6a Addresses #1531 linux port (fix compile) of [10491] 
git-svn-id: file:///svn/toku/tokudb@10492 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:45 -04:00
Bradley C. Kuszmaul
9bdd6eaf62 All the old recovery tests work (#1364), and are merged onto the main line. 
Refs #1510, Closes #1364.
This work was done on the 1510 branch, which we will create again.


git-svn-id: file:///svn/toku/tokudb@10313 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:44 -04:00
Yoni Fogel
e50cfa1034 Addresses #1519 poison off_t in windows 
git-svn-id: file:///svn/toku/tokudb@9783 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
Rich Prohaska
bf1af189e0 test with icc on linux. addresses #1032 
git-svn-id: file:///svn/toku/tokudb.1032b@7810 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:28 -04:00
Rich Prohaska
fbfd0476ba more merging of 1032 to 1032b. addresses #1032 
git-svn-id: file:///svn/toku/tokudb.1032b@7779 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:27 -04:00
Rich Prohaska
03b92c9f4e problem including brt-types.h in c++ code. c is not always compatible with c++. addresses #1185 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6556 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:22 -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
9e8e600430 Block allocator works and is tested. Addresses #1080, #1031, #1000. 
git-svn-id: file:///svn/tokudb.1131b+1080a@6076 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