Bradley C. Kuszmaul
77c38fad44
Remove second copy of time. Refs #2467 . [t:2467].
...
git-svn-id: file:///svn/toku/tokudb@18658 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:03 -04:00
Bradley C. Kuszmaul
8e833273da
Merge in all the changes from 18354 to 18555 from 3.1.0. The only real change was in the engine status instrumentation. Refs #2467 . [t:2467].
...
{{{
svn merge -r18354:18555 https://svn.tokutek.com/tokudb/mysql.branches/3.1.0/tokudb/
}}}
.
git-svn-id: file:///svn/toku/tokudb@18657 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:03 -04:00
Bradley C. Kuszmaul
91d93e80ca
Merge r18344. No actual changes. Refs #2467 . [t:2467].
...
git-svn-id: file:///svn/toku/tokudb@18656 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:03 -04:00
Bradley C. Kuszmaul
73cc033ae4
get_tdiff shouldn't be in logger.c. [t:2434] Refs #2434 .
...
git-svn-id: file:///svn/toku/tokudb@18653 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:03 -04:00
Bradley C. Kuszmaul
a2f83cd13b
get_tdiff shouldn't be in export.map. [t:2434] Refs #2434 .
...
git-svn-id: file:///svn/toku/tokudb@18652 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:03 -04:00
Bradley C. Kuszmaul
9fb8e42bac
Merge r18221. No substantial changes. Refs #2467 . [t:2467].
...
git-svn-id: file:///svn/toku/tokudb@18651 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:03 -04:00
Bradley C. Kuszmaul
e21e3b6328
Merge r18085. No actual changes. Refs #2467 . [t:2467].
...
git-svn-id: file:///svn/toku/tokudb@18649 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:03 -04:00
Bradley C. Kuszmaul
83ad86f23e
Merge r18411 (which increments output_condition_lock_ctr while lock is held.) Refs #2450 . [t:2450]
...
{{{
svn merge -c18411 https://svn.tokutek.com/tokudb/mysql.branches/3.1.0/tokudb/
}}}
.
git-svn-id: file:///svn/toku/tokudb@18644 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:03 -04:00
Bradley C. Kuszmaul
e8af332d42
Merge r18357 to put the logger statistics. Refs #2385 . [t:2385].
...
{{{
svn merge -c18357 https://svn.tokutek.com/tokudb/mysql.branches/3.1.0/tokudb/
}}}
.
git-svn-id: file:///svn/toku/tokudb@18640 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:03 -04:00
Bradley C. Kuszmaul
9bac0b073a
move get_tdiff to test.h. Refs #2434 . [t:2434]
...
{{{
svn merge -c18257 https://svn.tokutek.com/tokudb/mysql.branches/3.1.0/tokudb/
}}}
.
git-svn-id: file:///svn/toku/tokudb@18638 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:03 -04:00
Bradley C. Kuszmaul
b4d376d908
Merge all the changes from tokudb.2370. We hope to deprecate 2370.
...
{{{
svn merge -r17811:18633 https://svn.tokutek.com/tokudb/toku/tokudb.2370
}}}
Refs #2370 . [t:2370]
git-svn-id: file:///svn/toku/tokudb@18637 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:03 -04:00
Yoni Fogel
416e8c43db
[t:2249] Fix memory leak introduced in r18617 (merge of 2249)
...
git-svn-id: file:///svn/toku/tokudb@18618 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:03 -04:00
Yoni Fogel
b3f5306b41
[t:2249] Merge #2249 to main.
...
'load' entry and rollback/recovery,
single filename for brtloader and rest of brt
test-fsync
git-svn-id: file:///svn/toku/tokudb@18617 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:03 -04:00
Yoni Fogel
5cfc0adf1f
[t:2445] Windows port of functionality
...
git-svn-id: file:///svn/toku/tokudb@18613 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -04:00
Yoni Fogel
c6510b33fe
closes[t:2463] Merge #2463 changes (r18552,18555) to main to fix race condition
...
with CACHEFILE->fd
git-svn-id: file:///svn/toku/tokudb@18612 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -04:00
Rich Prohaska
0641ab568f
fix a memory leak in the logger refs[t:2445]
...
git-svn-id: file:///svn/toku/tokudb@18513 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -04:00
Rich Prohaska
a89af48d07
fix compile problems refs[t:2436]
...
git-svn-id: file:///svn/toku/tokudb@18504 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -04:00
Rich Prohaska
d329a40dfd
fix a compile problem refs[t:2436]
...
git-svn-id: file:///svn/toku/tokudb@18500 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -04:00
Rich Prohaska
d7056a9dc8
merge 3.0.5 changes to main refs[t:2436]
...
git-svn-id: file:///svn/toku/tokudb@18474 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -04:00
Bradley C. Kuszmaul
fe3420136d
Make the group commit test compile. Refs #2228 . [t:2228].
...
git-svn-id: file:///svn/toku/tokudb@18401 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -04:00
Dave Wells
0009757a37
merge changes to cachetable.c from tokudb.2445 [t:2444]
...
git-svn-id: file:///svn/toku/tokudb@18399 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -04:00
Dave Wells
f77996b3d0
merge from tokudb.2445
...
git-svn-id: file:///svn/toku/tokudb@18387 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -04:00
Rich Prohaska
b55e48b90a
merge -c 18380 from 3.0.5 to main refs[t:2436]
...
git-svn-id: file:///svn/toku/tokudb@18382 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -04:00
Rich Prohaska
5a5fca31d1
assert on ENOSPC for now on main refs[t:2436]
...
git-svn-id: file:///svn/toku/tokudb@18371 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -04:00
Rich Prohaska
473fc53ffe
retry writes when no space returned closes[t:2436]
...
git-svn-id: file:///svn/toku/tokudb@18362 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -04:00
Rich Prohaska
d371ba7b91
memory leak when logcursors fail refs[t:2446]
...
git-svn-id: file:///svn/toku/tokudb@18346 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -04:00
Rich Prohaska
8ac1902a65
recovery checks for logcursor errors refs[t:2443]
...
git-svn-id: file:///svn/toku/tokudb@18343 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -04:00
Dave Wells
77c6f461e2
plug memory leak [t:2426]
...
git-svn-id: file:///svn/toku/tokudb@18330 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -04:00
Dave Wells
336260de36
fixes [t:2426], addresses [t:2444] in logger.c
...
git-svn-id: file:///svn/toku/tokudb@18323 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -04:00
Dave Wells
d988daee39
add powerfail test
...
git-svn-id: file:///svn/toku/tokudb@18322 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -04:00
Dave Wells
10b1d60dad
fix [t:2426], add test
...
git-svn-id: file:///svn/toku/tokudb@18290 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -04:00
Dave Wells
f1612526b6
fix [t:2424]
...
git-svn-id: file:///svn/toku/tokudb@18289 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -04:00
Bradley C. Kuszmaul
099c51de5b
Fix layout version in brtloader header. Refs #2216 . [t:2216].
...
git-svn-id: file:///svn/toku/tokudb@18276 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -04:00
Yoni Fogel
2aba419dac
fix windows build (remove use of poisoned pthread function)
...
git-svn-id: file:///svn/toku/tokudb@18271 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -04:00
Bradley C. Kuszmaul
296fca6bed
Contrary to r18222, the new group commit code was not on the main truck.
...
{{{
svn merge -r17893:18056 https://svn.tokutek.com/tokudb/toku/tokudb.2370c
}}}
Refs #2370 , #2385 . [t:2370] [t:2385].
git-svn-id: file:///svn/toku/tokudb@18259 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -04:00
Rich Prohaska
e599eadbe1
ct the log file prior to scannint it refs[t:2432]
...
git-svn-id: file:///svn/toku/tokudb@18244 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:02 -04:00
Rich Prohaska
0955312a20
cat the log file prior to scanning it refs[t:2432]
...
git-svn-id: file:///svn/toku/tokudb@18214 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:01 -04:00
Yoni Fogel
d968f27fc4
[t:2216] Fix lock tree tests (not allowed to use dictionary id 0 anymore)
...
git-svn-id: file:///svn/toku/tokudb@18199 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:01 -04:00
Yoni Fogel
5f68cd8242
[t:2216] Merge/windows port of #2216
...
git-svn-id: file:///svn/toku/tokudb@18191 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:01 -04:00
Yoni Fogel
6baa2eb69c
[t:2216] Removed double export of toku_do_assert
...
git-svn-id: file:///svn/toku/tokudb@18190 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:01 -04:00
Yoni Fogel
1f1c288024
[t:2216] printf format now matches (windows port)
...
git-svn-id: file:///svn/toku/tokudb@18189 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:01 -04:00
Yoni Fogel
b19737b515
[t:2216] Windows port of #2216 . warning 147 is ignored in intel's -Werror. Put in a workaround.
...
git-svn-id: file:///svn/toku/tokudb@18188 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:01 -04:00
Yoni Fogel
fa8ef6da1f
[t:2216] Windows port of 2216 Showed that windows fetch_and_increment was returning incremented (not original) result.
...
Atomic functions now return the original
git-svn-id: file:///svn/toku/tokudb@18187 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:01 -04:00
Yoni Fogel
465be5c1f1
[t:2216] Fix deadlock bug introduced during merge of #2216
...
git-svn-id: file:///svn/toku/tokudb@18186 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:01 -04:00
Bradley C. Kuszmaul
7176886212
Change main's second argument to {{{char *const*argv}}}. Fixes #2228 . close[t:2228]
...
git-svn-id: file:///svn/toku/tokudb@18184 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:01 -04:00
Yoni Fogel
031acf5b97
[t:2328] Added nightly test script to windows scripts
...
git-svn-id: file:///svn/toku/tokudb@18182 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:01 -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
a9400fb09c
closes[t:2427] Fix windows build.
...
git-svn-id: file:///svn/toku/tokudb@18176 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:01 -04:00
Yoni Fogel
83f0f54ea4
closes[t:2408] Merge branch #2408 back to main. Delete dev branch.
...
git-svn-id: file:///svn/toku/tokudb@18163 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:01 -04:00
Yoni Fogel
14d67581f0
closes[t:2391] Merge 2391 branch to main
...
git-svn-id: file:///svn/toku/tokudb@18153 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:01 -04:00