Merge latest trunk changes into this branch.

FossilOrigin-Name: d4f3d52c5a11fc7ad7e8cad76361edbcef13a12f
2016-07-26 18:15:35 +00:00
parent 8da209b169 2900a6222f
commit d9ed09d47b
37 changed files with 1061 additions and 228 deletions
@@ -373,6 +373,7 @@ proc do_not_use_codec {} {
  set ::do_not_use_codec 1
  reset_db
 }
+unset -nocomplain do_not_use_codec

 # Return true if the "reserved_bytes" integer on database files is non-zero.
 #