mariadb/buildheader
Bradley C. Kuszmaul 1bfd207e32 Merge the fixes for #2862, #2861, and #2269 onto main. Fixes #2269, #2861, #2862. close[t:2269] close[t:2861] close[t:2862]
{{{
svn merge -r 23006:23042 https://svn.tokutek.com/tokudb/toku/tokudb.2862b
}}}
.


git-svn-id: file:///svn/toku/tokudb@23046 c7de825b-a66e-492c-adef-691d508d4ae1
2013-04-16 23:59:21 -04:00
..
db.h_4_1 Merge the fixes for #2862, #2861, and #2269 onto main. Fixes #2269, #2861, #2862. close[t:2269] close[t:2861] close[t:2862] 2013-04-16 23:59:21 -04:00
db.h_4_3 Merge the fixes for #2862, #2861, and #2269 onto main. Fixes #2269, #2861, #2862. close[t:2269] close[t:2861] close[t:2862] 2013-04-16 23:59:21 -04:00
db.h_4_4 Merge the fixes for #2862, #2861, and #2269 onto main. Fixes #2269, #2861, #2862. close[t:2269] close[t:2861] close[t:2862] 2013-04-16 23:59:21 -04:00
db.h_4_5 Merge the fixes for #2862, #2861, and #2269 onto main. Fixes #2269, #2861, #2862. close[t:2269] close[t:2861] close[t:2862] 2013-04-16 23:59:21 -04:00
db.h_4_6 Merge the fixes for #2862, #2861, and #2269 onto main. Fixes #2269, #2861, #2862. close[t:2269] close[t:2861] close[t:2862] 2013-04-16 23:59:21 -04:00
make.include merge DB_LOADER->abort changes from tokudb.2216a branch 2013-04-16 23:58:59 -04:00
make_db_h.c Merge the fixes for #2862, #2861, and #2269 onto main. Fixes #2269, #2861, #2862. close[t:2269] close[t:2861] close[t:2862] 2013-04-16 23:59:21 -04:00
Makefile [t:2499]Added TOKUDB_CANCELED error code for use in canceling during poll function of loader. 2013-04-16 23:59:10 -04:00
sample_offsets.c Merge the fixes for #2862, #2861, and #2269 onto main. Fixes #2269, #2861, #2862. close[t:2269] close[t:2861] close[t:2862] 2013-04-16 23:59:21 -04:00
sample_offsets_32_4_1.h Merge the fixes for #2862, #2861, and #2269 onto main. Fixes #2269, #2861, #2862. close[t:2269] close[t:2861] close[t:2862] 2013-04-16 23:59:21 -04:00
sample_offsets_32_4_3.h Merge the fixes for #2862, #2861, and #2269 onto main. Fixes #2269, #2861, #2862. close[t:2269] close[t:2861] close[t:2862] 2013-04-16 23:59:21 -04:00
sample_offsets_32_4_4.h Merge the fixes for #2862, #2861, and #2269 onto main. Fixes #2269, #2861, #2862. close[t:2269] close[t:2861] close[t:2862] 2013-04-16 23:59:21 -04:00
sample_offsets_32_4_5.h Merge the fixes for #2862, #2861, and #2269 onto main. Fixes #2269, #2861, #2862. close[t:2269] close[t:2861] close[t:2862] 2013-04-16 23:59:21 -04:00
sample_offsets_32_4_6.h Merge the fixes for #2862, #2861, and #2269 onto main. Fixes #2269, #2861, #2862. close[t:2269] close[t:2861] close[t:2862] 2013-04-16 23:59:21 -04:00
sample_offsets_64_4_1.h Merge the fixes for #2862, #2861, and #2269 onto main. Fixes #2269, #2861, #2862. close[t:2269] close[t:2861] close[t:2862] 2013-04-16 23:59:21 -04:00
sample_offsets_64_4_3.h Merge the fixes for #2862, #2861, and #2269 onto main. Fixes #2269, #2861, #2862. close[t:2269] close[t:2861] close[t:2862] 2013-04-16 23:59:21 -04:00
sample_offsets_64_4_4.h Merge the fixes for #2862, #2861, and #2269 onto main. Fixes #2269, #2861, #2862. close[t:2269] close[t:2861] close[t:2862] 2013-04-16 23:59:21 -04:00
sample_offsets_64_4_5.h Merge the fixes for #2862, #2861, and #2269 onto main. Fixes #2269, #2861, #2862. close[t:2269] close[t:2861] close[t:2862] 2013-04-16 23:59:21 -04:00
sample_offsets_64_4_6.h Merge the fixes for #2862, #2861, and #2269 onto main. Fixes #2269, #2861, #2862. close[t:2269] close[t:2861] close[t:2862] 2013-04-16 23:59:21 -04:00
sample_offsets_64_4_7.h Merge the fixes for #2862, #2861, and #2269 onto main. Fixes #2269, #2861, #2862. close[t:2269] close[t:2861] close[t:2862] 2013-04-16 23:59:21 -04:00
tdb.h Merge the fixes for #2862, #2861, and #2269 onto main. Fixes #2269, #2861, #2862. close[t:2269] close[t:2861] close[t:2862] 2013-04-16 23:59:21 -04:00