Merge branch 'orig' into mdb
authorHoward Chu <hyc@symas.com>
Sun, 3 Mar 2013 14:02:22 +0000 (06:02 -0800)
committerHoward Chu <hyc@symas.com>
Sun, 3 Mar 2013 14:02:22 +0000 (06:02 -0800)
commit34e8656a234bb52fd31627c4820758be32828048
tree349afbbb812ebd677e35124d034547a8c9b9ad8b
parent53d1731ae806e59f8df7cbcbfb99bf7bf047afda
parent06b0d33cafe336837d3fe6c419f082666fc2008a
Merge branch 'orig' into mdb

Conflicts:
src/backup.c
src/btree.c
src/btreeInt.h
src/pager.c
src/pcache.c
src/pcache1.c
src/wal.c
src/btreeInt.h
src/pager.h
src/printf.c
src/test2.c
src/test3.c
src/test_stat.c