1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-30 19:03:16 +03:00

Merge all changes in the latest 3.8.11 beta into the sessions branch.

Changes include the rename of OTA to RBU, the WITHOUT-ROWID-OR-Skipscan fix,
and improvements to pcache1.

FossilOrigin-Name: 7f0ee77062d2fcb014942c7c62c163ccc801f21b
This commit is contained in:
drh
2015-07-23 21:59:58 +00:00
58 changed files with 1839 additions and 1747 deletions

View File

@ -115,7 +115,7 @@ foreach hdr {
sqlite3ext.h
sqlite3.h
sqlite3ext.h
sqlite3ota.h
sqlite3rbu.h
sqliteicu.h
sqliteInt.h
sqliteLimit.h
@ -191,6 +191,10 @@ proc copy_file {filename} {
copy_file tsrc/$hdr
section_comment "Continuing where we left off in $tail"
if {$linemacros} {puts $out "#line [expr {$ln+1}] \"$filename\""}
} else {
# Comment out the entire line, replacing any nested comment
# begin/end markers with the harmless substring "**".
puts $out "/* [string map [list /* ** */ **] $line] */"
}
} elseif {![info exists seen_hdr($hdr)]} {
if {![regexp {/\*\s+amalgamator:\s+dontcache\s+\*/} $line]} {
@ -375,7 +379,7 @@ foreach file {
rtree.c
icu.c
fts3_icu.c
sqlite3ota.c
sqlite3rbu.c
dbstat.c
sqlite3session.c
} {