Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Merge the latest trunk changes into the apple-osx branch. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | apple-osx |
| Files: | files | file ages | folders |
| SHA1: |
59e0d4f3d9af81d0c920812a6583228f |
| User & Date: | drh 2011-12-08 21:08:53.430 |
Context
|
2012-01-03
| ||
| 21:54 | Pull all the latest trunk changes over into the apple-osx branch. (check-in: 8a048423f0 user: drh tags: apple-osx) | |
|
2011-12-08
| ||
| 21:08 | Merge the latest trunk changes into the apple-osx branch. (check-in: 59e0d4f3d9 user: drh tags: apple-osx) | |
| 20:41 | Hand merge the zone allocator for MacOS from the apple-osx branch. (check-in: 0d955c20c0 user: drh tags: trunk) | |
|
2011-10-31
| ||
| 19:59 | Fix a problem with sqlite3_backup_step() that resulted from a faulty merge. (check-in: dacdec78d0 user: drh tags: apple-osx) | |
Changes
Changes to Makefile.in.
Changes to Makefile.msc.
Changes to VERSION.
Changes to config.h.in.
Changes to configure.
Changes to configure.ac.
Changes to ext/fts3/fts3.c.
Changes to src/btree.c.
Changes to src/btreeInt.h.
Changes to src/build.c.
Changes to src/delete.c.
Changes to src/expr.c.
Changes to src/global.c.
Changes to src/insert.c.
Changes to src/main.c.
Changes to src/os.c.
Changes to src/os.h.
Changes to src/os_unix.c.
Changes to src/os_win.c.
Changes to src/pager.c.
Changes to src/pager.h.
Changes to src/parse.y.
Changes to src/pcache.c.
Changes to src/pcache.h.
Changes to src/pcache1.c.
Changes to src/pragma.c.
Changes to src/prepare.c.
Changes to src/select.c.
Changes to src/shell.c.
Changes to src/sqlite.h.in.
Changes to src/sqliteInt.h.
Changes to src/test1.c.
Changes to src/test_config.c.
Changes to src/test_init.c.
Changes to src/test_multiplex.c.
Changes to src/test_pcache.c.
Changes to src/test_vfs.c.
Changes to src/util.c.
Changes to src/vdbe.c.
Changes to src/vdbeapi.c.
Changes to src/vdbeaux.c.
Changes to src/wal.c.
Changes to src/where.c.
Changes to test/attach.test.
Changes to test/capi3d.test.
Changes to test/dbstatus.test.
Changes to test/insert4.test.
Changes to test/memsubsys1.test.
Changes to test/multiplex.test.
Changes to test/pragma.test.
Added test/shrink.test.
Changes to test/syscall.test.
Changes to test/tester.tcl.
Added test/tkt-3a77c9714e.test.
Changes to test/wal.test.
Changes to test/walpersist.test.
Added test/whereC.test.