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

927 commits

Author SHA1 Message Date
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
Bradley C. Kuszmaul
d5c96813bc This version compiles, but none of the new code is run by any test. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@6590 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:23 -04:00
Bradley C. Kuszmaul
b54c77c3cb Start simplification of tree code, in preparation for merge on delete. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@6589 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:23 -04:00
Bradley C. Kuszmaul
21502c1381 Start simplification of tree code, in preparation for merge on delete. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@6588 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:23 -04:00
Bradley C. Kuszmaul
01a3ecde78 Get rid of one assertion that the nodes are smaller than the nodesize. Those assertions are no longer needed. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@6586 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:23 -04:00
Rich Prohaska
111975b8ce need to move to portability layer. no statm on freebsd for example. addresses #1185 
git-svn-id: file:///svn/toku/tokudb@6583 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:22 -04:00
Yoni Fogel
7e5fd7c56e Manual glue for svn-git migration for r6575 due to multiple merges. 
Original message:
Create new main branch from tokudb.1131b+1080a+1185+nostatementexprs. Create in in the new directory layout. Addresses #1131,#1080,#1185,#1193.
 2013-04-16 23:57:22 -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
f53dfab8b7 Addresses #1185 
omt-cursor-test now works in wintel

git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6498 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:22 -04:00
Yoni Fogel
fc3fa5d809 Addresses #1185 
Windows portability for srandom->srand random->rand
Allows omt-test to succeed

git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6496 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:22 -04:00
Yoni Fogel
1912f987a2 Addresses #1185 
Accidentally left stubs in which disabled randomness in omt-test

git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6495 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:22 -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
Yoni Fogel
6a2017c7d1 Addresses #1185 
More portability code

git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6493 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:22 -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
Rich Prohaska
e8194aa954 fixup fragmentation calculation. addresses #1190 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6487 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:21 -04:00
Bradley C. Kuszmaul
568c71a362 add -ip -ipo2. Addresses #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6475 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:21 -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
Rich Prohaska
31c755d35b compile with gcc 4.3. addresses #1185 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6471 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:21 -04:00
Rich Prohaska
548c7f644f compile with gcc and icc. addresses #1185 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6470 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:21 -04:00
Rich Prohaska
746d28bf51 compile with gcc. addresses #1185 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6469 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:21 -04:00
Bradley C. Kuszmaul
5398661a9e Make it work better with icc. Addresses #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185+nostatementexprs@6467 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
332b87bd3b Add idag-enable port-win. Addresses #1085. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6460 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:20 -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
be368672e5 Get rid of most CIL warnings. Addresses #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6457 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:20 -04:00
Bradley C. Kuszmaul
2c412190e7 Get rid of most CIL warnings. Addresses #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6456 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
Rich Prohaska
fd9bf11381 dump block fragmentation information. closes #1190 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6435 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:20 -04:00
Rich Prohaska
681b3ed56e turn on -Werror for icc builds. addresses #1185 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6409 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:20 -04:00
Bradley C. Kuszmaul
9f7f84e655 Get rid of almost all compiler warnings in newbrt for icc, and also compiles with gcc. Addresses #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6383 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
Rich Prohaska
8ae6c215b3 get brt-serialize-test working. addresses #1185 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6379 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:20 -04:00
Rich Prohaska
3fe38b45b5 compile with either gcc or icc. addresses #1185 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6378 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:20 -04:00
Bradley C. Kuszmaul
3009670479 Get rid of some compiler warnings. Addresses #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6377 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:20 -04:00
Bradley C. Kuszmaul
00a182b134 Get rid of some compiler warnings. Addresses #1185. 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6376 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
78d8f02303 compile fifo-test with icc, remove nested functions. addresses #1185 
git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6343 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
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
Rich Prohaska
5ef2e3e59f fix valgrind errors introduced by checkin 6279. addresses #1054 
git-svn-id: file:///svn/tokudb.1131b+1080a@6284 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:18 -04:00
Rich Prohaska
00edc91492 move the root_put_counter to the brt_header. closes #1054 
git-svn-id: file:///svn/tokudb.1131b+1080a@6279 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:18 -04:00
Rich Prohaska
2adbbe6d15 fix 1172. we can not use the brt in the block serialize functions as the brt may not be valid. addresses #1172 
git-svn-id: file:///svn/tokudb.1131b+1080a@6272 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:18 -04:00
Bradley C. Kuszmaul
728b016482 Merge main line (up to 6206) and resolve the differences. 
{{{
svn merge -r5900:6206 https://svn.tokutek.com/tokudb/tokudb
}}}

Addresses #699, #1000, #1075, #1080, #1100, #1131, #1132, #1134, #1153, #1158.


git-svn-id: file:///svn/tokudb.1131b+1080a@6207 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:18 -04:00