SQLite

Changes On Branch vtab-conflict
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Changes In Branch vtab-conflict Excluding Merge-Ins

This is equivalent to a diff from ddeea5ab to 1a113359

2011-05-04
17:23
Merge vtab-conflict branch with trunk. (check-in: 8f9666af user: dan tags: trunk)
16:30
Fix a couple of compiler warnings in the FTS code. (Closed-Leaf check-in: 1a113359 user: dan tags: vtab-conflict)
15:41
Fix a performance problem in queries that use "ORDER BY rowid DESC" and one or more FTS auxiliary functions. (check-in: 95e09b20 user: dan tags: vtab-conflict)
2011-04-25
18:49
Add support for on conflict clauses to fts3/fts4. (check-in: 6d2633a6 user: dan tags: vtab-conflict)
18:01
Invoke the unix open() system call through a wrapper to avoid problems resulting from differing declarations to that function in various systems. (check-in: 4c7ff4dd user: drh tags: trunk)
2011-04-24
22:56
Disable the transfer optimization if the destination table contains any foreign key constraint and foreign key constraints are enabled. Ticket [6284df89debdf]. (check-in: ddeea5ab user: drh tags: trunk)
2011-04-22
22:55
Add the "getlock" utility for determining if a database file (on unix) is currently locked. (check-in: 0ab24b13 user: drh tags: trunk)

Changes to ext/fts3/fts3.c.

Changes to ext/fts3/fts3Int.h.

Changes to ext/fts3/fts3_snippet.c.

Added ext/fts3/fts3_term.c.

Changes to ext/fts3/fts3_write.c.

Changes to ext/rtree/rtree.c.

Changes to ext/rtree/rtree1.test.

Changes to main.mk.

Changes to src/insert.c.

Changes to src/sqlite.h.in.

Changes to src/sqliteInt.h.

Changes to src/test1.c.

Changes to src/update.c.

Changes to src/vdbe.c.

Changes to src/vdbeaux.c.

Changes to src/vtab.c.

Changes to test/fts3atoken.test.

Changes to test/fts3aux1.test.

Added test/fts3conf.test.

Added test/fts3sort.test.

Changes to test/tester.tcl.