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
..
Makefile.include	Merge 2216 onto main (from 16706-17293) as	2013-04-16 23:58:59 -04:00
memory.h	[t:2318] Merge #2318 back to main up to r17166	2013-04-16 23:58:59 -04:00
old-db.h	Candidate fix for #1374 (wrong db.h include file for BDB versions of code.) Addresses #1374.	2013-04-16 23:57:37 -04:00
rdtsc.h	Addresses #1976 refs[t:1976] Add warnings for code hygiene that windows compiler requires.	2013-04-16 23:58:00 -04:00
toku_assert.h	Addresses #2257 refs[t:2257] Merge windows port back into main.	2013-04-16 23:58:56 -04:00
toku_atomic.h	fix the linux 32 bit build closes[t:2306]	2013-04-16 23:58:58 -04:00
toku_htod.h	Addresses #1125 Merged nested transactions from temporary merge branch into main.	2013-04-16 23:57:56 -04:00
toku_list.h	Addresses #2164 refs[t:2164] Zombie locking contract now enforced in rename/remove	2013-04-16 23:58:06 -04:00
toku_os.h	closes[t:2309] [t:2308] Deprecate dup2, _dup2 (wrap with toku_dup2), and replace /dev/null with DEV_NULL_FILE	2013-04-16 23:58:58 -04:00
toku_portability.h	Merge 2216 onto main (from 16706-17293) as	2013-04-16 23:58:59 -04:00