/ Changes On Branch obsolete
Login

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

Changes In Branch obsolete Excluding Merge-Ins

This is equivalent to a diff from 2dbdfa5170 to c8ade949d4

2015-04-06
22:05
Detect and suppress an endless loops in clearDatabasePage() that might result from a corrupt database file. This is an edited cherry-pick from [30011ad2f55c] and [395bb3e677a]. (Leaf check-in: e5f5ef008d user: drh tags: apple-osx-385)
2014-08-15
22:37
Aborted merge. (Closed-Leaf check-in: c8ade949d4 user: numist tags: obsolete)
2014-06-30
19:57
Merge the latest trunk changes into the apple-osx branch. (check-in: f426876fe1 user: drh tags: apple-osx)
2014-06-05
12:53
Merge in the 3.8.5 release changes and the FTS integrity-check fix. (check-in: 2dbdfa5170 user: drh tags: apple-osx)
11:15
Fix a problem that was causing the FTS4 integrity-check command to fail if the table had one or more "notindexed" columns. (check-in: 7123bb2605 user: dan tags: trunk)
2014-05-29
20:36
Merge trunk changes into the apple-osx branch. (check-in: b9fad4490c user: drh tags: apple-osx)

Changes to Makefile.in.

Changes to config.h.in.

Changes to src/btree.c.

Changes to src/ctime.c.

Changes to src/loadext.c.

Changes to src/main.c.

Changes to src/mutex.c.

Changes to src/mutex_unix.c.

Changes to src/os_unix.c.

Changes to src/pager.c.

Changes to src/pcache1.c.

Changes to src/pragma.c.

Changes to src/shell.c.

Changes to src/sqlite.h.in.

Changes to src/sqlite3_private.h.

Changes to src/sqliteInt.h.

Changes to src/test1.c.

Changes to src/test_config.c.

Changes to src/test_intarray.c.

Changes to src/util.c.

Changes to src/vtab.c.

Changes to src/wal.c.

Changes to test/fallocate.test.

Changes to test/lock_proxy.test.

Changes to test/mutex1.test.

Changes to test/permutations.test.

Changes to test/pragma.test.

Changes to test/superlock.test.

Changes to test/walro.test.

Changes to tool/mksqlite3c.tcl.

Changes to tool/warnings.sh.