Merge updates from trunk.

FossilOrigin-Name: 86ab8643969bd2e51a257d80da9316c668437f7b
2016-03-21 10:49:49 +00:00
parent 762e32bcfa ef480d37dc
commit b7c9659db3
32 changed files with 1240 additions and 330 deletions
@@ -1931,6 +1931,8 @@ static int test_load_extension(
 #ifdef SQLITE_OMIT_LOAD_EXTENSION
  rc = SQLITE_ERROR;
  zErr = sqlite3_mprintf("this build omits sqlite3_load_extension()");
+  (void)zProc;
+  (void)zFile;
 #else
  rc = sqlite3_load_extension(db, zFile, zProc, &zErr);
 #endif