mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 07:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
2491 commits 2776 branches 343 tags 1.6 GiB
Commit graph

74 commits

Author SHA1 Message Date
Rich Prohaska
ed119ba646 get the timestamp test working refs[t:1910] 
git-svn-id: file:///svn/toku/tokudb@13853 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
Dave Wells
ae97a6dae5 remove failing test 
git-svn-id: file:///svn/toku/tokudb@13433 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:55 -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
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
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
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
0d081b83da Addresses #1626 Add test1626 to list of tests in Makefile 
git-svn-id: file:///svn/toku/tokudb@10778 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:46 -04:00
Rich Prohaska
9d20502817 merge 1489 to main. addresses #1489 
git-svn-id: file:///svn/toku/tokudb@10639 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:46 -04:00
Rich Prohaska
4f96393239 move the pwrite4g test to the portabilty layer. closes #1537 
git-svn-id: file:///svn/toku/tokudb@10069 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:44 -04:00
Bradley C. Kuszmaul
55b3f5eb3a Test for toku_os_pwrite to see if it can write beyond 4GB. Addresses #1519. 
git-svn-id: file:///svn/toku/tokudb@9777 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
e360f5f18e merge the 1458 and 1465 branches to main. addresses #1458, #1465 
git-svn-id: file:///svn/toku/tokudb@9363 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:41 -04:00
Yoni Fogel
a84973feaa Revert mistaken commit 
git-svn-id: file:///svn/toku/tokudb@9361 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
a0a592f71a Addresses #1396 
make clean in newbrt now cleans up dirty/clean files
Update ignore to ignore dirty/clean bits

git-svn-id: file:///svn/toku/tokudb@9111 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:39 -04:00
Yoni Fogel
83eee5663a Addresses #1396 
Merge tokudb.1396 back into main

git-svn-id: file:///svn/toku/tokudb@9110 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:39 -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
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
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
Yoni Fogel
44404dfbe1 Addresses #1338 
Added test to stress logger opening and close, fixed bug
where memory is not set to 0

git-svn-id: file:///svn/toku/tokudb.1032b@8402 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:32 -04:00
Bradley C. Kuszmaul
63bdae2d80 Fix up makefile. Addresses #1305. 
git-svn-id: file:///svn/toku/tokudb.1032b@8303 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:31 -04:00
Bradley C. Kuszmaul
da3a9e1430 Misnamed test. Addresses #1308. 
git-svn-id: file:///svn/toku/tokudb.1032b@8280 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:30 -04:00
Bradley C. Kuszmaul
b10f23d122 Test appears to demonstrate failure on 32 bit, and doesn't fail on 64 bit (for the first test in #1308). Addresses #1308. 
git-svn-id: file:///svn/toku/tokudb.1032b@8278 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:30 -04:00
Bradley C. Kuszmaul
75369283fa Merge changes back to tokudb.1032b. Fixes #1305. 
git-svn-id: file:///svn/toku/tokudb.1032b@8272 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:30 -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
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
Rich Prohaska
a3ae38596f test cachetable_unpin_and_remove. addresses #1237 
git-svn-id: file:///svn/toku/tokudb.1195@7612 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:24 -04:00
Bradley C. Kuszmaul
7a1f2d5706 Write tests for {{{toku_dump_brt()}}}. Addresses #1195. 
git-svn-id: file:///svn/toku/tokudb.1195@7461 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:24 -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
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
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
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
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
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
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
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
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
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
ce6b171044 Merge the multihreaded writer changes as 
{{{
svn merge -r 5899:5987 https://svn.tokutek.com/tokudb/tokudb
}}}
and resolve the conflicts.


git-svn-id: file:///svn/tokudb.1131b@5988 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:17 -04:00