Merge latest trunk changes into this branch.

FossilOrigin-Name: e7dcd013516723941c2fb78ecdc96806d49d310b
2016-01-06 19:35:52 +00:00
parent 4364e5c9f7 8d52c3b767
commit 4d14398a61
42 changed files with 840 additions and 543 deletions
@@ -338,7 +338,7 @@ int sqlite3Fts5StorageClose(Fts5Storage *p){
    int i;

    /* Finalize all SQL statements */
-    for(i=0; i<ArraySize(p->aStmt); i++){
+    for(i=0; i<(int)ArraySize(p->aStmt); i++){
      sqlite3_finalize(p->aStmt[i]);
    }