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

1489 commits

Author SHA1 Message Date
Rich Prohaska
287f0e8384 fix 32 bit linux build of brtloader test #2475 closes[t:2475] 
git-svn-id: file:///svn/toku/tokudb@18769 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:03 -04:00
Yoni Fogel
b33a8c1830 [t:2216] windows port of #2216 merge (remove statement expressions) 
git-svn-id: file:///svn/toku/tokudb@18753 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:03 -04:00
Bradley C. Kuszmaul
788b96e407 Merge 2216b onto main line. Refs #2216. [t:2216] 
{{{
svn merge -r18206:18672 https://svn.tokutek.com/tokudb/toku/tokudb.2216b
svn merge -r 18738:18746 https://svn.tokutek.com/tokudb/toku/tokudb.2216b
}}}
.


git-svn-id: file:///svn/toku/tokudb@18749 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:03 -04:00
Bradley C. Kuszmaul
53d376d7c3 Add keywords. [t:2468]. Refs #2468. 
git-svn-id: file:///svn/toku/tokudb@18673 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
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
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
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
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
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
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
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
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
Rich Prohaska
3d46ee3fd4 merge serialize.c from 3.0.4 to main refs[t:2371] 
git-svn-id: file:///svn/toku/tokudb@18055 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:00 -04:00
Dave Wells
235123b4d3 merge fixes from tokudb.2384 
git-svn-id: file:///svn/toku/tokudb@18039 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:00 -04:00
Rich Prohaska
1c7b2bce90 merge parallel block compressor from 3.0.4 to main closes[t:2371] 
git-svn-id: file:///svn/toku/tokudb@18038 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:00 -04:00
Rich Prohaska
92a9fdcf65 fix the panic exit out of logger maybe fsync closes[t:2376] 
git-svn-id: file:///svn/toku/tokudb@17857 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:00 -04:00
Rich Prohaska
dd4d1192ff add checkpoint work in the cachetable to the wait time in get and pin. merge from 3.0.4 closes[t:2348] 
git-svn-id: file:///svn/toku/tokudb@17819 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:00 -04:00
Yoni Fogel
54039a679f [t:2350] Add BRT_INSERT_NO_OVERWRITE to leafentry tests 
git-svn-id: file:///svn/toku/tokudb@17706 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:00 -04:00
Yoni Fogel
76340644aa [t:2350] Change BRT_LAYOUT_VERSION 11->12 to support new brt message BRT_INSERT_NO_OVERWRITE 
git-svn-id: file:///svn/toku/tokudb@17701 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:00 -04:00
Yoni Fogel
adf3e7ae95 [t:2350] Added DB_NOOVERWRITE_NO_ERROR flag for DB->put. 
Will return EINVAL for ENV->put_multiple.

Has same semantics as INSERT IGNORE in mysql.
(equivalently) Has same semantics as DB_NOOVERWRITE except that it returns 0 if there is a duplicate key error
instead of DB_KEYEXISTS

git-svn-id: file:///svn/toku/tokudb@17682 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:00 -04:00
Yoni Fogel
9a3d6c5dc9 Renamed "SKIP_*" for slow tests to "TOKU_SKIP_*" for slow tests 
git-svn-id: file:///svn/toku/tokudb@17681 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:00 -04:00
Yoni Fogel
f07af9de73 Added make local in newbrt to skip building tests 
git-svn-id: file:///svn/toku/tokudb@17680 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:59:00 -04:00
Yoni Fogel
c6fcce22ce [t:2328] Merge 2328 branch onto main, 
some minimal porting

git-svn-id: file:///svn/toku/tokudb@17597 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:59 -04:00
Barry Perlman
0fecb0fd4d Addresses #2336 refs[t:2336] Undoes unnecessary bug fix, restore assert. 
git-svn-id: file:///svn/toku/tokudb@17323 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:59 -04:00
Dave Wells
a146155e4f merge DB_LOADER->abort changes from tokudb.2216a branch 
git-svn-id: file:///svn/toku/tokudb@17320 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:59 -04:00
Bradley C. Kuszmaul
56d2c6fdf8 Merge 2216 onto main (from 16706-17293) as 
{{{
svn merge -r16706:17293 https://svn.tokutek.com/tokudb/toku/tokudb.2216
}}}

Refs #2216. [t:2216]


git-svn-id: file:///svn/toku/tokudb@17299 c7de825b-a66e-492c-adef-691d508d4ae1
 2013-04-16 23:58:59 -04:00