Fix a harmless compiler warning on MacOS.
Change some unreachable test conditions to NEVER().
Add a "database_may_be_corrupt" directive to test file fuzz3.test. Reformat an assert() statement in vdbeaux.c to make its intent clearer.
Remove an unnecessary branch from the UPDATE logic - one that was also
unreachable except following an OOM on x64.
Modify test file conflict2.test so that it works with the "inmemory_journal" permutation.
Fix a typo in fts3varint.test preventing the valgrind permutation test from running.
Fix an alignment problem in the stat3/stat4 code affecting 32-bit platforms.
Fix a possible (and probably harmless) uninitialized variable in STAT3/4.
Remove a branch in STAT4 logic that is no longer reachable after 
the previous change.
Merge in trunk changes.