Merge latest trunk changes with this branch. Add tests for columnsize=0.

FossilOrigin-Name: ef44c71a22518727030dd90c0139af8973b05841
2015-06-23 15:06:13 +00:00
parent 1153e60cf0 923cadb1ae
commit c94a08100b
69 changed files with 4793 additions and 3715 deletions
@@ -512,11 +512,11 @@ int sqlite3Fts5StorageDelete(Fts5Storage *p, i64 iDel){
  /* Delete the %_docsize record */
  if( rc==SQLITE_OK && pConfig->bColumnsize ){
    rc = fts5StorageGetStmt(p, FTS5_STMT_DELETE_DOCSIZE, &pDel, 0);
-  }
-  if( rc==SQLITE_OK ){
-    sqlite3_bind_int64(pDel, 1, iDel);
-    sqlite3_step(pDel);
-    rc = sqlite3_reset(pDel);
+    if( rc==SQLITE_OK ){
+      sqlite3_bind_int64(pDel, 1, iDel);
+      sqlite3_step(pDel);
+      rc = sqlite3_reset(pDel);
+    }
  }

  /* Delete the %_content record */