Barry Perlman 13c324ed06 Merge from 3.1.0 using following commands: ... > svn merge --accept=postpone -r18405:HEAD https://svn.tokutek.com/tokudb/mysql.branches/3.0.5/tokudb > svn merge --accept=postpone -r18484:HEAD https://svn.tokutek.com/tokudb/mysql.branches/3.1.0/tokudb > svn merge --accept=postpone -c18403 https://svn.tokutek.com/tokudb/mysql.branches/3.0.5/tokudb > all executed inside directory tokudb/toku/tokudb git-svn-id: file:///svn/toku/tokudb@18877 c7de825b-a66e-492c-adef-691d508d4ae1		2013-04-16 23:59:04 -04:00
..
Makefile.include	[t:2216] Windows port of #2216. warning 147 is ignored in intel's -Werror. Put in a workaround.	2013-04-16 23:59:01 -04:00
memory.h	Merge changes from 2216a to main (except possibly for the windows subdirectory, which Yoni will do separately).	2013-04-16 23:59:01 -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	Merge the backtrace onto the mainline. Refs #2387. [t:2387].	2013-04-16 23:59:01 -04:00
toku_atomic.h	[t:2216] Windows port of 2216 Showed that windows fetch_and_increment was returning incremented (not original) result.	2013-04-16 23:59:01 -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	Merge from 3.1.0 using following commands:	2013-04-16 23:59:04 -04:00
toku_portability.h	merge 3.0.5 -c 18481 to main refs[t:2467]	2013-04-16 23:59:04 -04:00