mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/newbrt
History
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
..
checksum-benchmarks
compression-ratio Addresses #1307 2013-04-16 23:57:30 -04:00
hash-benchmarks Add sum64 2008-07-27 18:36:56 +00:00
locking-benchmarks measure the times of errorcheck mutexes 2008-08-26 18:57:34 +00:00
omt-with-o1-cursors
tests realloc must also be poisoned. Addresses #1032, #1343, #1328. 2013-04-16 23:57:34 -04:00
worker-thread-benchmarks Merge main line (up to 6206) and resolve the differences. 2013-04-16 23:57:18 -04:00
block_allocator.c 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. 2013-04-16 23:57:20 -04:00
block_allocator.h Allocate blocks on alignment and don't write the root FIFO over the translate block. Addresses #1080, #1000, #1131. 2013-04-16 23:57:18 -04:00
bread.c Merge changes back to tokudb.1032b. Fixes #1305. 2013-04-16 23:57:30 -04:00
bread.h more merging of 1032 to 1032b. addresses #1032 2013-04-16 23:57:27 -04:00
brt-internal.h 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 2013-04-16 23:57:34 -04:00
brt-search.h compile newbrt with icc. addresses #1185 2013-04-16 23:57:19 -04:00
brt-serialize.c Manual glue for svn-git migration for r8452 due to multiple merge + diffs in the same patch. 2013-04-16 23:57:33 -04:00
brt-test-helpers.c merge tokudb revision 7776-7883 to toudb.1032b. closes #1260 2013-04-16 23:57:29 -04:00
brt-verify.c Make some tests run better. Addresses #1195. 2013-04-16 23:57:24 -04:00
brt-XY.c
brt.c Merge all stuff from source:tokudb/toku/tokudb.1032 since the creation of this branch at [8452] to the present [8556], as 2013-04-16 23:57:34 -04:00
brt.h More hacking on dlmalloc. Addresses #1032, #1328, #1343. 2013-04-16 23:57:34 -04:00
brtdump.c Manual glue for svn-git migration for r8452 due to multiple merge + diffs in the same patch. 2013-04-16 23:57:33 -04:00
brttypes.h test with icc on linux. addresses #1032 2013-04-16 23:57:28 -04:00
cachetable-rwlock.h merge some tokudb.1032 into 1032b. addresses #1032 2013-04-16 23:57:27 -04:00
cachetable-writequeue.h merge some tokudb.1032 into 1032b. addresses #1032 2013-04-16 23:57:27 -04:00
cachetable.c Merge all stuff from source:tokudb/toku/tokudb.1032 since the creation of this branch at [8452] to the present [8556], as 2013-04-16 23:57:34 -04:00
cachetable.h merge tokudb revision 7776-7883 to toudb.1032b. closes #1260 2013-04-16 23:57:29 -04:00
fifo.c 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. 2013-04-16 23:57:20 -04:00
fifo.h Get rid of icc warnings (with port-win warnings.) Addresss #1185. 2013-04-16 23:57:21 -04:00
fingerprint.c use toku_htonl. closes #1247 2013-04-16 23:57:29 -04:00
hashfun.h
hclip.c
includes.h rename to toku_portability.h addresses #1269 2013-04-16 23:57:29 -04:00
key.c 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. 2013-04-16 23:57:20 -04:00
key.h
kv-pair.h
leafentry.c merge tokudb revision 7776-7883 to toudb.1032b. closes #1260 2013-04-16 23:57:29 -04:00
leafentry.h rename to toku_portability.h addresses #1269 2013-04-16 23:57:29 -04:00
list.h
lock.h
log-internal.h Addresses #1338 2013-04-16 23:57:32 -04:00
log.c Manual glue for svn-git migration for r8452 due to multiple merge + diffs in the same patch. 2013-04-16 23:57:33 -04:00
log.h Closes #1339 2013-04-16 23:57:32 -04:00
logformat.c rename to toku_portability.h addresses #1269 2013-04-16 23:57:29 -04:00
Makefile dlmalloc now works on Linux. Addresses #1032, #1328, #1343. 2013-04-16 23:57:34 -04:00
Makefile.include
Makefile.new
memarena.c try to malloc after a realloc failure. addresses #1328 2013-04-16 23:57:32 -04:00
memarena.h
memory-debug.c
mempool.c 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. 2013-04-16 23:57:20 -04:00
mempool.h compile newbrt with icc. addresses #1185 2013-04-16 23:57:19 -04:00
omt.c rename to toku_portability.h addresses #1269 2013-04-16 23:57:29 -04:00
omt.h Merge all mainline patches into the 1195 branch. Fixes #1243. 2013-04-16 23:57:26 -04:00
rbuf.h rename to toku_portability.h addresses #1269 2013-04-16 23:57:29 -04:00
recover.c addresses #1268 2013-04-16 23:57:29 -04:00
roll.c Manual glue for svn-git migration for r8452 due to multiple merge + diffs in the same patch. 2013-04-16 23:57:33 -04:00
rwlock.c merge some tokudb.1032 into 1032b. addresses #1032 2013-04-16 23:57:27 -04:00
tdb-recover.c Get rid of more cil warnings. Addresses #1185. 2013-04-16 23:57:20 -04:00
tdb_logprint.c Get rid of icc warnings (with port-win warnings.) Addresss #1185. 2013-04-16 23:57:21 -04:00
threadpool.c Manual glue for svn-git migration for r8452 due to multiple merge + diffs in the same patch. 2013-04-16 23:57:33 -04:00
threadpool.h 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. 2013-04-16 23:57:20 -04:00
toku_assert.c rename to toku_portability.h addresses #1269 2013-04-16 23:57:29 -04:00
toku_assert.h turn on the cachetable writer threads. use fast asserts. addresses #1195 2013-04-16 23:57:25 -04:00
trace_mem.c rename to toku_portability.h addresses #1269 2013-04-16 23:57:29 -04:00
trace_mem.h Get rid of almost all compiler warnings in newbrt. Addresses #1185. 2013-04-16 23:57:20 -04:00
valgrind.suppressions Closes #1295 2013-04-16 23:57:30 -04:00
wbuf.h replace htonl with toku_htonl. addresses #1255 2013-04-16 23:57:29 -04:00
x1764.c Merge all mainline patches into the 1195 branch. Fixes #1243. 2013-04-16 23:57:26 -04:00
x1764.h compile using gcc 4.3 (fedora 9) addresses #1195 2013-04-16 23:57:25 -04:00
ybt.c 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. 2013-04-16 23:57:20 -04:00
ybt.h