Extra tests for fts3. And fixes for conflict-handling related problems in fts3.

FossilOrigin-Name: fb4a355871d9482ccb28b6ba03b842b3cc87b696
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index f000a22..71cb368 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3049,6 +3049,7 @@
 #  define sqlite3VtabLock(X) 
 #  define sqlite3VtabUnlock(X)
 #  define sqlite3VtabUnlockList(X)
+#  define sqlite3VtabSavepoint(X, Y, Z) SQLITE_OK
 #else
    void sqlite3VtabClear(sqlite3 *db, Table*);
    int sqlite3VtabSync(sqlite3 *db, char **);
@@ -3057,6 +3058,7 @@
    void sqlite3VtabLock(VTable *);
    void sqlite3VtabUnlock(VTable *);
    void sqlite3VtabUnlockList(sqlite3*);
+   int sqlite3VtabSavepoint(sqlite3 *, int, int);
 #  define sqlite3VtabInSync(db) ((db)->nVTrans>0 && (db)->aVTrans==0)
 #endif
 void sqlite3VtabMakeWritable(Parse*,Table*);