Merge the latest changes from trunk.

FossilOrigin-Name: 5021dfe1f3f723a5938d547a0308f1d63103702d
2016-05-17 17:11:21 +00:00
parent 8271630e81 ee7de914d4
commit 8884d99926
23 changed files with 419 additions and 143 deletions
@@ -388,8 +388,7 @@ TESTSRC2 = \
  $(TOP)/ext/fts3/fts3_write.c \
  $(TOP)/ext/async/sqlite3async.c \
  $(TOP)/ext/session/sqlite3session.c \
-  $(TOP)/ext/session/test_session.c \
-  $(FTS5_SRC)
+  $(TOP)/ext/session/test_session.c 

 # Header files used by all library source files.
 #