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

2062 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bradley C. Kuszmaul
d592348f56 Merged and resolved conflicts: 
{{{
svn merge -r7857:8080 https://svn.tokutek.com/tokudb/toku/tokudb
}}}
Addresses #1032, #1289.


git-svn-id: file:///svn/toku/tokudb.1032b+1343@8651 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:35 -04:00
Bradley C. Kuszmaul
eddad2d02c Merge in latest changes from 1032b into 1332+1343. 
About to merge 1332+1343 back to main line.
Addresses #1032, #1343.
{{{
svn merge -r8595:8646 https://svn.tokutek.com/tokudb/toku/tokudb.1032b
}}}


git-svn-id: file:///svn/toku/tokudb.1032b+1343@8648 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:35 -04:00
Rich Prohaska
9cdbdd4147 fix some helgrind issues. addresses #1277 
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8634 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:35 -04:00
Rich Prohaska
84d17e804a fix some data race problems detected with helgrind. addresses #1277 
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8628 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:35 -04:00
Rich Prohaska
a55b70cc05 fix a data race found with helgrind. closes #1370 
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8622 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:35 -04:00
Rich Prohaska
ef40f5e25a undo an erroneous change to test_db_delete.c. closes #1369 
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8621 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:35 -04:00
Rich Prohaska
be70861bf3 fix the data races in toku_malloc and toku_free. closes #1369 
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8620 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:35 -04:00
Bradley C. Kuszmaul
0dfc3aa50d Some fixes for recovery (#1364). Also some temporary fixes for #1277. Addresses #1364, #1277. 
Delete the 1364 branch, so I can restart it.
On the 1343 branch, I did:
{{{
svn merge -r 8586:8595 https://svn.tokutek.com/tokudb/toku/tokudb.1032b+1343+1364
}}}


git-svn-id: file:///svn/toku/tokudb.1032b+1343@8596 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:35 -04:00
Bradley C. Kuszmaul
bcff3ca394 Quiet cachetable-debug-test. Fixes #1368. 
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8582 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:35 -04:00
Bradley C. Kuszmaul
c40557746c Fixes #1367. 
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8578 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
c945aa448f Improve test robustness, found while working on #1367. Addresses #1367. 
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8577 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:34 -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
75cd8fe719 Cleanup make. Addresses #1343. 
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8561 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
0adc9f9bd8 Separate out the common malloc into newbrt/memory.c, and put the os-specific stuff into windows and linux subdirs. Addresses #1343. 
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8558 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
f66b523f89 Merge all stuff from source:tokudb/toku/tokudb.1032 since the creation of this branch at [8452] to the present [8556], as 
{{{
svn merge -r 8452:8556 https://svn.tokutek.com/tokudb/toku/tokudb.1032b/
}}}
And resolve conflicts.

It compiles, and we'll see if it runs.

Addresses #1032, #1343.


git-svn-id: file:///svn/toku/tokudb.1032b+1343@8557 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
8363a0d7de Make the symbols test pass. Addresses #1343. 
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8556 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
a83d6d833c Get things to compile. Addresses #1343. 
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8555 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
db2039c0db Compile better on linux, and more dlmalloc fixing. Addresses #1343. 
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8553 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
1ea88e0c8a More hacking on dlmalloc. Addresses #1032, #1328, #1343. 
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8476 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
316c7f118b Add {{{db_env_set_func_malloc}}}, {{{db_env_set_func_realloc}}}, and {{{db_env_set_func_free}}}. Addresses #1343, #1032, #1328. Tests don't pass 
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8474 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
Bradley C. Kuszmaul
ccac8cbcac Make cxx compile. Addresses #1032, #1343, #1328. 
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8459 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
a6de887207 realloc must also be poisoned. Addresses #1032, #1343, #1328. 
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8458 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
d04375154d realloc must also be poisoned. Addresses #1032, #1343, #1328. 
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8457 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:34 -04:00
Bradley C. Kuszmaul
a87c032a8f More link hacking. Addresses #1032, #1343, #1328. 
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8456 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:33 -04:00
Bradley C. Kuszmaul
5565b5e1f1 Try to get linking to work right. Addresses #1032, #1343, #1328. 
git-svn-id: file:///svn/toku/tokudb.1032b+1343@8454 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:33 -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
68a9ae24bb use the doug mallocator 
git-svn-id: file:///svn/toku/tokudb.1032b@8443 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:33 -04:00
Rich Prohaska
f3ea0d2a84 fixup the linux build. addresses #1342 
git-svn-id: file:///svn/toku/tokudb.1032b@8437 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:33 -04:00
Rich Prohaska
6ddfb50dfa compile ydb.c on windows 
git-svn-id: file:///svn/toku/tokudb.1032b@8436 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:33 -04:00
Bradley C. Kuszmaul
c8eba4924f change {{{db-benchmark-test}}} so that it can skip creating recovery logs. Addresses #1332. 
git-svn-id: file:///svn/toku/tokudb.1032b@8430 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:33 -04:00
Rich Prohaska
8f60fa22ad invert the error code from HeapSetInformation. addresses #1328 
git-svn-id: file:///svn/toku/tokudb.1032b@8428 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:33 -04:00
Rich Prohaska
7c167ffa5d move toku_malloc to portability layer. addresses #1342 
git-svn-id: file:///svn/toku/tokudb.1032b@8426 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:33 -04:00
Rich Prohaska
3962a69628 move toku_malloc to portability layer. addresses #1342 
git-svn-id: file:///svn/toku/tokudb.1032b@8425 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:32 -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
Yoni Fogel
4b1ad3b0bb Closes #1341 
Switches the heap to low fragmentation mode in windows.

git-svn-id: file:///svn/toku/tokudb.1032b@8421 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:32 -04:00
Rich Prohaska
a4e8aae3ac resize 64K blocks to 1MB. addresses #1328 
git-svn-id: file:///svn/toku/tokudb.1032b@8418 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:32 -04:00
Rich Prohaska
32e6287593 fix the 1032b build on linux 
git-svn-id: file:///svn/toku/tokudb.1032b@8415 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:32 -04:00
Rich Prohaska
24cfbaf471 fix the 1032b build on linux 
git-svn-id: file:///svn/toku/tokudb.1032b@8414 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:32 -04:00
Rich Prohaska
baa36a3933 fix the 1032b build on linux 
git-svn-id: file:///svn/toku/tokudb.1032b@8413 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:32 -04:00
Yoni Fogel
2c8ffa5068 Addresses #1032 
Fix compile for tests.

git-svn-id: file:///svn/toku/tokudb.1032b@8408 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:32 -04:00
Yoni Fogel
1c9bd84222 Addresses #1339 
Clean up properly on a logger that was not fully opened

git-svn-id: file:///svn/toku/tokudb.1032b@8406 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:32 -04:00
Rich Prohaska
227bdf60da try to malloc after a realloc failure. addresses #1328 
git-svn-id: file:///svn/toku/tokudb.1032b@8404 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:32 -04:00
Rich Prohaska
d1ecf12476 disable the mutex_init assert as we init mutexes from uninitialized memory sometimes. addresses #1328 
git-svn-id: file:///svn/toku/tokudb.1032b@8403 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:32 -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
Yoni Fogel
7a5104f5b7 Addresses #1032 
Compile bug

git-svn-id: file:///svn/toku/tokudb.1032b@8401 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:32 -04:00
Yoni Fogel
3ac6ee8ce7 Closes #1338 
windows pthread mutexes now require real initialization before use

git-svn-id: file:///svn/toku/tokudb.1032b@8400 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:57:32 -04:00