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

186 commits

Author SHA1 Message Date
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
Dave Wells
d6e96be1f0 MERGE tokudb/toku/tokudb/1857 into main, refs [t:1857] 
git-svn-id: file:///svn/toku/tokudb@13431 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:55 -04:00
Yoni Fogel
be608a5f70 Fix windows build. 
git-svn-id: file:///svn/toku/tokudb@13298 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:55 -04:00
Dave Wells
68df634693 MERGE tokudb.logchanges2 13168:13253 into main 
git-svn-id: file:///svn/toku/tokudb@13261 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:55 -04:00
Bradley C. Kuszmaul
6df3b7e6db Fixes #1775 (logformat execv error) 
git-svn-id: file:///svn/toku/tokudb@12146 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:53 -04:00
Barry Perlman
df9cd04035 Closes #1741, Addresses #1398 Fix Makefiles to expose BRT_LEVEL_STRADDLE_CALLBACK_LOGIC_NOT_READY 
to all files that need it in both src/ and newbrt/ levels.

git-svn-id: file:///svn/toku/tokudb@11701 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:52 -04:00
Barry Perlman
646141a74c Addresses #1736, #1398 When inside straddle_hack callback don't use normal rwlock_read_lock for get_and_pin, but simply increment reader count instead. This prevents deadlock where callback waits for end_checkpoint to release write lock, but while end_checkpoint waits for callback to release read lock. 
git-svn-id: file:///svn/toku/tokudb@11658 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:51 -04:00
Bradley C. Kuszmaul
d6ab1513e8 Merge the tokudb.1665 branch into the main line. Fixes #1665. 
{{{
svn merge -r 11185:11261 https://svn.tokutek.com/tokudb/toku/tokudb.1665
}}}


git-svn-id: file:///svn/toku/tokudb@11264 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
Bradley C. Kuszmaul
682405a0f6 Fixes #1580. logformat now only runs once. 
git-svn-id: file:///svn/toku/tokudb@10417 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:45 -04:00
Yoni Fogel
1e1031f1ce Addresses #1531 fix newbrt/ make checko2 in windows 
git-svn-id: file:///svn/toku/tokudb@9961 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:43 -04:00
Yoni Fogel
0f8b5dcf7d add VTUNE=1 option for profiling in windows 
git-svn-id: file:///svn/toku/tokudb@9634 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
Yoni Fogel
d1aab2ef76 Addresses #1463 
Abstracted out the block translation table and the block allocator
into BLOCK_TABLE
All use is done by accessors surrounded by locks.


git-svn-id: file:///svn/toku/tokudb@9360 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:41 -04:00
Yoni Fogel
0207163a80 Addresses #1442 
Use MT instead of MD by default for windows.
In windows, newbrt and src tests use static libraries (pre-ipo with optimization, standard without)

git-svn-id: file:///svn/toku/tokudb@9235 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:40 -04:00
Yoni Fogel
f470a45bcf Revert "Addresses #1298" 
This reverts commit 5fa57d593d531a7ddc2f59afa4b082da46b00bbf.

git-svn-id: file:///svn/toku/tokudb@9229 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:40 -04:00
Yoni Fogel
566d68bfa5 Addresses #1298 
make local (at top level) skips tests

git-svn-id: file:///svn/toku/tokudb@9227 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:40 -04:00
Rich Prohaska
8eaa912f33 merge generalized worker threads from the 1183 branch. addresses #1183 
git-svn-id: file:///svn/toku/tokudb@8902 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:38 -04:00
Bradley C. Kuszmaul
2f856f7d29 Candidate fix for #1374 (wrong db.h include file for BDB versions of code.) Addresses #1374. 
git-svn-id: file:///svn/toku/tokudb@8667 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:37 -04:00
Bradley C. Kuszmaul
141ef2eaa5 Clean up the MAYBEATSIGN and verbosity stuff. Fixes #1365. 
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8573 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
fe0a157971 Cleaned up. Note that some stuff moved into the windows directory with symlinks from linux (since I know that symlinks work in linux, but maybe not in windows.) Addresses #1348. 
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8560 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
017d4f8cc3 Separate out the common malloc into newbrt/memory.c, and put the os-specific stuff into windows and linux subdirs. Things are broken. Addresses #1343. 
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8559 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
7372787c7f dlmalloc now works on Linux. Addresses #1032, #1328, #1343. 
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8477 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
8bb6a17355 Change malloc to dlmalloc. Addresses #1032, #1343, #1328. 
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8471 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:34 -04:00
Yoni Fogel
a9c69fd3fe Manual glue for svn-git migration for r8452 due to multiple merge + diffs in the same patch. 
Original message:
Create a branch to make Doug Lea's malloc work. The big problem is having another malloc() in the system breaks things. Address #1343, #1032.
 2013-04-16 23:57:33 -04:00
Rich Prohaska
6fdbf9bf15 move toku_malloc to the port layer. closes #1342 
git-svn-id: file:///svn/toku/tokudb.1032b@8423 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:32 -04:00
Bradley C. Kuszmaul
6232f7a211 Fixes #1322. 
git-svn-id: file:///svn/toku/tokudb.1032b@8301 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:31 -04:00
Rich Prohaska
6b31c10d81 fix the checko2 rule. closes #1316 
git-svn-id: file:///svn/toku/tokudb.1032b@8288 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:31 -04:00
Rich Prohaska
d8b0d25a31 fix checko2 rule 
git-svn-id: file:///svn/toku/tokudb.1032b@8281 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:31 -04:00
Rich Prohaska
033a67e739 add a rule to run -ipo-c for a windows release build. addresses #1032 
git-svn-id: file:///svn/toku/tokudb.1032b@8038 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
Rich Prohaska
2a662e812b minor changes to compile with icc and make the windows port easier. addresses #1195 
git-svn-id: file:///svn/toku/tokudb.1195@7647 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:25 -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
f13fa4beca Start using the simplified code in some cases. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@6611 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:23 -04:00
Yoni Fogel
0bed4483eb Addresses #1185 
omt-test now works in windows/cygwin/icc (although not through makefile)

newbrt/tests/makefile now supports icc in cygwin (more so than before)


git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6494 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
41253ffabb Get rid of more cil warnings. Addresses #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6459 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:20 -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
Bradley C. Kuszmaul
0363b1697a Get rid of almost all compiler warnings in newbrt. Addresses #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6381 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:20 -04:00
Bradley C. Kuszmaul
4267767fe9 Get rid of some compiler warnings. brt-test runs under valgrind. Addresses #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6374 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:19 -04:00
Bradley C. Kuszmaul
0d2788eb22 Get rid of some compiler warnings. Addresses #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6371 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:19 -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
620fe5fd24 Fiddle around with compiler invocation flags for icc 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6368 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:19 -04:00
Rich Prohaska
abd7a99014 build the .so. addresses #1185 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6366 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:19 -04:00
Rich Prohaska
2e6126d8e7 remove -Werror for icc for now. addresses #1185 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6354 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:19 -04:00
Rich Prohaska
d8613b06c8 use icc -ipa-c to build the newbrt code. addresses #1185 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6331 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:19 -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