Fossil SCM

Merge updates from trunk.

zakero 2015-03-25 21:52 skin-xekri merge

Commit df21fa23c7d04b814c81cd9c99da89b62f0b4927

Parent 87f06e88fccc9d4…

66 files changed +6 -6 +13 +1 +10 +70 +55 +13 +1 +10 +78 +55 +5 +199 -147 +50 -47 +16 -12 +2 -1 +16 -12 -1 -1 -3 -40 +71 +3 +39 +2 +8 +7 +2 -1 +3 -1 +11 -38 +1 -1 +847 -17 +1 -1 +1 +39 -14 +11 -3 +2 -2 +1 -1 +52 -25 +42 -6 +1284 -443 +69 -48 +2 -4 +28 -2 +35 -18 +2 +18 -17 +29 +66 +4 +1 +44 -53 +12 -4 +13 -5 +12 -4 +1 -1 +5 -1 +11 -17 +4 -5

~ Dockerfile ~ skins/blitz/README.md ~ skins/blitz/arrow_project.png ~ skins/blitz/css.txt ~ skins/blitz/dir.png ~ skins/blitz/file.png ~ skins/blitz/footer.txt ~ skins/blitz/fossil_100.png ~ skins/blitz/fossil_80_reversed_darkcyan.png ~ skins/blitz/fossil_80_reversed_darkcyan_text.png ~ skins/blitz/header.txt ~ skins/blitz/rss_20.png ~ skins/blitz/ticket.txt ~ skins/blitz_no_logo/README.md ~ skins/blitz_no_logo/css.txt ~ skins/blitz_no_logo/footer.txt ~ skins/blitz_no_logo/header.txt ~ skins/blitz_no_logo/ticket.txt ~ skins/default/README.md ~ skins/default/css.txt ~ skins/default/header.txt ~ skins/eagle/header.txt ~ skins/enhanced1/footer.txt ~ skins/enhanced1/header.txt - skins/etienne1/README.md - skins/etienne1/css.txt - skins/etienne1/footer.txt - skins/etienne1/header.txt ~ skins/original/css.txt ~ skins/original/footer.txt ~ skins/original/header.txt ~ src/add.c ~ src/cache.c ~ src/checkin.c ~ src/clone.c ~ src/configure.c ~ src/db.c ~ src/doc.c ~ src/import.c ~ src/info.c ~ src/json_config.c ~ src/main.c ~ src/main.mk ~ src/makemake.tcl ~ src/rebuild.c ~ src/shell.c ~ src/skins.c ~ src/sqlite3.c ~ src/sqlite3.h ~ src/style.c ~ src/th_main.c ~ src/timeline.c ~ src/wikiformat.c ~ src/xfersetup.c ~ test/fileStat.th1 ~ test/tester.tcl ~ test/th1-docs-input.txt ~ test/th1-docs.test ~ test/th1-hooks.test ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc ~ www/build.wiki ~ www/changes.wiki ~ www/mkdownload.tcl ~ www/sync.wiki

M Dockerfile

+6 -6

		--- Dockerfile
		+++ Dockerfile
		@@ -2,26 +2,26 @@
2	2	# Dockerfile for Fossil
3	3	###
4	4	FROM fedora:21
5	5
6	6	### Now install some additional parts we will need for the build
7		-RUN yum update -y && yum install -y gcc make zlib-devel openssl-devel tcl tar && yum clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
	7	+RUN yum update -y && yum install -y gcc make zlib-devel openssl-devel tar && yum clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
8	8
9	9	### If you want to build "release", change the next line accordingly.
10	10	ENV FOSSIL_INSTALL_VERSION trunk
11	11
	12	+RUN curl "http://core.tcl.tk/tcl/tarball/tcl-src.tar.gz?name=tcl-src&uuid=release" \| tar zx
	13	+RUN cd tcl-src/unix && ./configure --prefix=/usr --disable-shared --disable-threads --disable-load && make && make install
12	14	RUN curl "http://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" \| tar zx
13		-RUN cd fossil-src && ./configure --disable-lineedit --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl --with-tcl-stubs --with-tcl-private-stubs && make;
14		-RUN cp fossil-src/fossil /usr/bin && rm -rf fossil-src && chmod a+rx /usr/bin/fossil && mkdir -p /opt/fossil && chown fossil:fossil /opt/fossil
	15	+RUN cd fossil-src && ./configure --disable-lineedit --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl
	16	+RUN cd fossil-src && make && strip fossil && cp fossil /usr/bin && cd .. && rm -rf fossil-src && chmod a+rx /usr/bin/fossil && mkdir -p /opt/fossil && chown fossil:fossil /opt/fossil
15	17
16	18	### Build is done, remove modules no longer needed
17	19	RUN yum remove -y gcc make zlib-devel openssl-devel tar && yum clean all
18	20
19	21	USER fossil
20	22
21	23	ENV HOME /opt/fossil
22	24
23		-RUN fossil new --docker -A admin /opt/fossil/repository.fossil && fossil user password -R /opt/fossil/repository.fossil admin admin && fossil cache init -R /opt/fossil/repository.fossil
24		-
25	25	EXPOSE 8080
26	26
27		-CMD ["/usr/bin/fossil", "server", "/opt/fossil/repository.fossil"]
	27	+CMD ["/usr/bin/fossil", "server", "--create", "--user", "admin", "/opt/fossil/repository.fossil"]
28	28
29	29	ADDED skins/blitz/README.md
30	30	ADDED skins/blitz/arrow_project.png
31	31	ADDED skins/blitz/css.txt
32	32	ADDED skins/blitz/dir.png
33	33	ADDED skins/blitz/file.png
34	34	ADDED skins/blitz/footer.txt
35	35	ADDED skins/blitz/fossil_100.png
36	36	ADDED skins/blitz/fossil_80_reversed_darkcyan.png
37	37	ADDED skins/blitz/fossil_80_reversed_darkcyan_text.png
38	38	ADDED skins/blitz/header.txt
39	39	ADDED skins/blitz/rss_20.png
40	40	ADDED skins/blitz/ticket.txt
41	41	ADDED skins/blitz_no_logo/README.md
42	42	ADDED skins/blitz_no_logo/css.txt
43	43	ADDED skins/blitz_no_logo/footer.txt
44	44	ADDED skins/blitz_no_logo/header.txt
45	45	ADDED skins/blitz_no_logo/ticket.txt
46	46	ADDED skins/default/README.md

	--- Dockerfile
	+++ Dockerfile
	@@ -2,26 +2,26 @@
2	# Dockerfile for Fossil
3	###
4	FROM fedora:21
5
6	### Now install some additional parts we will need for the build
7	RUN yum update -y && yum install -y gcc make zlib-devel openssl-devel tcl tar && yum clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
8
9	### If you want to build "release", change the next line accordingly.
10	ENV FOSSIL_INSTALL_VERSION trunk
11


12	RUN curl "http://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" \| tar zx
13	RUN cd fossil-src && ./configure --disable-lineedit --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl --with-tcl-stubs --with-tcl-private-stubs && make;
14	RUN cp fossil-src/fossil /usr/bin && rm -rf fossil-src && chmod a+rx /usr/bin/fossil && mkdir -p /opt/fossil && chown fossil:fossil /opt/fossil
15
16	### Build is done, remove modules no longer needed
17	RUN yum remove -y gcc make zlib-devel openssl-devel tar && yum clean all
18
19	USER fossil
20
21	ENV HOME /opt/fossil
22
23	RUN fossil new --docker -A admin /opt/fossil/repository.fossil && fossil user password -R /opt/fossil/repository.fossil admin admin && fossil cache init -R /opt/fossil/repository.fossil
24
25	EXPOSE 8080
26
27	CMD ["/usr/bin/fossil", "server", "/opt/fossil/repository.fossil"]
28
29	DDED skins/blitz/README.md
30	DDED skins/blitz/arrow_project.png
31	DDED skins/blitz/css.txt
32	DDED skins/blitz/dir.png
33	DDED skins/blitz/file.png
34	DDED skins/blitz/footer.txt
35	DDED skins/blitz/fossil_100.png
36	DDED skins/blitz/fossil_80_reversed_darkcyan.png
37	DDED skins/blitz/fossil_80_reversed_darkcyan_text.png
38	DDED skins/blitz/header.txt
39	DDED skins/blitz/rss_20.png
40	DDED skins/blitz/ticket.txt
41	DDED skins/blitz_no_logo/README.md
42	DDED skins/blitz_no_logo/css.txt
43	DDED skins/blitz_no_logo/footer.txt
44	DDED skins/blitz_no_logo/header.txt
45	DDED skins/blitz_no_logo/ticket.txt
46	DDED skins/default/README.md

	--- Dockerfile
	+++ Dockerfile
	@@ -2,26 +2,26 @@
2	# Dockerfile for Fossil
3	###
4	FROM fedora:21
5
6	### Now install some additional parts we will need for the build
7	RUN yum update -y && yum install -y gcc make zlib-devel openssl-devel tar && yum clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
8
9	### If you want to build "release", change the next line accordingly.
10	ENV FOSSIL_INSTALL_VERSION trunk
11
12	RUN curl "http://core.tcl.tk/tcl/tarball/tcl-src.tar.gz?name=tcl-src&uuid=release" \| tar zx
13	RUN cd tcl-src/unix && ./configure --prefix=/usr --disable-shared --disable-threads --disable-load && make && make install
14	RUN curl "http://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" \| tar zx
15	RUN cd fossil-src && ./configure --disable-lineedit --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl
16	RUN cd fossil-src && make && strip fossil && cp fossil /usr/bin && cd .. && rm -rf fossil-src && chmod a+rx /usr/bin/fossil && mkdir -p /opt/fossil && chown fossil:fossil /opt/fossil
17
18	### Build is done, remove modules no longer needed
19	RUN yum remove -y gcc make zlib-devel openssl-devel tar && yum clean all
20
21	USER fossil
22
23	ENV HOME /opt/fossil
24


25	EXPOSE 8080
26
27	CMD ["/usr/bin/fossil", "server", "--create", "--user", "admin", "/opt/fossil/repository.fossil"]
28
29	DDED skins/blitz/README.md
30	DDED skins/blitz/arrow_project.png
31	DDED skins/blitz/css.txt
32	DDED skins/blitz/dir.png
33	DDED skins/blitz/file.png
34	DDED skins/blitz/footer.txt
35	DDED skins/blitz/fossil_100.png
36	DDED skins/blitz/fossil_80_reversed_darkcyan.png
37	DDED skins/blitz/fossil_80_reversed_darkcyan_text.png
38	DDED skins/blitz/header.txt
39	DDED skins/blitz/rss_20.png
40	DDED skins/blitz/ticket.txt
41	DDED skins/blitz_no_logo/README.md
42	DDED skins/blitz_no_logo/css.txt
43	DDED skins/blitz_no_logo/footer.txt
44	DDED skins/blitz_no_logo/header.txt
45	DDED skins/blitz_no_logo/ticket.txt
46	DDED skins/default/README.md

M skins/blitz/README.md

+13

		--- a/skins/blitz/README.md
		+++ b/skins/blitz/README.md
		@@ -0,0 +1,13 @@
	1	+## Blitz Theme
	2	+
	3	+Contributed by James Moger ([email protected])
	4	+
	5	+This theme is inspired by my own project, [Gitblit](http://gitblit.com), and offered to the Fossil project.
	6	+
	7	+This theme embeds & uses an unmodified copy of [Normalize 3.0.2](https://necolas.github.io/normalize.css/) which is distributed under an [MIT license](https://github.com/necolas/normalize.css/blob/master/LICENSE.md).
	8	+
	9	+This theme uses half of a heavily-modified version of [Skeleton](http://getskeleton.com) which is distributed under an [MIT license](https://github.com/dhg/Skeleton/blob/master/LICENSE.md). None of the responsive elements (media queries) are included at this time.
	10	+
	11	+The font used in the included Fossil logo image is [Trillium Web Light](http://www.google.com/fonts/specimen/Titillium+Web) @ 48px HTML color code #456a7a.
	12	+
	13	+The RSS feed icon is sourced from [Font-Awesome](https://fortawesome.github.io/Font-Awesome/icons) by Dave Gandy and is distributed under the [SIL OFL 1.1 ](http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL) license.

	--- a/skins/blitz/README.md
	+++ b/skins/blitz/README.md
	@@ -0,0 +1,13 @@

	--- a/skins/blitz/README.md
	+++ b/skins/blitz/README.md
	@@ -0,0 +1,13 @@
1	## Blitz Theme
2
3	Contributed by James Moger ([email protected])
4
5	This theme is inspired by my own project, [Gitblit](http://gitblit.com), and offered to the Fossil project.
6
7	This theme embeds & uses an unmodified copy of [Normalize 3.0.2](https://necolas.github.io/normalize.css/) which is distributed under an [MIT license](https://github.com/necolas/normalize.css/blob/master/LICENSE.md).
8
9	This theme uses half of a heavily-modified version of [Skeleton](http://getskeleton.com) which is distributed under an [MIT license](https://github.com/dhg/Skeleton/blob/master/LICENSE.md). None of the responsive elements (media queries) are included at this time.
10
11	The font used in the included Fossil logo image is [Trillium Web Light](http://www.google.com/fonts/specimen/Titillium+Web) @ 48px HTML color code #456a7a.
12
13	The RSS feed icon is sourced from [Font-Awesome](https://fortawesome.github.io/Font-Awesome/icons) by Dave Gandy and is distributed under the [SIL OFL 1.1 ](http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL) license.

M skins/blitz/arrow_project.png

Binary file

M skins/blitz/css.txt

		--- a/skins/blitz/css.txt
		+++ b/skins/blitz/css.txt
		@@ -0,0 +1 @@
	1	+/! normdiv.timelineDate/! norm

	--- a/skins/blitz/css.txt
	+++ b/skins/blitz/css.txt
	@@ -0,0 +1 @@

	--- a/skins/blitz/css.txt
	+++ b/skins/blitz/css.txt
	@@ -0,0 +1 @@
1	/! normdiv.timelineDate/! norm

M skins/blitz/dir.png

Binary file

M skins/blitz/file.png

Binary file

M skins/blitz/footer.txt

+10

		--- a/skins/blitz/footer.txt
		+++ b/skins/blitz/footer.txt
		@@ -0,0 +1,10 @@
	1	+ </div> <!-- end div er -->
	2	+</div> <!-- end div <div class="footer">
	3	+ ->
	4	+<footer class="footer">
	5	+ < <div class="pull-righwww.t">
	6	+ >
	7	+ <a href="https://fossil-scm.org/">Fossil $rel://fossil-scm.orgvers </div>
	8	+ This/div>
	9	+ This page was generated in about <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}] </div>
	10	+

	--- a/skins/blitz/footer.txt
	+++ b/skins/blitz/footer.txt
	@@ -0,0 +1,10 @@

	--- a/skins/blitz/footer.txt
	+++ b/skins/blitz/footer.txt
	@@ -0,0 +1,10 @@
1	</div> <!-- end div er -->
2	</div> <!-- end div <div class="footer">
3	->
4	<footer class="footer">
5	< <div class="pull-righwww.t">
6	>
7	<a href="https://fossil-scm.org/">Fossil $rel://fossil-scm.orgvers </div>
8	This/div>
9	This page was generated in about <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}] </div>
10

M skins/blitz/fossil_100.png

Binary file

M skins/blitz/fossil_80_reversed_darkcyan.png

Binary file

M skins/blitz/fossil_80_reversed_darkcyan_text.png

Binary file

M skins/blitz/header.txt

+70

		--- a/skins/blitz/header.txt
		+++ b/skins/blitz/header.txt
		@@ -0,0 +1,70 @@
	1	+<html>
	2	+ <head>
	3	+ <base href="$baseurl/$current_page" />
	4	+ <title>$<project_name>: $<title></title>
	5	+ <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="$home/timeline.rss" />
	6	+ <link rel="stylesheet" href="$stylesheet_url" type="text/css" media="sc </th1>
	7	+ </div>
	8	+ <div class='logo'>
	9	+ header">
	10	+ </th1>
	11	+ </dicontainer">
	12	+
	13	+ <div class="container" </th1>
	14	+ </dilogin pull-right">
	15	+ $current]<th1>
	16	+ n pull-right">
	17	+ html "<b>$login</b> — <a class='button' href='$home/login'>Logout</a>\n"
	18	+ e/login'>Logout</a>\n"
	19	+ html "<a class='button' href='$home/login'>Login</a>\n"
	20	+ }
	21	+ length </th1>
	22	+ <div>
	23	+g length </th1>
	24	+ </div>
	25	+ </div>
	26	+ <h1>$<project_name>
	27	+ < <h1>$<pro <[string length p jor]} {
	28	+ html "<a c }
	29	+ length </th1>
	30	+ </div>
	31	+
	32	+ iv>
	33	+
	34	+ <!-- Main Menu --> </th1>
	35	+ </divainmenu">
	36	+ <ul>
	37	+ ng length $"mainmenu">
	38	+ <ul><th1>
	39	+html "<li><a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>☰</a></li>\n"
	40	+776;</a></li>\n"
	41	+ buset once 1
	42	+ set once 1
	43	+s} $mainmenu {
	44	+ if {![if {$once && [string match $url\[/?#\]* /$current_page/]} {
	45	+ set class "active $class"
	46	+ set once 0
	47	+ }
	48	+ 0
	49	+ }
	50	+ htif {[string match /* $uhtml "<a hre}
	51	+</th1></ul>
	52	+ </nav> <!-- end div mainmenu -->
	53	+ <nav id='hbdropdihss="con html "<a class='rss' href='$home/timeline.rss'></a>;$<title></small></h1>
	54	+ </div>
	55	+
	56	+ <!-- Main Menu -->
	57	+ <div c
	58	+ <th1>
	59	+proc menulink {url name} {
	60	+ upvar current_page current
	61	+ upvar home home
	62	+ if {[string range $url 0 [string length $current]] eq "/$current"} {
	63	+ html "<li class='active'>"
	64	+ } else {
	65	+ href='$home/login'>Login</a>\n"
	66	+ }
	67	+ </th1>
	68	+ </div>
	69	+ <div class='logo'>
	70	+

	--- a/skins/blitz/header.txt
	+++ b/skins/blitz/header.txt
	@@ -0,0 +1,70 @@

	--- a/skins/blitz/header.txt
	+++ b/skins/blitz/header.txt
	@@ -0,0 +1,70 @@
1	<html>
2	<head>
3	<base href="$baseurl/$current_page" />
4	<title>$<project_name>: $<title></title>
5	<link rel="alternate" type="application/rss+xml" title="RSS Feed" href="$home/timeline.rss" />
6	<link rel="stylesheet" href="$stylesheet_url" type="text/css" media="sc </th1>
7	</div>
8	<div class='logo'>
9	header">
10	</th1>
11	</dicontainer">
12
13	<div class="container" </th1>
14	</dilogin pull-right">
15	$current]<th1>
16	n pull-right">
17	html "<b>$login</b> — <a class='button' href='$home/login'>Logout</a>\n"
18	e/login'>Logout</a>\n"
19	html "<a class='button' href='$home/login'>Login</a>\n"
20	}
21	length </th1>
22	<div>
23	g length </th1>
24	</div>
25	</div>
26	<h1>$<project_name>
27	< <h1>$<pro <[string length p jor]} {
28	html "<a c }
29	length </th1>
30	</div>
31
32	iv>
33
34	<!-- Main Menu --> </th1>
35	</divainmenu">
36	<ul>
37	ng length $"mainmenu">
38	<ul><th1>
39	html "<li><a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>☰</a></li>\n"
40	776;</a></li>\n"
41	buset once 1
42	set once 1
43	s} $mainmenu {
44	if {![if {$once && [string match $url\[/?#\]* /$current_page/]} {
45	set class "active $class"
46	set once 0
47	}
48	0
49	}
50	htif {[string match /* $uhtml "<a hre}
51	</th1></ul>
52	</nav> <!-- end div mainmenu -->
53	<nav id='hbdropdihss="con html "<a class='rss' href='$home/timeline.rss'></a>;$<title></small></h1>
54	</div>
55
56	<!-- Main Menu -->
57	<div c
58	<th1>
59	proc menulink {url name} {
60	upvar current_page current
61	upvar home home
62	if {[string range $url 0 [string length $current]] eq "/$current"} {
63	html "<li class='active'>"
64	} else {
65	href='$home/login'>Login</a>\n"
66	}
67	</th1>
68	</div>
69	<div class='logo'>
70

M skins/blitz/rss_20.png

Binary file

M skins/blitz/ticket.txt

+55

		--- a/skins/blitz/ticket.txt
		+++ b/skins/blitz/ticket.txt
		@@ -0,0 +1,55 @@
	1	+<h4>$<title></h <h4>$<title></h4>
	2	+<table class="tktDsp">
	3	+<tr><td class="tktDspLabel">Ticket UUID</td>le class="tktDsp">
	4	+<tr><<h4>$<title></h4>
	5	+<table class="tktDsp">
	6	+<tr><td class="tktDspLabel">Ticket Hash</td>
	7	+<th1>
	8	+if {[info exists tkt_uuid]} {
	9	+ if {[hascap s]} {
	10	+ html "<td class='tktDspValue' colspan='3'>$tkt_uuid "
	11	+ html "($tkt_id)</td></tr>\n"
	12	+ } else {
	13	+ html "<td class='tktDspValue' colspan='3'>$tkt_uuid</td></tr>\n"
	14	+ }
	15	+} else {
	16	+ if {[hascap s]} {
	17	+ html "<td class='tktDspValue' colspan='3'>Deleted "
	18	+ html "(0)</td></tr>\n"
	19	+ } else {
	20	+ html "<td class='tktDspValue' colspan='3'>Deleted</td></tr>\n"
	21	+ }
	22	+}
	23	+</th1>
	24	+<tr><td class="tktDspLabel">Status</td><td class="tktDspValue">
	25	+$<status>
	26	+</td>
	27	+<td class="tktDspLabel">Type</td><td class="tktDspValue">
	28	+$<type>
	29	+</td></tr>
	30	+<tr><td class="tktDspLabel">Severity</td><td class="tktDspValue">
	31	+$<severity>
	32	+</td>
	33	+<td class="tktDspLabel">Priority</td><td class="tktDspValue">
	34	+$<priority>
	35	+</td></tr>
	36	+<tr><td class="tktDs4>
	37	+<table class="tktDsp">
	38	+<tr><td class="tktDspLabel">Ticket UUID</td>le class="tktDsp">
	39	+<tr><<h4>$<title></h4>
	40	+<table class="tktDsp">
	41	+<tr><td class="tktDspLabel">Ticket Hash</td>
	42	+<th1>
	43	+if {[info exists tkt_uuid]} {
	44	+ if {[hascap s]} {
	45	+ html "<td class='tktDspValue' colspan='3'>$tkt_uuid "
	46	+ html "($tkt_id)</td></tr>\n"
	47	+ } else {
	48	+ html "<td class='tktDspValue' colspan='3'>$tkt_uuid</td></tr>\n"
	49	+ }
	50	+} else {
	51	+ if {[hascap s]} {
	52	+ html "<td class='tktDspValue' colspan='3'>Deleted "
	53	+ html "(0)</td></tr>\n"
	54	+ } else {
	55	+ html "<td class='tktDspValue' colspan='3'>Deleted</td><

	--- a/skins/blitz/ticket.txt
	+++ b/skins/blitz/ticket.txt
	@@ -0,0 +1,55 @@

	--- a/skins/blitz/ticket.txt
	+++ b/skins/blitz/ticket.txt
	@@ -0,0 +1,55 @@
1	<h4>$<title></h <h4>$<title></h4>
2	<table class="tktDsp">
3	<tr><td class="tktDspLabel">Ticket UUID</td>le class="tktDsp">
4	<tr><<h4>$<title></h4>
5	<table class="tktDsp">
6	<tr><td class="tktDspLabel">Ticket Hash</td>
7	<th1>
8	if {[info exists tkt_uuid]} {
9	if {[hascap s]} {
10	html "<td class='tktDspValue' colspan='3'>$tkt_uuid "
11	html "($tkt_id)</td></tr>\n"
12	} else {
13	html "<td class='tktDspValue' colspan='3'>$tkt_uuid</td></tr>\n"
14	}
15	} else {
16	if {[hascap s]} {
17	html "<td class='tktDspValue' colspan='3'>Deleted "
18	html "(0)</td></tr>\n"
19	} else {
20	html "<td class='tktDspValue' colspan='3'>Deleted</td></tr>\n"
21	}
22	}
23	</th1>
24	<tr><td class="tktDspLabel">Status</td><td class="tktDspValue">
25	$<status>
26	</td>
27	<td class="tktDspLabel">Type</td><td class="tktDspValue">
28	$<type>
29	</td></tr>
30	<tr><td class="tktDspLabel">Severity</td><td class="tktDspValue">
31	$<severity>
32	</td>
33	<td class="tktDspLabel">Priority</td><td class="tktDspValue">
34	$<priority>
35	</td></tr>
36	<tr><td class="tktDs4>
37	<table class="tktDsp">
38	<tr><td class="tktDspLabel">Ticket UUID</td>le class="tktDsp">
39	<tr><<h4>$<title></h4>
40	<table class="tktDsp">
41	<tr><td class="tktDspLabel">Ticket Hash</td>
42	<th1>
43	if {[info exists tkt_uuid]} {
44	if {[hascap s]} {
45	html "<td class='tktDspValue' colspan='3'>$tkt_uuid "
46	html "($tkt_id)</td></tr>\n"
47	} else {
48	html "<td class='tktDspValue' colspan='3'>$tkt_uuid</td></tr>\n"
49	}
50	} else {
51	if {[hascap s]} {
52	html "<td class='tktDspValue' colspan='3'>Deleted "
53	html "(0)</td></tr>\n"
54	} else {
55	html "<td class='tktDspValue' colspan='3'>Deleted</td><

M skins/blitz_no_logo/README.md

+13

		--- a/skins/blitz_no_logo/README.md
		+++ b/skins/blitz_no_logo/README.md
		@@ -0,0 +1,13 @@
	1	+## Blitz Theme (no logo)
	2	+
	3	+Contributed by James Moger ([email protected])
	4	+
	5	+This theme is inspired by my own project, [Gitblit](http://gitblit.com), and offered to the Fossil project.
	6	+
	7	+This theme embeds & uses an unmodified copy of [Normalize 3.0.2](https://necolas.github.io/normalize.css/) which is distributed under an [MIT license](https://github.com/necolas/normalize.css/blob/master/LICENSE.md).
	8	+
	9	+This theme uses half of a heavily-modified version of [Skeleton](http://getskeleton.com) which is distributed under an [MIT license](https://github.com/dhg/Skeleton/blob/master/LICENSE.md). None of the responsive elements (media queries) are included at this time.
	10	+
	11	+The font used in the included Fossil logo image is [Trillium Web Light](http://www.google.com/fonts/specimen/Titillium+Web) @ 48px HTML color code #456a7a.
	12	+
	13	+The RSS feed icon is sourced from [Font-Awesome](https://fortawesome.github.io/Font-Awesome/icons) by Dave Gandy and is distributed under the [SIL OFL 1.1 ](http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL) license.

	--- a/skins/blitz_no_logo/README.md
	+++ b/skins/blitz_no_logo/README.md
	@@ -0,0 +1,13 @@

	--- a/skins/blitz_no_logo/README.md
	+++ b/skins/blitz_no_logo/README.md
	@@ -0,0 +1,13 @@
1	## Blitz Theme (no logo)
2
3	Contributed by James Moger ([email protected])
4
5	This theme is inspired by my own project, [Gitblit](http://gitblit.com), and offered to the Fossil project.
6
7	This theme embeds & uses an unmodified copy of [Normalize 3.0.2](https://necolas.github.io/normalize.css/) which is distributed under an [MIT license](https://github.com/necolas/normalize.css/blob/master/LICENSE.md).
8
9	This theme uses half of a heavily-modified version of [Skeleton](http://getskeleton.com) which is distributed under an [MIT license](https://github.com/dhg/Skeleton/blob/master/LICENSE.md). None of the responsive elements (media queries) are included at this time.
10
11	The font used in the included Fossil logo image is [Trillium Web Light](http://www.google.com/fonts/specimen/Titillium+Web) @ 48px HTML color code #456a7a.
12
13	The RSS feed icon is sourced from [Font-Awesome](https://fortawesome.github.io/Font-Awesome/icons) by Dave Gandy and is distributed under the [SIL OFL 1.1 ](http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL) license.

M skins/blitz_no_logo/css.txt

		--- a/skins/blitz_no_logo/css.txt
		+++ b/skins/blitz_no_logo/css.txt
		@@ -0,0 +1 @@
	1	+display:display:

	--- a/skins/blitz_no_logo/css.txt
	+++ b/skins/blitz_no_logo/css.txt
	@@ -0,0 +1 @@

	--- a/skins/blitz_no_logo/css.txt
	+++ b/skins/blitz_no_logo/css.txt
	@@ -0,0 +1 @@
1	display:display:

M skins/blitz_no_logo/footer.txt

+10

		--- a/skins/blitz_no_logo/footer.txt
		+++ b/skins/blitz_no_logo/footer.txt
		@@ -0,0 +1,10 @@
	1	+ </div> <!-- end div er -->
	2	+</div> <!-- end div <div class="footer">
	3	+ ->
	4	+<footer class="footer">
	5	+ < <div class="pull-righwww.t">
	6	+ >
	7	+ <a href="https://fossil-scm.org/">Fossil $rel://fossil-scm.orgvers </div>
	8	+ This/div>
	9	+ This page was generated in about <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}] </div>
	10	+

	--- a/skins/blitz_no_logo/footer.txt
	+++ b/skins/blitz_no_logo/footer.txt
	@@ -0,0 +1,10 @@

	--- a/skins/blitz_no_logo/footer.txt
	+++ b/skins/blitz_no_logo/footer.txt
	@@ -0,0 +1,10 @@
1	</div> <!-- end div er -->
2	</div> <!-- end div <div class="footer">
3	->
4	<footer class="footer">
5	< <div class="pull-righwww.t">
6	>
7	<a href="https://fossil-scm.org/">Fossil $rel://fossil-scm.orgvers </div>
8	This/div>
9	This page was generated in about <th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}] </div>
10

M skins/blitz_no_logo/header.txt

+78

		--- a/skins/blitz_no_logo/header.txt
		+++ b/skins/blitz_no_logo/header.txt
		@@ -0,0 +1,78 @@
	1	+<html>
	2	+ <head>
	3	+ <base href="$baseurl/$current_page" />
	4	+ <title>$<project_name>: $<title></title>
	5	+ <link rel="alternate" type="application/rss+xml" title="RSS Feed" href="$home/timeline.rss" />
	6	+ <link rel="stylesheet" href="$stylesheet_url" type="text/css" media="scr
	7	+ <div class="coheader">
	8	+ <div class="cocontainer">
	9	+
	10	+ <div class=" <th1>
	11	+ if {[info html "<b>$login</b> — <a class='button' href='$home/login'>Logout</a>\n"
	12	+ } else {
	13	+ \n"
	14	+ } else {
	15	+ html "<a class='button' href='$home/l }
	16	+nr]} {
	17	+ </th1>
	18	+ </div>
	19	+t</a>\n"<div class='title'>
	20	+
	21	+ <div class='title'>
	22	+ <th1>
	23	+ if {[anycap jor]} {
	24	+ \n"
	25	+ } else { {
	26	+ html }
	27	+nr]} {
	28	+ </th1>
	29	+ </a>"
	30	+ }
	31	+ </div>
	32	+
	33	+ ></small></h1>
	34	+ </div>
	35	+
	36	+ <div class="comainmenu">
	37	+ <ul>
	38	+ "mainmenu">
	39	+ <ul>
	40	+ <th1>
	41	+proc menulink {url name} {
	42	+ upvar current_page current
	43	+ upvar home home
	44	+ if {[string range $url 0 [string length $current]] eq "/$current"} {
	45	+ html "<li class='active'>"
	46	+ } else {
	47	+ html "<li>"$url'>$name</a></li>\n"
	48	+}
	49	+</th1></ul>
	50	+ </div> <!-- end dijoes
	51	+}
	52	+if {[hascap o]}div> <!-- end div container -->
	53	+ </div> <!-- end div header -->
	54	+ <div class="middle max-full-width">
	55	+ <div class="container">
	56	+menulink $index_page Home
	57	+if {[anycap hascap rlink /timeline Ticihascap es
	58	+}
	59	+if {[hascap o]} {
	60	+ menulink /brlist Branches
	61	+ menulink /taglist Tags
	62	+}
	63	+if {[anycap 23456] \|\| [anoncap 2] \|\| [anoncap 3]} {
	64	+ menulink /forum Forum
	65	+}
	66	+if {[anycap nr]} {
	67	+ menulink /ticket Tickets
	68	+}
	69	+if {[hascap j]} {
	70	+ menulink /wiki Wiki
	71	+}
	72	+if {[hascap o]} {
	73	+ menulink /help Help
	74	+ }
	75	+if {[hascap s]} {
	76	+ menulink /setup Admin
	77	+} elseif {[hascap a]} {
	78	+ menulink /setup_ulist User

	--- a/skins/blitz_no_logo/header.txt
	+++ b/skins/blitz_no_logo/header.txt
	@@ -0,0 +1,78 @@

	--- a/skins/blitz_no_logo/header.txt
	+++ b/skins/blitz_no_logo/header.txt
	@@ -0,0 +1,78 @@
1	<html>
2	<head>
3	<base href="$baseurl/$current_page" />
4	<title>$<project_name>: $<title></title>
5	<link rel="alternate" type="application/rss+xml" title="RSS Feed" href="$home/timeline.rss" />
6	<link rel="stylesheet" href="$stylesheet_url" type="text/css" media="scr
7	<div class="coheader">
8	<div class="cocontainer">
9
10	<div class=" <th1>
11	if {[info html "<b>$login</b> — <a class='button' href='$home/login'>Logout</a>\n"
12	} else {
13	\n"
14	} else {
15	html "<a class='button' href='$home/l }
16	nr]} {
17	</th1>
18	</div>
19	t</a>\n"<div class='title'>
20
21	<div class='title'>
22	<th1>
23	if {[anycap jor]} {
24	\n"
25	} else { {
26	html }
27	nr]} {
28	</th1>
29	</a>"
30	}
31	</div>
32
33	></small></h1>
34	</div>
35
36	<div class="comainmenu">
37	<ul>
38	"mainmenu">
39	<ul>
40	<th1>
41	proc menulink {url name} {
42	upvar current_page current
43	upvar home home
44	if {[string range $url 0 [string length $current]] eq "/$current"} {
45	html "<li class='active'>"
46	} else {
47	html "<li>"$url'>$name</a></li>\n"
48	}
49	</th1></ul>
50	</div> <!-- end dijoes
51	}
52	if {[hascap o]}div> <!-- end div container -->
53	</div> <!-- end div header -->
54	<div class="middle max-full-width">
55	<div class="container">
56	menulink $index_page Home
57	if {[anycap hascap rlink /timeline Ticihascap es
58	}
59	if {[hascap o]} {
60	menulink /brlist Branches
61	menulink /taglist Tags
62	}
63	if {[anycap 23456] \|\| [anoncap 2] \|\| [anoncap 3]} {
64	menulink /forum Forum
65	}
66	if {[anycap nr]} {
67	menulink /ticket Tickets
68	}
69	if {[hascap j]} {
70	menulink /wiki Wiki
71	}
72	if {[hascap o]} {
73	menulink /help Help
74	}
75	if {[hascap s]} {
76	menulink /setup Admin
77	} elseif {[hascap a]} {
78	menulink /setup_ulist User

M skins/blitz_no_logo/ticket.txt

+55

		--- a/skins/blitz_no_logo/ticket.txt
		+++ b/skins/blitz_no_logo/ticket.txt
		@@ -0,0 +1,55 @@
	1	+<h4>$<title></h <h4>$<title></h4>
	2	+<table class="tktDsp">
	3	+<tr><td class="tktDspLabel">Ticket UUID</td>le class="tktDsp">
	4	+<tr><<h4>$<title></h4>
	5	+<table class="tktDsp">
	6	+<tr><td class="tktDspLabel">Ticket Hash</td>
	7	+<th1>
	8	+if {[info exists tkt_uuid]} {
	9	+ if {[hascap s]} {
	10	+ html "<td class='tktDspValue' colspan='3'>$tkt_uuid "
	11	+ html "($tkt_id)</td></tr>\n"
	12	+ } else {
	13	+ html "<td class='tktDspValue' colspan='3'>$tkt_uuid</td></tr>\n"
	14	+ }
	15	+} else {
	16	+ if {[hascap s]} {
	17	+ html "<td class='tktDspValue' colspan='3'>Deleted "
	18	+ html "(0)</td></tr>\n"
	19	+ } else {
	20	+ html "<td class='tktDspValue' colspan='3'>Deleted</td></tr>\n"
	21	+ }
	22	+}
	23	+</th1>
	24	+<tr><td class="tktDspLabel">Status</td><td class="tktDspValue">
	25	+$<status>
	26	+</td>
	27	+<td class="tktDspLabel">Type</td><td class="tktDspValue">
	28	+$<type>
	29	+</td></tr>
	30	+<tr><td class="tktDspLabel">Severity</td><td class="tktDspValue">
	31	+$<severity>
	32	+</td>
	33	+<td class="tktDspLabel">Priority</td><td class="tktDspValue">
	34	+$<priority>
	35	+</td></tr>
	36	+<tr><td class="tktDs4>
	37	+<table class="tktDsp">
	38	+<tr><td class="tktDspLabel">Ticket UUID</td>le class="tktDsp">
	39	+<tr><<h4>$<title></h4>
	40	+<table class="tktDsp">
	41	+<tr><td class="tktDspLabel">Ticket Hash</td>
	42	+<th1>
	43	+if {[info exists tkt_uuid]} {
	44	+ if {[hascap s]} {
	45	+ html "<td class='tktDspValue' colspan='3'>$tkt_uuid "
	46	+ html "($tkt_id)</td></tr>\n"
	47	+ } else {
	48	+ html "<td class='tktDspValue' colspan='3'>$tkt_uuid</td></tr>\n"
	49	+ }
	50	+} else {
	51	+ if {[hascap s]} {
	52	+ html "<td class='tktDspValue' colspan='3'>Deleted "
	53	+ html "(0)</td></tr>\n"
	54	+ } else {
	55	+ html "<td class='tktDspValue' colspan='3'>Deleted</td><

	--- a/skins/blitz_no_logo/ticket.txt
	+++ b/skins/blitz_no_logo/ticket.txt
	@@ -0,0 +1,55 @@

	--- a/skins/blitz_no_logo/ticket.txt
	+++ b/skins/blitz_no_logo/ticket.txt
	@@ -0,0 +1,55 @@
1	<h4>$<title></h <h4>$<title></h4>
2	<table class="tktDsp">
3	<tr><td class="tktDspLabel">Ticket UUID</td>le class="tktDsp">
4	<tr><<h4>$<title></h4>
5	<table class="tktDsp">
6	<tr><td class="tktDspLabel">Ticket Hash</td>
7	<th1>
8	if {[info exists tkt_uuid]} {
9	if {[hascap s]} {
10	html "<td class='tktDspValue' colspan='3'>$tkt_uuid "
11	html "($tkt_id)</td></tr>\n"
12	} else {
13	html "<td class='tktDspValue' colspan='3'>$tkt_uuid</td></tr>\n"
14	}
15	} else {
16	if {[hascap s]} {
17	html "<td class='tktDspValue' colspan='3'>Deleted "
18	html "(0)</td></tr>\n"
19	} else {
20	html "<td class='tktDspValue' colspan='3'>Deleted</td></tr>\n"
21	}
22	}
23	</th1>
24	<tr><td class="tktDspLabel">Status</td><td class="tktDspValue">
25	$<status>
26	</td>
27	<td class="tktDspLabel">Type</td><td class="tktDspValue">
28	$<type>
29	</td></tr>
30	<tr><td class="tktDspLabel">Severity</td><td class="tktDspValue">
31	$<severity>
32	</td>
33	<td class="tktDspLabel">Priority</td><td class="tktDspValue">
34	$<priority>
35	</td></tr>
36	<tr><td class="tktDs4>
37	<table class="tktDsp">
38	<tr><td class="tktDspLabel">Ticket UUID</td>le class="tktDsp">
39	<tr><<h4>$<title></h4>
40	<table class="tktDsp">
41	<tr><td class="tktDspLabel">Ticket Hash</td>
42	<th1>
43	if {[info exists tkt_uuid]} {
44	if {[hascap s]} {
45	html "<td class='tktDspValue' colspan='3'>$tkt_uuid "
46	html "($tkt_id)</td></tr>\n"
47	} else {
48	html "<td class='tktDspValue' colspan='3'>$tkt_uuid</td></tr>\n"
49	}
50	} else {
51	if {[hascap s]} {
52	html "<td class='tktDspValue' colspan='3'>Deleted "
53	html "(0)</td></tr>\n"
54	} else {
55	html "<td class='tktDspValue' colspan='3'>Deleted</td><

M skins/default/README.md

		--- a/skins/default/README.md
		+++ b/skins/default/README.md
		@@ -0,0 +1,5 @@
	1	+This skin was contributed by Étienne Deparis.
	2	+
	3	+On 2015-03-14 this skin was promoted from an option to the default, which
	4	+involved moving it from its original home in the skins/etienne1 directory
	5	+into skins/default.

	--- a/skins/default/README.md
	+++ b/skins/default/README.md
	@@ -0,0 +1,5 @@

	--- a/skins/default/README.md
	+++ b/skins/default/README.md
	@@ -0,0 +1,5 @@
1	This skin was contributed by Étienne Deparis.
2
3	On 2015-03-14 this skin was promoted from an option to the default, which
4	involved moving it from its original home in the skins/etienne1 directory
5	into skins/default.

M skins/default/css.txt

+199 -147

		--- skins/default/css.txt
		+++ skins/default/css.txt
		@@ -1,148 +1,200 @@
1		-/* General settings for the entire page */
2		-body {
3		- margin: 0ex 1ex;
4		- padding: 0px;
5		- background-color: white;
6		- font-family: sans-serif;
7		- -moz-text-size-adjust: none;
8		- -webkit-text-size-adjust: none;
9		- -mx-text-size-adjust: none;
10		-}
11		-
12		-/* The project logo in the upper left-hand corner of each page */
13		-div.logo {
14		- display: table-cell;
15		- text-align: center;
16		- vertical-align: bottom;
17		- font-weight: bold;
18		- color: #558195;
19		- min-width: 200px;
20		- white-space: nowrap;
21		-}
22		-
23		-/* The page title centered at the top of each page */
24		-div.title {
25		- display: table-cell;
26		- font-size: 2em;
27		- font-weight: bold;
28		- text-align: center;
29		- padding: 0 0 0 1em;
30		- color: #558195;
31		- vertical-align: bottom;
32		- width: 100%;
33		-}
34		-
35		-/* The login status message in the top right-hand corner */
36		-div.status {
37		- display: table-cell;
38		- text-align: right;
39		- vertical-align: bottom;
40		- color: #558195;
41		- font-size: 0.8em;
42		- font-weight: bold;
43		- min-width: 200px;
44		- white-space: nowrap;
45		-}
46		-
47		-/* The header across the top of the page */
48		-div.header {
49		- display: table;
50		- width: 100%;
51		-}
52		-
53		-/* The main menu bar that appears at the top of the page beneath
54		-** the header */
55		-div.mainmenu {
56		- padding: 5px 10px 5px 10px;
57		- font-size: 0.9em;
58		- font-weight: bold;
59		- text-align: center;
60		- letter-spacing: 1px;
61		- background-color: #558195;
62		- border-top-left-radius: 8px;
63		- border-top-right-radius: 8px;
64		- color: white;
65		-}
66		-
67		-/* The submenu bar that sometimes appears below the main menu */
68		-div.submenu, div.sectionmenu {
69		- padding: 3px 10px 3px 0px;
70		- font-size: 0.9em;
71		- text-align: center;
72		- background-color: #456878;
73		- color: white;
74		-}
75		-div.mainmenu a, div.mainmenu a:visited, div.submenu a, div.submenu a:visited,
76		-div.sectionmenu>a.button:link, div.sectionmenu>a.button:visited {
77		- padding: 3px 10px 3px 10px;
78		- color: white;
79		- text-decoration: none;
80		-}
81		-div.mainmenu a:hover, div.submenu a:hover, div.sectionmenu>a.button:hover {
82		- color: #558195;
83		- background-color: white;
84		-}
85		-
86		-/* All page content from the bottom of the menu or submenu down to
87		-** the footer */
88		-div.content {
89		- padding: 0ex 1ex 1ex 1ex;
90		- border: solid #aaa;
91		- border-width: 1px;
92		-}
93		-
94		-/* Some pages have section dividers */
95		-div.section {
96		- margin-bottom: 0px;
97		- margin-top: 1em;
98		- padding: 1px 1px 1px 1px;
99		- font-size: 1.2em;
100		- font-weight: bold;
101		- background-color: #558195;
102		- color: white;
103		- white-space: nowrap;
104		-}
105		-
106		-/* The "Date" that occurs on the left hand side of timelines */
107		-div.divider {
108		- background: #a1c4d4;
109		- border: 2px #558195 solid;
110		- font-size: 1em; font-weight: normal;
111		- padding: .25em;
112		- margin: .2em 0 .2em 0;
113		- float: left;
114		- clear: left;
115		- white-space: nowrap;
116		-}
117		-
118		-/* The footer at the very bottom of the page */
119		-div.footer {
120		- clear: both;
121		- font-size: 0.8em;
122		- padding: 5px 10px 5px 10px;
123		- text-align: right;
124		- background-color: #558195;
125		- border-bottom-left-radius: 8px;
126		- border-bottom-right-radius: 8px;
127		- color: white;
128		-}
129		-
130		-/* Hyperlink colors in the footer */
131		-div.footer a { color: white; }
132		-div.footer a:link { color: white; }
133		-div.footer a:visited { color: white; }
134		-div.footer a:hover { background-color: white; color: #558195; }
135		-
136		-/* verbatim blocks */
137		-pre.verbatim {
138		- background-color: #f5f5f5;
139		- padding: 0.5em;
140		- white-space: pre-wrap;
141		-}
142		-
143		-/* The label/value pairs on (for example) the ci page */
144		-table.label-value th {
145		- vertical-align: top;
146		- text-align: right;
147		- padding: 0.2ex 2ex;
	1	+body {
	2	+ margin: 0 auto;
	3	+ min-width: 800px;
	4	+ padding: 0px 20px;
	5	+ background-color: white;
	6	+ font-family: sans-serif;
	7	+ font-size:14pt;
	8	+ -moz-text-size-adjust: none;
	9	+ -webkit-text-size-adjust: none;
	10	+ -mx-text-size-adjust: none;
	11	+}
	12	+
	13	+a {
	14	+ color: #4183C4;
	15	+ text-decoration: none;
	16	+}
	17	+a:hover {
	18	+ color: #4183C4;
	19	+ text-decoration: underline;
	20	+}
	21	+
	22	+hr {
	23	+ color: #eee;
	24	+}
	25	+
	26	+.title {
	27	+ color: #4183C4;
	28	+ float:left;
	29	+ padding-top: 30px;
	30	+ padding-bottom: 10px;
	31	+}
	32	+.title h1 {
	33	+ display:inline;
	34	+}
	35	+.title h1:after {
	36	+ content: " / ";
	37	+ color: #777;
	38	+ font-weight: normal;
	39	+}
	40	+
	41	+.content h1 {
	42	+ font-size: 1.25em;
	43	+}
	44	+.content h2 {
	45	+ font-size: 1.15em;
	46	+}
	47	+.content h2 {
	48	+ font-size: 1.05em;
	49	+ font-weight: bold;
	50	+}
	51	+
	52	+.section {
	53	+ font-size: 1em;
	54	+ font-weight: bold;
	55	+ background-color: #f5f5f5;
	56	+ border: 1px solid #d8d8d8;
	57	+ border-radius: 3px 3px 0 0;
	58	+ padding: 9px 10px 10px;
	59	+ margin: 10px 0;
	60	+}
	61	+
	62	+.sectionmenu {
	63	+ border: 1px solid #d8d8d8;
	64	+ border-radius: 0 0 3px 3px;
	65	+ border-top: 0;
	66	+ margin-top: -10px;
	67	+ margin-bottom: 10px;
	68	+ padding: 10px;
	69	+}
	70	+.sectionmenu a {
	71	+ display: inline-block;
	72	+ margin-right: 1em;
	73	+}
	74	+
	75	+.status {
	76	+ float:right;
	77	+ font-size:.7em;
	78	+ padding-top:50px;
	79	+}
	80	+
	81	+.mainmenu {
	82	+ font-size:.8em;
	83	+ clear:both;
	84	+ padding:10px;
	85	+ background:#eaeaea linear-gradient(#fafafa, #eaeaea) repeat-x;
	86	+ border:1px solid #eaeaea;
	87	+ border-radius:5px;
	88	+}
	89	+
	90	+.mainmenu a {
	91	+ padding: 10px 20px;
	92	+ text-decoration:none;
	93	+ color: #777;
	94	+ border-right:1px solid #eaeaea;
	95	+}
	96	+.mainmenu a.active,
	97	+.mainmenu a:hover {
	98	+ color: #000;
	99	+ border-bottom:2px solid #D26911;
	100	+}
	101	+
	102	+.submenu {
	103	+ font-size: .7em;
	104	+ margin-top: 10px;
	105	+ padding: 10px;
	106	+ border-bottom: 1px solid #ccc;
	107	+}
	108	+
	109	+.submenu a {
	110	+ padding: 10px 11px;
	111	+ text-decoration:none;
	112	+ color: #777;
	113	+}
	114	+
	115	+.submenu a:hover {
	116	+ padding: 6px 10px;
	117	+ border: 1px solid #ccc;
	118	+ border-radius: 5px;
	119	+ color: #000;
	120	+}
	121	+
	122	+.content {
	123	+ padding-top: 10px;
	124	+ font-size:.8em;
	125	+ color: #444;
	126	+}
	127	+
	128	+.udiff, .sbsdiff {
	129	+ font-size: .85em !important;
	130	+ overflow: auto;
	131	+ border: 1px solid #ccc;
	132	+ border-radius: 5px;
	133	+}
	134	+.content blockquote {
	135	+ padding: 0 15px;
	136	+}
	137	+
	138	+table.report {
	139	+ cursor: auto;
	140	+ border-radius: 5px;
	141	+ border: 1px solid #ccc;
	142	+ margin: 1em 0;
	143	+}
	144	+.report td, .report th {
	145	+ border: 0;
	146	+ font-size: .8em;
	147	+ padding: 10px;
	148	+}
	149	+.report td:first-child {
	150	+ border-top-left-radius: 5px;
	151	+}
	152	+.report tbody tr:last-child td:first-child {
	153	+ border-bottom-left-radius: 5px;
	154	+}
	155	+.report td:last-child {
	156	+ border-top-right-radius: 5px;
	157	+}
	158	+.report tbody tr:last-child {
	159	+ border-bottom-left-radius: 5px;
	160	+ border-bottom-right-radius: 5px;
	161	+}
	162	+.report tbody tr:last-child td:last-child {
	163	+ border-bottom-right-radius: 5px;
	164	+}
	165	+.report th {
	166	+ cursor: pointer;
	167	+}
	168	+.report thead+tbody tr:hover {
	169	+ background-color: #f5f9fc !important;
	170	+}
	171	+
	172	+td.tktDspLabel {
	173	+ width: 70px;
	174	+ text-align: right;
	175	+ overflow: hidden;
	176	+}
	177	+td.tktDspValue {
	178	+ text-align: left;
	179	+ vertical-align: top;
	180	+ background-color: #f8f8f8;
	181	+ border: 1px solid #ccc;
	182	+}
	183	+td.tktDspValue pre {
	184	+ white-space: pre-wrap;
	185	+}
	186	+
	187	+.footer {
	188	+ border-top: 1px solid #ccc;
	189	+ padding: 10px;
	190	+ font-size:.7em;
	191	+ margin-top: 10px;
	192	+ color: #ccc;
	193	+}
	194	+div.timelineDate {
	195	+ font-weight: bold;
	196	+ white-space: nowrap;
	197	+}
	198	+span.submenuctrl, span.submenuctrl input, select.submenuctrl {
	199	+ color: #777;
148	200	}
149	201

	--- skins/default/css.txt
	+++ skins/default/css.txt
	@@ -1,148 +1,200 @@
1	/* General settings for the entire page */
2	body {
3	margin: 0ex 1ex;
4	padding: 0px;
5	background-color: white;
6	font-family: sans-serif;
7	-moz-text-size-adjust: none;
8	-webkit-text-size-adjust: none;
9	-mx-text-size-adjust: none;
10	}
11
12	/* The project logo in the upper left-hand corner of each page */
13	div.logo {
14	display: table-cell;
15	text-align: center;
16	vertical-align: bottom;
17	font-weight: bold;
18	color: #558195;
19	min-width: 200px;
20	white-space: nowrap;
21	}
22
23	/* The page title centered at the top of each page */
24	div.title {
25	display: table-cell;
26	font-size: 2em;
27	font-weight: bold;
28	text-align: center;
29	padding: 0 0 0 1em;
30	color: #558195;
31	vertical-align: bottom;
32	width: 100%;
33	}
34
35	/* The login status message in the top right-hand corner */
36	div.status {
37	display: table-cell;
38	text-align: right;
39	vertical-align: bottom;
40	color: #558195;
41	font-size: 0.8em;
42	font-weight: bold;
43	min-width: 200px;
44	white-space: nowrap;
45	}
46
47	/* The header across the top of the page */
48	div.header {
49	display: table;
50	width: 100%;
51	}
52
53	/* The main menu bar that appears at the top of the page beneath
54	** the header */
55	div.mainmenu {
56	padding: 5px 10px 5px 10px;
57	font-size: 0.9em;
58	font-weight: bold;
59	text-align: center;
60	letter-spacing: 1px;
61	background-color: #558195;
62	border-top-left-radius: 8px;
63	border-top-right-radius: 8px;
64	color: white;
65	}
66
67	/* The submenu bar that sometimes appears below the main menu */
68	div.submenu, div.sectionmenu {
69	padding: 3px 10px 3px 0px;
70	font-size: 0.9em;
71	text-align: center;
72	background-color: #456878;
73	color: white;
74	}
75	div.mainmenu a, div.mainmenu a:visited, div.submenu a, div.submenu a:visited,
76	div.sectionmenu>a.button:link, div.sectionmenu>a.button:visited {
77	padding: 3px 10px 3px 10px;
78	color: white;
79	text-decoration: none;
80	}
81	div.mainmenu a:hover, div.submenu a:hover, div.sectionmenu>a.button:hover {
82	color: #558195;
83	background-color: white;
84	}
85
86	/* All page content from the bottom of the menu or submenu down to
87	** the footer */
88	div.content {
89	padding: 0ex 1ex 1ex 1ex;
90	border: solid #aaa;
91	border-width: 1px;
92	}
93
94	/* Some pages have section dividers */
95	div.section {
96	margin-bottom: 0px;
97	margin-top: 1em;
98	padding: 1px 1px 1px 1px;
99	font-size: 1.2em;
100	font-weight: bold;
101	background-color: #558195;
102	color: white;
103	white-space: nowrap;
104	}
105
106	/* The "Date" that occurs on the left hand side of timelines */
107	div.divider {
108	background: #a1c4d4;
109	border: 2px #558195 solid;
110	font-size: 1em; font-weight: normal;
111	padding: .25em;
112	margin: .2em 0 .2em 0;
113	float: left;
114	clear: left;
115	white-space: nowrap;
116	}
117
118	/* The footer at the very bottom of the page */
119	div.footer {
120	clear: both;
121	font-size: 0.8em;
122	padding: 5px 10px 5px 10px;
123	text-align: right;
124	background-color: #558195;
125	border-bottom-left-radius: 8px;
126	border-bottom-right-radius: 8px;
127	color: white;
128	}
129
130	/* Hyperlink colors in the footer */
131	div.footer a { color: white; }
132	div.footer a:link { color: white; }
133	div.footer a:visited { color: white; }
134	div.footer a:hover { background-color: white; color: #558195; }
135
136	/* verbatim blocks */
137	pre.verbatim {
138	background-color: #f5f5f5;
139	padding: 0.5em;
140	white-space: pre-wrap;
141	}
142
143	/* The label/value pairs on (for example) the ci page */
144	table.label-value th {
145	vertical-align: top;
146	text-align: right;
147	padding: 0.2ex 2ex;




















































148	}
149

	--- skins/default/css.txt
	+++ skins/default/css.txt
	@@ -1,148 +1,200 @@
1	body {
2	margin: 0 auto;
3	min-width: 800px;
4	padding: 0px 20px;
5	background-color: white;
6	font-family: sans-serif;
7	font-size:14pt;
8	-moz-text-size-adjust: none;
9	-webkit-text-size-adjust: none;
10	-mx-text-size-adjust: none;
11	}
12
13	a {
14	color: #4183C4;
15	text-decoration: none;
16	}
17	a:hover {
18	color: #4183C4;
19	text-decoration: underline;
20	}
21
22	hr {
23	color: #eee;
24	}
25
26	.title {
27	color: #4183C4;
28	float:left;
29	padding-top: 30px;
30	padding-bottom: 10px;
31	}
32	.title h1 {
33	display:inline;
34	}
35	.title h1:after {
36	content: " / ";
37	color: #777;
38	font-weight: normal;
39	}
40
41	.content h1 {
42	font-size: 1.25em;
43	}
44	.content h2 {
45	font-size: 1.15em;
46	}
47	.content h2 {
48	font-size: 1.05em;
49	font-weight: bold;
50	}
51
52	.section {
53	font-size: 1em;
54	font-weight: bold;
55	background-color: #f5f5f5;
56	border: 1px solid #d8d8d8;
57	border-radius: 3px 3px 0 0;
58	padding: 9px 10px 10px;
59	margin: 10px 0;
60	}
61
62	.sectionmenu {
63	border: 1px solid #d8d8d8;
64	border-radius: 0 0 3px 3px;
65	border-top: 0;
66	margin-top: -10px;
67	margin-bottom: 10px;
68	padding: 10px;
69	}
70	.sectionmenu a {
71	display: inline-block;
72	margin-right: 1em;
73	}
74
75	.status {
76	float:right;
77	font-size:.7em;
78	padding-top:50px;
79	}
80
81	.mainmenu {
82	font-size:.8em;
83	clear:both;
84	padding:10px;
85	background:#eaeaea linear-gradient(#fafafa, #eaeaea) repeat-x;
86	border:1px solid #eaeaea;
87	border-radius:5px;
88	}
89
90	.mainmenu a {
91	padding: 10px 20px;
92	text-decoration:none;
93	color: #777;
94	border-right:1px solid #eaeaea;
95	}
96	.mainmenu a.active,
97	.mainmenu a:hover {
98	color: #000;
99	border-bottom:2px solid #D26911;
100	}
101
102	.submenu {
103	font-size: .7em;
104	margin-top: 10px;
105	padding: 10px;
106	border-bottom: 1px solid #ccc;
107	}
108
109	.submenu a {
110	padding: 10px 11px;
111	text-decoration:none;
112	color: #777;
113	}
114
115	.submenu a:hover {
116	padding: 6px 10px;
117	border: 1px solid #ccc;
118	border-radius: 5px;
119	color: #000;
120	}
121
122	.content {
123	padding-top: 10px;
124	font-size:.8em;
125	color: #444;
126	}
127
128	.udiff, .sbsdiff {
129	font-size: .85em !important;
130	overflow: auto;
131	border: 1px solid #ccc;
132	border-radius: 5px;
133	}
134	.content blockquote {
135	padding: 0 15px;
136	}
137
138	table.report {
139	cursor: auto;
140	border-radius: 5px;
141	border: 1px solid #ccc;
142	margin: 1em 0;
143	}
144	.report td, .report th {
145	border: 0;
146	font-size: .8em;
147	padding: 10px;
148	}
149	.report td:first-child {
150	border-top-left-radius: 5px;
151	}
152	.report tbody tr:last-child td:first-child {
153	border-bottom-left-radius: 5px;
154	}
155	.report td:last-child {
156	border-top-right-radius: 5px;
157	}
158	.report tbody tr:last-child {
159	border-bottom-left-radius: 5px;
160	border-bottom-right-radius: 5px;
161	}
162	.report tbody tr:last-child td:last-child {
163	border-bottom-right-radius: 5px;
164	}
165	.report th {
166	cursor: pointer;
167	}
168	.report thead+tbody tr:hover {
169	background-color: #f5f9fc !important;
170	}
171
172	td.tktDspLabel {
173	width: 70px;
174	text-align: right;
175	overflow: hidden;
176	}
177	td.tktDspValue {
178	text-align: left;
179	vertical-align: top;
180	background-color: #f8f8f8;
181	border: 1px solid #ccc;
182	}
183	td.tktDspValue pre {
184	white-space: pre-wrap;
185	}
186
187	.footer {
188	border-top: 1px solid #ccc;
189	padding: 10px;
190	font-size:.7em;
191	margin-top: 10px;
192	color: #ccc;
193	}
194	div.timelineDate {
195	font-weight: bold;
196	white-space: nowrap;
197	}
198	span.submenuctrl, span.submenuctrl input, select.submenuctrl {
199	color: #777;
200	}
201

M skins/default/header.txt

+50 -47

		--- skins/default/header.txt
		+++ skins/default/header.txt
		@@ -1,53 +1,56 @@
1	1	<html>
2		-<head>
3		-<base href="$baseurl/$current_page" />
4		-<title>$<project_name>: $<title></title>
5		-<link rel="alternate" type="application/rss+xml" title="RSS Feed"
6		- href="$home/timeline.rss" />
7		-<link rel="stylesheet" href="$stylesheet_url" type="text/css"
8		- media="screen" />
9		-</head>
10		-<body>
11		-<div class="header">
12		- <div class="logo">
13		- <img src="$logo_image_url" alt="logo" />
14		- </div>
15		- <div class="title"><small>$<project_name></small><br />$<title></div>
16		- <div class="status"><th1>
17		- if {[info exists login]} {
18		- puts "Logged in as $login"
19		- } else {
20		- puts "Not logged in"
21		- }
22		- </th1></div>
23		-</div>
24		-<div class="mainmenu">
25		-<th1>
26		-html "<a href='$home$index_page'>Home</a>\n"
27		-if {[anycap jor]} {
28		- html "<a href='$home/timeline'>Timeline</a>\n"
29		-}
30		-if {[anoncap oh]} {
31		- html "<a href='$home/tree?ci=tip'>Files</a>\n"
32		-}
33		-if {[anoncap o]} {
34		- html "<a href='$home/brlist'>Branches</a>\n"
35		- html "<a href='$home/taglist'>Tags</a>\n"
36		-}
37		-if {[anoncap r]} {
38		- html "<a href='$home/ticket'>Tickets</a>\n"
39		-}
40		-if {[anoncap j]} {
41		- html "<a href='$home/wiki'>Wiki</a>\n"
	2	+ <head>
	3	+ <base href="$baseurl/$current_page" />
	4	+ <title>$<project_name>: $<title></title>
	5	+ <link rel="alternate" type="application/rss+xml" title="RSS Feed"
	6	+ href="$home/timeline.rss" />
	7	+ <link rel="stylesheet" href="$stylesheet_url" type="text/css"
	8	+ media="screen" />
	9	+ </head>
	10	+
	11	+ <body>
	12	+ <div class="header">
	13	+ <div class="title"><h1>$<project_name></h1>$<title></div>
	14	+ <div class="status"><th1>
	15	+ if {[info exists login]} {
	16	+ html "$login — <a href='$home/login'>Logout</a>\n"
	17	+ } else {
	18	+ html "<a href='$home/login'>Login</a>\n"
	19	+ }
	20	+ </th1></div>
	21	+ </div>
	22	+
	23	+ <div class="mainmenu">
	24	+<th1>
	25	+proc menulink {url name} {
	26	+ upvar current_page current
	27	+ upvar home home
	28	+ if {[string range $url 0 [string length $current]] eq "/$current"} {
	29	+ html "<a href='$home$url' class='active'>$name</a>\n"
	30	+ } else {
	31	+ html "<a href='$home$url'>$name</a>\n"
	32	+ }
	33	+}
	34	+menulink $index_page Home
	35	+if {[anycap jor]} {
	36	+ menulink /timeline Timeline
	37	+}
	38	+if {[hascap oh]} {
	39	+ menulink /dir?ci=tip Files
	40	+}
	41	+if {[hascap o]} {
	42	+ menulink /brlist Branches
	43	+ menulink /taglist Tags
	44	+}
	45	+if {[hascap r]} {
	46	+ menulink /ticket Tickets
	47	+}
	48	+if {[hascap j]} {
	49	+ menulink /wiki Wiki
42	50	}
43	51	if {[hascap s]} {
44		- html "<a href='$home/setup'>Admin</a>\n"
	52	+ menulink /setup Admin
45	53	} elseif {[hascap a]} {
46		- html "<a href='$home/setup_ulist'>Users</a>\n"
47		-}
48		-if {[info exists login]} {
49		- html "<a href='$home/login'>Logout</a>\n"
50		-} else {
51		- html "<a href='$home/login'>Login</a>\n"
	54	+ menulink /setup_ulist Users
52	55	}
53	56	</th1></div>
54	57

	--- skins/default/header.txt
	+++ skins/default/header.txt
	@@ -1,53 +1,56 @@
1	<html>
2	<head>
3	<base href="$baseurl/$current_page" />
4	<title>$<project_name>: $<title></title>
5	<link rel="alternate" type="application/rss+xml" title="RSS Feed"
6	href="$home/timeline.rss" />
7	<link rel="stylesheet" href="$stylesheet_url" type="text/css"
8	media="screen" />
9	</head>
10	<body>
11	<div class="header">
12	<div class="logo">
13	<img src="$logo_image_url" alt="logo" />
14	</div>
15	<div class="title"><small>$<project_name></small><br />$<title></div>
16	<div class="status"><th1>
17	if {[info exists login]} {
18	puts "Logged in as $login"
19	} else {
20	puts "Not logged in"
21	}
22	</th1></div>
23	</div>
24	<div class="mainmenu">
25	<th1>
26	html "<a href='$home$index_page'>Home</a>\n"
27	if {[anycap jor]} {
28	html "<a href='$home/timeline'>Timeline</a>\n"
29	}
30	if {[anoncap oh]} {
31	html "<a href='$home/tree?ci=tip'>Files</a>\n"
32	}
33	if {[anoncap o]} {
34	html "<a href='$home/brlist'>Branches</a>\n"
35	html "<a href='$home/taglist'>Tags</a>\n"
36	}
37	if {[anoncap r]} {
38	html "<a href='$home/ticket'>Tickets</a>\n"
39	}
40	if {[anoncap j]} {
41	html "<a href='$home/wiki'>Wiki</a>\n"








42	}
43	if {[hascap s]} {
44	html "<a href='$home/setup'>Admin</a>\n"
45	} elseif {[hascap a]} {
46	html "<a href='$home/setup_ulist'>Users</a>\n"
47	}
48	if {[info exists login]} {
49	html "<a href='$home/login'>Logout</a>\n"
50	} else {
51	html "<a href='$home/login'>Login</a>\n"
52	}
53	</th1></div>
54

	--- skins/default/header.txt
	+++ skins/default/header.txt
	@@ -1,53 +1,56 @@
1	<html>
2	<head>
3	<base href="$baseurl/$current_page" />
4	<title>$<project_name>: $<title></title>
5	<link rel="alternate" type="application/rss+xml" title="RSS Feed"
6	href="$home/timeline.rss" />
7	<link rel="stylesheet" href="$stylesheet_url" type="text/css"
8	media="screen" />
9	</head>
10
11	<body>
12	<div class="header">
13	<div class="title"><h1>$<project_name></h1>$<title></div>
14	<div class="status"><th1>
15	if {[info exists login]} {
16	html "$login — <a href='$home/login'>Logout</a>\n"
17	} else {
18	html "<a href='$home/login'>Login</a>\n"
19	}
20	</th1></div>
21	</div>
22
23	<div class="mainmenu">
24	<th1>
25	proc menulink {url name} {
26	upvar current_page current
27	upvar home home
28	if {[string range $url 0 [string length $current]] eq "/$current"} {
29	html "<a href='$home$url' class='active'>$name</a>\n"
30	} else {
31	html "<a href='$home$url'>$name</a>\n"
32	}
33	}
34	menulink $index_page Home
35	if {[anycap jor]} {
36	menulink /timeline Timeline
37	}
38	if {[hascap oh]} {
39	menulink /dir?ci=tip Files
40	}
41	if {[hascap o]} {
42	menulink /brlist Branches
43	menulink /taglist Tags
44	}
45	if {[hascap r]} {
46	menulink /ticket Tickets
47	}
48	if {[hascap j]} {
49	menulink /wiki Wiki
50	}
51	if {[hascap s]} {
52	menulink /setup Admin
53	} elseif {[hascap a]} {
54	menulink /setup_ulist Users





55	}
56	</th1></div>
57

M skins/eagle/header.txt

+16 -12

		--- skins/eagle/header.txt
		+++ skins/eagle/header.txt
		@@ -101,34 +101,38 @@
101	101	}
102	102	updateClock();
103	103	</script>
104	104	<div class="mainmenu">
105	105	<th1>
106		-html "<a href='$home$index_page'>Home</a>\n"
107		-html "<a href='$home/help'>Help</a>\n"
	106	+proc menulink {url name} {
	107	+ upvar home home
	108	+ html "<a href='$home$url'>$name</a>\n"
	109	+}
	110	+menulink $index_page Home
	111	+menulink /help Help
108	112	if {[anycap jor]} {
109		- html "<a href='$home/timeline'>Timeline</a>\n"
	113	+ menulink /timeline Timeline
110	114	}
111	115	if {[anoncap oh]} {
112		- html "<a href='$home/tree?ci=tip'>Files</a>\n"
	116	+ menulink /dir?ci=tip Files
113	117	}
114	118	if {[anoncap o]} {
115		- html "<a href='$home/brlist'>Branches</a>\n"
116		- html "<a href='$home/taglist'>Tags</a>\n"
	119	+ menulink /brlist Branches
	120	+ menulink /taglist Tags
117	121	}
118	122	if {[anoncap r]} {
119		- html "<a href='$home/ticket'>Tickets</a>\n"
	123	+ menulink /ticket Tickets
120	124	}
121	125	if {[anoncap j]} {
122		- html "<a href='$home/wiki'>Wiki</a>\n"
	126	+ menulink /wiki Wiki
123	127	}
124	128	if {[hascap s]} {
125		- html "<a href='$home/setup'>Admin</a>\n"
	129	+ menulink /setup Admin
126	130	} elseif {[hascap a]} {
127		- html "<a href='$home/setup_ulist'>Users</a>\n"
	131	+ menulink /setup_ulist Users
128	132	}
129	133	if {[info exists login]} {
130		- html "<a href='$home/login'>Logout</a>\n"
	134	+ menulink /login Logout
131	135	} else {
132		- html "<a href='$home/login'>Login</a>\n"
	136	+ menulink /login Login
133	137	}
134	138	</th1></div>
135	139

	--- skins/eagle/header.txt
	+++ skins/eagle/header.txt
	@@ -101,34 +101,38 @@
101	}
102	updateClock();
103	</script>
104	<div class="mainmenu">
105	<th1>
106	html "<a href='$home$index_page'>Home</a>\n"
107	html "<a href='$home/help'>Help</a>\n"




108	if {[anycap jor]} {
109	html "<a href='$home/timeline'>Timeline</a>\n"
110	}
111	if {[anoncap oh]} {
112	html "<a href='$home/tree?ci=tip'>Files</a>\n"
113	}
114	if {[anoncap o]} {
115	html "<a href='$home/brlist'>Branches</a>\n"
116	html "<a href='$home/taglist'>Tags</a>\n"
117	}
118	if {[anoncap r]} {
119	html "<a href='$home/ticket'>Tickets</a>\n"
120	}
121	if {[anoncap j]} {
122	html "<a href='$home/wiki'>Wiki</a>\n"
123	}
124	if {[hascap s]} {
125	html "<a href='$home/setup'>Admin</a>\n"
126	} elseif {[hascap a]} {
127	html "<a href='$home/setup_ulist'>Users</a>\n"
128	}
129	if {[info exists login]} {
130	html "<a href='$home/login'>Logout</a>\n"
131	} else {
132	html "<a href='$home/login'>Login</a>\n"
133	}
134	</th1></div>
135

	--- skins/eagle/header.txt
	+++ skins/eagle/header.txt
	@@ -101,34 +101,38 @@
101	}
102	updateClock();
103	</script>
104	<div class="mainmenu">
105	<th1>
106	proc menulink {url name} {
107	upvar home home
108	html "<a href='$home$url'>$name</a>\n"
109	}
110	menulink $index_page Home
111	menulink /help Help
112	if {[anycap jor]} {
113	menulink /timeline Timeline
114	}
115	if {[anoncap oh]} {
116	menulink /dir?ci=tip Files
117	}
118	if {[anoncap o]} {
119	menulink /brlist Branches
120	menulink /taglist Tags
121	}
122	if {[anoncap r]} {
123	menulink /ticket Tickets
124	}
125	if {[anoncap j]} {
126	menulink /wiki Wiki
127	}
128	if {[hascap s]} {
129	menulink /setup Admin
130	} elseif {[hascap a]} {
131	menulink /setup_ulist Users
132	}
133	if {[info exists login]} {
134	menulink /login Logout
135	} else {
136	menulink /login Login
137	}
138	</th1></div>
139

M skins/enhanced1/footer.txt

+2 -1

		--- skins/enhanced1/footer.txt
		+++ skins/enhanced1/footer.txt
		@@ -11,14 +11,15 @@
11	11	return [string range $version 1 [expr {$length - 2}]]
12	12	}
13	13	set version [getVersion $manifest_version]
14	14	set tclVersion [getTclVersion]
15	15	set fossilUrl https://www.fossil-scm.org
	16	+ set fossilDate [string range $manifest_date 0 9]T[string range $manifest_date 11 end]
16	17	</th1>
17	18	This page was generated in about
18	19	<th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}]</th1>s by
19	20	<a href="$fossilUrl/">Fossil</a>
20	21	version $release_version $tclVersion
21	22	<a href="$fossilUrl/index.html/info/$version">$manifest_version</a>
22		- <a href="$fossilUrl/index.html/timeline?c=$manifest_date&y=ci">$manifest_date</a>
	23	+ <a href="$fossilUrl/index.html/timeline?c=$fossilDate&y=ci">$manifest_date</a>
23	24	</div>
24	25	</body></html>
25	26

	--- skins/enhanced1/footer.txt
	+++ skins/enhanced1/footer.txt
	@@ -11,14 +11,15 @@
11	return [string range $version 1 [expr {$length - 2}]]
12	}
13	set version [getVersion $manifest_version]
14	set tclVersion [getTclVersion]
15	set fossilUrl https://www.fossil-scm.org

16	</th1>
17	This page was generated in about
18	<th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}]</th1>s by
19	<a href="$fossilUrl/">Fossil</a>
20	version $release_version $tclVersion
21	<a href="$fossilUrl/index.html/info/$version">$manifest_version</a>
22	<a href="$fossilUrl/index.html/timeline?c=$manifest_date&y=ci">$manifest_date</a>
23	</div>
24	</body></html>
25

	--- skins/enhanced1/footer.txt
	+++ skins/enhanced1/footer.txt
	@@ -11,14 +11,15 @@
11	return [string range $version 1 [expr {$length - 2}]]
12	}
13	set version [getVersion $manifest_version]
14	set tclVersion [getTclVersion]
15	set fossilUrl https://www.fossil-scm.org
16	set fossilDate [string range $manifest_date 0 9]T[string range $manifest_date 11 end]
17	</th1>
18	This page was generated in about
19	<th1>puts [expr {([utime]+[stime]+1000)/1000*0.001}]</th1>s by
20	<a href="$fossilUrl/">Fossil</a>
21	version $release_version $tclVersion
22	<a href="$fossilUrl/index.html/info/$version">$manifest_version</a>
23	<a href="$fossilUrl/index.html/timeline?c=$fossilDate&y=ci">$manifest_date</a>
24	</div>
25	</body></html>
26

M skins/enhanced1/header.txt

+16 -12

		--- skins/enhanced1/header.txt
		+++ skins/enhanced1/header.txt
		@@ -101,34 +101,38 @@
101	101	}
102	102	updateClock();
103	103	</script>
104	104	<div class="mainmenu">
105	105	<th1>
106		-html "<a href='$home$index_page'>Home</a>\n"
107		-html "<a href='$home/help'>Help</a>\n"
	106	+proc menulink {url name} {
	107	+ upvar home home
	108	+ html "<a href='$home$url'>$name</a>\n"
	109	+}
	110	+menulink $index_page Home
	111	+menulink /help Help
108	112	if {[anycap jor]} {
109		- html "<a href='$home/timeline'>Timeline</a>\n"
	113	+ menulink /timeline Timeline
110	114	}
111	115	if {[anoncap oh]} {
112		- html "<a href='$home/tree?ci=tip'>Files</a>\n"
	116	+ menulink /dir?ci=tip Files
113	117	}
114	118	if {[anoncap o]} {
115		- html "<a href='$home/brlist'>Branches</a>\n"
116		- html "<a href='$home/taglist'>Tags</a>\n"
	119	+ menulink /brlist Branches
	120	+ menulink /taglist Tags
117	121	}
118	122	if {[anoncap r]} {
119		- html "<a href='$home/ticket'>Tickets</a>\n"
	123	+ menulink /ticket Tickets
120	124	}
121	125	if {[anoncap j]} {
122		- html "<a href='$home/wiki'>Wiki</a>\n"
	126	+ menulink /wiki Wiki
123	127	}
124	128	if {[hascap s]} {
125		- html "<a href='$home/setup'>Admin</a>\n"
	129	+ menulink /setup Admin
126	130	} elseif {[hascap a]} {
127		- html "<a href='$home/setup_ulist'>Users</a>\n"
	131	+ menulink /setup_ulist Users
128	132	}
129	133	if {[info exists login]} {
130		- html "<a href='$home/login'>Logout</a>\n"
	134	+ menulink /login Logout
131	135	} else {
132		- html "<a href='$home/login'>Login</a>\n"
	136	+ menulink /login Login
133	137	}
134	138	</th1></div>
135	139
136	140	DELETED skins/etienne1/README.md
137	141	DELETED skins/etienne1/css.txt
138	142	DELETED skins/etienne1/footer.txt
139	143	DELETED skins/etienne1/header.txt
140	144	ADDED skins/original/css.txt
141	145	ADDED skins/original/footer.txt
142	146	ADDED skins/original/header.txt

	--- skins/enhanced1/header.txt
	+++ skins/enhanced1/header.txt
	@@ -101,34 +101,38 @@
101	}
102	updateClock();
103	</script>
104	<div class="mainmenu">
105	<th1>
106	html "<a href='$home$index_page'>Home</a>\n"
107	html "<a href='$home/help'>Help</a>\n"




108	if {[anycap jor]} {
109	html "<a href='$home/timeline'>Timeline</a>\n"
110	}
111	if {[anoncap oh]} {
112	html "<a href='$home/tree?ci=tip'>Files</a>\n"
113	}
114	if {[anoncap o]} {
115	html "<a href='$home/brlist'>Branches</a>\n"
116	html "<a href='$home/taglist'>Tags</a>\n"
117	}
118	if {[anoncap r]} {
119	html "<a href='$home/ticket'>Tickets</a>\n"
120	}
121	if {[anoncap j]} {
122	html "<a href='$home/wiki'>Wiki</a>\n"
123	}
124	if {[hascap s]} {
125	html "<a href='$home/setup'>Admin</a>\n"
126	} elseif {[hascap a]} {
127	html "<a href='$home/setup_ulist'>Users</a>\n"
128	}
129	if {[info exists login]} {
130	html "<a href='$home/login'>Logout</a>\n"
131	} else {
132	html "<a href='$home/login'>Login</a>\n"
133	}
134	</th1></div>
135
136	ELETED skins/etienne1/README.md
137	ELETED skins/etienne1/css.txt
138	ELETED skins/etienne1/footer.txt
139	ELETED skins/etienne1/header.txt
140	DDED skins/original/css.txt
141	DDED skins/original/footer.txt
142	DDED skins/original/header.txt

	--- skins/enhanced1/header.txt
	+++ skins/enhanced1/header.txt
	@@ -101,34 +101,38 @@
101	}
102	updateClock();
103	</script>
104	<div class="mainmenu">
105	<th1>
106	proc menulink {url name} {
107	upvar home home
108	html "<a href='$home$url'>$name</a>\n"
109	}
110	menulink $index_page Home
111	menulink /help Help
112	if {[anycap jor]} {
113	menulink /timeline Timeline
114	}
115	if {[anoncap oh]} {
116	menulink /dir?ci=tip Files
117	}
118	if {[anoncap o]} {
119	menulink /brlist Branches
120	menulink /taglist Tags
121	}
122	if {[anoncap r]} {
123	menulink /ticket Tickets
124	}
125	if {[anoncap j]} {
126	menulink /wiki Wiki
127	}
128	if {[hascap s]} {
129	menulink /setup Admin
130	} elseif {[hascap a]} {
131	menulink /setup_ulist Users
132	}
133	if {[info exists login]} {
134	menulink /login Logout
135	} else {
136	menulink /login Login
137	}
138	</th1></div>
139
140	ELETED skins/etienne1/README.md
141	ELETED skins/etienne1/css.txt
142	ELETED skins/etienne1/footer.txt
143	ELETED skins/etienne1/header.txt
144	DDED skins/original/css.txt
145	DDED skins/original/footer.txt
146	DDED skins/original/header.txt

D skins/etienne1/README.md

-1

		--- a/skins/etienne1/README.md
		+++ b/skins/etienne1/README.md
		@@ -1 +0,0 @@
1		-This skin was contributed by Étienne Deparis.

	--- a/skins/etienne1/README.md
	+++ b/skins/etienne1/README.md
	@@ -1 +0,0 @@
1	This skin was contributed by Étienne Deparis.

	--- a/skins/etienne1/README.md
	+++ b/skins/etienne1/README.md
	@@ -1 +0,0 @@

D skins/etienne1/css.txt

-1

		--- a/skins/etienne1/css.txt
		+++ b/skins/etienne1/css.txt
		@@ -1 +0,0 @@
1		-max-width: 33%.sub30max-width: min-width: 80%.sub30max-width: padding: 0px 20pxx-width: 33%.d2max-width: 33%.subAdjustmentsin padding-top:50pxpadding:10pxmax-width: 33%.sub30ma.d2max-width: 2

	--- a/skins/etienne1/css.txt
	+++ b/skins/etienne1/css.txt
	@@ -1 +0,0 @@
1	max-width: 33%.sub30max-width: min-width: 80%.sub30max-width: padding: 0px 20pxx-width: 33%.d2max-width: 33%.subAdjustmentsin padding-top:50pxpadding:10pxmax-width: 33%.sub30ma.d2max-width: 2

	--- a/skins/etienne1/css.txt
	+++ b/skins/etienne1/css.txt
	@@ -1 +0,0 @@

D skins/etienne1/footer.txt

-3

		--- a/skins/etienne1/footer.txt
		+++ b/skins/etienne1/footer.txt
		@@ -1,3 +0,0 @@
1		-<div class="footer">
2		-This page was generated in about
3		-<th1>puts [expr {([utime]+[stime]+1000)/100

	--- a/skins/etienne1/footer.txt
	+++ b/skins/etienne1/footer.txt
	@@ -1,3 +0,0 @@
1	<div class="footer">
2	This page was generated in about
3	<th1>puts [expr {([utime]+[stime]+1000)/100

	--- a/skins/etienne1/footer.txt
	+++ b/skins/etienne1/footer.txt
	@@ -1,3 +0,0 @@

D skins/etienne1/header.txt

-40

		--- a/skins/etienne1/header.txt
		+++ b/skins/etienne1/header.txt
		@@ -1,40 +0,0 @@
1		-<html>
2		- <head>
3		- <base href="$baseurl/$current_page" />
4		- <title>$<project_name>: $<title></title>
5		- <link rel="alternate" type="application/rss+xml" title="RSS Feed"
6		- href="$home/timeline.rss" />
7		- <lihome/style.css?default" type="text/css"
8		- media="screen" />
9		- </head>
10		-
11		- <bodyth1>
12		- if {[info exheader">
13		- t_name">
14		- </a>
15		- <<h1>$<project_name></h1>$<title>us"><th1>
16		- 1>
17		- if {[info exists login]} {
18		- if {[info exists login]} {
19		- } els$login — } els} } else {
20		- t h$login</a>\n"
21		- }
22		- h1>
23		- if {[info exmainmbtn' href='$proc menulink {url name} {
24		- upvar current_page current
25		- upvar home homa href='$url' c}range $url 0 [string lengtmap"></n } else {
26		-/a title='$url' class='active</nav>
27		-<h1 class='hbdrop' ti>$name</a>\n"
28		- }
29		-}
30		- menline Timeijr2}s currckin tiply
31		- joif {[has a]} {
32		- y
33		- menu/dir?cist Tagdesktopdeonly
34		-}der"ect_name<div class="her} Wiki wideonly
35		-}
36		-if {[hascap s]} {
37		- menulink /setup Admin {noncap if {[hascap a]} {
38		- menulink /setup_ulist Users {}dmin {noncap if
39		-}
40		-</th1></div>

	--- a/skins/etienne1/header.txt
	+++ b/skins/etienne1/header.txt
	@@ -1,40 +0,0 @@
1	<html>
2	<head>
3	<base href="$baseurl/$current_page" />
4	<title>$<project_name>: $<title></title>
5	<link rel="alternate" type="application/rss+xml" title="RSS Feed"
6	href="$home/timeline.rss" />
7	<lihome/style.css?default" type="text/css"
8	media="screen" />
9	</head>
10
11	<bodyth1>
12	if {[info exheader">
13	t_name">
14	</a>
15	<<h1>$<project_name></h1>$<title>us"><th1>
16	1>
17	if {[info exists login]} {
18	if {[info exists login]} {
19	} els$login — } els} } else {
20	t h$login</a>\n"
21	}
22	h1>
23	if {[info exmainmbtn' href='$proc menulink {url name} {
24	upvar current_page current
25	upvar home homa href='$url' c}range $url 0 [string lengtmap"></n } else {
26	/a title='$url' class='active</nav>
27	<h1 class='hbdrop' ti>$name</a>\n"
28	}
29	}
30	menline Timeijr2}s currckin tiply
31	joif {[has a]} {
32	y
33	menu/dir?cist Tagdesktopdeonly
34	}der"ect_name<div class="her} Wiki wideonly
35	}
36	if {[hascap s]} {
37	menulink /setup Admin {noncap if {[hascap a]} {
38	menulink /setup_ulist Users {}dmin {noncap if
39	}
40	</th1></div>

	--- a/skins/etienne1/header.txt
	+++ b/skins/etienne1/header.txt
	@@ -1,40 +0,0 @@

M skins/original/css.txt

+71

		--- a/skins/original/css.txt
		+++ b/skins/original/css.txt
		@@ -0,0 +1,71 @@
	1	+/* General settings for the entire page */
	2	+body {
	3	+ margin: 0ex 1ex;
	4	+ padding: 0px;
	5	+ background-color: white;
	6	+ font-family: sans-serif;
	7	+ -moz-text-size-adjust: none;
	8	+ -webkit-text-size-adjust: none;
	9	+ -mx-text-size-adjust: none;
	10	+}
	11	+
	12	+/* The project logo in the upper left-hand corner of each page */
	13	+div.logo {
	14	+ display: table-cell;
	15	+ text-align: center;
	16	+ vertical-align: bottom;
	17	+ font-weight: bold;
	18	+ co20or: #558195;
	19	+ min-width: 50px;
	20	+ white-space: nowrap;
	21	+}
	22	+
	23	+/* The page title centered at the top of each page */
	24	+div.title {
	25	+ display: table-cell;
	26	+ font-size: 2em;
	27	+ font-weight: bold;
	28	+ text-align: center;
	29	+ padding: 0 0 0 1em;
	30	+ color: #558195;
	31	+ vertical-align: bottom;
	32	+ width: 100%;
	33	+}
	34	+
	35	+/* The login status message in the top right-hand corner */
	36	+div.status {
	37	+ display: table-cell;
	38	+ text-align: right;
	39	+ vertical-align: bottom;
	40	+ color: #558195;
	41	+ font-size: 0.8min-width: 20or: #558195e-space: nowrap;
	42	+}
	43	+
	44	+/* The header across the top of the page */
	45	+div.header {
	46	+ display: table;
	47	+ width: 100%;
	48	+}
	49	+
	50	+/* The main menu bar that appears at the top of the page beneath
	51	+** the header */
	52	+diisplay: table;
	53	+ winmenu {
	54	+ padding: 5px;
	55	+ font-size: 0.9em;
	56	+ font-weight: bold;
	57	+ text-align: center;
	58	+ letter-spacing: 1px;
	59	+ background-color: #558195;
	60	+ border-top-left-radius: 8px;
	61	+ border-top-right-radius: 8px;
	62	+ color: white;
	63	+}
	64	+
	65	+/* The submenu bar that sometimes appedis below the main menu */
	66	+div.submenu, div.sectionmenu {
	67	+ padding: 3px 10px 3px 0px;
	68	+ font-size: 0.9em;
	69	+ text-align: center;
	70	+ background-color: div.mainmenu a, div.mainmenu av.sectionmenu>a.buttondidi entire page */
	71	+b

	--- a/skins/original/css.txt
	+++ b/skins/original/css.txt
	@@ -0,0 +1,71 @@

	--- a/skins/original/css.txt
	+++ b/skins/original/css.txt
	@@ -0,0 +1,71 @@
1	/* General settings for the entire page */
2	body {
3	margin: 0ex 1ex;
4	padding: 0px;
5	background-color: white;
6	font-family: sans-serif;
7	-moz-text-size-adjust: none;
8	-webkit-text-size-adjust: none;
9	-mx-text-size-adjust: none;
10	}
11
12	/* The project logo in the upper left-hand corner of each page */
13	div.logo {
14	display: table-cell;
15	text-align: center;
16	vertical-align: bottom;
17	font-weight: bold;
18	co20or: #558195;
19	min-width: 50px;
20	white-space: nowrap;
21	}
22
23	/* The page title centered at the top of each page */
24	div.title {
25	display: table-cell;
26	font-size: 2em;
27	font-weight: bold;
28	text-align: center;
29	padding: 0 0 0 1em;
30	color: #558195;
31	vertical-align: bottom;
32	width: 100%;
33	}
34
35	/* The login status message in the top right-hand corner */
36	div.status {
37	display: table-cell;
38	text-align: right;
39	vertical-align: bottom;
40	color: #558195;
41	font-size: 0.8min-width: 20or: #558195e-space: nowrap;
42	}
43
44	/* The header across the top of the page */
45	div.header {
46	display: table;
47	width: 100%;
48	}
49
50	/* The main menu bar that appears at the top of the page beneath
51	** the header */
52	diisplay: table;
53	winmenu {
54	padding: 5px;
55	font-size: 0.9em;
56	font-weight: bold;
57	text-align: center;
58	letter-spacing: 1px;
59	background-color: #558195;
60	border-top-left-radius: 8px;
61	border-top-right-radius: 8px;
62	color: white;
63	}
64
65	/* The submenu bar that sometimes appedis below the main menu */
66	div.submenu, div.sectionmenu {
67	padding: 3px 10px 3px 0px;
68	font-size: 0.9em;
69	text-align: center;
70	background-color: div.mainmenu a, div.mainmenu av.sectionmenu>a.buttondidi entire page */
71	b

M skins/original/footer.txt

		--- a/skins/original/footer.txt
		+++ b/skins/original/footer.txt
		@@ -0,0 +1,3 @@
	1	+<div class="footer">
	2	+This page was generated in about
	3	+<th1>puts [expr {([utime]+[stime]+1000)/100

	--- a/skins/original/footer.txt
	+++ b/skins/original/footer.txt
	@@ -0,0 +1,3 @@

	--- a/skins/original/footer.txt
	+++ b/skins/original/footer.txt
	@@ -0,0 +1,3 @@
1	<div class="footer">
2	This page was generated in about
3	<th1>puts [expr {([utime]+[stime]+1000)/100

M skins/original/header.txt

+39

		--- a/skins/original/header.txt
		+++ b/skins/original/header.txt
		@@ -0,0 +1,39 @@
	1	+<html>
	2	+<head>
	3	+<base href="<html>
	4	+ <head<html>
	5	+ <head>
	6	+ <base href="$baseurl/$current_page" />
	7	+ <title>$<tle="RSS Feed"
	8	+ hr<lihome/style.css?default" typstylesheet_url" type="text/css"
	9	+ media="screen" />
	10	+</head>
	11	+<body>
	12	+name">
	13	+ </a>
	14	+ <<h1><div class="logo">
	15	+ <img src="$logo_image_url" alt="logo" />
	16	+ </div>
	17	+ <div class="title"><small>$<project_name></small><br /{[info exists logiif {[info exists login]} {
	18	+ if {[info exists login]} {
	19	+ puts "Logged in as $logigin</a>\n"
	20	+ }
	21	+ hputs "Not logged in"
	22	+ '$url' c}range $url 0 [stringher} Wiki wideonly
	23	+}
	24	+index_page'>Home<="her} Wiki wideonly
	25	+}/timeline'>Timeline</a="her} Wiki wideonly
	26	+}/tree?ci=tip'>Files</="her} Wiki wideonly
	27	+}/brlist'>Branches</a>\n"
	28	+="her} Wiki wideonly
	29	+}/taglist'>Tags</="her} Wiki wideonly
	30	+}/ticket'>Tickets</="her} Wiki wideonly
	31	+}/wiki'>Wiki</a>\n"her} Wiki wideonly
	32	+}/setup'>Admin</a>\n"her} Wiki wideonly
	33	+}/setup_ulist'>Users</a>\n"
	34	+}
	35	+ } els$login — }her} Wiki wideonly
	36	+}/login'>Logout</a>\n"
	37	+} else {
	38	+="her} Wiki wideonly
	39	+}

	--- a/skins/original/header.txt
	+++ b/skins/original/header.txt
	@@ -0,0 +1,39 @@

	--- a/skins/original/header.txt
	+++ b/skins/original/header.txt
	@@ -0,0 +1,39 @@
1	<html>
2	<head>
3	<base href="<html>
4	<head<html>
5	<head>
6	<base href="$baseurl/$current_page" />
7	<title>$<tle="RSS Feed"
8	hr<lihome/style.css?default" typstylesheet_url" type="text/css"
9	media="screen" />
10	</head>
11	<body>
12	name">
13	</a>
14	<<h1><div class="logo">
15	<img src="$logo_image_url" alt="logo" />
16	</div>
17	<div class="title"><small>$<project_name></small><br /{[info exists logiif {[info exists login]} {
18	if {[info exists login]} {
19	puts "Logged in as $logigin</a>\n"
20	}
21	hputs "Not logged in"
22	'$url' c}range $url 0 [stringher} Wiki wideonly
23	}
24	index_page'>Home<="her} Wiki wideonly
25	}/timeline'>Timeline</a="her} Wiki wideonly
26	}/tree?ci=tip'>Files</="her} Wiki wideonly
27	}/brlist'>Branches</a>\n"
28	="her} Wiki wideonly
29	}/taglist'>Tags</="her} Wiki wideonly
30	}/ticket'>Tickets</="her} Wiki wideonly
31	}/wiki'>Wiki</a>\n"her} Wiki wideonly
32	}/setup'>Admin</a>\n"her} Wiki wideonly
33	}/setup_ulist'>Users</a>\n"
34	}
35	} els$login — }her} Wiki wideonly
36	}/login'>Logout</a>\n"
37	} else {
38	="her} Wiki wideonly
39	}

M src/add.c

		--- src/add.c
		+++ src/add.c
		@@ -272,10 +272,11 @@
272	272	zCleanFlag = db_get("clean-glob", 0);
273	273	}
274	274	if( zIgnoreFlag==0 ){
275	275	zIgnoreFlag = db_get("ignore-glob", 0);
276	276	}
	277	+ if( db_get_boolean("dotfiles", 0) ) scanFlags \|= SCAN_ALL;
277	278	vid = db_lget_int("checkout",0);
278	279	db_begin_transaction();
279	280	db_multi_exec("CREATE TEMP TABLE sfile(x TEXT PRIMARY KEY %s)",
280	281	filename_collation());
281	282	pClean = glob_create(zCleanFlag);
		@@ -533,10 +534,11 @@
533	534	zCleanFlag = db_get("clean-glob", 0);
534	535	}
535	536	if( zIgnoreFlag==0 ){
536	537	zIgnoreFlag = db_get("ignore-glob", 0);
537	538	}
	539	+ if( db_get_boolean("dotfiles", 0) ) scanFlags \|= SCAN_ALL;
538	540	vid = db_lget_int("checkout",0);
539	541	db_begin_transaction();
540	542
541	543	/* step 1:
542	544	** Populate the temp table "sfile" with the names of all unmanaged
543	545

	--- src/add.c
	+++ src/add.c
	@@ -272,10 +272,11 @@
272	zCleanFlag = db_get("clean-glob", 0);
273	}
274	if( zIgnoreFlag==0 ){
275	zIgnoreFlag = db_get("ignore-glob", 0);
276	}

277	vid = db_lget_int("checkout",0);
278	db_begin_transaction();
279	db_multi_exec("CREATE TEMP TABLE sfile(x TEXT PRIMARY KEY %s)",
280	filename_collation());
281	pClean = glob_create(zCleanFlag);
	@@ -533,10 +534,11 @@
533	zCleanFlag = db_get("clean-glob", 0);
534	}
535	if( zIgnoreFlag==0 ){
536	zIgnoreFlag = db_get("ignore-glob", 0);
537	}

538	vid = db_lget_int("checkout",0);
539	db_begin_transaction();
540
541	/* step 1:
542	** Populate the temp table "sfile" with the names of all unmanaged
543

	--- src/add.c
	+++ src/add.c
	@@ -272,10 +272,11 @@
272	zCleanFlag = db_get("clean-glob", 0);
273	}
274	if( zIgnoreFlag==0 ){
275	zIgnoreFlag = db_get("ignore-glob", 0);
276	}
277	if( db_get_boolean("dotfiles", 0) ) scanFlags \|= SCAN_ALL;
278	vid = db_lget_int("checkout",0);
279	db_begin_transaction();
280	db_multi_exec("CREATE TEMP TABLE sfile(x TEXT PRIMARY KEY %s)",
281	filename_collation());
282	pClean = glob_create(zCleanFlag);
	@@ -533,10 +534,11 @@
534	zCleanFlag = db_get("clean-glob", 0);
535	}
536	if( zIgnoreFlag==0 ){
537	zIgnoreFlag = db_get("ignore-glob", 0);
538	}
539	if( db_get_boolean("dotfiles", 0) ) scanFlags \|= SCAN_ALL;
540	vid = db_lget_int("checkout",0);
541	db_begin_transaction();
542
543	/* step 1:
544	** Populate the temp table "sfile" with the names of all unmanaged
545

M src/cache.c

		--- src/cache.c
		+++ src/cache.c
		@@ -226,10 +226,18 @@
226	226	cache_read_done:
227	227	sqlite3_exec(db, "COMMIT", 0, 0, 0);
228	228	sqlite3_close(db);
229	229	return rc;
230	230	}
	231	+
	232	+/*
	233	+** Create a cache database for the current repository if no such
	234	+** database already exists.
	235	+*/
	236	+void cache_initialize(void){
	237	+ sqlite3_close(cacheOpen(1));
	238	+}
231	239
232	240	/*
233	241	** COMMAND: cache*
234	242	** Usage: %fossil cache SUBCOMMAND
235	243	**
236	244

	--- src/cache.c
	+++ src/cache.c
	@@ -226,10 +226,18 @@
226	cache_read_done:
227	sqlite3_exec(db, "COMMIT", 0, 0, 0);
228	sqlite3_close(db);
229	return rc;
230	}








231
232	/*
233	** COMMAND: cache*
234	** Usage: %fossil cache SUBCOMMAND
235	**
236

	--- src/cache.c
	+++ src/cache.c
	@@ -226,10 +226,18 @@
226	cache_read_done:
227	sqlite3_exec(db, "COMMIT", 0, 0, 0);
228	sqlite3_close(db);
229	return rc;
230	}
231
232	/*
233	** Create a cache database for the current repository if no such
234	** database already exists.
235	*/
236	void cache_initialize(void){
237	sqlite3_close(cacheOpen(1));
238	}
239
240	/*
241	** COMMAND: cache*
242	** Usage: %fossil cache SUBCOMMAND
243	**
244

M src/checkin.c

		--- src/checkin.c
		+++ src/checkin.c
		@@ -571,10 +571,12 @@
571	571
572	572	if( find_option("temp",0,0)!=0 ) scanFlags \|= SCAN_TEMP;
573	573	db_must_be_within_tree();
574	574	cwdRelative = determine_cwd_relative_option();
575	575
	576	+ if( db_get_boolean("dotfiles", 0) ) scanFlags \|= SCAN_ALL;
	577	+
576	578	/* We should be done with options.. */
577	579	verify_all_options();
578	580
579	581	if( zIgnoreFlag==0 ){
580	582	zIgnoreFlag = db_get("ignore-glob", 0);
		@@ -707,10 +709,11 @@
707	709	zKeepFlag = db_get("keep-glob", 0);
708	710	}
709	711	if( zCleanFlag==0 ){
710	712	zCleanFlag = db_get("clean-glob", 0);
711	713	}
	714	+ if( db_get_boolean("dotfiles", 0) ) scanFlags \|= SCAN_ALL;
712	715	verify_all_options();
713	716	pIgnore = glob_create(zIgnoreFlag);
714	717	pKeep = glob_create(zKeepFlag);
715	718	pClean = glob_create(zCleanFlag);
716	719	nRoot = (int)strlen(g.zLocalRoot);
		@@ -1806,10 +1809,14 @@
1806	1809	** or --force flags is used, or unless this is a private check-in.
1807	1810	** The initial commit MUST have tags "trunk" and "sym-trunk".
1808	1811	*/
1809	1812	if( !vid ){
1810	1813	if( sCiInfo.zBranch==0 ){
	1814	+ if( allowFork==0 && forceFlag==0 && g.markPrivate==0
	1815	+ && db_exists("SELECT 1 from event where type='ci'") ){
	1816	+ fossil_fatal("would fork. \"update\" first or use --allow-fork.");
	1817	+ }
1811	1818	sCiInfo.zBranch = db_get("main-branch", "trunk");
1812	1819	}
1813	1820	}else if( sCiInfo.zBranch==0 && allowFork==0 && forceFlag==0
1814	1821	&& g.markPrivate==0 && !is_a_leaf(vid)
1815	1822	){
1816	1823

	--- src/checkin.c
	+++ src/checkin.c
	@@ -571,10 +571,12 @@
571
572	if( find_option("temp",0,0)!=0 ) scanFlags \|= SCAN_TEMP;
573	db_must_be_within_tree();
574	cwdRelative = determine_cwd_relative_option();
575


576	/* We should be done with options.. */
577	verify_all_options();
578
579	if( zIgnoreFlag==0 ){
580	zIgnoreFlag = db_get("ignore-glob", 0);
	@@ -707,10 +709,11 @@
707	zKeepFlag = db_get("keep-glob", 0);
708	}
709	if( zCleanFlag==0 ){
710	zCleanFlag = db_get("clean-glob", 0);
711	}

712	verify_all_options();
713	pIgnore = glob_create(zIgnoreFlag);
714	pKeep = glob_create(zKeepFlag);
715	pClean = glob_create(zCleanFlag);
716	nRoot = (int)strlen(g.zLocalRoot);
	@@ -1806,10 +1809,14 @@
1806	** or --force flags is used, or unless this is a private check-in.
1807	** The initial commit MUST have tags "trunk" and "sym-trunk".
1808	*/
1809	if( !vid ){
1810	if( sCiInfo.zBranch==0 ){




1811	sCiInfo.zBranch = db_get("main-branch", "trunk");
1812	}
1813	}else if( sCiInfo.zBranch==0 && allowFork==0 && forceFlag==0
1814	&& g.markPrivate==0 && !is_a_leaf(vid)
1815	){
1816

	--- src/checkin.c
	+++ src/checkin.c
	@@ -571,10 +571,12 @@
571
572	if( find_option("temp",0,0)!=0 ) scanFlags \|= SCAN_TEMP;
573	db_must_be_within_tree();
574	cwdRelative = determine_cwd_relative_option();
575
576	if( db_get_boolean("dotfiles", 0) ) scanFlags \|= SCAN_ALL;
577
578	/* We should be done with options.. */
579	verify_all_options();
580
581	if( zIgnoreFlag==0 ){
582	zIgnoreFlag = db_get("ignore-glob", 0);
	@@ -707,10 +709,11 @@
709	zKeepFlag = db_get("keep-glob", 0);
710	}
711	if( zCleanFlag==0 ){
712	zCleanFlag = db_get("clean-glob", 0);
713	}
714	if( db_get_boolean("dotfiles", 0) ) scanFlags \|= SCAN_ALL;
715	verify_all_options();
716	pIgnore = glob_create(zIgnoreFlag);
717	pKeep = glob_create(zKeepFlag);
718	pClean = glob_create(zCleanFlag);
719	nRoot = (int)strlen(g.zLocalRoot);
	@@ -1806,10 +1809,14 @@
1809	** or --force flags is used, or unless this is a private check-in.
1810	** The initial commit MUST have tags "trunk" and "sym-trunk".
1811	*/
1812	if( !vid ){
1813	if( sCiInfo.zBranch==0 ){
1814	if( allowFork==0 && forceFlag==0 && g.markPrivate==0
1815	&& db_exists("SELECT 1 from event where type='ci'") ){
1816	fossil_fatal("would fork. \"update\" first or use --allow-fork.");
1817	}
1818	sCiInfo.zBranch = db_get("main-branch", "trunk");
1819	}
1820	}else if( sCiInfo.zBranch==0 && allowFork==0 && forceFlag==0
1821	&& g.markPrivate==0 && !is_a_leaf(vid)
1822	){
1823

M src/clone.c

+2 -1

		--- src/clone.c
		+++ src/clone.c
		@@ -164,11 +164,11 @@
164	164	}else{
165	165	db_create_repository(g.argv[3]);
166	166	db_open_repository(g.argv[3]);
167	167	db_begin_transaction();
168	168	db_record_repository_filename(g.argv[3]);
169		- db_initial_setup(0, 0, zDefaultUser, 0);
	169	+ db_initial_setup(0, 0, zDefaultUser);
170	170	user_select();
171	171	db_set("content-schema", CONTENT_SCHEMA, 0);
172	172	db_set("aux-schema", AUX_SCHEMA_MAX, 0);
173	173	db_set("rebuilt", get_version(), 0);
174	174	remember_or_get_http_auth(zHttpAuth, urlFlags & URL_REMEMBER, g.argv[2]);
		@@ -182,10 +182,11 @@
182	182	blob_reset(&fn);
183	183	}
184	184	db_multi_exec(
185	185	"REPLACE INTO config(name,value,mtime)"
186	186	" VALUES('server-code', lower(hex(randomblob(20))), now());"
	187	+ "DELETE FROM config WHERE name='project-code';"
187	188	);
188	189	url_enable_proxy(0);
189	190	clone_ssh_db_set_options();
190	191	url_get_password_if_needed();
191	192	g.xlinkClusterOnly = 1;
192	193

	--- src/clone.c
	+++ src/clone.c
	@@ -164,11 +164,11 @@
164	}else{
165	db_create_repository(g.argv[3]);
166	db_open_repository(g.argv[3]);
167	db_begin_transaction();
168	db_record_repository_filename(g.argv[3]);
169	db_initial_setup(0, 0, zDefaultUser, 0);
170	user_select();
171	db_set("content-schema", CONTENT_SCHEMA, 0);
172	db_set("aux-schema", AUX_SCHEMA_MAX, 0);
173	db_set("rebuilt", get_version(), 0);
174	remember_or_get_http_auth(zHttpAuth, urlFlags & URL_REMEMBER, g.argv[2]);
	@@ -182,10 +182,11 @@
182	blob_reset(&fn);
183	}
184	db_multi_exec(
185	"REPLACE INTO config(name,value,mtime)"
186	" VALUES('server-code', lower(hex(randomblob(20))), now());"

187	);
188	url_enable_proxy(0);
189	clone_ssh_db_set_options();
190	url_get_password_if_needed();
191	g.xlinkClusterOnly = 1;
192

	--- src/clone.c
	+++ src/clone.c
	@@ -164,11 +164,11 @@
164	}else{
165	db_create_repository(g.argv[3]);
166	db_open_repository(g.argv[3]);
167	db_begin_transaction();
168	db_record_repository_filename(g.argv[3]);
169	db_initial_setup(0, 0, zDefaultUser);
170	user_select();
171	db_set("content-schema", CONTENT_SCHEMA, 0);
172	db_set("aux-schema", AUX_SCHEMA_MAX, 0);
173	db_set("rebuilt", get_version(), 0);
174	remember_or_get_http_auth(zHttpAuth, urlFlags & URL_REMEMBER, g.argv[2]);
	@@ -182,10 +182,11 @@
182	blob_reset(&fn);
183	}
184	db_multi_exec(
185	"REPLACE INTO config(name,value,mtime)"
186	" VALUES('server-code', lower(hex(randomblob(20))), now());"
187	"DELETE FROM config WHERE name='project-code';"
188	);
189	url_enable_proxy(0);
190	clone_ssh_db_set_options();
191	url_get_password_if_needed();
192	g.xlinkClusterOnly = 1;
193

M src/configure.c

+3 -1

		--- src/configure.c
		+++ src/configure.c
		@@ -97,10 +97,11 @@
97	97	{ "timeline-plaintext", CONFIGSET_SKIN },
98	98	{ "adunit", CONFIGSET_SKIN },
99	99	{ "adunit-omit-if-admin", CONFIGSET_SKIN },
100	100	{ "adunit-omit-if-user", CONFIGSET_SKIN },
101	101	{ "white-foreground", CONFIGSET_SKIN },
	102	+
102	103	#ifdef FOSSIL_ENABLE_TH1_DOCS
103	104	{ "th1-docs", CONFIGSET_TH1 },
104	105	#endif
105	106	#ifdef FOSSIL_ENABLE_TH1_HOOKS
106	107	{ "th1-hooks", CONFIGSET_TH1 },
		@@ -124,10 +125,11 @@
124	125	{ "keep-glob", CONFIGSET_PROJ },
125	126	{ "crnl-glob", CONFIGSET_PROJ },
126	127	{ "encoding-glob", CONFIGSET_PROJ },
127	128	{ "empty-dirs", CONFIGSET_PROJ },
128	129	{ "allow-symlinks", CONFIGSET_PROJ },
	130	+ { "dotfiles", CONFIGSET_PROJ },
129	131
130	132	{ "ticket-table", CONFIGSET_TKT },
131	133	{ "ticket-common", CONFIGSET_TKT },
132	134	{ "ticket-change", CONFIGSET_TKT },
133	135	{ "ticket-newpage", CONFIGSET_TKT },
		@@ -857,11 +859,11 @@
857	859	**
858	860	** Push the local configuration into the remote server identified
859	861	** by URL. Admin privilege is required on the remote server for
860	862	** this to work. When the same record exists both locally and on
861	863	** the remote end, the one that was most recently changed wins.
862		-** Use the --legacy flag when talking to holder servers.
	864	+** Use the --legacy flag when talking to older servers.
863	865	**
864	866	** %fossil configuration reset AREA
865	867	**
866	868	** Restore the configuration to the default. AREA as above.
867	869	**
868	870

	--- src/configure.c
	+++ src/configure.c
	@@ -97,10 +97,11 @@
97	{ "timeline-plaintext", CONFIGSET_SKIN },
98	{ "adunit", CONFIGSET_SKIN },
99	{ "adunit-omit-if-admin", CONFIGSET_SKIN },
100	{ "adunit-omit-if-user", CONFIGSET_SKIN },
101	{ "white-foreground", CONFIGSET_SKIN },

102	#ifdef FOSSIL_ENABLE_TH1_DOCS
103	{ "th1-docs", CONFIGSET_TH1 },
104	#endif
105	#ifdef FOSSIL_ENABLE_TH1_HOOKS
106	{ "th1-hooks", CONFIGSET_TH1 },
	@@ -124,10 +125,11 @@
124	{ "keep-glob", CONFIGSET_PROJ },
125	{ "crnl-glob", CONFIGSET_PROJ },
126	{ "encoding-glob", CONFIGSET_PROJ },
127	{ "empty-dirs", CONFIGSET_PROJ },
128	{ "allow-symlinks", CONFIGSET_PROJ },

129
130	{ "ticket-table", CONFIGSET_TKT },
131	{ "ticket-common", CONFIGSET_TKT },
132	{ "ticket-change", CONFIGSET_TKT },
133	{ "ticket-newpage", CONFIGSET_TKT },
	@@ -857,11 +859,11 @@
857	**
858	** Push the local configuration into the remote server identified
859	** by URL. Admin privilege is required on the remote server for
860	** this to work. When the same record exists both locally and on
861	** the remote end, the one that was most recently changed wins.
862	** Use the --legacy flag when talking to holder servers.
863	**
864	** %fossil configuration reset AREA
865	**
866	** Restore the configuration to the default. AREA as above.
867	**
868

	--- src/configure.c
	+++ src/configure.c
	@@ -97,10 +97,11 @@
97	{ "timeline-plaintext", CONFIGSET_SKIN },
98	{ "adunit", CONFIGSET_SKIN },
99	{ "adunit-omit-if-admin", CONFIGSET_SKIN },
100	{ "adunit-omit-if-user", CONFIGSET_SKIN },
101	{ "white-foreground", CONFIGSET_SKIN },
102
103	#ifdef FOSSIL_ENABLE_TH1_DOCS
104	{ "th1-docs", CONFIGSET_TH1 },
105	#endif
106	#ifdef FOSSIL_ENABLE_TH1_HOOKS
107	{ "th1-hooks", CONFIGSET_TH1 },
	@@ -124,10 +125,11 @@
125	{ "keep-glob", CONFIGSET_PROJ },
126	{ "crnl-glob", CONFIGSET_PROJ },
127	{ "encoding-glob", CONFIGSET_PROJ },
128	{ "empty-dirs", CONFIGSET_PROJ },
129	{ "allow-symlinks", CONFIGSET_PROJ },
130	{ "dotfiles", CONFIGSET_PROJ },
131
132	{ "ticket-table", CONFIGSET_TKT },
133	{ "ticket-common", CONFIGSET_TKT },
134	{ "ticket-change", CONFIGSET_TKT },
135	{ "ticket-newpage", CONFIGSET_TKT },
	@@ -857,11 +859,11 @@
859	**
860	** Push the local configuration into the remote server identified
861	** by URL. Admin privilege is required on the remote server for
862	** this to work. When the same record exists both locally and on
863	** the remote end, the one that was most recently changed wins.
864	** Use the --legacy flag when talking to older servers.
865	**
866	** %fossil configuration reset AREA
867	**
868	** Restore the configuration to the default. AREA as above.
869	**
870

M src/db.c

+11 -38

		--- src/db.c
		+++ src/db.c
		@@ -1475,42 +1475,10 @@
1475	1475	" VALUES('reader','','kptw','Reader');"
1476	1476	);
1477	1477	}
1478	1478	}
1479	1479
1480		-/*
1481		-** This function sets the server and project codes if they do not already
1482		-** exist. Currently, it should be called only by the db_initial_setup()
1483		-** or cmd_webserver() functions, the latter being used to facilitate more
1484		-** robust integration with "canned image" environments (e.g. Docker).
1485		-*/
1486		-void db_setup_server_and_project_codes(
1487		- int optional
1488		-){
1489		- if( !optional ){
1490		- db_multi_exec(
1491		- "INSERT INTO config(name,value,mtime)"
1492		- " VALUES('server-code', lower(hex(randomblob(20))),now());"
1493		- "INSERT INTO config(name,value,mtime)"
1494		- " VALUES('project-code', lower(hex(randomblob(20))),now());"
1495		- );
1496		- }else if( db_is_writeable("repository") ){
1497		- if( db_get("server-code", 0)==0 ) {
1498		- db_multi_exec(
1499		- "INSERT INTO config(name,value,mtime)"
1500		- " VALUES('server-code', lower(hex(randomblob(20))),now());"
1501		- );
1502		- }
1503		- if( db_get("project-code", 0)==0 ) {
1504		- db_multi_exec(
1505		- "INSERT INTO config(name,value,mtime)"
1506		- " VALUES('project-code', lower(hex(randomblob(20))),now());"
1507		- );
1508		- }
1509		- }
1510		-}
1511		-
1512	1480	/*
1513	1481	** Return a pointer to a string that contains the RHS of an IN operator
1514	1482	** that will select CONFIG table names that are in the list of control
1515	1483	** settings.
1516	1484	*/
		@@ -1548,23 +1516,25 @@
1548	1516	** not server and project codes are invented for this repository.
1549	1517	*/
1550	1518	void db_initial_setup(
1551	1519	const char zTemplate, / Repository from which to copy settings. */
1552	1520	const char zInitialDate, / Initial date of repository. (ex: "now") */
1553		- const char zDefaultUser, / Default user for the repository */
1554		- int makeServerCodes /* True to make new server & project codes */
	1521	+ const char zDefaultUser / Default user for the repository */
1555	1522	){
1556	1523	char *zDate;
1557	1524	Blob hash;
1558	1525	Blob manifest;
1559	1526
1560	1527	db_set("content-schema", CONTENT_SCHEMA, 0);
1561	1528	db_set("aux-schema", AUX_SCHEMA_MAX, 0);
1562	1529	db_set("rebuilt", get_version(), 0);
1563		- if( makeServerCodes ){
1564		- db_setup_server_and_project_codes(0);
1565		- }
	1530	+ db_multi_exec(
	1531	+ "INSERT INTO config(name,value,mtime)"
	1532	+ " VALUES('server-code', lower(hex(randomblob(20))),now());"
	1533	+ "INSERT INTO config(name,value,mtime)"
	1534	+ " VALUES('project-code', lower(hex(randomblob(20))),now());"
	1535	+ );
1566	1536	if( !db_is_global("autosync") ) db_set_int("autosync", 1, 0);
1567	1537	if( !db_is_global("localauth") ) db_set_int("localauth", 0, 0);
1568	1538	if( !db_is_global("timeline-plaintext") ){
1569	1539	db_set_int("timeline-plaintext", 1, 0);
1570	1540	}
		@@ -1687,11 +1657,11 @@
1687	1657	db_open_repository(g.argv[2]);
1688	1658	db_open_config(0);
1689	1659	if( zTemplate ) db_attach(zTemplate, "settingSrc");
1690	1660	db_begin_transaction();
1691	1661	if( zDate==0 ) zDate = "now";
1692		- db_initial_setup(zTemplate, zDate, zDefaultUser, 1);
	1662	+ db_initial_setup(zTemplate, zDate, zDefaultUser);
1693	1663	db_end_transaction(0);
1694	1664	if( zTemplate ) db_detach("settingSrc");
1695	1665	fossil_print("project-id: %s\n", db_get("project-code", 0));
1696	1666	fossil_print("server-id: %s\n", db_get("server-code", 0));
1697	1667	zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin);
		@@ -2375,10 +2345,11 @@
2375	2345	{ "crnl-glob", 0, 40, 1, 0, "" },
2376	2346	{ "default-perms", 0, 16, 0, 0, "u" },
2377	2347	{ "diff-binary", 0, 0, 0, 0, "on" },
2378	2348	{ "diff-command", 0, 40, 0, 0, "" },
2379	2349	{ "dont-push", 0, 0, 0, 0, "off" },
	2350	+ { "dotfiles", 0, 0, 0, 0, "off" },
2380	2351	{ "editor", 0, 32, 0, 0, "" },
2381	2352	{ "empty-dirs", 0, 40, 1, 0, "" },
2382	2353	{ "encoding-glob", 0, 40, 1, 0, "" },
2383	2354	{ "gdiff-command", 0, 40, 0, 0, "gdiff" },
2384	2355	{ "gmerge-command", 0, 40, 0, 0, "" },
		@@ -2535,10 +2506,12 @@
2535	2506	** diff-command External command to run when performing a diff.
2536	2507	** If undefined, the internal text diff will be used.
2537	2508	**
2538	2509	** dont-push Prevent this repository from pushing from client to
2539	2510	** server. Useful when setting up a private branch.
	2511	+**
	2512	+** dotfiles Include --dotfiles option for all compatible commands.
2540	2513	**
2541	2514	** editor Text editor command used for check-in comments.
2542	2515	**
2543	2516	** empty-dirs A comma or newline-separated list of pathnames. On
2544	2517	** (versionable) update and checkout commands, if no file or directory
2545	2518

	--- src/db.c
	+++ src/db.c
	@@ -1475,42 +1475,10 @@
1475	" VALUES('reader','','kptw','Reader');"
1476	);
1477	}
1478	}
1479
1480	/*
1481	** This function sets the server and project codes if they do not already
1482	** exist. Currently, it should be called only by the db_initial_setup()
1483	** or cmd_webserver() functions, the latter being used to facilitate more
1484	** robust integration with "canned image" environments (e.g. Docker).
1485	*/
1486	void db_setup_server_and_project_codes(
1487	int optional
1488	){
1489	if( !optional ){
1490	db_multi_exec(
1491	"INSERT INTO config(name,value,mtime)"
1492	" VALUES('server-code', lower(hex(randomblob(20))),now());"
1493	"INSERT INTO config(name,value,mtime)"
1494	" VALUES('project-code', lower(hex(randomblob(20))),now());"
1495	);
1496	}else if( db_is_writeable("repository") ){
1497	if( db_get("server-code", 0)==0 ) {
1498	db_multi_exec(
1499	"INSERT INTO config(name,value,mtime)"
1500	" VALUES('server-code', lower(hex(randomblob(20))),now());"
1501	);
1502	}
1503	if( db_get("project-code", 0)==0 ) {
1504	db_multi_exec(
1505	"INSERT INTO config(name,value,mtime)"
1506	" VALUES('project-code', lower(hex(randomblob(20))),now());"
1507	);
1508	}
1509	}
1510	}
1511
1512	/*
1513	** Return a pointer to a string that contains the RHS of an IN operator
1514	** that will select CONFIG table names that are in the list of control
1515	** settings.
1516	*/
	@@ -1548,23 +1516,25 @@
1548	** not server and project codes are invented for this repository.
1549	*/
1550	void db_initial_setup(
1551	const char zTemplate, / Repository from which to copy settings. */
1552	const char zInitialDate, / Initial date of repository. (ex: "now") */
1553	const char zDefaultUser, / Default user for the repository */
1554	int makeServerCodes /* True to make new server & project codes */
1555	){
1556	char *zDate;
1557	Blob hash;
1558	Blob manifest;
1559
1560	db_set("content-schema", CONTENT_SCHEMA, 0);
1561	db_set("aux-schema", AUX_SCHEMA_MAX, 0);
1562	db_set("rebuilt", get_version(), 0);
1563	if( makeServerCodes ){
1564	db_setup_server_and_project_codes(0);
1565	}



1566	if( !db_is_global("autosync") ) db_set_int("autosync", 1, 0);
1567	if( !db_is_global("localauth") ) db_set_int("localauth", 0, 0);
1568	if( !db_is_global("timeline-plaintext") ){
1569	db_set_int("timeline-plaintext", 1, 0);
1570	}
	@@ -1687,11 +1657,11 @@
1687	db_open_repository(g.argv[2]);
1688	db_open_config(0);
1689	if( zTemplate ) db_attach(zTemplate, "settingSrc");
1690	db_begin_transaction();
1691	if( zDate==0 ) zDate = "now";
1692	db_initial_setup(zTemplate, zDate, zDefaultUser, 1);
1693	db_end_transaction(0);
1694	if( zTemplate ) db_detach("settingSrc");
1695	fossil_print("project-id: %s\n", db_get("project-code", 0));
1696	fossil_print("server-id: %s\n", db_get("server-code", 0));
1697	zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin);
	@@ -2375,10 +2345,11 @@
2375	{ "crnl-glob", 0, 40, 1, 0, "" },
2376	{ "default-perms", 0, 16, 0, 0, "u" },
2377	{ "diff-binary", 0, 0, 0, 0, "on" },
2378	{ "diff-command", 0, 40, 0, 0, "" },
2379	{ "dont-push", 0, 0, 0, 0, "off" },

2380	{ "editor", 0, 32, 0, 0, "" },
2381	{ "empty-dirs", 0, 40, 1, 0, "" },
2382	{ "encoding-glob", 0, 40, 1, 0, "" },
2383	{ "gdiff-command", 0, 40, 0, 0, "gdiff" },
2384	{ "gmerge-command", 0, 40, 0, 0, "" },
	@@ -2535,10 +2506,12 @@
2535	** diff-command External command to run when performing a diff.
2536	** If undefined, the internal text diff will be used.
2537	**
2538	** dont-push Prevent this repository from pushing from client to
2539	** server. Useful when setting up a private branch.


2540	**
2541	** editor Text editor command used for check-in comments.
2542	**
2543	** empty-dirs A comma or newline-separated list of pathnames. On
2544	** (versionable) update and checkout commands, if no file or directory
2545

	--- src/db.c
	+++ src/db.c
	@@ -1475,42 +1475,10 @@
1475	" VALUES('reader','','kptw','Reader');"
1476	);
1477	}
1478	}
1479
































1480	/*
1481	** Return a pointer to a string that contains the RHS of an IN operator
1482	** that will select CONFIG table names that are in the list of control
1483	** settings.
1484	*/
	@@ -1548,23 +1516,25 @@
1516	** not server and project codes are invented for this repository.
1517	*/
1518	void db_initial_setup(
1519	const char zTemplate, / Repository from which to copy settings. */
1520	const char zInitialDate, / Initial date of repository. (ex: "now") */
1521	const char zDefaultUser / Default user for the repository */

1522	){
1523	char *zDate;
1524	Blob hash;
1525	Blob manifest;
1526
1527	db_set("content-schema", CONTENT_SCHEMA, 0);
1528	db_set("aux-schema", AUX_SCHEMA_MAX, 0);
1529	db_set("rebuilt", get_version(), 0);
1530	db_multi_exec(
1531	"INSERT INTO config(name,value,mtime)"
1532	" VALUES('server-code', lower(hex(randomblob(20))),now());"
1533	"INSERT INTO config(name,value,mtime)"
1534	" VALUES('project-code', lower(hex(randomblob(20))),now());"
1535	);
1536	if( !db_is_global("autosync") ) db_set_int("autosync", 1, 0);
1537	if( !db_is_global("localauth") ) db_set_int("localauth", 0, 0);
1538	if( !db_is_global("timeline-plaintext") ){
1539	db_set_int("timeline-plaintext", 1, 0);
1540	}
	@@ -1687,11 +1657,11 @@
1657	db_open_repository(g.argv[2]);
1658	db_open_config(0);
1659	if( zTemplate ) db_attach(zTemplate, "settingSrc");
1660	db_begin_transaction();
1661	if( zDate==0 ) zDate = "now";
1662	db_initial_setup(zTemplate, zDate, zDefaultUser);
1663	db_end_transaction(0);
1664	if( zTemplate ) db_detach("settingSrc");
1665	fossil_print("project-id: %s\n", db_get("project-code", 0));
1666	fossil_print("server-id: %s\n", db_get("server-code", 0));
1667	zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin);
	@@ -2375,10 +2345,11 @@
2345	{ "crnl-glob", 0, 40, 1, 0, "" },
2346	{ "default-perms", 0, 16, 0, 0, "u" },
2347	{ "diff-binary", 0, 0, 0, 0, "on" },
2348	{ "diff-command", 0, 40, 0, 0, "" },
2349	{ "dont-push", 0, 0, 0, 0, "off" },
2350	{ "dotfiles", 0, 0, 0, 0, "off" },
2351	{ "editor", 0, 32, 0, 0, "" },
2352	{ "empty-dirs", 0, 40, 1, 0, "" },
2353	{ "encoding-glob", 0, 40, 1, 0, "" },
2354	{ "gdiff-command", 0, 40, 0, 0, "gdiff" },
2355	{ "gmerge-command", 0, 40, 0, 0, "" },
	@@ -2535,10 +2506,12 @@
2506	** diff-command External command to run when performing a diff.
2507	** If undefined, the internal text diff will be used.
2508	**
2509	** dont-push Prevent this repository from pushing from client to
2510	** server. Useful when setting up a private branch.
2511	**
2512	** dotfiles Include --dotfiles option for all compatible commands.
2513	**
2514	** editor Text editor command used for check-in comments.
2515	**
2516	** empty-dirs A comma or newline-separated list of pathnames. On
2517	** (versionable) update and checkout commands, if no file or directory
2518

M src/doc.c

+1 -1

		--- src/doc.c
		+++ src/doc.c
		@@ -640,11 +640,11 @@
640	640	if( blob_size(&title)==0 ) blob_append(&title,zName,-1);
641	641	style_header("%s", blob_str(&title));
642	642	blob_append(cgi_output_blob(), blob_buffer(&filebody),blob_size(&filebody));
643	643	style_footer();
644	644	#ifdef FOSSIL_ENABLE_TH1_DOCS
645		- }else if( db_get_boolean("th1-docs", 0) &&
	645	+ }else if( Th_AreDocsEnabled() &&
646	646	fossil_strcmp(zMime, "application/x-th1")==0 ){
647	647	style_header("%h", zName);
648	648	Th_Render(blob_str(&filebody));
649	649	style_footer();
650	650	#endif
651	651

	--- src/doc.c
	+++ src/doc.c
	@@ -640,11 +640,11 @@
640	if( blob_size(&title)==0 ) blob_append(&title,zName,-1);
641	style_header("%s", blob_str(&title));
642	blob_append(cgi_output_blob(), blob_buffer(&filebody),blob_size(&filebody));
643	style_footer();
644	#ifdef FOSSIL_ENABLE_TH1_DOCS
645	}else if( db_get_boolean("th1-docs", 0) &&
646	fossil_strcmp(zMime, "application/x-th1")==0 ){
647	style_header("%h", zName);
648	Th_Render(blob_str(&filebody));
649	style_footer();
650	#endif
651

	--- src/doc.c
	+++ src/doc.c
	@@ -640,11 +640,11 @@
640	if( blob_size(&title)==0 ) blob_append(&title,zName,-1);
641	style_header("%s", blob_str(&title));
642	blob_append(cgi_output_blob(), blob_buffer(&filebody),blob_size(&filebody));
643	style_footer();
644	#ifdef FOSSIL_ENABLE_TH1_DOCS
645	}else if( Th_AreDocsEnabled() &&
646	fossil_strcmp(zMime, "application/x-th1")==0 ){
647	style_header("%h", zName);
648	Th_Render(blob_str(&filebody));
649	style_footer();
650	#endif
651

M src/import.c

+847 -17

		--- src/import.c
		+++ src/import.c
		@@ -12,12 +12,12 @@
12	12	** Author contact information:
13	13	** [email protected]
14	14	**
15	15	*******************************************************************************
16	16	**
17		-** This file contains code used to import the content of a Git
18		-** repository in the git-fast-import format as a new Fossil
	17	+** This file contains code used to import the content of a Git/SVN
	18	+** repository in the git-fast-import/svn-dump formats as a new Fossil
19	19	** repository.
20	20	*/
21	21	#include "config.h"
22	22	#include "import.h"
23	23	#include <assert.h>
		@@ -516,12 +516,12 @@
516	516	** last commit that holds that tag.
517	517	**
518	518	** None of the above is explained in the git-fast-export
519	519	** documentation. We had to figure it out via trial and error.
520	520	*/
521		- for(i=strlen(z)-1; i>=0 && z[i]!='/'; i--){}
522		- gg.tagCommit = strncmp(&z[i-4], "tags", 4)==0; /* True for pattern B */
	521	+ for(i=5; i<strlen(z) && z[i]!='/'; i++){}
	522	+ gg.tagCommit = strncmp(&z[5], "tags", 4)==0; /* True for pattern B */
523	523	if( z[i+1]!=0 ) z += i+1;
524	524	if( fossil_strcmp(z, "master")==0 ) z = "trunk";
525	525	gg.zBranch = fossil_strdup(z);
526	526	gg.fromLoaded = 0;
527	527	}else
		@@ -716,46 +716,822 @@
716	716	malformed_line:
717	717	trim_newline(zLine);
718	718	fossil_fatal("bad fast-import line: [%s]", zLine);
719	719	return;
720	720	}
	721	+
	722	+static struct{
	723	+ int rev; /* SVN revision number */
	724	+ char zDate; / Date/time stamp */
	725	+ char zUser; / User name */
	726	+ char zComment; / Comment of a commit */
	727	+ const char zTrunk; / Name of trunk folder in repo root */
	728	+ int lenTrunk; /* String length of zTrunk */
	729	+ const char zBranches; / Name of branches folder in repo root */
	730	+ int lenBranches; /* String length of zBranches */
	731	+ const char zTags; / Name of tags folder in repo root */
	732	+ int lenTags; /* String length of zTags */
	733	+ Bag newBranches; /* Branches that were created in this revision */
	734	+ int incrFlag; /* Add svn-rev-nn tags on every checkin */
	735	+} gsvn;
	736	+typedef struct {
	737	+ char *zKey;
	738	+ char *zVal;
	739	+} KeyVal;
	740	+typedef struct {
	741	+ KeyVal *aHeaders;
	742	+ int nHeaders;
	743	+ char *pRawProps;
	744	+ KeyVal *aProps;
	745	+ int nProps;
	746	+ Blob content;
	747	+ int contentFlag;
	748	+} SvnRecord;
	749	+
	750	+#define svn_find_header(rec, zHeader) \
	751	+ svn_find_keyval((rec).aHeaders, (rec).nHeaders, (zHeader))
	752	+#define svn_find_prop(rec, zProp) \
	753	+ svn_find_keyval((rec).aProps, (rec).nProps, (zProp))
	754	+static char *svn_find_keyval(
	755	+ KeyVal *aKeyVal,
	756	+ int nKeyVal,
	757	+ const char *zKey
	758	+){
	759	+ int i;
	760	+ for(i=0; i<nKeyVal; i++){
	761	+ if( fossil_strcmp(aKeyVal[i].zKey, zKey)==0 ){
	762	+ return aKeyVal[i].zVal;
	763	+ }
	764	+ }
	765	+ return 0;
	766	+}
	767	+
	768	+static void svn_free_rec(SvnRecord *rec){
	769	+ int i;
	770	+ for(i=0; i<rec->nHeaders; i++){
	771	+ fossil_free(rec->aHeaders[i].zKey);
	772	+ }
	773	+ fossil_free(rec->aHeaders);
	774	+ fossil_free(rec->aProps);
	775	+ fossil_free(rec->pRawProps);
	776	+ blob_reset(&rec->content);
	777	+}
	778	+
	779	+static int svn_read_headers(FILE pIn, SvnRecord rec){
	780	+ char zLine[1000];
	781	+
	782	+ rec->aHeaders = 0;
	783	+ rec->nHeaders = 0;
	784	+ while( fgets(zLine, sizeof(zLine), pIn) ){
	785	+ if( zLine[0]!='\n' ) break;
	786	+ }
	787	+ if( feof(pIn) ) return 0;
	788	+ do{
	789	+ char *sep;
	790	+ if( zLine[0]=='\n' ) break;
	791	+ rec->nHeaders += 1;
	792	+ rec->aHeaders = fossil_realloc(rec->aHeaders,
	793	+ sizeof(rec->aHeaders[0])*rec->nHeaders);
	794	+ rec->aHeaders[rec->nHeaders-1].zKey = mprintf("%s", zLine);
	795	+ sep = strchr(rec->aHeaders[rec->nHeaders-1].zKey, ':');
	796	+ if( !sep ){
	797	+ trim_newline(zLine);
	798	+ fossil_fatal("bad header line: [%s]", zLine);
	799	+ }
	800	+ *sep = 0;
	801	+ rec->aHeaders[rec->nHeaders-1].zVal = sep+1;
	802	+ sep = strchr(rec->aHeaders[rec->nHeaders-1].zVal, '\n');
	803	+ *sep = 0;
	804	+ while(rec->aHeaders[rec->nHeaders-1].zVal
	805	+ && fossil_isspace(*(rec->aHeaders[rec->nHeaders-1].zVal)) )
	806	+ {
	807	+ rec->aHeaders[rec->nHeaders-1].zVal++;
	808	+ }
	809	+ }while( fgets(zLine, sizeof(zLine), pIn) );
	810	+ if( zLine[0]!='\n' ){
	811	+ trim_newline(zLine);
	812	+ fossil_fatal("svn-dump data ended unexpectedly");
	813	+ }
	814	+ return 1;
	815	+}
	816	+
	817	+static void svn_read_props(FILE pIn, SvnRecord rec){
	818	+ int nRawProps = 0;
	819	+ char *pRawProps;
	820	+ const char *zLen;
	821	+
	822	+ rec->pRawProps = 0;
	823	+ rec->aProps = 0;
	824	+ rec->nProps = 0;
	825	+ zLen = svn_find_header(*rec, "Prop-content-length");
	826	+ if( zLen ){
	827	+ nRawProps = atoi(zLen);
	828	+ }
	829	+ if( nRawProps ){
	830	+ int got;
	831	+ char *zLine;
	832	+ rec->pRawProps = pRawProps = fossil_malloc( nRawProps );
	833	+ got = fread(rec->pRawProps, 1, nRawProps, pIn);
	834	+ if( got!=nRawProps ){
	835	+ fossil_fatal("short read: got %d of %d bytes", got, nRawProps);
	836	+ }
	837	+ if( memcmp(&pRawProps[got-10], "PROPS-END\n", 10)!=0 ){
	838	+ fossil_fatal("svn-dump data ended unexpectedly");
	839	+ }
	840	+ zLine = pRawProps;
	841	+ while( zLine<(pRawProps+nRawProps-10) ){
	842	+ char *eol;
	843	+ int propLen;
	844	+ if( zLine[0]=='D' ){
	845	+ propLen = atoi(&zLine[2]);
	846	+ eol = strchr(zLine, '\n');
	847	+ zLine = eol+1+propLen+1;
	848	+ }else{
	849	+ if( zLine[0]!='K' ){
	850	+ fossil_fatal("svn-dump data format broken");
	851	+ }
	852	+ propLen = atoi(&zLine[2]);
	853	+ eol = strchr(zLine, '\n');
	854	+ zLine = eol+1;
	855	+ eol = zLine+propLen;
	856	+ if( *eol!='\n' ){
	857	+ fossil_fatal("svn-dump data format broken");
	858	+ }
	859	+ *eol = 0;
	860	+ rec->nProps += 1;
	861	+ rec->aProps = fossil_realloc(rec->aProps,
	862	+ sizeof(rec->aProps[0])*rec->nProps);
	863	+ rec->aProps[rec->nProps-1].zKey = zLine;
	864	+ zLine = eol+1;
	865	+ if( zLine[0]!='V' ){
	866	+ fossil_fatal("svn-dump data format broken");
	867	+ }
	868	+ propLen = atoi(&zLine[2]);
	869	+ eol = strchr(zLine, '\n');
	870	+ zLine = eol+1;
	871	+ eol = zLine+propLen;
	872	+ if( *eol!='\n' ){
	873	+ fossil_fatal("svn-dump data format broken");
	874	+ }
	875	+ *eol = 0;
	876	+ rec->aProps[rec->nProps-1].zVal = zLine;
	877	+ zLine = eol+1;
	878	+ }
	879	+ }
	880	+ }
	881	+}
	882	+
	883	+static int svn_read_rec(FILE pIn, SvnRecord rec){
	884	+ const char *zLen;
	885	+ int nLen = 0;
	886	+ if( svn_read_headers(pIn, rec)==0 ) return 0;
	887	+ svn_read_props(pIn, rec);
	888	+ blob_zero(&rec->content);
	889	+ zLen = svn_find_header(*rec, "Text-content-length");
	890	+ if( zLen ){
	891	+ rec->contentFlag = 1;
	892	+ nLen = atoi(zLen);
	893	+ blob_read_from_channel(&rec->content, pIn, nLen);
	894	+ if( blob_size(&rec->content)!=nLen ){
	895	+ fossil_fatal("short read: got %d of %d bytes",
	896	+ blob_size(&rec->content), nLen
	897	+ );
	898	+ }
	899	+ }else{
	900	+ rec->contentFlag = 0;
	901	+ }
	902	+ return 1;
	903	+}
	904	+
	905	+/*
	906	+** Returns the UUID for the RID, or NULL if not found.
	907	+** The returned string is allocated via db_text() and must be
	908	+** free()d by the caller.
	909	+*/
	910	+char * rid_to_uuid(int rid)
	911	+{
	912	+ return db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
	913	+}
	914	+
	915	+#define SVN_UNKNOWN 0
	916	+#define SVN_TRUNK 1
	917	+#define SVN_BRANCH 2
	918	+#define SVN_TAG 3
	919	+
	920	+#define MAX_INT_32 (0x7FFFFFFFL)
	921	+
	922	+static void svn_finish_revision(){
	923	+ Blob manifest;
	924	+ static Stmt getChanges;
	925	+ static Stmt getFiles;
	926	+ static Stmt setRid;
	927	+ Blob mcksum;
	928	+
	929	+ blob_zero(&manifest);
	930	+ db_static_prepare(&getChanges, "SELECT tid, tname, ttype, tparent"
	931	+ " FROM xrevisions, xbranches ON (tbranch=tid)"
	932	+ " WHERE trid ISNULL");
	933	+ db_static_prepare(&getFiles, "SELECT tpath, tuuid, tperm FROM xfiles"
	934	+ " WHERE tbranch=:branch ORDER BY tpath");
	935	+ db_prepare(&setRid, "UPDATE xrevisions SET trid=:rid"
	936	+ " WHERE trev=%d AND tbranch=:branch", gsvn.rev);
	937	+ while( db_step(&getChanges)==SQLITE_ROW ){
	938	+ int branchId = db_column_int(&getChanges, 0);
	939	+ const char *zBranch = db_column_text(&getChanges, 1);
	940	+ int branchType = db_column_int(&getChanges, 2);
	941	+ int parentRid = db_column_int(&getChanges, 3);
	942	+ int mergeRid = parentRid;
	943	+ Manifest *pParentManifest = 0;
	944	+ ManifestFile *pParentFile = 0;
	945	+ int sameAsParent = 1;
	946	+ int parentBranch = 0;
	947	+ if( !bag_find(&gsvn.newBranches, branchId) ){
	948	+ parentRid = db_int(0, "SELECT trid, max(trev) FROM xrevisions"
	949	+ " WHERE trev<%d AND tbranch=%d",
	950	+ gsvn.rev, branchId);
	951	+ }
	952	+ if( parentRid>0 ){
	953	+ pParentManifest = manifest_get(parentRid, CFTYPE_MANIFEST, 0);
	954	+ pParentFile = manifest_file_next(pParentManifest, 0);
	955	+ parentBranch = db_int(0, "SELECT tbranch FROM xrevisions WHERE trid=%d",
	956	+ parentRid);
	957	+ if( parentBranch!=branchId && branchType!=SVN_TAG ){
	958	+ sameAsParent = 0;
	959	+ }
	960	+ }
	961	+ if( mergeRid<MAX_INT_32 ){
	962	+ if( gsvn.zComment ){
	963	+ blob_appendf(&manifest, "C %F\n", gsvn.zComment);
	964	+ }else{
	965	+ blob_append(&manifest, "C (no\\scomment)\n", 16);
	966	+ }
	967	+ blob_appendf(&manifest, "D %s\n", gsvn.zDate);
	968	+ db_bind_int(&getFiles, ":branch", branchId);
	969	+ while( db_step(&getFiles)==SQLITE_ROW ){
	970	+ const char *zFile = db_column_text(&getFiles, 0);
	971	+ const char *zUuid = db_column_text(&getFiles, 1);
	972	+ const char *zPerm = db_column_text(&getFiles, 2);
	973	+ if( zPerm ){
	974	+ blob_appendf(&manifest, "F %F %s %s\n", zFile, zUuid, zPerm);
	975	+ }else{
	976	+ blob_appendf(&manifest, "F %F %s\n", zFile, zUuid);
	977	+ }
	978	+ if( sameAsParent ){
	979	+ if( !pParentFile
	980	+ \|\| fossil_strcmp(pParentFile->zName,zFile)!=0
	981	+ \|\| fossil_strcmp(pParentFile->zUuid,zUuid)!=0
	982	+ \|\| fossil_strcmp(pParentFile->zPerm,zPerm)!=0
	983	+ ){
	984	+ sameAsParent = 0;
	985	+ }else{
	986	+ pParentFile = manifest_file_next(pParentManifest, 0);
	987	+ }
	988	+ }
	989	+ }
	990	+ if( pParentFile ){
	991	+ sameAsParent = 0;
	992	+ }
	993	+ db_reset(&getFiles);
	994	+ if( !sameAsParent ){
	995	+ if( parentRid>0 ){
	996	+ char *zParentUuid = rid_to_uuid(parentRid);
	997	+ if( parentRid==mergeRid \|\| mergeRid==0){
	998	+ char *zParentBranch =
	999	+ db_text(0, "SELECT tname FROM xbranches WHERE tid=%d",
	1000	+ parentBranch
	1001	+ );
	1002	+ blob_appendf(&manifest, "P %s\n", zParentUuid);
	1003	+ blob_appendf(&manifest, "T branch %F\n", zBranch);
	1004	+ blob_appendf(&manifest, "T sym-%F \n", zBranch);
	1005	+ if( gsvn.incrFlag ){
	1006	+ blob_appendf(&manifest, "T +sym-svn-rev-%d *\n", gsvn.rev);
	1007	+ }
	1008	+ blob_appendf(&manifest, "T -sym-%F *\n", zParentBranch);
	1009	+ fossil_free(zParentBranch);
	1010	+ }else{
	1011	+ char *zMergeUuid = rid_to_uuid(mergeRid);
	1012	+ blob_appendf(&manifest, "P %s %s\n", zParentUuid, zMergeUuid);
	1013	+ if( gsvn.incrFlag ){
	1014	+ blob_appendf(&manifest, "T +sym-svn-rev-%d *\n", gsvn.rev);
	1015	+ }
	1016	+ fossil_free(zMergeUuid);
	1017	+ }
	1018	+ fossil_free(zParentUuid);
	1019	+ }else{
	1020	+ blob_appendf(&manifest, "T branch %F\n", zBranch);
	1021	+ blob_appendf(&manifest, "T sym-%F \n", zBranch);
	1022	+ if( gsvn.incrFlag ){
	1023	+ blob_appendf(&manifest, "T +sym-svn-rev-%d *\n", gsvn.rev);
	1024	+ }
	1025	+ }
	1026	+ }else if( branchType==SVN_TAG ){
	1027	+ char *zParentUuid = rid_to_uuid(parentRid);
	1028	+ blob_reset(&manifest);
	1029	+ blob_appendf(&manifest, "D %s\n", gsvn.zDate);
	1030	+ blob_appendf(&manifest, "T +sym-%F %s\n", zBranch, zParentUuid);
	1031	+ fossil_free(zParentUuid);
	1032	+ }
	1033	+ }else{
	1034	+ char *zParentUuid = rid_to_uuid(parentRid);
	1035	+ blob_appendf(&manifest, "D %s\n", gsvn.zDate);
	1036	+ if( branchType!=SVN_TAG ){
	1037	+ blob_appendf(&manifest, "T +closed %s\n", zParentUuid);
	1038	+ }else{
	1039	+ blob_appendf(&manifest, "T -sym-%F %s\n", zBranch, zParentUuid);
	1040	+ }
	1041	+ fossil_free(zParentUuid);
	1042	+ }
	1043	+ if( gsvn.zUser ){
	1044	+ blob_appendf(&manifest, "U %F\n", gsvn.zUser);
	1045	+ }else{
	1046	+ const char *zUserOvrd = find_option("user-override",0,1);
	1047	+ blob_appendf(&manifest, "U %F\n", zUserOvrd ? zUserOvrd : login_name());
	1048	+ }
	1049	+ md5sum_blob(&manifest, &mcksum);
	1050	+ blob_appendf(&manifest, "Z %b\n", &mcksum);
	1051	+ blob_reset(&mcksum);
	1052	+ if( !sameAsParent ){
	1053	+ int rid = content_put(&manifest);
	1054	+ db_bind_int(&setRid, ":branch", branchId);
	1055	+ db_bind_int(&setRid, ":rid", rid);
	1056	+ db_step(&setRid);
	1057	+ db_reset(&setRid);
	1058	+ }else if( branchType==SVN_TAG ){
	1059	+ content_put(&manifest);
	1060	+ db_bind_int(&setRid, ":branch", branchId);
	1061	+ db_bind_int(&setRid, ":rid", parentRid);
	1062	+ db_step(&setRid);
	1063	+ db_reset(&setRid);
	1064	+ }else if( mergeRid==MAX_INT_32 ){
	1065	+ content_put(&manifest);
	1066	+ db_multi_exec("DELETE FROM xrevisions WHERE tbranch=%d AND trev=%d",
	1067	+ branchId, gsvn.rev);
	1068	+ }else{
	1069	+ db_multi_exec("DELETE FROM xrevisions WHERE tbranch=%d AND trev=%d",
	1070	+ branchId, gsvn.rev);
	1071	+ }
	1072	+ blob_reset(&manifest);
	1073	+ manifest_destroy(pParentManifest);
	1074	+ }
	1075	+ db_reset(&getChanges);
	1076	+ db_finalize(&setRid);
	1077	+}
	1078	+
	1079	+static u64 svn_get_varint(const char **pz){
	1080	+ unsigned int v = 0;
	1081	+ do{
	1082	+ v = (v<<7) \| ((*pz)[0]&0x7f);
	1083	+ }while( (*pz)++[0]&0x80 );
	1084	+ return v;
	1085	+}
	1086	+
	1087	+static void svn_apply_svndiff(Blob pDiff, Blob pSrc, Blob *pOut){
	1088	+ const char *zDiff = blob_buffer(pDiff);
	1089	+ char *zOut;
	1090	+ if( blob_size(pDiff)<4 \|\| memcmp(zDiff, "SVN", 4)!=0 ){
	1091	+ fossil_fatal("Invalid svndiff0 format");
	1092	+ }
	1093	+ zDiff += 4;
	1094	+ blob_zero(pOut);
	1095	+ while( zDiff<(blob_buffer(pDiff)+blob_size(pDiff)) ){
	1096	+ u64 lenOut, lenInst, lenData, lenOld;
	1097	+ const char *zInst;
	1098	+ const char *zData;
	1099	+
	1100	+ u64 offSrc = svn_get_varint(&zDiff);
	1101	+ /lenSrc =/ svn_get_varint(&zDiff);
	1102	+ lenOut = svn_get_varint(&zDiff);
	1103	+ lenInst = svn_get_varint(&zDiff);
	1104	+ lenData = svn_get_varint(&zDiff);
	1105	+ zInst = zDiff;
	1106	+ zData = zInst+lenInst;
	1107	+ lenOld = blob_size(pOut);
	1108	+ blob_resize(pOut, lenOut+lenOld);
	1109	+ zOut = blob_buffer(pOut)+lenOld;
	1110	+ while( zDiff<zInst+lenInst ){
	1111	+ u64 lenCpy = (*zDiff)&0x3f;
	1112	+ const char *zCpy;
	1113	+ switch( (*zDiff)&0xC0 ){
	1114	+ case 0x00: zCpy = blob_buffer(pSrc)+offSrc; break;
	1115	+ case 0x40: zCpy = blob_buffer(pOut); break;
	1116	+ case 0x80: zCpy = zData; break;
	1117	+ default: fossil_fatal("Invalid svndiff0 instruction");
	1118	+ }
	1119	+ zDiff++;
	1120	+ if( lenCpy==0 ){
	1121	+ lenCpy = svn_get_varint(&zDiff);
	1122	+ }
	1123	+ if( zCpy!=zData ){
	1124	+ zCpy += svn_get_varint(&zDiff);
	1125	+ }else{
	1126	+ zData += lenCpy;
	1127	+ }
	1128	+ while( lenCpy-- > 0 ){
	1129	+ zOut++ = zCpy++;
	1130	+ }
	1131	+ }
	1132	+ zDiff += lenData;
	1133	+ }
	1134	+}
	1135	+
	1136	+/*
	1137	+** Extract the branch or tag that the given path is on. Return the branch ID.
	1138	+ */
	1139	+static int svn_parse_path(char zPath, char zFile, int type){
	1140	+ char *zBranch = 0;
	1141	+ int branchId = 0;
	1142	+ *type = SVN_UNKNOWN;
	1143	+ *zFile = 0;
	1144	+ if( gsvn.lenTrunk==0 ){
	1145	+ zBranch = "trunk";
	1146	+ *zFile = zPath;
	1147	+ *type = SVN_TRUNK;
	1148	+ }else
	1149	+ if( strncmp(zPath, gsvn.zTrunk, gsvn.lenTrunk-1)==0 ){
	1150	+ if( zPath[gsvn.lenTrunk-1]=='/' \|\| zPath[gsvn.lenTrunk-1]==0 ){
	1151	+ zBranch = "trunk";
	1152	+ *zFile = zPath+gsvn.lenTrunk;
	1153	+ *type = SVN_TRUNK;
	1154	+ }else{
	1155	+ zBranch = 0;
	1156	+ *type = SVN_UNKNOWN;
	1157	+ }
	1158	+ }else{
	1159	+ if( strncmp(zPath, gsvn.zBranches, gsvn.lenBranches)==0 ){
	1160	+ *zFile = zBranch = zPath+gsvn.lenBranches;
	1161	+ *type = SVN_BRANCH;
	1162	+ }else
	1163	+ if( strncmp(zPath, gsvn.zTags, gsvn.lenTags)==0 ){
	1164	+ *zFile = zBranch = zPath+gsvn.lenTags;
	1165	+ *type = SVN_TAG;
	1166	+ }else{ /* Not a branch, tag or trunk */
	1167	+ return 0;
	1168	+ }
	1169	+ while( zFile && zFile!='/' ){ (*zFile)++; }
	1170	+ if( **zFile ){
	1171	+ **zFile = '\0';
	1172	+ (*zFile)++;
	1173	+ }
	1174	+ }
	1175	+ if( *type!=SVN_UNKNOWN ){
	1176	+ branchId = db_int(0,
	1177	+ "SELECT tid FROM xbranches WHERE tname=%Q AND ttype=%d",
	1178	+ zBranch, *type);
	1179	+ if( branchId==0 ){
	1180	+ db_multi_exec("INSERT INTO xbranches (tname, ttype) VALUES(%Q, %d)",
	1181	+ zBranch, *type);
	1182	+ branchId = db_last_insert_rowid();
	1183	+ }
	1184	+ }
	1185	+ return branchId;
	1186	+}
	1187	+
	1188	+/*
	1189	+** Read the svn-dump format from pIn and insert the corresponding
	1190	+** content into the database.
	1191	+*/
	1192	+static void svn_dump_import(FILE *pIn){
	1193	+ SvnRecord rec;
	1194	+ int ver;
	1195	+ char *zTemp;
	1196	+ const char *zUuid;
	1197	+ Stmt addFile;
	1198	+ Stmt delPath;
	1199	+ Stmt addRev;
	1200	+ Stmt cpyPath;
	1201	+ Stmt cpyRoot;
	1202	+ Stmt revSrc;
	1203	+
	1204	+ /* version */
	1205	+ if( svn_read_rec(pIn, &rec)
	1206	+ && (zTemp = svn_find_header(rec, "SVN-fs-dump-format-version")) ){
	1207	+ ver = atoi(zTemp);
	1208	+ if( ver!=2 && ver!=3 ){
	1209	+ fossil_fatal("Unknown svn-dump format version: %d", ver);
	1210	+ }
	1211	+ }else{
	1212	+ fossil_fatal("Input is not an svn-dump!");
	1213	+ }
	1214	+ svn_free_rec(&rec);
	1215	+ /* UUID */
	1216	+ if( !svn_read_rec(pIn, &rec) \|\| !(zUuid = svn_find_header(rec, "UUID")) ){
	1217	+ /* Removed the following line since UUID is not actually used
	1218	+ fossil_fatal("Missing UUID!"); */
	1219	+ }
	1220	+ svn_free_rec(&rec);
	1221	+
	1222	+ /* content */
	1223	+ db_prepare(&addFile,
	1224	+ "INSERT INTO xfiles (tpath, tbranch, tuuid, tperm)"
	1225	+ " VALUES(:path, :branch, (SELECT uuid FROM blob WHERE rid=:rid), :perm)"
	1226	+ );
	1227	+ db_prepare(&delPath,
	1228	+ "DELETE FROM xfiles"
	1229	+ " WHERE (tpath=:path OR (tpath>:path\|\|'/' AND tpath<:path\|\|'0'))"
	1230	+ " AND tbranch=:branch"
	1231	+ );
	1232	+ db_prepare(&addRev,
	1233	+ "INSERT OR IGNORE INTO xrevisions (trev, tbranch) VALUES(:rev, :branch)"
	1234	+ );
	1235	+ db_prepare(&cpyPath,
	1236	+ "INSERT INTO xfiles (tpath, tbranch, tuuid, tperm)"
	1237	+ " SELECT :path\|\|:sep\|\|substr(filename, length(:srcpath)+2), :branch, uuid, perm"
	1238	+ " FROM xfoci"
	1239	+ " WHERE checkinID=:rid"
	1240	+ " AND filename>:srcpath\|\|'/'"
	1241	+ " AND filename<:srcpath\|\|'0'"
	1242	+ );
	1243	+ db_prepare(&cpyRoot,
	1244	+ "INSERT INTO xfiles (tpath, tbranch, tuuid, tperm)"
	1245	+ " SELECT :path\|\|:sep\|\|filename, :branch, uuid, perm"
	1246	+ " FROM xfoci"
	1247	+ " WHERE checkinID=:rid"
	1248	+ );
	1249	+ db_prepare(&revSrc,
	1250	+ "UPDATE xrevisions SET tparent=:parent"
	1251	+ " WHERE trev=:rev AND tbranch=:branch AND tparent<:parent"
	1252	+ );
	1253	+ gsvn.rev = -1;
	1254	+ bag_init(&gsvn.newBranches);
	1255	+ while( svn_read_rec(pIn, &rec) ){
	1256	+ if( (zTemp = svn_find_header(rec, "Revision-number")) ){ /* revision node */
	1257	+ /* finish previous revision */
	1258	+ char *zDate = NULL;
	1259	+ if( gsvn.rev>=0 ){
	1260	+ svn_finish_revision();
	1261	+ fossil_free(gsvn.zUser);
	1262	+ fossil_free(gsvn.zComment);
	1263	+ fossil_free(gsvn.zDate);
	1264	+ bag_clear(&gsvn.newBranches);
	1265	+ }
	1266	+ /* start new revision */
	1267	+ gsvn.rev = atoi(zTemp);
	1268	+ gsvn.zUser = mprintf("%s", svn_find_prop(rec, "svn:author"));
	1269	+ gsvn.zComment = mprintf("%s", svn_find_prop(rec, "svn:log"));
	1270	+ zDate = svn_find_prop(rec, "svn:date");
	1271	+ if( zDate ){
	1272	+ gsvn.zDate = date_in_standard_format(zDate);
	1273	+ }else{
	1274	+ gsvn.zDate = date_in_standard_format("now");
	1275	+ }
	1276	+ db_bind_int(&addRev, ":rev", gsvn.rev);
	1277	+ fossil_print("\rImporting SVN revision: %d", gsvn.rev);
	1278	+ }else
	1279	+ if( (zTemp = svn_find_header(rec, "Node-path")) ){ /* file/dir node */
	1280	+ char *zFile;
	1281	+ int branchType;
	1282	+ int branchId = svn_parse_path(zTemp, &zFile, &branchType);
	1283	+ char *zAction = svn_find_header(rec, "Node-action");
	1284	+ char *zKind = svn_find_header(rec, "Node-kind");
	1285	+ char *zPerm = svn_find_prop(rec, "svn:executable") ? "x" : 0;
	1286	+ int deltaFlag = 0;
	1287	+ int srcRev = 0;
	1288	+ if( branchId==0 ){
	1289	+ svn_free_rec(&rec);
	1290	+ continue;
	1291	+ }
	1292	+ if( (zTemp = svn_find_header(rec, "Text-delta")) ){
	1293	+ deltaFlag = strncmp(zTemp, "true", 4)==0;
	1294	+ }
	1295	+ if( strncmp(zAction, "delete", 6)==0
	1296	+ \|\| strncmp(zAction, "replace", 7)==0 )
	1297	+ {
	1298	+ db_bind_int(&addRev, ":branch", branchId);
	1299	+ db_step(&addRev);
	1300	+ db_reset(&addRev);
	1301	+ if( zFile[0]!=0 ){
	1302	+ db_bind_text(&delPath, ":path", zFile);
	1303	+ db_bind_int(&delPath, ":branch", branchId);
	1304	+ db_step(&delPath);
	1305	+ db_reset(&delPath);
	1306	+ }else{
	1307	+ db_multi_exec("DELETE FROM xfiles WHERE tbranch=%d", branchId);
	1308	+ db_bind_int(&revSrc, ":parent", MAX_INT_32);
	1309	+ db_bind_int(&revSrc, ":rev", gsvn.rev);
	1310	+ db_bind_int(&revSrc, ":branch", branchId);
	1311	+ db_step(&revSrc);
	1312	+ db_reset(&revSrc);
	1313	+ }
	1314	+ } /* no 'else' here since 'replace' does both a 'delete' and an 'add' */
	1315	+ if( strncmp(zAction, "add", 3)==0
	1316	+ \|\| strncmp(zAction, "replace", 7)==0 )
	1317	+ {
	1318	+ char *zSrcPath = svn_find_header(rec, "Node-copyfrom-path");
	1319	+ char *zSrcFile;
	1320	+ int srcRid = 0;
	1321	+ if( zSrcPath ){
	1322	+ int srcBranch;
	1323	+ zTemp = svn_find_header(rec, "Node-copyfrom-rev");
	1324	+ if( zTemp ){
	1325	+ srcRev = atoi(zTemp);
	1326	+ }else{
	1327	+ fossil_fatal("Missing copyfrom-rev");
	1328	+ }
	1329	+ srcBranch = svn_parse_path(zSrcPath, &zSrcFile, &branchType);
	1330	+ if( srcBranch==0 ){
	1331	+ fossil_fatal("Copy from path outside the import paths");
	1332	+ }
	1333	+ srcRid = db_int(0, "SELECT trid, max(trev) FROM xrevisions"
	1334	+ " WHERE trev<=%d AND tbranch=%d",
	1335	+ srcRev, srcBranch);
	1336	+ if( srcRid>0 && srcBranch!=branchId ){
	1337	+ db_bind_int(&addRev, ":branch", branchId);
	1338	+ db_step(&addRev);
	1339	+ db_reset(&addRev);
	1340	+ db_bind_int(&revSrc, ":parent", srcRid);
	1341	+ db_bind_int(&revSrc, ":rev", gsvn.rev);
	1342	+ db_bind_int(&revSrc, ":branch", branchId);
	1343	+ db_step(&revSrc);
	1344	+ db_reset(&revSrc);
	1345	+ }
	1346	+ }
	1347	+ if( zKind==0 ){
	1348	+ fossil_fatal("Missing Node-kind");
	1349	+ }else if( strncmp(zKind, "dir", 3)==0 ){
	1350	+ if( zSrcPath ){
	1351	+ if( srcRid>0 ){
	1352	+ if( zSrcFile[0]==0 ){
	1353	+ db_bind_text(&cpyRoot, ":path", zFile);
	1354	+ if( zFile[0]!=0 ){
	1355	+ db_bind_text(&cpyRoot, ":sep", "/");
	1356	+ }else{
	1357	+ db_bind_text(&cpyRoot, ":sep", "");
	1358	+ }
	1359	+ db_bind_int(&cpyRoot, ":branch", branchId);
	1360	+ db_bind_int(&cpyRoot, ":rid", srcRid);
	1361	+ db_step(&cpyRoot);
	1362	+ db_reset(&cpyRoot);
	1363	+ }else{
	1364	+ db_bind_text(&cpyPath, ":path", zFile);
	1365	+ if( zFile[0]!=0 ){
	1366	+ db_bind_text(&cpyPath, ":sep", "/");
	1367	+ }else{
	1368	+ db_bind_text(&cpyPath, ":sep", "");
	1369	+ }
	1370	+ db_bind_int(&cpyPath, ":branch", branchId);
	1371	+ db_bind_text(&cpyPath, ":srcpath", zSrcFile);
	1372	+ db_bind_int(&cpyPath, ":rid", srcRid);
	1373	+ db_step(&cpyPath);
	1374	+ db_reset(&cpyPath);
	1375	+ }
	1376	+ }
	1377	+ }
	1378	+ if( zFile[0]==0 ){
	1379	+ bag_insert(&gsvn.newBranches, branchId);
	1380	+ }
	1381	+ }else{
	1382	+ int rid = 0;
	1383	+ if( zSrcPath ){
	1384	+ rid = db_int(0, "SELECT rid FROM blob WHERE uuid=("
	1385	+ " SELECT uuid FROM xfoci"
	1386	+ " WHERE checkinID=%d AND filename=%Q"
	1387	+ ")",
	1388	+ srcRid, zSrcFile);
	1389	+ }
	1390	+ if( deltaFlag ){
	1391	+ Blob deltaSrc;
	1392	+ Blob target;
	1393	+ if( rid!=0 ){
	1394	+ content_get(rid, &deltaSrc);
	1395	+ }else{
	1396	+ blob_zero(&deltaSrc);
	1397	+ }
	1398	+ svn_apply_svndiff(&rec.content, &deltaSrc, &target);
	1399	+ rid = content_put(&target);
	1400	+ }else if( rec.contentFlag ){
	1401	+ rid = content_put(&rec.content);
	1402	+ }
	1403	+ db_bind_text(&addFile, ":path", zFile);
	1404	+ db_bind_int(&addFile, ":branch", branchId);
	1405	+ db_bind_int(&addFile, ":rid", rid);
	1406	+ db_bind_text(&addFile, ":perm", zPerm);
	1407	+ db_step(&addFile);
	1408	+ db_reset(&addFile);
	1409	+ db_bind_int(&addRev, ":branch", branchId);
	1410	+ db_step(&addRev);
	1411	+ db_reset(&addRev);
	1412	+ }
	1413	+ }else
	1414	+ if( strncmp(zAction, "change", 6)==0 ){
	1415	+ int rid = 0;
	1416	+ if( zKind==0 ){
	1417	+ fossil_fatal("Missing Node-kind");
	1418	+ }
	1419	+ if( strncmp(zKind, "dir", 3)!=0 ){
	1420	+ if( deltaFlag ){
	1421	+ Blob deltaSrc;
	1422	+ Blob target;
	1423	+ rid = db_int(0, "SELECT rid FROM blob WHERE uuid=("
	1424	+ " SELECT uuid FROM xfiles"
	1425	+ " WHERE tpath=%Q AND tbranch=%d"
	1426	+ ")", zFile, branchId);
	1427	+ content_get(rid, &deltaSrc);
	1428	+ svn_apply_svndiff(&rec.content, &deltaSrc, &target);
	1429	+ rid = content_put(&target);
	1430	+ }else{
	1431	+ rid = content_put(&rec.content);
	1432	+ }
	1433	+ db_bind_text(&addFile, ":path", zFile);
	1434	+ db_bind_int(&addFile, ":branch", branchId);
	1435	+ db_bind_int(&addFile, ":rid", rid);
	1436	+ db_bind_text(&addFile, ":perm", zPerm);
	1437	+ db_step(&addFile);
	1438	+ db_reset(&addFile);
	1439	+ db_bind_int(&addRev, ":branch", branchId);
	1440	+ db_step(&addRev);
	1441	+ db_reset(&addRev);
	1442	+ }
	1443	+ }else
	1444	+ if( strncmp(zAction, "delete", 6)!=0 ){ /* already did this one above */
	1445	+ fossil_fatal("Unknown Node-action");
	1446	+ }
	1447	+ }else{
	1448	+ fossil_fatal("Unknown record type");
	1449	+ }
	1450	+ svn_free_rec(&rec);
	1451	+ }
	1452	+ svn_finish_revision();
	1453	+ fossil_free(gsvn.zUser);
	1454	+ fossil_free(gsvn.zComment);
	1455	+ fossil_free(gsvn.zDate);
	1456	+ db_finalize(&addFile);
	1457	+ db_finalize(&delPath);
	1458	+ db_finalize(&addRev);
	1459	+ db_finalize(&cpyPath);
	1460	+ db_finalize(&cpyRoot);
	1461	+ db_finalize(&revSrc);
	1462	+ fossil_print(" Done!\n");
	1463	+}
721	1464
722	1465	/*
723	1466	** COMMAND: import
724	1467	**
725		-** Usage: %fossil import ?OPTIONS? NEW-REPOSITORY ?INPUT-FILE?
	1468	+** Usage: %fossil import ?--git? ?OPTIONS? NEW-REPOSITORY ?INPUT-FILE?
	1469	+** or: %fossil import --svn ?OPTIONS? NEW-REPOSITORY ?INPUT-FILE?
726	1470	**
727	1471	** Read interchange format generated by another VCS and use it to
728	1472	** construct a new Fossil repository named by the NEW-REPOSITORY
729	1473	** argument. If no input file is supplied the interchange format
730	1474	** data is read from standard input.
731	1475	**
732		-** The git-fast-export file format is currently the only VCS interchange
733		-** format that is understood, though other interchange formats may be added
734		-** in the future.
	1476	+** The following formats are currently understood by this command
	1477	+**
	1478	+** --git Import from the git-fast-export file format (default)
	1479	+**
	1480	+** --svn Import from the svnadmin-dump file format. The default
	1481	+** behaviour (unless overridden by --flat) is to treat 3
	1482	+** folders in the SVN root as special, following the
	1483	+** common layout of SVN repositories. These are (by
	1484	+** default) trunk/, branches/ and tags/
	1485	+** Options:
	1486	+** --trunk FOLDER Name of trunk folder
	1487	+** --branches FOLDER Name of branches folder
	1488	+** --tags FOLDER Name of tags folder
	1489	+** --base PATH Path to project root in repository
	1490	+** --flat The whole dump is a single branch
	1491	+**
	1492	+** Common Options:
	1493	+** -i\|--incremental allow importing into an existing repository
	1494	+** -f\|--force overwrite repository if already exist
735	1495	**
736	1496	** The --incremental option allows an existing repository to be extended
737	1497	** with new content.
738	1498	**
739		-** Options:
740		-** --git import from the git-fast-export file format (default)
741		-** --incremental allow importing into an existing repository
742	1499	**
743	1500	** See also: export
744	1501	*/
745	1502	void import_cmd(void){
746	1503	char *zPassword;
747	1504	FILE *pIn;
748	1505	Stmt q;
749	1506	int forceFlag = find_option("force", "f", 0)!=0;
750		- int incrFlag = find_option("incremental", "i", 0)!=0;
751	1507	int svnFlag = find_option("svn", 0, 0)!=0;
752	1508
753		- find_option("git",0,0); /* Skip the --git option for now */
	1509	+ /* Options common to all input formats */
	1510	+ int incrFlag = find_option("incremental", "i", 0)!=0;
	1511	+
	1512	+ /* Options for --svn only */
	1513	+ const char *zBase="";
	1514	+ int flatFlag=0;
	1515	+
	1516	+ if( svnFlag ){
	1517	+ /* Get --svn related options here, so verify_all_options() fail when svn
	1518	+ * only option are specify with --git
	1519	+ */
	1520	+ zBase = find_option("base", 0, 1);
	1521	+ flatFlag = find_option("flat", 0, 0)!=0;
	1522	+ gsvn.zTrunk = find_option("trunk", 0, 1);
	1523	+ gsvn.zBranches = find_option("branches", 0, 1);
	1524	+ gsvn.zTags = find_option("tags", 0, 1);
	1525	+ gsvn.incrFlag = incrFlag;
	1526	+ }else{
	1527	+ find_option("git",0,0); /* Skip the --git option for now */
	1528	+ }
754	1529	verify_all_options();
755		- if( g.argc!=3 && g.argc!=4 ){
756		- usage("NEW-REPOSITORY ?INPUT-FILE?");
	1530	+
	1531	+ if( g.argc!=3 && g.argc!=4 ){
	1532	+ usage("--git\|--svn ?OPTIONS? NEW-REPOSITORY ?INPUT-FILE?");
757	1533	}
758	1534	if( g.argc==4 ){
759	1535	pIn = fossil_fopen(g.argv[3], "rb");
760	1536	}else{
761	1537	pIn = stdin;
		@@ -767,14 +1543,66 @@
767	1543	}
768	1544	db_open_repository(g.argv[2]);
769	1545	db_open_config(0);
770	1546
771	1547	db_begin_transaction();
772		- if( !incrFlag ) db_initial_setup(0, 0, 0, 1);
	1548	+ if( !incrFlag ) db_initial_setup(0, 0, 0);
773	1549
774	1550	if( svnFlag ){
775		- fossil_fatal("--svn format not implemented yet");
	1551	+ db_multi_exec(
	1552	+ "CREATE TEMP TABLE xrevisions("
	1553	+ " trev INTEGER, tbranch INT, trid INT, tparent INT DEFAULT 0,"
	1554	+ " UNIQUE(tbranch, trev)"
	1555	+ ");"
	1556	+ "CREATE INDEX temp.i_xrevisions ON xrevisions(trid);"
	1557	+ "CREATE TEMP TABLE xfiles("
	1558	+ " tpath TEXT, tbranch INT, tuuid TEXT, tperm TEXT,"
	1559	+ " UNIQUE (tbranch, tpath) ON CONFLICT REPLACE"
	1560	+ ");"
	1561	+ "CREATE TEMP TABLE xbranches("
	1562	+ " tid INTEGER PRIMARY KEY, tname TEXT, ttype INT,"
	1563	+ " UNIQUE(tname, ttype)"
	1564	+ ");"
	1565	+ "CREATE VIRTUAL TABLE temp.xfoci USING files_of_checkin;"
	1566	+ );
	1567	+ if( zBase==0 ){ zBase = ""; }
	1568	+ if( strlen(zBase)>0 ){
	1569	+ if( zBase[strlen(zBase)-1]!='/' ){
	1570	+ zBase = mprintf("%s/", zBase);
	1571	+ }
	1572	+ }
	1573	+ if( flatFlag ){
	1574	+ gsvn.zTrunk = zBase;
	1575	+ gsvn.zBranches = 0;
	1576	+ gsvn.zTags = 0;
	1577	+ gsvn.lenTrunk = strlen(zBase);
	1578	+ gsvn.lenBranches = 0;
	1579	+ gsvn.lenTags = 0;
	1580	+ }else{
	1581	+ if( gsvn.zTrunk==0 ){ gsvn.zTrunk = "trunk/"; }
	1582	+ if( gsvn.zBranches==0 ){ gsvn.zBranches = "branches/"; }
	1583	+ if( gsvn.zTags==0 ){ gsvn.zTags = "tags/"; }
	1584	+ gsvn.zTrunk = mprintf("%s%s", zBase, gsvn.zTrunk);
	1585	+ gsvn.zBranches = mprintf("%s%s", zBase, gsvn.zBranches);
	1586	+ gsvn.zTags = mprintf("%s%s", zBase, gsvn.zTags);
	1587	+ gsvn.lenTrunk = strlen(gsvn.zTrunk);
	1588	+ gsvn.lenBranches = strlen(gsvn.zBranches);
	1589	+ gsvn.lenTags = strlen(gsvn.zTags);
	1590	+ if( gsvn.zTrunk[gsvn.lenTrunk-1]!='/' ){
	1591	+ gsvn.zTrunk = mprintf("%s/", gsvn.zTrunk);
	1592	+ gsvn.lenTrunk++;
	1593	+ }
	1594	+ if( gsvn.zBranches[gsvn.lenBranches-1]!='/' ){
	1595	+ gsvn.zBranches = mprintf("%s/", gsvn.zBranches);
	1596	+ gsvn.lenBranches++;
	1597	+ }
	1598	+ if( gsvn.zTags[gsvn.lenTags-1]!='/' ){
	1599	+ gsvn.zTags = mprintf("%s/", gsvn.zTags);
	1600	+ gsvn.lenTags++;
	1601	+ }
	1602	+ }
	1603	+ svn_dump_import(pIn);
776	1604	}else{
777	1605	/* The following temp-tables are used to hold information needed for
778	1606	** the import.
779	1607	**
780	1608	** The XMARK table provides a mapping from fast-import "marks" and symbols
		@@ -807,10 +1635,12 @@
807	1635	fast_insert_content(&record, 0, 0);
808	1636	import_reset(0);
809	1637	}
810	1638	db_finalize(&q);
811	1639	}
	1640	+
	1641	+ verify_cancel();
812	1642	db_end_transaction(0);
813	1643	db_begin_transaction();
814	1644	fossil_print("Rebuilding repository meta-data...\n");
815	1645	rebuild_db(0, 1, !incrFlag);
816	1646	verify_cancel();
817	1647

	--- src/import.c
	+++ src/import.c
	@@ -12,12 +12,12 @@
12	** Author contact information:
13	** [email protected]
14	**
15	*******************************************************************************
16	**
17	** This file contains code used to import the content of a Git
18	** repository in the git-fast-import format as a new Fossil
19	** repository.
20	*/
21	#include "config.h"
22	#include "import.h"
23	#include <assert.h>
	@@ -516,12 +516,12 @@
516	** last commit that holds that tag.
517	**
518	** None of the above is explained in the git-fast-export
519	** documentation. We had to figure it out via trial and error.
520	*/
521	for(i=strlen(z)-1; i>=0 && z[i]!='/'; i--){}
522	gg.tagCommit = strncmp(&z[i-4], "tags", 4)==0; /* True for pattern B */
523	if( z[i+1]!=0 ) z += i+1;
524	if( fossil_strcmp(z, "master")==0 ) z = "trunk";
525	gg.zBranch = fossil_strdup(z);
526	gg.fromLoaded = 0;
527	}else
	@@ -716,46 +716,822 @@
716	malformed_line:
717	trim_newline(zLine);
718	fossil_fatal("bad fast-import line: [%s]", zLine);
719	return;
720	}







































































































































































































































































































































































































































































































































































































































































































































































721
722	/*
723	** COMMAND: import
724	**
725	** Usage: %fossil import ?OPTIONS? NEW-REPOSITORY ?INPUT-FILE?

726	**
727	** Read interchange format generated by another VCS and use it to
728	** construct a new Fossil repository named by the NEW-REPOSITORY
729	** argument. If no input file is supplied the interchange format
730	** data is read from standard input.
731	**
732	** The git-fast-export file format is currently the only VCS interchange
733	** format that is understood, though other interchange formats may be added
734	** in the future.
















735	**
736	** The --incremental option allows an existing repository to be extended
737	** with new content.
738	**
739	** Options:
740	** --git import from the git-fast-export file format (default)
741	** --incremental allow importing into an existing repository
742	**
743	** See also: export
744	*/
745	void import_cmd(void){
746	char *zPassword;
747	FILE *pIn;
748	Stmt q;
749	int forceFlag = find_option("force", "f", 0)!=0;
750	int incrFlag = find_option("incremental", "i", 0)!=0;
751	int svnFlag = find_option("svn", 0, 0)!=0;
752
753	find_option("git",0,0); /* Skip the --git option for now */



















754	verify_all_options();
755	if( g.argc!=3 && g.argc!=4 ){
756	usage("NEW-REPOSITORY ?INPUT-FILE?");

757	}
758	if( g.argc==4 ){
759	pIn = fossil_fopen(g.argv[3], "rb");
760	}else{
761	pIn = stdin;
	@@ -767,14 +1543,66 @@
767	}
768	db_open_repository(g.argv[2]);
769	db_open_config(0);
770
771	db_begin_transaction();
772	if( !incrFlag ) db_initial_setup(0, 0, 0, 1);
773
774	if( svnFlag ){
775	fossil_fatal("--svn format not implemented yet");




















































776	}else{
777	/* The following temp-tables are used to hold information needed for
778	** the import.
779	**
780	** The XMARK table provides a mapping from fast-import "marks" and symbols
	@@ -807,10 +1635,12 @@
807	fast_insert_content(&record, 0, 0);
808	import_reset(0);
809	}
810	db_finalize(&q);
811	}


812	db_end_transaction(0);
813	db_begin_transaction();
814	fossil_print("Rebuilding repository meta-data...\n");
815	rebuild_db(0, 1, !incrFlag);
816	verify_cancel();
817

	--- src/import.c
	+++ src/import.c
	@@ -12,12 +12,12 @@
12	** Author contact information:
13	** [email protected]
14	**
15	*******************************************************************************
16	**
17	** This file contains code used to import the content of a Git/SVN
18	** repository in the git-fast-import/svn-dump formats as a new Fossil
19	** repository.
20	*/
21	#include "config.h"
22	#include "import.h"
23	#include <assert.h>
	@@ -516,12 +516,12 @@
516	** last commit that holds that tag.
517	**
518	** None of the above is explained in the git-fast-export
519	** documentation. We had to figure it out via trial and error.
520	*/
521	for(i=5; i<strlen(z) && z[i]!='/'; i++){}
522	gg.tagCommit = strncmp(&z[5], "tags", 4)==0; /* True for pattern B */
523	if( z[i+1]!=0 ) z += i+1;
524	if( fossil_strcmp(z, "master")==0 ) z = "trunk";
525	gg.zBranch = fossil_strdup(z);
526	gg.fromLoaded = 0;
527	}else
	@@ -716,46 +716,822 @@
716	malformed_line:
717	trim_newline(zLine);
718	fossil_fatal("bad fast-import line: [%s]", zLine);
719	return;
720	}
721
722	static struct{
723	int rev; /* SVN revision number */
724	char zDate; / Date/time stamp */
725	char zUser; / User name */
726	char zComment; / Comment of a commit */
727	const char zTrunk; / Name of trunk folder in repo root */
728	int lenTrunk; /* String length of zTrunk */
729	const char zBranches; / Name of branches folder in repo root */
730	int lenBranches; /* String length of zBranches */
731	const char zTags; / Name of tags folder in repo root */
732	int lenTags; /* String length of zTags */
733	Bag newBranches; /* Branches that were created in this revision */
734	int incrFlag; /* Add svn-rev-nn tags on every checkin */
735	} gsvn;
736	typedef struct {
737	char *zKey;
738	char *zVal;
739	} KeyVal;
740	typedef struct {
741	KeyVal *aHeaders;
742	int nHeaders;
743	char *pRawProps;
744	KeyVal *aProps;
745	int nProps;
746	Blob content;
747	int contentFlag;
748	} SvnRecord;
749
750	#define svn_find_header(rec, zHeader) \
751	svn_find_keyval((rec).aHeaders, (rec).nHeaders, (zHeader))
752	#define svn_find_prop(rec, zProp) \
753	svn_find_keyval((rec).aProps, (rec).nProps, (zProp))
754	static char *svn_find_keyval(
755	KeyVal *aKeyVal,
756	int nKeyVal,
757	const char *zKey
758	){
759	int i;
760	for(i=0; i<nKeyVal; i++){
761	if( fossil_strcmp(aKeyVal[i].zKey, zKey)==0 ){
762	return aKeyVal[i].zVal;
763	}
764	}
765	return 0;
766	}
767
768	static void svn_free_rec(SvnRecord *rec){
769	int i;
770	for(i=0; i<rec->nHeaders; i++){
771	fossil_free(rec->aHeaders[i].zKey);
772	}
773	fossil_free(rec->aHeaders);
774	fossil_free(rec->aProps);
775	fossil_free(rec->pRawProps);
776	blob_reset(&rec->content);
777	}
778
779	static int svn_read_headers(FILE pIn, SvnRecord rec){
780	char zLine[1000];
781
782	rec->aHeaders = 0;
783	rec->nHeaders = 0;
784	while( fgets(zLine, sizeof(zLine), pIn) ){
785	if( zLine[0]!='\n' ) break;
786	}
787	if( feof(pIn) ) return 0;
788	do{
789	char *sep;
790	if( zLine[0]=='\n' ) break;
791	rec->nHeaders += 1;
792	rec->aHeaders = fossil_realloc(rec->aHeaders,
793	sizeof(rec->aHeaders[0])*rec->nHeaders);
794	rec->aHeaders[rec->nHeaders-1].zKey = mprintf("%s", zLine);
795	sep = strchr(rec->aHeaders[rec->nHeaders-1].zKey, ':');
796	if( !sep ){
797	trim_newline(zLine);
798	fossil_fatal("bad header line: [%s]", zLine);
799	}
800	*sep = 0;
801	rec->aHeaders[rec->nHeaders-1].zVal = sep+1;
802	sep = strchr(rec->aHeaders[rec->nHeaders-1].zVal, '\n');
803	*sep = 0;
804	while(rec->aHeaders[rec->nHeaders-1].zVal
805	&& fossil_isspace(*(rec->aHeaders[rec->nHeaders-1].zVal)) )
806	{
807	rec->aHeaders[rec->nHeaders-1].zVal++;
808	}
809	}while( fgets(zLine, sizeof(zLine), pIn) );
810	if( zLine[0]!='\n' ){
811	trim_newline(zLine);
812	fossil_fatal("svn-dump data ended unexpectedly");
813	}
814	return 1;
815	}
816
817	static void svn_read_props(FILE pIn, SvnRecord rec){
818	int nRawProps = 0;
819	char *pRawProps;
820	const char *zLen;
821
822	rec->pRawProps = 0;
823	rec->aProps = 0;
824	rec->nProps = 0;
825	zLen = svn_find_header(*rec, "Prop-content-length");
826	if( zLen ){
827	nRawProps = atoi(zLen);
828	}
829	if( nRawProps ){
830	int got;
831	char *zLine;
832	rec->pRawProps = pRawProps = fossil_malloc( nRawProps );
833	got = fread(rec->pRawProps, 1, nRawProps, pIn);
834	if( got!=nRawProps ){
835	fossil_fatal("short read: got %d of %d bytes", got, nRawProps);
836	}
837	if( memcmp(&pRawProps[got-10], "PROPS-END\n", 10)!=0 ){
838	fossil_fatal("svn-dump data ended unexpectedly");
839	}
840	zLine = pRawProps;
841	while( zLine<(pRawProps+nRawProps-10) ){
842	char *eol;
843	int propLen;
844	if( zLine[0]=='D' ){
845	propLen = atoi(&zLine[2]);
846	eol = strchr(zLine, '\n');
847	zLine = eol+1+propLen+1;
848	}else{
849	if( zLine[0]!='K' ){
850	fossil_fatal("svn-dump data format broken");
851	}
852	propLen = atoi(&zLine[2]);
853	eol = strchr(zLine, '\n');
854	zLine = eol+1;
855	eol = zLine+propLen;
856	if( *eol!='\n' ){
857	fossil_fatal("svn-dump data format broken");
858	}
859	*eol = 0;
860	rec->nProps += 1;
861	rec->aProps = fossil_realloc(rec->aProps,
862	sizeof(rec->aProps[0])*rec->nProps);
863	rec->aProps[rec->nProps-1].zKey = zLine;
864	zLine = eol+1;
865	if( zLine[0]!='V' ){
866	fossil_fatal("svn-dump data format broken");
867	}
868	propLen = atoi(&zLine[2]);
869	eol = strchr(zLine, '\n');
870	zLine = eol+1;
871	eol = zLine+propLen;
872	if( *eol!='\n' ){
873	fossil_fatal("svn-dump data format broken");
874	}
875	*eol = 0;
876	rec->aProps[rec->nProps-1].zVal = zLine;
877	zLine = eol+1;
878	}
879	}
880	}
881	}
882
883	static int svn_read_rec(FILE pIn, SvnRecord rec){
884	const char *zLen;
885	int nLen = 0;
886	if( svn_read_headers(pIn, rec)==0 ) return 0;
887	svn_read_props(pIn, rec);
888	blob_zero(&rec->content);
889	zLen = svn_find_header(*rec, "Text-content-length");
890	if( zLen ){
891	rec->contentFlag = 1;
892	nLen = atoi(zLen);
893	blob_read_from_channel(&rec->content, pIn, nLen);
894	if( blob_size(&rec->content)!=nLen ){
895	fossil_fatal("short read: got %d of %d bytes",
896	blob_size(&rec->content), nLen
897	);
898	}
899	}else{
900	rec->contentFlag = 0;
901	}
902	return 1;
903	}
904
905	/*
906	** Returns the UUID for the RID, or NULL if not found.
907	** The returned string is allocated via db_text() and must be
908	** free()d by the caller.
909	*/
910	char * rid_to_uuid(int rid)
911	{
912	return db_text(0, "SELECT uuid FROM blob WHERE rid=%d", rid);
913	}
914
915	#define SVN_UNKNOWN 0
916	#define SVN_TRUNK 1
917	#define SVN_BRANCH 2
918	#define SVN_TAG 3
919
920	#define MAX_INT_32 (0x7FFFFFFFL)
921
922	static void svn_finish_revision(){
923	Blob manifest;
924	static Stmt getChanges;
925	static Stmt getFiles;
926	static Stmt setRid;
927	Blob mcksum;
928
929	blob_zero(&manifest);
930	db_static_prepare(&getChanges, "SELECT tid, tname, ttype, tparent"
931	" FROM xrevisions, xbranches ON (tbranch=tid)"
932	" WHERE trid ISNULL");
933	db_static_prepare(&getFiles, "SELECT tpath, tuuid, tperm FROM xfiles"
934	" WHERE tbranch=:branch ORDER BY tpath");
935	db_prepare(&setRid, "UPDATE xrevisions SET trid=:rid"
936	" WHERE trev=%d AND tbranch=:branch", gsvn.rev);
937	while( db_step(&getChanges)==SQLITE_ROW ){
938	int branchId = db_column_int(&getChanges, 0);
939	const char *zBranch = db_column_text(&getChanges, 1);
940	int branchType = db_column_int(&getChanges, 2);
941	int parentRid = db_column_int(&getChanges, 3);
942	int mergeRid = parentRid;
943	Manifest *pParentManifest = 0;
944	ManifestFile *pParentFile = 0;
945	int sameAsParent = 1;
946	int parentBranch = 0;
947	if( !bag_find(&gsvn.newBranches, branchId) ){
948	parentRid = db_int(0, "SELECT trid, max(trev) FROM xrevisions"
949	" WHERE trev<%d AND tbranch=%d",
950	gsvn.rev, branchId);
951	}
952	if( parentRid>0 ){
953	pParentManifest = manifest_get(parentRid, CFTYPE_MANIFEST, 0);
954	pParentFile = manifest_file_next(pParentManifest, 0);
955	parentBranch = db_int(0, "SELECT tbranch FROM xrevisions WHERE trid=%d",
956	parentRid);
957	if( parentBranch!=branchId && branchType!=SVN_TAG ){
958	sameAsParent = 0;
959	}
960	}
961	if( mergeRid<MAX_INT_32 ){
962	if( gsvn.zComment ){
963	blob_appendf(&manifest, "C %F\n", gsvn.zComment);
964	}else{
965	blob_append(&manifest, "C (no\\scomment)\n", 16);
966	}
967	blob_appendf(&manifest, "D %s\n", gsvn.zDate);
968	db_bind_int(&getFiles, ":branch", branchId);
969	while( db_step(&getFiles)==SQLITE_ROW ){
970	const char *zFile = db_column_text(&getFiles, 0);
971	const char *zUuid = db_column_text(&getFiles, 1);
972	const char *zPerm = db_column_text(&getFiles, 2);
973	if( zPerm ){
974	blob_appendf(&manifest, "F %F %s %s\n", zFile, zUuid, zPerm);
975	}else{
976	blob_appendf(&manifest, "F %F %s\n", zFile, zUuid);
977	}
978	if( sameAsParent ){
979	if( !pParentFile
980	\|\| fossil_strcmp(pParentFile->zName,zFile)!=0
981	\|\| fossil_strcmp(pParentFile->zUuid,zUuid)!=0
982	\|\| fossil_strcmp(pParentFile->zPerm,zPerm)!=0
983	){
984	sameAsParent = 0;
985	}else{
986	pParentFile = manifest_file_next(pParentManifest, 0);
987	}
988	}
989	}
990	if( pParentFile ){
991	sameAsParent = 0;
992	}
993	db_reset(&getFiles);
994	if( !sameAsParent ){
995	if( parentRid>0 ){
996	char *zParentUuid = rid_to_uuid(parentRid);
997	if( parentRid==mergeRid \|\| mergeRid==0){
998	char *zParentBranch =
999	db_text(0, "SELECT tname FROM xbranches WHERE tid=%d",
1000	parentBranch
1001	);
1002	blob_appendf(&manifest, "P %s\n", zParentUuid);
1003	blob_appendf(&manifest, "T branch %F\n", zBranch);
1004	blob_appendf(&manifest, "T sym-%F \n", zBranch);
1005	if( gsvn.incrFlag ){
1006	blob_appendf(&manifest, "T +sym-svn-rev-%d *\n", gsvn.rev);
1007	}
1008	blob_appendf(&manifest, "T -sym-%F *\n", zParentBranch);
1009	fossil_free(zParentBranch);
1010	}else{
1011	char *zMergeUuid = rid_to_uuid(mergeRid);
1012	blob_appendf(&manifest, "P %s %s\n", zParentUuid, zMergeUuid);
1013	if( gsvn.incrFlag ){
1014	blob_appendf(&manifest, "T +sym-svn-rev-%d *\n", gsvn.rev);
1015	}
1016	fossil_free(zMergeUuid);
1017	}
1018	fossil_free(zParentUuid);
1019	}else{
1020	blob_appendf(&manifest, "T branch %F\n", zBranch);
1021	blob_appendf(&manifest, "T sym-%F \n", zBranch);
1022	if( gsvn.incrFlag ){
1023	blob_appendf(&manifest, "T +sym-svn-rev-%d *\n", gsvn.rev);
1024	}
1025	}
1026	}else if( branchType==SVN_TAG ){
1027	char *zParentUuid = rid_to_uuid(parentRid);
1028	blob_reset(&manifest);
1029	blob_appendf(&manifest, "D %s\n", gsvn.zDate);
1030	blob_appendf(&manifest, "T +sym-%F %s\n", zBranch, zParentUuid);
1031	fossil_free(zParentUuid);
1032	}
1033	}else{
1034	char *zParentUuid = rid_to_uuid(parentRid);
1035	blob_appendf(&manifest, "D %s\n", gsvn.zDate);
1036	if( branchType!=SVN_TAG ){
1037	blob_appendf(&manifest, "T +closed %s\n", zParentUuid);
1038	}else{
1039	blob_appendf(&manifest, "T -sym-%F %s\n", zBranch, zParentUuid);
1040	}
1041	fossil_free(zParentUuid);
1042	}
1043	if( gsvn.zUser ){
1044	blob_appendf(&manifest, "U %F\n", gsvn.zUser);
1045	}else{
1046	const char *zUserOvrd = find_option("user-override",0,1);
1047	blob_appendf(&manifest, "U %F\n", zUserOvrd ? zUserOvrd : login_name());
1048	}
1049	md5sum_blob(&manifest, &mcksum);
1050	blob_appendf(&manifest, "Z %b\n", &mcksum);
1051	blob_reset(&mcksum);
1052	if( !sameAsParent ){
1053	int rid = content_put(&manifest);
1054	db_bind_int(&setRid, ":branch", branchId);
1055	db_bind_int(&setRid, ":rid", rid);
1056	db_step(&setRid);
1057	db_reset(&setRid);
1058	}else if( branchType==SVN_TAG ){
1059	content_put(&manifest);
1060	db_bind_int(&setRid, ":branch", branchId);
1061	db_bind_int(&setRid, ":rid", parentRid);
1062	db_step(&setRid);
1063	db_reset(&setRid);
1064	}else if( mergeRid==MAX_INT_32 ){
1065	content_put(&manifest);
1066	db_multi_exec("DELETE FROM xrevisions WHERE tbranch=%d AND trev=%d",
1067	branchId, gsvn.rev);
1068	}else{
1069	db_multi_exec("DELETE FROM xrevisions WHERE tbranch=%d AND trev=%d",
1070	branchId, gsvn.rev);
1071	}
1072	blob_reset(&manifest);
1073	manifest_destroy(pParentManifest);
1074	}
1075	db_reset(&getChanges);
1076	db_finalize(&setRid);
1077	}
1078
1079	static u64 svn_get_varint(const char **pz){
1080	unsigned int v = 0;
1081	do{
1082	v = (v<<7) \| ((*pz)[0]&0x7f);
1083	}while( (*pz)++[0]&0x80 );
1084	return v;
1085	}
1086
1087	static void svn_apply_svndiff(Blob pDiff, Blob pSrc, Blob *pOut){
1088	const char *zDiff = blob_buffer(pDiff);
1089	char *zOut;
1090	if( blob_size(pDiff)<4 \|\| memcmp(zDiff, "SVN", 4)!=0 ){
1091	fossil_fatal("Invalid svndiff0 format");
1092	}
1093	zDiff += 4;
1094	blob_zero(pOut);
1095	while( zDiff<(blob_buffer(pDiff)+blob_size(pDiff)) ){
1096	u64 lenOut, lenInst, lenData, lenOld;
1097	const char *zInst;
1098	const char *zData;
1099
1100	u64 offSrc = svn_get_varint(&zDiff);
1101	/lenSrc =/ svn_get_varint(&zDiff);
1102	lenOut = svn_get_varint(&zDiff);
1103	lenInst = svn_get_varint(&zDiff);
1104	lenData = svn_get_varint(&zDiff);
1105	zInst = zDiff;
1106	zData = zInst+lenInst;
1107	lenOld = blob_size(pOut);
1108	blob_resize(pOut, lenOut+lenOld);
1109	zOut = blob_buffer(pOut)+lenOld;
1110	while( zDiff<zInst+lenInst ){
1111	u64 lenCpy = (*zDiff)&0x3f;
1112	const char *zCpy;
1113	switch( (*zDiff)&0xC0 ){
1114	case 0x00: zCpy = blob_buffer(pSrc)+offSrc; break;
1115	case 0x40: zCpy = blob_buffer(pOut); break;
1116	case 0x80: zCpy = zData; break;
1117	default: fossil_fatal("Invalid svndiff0 instruction");
1118	}
1119	zDiff++;
1120	if( lenCpy==0 ){
1121	lenCpy = svn_get_varint(&zDiff);
1122	}
1123	if( zCpy!=zData ){
1124	zCpy += svn_get_varint(&zDiff);
1125	}else{
1126	zData += lenCpy;
1127	}
1128	while( lenCpy-- > 0 ){
1129	zOut++ = zCpy++;
1130	}
1131	}
1132	zDiff += lenData;
1133	}
1134	}
1135
1136	/*
1137	** Extract the branch or tag that the given path is on. Return the branch ID.
1138	*/
1139	static int svn_parse_path(char zPath, char zFile, int type){
1140	char *zBranch = 0;
1141	int branchId = 0;
1142	*type = SVN_UNKNOWN;
1143	*zFile = 0;
1144	if( gsvn.lenTrunk==0 ){
1145	zBranch = "trunk";
1146	*zFile = zPath;
1147	*type = SVN_TRUNK;
1148	}else
1149	if( strncmp(zPath, gsvn.zTrunk, gsvn.lenTrunk-1)==0 ){
1150	if( zPath[gsvn.lenTrunk-1]=='/' \|\| zPath[gsvn.lenTrunk-1]==0 ){
1151	zBranch = "trunk";
1152	*zFile = zPath+gsvn.lenTrunk;
1153	*type = SVN_TRUNK;
1154	}else{
1155	zBranch = 0;
1156	*type = SVN_UNKNOWN;
1157	}
1158	}else{
1159	if( strncmp(zPath, gsvn.zBranches, gsvn.lenBranches)==0 ){
1160	*zFile = zBranch = zPath+gsvn.lenBranches;
1161	*type = SVN_BRANCH;
1162	}else
1163	if( strncmp(zPath, gsvn.zTags, gsvn.lenTags)==0 ){
1164	*zFile = zBranch = zPath+gsvn.lenTags;
1165	*type = SVN_TAG;
1166	}else{ /* Not a branch, tag or trunk */
1167	return 0;
1168	}
1169	while( zFile && zFile!='/' ){ (*zFile)++; }
1170	if( **zFile ){
1171	**zFile = '\0';
1172	(*zFile)++;
1173	}
1174	}
1175	if( *type!=SVN_UNKNOWN ){
1176	branchId = db_int(0,
1177	"SELECT tid FROM xbranches WHERE tname=%Q AND ttype=%d",
1178	zBranch, *type);
1179	if( branchId==0 ){
1180	db_multi_exec("INSERT INTO xbranches (tname, ttype) VALUES(%Q, %d)",
1181	zBranch, *type);
1182	branchId = db_last_insert_rowid();
1183	}
1184	}
1185	return branchId;
1186	}
1187
1188	/*
1189	** Read the svn-dump format from pIn and insert the corresponding
1190	** content into the database.
1191	*/
1192	static void svn_dump_import(FILE *pIn){
1193	SvnRecord rec;
1194	int ver;
1195	char *zTemp;
1196	const char *zUuid;
1197	Stmt addFile;
1198	Stmt delPath;
1199	Stmt addRev;
1200	Stmt cpyPath;
1201	Stmt cpyRoot;
1202	Stmt revSrc;
1203
1204	/* version */
1205	if( svn_read_rec(pIn, &rec)
1206	&& (zTemp = svn_find_header(rec, "SVN-fs-dump-format-version")) ){
1207	ver = atoi(zTemp);
1208	if( ver!=2 && ver!=3 ){
1209	fossil_fatal("Unknown svn-dump format version: %d", ver);
1210	}
1211	}else{
1212	fossil_fatal("Input is not an svn-dump!");
1213	}
1214	svn_free_rec(&rec);
1215	/* UUID */
1216	if( !svn_read_rec(pIn, &rec) \|\| !(zUuid = svn_find_header(rec, "UUID")) ){
1217	/* Removed the following line since UUID is not actually used
1218	fossil_fatal("Missing UUID!"); */
1219	}
1220	svn_free_rec(&rec);
1221
1222	/* content */
1223	db_prepare(&addFile,
1224	"INSERT INTO xfiles (tpath, tbranch, tuuid, tperm)"
1225	" VALUES(:path, :branch, (SELECT uuid FROM blob WHERE rid=:rid), :perm)"
1226	);
1227	db_prepare(&delPath,
1228	"DELETE FROM xfiles"
1229	" WHERE (tpath=:path OR (tpath>:path\|\|'/' AND tpath<:path\|\|'0'))"
1230	" AND tbranch=:branch"
1231	);
1232	db_prepare(&addRev,
1233	"INSERT OR IGNORE INTO xrevisions (trev, tbranch) VALUES(:rev, :branch)"
1234	);
1235	db_prepare(&cpyPath,
1236	"INSERT INTO xfiles (tpath, tbranch, tuuid, tperm)"
1237	" SELECT :path\|\|:sep\|\|substr(filename, length(:srcpath)+2), :branch, uuid, perm"
1238	" FROM xfoci"
1239	" WHERE checkinID=:rid"
1240	" AND filename>:srcpath\|\|'/'"
1241	" AND filename<:srcpath\|\|'0'"
1242	);
1243	db_prepare(&cpyRoot,
1244	"INSERT INTO xfiles (tpath, tbranch, tuuid, tperm)"
1245	" SELECT :path\|\|:sep\|\|filename, :branch, uuid, perm"
1246	" FROM xfoci"
1247	" WHERE checkinID=:rid"
1248	);
1249	db_prepare(&revSrc,
1250	"UPDATE xrevisions SET tparent=:parent"
1251	" WHERE trev=:rev AND tbranch=:branch AND tparent<:parent"
1252	);
1253	gsvn.rev = -1;
1254	bag_init(&gsvn.newBranches);
1255	while( svn_read_rec(pIn, &rec) ){
1256	if( (zTemp = svn_find_header(rec, "Revision-number")) ){ /* revision node */
1257	/* finish previous revision */
1258	char *zDate = NULL;
1259	if( gsvn.rev>=0 ){
1260	svn_finish_revision();
1261	fossil_free(gsvn.zUser);
1262	fossil_free(gsvn.zComment);
1263	fossil_free(gsvn.zDate);
1264	bag_clear(&gsvn.newBranches);
1265	}
1266	/* start new revision */
1267	gsvn.rev = atoi(zTemp);
1268	gsvn.zUser = mprintf("%s", svn_find_prop(rec, "svn:author"));
1269	gsvn.zComment = mprintf("%s", svn_find_prop(rec, "svn:log"));
1270	zDate = svn_find_prop(rec, "svn:date");
1271	if( zDate ){
1272	gsvn.zDate = date_in_standard_format(zDate);
1273	}else{
1274	gsvn.zDate = date_in_standard_format("now");
1275	}
1276	db_bind_int(&addRev, ":rev", gsvn.rev);
1277	fossil_print("\rImporting SVN revision: %d", gsvn.rev);
1278	}else
1279	if( (zTemp = svn_find_header(rec, "Node-path")) ){ /* file/dir node */
1280	char *zFile;
1281	int branchType;
1282	int branchId = svn_parse_path(zTemp, &zFile, &branchType);
1283	char *zAction = svn_find_header(rec, "Node-action");
1284	char *zKind = svn_find_header(rec, "Node-kind");
1285	char *zPerm = svn_find_prop(rec, "svn:executable") ? "x" : 0;
1286	int deltaFlag = 0;
1287	int srcRev = 0;
1288	if( branchId==0 ){
1289	svn_free_rec(&rec);
1290	continue;
1291	}
1292	if( (zTemp = svn_find_header(rec, "Text-delta")) ){
1293	deltaFlag = strncmp(zTemp, "true", 4)==0;
1294	}
1295	if( strncmp(zAction, "delete", 6)==0
1296	\|\| strncmp(zAction, "replace", 7)==0 )
1297	{
1298	db_bind_int(&addRev, ":branch", branchId);
1299	db_step(&addRev);
1300	db_reset(&addRev);
1301	if( zFile[0]!=0 ){
1302	db_bind_text(&delPath, ":path", zFile);
1303	db_bind_int(&delPath, ":branch", branchId);
1304	db_step(&delPath);
1305	db_reset(&delPath);
1306	}else{
1307	db_multi_exec("DELETE FROM xfiles WHERE tbranch=%d", branchId);
1308	db_bind_int(&revSrc, ":parent", MAX_INT_32);
1309	db_bind_int(&revSrc, ":rev", gsvn.rev);
1310	db_bind_int(&revSrc, ":branch", branchId);
1311	db_step(&revSrc);
1312	db_reset(&revSrc);
1313	}
1314	} /* no 'else' here since 'replace' does both a 'delete' and an 'add' */
1315	if( strncmp(zAction, "add", 3)==0
1316	\|\| strncmp(zAction, "replace", 7)==0 )
1317	{
1318	char *zSrcPath = svn_find_header(rec, "Node-copyfrom-path");
1319	char *zSrcFile;
1320	int srcRid = 0;
1321	if( zSrcPath ){
1322	int srcBranch;
1323	zTemp = svn_find_header(rec, "Node-copyfrom-rev");
1324	if( zTemp ){
1325	srcRev = atoi(zTemp);
1326	}else{
1327	fossil_fatal("Missing copyfrom-rev");
1328	}
1329	srcBranch = svn_parse_path(zSrcPath, &zSrcFile, &branchType);
1330	if( srcBranch==0 ){
1331	fossil_fatal("Copy from path outside the import paths");
1332	}
1333	srcRid = db_int(0, "SELECT trid, max(trev) FROM xrevisions"
1334	" WHERE trev<=%d AND tbranch=%d",
1335	srcRev, srcBranch);
1336	if( srcRid>0 && srcBranch!=branchId ){
1337	db_bind_int(&addRev, ":branch", branchId);
1338	db_step(&addRev);
1339	db_reset(&addRev);
1340	db_bind_int(&revSrc, ":parent", srcRid);
1341	db_bind_int(&revSrc, ":rev", gsvn.rev);
1342	db_bind_int(&revSrc, ":branch", branchId);
1343	db_step(&revSrc);
1344	db_reset(&revSrc);
1345	}
1346	}
1347	if( zKind==0 ){
1348	fossil_fatal("Missing Node-kind");
1349	}else if( strncmp(zKind, "dir", 3)==0 ){
1350	if( zSrcPath ){
1351	if( srcRid>0 ){
1352	if( zSrcFile[0]==0 ){
1353	db_bind_text(&cpyRoot, ":path", zFile);
1354	if( zFile[0]!=0 ){
1355	db_bind_text(&cpyRoot, ":sep", "/");
1356	}else{
1357	db_bind_text(&cpyRoot, ":sep", "");
1358	}
1359	db_bind_int(&cpyRoot, ":branch", branchId);
1360	db_bind_int(&cpyRoot, ":rid", srcRid);
1361	db_step(&cpyRoot);
1362	db_reset(&cpyRoot);
1363	}else{
1364	db_bind_text(&cpyPath, ":path", zFile);
1365	if( zFile[0]!=0 ){
1366	db_bind_text(&cpyPath, ":sep", "/");
1367	}else{
1368	db_bind_text(&cpyPath, ":sep", "");
1369	}
1370	db_bind_int(&cpyPath, ":branch", branchId);
1371	db_bind_text(&cpyPath, ":srcpath", zSrcFile);
1372	db_bind_int(&cpyPath, ":rid", srcRid);
1373	db_step(&cpyPath);
1374	db_reset(&cpyPath);
1375	}
1376	}
1377	}
1378	if( zFile[0]==0 ){
1379	bag_insert(&gsvn.newBranches, branchId);
1380	}
1381	}else{
1382	int rid = 0;
1383	if( zSrcPath ){
1384	rid = db_int(0, "SELECT rid FROM blob WHERE uuid=("
1385	" SELECT uuid FROM xfoci"
1386	" WHERE checkinID=%d AND filename=%Q"
1387	")",
1388	srcRid, zSrcFile);
1389	}
1390	if( deltaFlag ){
1391	Blob deltaSrc;
1392	Blob target;
1393	if( rid!=0 ){
1394	content_get(rid, &deltaSrc);
1395	}else{
1396	blob_zero(&deltaSrc);
1397	}
1398	svn_apply_svndiff(&rec.content, &deltaSrc, &target);
1399	rid = content_put(&target);
1400	}else if( rec.contentFlag ){
1401	rid = content_put(&rec.content);
1402	}
1403	db_bind_text(&addFile, ":path", zFile);
1404	db_bind_int(&addFile, ":branch", branchId);
1405	db_bind_int(&addFile, ":rid", rid);
1406	db_bind_text(&addFile, ":perm", zPerm);
1407	db_step(&addFile);
1408	db_reset(&addFile);
1409	db_bind_int(&addRev, ":branch", branchId);
1410	db_step(&addRev);
1411	db_reset(&addRev);
1412	}
1413	}else
1414	if( strncmp(zAction, "change", 6)==0 ){
1415	int rid = 0;
1416	if( zKind==0 ){
1417	fossil_fatal("Missing Node-kind");
1418	}
1419	if( strncmp(zKind, "dir", 3)!=0 ){
1420	if( deltaFlag ){
1421	Blob deltaSrc;
1422	Blob target;
1423	rid = db_int(0, "SELECT rid FROM blob WHERE uuid=("
1424	" SELECT uuid FROM xfiles"
1425	" WHERE tpath=%Q AND tbranch=%d"
1426	")", zFile, branchId);
1427	content_get(rid, &deltaSrc);
1428	svn_apply_svndiff(&rec.content, &deltaSrc, &target);
1429	rid = content_put(&target);
1430	}else{
1431	rid = content_put(&rec.content);
1432	}
1433	db_bind_text(&addFile, ":path", zFile);
1434	db_bind_int(&addFile, ":branch", branchId);
1435	db_bind_int(&addFile, ":rid", rid);
1436	db_bind_text(&addFile, ":perm", zPerm);
1437	db_step(&addFile);
1438	db_reset(&addFile);
1439	db_bind_int(&addRev, ":branch", branchId);
1440	db_step(&addRev);
1441	db_reset(&addRev);
1442	}
1443	}else
1444	if( strncmp(zAction, "delete", 6)!=0 ){ /* already did this one above */
1445	fossil_fatal("Unknown Node-action");
1446	}
1447	}else{
1448	fossil_fatal("Unknown record type");
1449	}
1450	svn_free_rec(&rec);
1451	}
1452	svn_finish_revision();
1453	fossil_free(gsvn.zUser);
1454	fossil_free(gsvn.zComment);
1455	fossil_free(gsvn.zDate);
1456	db_finalize(&addFile);
1457	db_finalize(&delPath);
1458	db_finalize(&addRev);
1459	db_finalize(&cpyPath);
1460	db_finalize(&cpyRoot);
1461	db_finalize(&revSrc);
1462	fossil_print(" Done!\n");
1463	}
1464
1465	/*
1466	** COMMAND: import
1467	**
1468	** Usage: %fossil import ?--git? ?OPTIONS? NEW-REPOSITORY ?INPUT-FILE?
1469	** or: %fossil import --svn ?OPTIONS? NEW-REPOSITORY ?INPUT-FILE?
1470	**
1471	** Read interchange format generated by another VCS and use it to
1472	** construct a new Fossil repository named by the NEW-REPOSITORY
1473	** argument. If no input file is supplied the interchange format
1474	** data is read from standard input.
1475	**
1476	** The following formats are currently understood by this command
1477	**
1478	** --git Import from the git-fast-export file format (default)
1479	**
1480	** --svn Import from the svnadmin-dump file format. The default
1481	** behaviour (unless overridden by --flat) is to treat 3
1482	** folders in the SVN root as special, following the
1483	** common layout of SVN repositories. These are (by
1484	** default) trunk/, branches/ and tags/
1485	** Options:
1486	** --trunk FOLDER Name of trunk folder
1487	** --branches FOLDER Name of branches folder
1488	** --tags FOLDER Name of tags folder
1489	** --base PATH Path to project root in repository
1490	** --flat The whole dump is a single branch
1491	**
1492	** Common Options:
1493	** -i\|--incremental allow importing into an existing repository
1494	** -f\|--force overwrite repository if already exist
1495	**
1496	** The --incremental option allows an existing repository to be extended
1497	** with new content.
1498	**



1499	**
1500	** See also: export
1501	*/
1502	void import_cmd(void){
1503	char *zPassword;
1504	FILE *pIn;
1505	Stmt q;
1506	int forceFlag = find_option("force", "f", 0)!=0;

1507	int svnFlag = find_option("svn", 0, 0)!=0;
1508
1509	/* Options common to all input formats */
1510	int incrFlag = find_option("incremental", "i", 0)!=0;
1511
1512	/* Options for --svn only */
1513	const char *zBase="";
1514	int flatFlag=0;
1515
1516	if( svnFlag ){
1517	/* Get --svn related options here, so verify_all_options() fail when svn
1518	* only option are specify with --git
1519	*/
1520	zBase = find_option("base", 0, 1);
1521	flatFlag = find_option("flat", 0, 0)!=0;
1522	gsvn.zTrunk = find_option("trunk", 0, 1);
1523	gsvn.zBranches = find_option("branches", 0, 1);
1524	gsvn.zTags = find_option("tags", 0, 1);
1525	gsvn.incrFlag = incrFlag;
1526	}else{
1527	find_option("git",0,0); /* Skip the --git option for now */
1528	}
1529	verify_all_options();
1530
1531	if( g.argc!=3 && g.argc!=4 ){
1532	usage("--git\|--svn ?OPTIONS? NEW-REPOSITORY ?INPUT-FILE?");
1533	}
1534	if( g.argc==4 ){
1535	pIn = fossil_fopen(g.argv[3], "rb");
1536	}else{
1537	pIn = stdin;
	@@ -767,14 +1543,66 @@
1543	}
1544	db_open_repository(g.argv[2]);
1545	db_open_config(0);
1546
1547	db_begin_transaction();
1548	if( !incrFlag ) db_initial_setup(0, 0, 0);
1549
1550	if( svnFlag ){
1551	db_multi_exec(
1552	"CREATE TEMP TABLE xrevisions("
1553	" trev INTEGER, tbranch INT, trid INT, tparent INT DEFAULT 0,"
1554	" UNIQUE(tbranch, trev)"
1555	");"
1556	"CREATE INDEX temp.i_xrevisions ON xrevisions(trid);"
1557	"CREATE TEMP TABLE xfiles("
1558	" tpath TEXT, tbranch INT, tuuid TEXT, tperm TEXT,"
1559	" UNIQUE (tbranch, tpath) ON CONFLICT REPLACE"
1560	");"
1561	"CREATE TEMP TABLE xbranches("
1562	" tid INTEGER PRIMARY KEY, tname TEXT, ttype INT,"
1563	" UNIQUE(tname, ttype)"
1564	");"
1565	"CREATE VIRTUAL TABLE temp.xfoci USING files_of_checkin;"
1566	);
1567	if( zBase==0 ){ zBase = ""; }
1568	if( strlen(zBase)>0 ){
1569	if( zBase[strlen(zBase)-1]!='/' ){
1570	zBase = mprintf("%s/", zBase);
1571	}
1572	}
1573	if( flatFlag ){
1574	gsvn.zTrunk = zBase;
1575	gsvn.zBranches = 0;
1576	gsvn.zTags = 0;
1577	gsvn.lenTrunk = strlen(zBase);
1578	gsvn.lenBranches = 0;
1579	gsvn.lenTags = 0;
1580	}else{
1581	if( gsvn.zTrunk==0 ){ gsvn.zTrunk = "trunk/"; }
1582	if( gsvn.zBranches==0 ){ gsvn.zBranches = "branches/"; }
1583	if( gsvn.zTags==0 ){ gsvn.zTags = "tags/"; }
1584	gsvn.zTrunk = mprintf("%s%s", zBase, gsvn.zTrunk);
1585	gsvn.zBranches = mprintf("%s%s", zBase, gsvn.zBranches);
1586	gsvn.zTags = mprintf("%s%s", zBase, gsvn.zTags);
1587	gsvn.lenTrunk = strlen(gsvn.zTrunk);
1588	gsvn.lenBranches = strlen(gsvn.zBranches);
1589	gsvn.lenTags = strlen(gsvn.zTags);
1590	if( gsvn.zTrunk[gsvn.lenTrunk-1]!='/' ){
1591	gsvn.zTrunk = mprintf("%s/", gsvn.zTrunk);
1592	gsvn.lenTrunk++;
1593	}
1594	if( gsvn.zBranches[gsvn.lenBranches-1]!='/' ){
1595	gsvn.zBranches = mprintf("%s/", gsvn.zBranches);
1596	gsvn.lenBranches++;
1597	}
1598	if( gsvn.zTags[gsvn.lenTags-1]!='/' ){
1599	gsvn.zTags = mprintf("%s/", gsvn.zTags);
1600	gsvn.lenTags++;
1601	}
1602	}
1603	svn_dump_import(pIn);
1604	}else{
1605	/* The following temp-tables are used to hold information needed for
1606	** the import.
1607	**
1608	** The XMARK table provides a mapping from fast-import "marks" and symbols
	@@ -807,10 +1635,12 @@
1635	fast_insert_content(&record, 0, 0);
1636	import_reset(0);
1637	}
1638	db_finalize(&q);
1639	}
1640
1641	verify_cancel();
1642	db_end_transaction(0);
1643	db_begin_transaction();
1644	fossil_print("Rebuilding repository meta-data...\n");
1645	rebuild_db(0, 1, !incrFlag);
1646	verify_cancel();
1647

M src/info.c

+1 -1

		--- src/info.c
		+++ src/info.c
		@@ -1880,11 +1880,11 @@
1880	1880	if( descOnly ){
1881	1881	style_submenu_element("Content", "Content", "%R/artifact/%s", zUuid);
1882	1882	}else{
1883	1883	style_submenu_element("Line Numbers", "Line Numbers",
1884	1884	"%R/info/%s%s",zUuid,
1885		- ((zLn&&*zLn) ? "" : "?ln=0"));
	1885	+ ((zLn&&*zLn) ? "" : "?txt=1&ln=0"));
1886	1886	@ <hr />
1887	1887	content_get(rid, &content);
1888	1888	if( renderAsWiki ){
1889	1889	wiki_render_by_mimetype(&content, zMime);
1890	1890	}else if( renderAsHtml ){
1891	1891

	--- src/info.c
	+++ src/info.c
	@@ -1880,11 +1880,11 @@
1880	if( descOnly ){
1881	style_submenu_element("Content", "Content", "%R/artifact/%s", zUuid);
1882	}else{
1883	style_submenu_element("Line Numbers", "Line Numbers",
1884	"%R/info/%s%s",zUuid,
1885	((zLn&&*zLn) ? "" : "?ln=0"));
1886	@ <hr />
1887	content_get(rid, &content);
1888	if( renderAsWiki ){
1889	wiki_render_by_mimetype(&content, zMime);
1890	}else if( renderAsHtml ){
1891

	--- src/info.c
	+++ src/info.c
	@@ -1880,11 +1880,11 @@
1880	if( descOnly ){
1881	style_submenu_element("Content", "Content", "%R/artifact/%s", zUuid);
1882	}else{
1883	style_submenu_element("Line Numbers", "Line Numbers",
1884	"%R/info/%s%s",zUuid,
1885	((zLn&&*zLn) ? "" : "?txt=1&ln=0"));
1886	@ <hr />
1887	content_get(rid, &content);
1888	if( renderAsWiki ){
1889	wiki_render_by_mimetype(&content, zMime);
1890	}else if( renderAsHtml ){
1891

M src/json_config.c

		--- src/json_config.c
		+++ src/json_config.c
		@@ -81,10 +81,11 @@
81	81	{ "keep-glob", CONFIGSET_PROJ },
82	82	{ "crnl-glob", CONFIGSET_PROJ },
83	83	{ "encoding-glob", CONFIGSET_PROJ },
84	84	{ "empty-dirs", CONFIGSET_PROJ },
85	85	{ "allow-symlinks", CONFIGSET_PROJ },
	86	+{ "dotfiles", CONFIGSET_PROJ },
86	87
87	88	{ "ticket-table", CONFIGSET_TKT },
88	89	{ "ticket-common", CONFIGSET_TKT },
89	90	{ "ticket-change", CONFIGSET_TKT },
90	91	{ "ticket-newpage", CONFIGSET_TKT },
91	92

	--- src/json_config.c
	+++ src/json_config.c
	@@ -81,10 +81,11 @@
81	{ "keep-glob", CONFIGSET_PROJ },
82	{ "crnl-glob", CONFIGSET_PROJ },
83	{ "encoding-glob", CONFIGSET_PROJ },
84	{ "empty-dirs", CONFIGSET_PROJ },
85	{ "allow-symlinks", CONFIGSET_PROJ },

86
87	{ "ticket-table", CONFIGSET_TKT },
88	{ "ticket-common", CONFIGSET_TKT },
89	{ "ticket-change", CONFIGSET_TKT },
90	{ "ticket-newpage", CONFIGSET_TKT },
91

	--- src/json_config.c
	+++ src/json_config.c
	@@ -81,10 +81,11 @@
81	{ "keep-glob", CONFIGSET_PROJ },
82	{ "crnl-glob", CONFIGSET_PROJ },
83	{ "encoding-glob", CONFIGSET_PROJ },
84	{ "empty-dirs", CONFIGSET_PROJ },
85	{ "allow-symlinks", CONFIGSET_PROJ },
86	{ "dotfiles", CONFIGSET_PROJ },
87
88	{ "ticket-table", CONFIGSET_TKT },
89	{ "ticket-common", CONFIGSET_TKT },
90	{ "ticket-change", CONFIGSET_TKT },
91	{ "ticket-newpage", CONFIGSET_TKT },
92

M src/main.c

+39 -14

		--- src/main.c
		+++ src/main.c
		@@ -2031,19 +2031,43 @@
2031	2031	** Open the repository to be served if it is known. If g.argv[arg] is
2032	2032	** a directory full of repositories, then set g.zRepositoryName to
2033	2033	** the name of that directory and the specific repository will be
2034	2034	** opened later by process_one_web_page() based on the content of
2035	2035	** the PATH_INFO variable.
	2036	+**
	2037	+** If the fCreate flag is set, then create the repository if it
	2038	+** does not already exist.
2036	2039	*/
2037		-static void find_server_repository(int arg){
	2040	+static void find_server_repository(int arg, int fCreate){
2038	2041	if( g.argc<=arg ){
2039	2042	db_must_be_within_tree();
2040		- }else if( file_isdir(g.argv[arg])==1 ){
2041		- g.zRepositoryName = mprintf("%s", g.argv[arg]);
2042		- file_simplify_name(g.zRepositoryName, -1, 0);
2043	2043	}else{
2044		- db_open_repository(g.argv[arg]);
	2044	+ const char *zRepo = g.argv[arg];
	2045	+ int isDir = file_isdir(zRepo);
	2046	+ if( isDir==1 ){
	2047	+ g.zRepositoryName = mprintf("%s", zRepo);
	2048	+ file_simplify_name(g.zRepositoryName, -1, 0);
	2049	+ }else{
	2050	+ if( isDir==0 && fCreate ){
	2051	+ const char *zPassword;
	2052	+ db_create_repository(zRepo);
	2053	+ db_open_repository(zRepo);
	2054	+ db_begin_transaction();
	2055	+ db_initial_setup(0, "now", g.zLogin);
	2056	+ db_end_transaction(0);
	2057	+ fossil_print("project-id: %s\n", db_get("project-code", 0));
	2058	+ fossil_print("server-id: %s\n", db_get("server-code", 0));
	2059	+ zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin);
	2060	+ fossil_print("admin-user: %s (initial password is \"%s\")\n",
	2061	+ g.zLogin, zPassword);
	2062	+ cache_initialize();
	2063	+ g.zLogin = 0;
	2064	+ g.userUid = 0;
	2065	+ }else{
	2066	+ db_open_repository(zRepo);
	2067	+ }
	2068	+ }
2045	2069	}
2046	2070	}
2047	2071
2048	2072	/*
2049	2073	** undocumented format:
		@@ -2146,15 +2170,15 @@
2146	2170	g.fullHttpReply = 1;
2147	2171	if( g.argc>=5 ){
2148	2172	g.httpIn = fossil_fopen(g.argv[2], "rb");
2149	2173	g.httpOut = fossil_fopen(g.argv[3], "wb");
2150	2174	zIpAddr = g.argv[4];
2151		- find_server_repository(5);
	2175	+ find_server_repository(5, 0);
2152	2176	}else{
2153	2177	g.httpIn = stdin;
2154	2178	g.httpOut = stdout;
2155		- find_server_repository(2);
	2179	+ find_server_repository(2, 0);
2156	2180	}
2157	2181	if( zIpAddr==0 ){
2158	2182	zIpAddr = cgi_ssh_remote_addr(0);
2159	2183	if( zIpAddr && zIpAddr[0] ){
2160	2184	g.fSshClient \|= CGI_SSH_CLIENT;
		@@ -2197,11 +2221,11 @@
2197	2221	Th_InitTraceLog();
2198	2222	login_set_capabilities("sx", 0);
2199	2223	g.useLocalauth = 1;
2200	2224	g.httpIn = stdin;
2201	2225	g.httpOut = stdout;
2202		- find_server_repository(2);
	2226	+ find_server_repository(2, 0);
2203	2227	g.cgiOutput = 1;
2204	2228	g.fullHttpReply = 1;
2205	2229	zIpAddr = cgi_ssh_remote_addr(0);
2206	2230	if( zIpAddr && zIpAddr[0] ){
2207	2231	g.fSshClient \|= CGI_SSH_CLIENT;
		@@ -2254,12 +2278,12 @@
2254	2278	** The "ui" command automatically starts a web browser after initializing
2255	2279	** the web server. The "ui" command also binds to 127.0.0.1 and so will
2256	2280	** only process HTTP traffic from the local machine.
2257	2281	**
2258	2282	** The REPOSITORY can be a directory (aka folder) that contains one or
2259		-** more repositories with names ending in ".fossil". In this case, the
2260		-** a prefix of the URL pathname is used to search the directory for an
	2283	+** more repositories with names ending in ".fossil". In this case, a
	2284	+** prefix of the URL pathname is used to search the directory for an
2261	2285	** appropriate repository. To thwart mischief, the pathname in the URL must
2262	2286	** contain only alphanumerics, "_", "/", "-", and ".", and no "-" may
2263	2287	** occur after "/", and every "." must be surrounded on both sides by
2264	2288	** alphanumerics. Any pathname that does not satisfy these constraints
2265	2289	** results in a 404 error. Files in REPOSITORY that match the comma-separated
		@@ -2276,10 +2300,11 @@
2276	2300	** connection is from localhost. The "ui" command also enables --repolist
2277	2301	** by default.
2278	2302	**
2279	2303	** Options:
2280	2304	** --baseurl URL Use URL as the base (useful for reverse proxies)
	2305	+** --create Create a new REPOSITORY if it does not already exist
2281	2306	** --files GLOBLIST Comma-separated list of glob patterns for static files
2282	2307	** --localauth enable automatic login for requests from localhost
2283	2308	** --localhost listen on 127.0.0.1 only (always true for "ui")
2284	2309	** --nojail Drop root privileges but do not enter the chroot jail
2285	2310	** --notfound URL Redirect
		@@ -2305,10 +2330,11 @@
2305	2330	#endif
2306	2331	int allowRepoList; /* List repositories on URL "/" */
2307	2332	const char zAltBase; / Argument to the --baseurl option */
2308	2333	const char zFileGlob; / Static content must match this */
2309	2334	char zIpAddr = 0; / Bind to this IP address */
	2335	+ int fCreate = 0;
2310	2336
2311	2337	#if defined(_WIN32)
2312	2338	const char zStopperFile; / Name of file used to terminate server */
2313	2339	zStopperFile = find_option("stopper", 0, 1);
2314	2340	#endif
		@@ -2329,10 +2355,11 @@
2329	2355	Th_InitTraceLog();
2330	2356	zPort = find_option("port", "P", 1);
2331	2357	zNotFound = find_option("notfound", 0, 1);
2332	2358	allowRepoList = find_option("repolist",0,0)!=0;
2333	2359	zAltBase = find_option("baseurl", 0, 1);
	2360	+ fCreate = find_option("create",0,0)!=0;
2334	2361	if( find_option("scgi", 0, 0)!=0 ) flags \|= HTTP_SERVER_SCGI;
2335	2362	if( zAltBase ){
2336	2363	set_base_url(zAltBase);
2337	2364	}
2338	2365	if( find_option("localhost", 0, 0)!=0 ){
		@@ -2347,11 +2374,11 @@
2347	2374	if( isUiCmd ){
2348	2375	flags \|= HTTP_SERVER_LOCALHOST\|HTTP_SERVER_REPOLIST;
2349	2376	g.useLocalauth = 1;
2350	2377	allowRepoList = 1;
2351	2378	}
2352		- find_server_repository(2);
	2379	+ find_server_repository(2, fCreate);
2353	2380	if( zPort ){
2354	2381	int i;
2355	2382	for(i=strlen(zPort)-1; i>=0 && zPort[i]!=':'; i--){}
2356	2383	if( i>0 ){
2357	2384	zIpAddr = mprintf("%.*s", i, zPort);
		@@ -2387,12 +2414,10 @@
2387	2414	}else{
2388	2415	zBrowserCmd = mprintf("%s http://localhost:%%d/ &", zBrowser);
2389	2416	}
2390	2417	if( g.repositoryOpen ) flags \|= HTTP_SERVER_HAD_REPOSITORY;
2391	2418	if( g.localOpen ) flags \|= HTTP_SERVER_HAD_CHECKOUT;
2392		- }else{
2393		- db_setup_server_and_project_codes(1);
2394	2419	}
2395	2420	db_close(1);
2396	2421	if( cgi_http_server(iPort, mxPort, zBrowserCmd, zIpAddr, flags) ){
2397	2422	fossil_fatal("unable to listen on TCP socket %d", iPort);
2398	2423	}
		@@ -2401,11 +2426,11 @@
2401	2426	g.httpOut = stdout;
2402	2427	if( g.fHttpTrace \|\| g.fSqlTrace ){
2403	2428	fprintf(stderr, "====== SERVER pid %d =======\n", getpid());
2404	2429	}
2405	2430	g.cgiOutput = 1;
2406		- find_server_repository(2);
	2431	+ find_server_repository(2, 0);
2407	2432	g.zRepositoryName = enter_chroot_jail(g.zRepositoryName, noJail);
2408	2433	if( flags & HTTP_SERVER_SCGI ){
2409	2434	cgi_handle_scgi_request();
2410	2435	}else{
2411	2436	cgi_handle_http_request(0);
2412	2437

	--- src/main.c
	+++ src/main.c
	@@ -2031,19 +2031,43 @@
2031	** Open the repository to be served if it is known. If g.argv[arg] is
2032	** a directory full of repositories, then set g.zRepositoryName to
2033	** the name of that directory and the specific repository will be
2034	** opened later by process_one_web_page() based on the content of
2035	** the PATH_INFO variable.



2036	*/
2037	static void find_server_repository(int arg){
2038	if( g.argc<=arg ){
2039	db_must_be_within_tree();
2040	}else if( file_isdir(g.argv[arg])==1 ){
2041	g.zRepositoryName = mprintf("%s", g.argv[arg]);
2042	file_simplify_name(g.zRepositoryName, -1, 0);
2043	}else{
2044	db_open_repository(g.argv[arg]);
























2045	}
2046	}
2047
2048	/*
2049	** undocumented format:
	@@ -2146,15 +2170,15 @@
2146	g.fullHttpReply = 1;
2147	if( g.argc>=5 ){
2148	g.httpIn = fossil_fopen(g.argv[2], "rb");
2149	g.httpOut = fossil_fopen(g.argv[3], "wb");
2150	zIpAddr = g.argv[4];
2151	find_server_repository(5);
2152	}else{
2153	g.httpIn = stdin;
2154	g.httpOut = stdout;
2155	find_server_repository(2);
2156	}
2157	if( zIpAddr==0 ){
2158	zIpAddr = cgi_ssh_remote_addr(0);
2159	if( zIpAddr && zIpAddr[0] ){
2160	g.fSshClient \|= CGI_SSH_CLIENT;
	@@ -2197,11 +2221,11 @@
2197	Th_InitTraceLog();
2198	login_set_capabilities("sx", 0);
2199	g.useLocalauth = 1;
2200	g.httpIn = stdin;
2201	g.httpOut = stdout;
2202	find_server_repository(2);
2203	g.cgiOutput = 1;
2204	g.fullHttpReply = 1;
2205	zIpAddr = cgi_ssh_remote_addr(0);
2206	if( zIpAddr && zIpAddr[0] ){
2207	g.fSshClient \|= CGI_SSH_CLIENT;
	@@ -2254,12 +2278,12 @@
2254	** The "ui" command automatically starts a web browser after initializing
2255	** the web server. The "ui" command also binds to 127.0.0.1 and so will
2256	** only process HTTP traffic from the local machine.
2257	**
2258	** The REPOSITORY can be a directory (aka folder) that contains one or
2259	** more repositories with names ending in ".fossil". In this case, the
2260	** a prefix of the URL pathname is used to search the directory for an
2261	** appropriate repository. To thwart mischief, the pathname in the URL must
2262	** contain only alphanumerics, "_", "/", "-", and ".", and no "-" may
2263	** occur after "/", and every "." must be surrounded on both sides by
2264	** alphanumerics. Any pathname that does not satisfy these constraints
2265	** results in a 404 error. Files in REPOSITORY that match the comma-separated
	@@ -2276,10 +2300,11 @@
2276	** connection is from localhost. The "ui" command also enables --repolist
2277	** by default.
2278	**
2279	** Options:
2280	** --baseurl URL Use URL as the base (useful for reverse proxies)

2281	** --files GLOBLIST Comma-separated list of glob patterns for static files
2282	** --localauth enable automatic login for requests from localhost
2283	** --localhost listen on 127.0.0.1 only (always true for "ui")
2284	** --nojail Drop root privileges but do not enter the chroot jail
2285	** --notfound URL Redirect
	@@ -2305,10 +2330,11 @@
2305	#endif
2306	int allowRepoList; /* List repositories on URL "/" */
2307	const char zAltBase; / Argument to the --baseurl option */
2308	const char zFileGlob; / Static content must match this */
2309	char zIpAddr = 0; / Bind to this IP address */

2310
2311	#if defined(_WIN32)
2312	const char zStopperFile; / Name of file used to terminate server */
2313	zStopperFile = find_option("stopper", 0, 1);
2314	#endif
	@@ -2329,10 +2355,11 @@
2329	Th_InitTraceLog();
2330	zPort = find_option("port", "P", 1);
2331	zNotFound = find_option("notfound", 0, 1);
2332	allowRepoList = find_option("repolist",0,0)!=0;
2333	zAltBase = find_option("baseurl", 0, 1);

2334	if( find_option("scgi", 0, 0)!=0 ) flags \|= HTTP_SERVER_SCGI;
2335	if( zAltBase ){
2336	set_base_url(zAltBase);
2337	}
2338	if( find_option("localhost", 0, 0)!=0 ){
	@@ -2347,11 +2374,11 @@
2347	if( isUiCmd ){
2348	flags \|= HTTP_SERVER_LOCALHOST\|HTTP_SERVER_REPOLIST;
2349	g.useLocalauth = 1;
2350	allowRepoList = 1;
2351	}
2352	find_server_repository(2);
2353	if( zPort ){
2354	int i;
2355	for(i=strlen(zPort)-1; i>=0 && zPort[i]!=':'; i--){}
2356	if( i>0 ){
2357	zIpAddr = mprintf("%.*s", i, zPort);
	@@ -2387,12 +2414,10 @@
2387	}else{
2388	zBrowserCmd = mprintf("%s http://localhost:%%d/ &", zBrowser);
2389	}
2390	if( g.repositoryOpen ) flags \|= HTTP_SERVER_HAD_REPOSITORY;
2391	if( g.localOpen ) flags \|= HTTP_SERVER_HAD_CHECKOUT;
2392	}else{
2393	db_setup_server_and_project_codes(1);
2394	}
2395	db_close(1);
2396	if( cgi_http_server(iPort, mxPort, zBrowserCmd, zIpAddr, flags) ){
2397	fossil_fatal("unable to listen on TCP socket %d", iPort);
2398	}
	@@ -2401,11 +2426,11 @@
2401	g.httpOut = stdout;
2402	if( g.fHttpTrace \|\| g.fSqlTrace ){
2403	fprintf(stderr, "====== SERVER pid %d =======\n", getpid());
2404	}
2405	g.cgiOutput = 1;
2406	find_server_repository(2);
2407	g.zRepositoryName = enter_chroot_jail(g.zRepositoryName, noJail);
2408	if( flags & HTTP_SERVER_SCGI ){
2409	cgi_handle_scgi_request();
2410	}else{
2411	cgi_handle_http_request(0);
2412

	--- src/main.c
	+++ src/main.c
	@@ -2031,19 +2031,43 @@
2031	** Open the repository to be served if it is known. If g.argv[arg] is
2032	** a directory full of repositories, then set g.zRepositoryName to
2033	** the name of that directory and the specific repository will be
2034	** opened later by process_one_web_page() based on the content of
2035	** the PATH_INFO variable.
2036	**
2037	** If the fCreate flag is set, then create the repository if it
2038	** does not already exist.
2039	*/
2040	static void find_server_repository(int arg, int fCreate){
2041	if( g.argc<=arg ){
2042	db_must_be_within_tree();



2043	}else{
2044	const char *zRepo = g.argv[arg];
2045	int isDir = file_isdir(zRepo);
2046	if( isDir==1 ){
2047	g.zRepositoryName = mprintf("%s", zRepo);
2048	file_simplify_name(g.zRepositoryName, -1, 0);
2049	}else{
2050	if( isDir==0 && fCreate ){
2051	const char *zPassword;
2052	db_create_repository(zRepo);
2053	db_open_repository(zRepo);
2054	db_begin_transaction();
2055	db_initial_setup(0, "now", g.zLogin);
2056	db_end_transaction(0);
2057	fossil_print("project-id: %s\n", db_get("project-code", 0));
2058	fossil_print("server-id: %s\n", db_get("server-code", 0));
2059	zPassword = db_text(0, "SELECT pw FROM user WHERE login=%Q", g.zLogin);
2060	fossil_print("admin-user: %s (initial password is \"%s\")\n",
2061	g.zLogin, zPassword);
2062	cache_initialize();
2063	g.zLogin = 0;
2064	g.userUid = 0;
2065	}else{
2066	db_open_repository(zRepo);
2067	}
2068	}
2069	}
2070	}
2071
2072	/*
2073	** undocumented format:
	@@ -2146,15 +2170,15 @@
2170	g.fullHttpReply = 1;
2171	if( g.argc>=5 ){
2172	g.httpIn = fossil_fopen(g.argv[2], "rb");
2173	g.httpOut = fossil_fopen(g.argv[3], "wb");
2174	zIpAddr = g.argv[4];
2175	find_server_repository(5, 0);
2176	}else{
2177	g.httpIn = stdin;
2178	g.httpOut = stdout;
2179	find_server_repository(2, 0);
2180	}
2181	if( zIpAddr==0 ){
2182	zIpAddr = cgi_ssh_remote_addr(0);
2183	if( zIpAddr && zIpAddr[0] ){
2184	g.fSshClient \|= CGI_SSH_CLIENT;
	@@ -2197,11 +2221,11 @@
2221	Th_InitTraceLog();
2222	login_set_capabilities("sx", 0);
2223	g.useLocalauth = 1;
2224	g.httpIn = stdin;
2225	g.httpOut = stdout;
2226	find_server_repository(2, 0);
2227	g.cgiOutput = 1;
2228	g.fullHttpReply = 1;
2229	zIpAddr = cgi_ssh_remote_addr(0);
2230	if( zIpAddr && zIpAddr[0] ){
2231	g.fSshClient \|= CGI_SSH_CLIENT;
	@@ -2254,12 +2278,12 @@
2278	** The "ui" command automatically starts a web browser after initializing
2279	** the web server. The "ui" command also binds to 127.0.0.1 and so will
2280	** only process HTTP traffic from the local machine.
2281	**
2282	** The REPOSITORY can be a directory (aka folder) that contains one or
2283	** more repositories with names ending in ".fossil". In this case, a
2284	** prefix of the URL pathname is used to search the directory for an
2285	** appropriate repository. To thwart mischief, the pathname in the URL must
2286	** contain only alphanumerics, "_", "/", "-", and ".", and no "-" may
2287	** occur after "/", and every "." must be surrounded on both sides by
2288	** alphanumerics. Any pathname that does not satisfy these constraints
2289	** results in a 404 error. Files in REPOSITORY that match the comma-separated
	@@ -2276,10 +2300,11 @@
2300	** connection is from localhost. The "ui" command also enables --repolist
2301	** by default.
2302	**
2303	** Options:
2304	** --baseurl URL Use URL as the base (useful for reverse proxies)
2305	** --create Create a new REPOSITORY if it does not already exist
2306	** --files GLOBLIST Comma-separated list of glob patterns for static files
2307	** --localauth enable automatic login for requests from localhost
2308	** --localhost listen on 127.0.0.1 only (always true for "ui")
2309	** --nojail Drop root privileges but do not enter the chroot jail
2310	** --notfound URL Redirect
	@@ -2305,10 +2330,11 @@
2330	#endif
2331	int allowRepoList; /* List repositories on URL "/" */
2332	const char zAltBase; / Argument to the --baseurl option */
2333	const char zFileGlob; / Static content must match this */
2334	char zIpAddr = 0; / Bind to this IP address */
2335	int fCreate = 0;
2336
2337	#if defined(_WIN32)
2338	const char zStopperFile; / Name of file used to terminate server */
2339	zStopperFile = find_option("stopper", 0, 1);
2340	#endif
	@@ -2329,10 +2355,11 @@
2355	Th_InitTraceLog();
2356	zPort = find_option("port", "P", 1);
2357	zNotFound = find_option("notfound", 0, 1);
2358	allowRepoList = find_option("repolist",0,0)!=0;
2359	zAltBase = find_option("baseurl", 0, 1);
2360	fCreate = find_option("create",0,0)!=0;
2361	if( find_option("scgi", 0, 0)!=0 ) flags \|= HTTP_SERVER_SCGI;
2362	if( zAltBase ){
2363	set_base_url(zAltBase);
2364	}
2365	if( find_option("localhost", 0, 0)!=0 ){
	@@ -2347,11 +2374,11 @@
2374	if( isUiCmd ){
2375	flags \|= HTTP_SERVER_LOCALHOST\|HTTP_SERVER_REPOLIST;
2376	g.useLocalauth = 1;
2377	allowRepoList = 1;
2378	}
2379	find_server_repository(2, fCreate);
2380	if( zPort ){
2381	int i;
2382	for(i=strlen(zPort)-1; i>=0 && zPort[i]!=':'; i--){}
2383	if( i>0 ){
2384	zIpAddr = mprintf("%.*s", i, zPort);
	@@ -2387,12 +2414,10 @@
2414	}else{
2415	zBrowserCmd = mprintf("%s http://localhost:%%d/ &", zBrowser);
2416	}
2417	if( g.repositoryOpen ) flags \|= HTTP_SERVER_HAD_REPOSITORY;
2418	if( g.localOpen ) flags \|= HTTP_SERVER_HAD_CHECKOUT;


2419	}
2420	db_close(1);
2421	if( cgi_http_server(iPort, mxPort, zBrowserCmd, zIpAddr, flags) ){
2422	fossil_fatal("unable to listen on TCP socket %d", iPort);
2423	}
	@@ -2401,11 +2426,11 @@
2426	g.httpOut = stdout;
2427	if( g.fHttpTrace \|\| g.fSqlTrace ){
2428	fprintf(stderr, "====== SERVER pid %d =======\n", getpid());
2429	}
2430	g.cgiOutput = 1;
2431	find_server_repository(2, 0);
2432	g.zRepositoryName = enter_chroot_jail(g.zRepositoryName, noJail);
2433	if( flags & HTTP_SERVER_SCGI ){
2434	cgi_handle_scgi_request();
2435	}else{
2436	cgi_handle_http_request(0);
2437

M src/main.mk

+11 -3

		--- src/main.mk
		+++ src/main.mk
		@@ -135,25 +135,33 @@
135	135
136	136	EXTRA_FILES = \
137	137	$(SRCDIR)/../skins/black_and_white/css.txt \
138	138	$(SRCDIR)/../skins/black_and_white/footer.txt \
139	139	$(SRCDIR)/../skins/black_and_white/header.txt \
	140	+ $(SRCDIR)/../skins/blitz/css.txt \
	141	+ $(SRCDIR)/../skins/blitz/footer.txt \
	142	+ $(SRCDIR)/../skins/blitz/header.txt \
	143	+ $(SRCDIR)/../skins/blitz/ticket.txt \
	144	+ $(SRCDIR)/../skins/blitz_no_logo/css.txt \
	145	+ $(SRCDIR)/../skins/blitz_no_logo/footer.txt \
	146	+ $(SRCDIR)/../skins/blitz_no_logo/header.txt \
	147	+ $(SRCDIR)/../skins/blitz_no_logo/ticket.txt \
140	148	$(SRCDIR)/../skins/default/css.txt \
141	149	$(SRCDIR)/../skins/default/footer.txt \
142	150	$(SRCDIR)/../skins/default/header.txt \
143	151	$(SRCDIR)/../skins/eagle/css.txt \
144	152	$(SRCDIR)/../skins/eagle/footer.txt \
145	153	$(SRCDIR)/../skins/eagle/header.txt \
146	154	$(SRCDIR)/../skins/enhanced1/css.txt \
147	155	$(SRCDIR)/../skins/enhanced1/footer.txt \
148	156	$(SRCDIR)/../skins/enhanced1/header.txt \
149		- $(SRCDIR)/../skins/etienne1/css.txt \
150		- $(SRCDIR)/../skins/etienne1/footer.txt \
151		- $(SRCDIR)/../skins/etienne1/header.txt \
152	157	$(SRCDIR)/../skins/khaki/css.txt \
153	158	$(SRCDIR)/../skins/khaki/footer.txt \
154	159	$(SRCDIR)/../skins/khaki/header.txt \
	160	+ $(SRCDIR)/../skins/original/css.txt \
	161	+ $(SRCDIR)/../skins/original/footer.txt \
	162	+ $(SRCDIR)/../skins/original/header.txt \
155	163	$(SRCDIR)/../skins/plain_gray/css.txt \
156	164	$(SRCDIR)/../skins/plain_gray/footer.txt \
157	165	$(SRCDIR)/../skins/plain_gray/header.txt \
158	166	$(SRCDIR)/../skins/rounded1/css.txt \
159	167	$(SRCDIR)/../skins/rounded1/footer.txt \
160	168

	--- src/main.mk
	+++ src/main.mk
	@@ -135,25 +135,33 @@
135
136	EXTRA_FILES = \
137	$(SRCDIR)/../skins/black_and_white/css.txt \
138	$(SRCDIR)/../skins/black_and_white/footer.txt \
139	$(SRCDIR)/../skins/black_and_white/header.txt \








140	$(SRCDIR)/../skins/default/css.txt \
141	$(SRCDIR)/../skins/default/footer.txt \
142	$(SRCDIR)/../skins/default/header.txt \
143	$(SRCDIR)/../skins/eagle/css.txt \
144	$(SRCDIR)/../skins/eagle/footer.txt \
145	$(SRCDIR)/../skins/eagle/header.txt \
146	$(SRCDIR)/../skins/enhanced1/css.txt \
147	$(SRCDIR)/../skins/enhanced1/footer.txt \
148	$(SRCDIR)/../skins/enhanced1/header.txt \
149	$(SRCDIR)/../skins/etienne1/css.txt \
150	$(SRCDIR)/../skins/etienne1/footer.txt \
151	$(SRCDIR)/../skins/etienne1/header.txt \
152	$(SRCDIR)/../skins/khaki/css.txt \
153	$(SRCDIR)/../skins/khaki/footer.txt \
154	$(SRCDIR)/../skins/khaki/header.txt \



155	$(SRCDIR)/../skins/plain_gray/css.txt \
156	$(SRCDIR)/../skins/plain_gray/footer.txt \
157	$(SRCDIR)/../skins/plain_gray/header.txt \
158	$(SRCDIR)/../skins/rounded1/css.txt \
159	$(SRCDIR)/../skins/rounded1/footer.txt \
160

	--- src/main.mk
	+++ src/main.mk
	@@ -135,25 +135,33 @@
135
136	EXTRA_FILES = \
137	$(SRCDIR)/../skins/black_and_white/css.txt \
138	$(SRCDIR)/../skins/black_and_white/footer.txt \
139	$(SRCDIR)/../skins/black_and_white/header.txt \
140	$(SRCDIR)/../skins/blitz/css.txt \
141	$(SRCDIR)/../skins/blitz/footer.txt \
142	$(SRCDIR)/../skins/blitz/header.txt \
143	$(SRCDIR)/../skins/blitz/ticket.txt \
144	$(SRCDIR)/../skins/blitz_no_logo/css.txt \
145	$(SRCDIR)/../skins/blitz_no_logo/footer.txt \
146	$(SRCDIR)/../skins/blitz_no_logo/header.txt \
147	$(SRCDIR)/../skins/blitz_no_logo/ticket.txt \
148	$(SRCDIR)/../skins/default/css.txt \
149	$(SRCDIR)/../skins/default/footer.txt \
150	$(SRCDIR)/../skins/default/header.txt \
151	$(SRCDIR)/../skins/eagle/css.txt \
152	$(SRCDIR)/../skins/eagle/footer.txt \
153	$(SRCDIR)/../skins/eagle/header.txt \
154	$(SRCDIR)/../skins/enhanced1/css.txt \
155	$(SRCDIR)/../skins/enhanced1/footer.txt \
156	$(SRCDIR)/../skins/enhanced1/header.txt \



157	$(SRCDIR)/../skins/khaki/css.txt \
158	$(SRCDIR)/../skins/khaki/footer.txt \
159	$(SRCDIR)/../skins/khaki/header.txt \
160	$(SRCDIR)/../skins/original/css.txt \
161	$(SRCDIR)/../skins/original/footer.txt \
162	$(SRCDIR)/../skins/original/header.txt \
163	$(SRCDIR)/../skins/plain_gray/css.txt \
164	$(SRCDIR)/../skins/plain_gray/footer.txt \
165	$(SRCDIR)/../skins/plain_gray/header.txt \
166	$(SRCDIR)/../skins/rounded1/css.txt \
167	$(SRCDIR)/../skins/rounded1/footer.txt \
168

M src/makemake.tcl

+2 -2

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -587,11 +587,11 @@
587	587	#### The directories where the OpenSSL include and library files are located.
588	588	# The recommended usage here is to use the Sysinternals junction tool
589	589	# to create a hard link between an "openssl-1.x" sub-directory of the
590	590	# Fossil source code directory and the target OpenSSL source directory.
591	591	#
592		-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2
	592	+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2a
593	593	OPENSSLINCDIR = $(OPENSSLDIR)/include
594	594	OPENSSLLIBDIR = $(OPENSSLDIR)
595	595
596	596	#### Either the directory where the Tcl library is installed or the Tcl
597	597	# source code directory resides (depending on the value of the macro
		@@ -1320,11 +1320,11 @@
1320	1320
1321	1321	# Uncomment to enable Tcl support
1322	1322	# FOSSIL_ENABLE_TCL = 1
1323	1323
1324	1324	!ifdef FOSSIL_ENABLE_SSL
1325		-SSLDIR = $(B)\compat\openssl-1.0.2
	1325	+SSLDIR = $(B)\compat\openssl-1.0.2a
1326	1326	SSLINCDIR = $(SSLDIR)\inc32
1327	1327	SSLLIBDIR = $(SSLDIR)\out32
1328	1328	SSLLFLAGS = /nologo /opt:ref /debug
1329	1329	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1330	1330	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
1331	1331

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -587,11 +587,11 @@
587	#### The directories where the OpenSSL include and library files are located.
588	# The recommended usage here is to use the Sysinternals junction tool
589	# to create a hard link between an "openssl-1.x" sub-directory of the
590	# Fossil source code directory and the target OpenSSL source directory.
591	#
592	OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2
593	OPENSSLINCDIR = $(OPENSSLDIR)/include
594	OPENSSLLIBDIR = $(OPENSSLDIR)
595
596	#### Either the directory where the Tcl library is installed or the Tcl
597	# source code directory resides (depending on the value of the macro
	@@ -1320,11 +1320,11 @@
1320
1321	# Uncomment to enable Tcl support
1322	# FOSSIL_ENABLE_TCL = 1
1323
1324	!ifdef FOSSIL_ENABLE_SSL
1325	SSLDIR = $(B)\compat\openssl-1.0.2
1326	SSLINCDIR = $(SSLDIR)\inc32
1327	SSLLIBDIR = $(SSLDIR)\out32
1328	SSLLFLAGS = /nologo /opt:ref /debug
1329	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1330	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
1331

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -587,11 +587,11 @@
587	#### The directories where the OpenSSL include and library files are located.
588	# The recommended usage here is to use the Sysinternals junction tool
589	# to create a hard link between an "openssl-1.x" sub-directory of the
590	# Fossil source code directory and the target OpenSSL source directory.
591	#
592	OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2a
593	OPENSSLINCDIR = $(OPENSSLDIR)/include
594	OPENSSLLIBDIR = $(OPENSSLDIR)
595
596	#### Either the directory where the Tcl library is installed or the Tcl
597	# source code directory resides (depending on the value of the macro
	@@ -1320,11 +1320,11 @@
1320
1321	# Uncomment to enable Tcl support
1322	# FOSSIL_ENABLE_TCL = 1
1323
1324	!ifdef FOSSIL_ENABLE_SSL
1325	SSLDIR = $(B)\compat\openssl-1.0.2a
1326	SSLINCDIR = $(SSLDIR)\inc32
1327	SSLLIBDIR = $(SSLDIR)\out32
1328	SSLLFLAGS = /nologo /opt:ref /debug
1329	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1330	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
1331

M src/rebuild.c

+1 -1

		--- src/rebuild.c
		+++ src/rebuild.c
		@@ -953,11 +953,11 @@
953	953	/* We should be done with options.. */
954	954	verify_all_options();
955	955
956	956	db_open_config(0);
957	957	db_begin_transaction();
958		- db_initial_setup(0, 0, 0, 1);
	958	+ db_initial_setup(0, 0, 0);
959	959
960	960	fossil_print("Reading files from directory \"%s\"...\n", g.argv[3]);
961	961	recon_read_dir(g.argv[3]);
962	962	fossil_print("\nBuilding the Fossil repository...\n");
963	963
964	964

	--- src/rebuild.c
	+++ src/rebuild.c
	@@ -953,11 +953,11 @@
953	/* We should be done with options.. */
954	verify_all_options();
955
956	db_open_config(0);
957	db_begin_transaction();
958	db_initial_setup(0, 0, 0, 1);
959
960	fossil_print("Reading files from directory \"%s\"...\n", g.argv[3]);
961	recon_read_dir(g.argv[3]);
962	fossil_print("\nBuilding the Fossil repository...\n");
963
964

	--- src/rebuild.c
	+++ src/rebuild.c
	@@ -953,11 +953,11 @@
953	/* We should be done with options.. */
954	verify_all_options();
955
956	db_open_config(0);
957	db_begin_transaction();
958	db_initial_setup(0, 0, 0);
959
960	fossil_print("Reading files from directory \"%s\"...\n", g.argv[3]);
961	recon_read_dir(g.argv[3]);
962	fossil_print("\nBuilding the Fossil repository...\n");
963
964

M src/shell.c

+52 -25

		--- src/shell.c
		+++ src/shell.c
		@@ -22,10 +22,17 @@
22	22	*/
23	23	#if defined(INCLUDE_MSVC_H)
24	24	#include "msvc.h"
25	25	#endif
26	26
	27	+/*
	28	+** No support for loadable extensions in VxWorks.
	29	+*/
	30	+#if (defined(__RTP__) \|\| defined(_WRS_KERNEL)) && !SQLITE_OMIT_LOAD_EXTENSION
	31	+# define SQLITE_OMIT_LOAD_EXTENSION 1
	32	+#endif
	33	+
27	34	/*
28	35	** Enable large-file support for fopen() and friends on unix.
29	36	*/
30	37	#ifndef SQLITE_DISABLE_LFS
31	38	# define _LARGE_FILE 1
		@@ -105,14 +112,19 @@
105	112	#else
106	113	/* Make sure isatty() has a prototype.
107	114	*/
108	115	extern int isatty(int);
109	116
110		-/* popen and pclose are not C89 functions and so are sometimes omitted from
111		-** the <stdio.h> header */
112		-extern FILE popen(const char,const char*);
113		-extern int pclose(FILE*);
	117	+#if !defined(__RTP__) && !defined(_WRS_KERNEL)
	118	+ /* popen and pclose are not C89 functions and so are sometimes omitted from
	119	+ ** the <stdio.h> header */
	120	+ extern FILE popen(const char,const char*);
	121	+ extern int pclose(FILE*);
	122	+#else
	123	+# define SQLITE_OMIT_POPEN 1
	124	+#endif
	125	+
114	126	#endif
115	127
116	128	#if defined(_WIN32_WCE)
117	129	/* Windows CE (arm-wince-mingw32ce-gcc) does not provide isatty()
118	130	* thus we always assume that we have a console. That can be
		@@ -163,14 +175,22 @@
163	175	t = (sqlite3_int64)(r*86400000.0);
164	176	}
165	177	return t;
166	178	}
167	179
168		-#if !defined(_WIN32) && !defined(WIN32) && !defined(_WRS_KERNEL) \
169		- && !defined(__minux)
	180	+#if !defined(_WIN32) && !defined(WIN32) && !defined(__minux)
170	181	#include <sys/time.h>
171	182	#include <sys/resource.h>
	183	+
	184	+/* VxWorks does not support getrusage() as far as we can determine */
	185	+#if defined(_WRS_KERNEL) \|\| defined(__RTP__)
	186	+struct rusage {
	187	+ struct timeval ru_utime; /* user CPU time used */
	188	+ struct timeval ru_stime; /* system CPU time used */
	189	+};
	190	+#define getrusage(A,B) memset(B,0,sizeof(*B))
	191	+#endif
172	192
173	193	/* Saved resource information for the beginning of an operation */
174	194	static struct rusage sBegin; /* CPU time at start */
175	195	static sqlite3_int64 iBegin; /* Wall-clock time at start */
176	196
		@@ -193,12 +213,12 @@
193	213	/*
194	214	** Print the timing results.
195	215	*/
196	216	static void endTimer(void){
197	217	if( enableTimer ){
198		- struct rusage sEnd;
199	218	sqlite3_int64 iEnd = timeOfDay();
	219	+ struct rusage sEnd;
200	220	getrusage(RUSAGE_SELF, &sEnd);
201	221	printf("Run Time: real %.3f user %f sys %f\n",
202	222	(iEnd - iBegin)*0.001,
203	223	timeDiff(&sBegin.ru_utime, &sEnd.ru_utime),
204	224	timeDiff(&sBegin.ru_stime, &sEnd.ru_stime));
		@@ -2121,11 +2141,11 @@
2121	2141	** + Keep track of the line number in p->nLine.
2122	2142	** + Store the character that terminates the field in p->cTerm. Store
2123	2143	** EOF on end-of-file.
2124	2144	** + Report syntax errors on stderr
2125	2145	*/
2126		-static char csv_read_one_field(ImportCtx p){
	2146	+static char SQLITE_CDECL csv_read_one_field(ImportCtx p){
2127	2147	int c;
2128	2148	int cSep = p->cColSep;
2129	2149	int rSep = p->cRowSep;
2130	2150	p->n = 0;
2131	2151	c = fgetc(p->in);
		@@ -2195,11 +2215,11 @@
2195	2215	** + Keep track of the row number in p->nLine.
2196	2216	** + Store the character that terminates the field in p->cTerm. Store
2197	2217	** EOF on end-of-file.
2198	2218	** + Report syntax errors on stderr
2199	2219	*/
2200		-static char ascii_read_one_field(ImportCtx p){
	2220	+static char SQLITE_CDECL ascii_read_one_field(ImportCtx p){
2201	2221	int c;
2202	2222	int cSep = p->cColSep;
2203	2223	int rSep = p->cRowSep;
2204	2224	p->n = 0;
2205	2225	c = fgetc(p->in);
		@@ -2437,11 +2457,13 @@
2437	2457	/*
2438	2458	** Change the output file back to stdout
2439	2459	*/
2440	2460	static void output_reset(ShellState *p){
2441	2461	if( p->outfile[0]=='\|' ){
	2462	+#ifndef SQLITE_OMIT_POPEN
2442	2463	pclose(p->out);
	2464	+#endif
2443	2465	}else{
2444	2466	output_file_close(p->out);
2445	2467	}
2446	2468	p->outfile[0] = 0;
2447	2469	p->out = stdout;
		@@ -2887,12 +2909,12 @@
2887	2909	int i, j; /* Loop counters */
2888	2910	int needCommit; /* True to COMMIT or ROLLBACK at end */
2889	2911	int nSep; /* Number of bytes in p->colSeparator[] */
2890	2912	char zSql; / An SQL statement */
2891	2913	ImportCtx sCtx; /* Reader context */
2892		- char (xRead)(ImportCtx); / Procedure to read one value */
2893		- int (xCloser)(FILE); /* Procedure to close th3 connection */
	2914	+ char (SQLITE_CDECL xRead)(ImportCtx); / Func to read one value */
	2915	+ int (SQLITE_CDECL xCloser)(FILE); /* Func to close file */
2894	2916
2895	2917	if( nArg!=3 ){
2896	2918	fprintf(stderr, "Usage: .import FILE TABLE\n");
2897	2919	goto meta_command_exit;
2898	2920	}
		@@ -2930,13 +2952,18 @@
2930	2952	return 1;
2931	2953	}
2932	2954	sCtx.zFile = zFile;
2933	2955	sCtx.nLine = 1;
2934	2956	if( sCtx.zFile[0]=='\|' ){
	2957	+#ifdef SQLITE_OMIT_POPEN
	2958	+ fprintf(stderr, "Error: pipes are not supported in this OS\n");
	2959	+ return 1;
	2960	+#else
2935	2961	sCtx.in = popen(sCtx.zFile+1, "r");
2936	2962	sCtx.zFile = "<pipe>";
2937	2963	xCloser = pclose;
	2964	+#endif
2938	2965	}else{
2939	2966	sCtx.in = fopen(sCtx.zFile, "rb");
2940	2967	xCloser = fclose;
2941	2968	}
2942	2969	if( p->mode==MODE_Ascii ){
		@@ -3255,18 +3282,24 @@
3255	3282	}else{
3256	3283	p->outCount = 0;
3257	3284	}
3258	3285	output_reset(p);
3259	3286	if( zFile[0]=='\|' ){
	3287	+#ifdef SQLITE_OMIT_POPEN
	3288	+ fprintf(stderr,"Error: pipes are not supported in this OS\n");
	3289	+ rc = 1;
	3290	+ p->out = stdout;
	3291	+#else
3260	3292	p->out = popen(zFile + 1, "w");
3261	3293	if( p->out==0 ){
3262	3294	fprintf(stderr,"Error: cannot open pipe \"%s\"\n", zFile + 1);
3263	3295	p->out = stdout;
3264	3296	rc = 1;
3265	3297	}else{
3266	3298	sqlite3_snprintf(sizeof(p->outfile), p->outfile, "%s", zFile);
3267	3299	}
	3300	+#endif
3268	3301	}else{
3269	3302	p->out = output_file_open(zFile);
3270	3303	if( p->out==0 ){
3271	3304	if( strcmp(zFile,"off")!=0 ){
3272	3305	fprintf(stderr,"Error: cannot write to \"%s\"\n", zFile);
		@@ -3806,16 +3839,16 @@
3806	3839	}
3807	3840	}else
3808	3841
3809	3842	if( c=='t' && strncmp(azArg[0], "trace", n)==0 ){
3810	3843	open_db(p, 0);
3811		- output_file_close(p->traceOut);
3812	3844	if( nArg!=2 ){
3813	3845	fprintf(stderr, "Usage: .trace FILE\|off\n");
3814	3846	rc = 1;
3815	3847	goto meta_command_exit;
3816	3848	}
	3849	+ output_file_close(p->traceOut);
3817	3850	p->traceOut = output_file_open(azArg[1]);
3818	3851	#if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT)
3819	3852	if( p->traceOut==0 ){
3820	3853	sqlite3_trace(p->db, 0, 0);
3821	3854	}else{
		@@ -4187,27 +4220,25 @@
4187	4220	** Read input from the file given by sqliterc_override. Or if that
4188	4221	** parameter is NULL, take input from ~/.sqliterc
4189	4222	**
4190	4223	** Returns the number of errors.
4191	4224	*/
4192		-static int process_sqliterc(
	4225	+static void process_sqliterc(
4193	4226	ShellState p, / Configuration data */
4194	4227	const char sqliterc_override / Name of config file. NULL to use default */
4195	4228	){
4196	4229	char *home_dir = NULL;
4197	4230	const char *sqliterc = sqliterc_override;
4198	4231	char *zBuf = 0;
4199	4232	FILE *in = NULL;
4200		- int rc = 0;
4201	4233
4202	4234	if (sqliterc == NULL) {
4203	4235	home_dir = find_home_dir();
4204	4236	if( home_dir==0 ){
4205		-#if !defined(__RTP__) && !defined(_WRS_KERNEL)
4206		- fprintf(stderr,"%s: Error: cannot locate your home directory\n", Argv0);
4207		-#endif
4208		- return 1;
	4237	+ fprintf(stderr, "-- warning: cannot find home directory;"
	4238	+ " cannot read ~/.sqliterc\n");
	4239	+ return;
4209	4240	}
4210	4241	sqlite3_initialize();
4211	4242	zBuf = sqlite3_mprintf("%s/.sqliterc",home_dir);
4212	4243	sqliterc = zBuf;
4213	4244	}
		@@ -4214,15 +4245,14 @@
4214	4245	in = fopen(sqliterc,"rb");
4215	4246	if( in ){
4216	4247	if( stdin_is_interactive ){
4217	4248	fprintf(stderr,"-- Loading resources from %s\n",sqliterc);
4218	4249	}
4219		- rc = process_input(p,in);
	4250	+ process_input(p,in);
4220	4251	fclose(in);
4221	4252	}
4222	4253	sqlite3_free(zBuf);
4223		- return rc;
4224	4254	}
4225	4255
4226	4256	/*
4227	4257	** Show available command line options
4228	4258	*/
		@@ -4322,11 +4352,11 @@
4322	4352	exit(1);
4323	4353	}
4324	4354	return argv[i];
4325	4355	}
4326	4356
4327		-int main(int argc, char **argv){
	4357	+int SQLITE_CDECL main(int argc, char **argv){
4328	4358	char *zErrMsg = 0;
4329	4359	ShellState data;
4330	4360	const char *zInitFile = 0;
4331	4361	int i;
4332	4362	int rc = 0;
		@@ -4494,14 +4524,11 @@
4494	4524
4495	4525	/* Process the initialization file if there is one. If no -init option
4496	4526	** is given on the command line, look for a file named ~/.sqliterc and
4497	4527	** try to process it.
4498	4528	*/
4499		- rc = process_sqliterc(&data,zInitFile);
4500		- if( rc>0 ){
4501		- return rc;
4502		- }
	4529	+ process_sqliterc(&data,zInitFile);
4503	4530
4504	4531	/* Make a second pass through the command-line argument and set
4505	4532	** options. This second pass is delayed until after the initialization
4506	4533	** file is processed so that the command-line arguments will override
4507	4534	** settings in the initialization file.
4508	4535

	--- src/shell.c
	+++ src/shell.c
	@@ -22,10 +22,17 @@
22	*/
23	#if defined(INCLUDE_MSVC_H)
24	#include "msvc.h"
25	#endif
26







27	/*
28	** Enable large-file support for fopen() and friends on unix.
29	*/
30	#ifndef SQLITE_DISABLE_LFS
31	# define _LARGE_FILE 1
	@@ -105,14 +112,19 @@
105	#else
106	/* Make sure isatty() has a prototype.
107	*/
108	extern int isatty(int);
109
110	/* popen and pclose are not C89 functions and so are sometimes omitted from
111	** the <stdio.h> header */
112	extern FILE popen(const char,const char*);
113	extern int pclose(FILE*);





114	#endif
115
116	#if defined(_WIN32_WCE)
117	/* Windows CE (arm-wince-mingw32ce-gcc) does not provide isatty()
118	* thus we always assume that we have a console. That can be
	@@ -163,14 +175,22 @@
163	t = (sqlite3_int64)(r*86400000.0);
164	}
165	return t;
166	}
167
168	#if !defined(_WIN32) && !defined(WIN32) && !defined(_WRS_KERNEL) \
169	&& !defined(__minux)
170	#include <sys/time.h>
171	#include <sys/resource.h>









172
173	/* Saved resource information for the beginning of an operation */
174	static struct rusage sBegin; /* CPU time at start */
175	static sqlite3_int64 iBegin; /* Wall-clock time at start */
176
	@@ -193,12 +213,12 @@
193	/*
194	** Print the timing results.
195	*/
196	static void endTimer(void){
197	if( enableTimer ){
198	struct rusage sEnd;
199	sqlite3_int64 iEnd = timeOfDay();

200	getrusage(RUSAGE_SELF, &sEnd);
201	printf("Run Time: real %.3f user %f sys %f\n",
202	(iEnd - iBegin)*0.001,
203	timeDiff(&sBegin.ru_utime, &sEnd.ru_utime),
204	timeDiff(&sBegin.ru_stime, &sEnd.ru_stime));
	@@ -2121,11 +2141,11 @@
2121	** + Keep track of the line number in p->nLine.
2122	** + Store the character that terminates the field in p->cTerm. Store
2123	** EOF on end-of-file.
2124	** + Report syntax errors on stderr
2125	*/
2126	static char csv_read_one_field(ImportCtx p){
2127	int c;
2128	int cSep = p->cColSep;
2129	int rSep = p->cRowSep;
2130	p->n = 0;
2131	c = fgetc(p->in);
	@@ -2195,11 +2215,11 @@
2195	** + Keep track of the row number in p->nLine.
2196	** + Store the character that terminates the field in p->cTerm. Store
2197	** EOF on end-of-file.
2198	** + Report syntax errors on stderr
2199	*/
2200	static char ascii_read_one_field(ImportCtx p){
2201	int c;
2202	int cSep = p->cColSep;
2203	int rSep = p->cRowSep;
2204	p->n = 0;
2205	c = fgetc(p->in);
	@@ -2437,11 +2457,13 @@
2437	/*
2438	** Change the output file back to stdout
2439	*/
2440	static void output_reset(ShellState *p){
2441	if( p->outfile[0]=='\|' ){

2442	pclose(p->out);

2443	}else{
2444	output_file_close(p->out);
2445	}
2446	p->outfile[0] = 0;
2447	p->out = stdout;
	@@ -2887,12 +2909,12 @@
2887	int i, j; /* Loop counters */
2888	int needCommit; /* True to COMMIT or ROLLBACK at end */
2889	int nSep; /* Number of bytes in p->colSeparator[] */
2890	char zSql; / An SQL statement */
2891	ImportCtx sCtx; /* Reader context */
2892	char (xRead)(ImportCtx); / Procedure to read one value */
2893	int (xCloser)(FILE); /* Procedure to close th3 connection */
2894
2895	if( nArg!=3 ){
2896	fprintf(stderr, "Usage: .import FILE TABLE\n");
2897	goto meta_command_exit;
2898	}
	@@ -2930,13 +2952,18 @@
2930	return 1;
2931	}
2932	sCtx.zFile = zFile;
2933	sCtx.nLine = 1;
2934	if( sCtx.zFile[0]=='\|' ){




2935	sCtx.in = popen(sCtx.zFile+1, "r");
2936	sCtx.zFile = "<pipe>";
2937	xCloser = pclose;

2938	}else{
2939	sCtx.in = fopen(sCtx.zFile, "rb");
2940	xCloser = fclose;
2941	}
2942	if( p->mode==MODE_Ascii ){
	@@ -3255,18 +3282,24 @@
3255	}else{
3256	p->outCount = 0;
3257	}
3258	output_reset(p);
3259	if( zFile[0]=='\|' ){





3260	p->out = popen(zFile + 1, "w");
3261	if( p->out==0 ){
3262	fprintf(stderr,"Error: cannot open pipe \"%s\"\n", zFile + 1);
3263	p->out = stdout;
3264	rc = 1;
3265	}else{
3266	sqlite3_snprintf(sizeof(p->outfile), p->outfile, "%s", zFile);
3267	}

3268	}else{
3269	p->out = output_file_open(zFile);
3270	if( p->out==0 ){
3271	if( strcmp(zFile,"off")!=0 ){
3272	fprintf(stderr,"Error: cannot write to \"%s\"\n", zFile);
	@@ -3806,16 +3839,16 @@
3806	}
3807	}else
3808
3809	if( c=='t' && strncmp(azArg[0], "trace", n)==0 ){
3810	open_db(p, 0);
3811	output_file_close(p->traceOut);
3812	if( nArg!=2 ){
3813	fprintf(stderr, "Usage: .trace FILE\|off\n");
3814	rc = 1;
3815	goto meta_command_exit;
3816	}

3817	p->traceOut = output_file_open(azArg[1]);
3818	#if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT)
3819	if( p->traceOut==0 ){
3820	sqlite3_trace(p->db, 0, 0);
3821	}else{
	@@ -4187,27 +4220,25 @@
4187	** Read input from the file given by sqliterc_override. Or if that
4188	** parameter is NULL, take input from ~/.sqliterc
4189	**
4190	** Returns the number of errors.
4191	*/
4192	static int process_sqliterc(
4193	ShellState p, / Configuration data */
4194	const char sqliterc_override / Name of config file. NULL to use default */
4195	){
4196	char *home_dir = NULL;
4197	const char *sqliterc = sqliterc_override;
4198	char *zBuf = 0;
4199	FILE *in = NULL;
4200	int rc = 0;
4201
4202	if (sqliterc == NULL) {
4203	home_dir = find_home_dir();
4204	if( home_dir==0 ){
4205	#if !defined(__RTP__) && !defined(_WRS_KERNEL)
4206	fprintf(stderr,"%s: Error: cannot locate your home directory\n", Argv0);
4207	#endif
4208	return 1;
4209	}
4210	sqlite3_initialize();
4211	zBuf = sqlite3_mprintf("%s/.sqliterc",home_dir);
4212	sqliterc = zBuf;
4213	}
	@@ -4214,15 +4245,14 @@
4214	in = fopen(sqliterc,"rb");
4215	if( in ){
4216	if( stdin_is_interactive ){
4217	fprintf(stderr,"-- Loading resources from %s\n",sqliterc);
4218	}
4219	rc = process_input(p,in);
4220	fclose(in);
4221	}
4222	sqlite3_free(zBuf);
4223	return rc;
4224	}
4225
4226	/*
4227	** Show available command line options
4228	*/
	@@ -4322,11 +4352,11 @@
4322	exit(1);
4323	}
4324	return argv[i];
4325	}
4326
4327	int main(int argc, char **argv){
4328	char *zErrMsg = 0;
4329	ShellState data;
4330	const char *zInitFile = 0;
4331	int i;
4332	int rc = 0;
	@@ -4494,14 +4524,11 @@
4494
4495	/* Process the initialization file if there is one. If no -init option
4496	** is given on the command line, look for a file named ~/.sqliterc and
4497	** try to process it.
4498	*/
4499	rc = process_sqliterc(&data,zInitFile);
4500	if( rc>0 ){
4501	return rc;
4502	}
4503
4504	/* Make a second pass through the command-line argument and set
4505	** options. This second pass is delayed until after the initialization
4506	** file is processed so that the command-line arguments will override
4507	** settings in the initialization file.
4508

	--- src/shell.c
	+++ src/shell.c
	@@ -22,10 +22,17 @@
22	*/
23	#if defined(INCLUDE_MSVC_H)
24	#include "msvc.h"
25	#endif
26
27	/*
28	** No support for loadable extensions in VxWorks.
29	*/
30	#if (defined(__RTP__) \|\| defined(_WRS_KERNEL)) && !SQLITE_OMIT_LOAD_EXTENSION
31	# define SQLITE_OMIT_LOAD_EXTENSION 1
32	#endif
33
34	/*
35	** Enable large-file support for fopen() and friends on unix.
36	*/
37	#ifndef SQLITE_DISABLE_LFS
38	# define _LARGE_FILE 1
	@@ -105,14 +112,19 @@
112	#else
113	/* Make sure isatty() has a prototype.
114	*/
115	extern int isatty(int);
116
117	#if !defined(__RTP__) && !defined(_WRS_KERNEL)
118	/* popen and pclose are not C89 functions and so are sometimes omitted from
119	** the <stdio.h> header */
120	extern FILE popen(const char,const char*);
121	extern int pclose(FILE*);
122	#else
123	# define SQLITE_OMIT_POPEN 1
124	#endif
125
126	#endif
127
128	#if defined(_WIN32_WCE)
129	/* Windows CE (arm-wince-mingw32ce-gcc) does not provide isatty()
130	* thus we always assume that we have a console. That can be
	@@ -163,14 +175,22 @@
175	t = (sqlite3_int64)(r*86400000.0);
176	}
177	return t;
178	}
179
180	#if !defined(_WIN32) && !defined(WIN32) && !defined(__minux)

181	#include <sys/time.h>
182	#include <sys/resource.h>
183
184	/* VxWorks does not support getrusage() as far as we can determine */
185	#if defined(_WRS_KERNEL) \|\| defined(__RTP__)
186	struct rusage {
187	struct timeval ru_utime; /* user CPU time used */
188	struct timeval ru_stime; /* system CPU time used */
189	};
190	#define getrusage(A,B) memset(B,0,sizeof(*B))
191	#endif
192
193	/* Saved resource information for the beginning of an operation */
194	static struct rusage sBegin; /* CPU time at start */
195	static sqlite3_int64 iBegin; /* Wall-clock time at start */
196
	@@ -193,12 +213,12 @@
213	/*
214	** Print the timing results.
215	*/
216	static void endTimer(void){
217	if( enableTimer ){

218	sqlite3_int64 iEnd = timeOfDay();
219	struct rusage sEnd;
220	getrusage(RUSAGE_SELF, &sEnd);
221	printf("Run Time: real %.3f user %f sys %f\n",
222	(iEnd - iBegin)*0.001,
223	timeDiff(&sBegin.ru_utime, &sEnd.ru_utime),
224	timeDiff(&sBegin.ru_stime, &sEnd.ru_stime));
	@@ -2121,11 +2141,11 @@
2141	** + Keep track of the line number in p->nLine.
2142	** + Store the character that terminates the field in p->cTerm. Store
2143	** EOF on end-of-file.
2144	** + Report syntax errors on stderr
2145	*/
2146	static char SQLITE_CDECL csv_read_one_field(ImportCtx p){
2147	int c;
2148	int cSep = p->cColSep;
2149	int rSep = p->cRowSep;
2150	p->n = 0;
2151	c = fgetc(p->in);
	@@ -2195,11 +2215,11 @@
2215	** + Keep track of the row number in p->nLine.
2216	** + Store the character that terminates the field in p->cTerm. Store
2217	** EOF on end-of-file.
2218	** + Report syntax errors on stderr
2219	*/
2220	static char SQLITE_CDECL ascii_read_one_field(ImportCtx p){
2221	int c;
2222	int cSep = p->cColSep;
2223	int rSep = p->cRowSep;
2224	p->n = 0;
2225	c = fgetc(p->in);
	@@ -2437,11 +2457,13 @@
2457	/*
2458	** Change the output file back to stdout
2459	*/
2460	static void output_reset(ShellState *p){
2461	if( p->outfile[0]=='\|' ){
2462	#ifndef SQLITE_OMIT_POPEN
2463	pclose(p->out);
2464	#endif
2465	}else{
2466	output_file_close(p->out);
2467	}
2468	p->outfile[0] = 0;
2469	p->out = stdout;
	@@ -2887,12 +2909,12 @@
2909	int i, j; /* Loop counters */
2910	int needCommit; /* True to COMMIT or ROLLBACK at end */
2911	int nSep; /* Number of bytes in p->colSeparator[] */
2912	char zSql; / An SQL statement */
2913	ImportCtx sCtx; /* Reader context */
2914	char (SQLITE_CDECL xRead)(ImportCtx); / Func to read one value */
2915	int (SQLITE_CDECL xCloser)(FILE); /* Func to close file */
2916
2917	if( nArg!=3 ){
2918	fprintf(stderr, "Usage: .import FILE TABLE\n");
2919	goto meta_command_exit;
2920	}
	@@ -2930,13 +2952,18 @@
2952	return 1;
2953	}
2954	sCtx.zFile = zFile;
2955	sCtx.nLine = 1;
2956	if( sCtx.zFile[0]=='\|' ){
2957	#ifdef SQLITE_OMIT_POPEN
2958	fprintf(stderr, "Error: pipes are not supported in this OS\n");
2959	return 1;
2960	#else
2961	sCtx.in = popen(sCtx.zFile+1, "r");
2962	sCtx.zFile = "<pipe>";
2963	xCloser = pclose;
2964	#endif
2965	}else{
2966	sCtx.in = fopen(sCtx.zFile, "rb");
2967	xCloser = fclose;
2968	}
2969	if( p->mode==MODE_Ascii ){
	@@ -3255,18 +3282,24 @@
3282	}else{
3283	p->outCount = 0;
3284	}
3285	output_reset(p);
3286	if( zFile[0]=='\|' ){
3287	#ifdef SQLITE_OMIT_POPEN
3288	fprintf(stderr,"Error: pipes are not supported in this OS\n");
3289	rc = 1;
3290	p->out = stdout;
3291	#else
3292	p->out = popen(zFile + 1, "w");
3293	if( p->out==0 ){
3294	fprintf(stderr,"Error: cannot open pipe \"%s\"\n", zFile + 1);
3295	p->out = stdout;
3296	rc = 1;
3297	}else{
3298	sqlite3_snprintf(sizeof(p->outfile), p->outfile, "%s", zFile);
3299	}
3300	#endif
3301	}else{
3302	p->out = output_file_open(zFile);
3303	if( p->out==0 ){
3304	if( strcmp(zFile,"off")!=0 ){
3305	fprintf(stderr,"Error: cannot write to \"%s\"\n", zFile);
	@@ -3806,16 +3839,16 @@
3839	}
3840	}else
3841
3842	if( c=='t' && strncmp(azArg[0], "trace", n)==0 ){
3843	open_db(p, 0);

3844	if( nArg!=2 ){
3845	fprintf(stderr, "Usage: .trace FILE\|off\n");
3846	rc = 1;
3847	goto meta_command_exit;
3848	}
3849	output_file_close(p->traceOut);
3850	p->traceOut = output_file_open(azArg[1]);
3851	#if !defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_OMIT_FLOATING_POINT)
3852	if( p->traceOut==0 ){
3853	sqlite3_trace(p->db, 0, 0);
3854	}else{
	@@ -4187,27 +4220,25 @@
4220	** Read input from the file given by sqliterc_override. Or if that
4221	** parameter is NULL, take input from ~/.sqliterc
4222	**
4223	** Returns the number of errors.
4224	*/
4225	static void process_sqliterc(
4226	ShellState p, / Configuration data */
4227	const char sqliterc_override / Name of config file. NULL to use default */
4228	){
4229	char *home_dir = NULL;
4230	const char *sqliterc = sqliterc_override;
4231	char *zBuf = 0;
4232	FILE *in = NULL;

4233
4234	if (sqliterc == NULL) {
4235	home_dir = find_home_dir();
4236	if( home_dir==0 ){
4237	fprintf(stderr, "-- warning: cannot find home directory;"
4238	" cannot read ~/.sqliterc\n");
4239	return;

4240	}
4241	sqlite3_initialize();
4242	zBuf = sqlite3_mprintf("%s/.sqliterc",home_dir);
4243	sqliterc = zBuf;
4244	}
	@@ -4214,15 +4245,14 @@
4245	in = fopen(sqliterc,"rb");
4246	if( in ){
4247	if( stdin_is_interactive ){
4248	fprintf(stderr,"-- Loading resources from %s\n",sqliterc);
4249	}
4250	process_input(p,in);
4251	fclose(in);
4252	}
4253	sqlite3_free(zBuf);

4254	}
4255
4256	/*
4257	** Show available command line options
4258	*/
	@@ -4322,11 +4352,11 @@
4352	exit(1);
4353	}
4354	return argv[i];
4355	}
4356
4357	int SQLITE_CDECL main(int argc, char **argv){
4358	char *zErrMsg = 0;
4359	ShellState data;
4360	const char *zInitFile = 0;
4361	int i;
4362	int rc = 0;
	@@ -4494,14 +4524,11 @@
4524
4525	/* Process the initialization file if there is one. If no -init option
4526	** is given on the command line, look for a file named ~/.sqliterc and
4527	** try to process it.
4528	*/
4529	process_sqliterc(&data,zInitFile);



4530
4531	/* Make a second pass through the command-line argument and set
4532	** options. This second pass is delayed until after the initialization
4533	** file is processed so that the command-line arguments will override
4534	** settings in the initialization file.
4535

M src/skins.c

+42 -6

		--- src/skins.c
		+++ src/skins.c
		@@ -41,18 +41,20 @@
41	41	const char zLabel; / The directory under skins/ holding this skin */
42	42	int whiteForeground; /* True if this skin uses a light-colored foreground */
43	43	char zSQL; / Filled in at run-time with SQL to insert this skin */
44	44	} aBuiltinSkin[] = {
45	45	{ "Default", "default", 0, 0 },
	46	+ { "Blitz", "blitz", 0, 0 },
	47	+ { "Blitz, No Logo", "blitz_no_logo", 0, 0 },
	48	+ { "Xekri", "xekri", 0, 0 },
	49	+ { "Original", "original", 0, 0 },
	50	+ { "Enhanced Original", "enhanced1", 0, 0 },
	51	+ { "Shadow boxes & Rounded Corners", "rounded1", 0, 0 },
	52	+ { "Eagle", "eagle", 1, 0 },
	53	+ { "Black & White, Menu on Left", "black_and_white", 0, 0 },
46	54	{ "Plain Gray, No Logo", "plain_gray", 0, 0 },
47	55	{ "Khaki, No Logo", "khaki", 0, 0 },
48		- { "Black & White, Menu on Left", "black_and_white", 0, 0 },
49		- { "Shadow boxes & Rounded Corners", "rounded1", 0, 0 },
50		- { "Enhanced Default", "enhanced1", 0, 0 },
51		- { "San Francisco Modern", "etienne1", 0, 0 },
52		- { "Eagle", "eagle", 1, 0 },
53		- { "Xekri", "xekri", 0, 0 },
54	56	};
55	57
56	58	/*
57	59	** Alternative skins can be specified in the CGI script or by options
58	60	** on the "http", "ui", and "server" commands. The alternative skin
		@@ -148,10 +150,44 @@
148	150	}else{
149	151	rc = db_get_boolean("white-foreground",0);
150	152	}
151	153	return rc;
152	154	}
	155	+
	156	+/*
	157	+** Hash function for computing a skin id.
	158	+*/
	159	+static unsigned int skin_hash(unsigned int h, const char *z){
	160	+ if( z==0 ) return h;
	161	+ while( z[0] ){
	162	+ h = (h<<11) ^ (h<<1) ^ (h>>3) ^ z[0];
	163	+ z++;
	164	+ }
	165	+ return h;
	166	+}
	167	+
	168	+/*
	169	+** Return an identifier that is (probably) different for every skin
	170	+** but that is (probably) the same if the skin is unchanged. This
	171	+** identifier can be attached to resource URLs to force reloading when
	172	+** the resources change but allow the resources to be read from cache
	173	+** as long as they are unchanged.
	174	+*/
	175	+unsigned int skin_id(const char *zResource){
	176	+ unsigned int h = 0;
	177	+ if( zAltSkinDir ){
	178	+ h = skin_hash(0, zAltSkinDir);
	179	+ }else if( pAltSkin ){
	180	+ h = skin_hash(0, pAltSkin->zLabel);
	181	+ }else{
	182	+ char *zMTime = db_get_mtime(zResource, 0, 0);
	183	+ h = skin_hash(0, zMTime);
	184	+ fossil_free(zMTime);
	185	+ }
	186	+ h = skin_hash(h, MANIFEST_UUID);
	187	+ return h;
	188	+}
153	189
154	190	/*
155	191	** For a skin named zSkinName, compute the name of the CONFIG table
156	192	** entry where that skin is stored and return it.
157	193	**
158	194

	--- src/skins.c
	+++ src/skins.c
	@@ -41,18 +41,20 @@
41	const char zLabel; / The directory under skins/ holding this skin */
42	int whiteForeground; /* True if this skin uses a light-colored foreground */
43	char zSQL; / Filled in at run-time with SQL to insert this skin */
44	} aBuiltinSkin[] = {
45	{ "Default", "default", 0, 0 },








46	{ "Plain Gray, No Logo", "plain_gray", 0, 0 },
47	{ "Khaki, No Logo", "khaki", 0, 0 },
48	{ "Black & White, Menu on Left", "black_and_white", 0, 0 },
49	{ "Shadow boxes & Rounded Corners", "rounded1", 0, 0 },
50	{ "Enhanced Default", "enhanced1", 0, 0 },
51	{ "San Francisco Modern", "etienne1", 0, 0 },
52	{ "Eagle", "eagle", 1, 0 },
53	{ "Xekri", "xekri", 0, 0 },
54	};
55
56	/*
57	** Alternative skins can be specified in the CGI script or by options
58	** on the "http", "ui", and "server" commands. The alternative skin
	@@ -148,10 +150,44 @@
148	}else{
149	rc = db_get_boolean("white-foreground",0);
150	}
151	return rc;
152	}


































153
154	/*
155	** For a skin named zSkinName, compute the name of the CONFIG table
156	** entry where that skin is stored and return it.
157	**
158

	--- src/skins.c
	+++ src/skins.c
	@@ -41,18 +41,20 @@
41	const char zLabel; / The directory under skins/ holding this skin */
42	int whiteForeground; /* True if this skin uses a light-colored foreground */
43	char zSQL; / Filled in at run-time with SQL to insert this skin */
44	} aBuiltinSkin[] = {
45	{ "Default", "default", 0, 0 },
46	{ "Blitz", "blitz", 0, 0 },
47	{ "Blitz, No Logo", "blitz_no_logo", 0, 0 },
48	{ "Xekri", "xekri", 0, 0 },
49	{ "Original", "original", 0, 0 },
50	{ "Enhanced Original", "enhanced1", 0, 0 },
51	{ "Shadow boxes & Rounded Corners", "rounded1", 0, 0 },
52	{ "Eagle", "eagle", 1, 0 },
53	{ "Black & White, Menu on Left", "black_and_white", 0, 0 },
54	{ "Plain Gray, No Logo", "plain_gray", 0, 0 },
55	{ "Khaki, No Logo", "khaki", 0, 0 },






56	};
57
58	/*
59	** Alternative skins can be specified in the CGI script or by options
60	** on the "http", "ui", and "server" commands. The alternative skin
	@@ -148,10 +150,44 @@
150	}else{
151	rc = db_get_boolean("white-foreground",0);
152	}
153	return rc;
154	}
155
156	/*
157	** Hash function for computing a skin id.
158	*/
159	static unsigned int skin_hash(unsigned int h, const char *z){
160	if( z==0 ) return h;
161	while( z[0] ){
162	h = (h<<11) ^ (h<<1) ^ (h>>3) ^ z[0];
163	z++;
164	}
165	return h;
166	}
167
168	/*
169	** Return an identifier that is (probably) different for every skin
170	** but that is (probably) the same if the skin is unchanged. This
171	** identifier can be attached to resource URLs to force reloading when
172	** the resources change but allow the resources to be read from cache
173	** as long as they are unchanged.
174	*/
175	unsigned int skin_id(const char *zResource){
176	unsigned int h = 0;
177	if( zAltSkinDir ){
178	h = skin_hash(0, zAltSkinDir);
179	}else if( pAltSkin ){
180	h = skin_hash(0, pAltSkin->zLabel);
181	}else{
182	char *zMTime = db_get_mtime(zResource, 0, 0);
183	h = skin_hash(0, zMTime);
184	fossil_free(zMTime);
185	}
186	h = skin_hash(h, MANIFEST_UUID);
187	return h;
188	}
189
190	/*
191	** For a skin named zSkinName, compute the name of the CONFIG table
192	** entry where that skin is stored and return it.
193	**
194

M src/sqlite3.c

+1284 -443

		--- src/sqlite3.c
		+++ src/sqlite3.c
		@@ -1,8 +1,8 @@
1	1	/******************************************************************************
2	2	** This file is an amalgamation of many separate C source files from SQLite
3		-** version 3.8.8. By combining all the individual C code files into this
	3	+** version 3.8.9. By combining all the individual C code files into this
4	4	** single large file, the entire code can be compiled as a single translation
5	5	** unit. This allows many compilers to do optimizations that would not be
6	6	** possible if the files were compiled separately. Performance improvements
7	7	** of 5% or more are commonly seen when SQLite is compiled as a single
8	8	** translation unit.
		@@ -88,10 +88,48 @@
88	88	#endif /* _MSVC_H_ */
89	89
90	90	/************ End of msvc.h **********************************************/
91	91	/************ Continuing where we left off in sqliteInt.h ****************/
92	92
	93	+/*
	94	+** Special setup for VxWorks
	95	+*/
	96	+/************ Include vxworks.h in the middle of sqliteInt.h *************/
	97	+/************ Begin file vxworks.h ***************************************/
	98	+/*
	99	+** 2015-03-02
	100	+**
	101	+** The author disclaims copyright to this source code. In place of
	102	+** a legal notice, here is a blessing:
	103	+**
	104	+** May you do good and not evil.
	105	+** May you find forgiveness for yourself and forgive others.
	106	+** May you share freely, never taking more than you give.
	107	+**
	108	+******************************************************************************
	109	+**
	110	+** This file contains code that is specific to Wind River's VxWorks
	111	+*/
	112	+#if defined(__RTP__) \|\| defined(_WRS_KERNEL)
	113	+/* This is VxWorks. Set up things specially for that OS
	114	+*/
	115	+#include <vxWorks.h>
	116	+#include <pthread.h> /* amalgamator: dontcache */
	117	+#define OS_VXWORKS 1
	118	+#define SQLITE_OS_OTHER 0
	119	+#define SQLITE_HOMEGROWN_RECURSIVE_MUTEX 1
	120	+#define SQLITE_OMIT_LOAD_EXTENSION 1
	121	+#define SQLITE_ENABLE_LOCKING_STYLE 0
	122	+#define HAVE_UTIME 1
	123	+#else
	124	+/* This is not VxWorks. */
	125	+#define OS_VXWORKS 0
	126	+#endif /* defined(_WRS_KERNEL) */
	127	+
	128	+/************ End of vxworks.h *******************************************/
	129	+/************ Continuing where we left off in sqliteInt.h ****************/
	130	+
93	131	/*
94	132	** These #defines should enable >2GB file support on POSIX if the
95	133	** underlying operating system supports it. If the OS lacks
96	134	** large file support, or if the OS is windows, these should be no-ops.
97	135	**
		@@ -223,10 +261,17 @@
223	261	#ifndef SQLITE_API
224	262	# define SQLITE_API
225	263	#endif
226	264
227	265
	266	+/*
	267	+** Add the ability to override 'cdecl'
	268	+*/
	269	+#ifndef SQLITE_CDECL
	270	+# define SQLITE_CDECL
	271	+#endif
	272	+
228	273	/*
229	274	** These no-op macros are used in front of interfaces to mark those
230	275	** interfaces as either deprecated or experimental. New applications
231	276	** should not use deprecated interfaces - they are supported for backwards
232	277	** compatibility only. Application writers should be aware that
		@@ -276,13 +321,13 @@
276	321	**
277	322	** See also: [sqlite3_libversion()],
278	323	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
279	324	** [sqlite_version()] and [sqlite_source_id()].
280	325	*/
281		-#define SQLITE_VERSION "3.8.8"
282		-#define SQLITE_VERSION_NUMBER 3008008
283		-#define SQLITE_SOURCE_ID "2015-02-25 14:25:31 6d132e7a224ee68b5cefe9222944aac5760ffc20"
	326	+#define SQLITE_VERSION "3.8.9"
	327	+#define SQLITE_VERSION_NUMBER 3008009
	328	+#define SQLITE_SOURCE_ID "2015-03-24 18:19:39 436314b5728c9413f9ac2d837e1c19364f31be72"
284	329
285	330	/*
286	331	** CAPI3REF: Run-Time Library Version Numbers
287	332	** KEYWORDS: sqlite3_version, sqlite3_sourceid
288	333	**
		@@ -925,18 +970,20 @@
925	970	**
926	971	** These integer constants are opcodes for the xFileControl method
927	972	** of the [sqlite3_io_methods] object and for the [sqlite3_file_control()]
928	973	** interface.
929	974	**
	975	+** <ul>
	976	+** <li>[[SQLITE_FCNTL_LOCKSTATE]]
930	977	** The [SQLITE_FCNTL_LOCKSTATE] opcode is used for debugging. This
931	978	** opcode causes the xFileControl method to write the current state of
932	979	** the lock (one of [SQLITE_LOCK_NONE], [SQLITE_LOCK_SHARED],
933	980	** [SQLITE_LOCK_RESERVED], [SQLITE_LOCK_PENDING], or [SQLITE_LOCK_EXCLUSIVE])
934	981	** into an integer that the pArg argument points to. This capability
935		-** is used during testing and only needs to be supported when SQLITE_TEST
936		-** is defined.
937		-** <ul>
	982	+** is used during testing and is only available when the SQLITE_TEST
	983	+** compile-time option is used.
	984	+**
938	985	** <li>[[SQLITE_FCNTL_SIZE_HINT]]
939	986	** The [SQLITE_FCNTL_SIZE_HINT] opcode is used by SQLite to give the VFS
940	987	** layer a hint of how large the database file will grow to be during the
941	988	** current transaction. This hint is not guaranteed to be accurate but it
942	989	** is often close. The underlying VFS might choose to preallocate database
		@@ -1057,11 +1104,13 @@
1057	1104	** the error message if the pragma fails. ^If the
1058	1105	** [SQLITE_FCNTL_PRAGMA] file control returns [SQLITE_NOTFOUND], then normal
1059	1106	** [PRAGMA] processing continues. ^If the [SQLITE_FCNTL_PRAGMA]
1060	1107	** file control returns [SQLITE_OK], then the parser assumes that the
1061	1108	** VFS has handled the PRAGMA itself and the parser generates a no-op
1062		-** prepared statement. ^If the [SQLITE_FCNTL_PRAGMA] file control returns
	1109	+** prepared statement if result string is NULL, or that returns a copy
	1110	+** of the result string if the string is non-NULL.
	1111	+** ^If the [SQLITE_FCNTL_PRAGMA] file control returns
1063	1112	** any result code other than [SQLITE_OK] or [SQLITE_NOTFOUND], that means
1064	1113	** that the VFS encountered an error while handling the [PRAGMA] and the
1065	1114	** compilation of the PRAGMA fails with an error. ^The [SQLITE_FCNTL_PRAGMA]
1066	1115	** file control occurs at the beginning of pragma statement analysis and so
1067	1116	** it is able to override built-in [PRAGMA] statements.
		@@ -1115,10 +1164,17 @@
1115	1164	** The [SQLITE_FCNTL_WIN32_SET_HANDLE] opcode is used for debugging. This
1116	1165	** opcode causes the xFileControl method to swap the file handle with the one
1117	1166	** pointed to by the pArg argument. This capability is used during testing
1118	1167	** and only needs to be supported when SQLITE_TEST is defined.
1119	1168	**
	1169	+** <li>[[SQLITE_FCNTL_WAL_BLOCK]]
	1170	+** The [SQLITE_FCNTL_WAL_BLOCK] is a signal to the VFS layer that it might
	1171	+** be advantageous to block on the next WAL lock if the lock is not immediately
	1172	+** available. The WAL subsystem issues this signal during rare
	1173	+** circumstances in order to fix a problem with priority inversion.
	1174	+** Applications should <em>not</em> use this file-control.
	1175	+**
1120	1176	** </ul>
1121	1177	*/
1122	1178	#define SQLITE_FCNTL_LOCKSTATE 1
1123	1179	#define SQLITE_FCNTL_GET_LOCKPROXYFILE 2
1124	1180	#define SQLITE_FCNTL_SET_LOCKPROXYFILE 3
		@@ -1139,10 +1195,11 @@
1139	1195	#define SQLITE_FCNTL_TRACE 19
1140	1196	#define SQLITE_FCNTL_HAS_MOVED 20
1141	1197	#define SQLITE_FCNTL_SYNC 21
1142	1198	#define SQLITE_FCNTL_COMMIT_PHASETWO 22
1143	1199	#define SQLITE_FCNTL_WIN32_SET_HANDLE 23
	1200	+#define SQLITE_FCNTL_WAL_BLOCK 24
1144	1201
1145	1202	/* deprecated names */
1146	1203	#define SQLITE_GET_LOCKPROXYFILE SQLITE_FCNTL_GET_LOCKPROXYFILE
1147	1204	#define SQLITE_SET_LOCKPROXYFILE SQLITE_FCNTL_SET_LOCKPROXYFILE
1148	1205	#define SQLITE_LAST_ERRNO SQLITE_FCNTL_LAST_ERRNO
		@@ -1705,11 +1762,11 @@
1705	1762	** disabled, the following SQLite interfaces become non-operational:
1706	1763	** <ul>
1707	1764	** <li> [sqlite3_memory_used()]
1708	1765	** <li> [sqlite3_memory_highwater()]
1709	1766	** <li> [sqlite3_soft_heap_limit64()]
1710		-** <li> [sqlite3_status()]
	1767	+** <li> [sqlite3_status64()]
1711	1768	** </ul>)^
1712	1769	** ^Memory allocation statistics are enabled by default unless SQLite is
1713	1770	** compiled with [SQLITE_DEFAULT_MEMSTATUS]=0 in which case memory
1714	1771	** allocation statistics are disabled by default.
1715	1772	** </dd>
		@@ -1916,11 +1973,10 @@
1916	1973	** <dt>SQLITE_CONFIG_WIN32_HEAPSIZE
1917	1974	** <dd>^The SQLITE_CONFIG_WIN32_HEAPSIZE option is only available if SQLite is
1918	1975	** compiled for Windows with the [SQLITE_WIN32_MALLOC] pre-processor macro
1919	1976	** defined. ^SQLITE_CONFIG_WIN32_HEAPSIZE takes a 32-bit unsigned integer value
1920	1977	** that specifies the maximum size of the created heap.
1921		-** </dl>
1922	1978	**
1923	1979	** [[SQLITE_CONFIG_PCACHE_HDRSZ]]
1924	1980	** <dt>SQLITE_CONFIG_PCACHE_HDRSZ
1925	1981	** <dd>^The SQLITE_CONFIG_PCACHE_HDRSZ option takes a single parameter which
1926	1982	** is a pointer to an integer and writes into that integer the number of extra
		@@ -3163,15 +3219,17 @@
3163	3219
3164	3220
3165	3221	/*
3166	3222	** CAPI3REF: Error Codes And Messages
3167	3223	**
3168		-** ^The sqlite3_errcode() interface returns the numeric [result code] or
3169		-** [extended result code] for the most recent failed sqlite3_* API call
3170		-** associated with a [database connection]. If a prior API call failed
3171		-** but the most recent API call succeeded, the return value from
3172		-** sqlite3_errcode() is undefined. ^The sqlite3_extended_errcode()
	3224	+** ^If the most recent sqlite3_* API call associated with
	3225	+** [database connection] D failed, then the sqlite3_errcode(D) interface
	3226	+** returns the numeric [result code] or [extended result code] for that
	3227	+** API call.
	3228	+** If the most recent API call was successful,
	3229	+** then the return value from sqlite3_errcode() is undefined.
	3230	+** ^The sqlite3_extended_errcode()
3173	3231	** interface is the same except that it always returns the
3174	3232	** [extended result code] even when extended result codes are
3175	3233	** disabled.
3176	3234	**
3177	3235	** ^The sqlite3_errmsg() and sqlite3_errmsg16() return English-language
		@@ -3356,20 +3414,18 @@
3356	3414	** The second argument, "zSql", is the statement to be compiled, encoded
3357	3415	** as either UTF-8 or UTF-16. The sqlite3_prepare() and sqlite3_prepare_v2()
3358	3416	** interfaces use UTF-8, and sqlite3_prepare16() and sqlite3_prepare16_v2()
3359	3417	** use UTF-16.
3360	3418	**
3361		-** ^If the nByte argument is less than zero, then zSql is read up to the
3362		-** first zero terminator. ^If nByte is non-negative, then it is the maximum
3363		-** number of bytes read from zSql. ^When nByte is non-negative, the
3364		-** zSql string ends at either the first '\000' or '\u0000' character or
3365		-** the nByte-th byte, whichever comes first. If the caller knows
3366		-** that the supplied string is nul-terminated, then there is a small
3367		-** performance advantage to be gained by passing an nByte parameter that
3368		-** is equal to the number of bytes in the input string <i>including</i>
3369		-** the nul-terminator bytes as this saves SQLite from having to
3370		-** make a copy of the input string.
	3419	+** ^If the nByte argument is negative, then zSql is read up to the
	3420	+** first zero terminator. ^If nByte is positive, then it is the
	3421	+** number of bytes read from zSql. ^If nByte is zero, then no prepared
	3422	+** statement is generated.
	3423	+** If the caller knows that the supplied string is nul-terminated, then
	3424	+** there is a small performance advantage to passing an nByte parameter that
	3425	+** is the number of bytes in the input string <i>including</i>
	3426	+** the nul-terminator.
3371	3427	**
3372	3428	** ^If pzTail is not NULL then *pzTail is made to point to the first byte
3373	3429	** past the end of the first SQL statement in zSql. These routines only
3374	3430	** compile the first statement in zSql, so *pzTail is left pointing to
3375	3431	** what remains uncompiled.
		@@ -4394,12 +4450,12 @@
4394	4450	** DEPRECATED
4395	4451	**
4396	4452	** These functions are [deprecated]. In order to maintain
4397	4453	** backwards compatibility with older code, these functions continue
4398	4454	** to be supported. However, new applications should avoid
4399		-** the use of these functions. To help encourage people to avoid
4400		-** using these functions, we are not going to tell you what they do.
	4455	+** the use of these functions. To encourage programmers to avoid
	4456	+** these functions, we will not explain what they do.
4401	4457	*/
4402	4458	#ifndef SQLITE_OMIT_DEPRECATED
4403	4459	SQLITE_API SQLITE_DEPRECATED int sqlite3_aggregate_count(sqlite3_context*);
4404	4460	SQLITE_API SQLITE_DEPRECATED int sqlite3_expired(sqlite3_stmt*);
4405	4461	SQLITE_API SQLITE_DEPRECATED int sqlite3_transfer_bindings(sqlite3_stmt, sqlite3_stmt);
		@@ -5783,11 +5839,11 @@
5783	5839	** is delivered up to the client application, the string will be automatically
5784	5840	** freed by sqlite3_free() and the zErrMsg field will be zeroed.
5785	5841	*/
5786	5842	struct sqlite3_vtab {
5787	5843	const sqlite3_module pModule; / The module for this virtual table */
5788		- int nRef; /* NO LONGER USED */
	5844	+ int nRef; /* Number of open cursors */
5789	5845	char zErrMsg; / Error message from sqlite3_mprintf() */
5790	5846	/* Virtual table implementations will typically add additional fields */
5791	5847	};
5792	5848
5793	5849	/*
		@@ -6461,11 +6517,11 @@
6461	6517	#define SQLITE_TESTCTRL_LAST 25
6462	6518
6463	6519	/*
6464	6520	** CAPI3REF: SQLite Runtime Status
6465	6521	**
6466		-** ^This interface is used to retrieve runtime status information
	6522	+** ^These interfaces are used to retrieve runtime status information
6467	6523	** about the performance of SQLite, and optionally to reset various
6468	6524	** highwater marks. ^The first argument is an integer code for
6469	6525	** the specific parameter to measure. ^(Recognized integer codes
6470	6526	** are of the form [status parameters \| SQLITE_STATUS_...].)^
6471	6527	** ^The current value of the parameter is returned into *pCurrent.
		@@ -6475,23 +6531,26 @@
6475	6531	** value. For those parameters
6476	6532	** nothing is written into *pHighwater and the resetFlag is ignored.)^
6477	6533	** ^(Other parameters record only the highwater mark and not the current
6478	6534	** value. For these latter parameters nothing is written into *pCurrent.)^
6479	6535	**
6480		-** ^The sqlite3_status() routine returns SQLITE_OK on success and a
6481		-** non-zero [error code] on failure.
	6536	+** ^The sqlite3_status() and sqlite3_status64() routines return
	6537	+** SQLITE_OK on success and a non-zero [error code] on failure.
6482	6538	**
6483		-** This routine is threadsafe but is not atomic. This routine can be
6484		-** called while other threads are running the same or different SQLite
6485		-** interfaces. However the values returned in *pCurrent and
6486		-** *pHighwater reflect the status of SQLite at different points in time
6487		-** and it is possible that another thread might change the parameter
6488		-** in between the times when pCurrent and pHighwater are written.
	6539	+** If either the current value or the highwater mark is too large to
	6540	+** be represented by a 32-bit integer, then the values returned by
	6541	+** sqlite3_status() are undefined.
6489	6542	**
6490	6543	** See also: [sqlite3_db_status()]
6491	6544	*/
6492	6545	SQLITE_API int sqlite3_status(int op, int pCurrent, int pHighwater, int resetFlag);
	6546	+SQLITE_API int sqlite3_status64(
	6547	+ int op,
	6548	+ sqlite3_int64 *pCurrent,
	6549	+ sqlite3_int64 *pHighwater,
	6550	+ int resetFlag
	6551	+);
6493	6552
6494	6553
6495	6554	/*
6496	6555	** CAPI3REF: Status Parameters
6497	6556	** KEYWORDS: {status parameters}
		@@ -7157,24 +7216,24 @@
7157	7216	**
7158	7217	** ^A return of [SQLITE_BUSY] or [SQLITE_LOCKED] from sqlite3_backup_step()
7159	7218	** is not a permanent error and does not affect the return value of
7160	7219	** sqlite3_backup_finish().
7161	7220	**
7162		-** [[sqlite3_backup__remaining()]] [[sqlite3_backup_pagecount()]]
	7221	+** [[sqlite3_backup_remaining()]] [[sqlite3_backup_pagecount()]]
7163	7222	** <b>sqlite3_backup_remaining() and sqlite3_backup_pagecount()</b>
7164	7223	**
7165		-** ^Each call to sqlite3_backup_step() sets two values inside
7166		-** the [sqlite3_backup] object: the number of pages still to be backed
7167		-** up and the total number of pages in the source database file.
7168		-** The sqlite3_backup_remaining() and sqlite3_backup_pagecount() interfaces
7169		-** retrieve these two values, respectively.
7170		-**
7171		-** ^The values returned by these functions are only updated by
7172		-** sqlite3_backup_step(). ^If the source database is modified during a backup
7173		-** operation, then the values are not updated to account for any extra
7174		-** pages that need to be updated or the size of the source database file
7175		-** changing.
	7224	+** ^The sqlite3_backup_remaining() routine returns the number of pages still
	7225	+** to be backed up at the conclusion of the most recent sqlite3_backup_step().
	7226	+** ^The sqlite3_backup_pagecount() routine returns the total number of pages
	7227	+** in the source database at the conclusion of the most recent
	7228	+** sqlite3_backup_step().
	7229	+** ^(The values returned by these functions are only updated by
	7230	+** sqlite3_backup_step(). If the source database is modified in a way that
	7231	+** changes the size of the source database or the number of pages remaining,
	7232	+** those changes are not reflected in the output of sqlite3_backup_pagecount()
	7233	+** and sqlite3_backup_remaining() until after the next
	7234	+** sqlite3_backup_step().)^
7176	7235	**
7177	7236	** <b>Concurrent Usage of Database Handles</b>
7178	7237	**
7179	7238	** ^The source [database connection] may be used by the application for other
7180	7239	** purposes while a backup operation is underway or being initialized.
		@@ -8018,19 +8077,21 @@
8018	8077	#ifndef SQLITE_MAX_FUNCTION_ARG
8019	8078	# define SQLITE_MAX_FUNCTION_ARG 127
8020	8079	#endif
8021	8080
8022	8081	/*
8023		-** The maximum number of in-memory pages to use for the main database
8024		-** table and for temporary tables. The SQLITE_DEFAULT_CACHE_SIZE
	8082	+** The suggested maximum number of in-memory pages to use for
	8083	+** the main database table and for temporary tables.
	8084	+**
	8085	+** IMPLEMENTATION-OF: R-31093-59126 The default suggested cache size
	8086	+** is 2000 pages.
	8087	+** IMPLEMENTATION-OF: R-48205-43578 The default suggested cache size can be
	8088	+** altered using the SQLITE_DEFAULT_CACHE_SIZE compile-time options.
8025	8089	*/
8026	8090	#ifndef SQLITE_DEFAULT_CACHE_SIZE
8027	8091	# define SQLITE_DEFAULT_CACHE_SIZE 2000
8028	8092	#endif
8029		-#ifndef SQLITE_DEFAULT_TEMP_CACHE_SIZE
8030		-# define SQLITE_DEFAULT_TEMP_CACHE_SIZE 500
8031		-#endif
8032	8093
8033	8094	/*
8034	8095	** The default number of frames to accumulate in the log file before
8035	8096	** checkpointing the database in WAL mode.
8036	8097	*/
		@@ -8870,10 +8931,24 @@
8870	8931	**
8871	8932	** 0.5 -> -10 0.1 -> -33 0.0625 -> -40
8872	8933	*/
8873	8934	typedef INT16_TYPE LogEst;
8874	8935
	8936	+/*
	8937	+** Set the SQLITE_PTRSIZE macro to the number of bytes in a pointer
	8938	+*/
	8939	+#ifndef SQLITE_PTRSIZE
	8940	+# if defined(__SIZEOF_POINTER__)
	8941	+# define SQLITE_PTRSIZE __SIZEOF_POINTER__
	8942	+# elif defined(i386) \|\| defined(__i386__) \|\| defined(_M_IX86) \|\| \
	8943	+ defined(_M_ARM) \|\| defined(__arm__) \|\| defined(__x86)
	8944	+# define SQLITE_PTRSIZE 4
	8945	+# else
	8946	+# define SQLITE_PTRSIZE 8
	8947	+# endif
	8948	+#endif
	8949	+
8875	8950	/*
8876	8951	** Macros to determine whether the machine is big or little endian,
8877	8952	** and whether or not that determination is run-time or compile-time.
8878	8953	**
8879	8954	** For best performance, an attempt is made to guess at the byte-order
		@@ -9320,12 +9395,22 @@
9320	9395	#define BTREE_DATA_VERSION 15 /* A virtual meta-value */
9321	9396
9322	9397	/*
9323	9398	** Values that may be OR'd together to form the second argument of an
9324	9399	** sqlite3BtreeCursorHints() call.
	9400	+**
	9401	+** The BTREE_BULKLOAD flag is set on index cursors when the index is going
	9402	+** to be filled with content that is already in sorted order.
	9403	+**
	9404	+** The BTREE_SEEK_EQ flag is set on cursors that will get OP_SeekGE or
	9405	+** OP_SeekLE opcodes for a range search, but where the range of entries
	9406	+** selected will all have the same key. In other words, the cursor will
	9407	+** be used only for equality key searches.
	9408	+**
9325	9409	*/
9326		-#define BTREE_BULKLOAD 0x00000001
	9410	+#define BTREE_BULKLOAD 0x00000001 /* Used to full index in sorted order */
	9411	+#define BTREE_SEEK_EQ 0x00000002 /* EQ seeks only - no range seeks */
9327	9412
9328	9413	SQLITE_PRIVATE int sqlite3BtreeCursor(
9329	9414	Btree, / BTree containing table to open */
9330	9415	int iTable, /* Index of root page */
9331	9416	int wrFlag, /* 1 for writing. 0 for read-only */
		@@ -9367,10 +9452,13 @@
9367	9452	SQLITE_PRIVATE int sqlite3BtreePutData(BtCursor, u32 offset, u32 amt, void);
9368	9453	SQLITE_PRIVATE void sqlite3BtreeIncrblobCursor(BtCursor *);
9369	9454	SQLITE_PRIVATE void sqlite3BtreeClearCursor(BtCursor *);
9370	9455	SQLITE_PRIVATE int sqlite3BtreeSetVersion(Btree *pBt, int iVersion);
9371	9456	SQLITE_PRIVATE void sqlite3BtreeCursorHints(BtCursor *, unsigned int mask);
	9457	+#ifdef SQLITE_DEBUG
	9458	+SQLITE_PRIVATE int sqlite3BtreeCursorHasHint(BtCursor*, unsigned int mask);
	9459	+#endif
9372	9460	SQLITE_PRIVATE int sqlite3BtreeIsReadonly(Btree *pBt);
9373	9461	SQLITE_PRIVATE int sqlite3HeaderSizeBtree(void);
9374	9462
9375	9463	#ifndef NDEBUG
9376	9464	SQLITE_PRIVATE int sqlite3BtreeCursorIsValid(BtCursor*);
		@@ -9733,27 +9821,29 @@
9733	9821	#define OP_FkCounter 134 /* synopsis: fkctr[P1]+=P2 */
9734	9822	#define OP_FkIfZero 135 /* synopsis: if fkctr[P1]==0 goto P2 */
9735	9823	#define OP_MemMax 136 /* synopsis: r[P1]=max(r[P1],r[P2]) */
9736	9824	#define OP_IfPos 137 /* synopsis: if r[P1]>0 goto P2 */
9737	9825	#define OP_IfNeg 138 /* synopsis: r[P1]+=P3, if r[P1]<0 goto P2 */
9738		-#define OP_IfZero 139 /* synopsis: r[P1]+=P3, if r[P1]==0 goto P2 */
9739		-#define OP_AggFinal 140 /* synopsis: accum=r[P1] N=P2 */
9740		-#define OP_IncrVacuum 141
9741		-#define OP_Expire 142
9742		-#define OP_TableLock 143 /* synopsis: iDb=P1 root=P2 write=P3 */
9743		-#define OP_VBegin 144
9744		-#define OP_VCreate 145
9745		-#define OP_VDestroy 146
9746		-#define OP_VOpen 147
9747		-#define OP_VColumn 148 /* synopsis: r[P3]=vcolumn(P2) */
9748		-#define OP_VNext 149
9749		-#define OP_VRename 150
9750		-#define OP_Pagecount 151
9751		-#define OP_MaxPgcnt 152
9752		-#define OP_Init 153 /* synopsis: Start at P2 */
9753		-#define OP_Noop 154
9754		-#define OP_Explain 155
	9826	+#define OP_IfNotZero 139 /* synopsis: if r[P1]!=0 then r[P1]+=P3, goto P2 */
	9827	+#define OP_DecrJumpZero 140 /* synopsis: if (--r[P1])==0 goto P2 */
	9828	+#define OP_JumpZeroIncr 141 /* synopsis: if (r[P1]++)==0 ) goto P2 */
	9829	+#define OP_AggFinal 142 /* synopsis: accum=r[P1] N=P2 */
	9830	+#define OP_IncrVacuum 143
	9831	+#define OP_Expire 144
	9832	+#define OP_TableLock 145 /* synopsis: iDb=P1 root=P2 write=P3 */
	9833	+#define OP_VBegin 146
	9834	+#define OP_VCreate 147
	9835	+#define OP_VDestroy 148
	9836	+#define OP_VOpen 149
	9837	+#define OP_VColumn 150 /* synopsis: r[P3]=vcolumn(P2) */
	9838	+#define OP_VNext 151
	9839	+#define OP_VRename 152
	9840	+#define OP_Pagecount 153
	9841	+#define OP_MaxPgcnt 154
	9842	+#define OP_Init 155 /* synopsis: Start at P2 */
	9843	+#define OP_Noop 156
	9844	+#define OP_Explain 157
9755	9845
9756	9846
9757	9847	/* Properties such as "out2" or "jump" that are specified in
9758	9848	** comments following the "case" for each opcode in the vdbe.c
9759	9849	** are encoded into bitvectors as follows:
		@@ -9781,13 +9871,13 @@
9781	9871	/* 96 */ 0x24, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,\
9782	9872	/* 104 */ 0x00, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 0x00,\
9783	9873	/* 112 */ 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x00,\
9784	9874	/* 120 */ 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
9785	9875	/* 128 */ 0x0c, 0x45, 0x15, 0x01, 0x02, 0x02, 0x00, 0x01,\
9786		-/* 136 */ 0x08, 0x05, 0x05, 0x05, 0x00, 0x01, 0x00, 0x00,\
9787		-/* 144 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02,\
9788		-/* 152 */ 0x02, 0x01, 0x00, 0x00,}
	9876	+/* 136 */ 0x08, 0x05, 0x05, 0x05, 0x05, 0x05, 0x00, 0x01,\
	9877	+/* 144 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,\
	9878	+/* 152 */ 0x00, 0x02, 0x02, 0x01, 0x00, 0x00,}
9789	9879
9790	9880	/************ End of opcodes.h *******************************************/
9791	9881	/************ Continuing where we left off in vdbe.h *********************/
9792	9882
9793	9883	/*
		@@ -10865,10 +10955,11 @@
10865	10955	} init;
10866	10956	int nVdbeActive; /* Number of VDBEs currently running */
10867	10957	int nVdbeRead; /* Number of active VDBEs that read or write */
10868	10958	int nVdbeWrite; /* Number of active VDBEs that read and write */
10869	10959	int nVdbeExec; /* Number of nested calls to VdbeExec() */
	10960	+ int nVDestroy; /* Number of active OP_VDestroy operations */
10870	10961	int nExtension; /* Number of loaded extensions */
10871	10962	void *aExtension; / Array of shared library handles */
10872	10963	void (xTrace)(void,const char); / Trace function */
10873	10964	void pTraceArg; / Argument to the trace function */
10874	10965	void (xProfile)(void,const char,u64); / Profiling function */
		@@ -12022,11 +12113,11 @@
12022	12113	#define WHERE_ONEPASS_DESIRED 0x0004 /* Want to do one-pass UPDATE/DELETE */
12023	12114	#define WHERE_DUPLICATES_OK 0x0008 /* Ok to return a row more than once */
12024	12115	#define WHERE_OMIT_OPEN_CLOSE 0x0010 /* Table cursors are already open */
12025	12116	#define WHERE_FORCE_TABLE 0x0020 /* Do not use an index-only search */
12026	12117	#define WHERE_ONETABLE_ONLY 0x0040 /* Only code the 1st table in pTabList */
12027		- /* 0x0080 // not currently used */
	12118	+#define WHERE_NO_AUTOINDEX 0x0080 /* Disallow automatic indexes */
12028	12119	#define WHERE_GROUPBY 0x0100 /* pOrderBy is really a GROUP BY */
12029	12120	#define WHERE_DISTINCTBY 0x0200 /* pOrderby is really a DISTINCT clause */
12030	12121	#define WHERE_WANT_DISTINCT 0x0400 /* All output needs to be distinct */
12031	12122	#define WHERE_SORTBYGROUP 0x0800 /* Support sqlite3WhereIsSorted() */
12032	12123	#define WHERE_REOPEN_IDX 0x1000 /* Try to use OP_ReopenIdx */
		@@ -12459,11 +12550,12 @@
12459	12550	#define OPFLAG_APPEND 0x08 /* This is likely to be an append */
12460	12551	#define OPFLAG_USESEEKRESULT 0x10 /* Try to avoid a seek in BtreeInsert() */
12461	12552	#define OPFLAG_LENGTHARG 0x40 /* OP_Column only used for length() */
12462	12553	#define OPFLAG_TYPEOFARG 0x80 /* OP_Column only used for typeof() */
12463	12554	#define OPFLAG_BULKCSR 0x01 /* OP_Open** used to open bulk cursor */
12464		-#define OPFLAG_P2ISREG 0x02 /* P2 to OP_Open** is a register number */
	12555	+#define OPFLAG_SEEKEQ 0x02 /* OP_Open** cursor uses EQ seek only */
	12556	+#define OPFLAG_P2ISREG 0x04 /* P2 to OP_Open** is a register number */
12465	12557	#define OPFLAG_PERMUTE 0x01 /* OP_Compare: use the permutation */
12466	12558
12467	12559	/*
12468	12560	* Each trigger present in the database schema is stored as an instance of
12469	12561	* struct Trigger.
		@@ -12863,14 +12955,19 @@
12863	12955	SQLITE_PRIVATE sqlite3_mutex *sqlite3MutexAlloc(int);
12864	12956	SQLITE_PRIVATE int sqlite3MutexInit(void);
12865	12957	SQLITE_PRIVATE int sqlite3MutexEnd(void);
12866	12958	#endif
12867	12959
12868		-SQLITE_PRIVATE int sqlite3StatusValue(int);
12869		-SQLITE_PRIVATE void sqlite3StatusAdd(int, int);
	12960	+SQLITE_PRIVATE sqlite3_int64 sqlite3StatusValue(int);
	12961	+SQLITE_PRIVATE void sqlite3StatusUp(int, int);
	12962	+SQLITE_PRIVATE void sqlite3StatusDown(int, int);
12870	12963	SQLITE_PRIVATE void sqlite3StatusSet(int, int);
12871	12964
	12965	+/* Access to mutexes used by sqlite3_status() */
	12966	+SQLITE_PRIVATE sqlite3_mutex *sqlite3Pcache1Mutex(void);
	12967	+SQLITE_PRIVATE sqlite3_mutex *sqlite3MallocMutex(void);
	12968	+
12872	12969	#ifndef SQLITE_OMIT_FLOATING_POINT
12873	12970	SQLITE_PRIVATE int sqlite3IsNaN(double);
12874	12971	#else
12875	12972	# define sqlite3IsNaN(X) 0
12876	12973	#endif
		@@ -13246,11 +13343,11 @@
13246	13343	SQLITE_PRIVATE const char *sqlite3ErrStr(int);
13247	13344	SQLITE_PRIVATE int sqlite3ReadSchema(Parse *pParse);
13248	13345	SQLITE_PRIVATE CollSeq sqlite3FindCollSeq(sqlite3,u8 enc, const char*,int);
13249	13346	SQLITE_PRIVATE CollSeq sqlite3LocateCollSeq(Parse pParse, const char*zName);
13250	13347	SQLITE_PRIVATE CollSeq sqlite3ExprCollSeq(Parse pParse, Expr *pExpr);
13251		-SQLITE_PRIVATE Expr sqlite3ExprAddCollateToken(Parse pParse, Expr, const Token);
	13348	+SQLITE_PRIVATE Expr sqlite3ExprAddCollateToken(Parse pParse, Expr, const Token, int);
13252	13349	SQLITE_PRIVATE Expr sqlite3ExprAddCollateString(Parse,Expr,const char);
13253	13350	SQLITE_PRIVATE Expr sqlite3ExprSkipCollate(Expr);
13254	13351	SQLITE_PRIVATE int sqlite3CheckCollSeq(Parse , CollSeq );
13255	13352	SQLITE_PRIVATE int sqlite3CheckObjectName(Parse , const char );
13256	13353	SQLITE_PRIVATE void sqlite3VdbeSetChanges(sqlite3 *, int);
		@@ -14633,18 +14730,10 @@
14633	14730	** An instance of the virtual machine. This structure contains the complete
14634	14731	** state of the virtual machine.
14635	14732	**
14636	14733	** The "sqlite3_stmt" structure pointer that is returned by sqlite3_prepare()
14637	14734	** is really a pointer to an instance of this structure.
14638		-**
14639		-** The Vdbe.inVtabMethod variable is set to non-zero for the duration of
14640		-** any virtual table method invocations made by the vdbe program. It is
14641		-** set to 2 for xDestroy method calls and 1 for all other methods. This
14642		-** variable is used for two purposes: to allow xDestroy methods to execute
14643		-** "DROP TABLE" statements and to prevent some nasty side effects of
14644		-** malloc failure when SQLite is invoked recursively by a virtual table
14645		-** method function.
14646	14735	*/
14647	14736	struct Vdbe {
14648	14737	sqlite3 db; / The database connection that owns this statement */
14649	14738	Op aOp; / Space to hold the virtual machine's program */
14650	14739	Mem aMem; / The memory locations */
		@@ -14671,11 +14760,10 @@
14671	14760	#endif
14672	14761	u16 nResColumn; /* Number of columns in one row of the result set */
14673	14762	u8 errorAction; /* Recovery action to do in case of an error */
14674	14763	u8 minWriteFileFormat; /* Minimum file format for writable database files */
14675	14764	bft explain:2; /* True if EXPLAIN present on SQL command */
14676		- bft inVtabMethod:2; /* See comments above */
14677	14765	bft changeCntOn:1; /* True to update the change-counter */
14678	14766	bft expired:1; /* True if the VM needs to be recompiled */
14679	14767	bft runOnlyOnce:1; /* Automatically expire on reset */
14680	14768	bft usesStmtJournal:1; /* True if uses a statement journal */
14681	14769	bft readOnly:1; /* True for statements that do not write */
		@@ -14831,13 +14919,35 @@
14831	14919	/*
14832	14920	** Variables in which to record status information.
14833	14921	*/
14834	14922	typedef struct sqlite3StatType sqlite3StatType;
14835	14923	static SQLITE_WSD struct sqlite3StatType {
14836		- int nowValue[10]; /* Current value */
14837		- int mxValue[10]; /* Maximum value */
	14924	+#if SQLITE_PTRSIZE>4
	14925	+ sqlite3_int64 nowValue[10]; /* Current value */
	14926	+ sqlite3_int64 mxValue[10]; /* Maximum value */
	14927	+#else
	14928	+ u32 nowValue[10]; /* Current value */
	14929	+ u32 mxValue[10]; /* Maximum value */
	14930	+#endif
14838	14931	} sqlite3Stat = { {0,}, {0,} };
	14932	+
	14933	+/*
	14934	+** Elements of sqlite3Stat[] are protected by either the memory allocator
	14935	+** mutex, or by the pcache1 mutex. The following array determines which.
	14936	+*/
	14937	+static const char statMutex[] = {
	14938	+ 0, /* SQLITE_STATUS_MEMORY_USED */
	14939	+ 1, /* SQLITE_STATUS_PAGECACHE_USED */
	14940	+ 1, /* SQLITE_STATUS_PAGECACHE_OVERFLOW */
	14941	+ 0, /* SQLITE_STATUS_SCRATCH_USED */
	14942	+ 0, /* SQLITE_STATUS_SCRATCH_OVERFLOW */
	14943	+ 0, /* SQLITE_STATUS_MALLOC_SIZE */
	14944	+ 0, /* SQLITE_STATUS_PARSER_STACK */
	14945	+ 1, /* SQLITE_STATUS_PAGECACHE_SIZE */
	14946	+ 0, /* SQLITE_STATUS_SCRATCH_SIZE */
	14947	+ 0, /* SQLITE_STATUS_MALLOC_COUNT */
	14948	+};
14839	14949
14840	14950
14841	14951	/* The "wsdStat" macro will resolve to the status information
14842	14952	** state vector. If writable static data is unsupported on the target,
14843	14953	** we have to locate the state vector at run-time. In the more common
		@@ -14851,64 +14961,110 @@
14851	14961	# define wsdStatInit
14852	14962	# define wsdStat sqlite3Stat
14853	14963	#endif
14854	14964
14855	14965	/*
14856		-** Return the current value of a status parameter.
	14966	+** Return the current value of a status parameter. The caller must
	14967	+** be holding the appropriate mutex.
14857	14968	*/
14858		-SQLITE_PRIVATE int sqlite3StatusValue(int op){
	14969	+SQLITE_PRIVATE sqlite3_int64 sqlite3StatusValue(int op){
14859	14970	wsdStatInit;
14860	14971	assert( op>=0 && op<ArraySize(wsdStat.nowValue) );
	14972	+ assert( op>=0 && op<ArraySize(statMutex) );
	14973	+ assert( sqlite3_mutex_held(statMutex[op] ? sqlite3Pcache1Mutex()
	14974	+ : sqlite3MallocMutex()) );
14861	14975	return wsdStat.nowValue[op];
14862	14976	}
14863	14977
14864	14978	/*
14865		-** Add N to the value of a status record. It is assumed that the
14866		-** caller holds appropriate locks.
	14979	+** Add N to the value of a status record. The caller must hold the
	14980	+** appropriate mutex. (Locking is checked by assert()).
	14981	+**
	14982	+** The StatusUp() routine can accept positive or negative values for N.
	14983	+** The value of N is added to the current status value and the high-water
	14984	+** mark is adjusted if necessary.
	14985	+**
	14986	+** The StatusDown() routine lowers the current value by N. The highwater
	14987	+** mark is unchanged. N must be non-negative for StatusDown().
14867	14988	*/
14868		-SQLITE_PRIVATE void sqlite3StatusAdd(int op, int N){
	14989	+SQLITE_PRIVATE void sqlite3StatusUp(int op, int N){
14869	14990	wsdStatInit;
14870	14991	assert( op>=0 && op<ArraySize(wsdStat.nowValue) );
	14992	+ assert( op>=0 && op<ArraySize(statMutex) );
	14993	+ assert( sqlite3_mutex_held(statMutex[op] ? sqlite3Pcache1Mutex()
	14994	+ : sqlite3MallocMutex()) );
14871	14995	wsdStat.nowValue[op] += N;
14872	14996	if( wsdStat.nowValue[op]>wsdStat.mxValue[op] ){
14873	14997	wsdStat.mxValue[op] = wsdStat.nowValue[op];
14874	14998	}
14875	14999	}
	15000	+SQLITE_PRIVATE void sqlite3StatusDown(int op, int N){
	15001	+ wsdStatInit;
	15002	+ assert( N>=0 );
	15003	+ assert( op>=0 && op<ArraySize(statMutex) );
	15004	+ assert( sqlite3_mutex_held(statMutex[op] ? sqlite3Pcache1Mutex()
	15005	+ : sqlite3MallocMutex()) );
	15006	+ assert( op>=0 && op<ArraySize(wsdStat.nowValue) );
	15007	+ wsdStat.nowValue[op] -= N;
	15008	+}
14876	15009
14877	15010	/*
14878		-** Set the value of a status to X.
	15011	+** Set the value of a status to X. The highwater mark is adjusted if
	15012	+** necessary. The caller must hold the appropriate mutex.
14879	15013	*/
14880	15014	SQLITE_PRIVATE void sqlite3StatusSet(int op, int X){
14881	15015	wsdStatInit;
14882	15016	assert( op>=0 && op<ArraySize(wsdStat.nowValue) );
	15017	+ assert( op>=0 && op<ArraySize(statMutex) );
	15018	+ assert( sqlite3_mutex_held(statMutex[op] ? sqlite3Pcache1Mutex()
	15019	+ : sqlite3MallocMutex()) );
14883	15020	wsdStat.nowValue[op] = X;
14884	15021	if( wsdStat.nowValue[op]>wsdStat.mxValue[op] ){
14885	15022	wsdStat.mxValue[op] = wsdStat.nowValue[op];
14886	15023	}
14887	15024	}
14888	15025
14889	15026	/*
14890	15027	** Query status information.
14891		-**
14892		-** This implementation assumes that reading or writing an aligned
14893		-** 32-bit integer is an atomic operation. If that assumption is not true,
14894		-** then this routine is not threadsafe.
14895	15028	*/
14896		-SQLITE_API int sqlite3_status(int op, int pCurrent, int pHighwater, int resetFlag){
	15029	+SQLITE_API int sqlite3_status64(
	15030	+ int op,
	15031	+ sqlite3_int64 *pCurrent,
	15032	+ sqlite3_int64 *pHighwater,
	15033	+ int resetFlag
	15034	+){
	15035	+ sqlite3_mutex *pMutex;
14897	15036	wsdStatInit;
14898	15037	if( op<0 \|\| op>=ArraySize(wsdStat.nowValue) ){
14899	15038	return SQLITE_MISUSE_BKPT;
14900	15039	}
14901	15040	#ifdef SQLITE_ENABLE_API_ARMOR
14902	15041	if( pCurrent==0 \|\| pHighwater==0 ) return SQLITE_MISUSE_BKPT;
14903	15042	#endif
	15043	+ pMutex = statMutex[op] ? sqlite3Pcache1Mutex() : sqlite3MallocMutex();
	15044	+ sqlite3_mutex_enter(pMutex);
14904	15045	*pCurrent = wsdStat.nowValue[op];
14905	15046	*pHighwater = wsdStat.mxValue[op];
14906	15047	if( resetFlag ){
14907	15048	wsdStat.mxValue[op] = wsdStat.nowValue[op];
14908	15049	}
	15050	+ sqlite3_mutex_leave(pMutex);
	15051	+ (void)pMutex; /* Prevent warning when SQLITE_THREADSAFE=0 */
14909	15052	return SQLITE_OK;
	15053	+}
	15054	+SQLITE_API int sqlite3_status(int op, int pCurrent, int pHighwater, int resetFlag){
	15055	+ sqlite3_int64 iCur, iHwtr;
	15056	+ int rc;
	15057	+#ifdef SQLITE_ENABLE_API_ARMOR
	15058	+ if( pCurrent==0 \|\| pHighwater==0 ) return SQLITE_MISUSE_BKPT;
	15059	+#endif
	15060	+ rc = sqlite3_status64(op, &iCur, &iHwtr, resetFlag);
	15061	+ if( rc==0 ){
	15062	+ *pCurrent = (int)iCur;
	15063	+ *pHighwater = (int)iHwtr;
	15064	+ }
	15065	+ return rc;
14910	15066	}
14911	15067
14912	15068	/*
14913	15069	** Query status information for a single database connection
14914	15070	*/
		@@ -20358,10 +20514,17 @@
20358	20514	*/
20359	20515	int nearlyFull;
20360	20516	} mem0 = { 0, 0, 0, 0, 0, 0, 0, 0 };
20361	20517
20362	20518	#define mem0 GLOBAL(struct Mem0Global, mem0)
	20519	+
	20520	+/*
	20521	+** Return the memory allocator mutex. sqlite3_status() needs it.
	20522	+*/
	20523	+SQLITE_PRIVATE sqlite3_mutex *sqlite3MallocMutex(void){
	20524	+ return mem0.mutex;
	20525	+}
20363	20526
20364	20527	/*
20365	20528	** This routine runs when the memory allocator sees that the
20366	20529	** total memory allocation is about to exceed the soft heap
20367	20530	** limit.
		@@ -20381,11 +20544,11 @@
20381	20544	static int sqlite3MemoryAlarm(
20382	20545	void(xCallback)(void pArg, sqlite3_int64 used,int N),
20383	20546	void *pArg,
20384	20547	sqlite3_int64 iThreshold
20385	20548	){
20386		- int nUsed;
	20549	+ sqlite3_int64 nUsed;
20387	20550	sqlite3_mutex_enter(mem0.mutex);
20388	20551	mem0.alarmCallback = xCallback;
20389	20552	mem0.alarmArg = pArg;
20390	20553	mem0.alarmThreshold = iThreshold;
20391	20554	nUsed = sqlite3StatusValue(SQLITE_STATUS_MEMORY_USED);
		@@ -20550,11 +20713,11 @@
20550	20713	void *p;
20551	20714	assert( sqlite3_mutex_held(mem0.mutex) );
20552	20715	nFull = sqlite3GlobalConfig.m.xRoundup(n);
20553	20716	sqlite3StatusSet(SQLITE_STATUS_MALLOC_SIZE, n);
20554	20717	if( mem0.alarmCallback!=0 ){
20555		- int nUsed = sqlite3StatusValue(SQLITE_STATUS_MEMORY_USED);
	20718	+ sqlite3_int64 nUsed = sqlite3StatusValue(SQLITE_STATUS_MEMORY_USED);
20556	20719	if( nUsed >= mem0.alarmThreshold - nFull ){
20557	20720	mem0.nearlyFull = 1;
20558	20721	sqlite3MallocAlarm(nFull);
20559	20722	}else{
20560	20723	mem0.nearlyFull = 0;
		@@ -20567,12 +20730,12 @@
20567	20730	p = sqlite3GlobalConfig.m.xMalloc(nFull);
20568	20731	}
20569	20732	#endif
20570	20733	if( p ){
20571	20734	nFull = sqlite3MallocSize(p);
20572		- sqlite3StatusAdd(SQLITE_STATUS_MEMORY_USED, nFull);
20573		- sqlite3StatusAdd(SQLITE_STATUS_MALLOC_COUNT, 1);
	20735	+ sqlite3StatusUp(SQLITE_STATUS_MEMORY_USED, nFull);
	20736	+ sqlite3StatusUp(SQLITE_STATUS_MALLOC_COUNT, 1);
20574	20737	}
20575	20738	*pp = p;
20576	20739	return nFull;
20577	20740	}
20578	20741
		@@ -20645,18 +20808,18 @@
20645	20808	sqlite3StatusSet(SQLITE_STATUS_SCRATCH_SIZE, n);
20646	20809	if( mem0.nScratchFree && sqlite3GlobalConfig.szScratch>=n ){
20647	20810	p = mem0.pScratchFree;
20648	20811	mem0.pScratchFree = mem0.pScratchFree->pNext;
20649	20812	mem0.nScratchFree--;
20650		- sqlite3StatusAdd(SQLITE_STATUS_SCRATCH_USED, 1);
	20813	+ sqlite3StatusUp(SQLITE_STATUS_SCRATCH_USED, 1);
20651	20814	sqlite3_mutex_leave(mem0.mutex);
20652	20815	}else{
20653	20816	sqlite3_mutex_leave(mem0.mutex);
20654	20817	p = sqlite3Malloc(n);
20655	20818	if( sqlite3GlobalConfig.bMemstat && p ){
20656	20819	sqlite3_mutex_enter(mem0.mutex);
20657		- sqlite3StatusAdd(SQLITE_STATUS_SCRATCH_OVERFLOW, sqlite3MallocSize(p));
	20820	+ sqlite3StatusUp(SQLITE_STATUS_SCRATCH_OVERFLOW, sqlite3MallocSize(p));
20658	20821	sqlite3_mutex_leave(mem0.mutex);
20659	20822	}
20660	20823	sqlite3MemdebugSetType(p, MEMTYPE_SCRATCH);
20661	20824	}
20662	20825	assert( sqlite3_mutex_notheld(mem0.mutex) );
		@@ -20693,23 +20856,23 @@
20693	20856	sqlite3_mutex_enter(mem0.mutex);
20694	20857	pSlot->pNext = mem0.pScratchFree;
20695	20858	mem0.pScratchFree = pSlot;
20696	20859	mem0.nScratchFree++;
20697	20860	assert( mem0.nScratchFree <= (u32)sqlite3GlobalConfig.nScratch );
20698		- sqlite3StatusAdd(SQLITE_STATUS_SCRATCH_USED, -1);
	20861	+ sqlite3StatusDown(SQLITE_STATUS_SCRATCH_USED, 1);
20699	20862	sqlite3_mutex_leave(mem0.mutex);
20700	20863	}else{
20701	20864	/* Release memory back to the heap */
20702	20865	assert( sqlite3MemdebugHasType(p, MEMTYPE_SCRATCH) );
20703		- assert( sqlite3MemdebugNoType(p, ~MEMTYPE_SCRATCH) );
	20866	+ assert( sqlite3MemdebugNoType(p, (u8)~MEMTYPE_SCRATCH) );
20704	20867	sqlite3MemdebugSetType(p, MEMTYPE_HEAP);
20705	20868	if( sqlite3GlobalConfig.bMemstat ){
20706	20869	int iSize = sqlite3MallocSize(p);
20707	20870	sqlite3_mutex_enter(mem0.mutex);
20708		- sqlite3StatusAdd(SQLITE_STATUS_SCRATCH_OVERFLOW, -iSize);
20709		- sqlite3StatusAdd(SQLITE_STATUS_MEMORY_USED, -iSize);
20710		- sqlite3StatusAdd(SQLITE_STATUS_MALLOC_COUNT, -1);
	20871	+ sqlite3StatusDown(SQLITE_STATUS_SCRATCH_OVERFLOW, iSize);
	20872	+ sqlite3StatusDown(SQLITE_STATUS_MEMORY_USED, iSize);
	20873	+ sqlite3StatusDown(SQLITE_STATUS_MALLOC_COUNT, 1);
20711	20874	sqlite3GlobalConfig.m.xFree(p);
20712	20875	sqlite3_mutex_leave(mem0.mutex);
20713	20876	}else{
20714	20877	sqlite3GlobalConfig.m.xFree(p);
20715	20878	}
		@@ -20736,26 +20899,26 @@
20736	20899	assert( sqlite3MemdebugHasType(p, MEMTYPE_HEAP) );
20737	20900	return sqlite3GlobalConfig.m.xSize(p);
20738	20901	}
20739	20902	SQLITE_PRIVATE int sqlite3DbMallocSize(sqlite3 db, void p){
20740	20903	if( db==0 ){
20741		- assert( sqlite3MemdebugNoType(p, ~MEMTYPE_HEAP) );
	20904	+ assert( sqlite3MemdebugNoType(p, (u8)~MEMTYPE_HEAP) );
20742	20905	assert( sqlite3MemdebugHasType(p, MEMTYPE_HEAP) );
20743	20906	return sqlite3MallocSize(p);
20744	20907	}else{
20745	20908	assert( sqlite3_mutex_held(db->mutex) );
20746	20909	if( isLookaside(db, p) ){
20747	20910	return db->lookaside.sz;
20748	20911	}else{
20749	20912	assert( sqlite3MemdebugHasType(p, (MEMTYPE_LOOKASIDE\|MEMTYPE_HEAP)) );
20750		- assert( sqlite3MemdebugNoType(p, ~(MEMTYPE_LOOKASIDE\|MEMTYPE_HEAP)) );
	20913	+ assert( sqlite3MemdebugNoType(p, (u8)~(MEMTYPE_LOOKASIDE\|MEMTYPE_HEAP)) );
20751	20914	return sqlite3GlobalConfig.m.xSize(p);
20752	20915	}
20753	20916	}
20754	20917	}
20755	20918	SQLITE_API sqlite3_uint64 sqlite3_msize(void *p){
20756		- assert( sqlite3MemdebugNoType(p, ~MEMTYPE_HEAP) );
	20919	+ assert( sqlite3MemdebugNoType(p, (u8)~MEMTYPE_HEAP) );
20757	20920	assert( sqlite3MemdebugHasType(p, MEMTYPE_HEAP) );
20758	20921	return (sqlite3_uint64)sqlite3GlobalConfig.m.xSize(p);
20759	20922	}
20760	20923
20761	20924	/*
		@@ -20762,15 +20925,15 @@
20762	20925	** Free memory previously obtained from sqlite3Malloc().
20763	20926	*/
20764	20927	SQLITE_API void sqlite3_free(void *p){
20765	20928	if( p==0 ) return; /* IMP: R-49053-54554 */
20766	20929	assert( sqlite3MemdebugHasType(p, MEMTYPE_HEAP) );
20767		- assert( sqlite3MemdebugNoType(p, ~MEMTYPE_HEAP) );
	20930	+ assert( sqlite3MemdebugNoType(p, (u8)~MEMTYPE_HEAP) );
20768	20931	if( sqlite3GlobalConfig.bMemstat ){
20769	20932	sqlite3_mutex_enter(mem0.mutex);
20770		- sqlite3StatusAdd(SQLITE_STATUS_MEMORY_USED, -sqlite3MallocSize(p));
20771		- sqlite3StatusAdd(SQLITE_STATUS_MALLOC_COUNT, -1);
	20933	+ sqlite3StatusDown(SQLITE_STATUS_MEMORY_USED, sqlite3MallocSize(p));
	20934	+ sqlite3StatusDown(SQLITE_STATUS_MALLOC_COUNT, 1);
20772	20935	sqlite3GlobalConfig.m.xFree(p);
20773	20936	sqlite3_mutex_leave(mem0.mutex);
20774	20937	}else{
20775	20938	sqlite3GlobalConfig.m.xFree(p);
20776	20939	}
		@@ -20807,11 +20970,11 @@
20807	20970	db->lookaside.nOut--;
20808	20971	return;
20809	20972	}
20810	20973	}
20811	20974	assert( sqlite3MemdebugHasType(p, (MEMTYPE_LOOKASIDE\|MEMTYPE_HEAP)) );
20812		- assert( sqlite3MemdebugNoType(p, ~(MEMTYPE_LOOKASIDE\|MEMTYPE_HEAP)) );
	20975	+ assert( sqlite3MemdebugNoType(p, (u8)~(MEMTYPE_LOOKASIDE\|MEMTYPE_HEAP)) );
20813	20976	assert( db!=0 \|\| sqlite3MemdebugNoType(p, MEMTYPE_LOOKASIDE) );
20814	20977	sqlite3MemdebugSetType(p, MEMTYPE_HEAP);
20815	20978	sqlite3_free(p);
20816	20979	}
20817	20980
		@@ -20820,11 +20983,11 @@
20820	20983	*/
20821	20984	SQLITE_PRIVATE void sqlite3Realloc(void pOld, u64 nBytes){
20822	20985	int nOld, nNew, nDiff;
20823	20986	void *pNew;
20824	20987	assert( sqlite3MemdebugHasType(pOld, MEMTYPE_HEAP) );
20825		- assert( sqlite3MemdebugNoType(pOld, ~MEMTYPE_HEAP) );
	20988	+ assert( sqlite3MemdebugNoType(pOld, (u8)~MEMTYPE_HEAP) );
20826	20989	if( pOld==0 ){
20827	20990	return sqlite3Malloc(nBytes); /* IMP: R-04300-56712 */
20828	20991	}
20829	20992	if( nBytes==0 ){
20830	20993	sqlite3_free(pOld); /* IMP: R-26507-47431 */
		@@ -20854,11 +21017,11 @@
20854	21017	sqlite3MallocAlarm((int)nBytes);
20855	21018	pNew = sqlite3GlobalConfig.m.xRealloc(pOld, nNew);
20856	21019	}
20857	21020	if( pNew ){
20858	21021	nNew = sqlite3MallocSize(pNew);
20859		- sqlite3StatusAdd(SQLITE_STATUS_MEMORY_USED, nNew-nOld);
	21022	+ sqlite3StatusUp(SQLITE_STATUS_MEMORY_USED, nNew-nOld);
20860	21023	}
20861	21024	sqlite3_mutex_leave(mem0.mutex);
20862	21025	}else{
20863	21026	pNew = sqlite3GlobalConfig.m.xRealloc(pOld, nNew);
20864	21027	}
		@@ -20987,11 +21150,11 @@
20987	21150	memcpy(pNew, p, db->lookaside.sz);
20988	21151	sqlite3DbFree(db, p);
20989	21152	}
20990	21153	}else{
20991	21154	assert( sqlite3MemdebugHasType(p, (MEMTYPE_LOOKASIDE\|MEMTYPE_HEAP)) );
20992		- assert( sqlite3MemdebugNoType(p, ~(MEMTYPE_LOOKASIDE\|MEMTYPE_HEAP)) );
	21155	+ assert( sqlite3MemdebugNoType(p, (u8)~(MEMTYPE_LOOKASIDE\|MEMTYPE_HEAP)) );
20993	21156	sqlite3MemdebugSetType(p, MEMTYPE_HEAP);
20994	21157	pNew = sqlite3_realloc64(p, n);
20995	21158	if( !pNew ){
20996	21159	db->mallocFailed = 1;
20997	21160	}
		@@ -24969,27 +25132,29 @@
24969	25132	/* 134 */ "FkCounter" OpHelp("fkctr[P1]+=P2"),
24970	25133	/* 135 */ "FkIfZero" OpHelp("if fkctr[P1]==0 goto P2"),
24971	25134	/* 136 */ "MemMax" OpHelp("r[P1]=max(r[P1],r[P2])"),
24972	25135	/* 137 */ "IfPos" OpHelp("if r[P1]>0 goto P2"),
24973	25136	/* 138 */ "IfNeg" OpHelp("r[P1]+=P3, if r[P1]<0 goto P2"),
24974		- /* 139 */ "IfZero" OpHelp("r[P1]+=P3, if r[P1]==0 goto P2"),
24975		- /* 140 */ "AggFinal" OpHelp("accum=r[P1] N=P2"),
24976		- /* 141 */ "IncrVacuum" OpHelp(""),
24977		- /* 142 */ "Expire" OpHelp(""),
24978		- /* 143 */ "TableLock" OpHelp("iDb=P1 root=P2 write=P3"),
24979		- /* 144 */ "VBegin" OpHelp(""),
24980		- /* 145 */ "VCreate" OpHelp(""),
24981		- /* 146 */ "VDestroy" OpHelp(""),
24982		- /* 147 */ "VOpen" OpHelp(""),
24983		- /* 148 */ "VColumn" OpHelp("r[P3]=vcolumn(P2)"),
24984		- /* 149 */ "VNext" OpHelp(""),
24985		- /* 150 */ "VRename" OpHelp(""),
24986		- /* 151 */ "Pagecount" OpHelp(""),
24987		- /* 152 */ "MaxPgcnt" OpHelp(""),
24988		- /* 153 */ "Init" OpHelp("Start at P2"),
24989		- /* 154 */ "Noop" OpHelp(""),
24990		- /* 155 */ "Explain" OpHelp(""),
	25137	+ /* 139 */ "IfNotZero" OpHelp("if r[P1]!=0 then r[P1]+=P3, goto P2"),
	25138	+ /* 140 */ "DecrJumpZero" OpHelp("if (--r[P1])==0 goto P2"),
	25139	+ /* 141 */ "JumpZeroIncr" OpHelp("if (r[P1]++)==0 ) goto P2"),
	25140	+ /* 142 */ "AggFinal" OpHelp("accum=r[P1] N=P2"),
	25141	+ /* 143 */ "IncrVacuum" OpHelp(""),
	25142	+ /* 144 */ "Expire" OpHelp(""),
	25143	+ /* 145 */ "TableLock" OpHelp("iDb=P1 root=P2 write=P3"),
	25144	+ /* 146 */ "VBegin" OpHelp(""),
	25145	+ /* 147 */ "VCreate" OpHelp(""),
	25146	+ /* 148 */ "VDestroy" OpHelp(""),
	25147	+ /* 149 */ "VOpen" OpHelp(""),
	25148	+ /* 150 */ "VColumn" OpHelp("r[P3]=vcolumn(P2)"),
	25149	+ /* 151 */ "VNext" OpHelp(""),
	25150	+ /* 152 */ "VRename" OpHelp(""),
	25151	+ /* 153 */ "Pagecount" OpHelp(""),
	25152	+ /* 154 */ "MaxPgcnt" OpHelp(""),
	25153	+ /* 155 */ "Init" OpHelp("Start at P2"),
	25154	+ /* 156 */ "Noop" OpHelp(""),
	25155	+ /* 157 */ "Explain" OpHelp(""),
24991	25156	};
24992	25157	return azName[i];
24993	25158	}
24994	25159	#endif
24995	25160
		@@ -25065,22 +25230,10 @@
25065	25230	# else
25066	25231	# define SQLITE_ENABLE_LOCKING_STYLE 0
25067	25232	# endif
25068	25233	#endif
25069	25234
25070		-/*
25071		-** Define the OS_VXWORKS pre-processor macro to 1 if building on
25072		-** vxworks, or 0 otherwise.
25073		-*/
25074		-#ifndef OS_VXWORKS
25075		-# if defined(__RTP__) \|\| defined(_WRS_KERNEL)
25076		-# define OS_VXWORKS 1
25077		-# else
25078		-# define OS_VXWORKS 0
25079		-# endif
25080		-#endif
25081		-
25082	25235	/*
25083	25236	** standard include files.
25084	25237	*/
25085	25238	#include <sys/types.h>
25086	25239	#include <sys/stat.h>
		@@ -25091,22 +25244,23 @@
25091	25244	#include <errno.h>
25092	25245	#if !defined(SQLITE_OMIT_WAL) \|\| SQLITE_MAX_MMAP_SIZE>0
25093	25246	# include <sys/mman.h>
25094	25247	#endif
25095	25248
25096		-#if SQLITE_ENABLE_LOCKING_STYLE \|\| OS_VXWORKS
	25249	+#if SQLITE_ENABLE_LOCKING_STYLE
25097	25250	# include <sys/ioctl.h>
25098		-# if OS_VXWORKS
25099		-# include <semaphore.h>
25100		-# include <limits.h>
25101		-# else
25102		-# include <sys/file.h>
25103		-# include <sys/param.h>
25104		-# endif
	25251	+# include <sys/file.h>
	25252	+# include <sys/param.h>
25105	25253	#endif /* SQLITE_ENABLE_LOCKING_STYLE */
25106	25254
25107		-#if defined(__APPLE__) \|\| (SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS)
	25255	+#if OS_VXWORKS
	25256	+/* # include <sys/ioctl.h> */
	25257	+# include <semaphore.h>
	25258	+# include <limits.h>
	25259	+#endif /* OS_VXWORKS */
	25260	+
	25261	+#if defined(__APPLE__) \|\| SQLITE_ENABLE_LOCKING_STYLE
25108	25262	# include <sys/mount.h>
25109	25263	#endif
25110	25264
25111	25265	#ifdef HAVE_UTIME
25112	25266	# include <utime.h>
		@@ -25142,10 +25296,14 @@
25142	25296
25143	25297	/*
25144	25298	** Maximum supported path-length.
25145	25299	*/
25146	25300	#define MAX_PATHNAME 512
	25301	+
	25302	+/* Always cast the getpid() return type for compatibility with
	25303	+** kernel modules in VxWorks. */
	25304	+#define osGetpid(X) (pid_t)getpid()
25147	25305
25148	25306	/*
25149	25307	** Only set the lastErrno if the error code is a real error and not
25150	25308	** a normal expected return code of SQLITE_BUSY or SQLITE_OK
25151	25309	*/
		@@ -25231,11 +25389,11 @@
25231	25389
25232	25390	/* This variable holds the process id (pid) from when the xRandomness()
25233	25391	** method was called. If xOpen() is called from a different process id,
25234	25392	** indicating that a fork() has occurred, the PRNG will be reset.
25235	25393	*/
25236		-static int randomnessPid = 0;
	25394	+static pid_t randomnessPid = 0;
25237	25395
25238	25396	/*
25239	25397	** Allowed values for the unixFile.ctrlFlags bitmask:
25240	25398	*/
25241	25399	#define UNIXFILE_EXCL 0x01 /* Connections from one process only */
		@@ -25249,10 +25407,11 @@
25249	25407	#define UNIXFILE_PSOW 0x10 /* SQLITE_IOCAP_POWERSAFE_OVERWRITE */
25250	25408	#define UNIXFILE_DELETE 0x20 /* Delete on close */
25251	25409	#define UNIXFILE_URI 0x40 /* Filename might have query parameters */
25252	25410	#define UNIXFILE_NOLOCK 0x80 /* Do no file locking */
25253	25411	#define UNIXFILE_WARNED 0x0100 /* verifyDbFile() warnings issued */
	25412	+#define UNIXFILE_BLOCK 0x0200 /* Next SHM lock might block */
25254	25413
25255	25414	/*
25256	25415	** Include code that is common to all os_*.c files
25257	25416	*/
25258	25417	/************ Include os_common.h in the middle of os_unix.c *************/
		@@ -25587,11 +25746,11 @@
25587	25746	#define osFcntl ((int(*)(int,int,...))aSyscall[7].pCurrent)
25588	25747
25589	25748	{ "read", (sqlite3_syscall_ptr)read, 0 },
25590	25749	#define osRead ((ssize_t()(int,void,size_t))aSyscall[8].pCurrent)
25591	25750
25592		-#if defined(USE_PREAD) \|\| (SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS)
	25751	+#if defined(USE_PREAD) \|\| SQLITE_ENABLE_LOCKING_STYLE
25593	25752	{ "pread", (sqlite3_syscall_ptr)pread, 0 },
25594	25753	#else
25595	25754	{ "pread", (sqlite3_syscall_ptr)0, 0 },
25596	25755	#endif
25597	25756	#define osPread ((ssize_t()(int,void,size_t,off_t))aSyscall[9].pCurrent)
		@@ -25604,11 +25763,11 @@
25604	25763	#define osPread64 ((ssize_t()(int,void,size_t,off_t))aSyscall[10].pCurrent)
25605	25764
25606	25765	{ "write", (sqlite3_syscall_ptr)write, 0 },
25607	25766	#define osWrite ((ssize_t()(int,const void,size_t))aSyscall[11].pCurrent)
25608	25767
25609		-#if defined(USE_PREAD) \|\| (SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS)
	25768	+#if defined(USE_PREAD) \|\| SQLITE_ENABLE_LOCKING_STYLE
25610	25769	{ "pwrite", (sqlite3_syscall_ptr)pwrite, 0 },
25611	25770	#else
25612	25771	{ "pwrite", (sqlite3_syscall_ptr)0, 0 },
25613	25772	#endif
25614	25773	#define osPwrite ((ssize_t()(int,const void,size_t,off_t))\
		@@ -26743,11 +26902,12 @@
26743	26902	int tErrno = 0;
26744	26903
26745	26904	assert( pFile );
26746	26905	OSTRACE(("LOCK %d %s was %s(%s,%d) pid=%d (unix)\n", pFile->h,
26747	26906	azFileLock(eFileLock), azFileLock(pFile->eFileLock),
26748		- azFileLock(pFile->pInode->eFileLock), pFile->pInode->nShared , getpid()));
	26907	+ azFileLock(pFile->pInode->eFileLock), pFile->pInode->nShared,
	26908	+ osGetpid(0)));
26749	26909
26750	26910	/* If there is already a lock of this type or more restrictive on the
26751	26911	** unixFile, do nothing. Don't use the end_lock: exit path, as
26752	26912	** unixEnterMutex() hasn't been called yet.
26753	26913	*/
		@@ -26951,11 +27111,11 @@
26951	27111	int rc = SQLITE_OK;
26952	27112
26953	27113	assert( pFile );
26954	27114	OSTRACE(("UNLOCK %d %d was %d(%d,%d) pid=%d (unix)\n", pFile->h, eFileLock,
26955	27115	pFile->eFileLock, pFile->pInode->eFileLock, pFile->pInode->nShared,
26956		- getpid()));
	27116	+ osGetpid(0)));
26957	27117
26958	27118	assert( eFileLock<=SHARED_LOCK );
26959	27119	if( pFile->eFileLock<=eFileLock ){
26960	27120	return SQLITE_OK;
26961	27121	}
		@@ -27378,11 +27538,11 @@
27378	27538	char zLockFile = (char )pFile->lockingContext;
27379	27539	int rc;
27380	27540
27381	27541	assert( pFile );
27382	27542	OSTRACE(("UNLOCK %d %d was %d pid=%d (dotlock)\n", pFile->h, eFileLock,
27383		- pFile->eFileLock, getpid()));
	27543	+ pFile->eFileLock, osGetpid(0)));
27384	27544	assert( eFileLock<=SHARED_LOCK );
27385	27545
27386	27546	/* no-op if possible */
27387	27547	if( pFile->eFileLock==eFileLock ){
27388	27548	return SQLITE_OK;
		@@ -27441,14 +27601,13 @@
27441	27601	** a single exclusive lock. In other words, SHARED, RESERVED, and
27442	27602	** PENDING locks are the same thing as an EXCLUSIVE lock. SQLite
27443	27603	** still works when you do this, but concurrency is reduced since
27444	27604	** only a single process can be reading the database at a time.
27445	27605	**
27446		-** Omit this section if SQLITE_ENABLE_LOCKING_STYLE is turned off or if
27447		-** compiling for VXWORKS.
	27606	+** Omit this section if SQLITE_ENABLE_LOCKING_STYLE is turned off
27448	27607	*/
27449		-#if SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS
	27608	+#if SQLITE_ENABLE_LOCKING_STYLE
27450	27609
27451	27610	/*
27452	27611	** Retry flock() calls that fail with EINTR
27453	27612	*/
27454	27613	#ifdef EINTR
		@@ -27597,11 +27756,11 @@
27597	27756	static int flockUnlock(sqlite3_file *id, int eFileLock) {
27598	27757	unixFile pFile = (unixFile)id;
27599	27758
27600	27759	assert( pFile );
27601	27760	OSTRACE(("UNLOCK %d %d was %d pid=%d (flock)\n", pFile->h, eFileLock,
27602		- pFile->eFileLock, getpid()));
	27761	+ pFile->eFileLock, osGetpid(0)));
27603	27762	assert( eFileLock<=SHARED_LOCK );
27604	27763
27605	27764	/* no-op if possible */
27606	27765	if( pFile->eFileLock==eFileLock ){
27607	27766	return SQLITE_OK;
		@@ -27658,11 +27817,11 @@
27658	27817	** This routine checks if there is a RESERVED lock held on the specified
27659	27818	** file by this or any other process. If such a lock is held, set *pResOut
27660	27819	** to a non-zero value otherwise *pResOut is set to zero. The return value
27661	27820	** is set to SQLITE_OK unless an I/O error occurs during lock checking.
27662	27821	*/
27663		-static int semCheckReservedLock(sqlite3_file id, int pResOut) {
	27822	+static int semXCheckReservedLock(sqlite3_file id, int pResOut) {
27664	27823	int rc = SQLITE_OK;
27665	27824	int reserved = 0;
27666	27825	unixFile pFile = (unixFile)id;
27667	27826
27668	27827	SimulateIOError( return SQLITE_IOERR_CHECKRESERVEDLOCK; );
		@@ -27725,11 +27884,11 @@
27725	27884	** access the file.
27726	27885	**
27727	27886	** This routine will only increase a lock. Use the sqlite3OsUnlock()
27728	27887	** routine to lower a locking level.
27729	27888	*/
27730		-static int semLock(sqlite3_file *id, int eFileLock) {
	27889	+static int semXLock(sqlite3_file *id, int eFileLock) {
27731	27890	unixFile pFile = (unixFile)id;
27732	27891	sem_t *pSem = pFile->pInode->pSem;
27733	27892	int rc = SQLITE_OK;
27734	27893
27735	27894	/* if we already have a lock, it is exclusive.
		@@ -27758,18 +27917,18 @@
27758	27917	** must be either NO_LOCK or SHARED_LOCK.
27759	27918	**
27760	27919	** If the locking level of the file descriptor is already at or below
27761	27920	** the requested locking level, this routine is a no-op.
27762	27921	*/
27763		-static int semUnlock(sqlite3_file *id, int eFileLock) {
	27922	+static int semXUnlock(sqlite3_file *id, int eFileLock) {
27764	27923	unixFile pFile = (unixFile)id;
27765	27924	sem_t *pSem = pFile->pInode->pSem;
27766	27925
27767	27926	assert( pFile );
27768	27927	assert( pSem );
27769	27928	OSTRACE(("UNLOCK %d %d was %d pid=%d (sem)\n", pFile->h, eFileLock,
27770		- pFile->eFileLock, getpid()));
	27929	+ pFile->eFileLock, osGetpid(0)));
27771	27930	assert( eFileLock<=SHARED_LOCK );
27772	27931
27773	27932	/* no-op if possible */
27774	27933	if( pFile->eFileLock==eFileLock ){
27775	27934	return SQLITE_OK;
		@@ -27795,14 +27954,14 @@
27795	27954	}
27796	27955
27797	27956	/*
27798	27957	** Close a file.
27799	27958	*/
27800		-static int semClose(sqlite3_file *id) {
	27959	+static int semXClose(sqlite3_file *id) {
27801	27960	if( id ){
27802	27961	unixFile pFile = (unixFile)id;
27803		- semUnlock(id, NO_LOCK);
	27962	+ semXUnlock(id, NO_LOCK);
27804	27963	assert( pFile );
27805	27964	unixEnterMutex();
27806	27965	releaseInodeInfo(pFile);
27807	27966	unixLeaveMutex();
27808	27967	closeUnixFile(id);
		@@ -27979,11 +28138,11 @@
27979	28138	afpLockingContext context = (afpLockingContext ) pFile->lockingContext;
27980	28139
27981	28140	assert( pFile );
27982	28141	OSTRACE(("LOCK %d %s was %s(%s,%d) pid=%d (afp)\n", pFile->h,
27983	28142	azFileLock(eFileLock), azFileLock(pFile->eFileLock),
27984		- azFileLock(pInode->eFileLock), pInode->nShared , getpid()));
	28143	+ azFileLock(pInode->eFileLock), pInode->nShared , osGetpid(0)));
27985	28144
27986	28145	/* If there is already a lock of this type or more restrictive on the
27987	28146	** unixFile, do nothing. Don't use the afp_end_lock: exit path, as
27988	28147	** unixEnterMutex() hasn't been called yet.
27989	28148	*/
		@@ -28165,11 +28324,11 @@
28165	28324	#endif
28166	28325
28167	28326	assert( pFile );
28168	28327	OSTRACE(("UNLOCK %d %d was %d(%d,%d) pid=%d (afp)\n", pFile->h, eFileLock,
28169	28328	pFile->eFileLock, pFile->pInode->eFileLock, pFile->pInode->nShared,
28170		- getpid()));
	28329	+ osGetpid(0)));
28171	28330
28172	28331	assert( eFileLock<=SHARED_LOCK );
28173	28332	if( pFile->eFileLock<=eFileLock ){
28174	28333	return SQLITE_OK;
28175	28334	}
		@@ -28990,10 +29149,14 @@
28990	29149	** Information and control of an open file handle.
28991	29150	*/
28992	29151	static int unixFileControl(sqlite3_file id, int op, void pArg){
28993	29152	unixFile pFile = (unixFile)id;
28994	29153	switch( op ){
	29154	+ case SQLITE_FCNTL_WAL_BLOCK: {
	29155	+ pFile->ctrlFlags \|= UNIXFILE_BLOCK;
	29156	+ return SQLITE_OK;
	29157	+ }
28995	29158	case SQLITE_FCNTL_LOCKSTATE: {
28996	29159	(int)pArg = pFile->eFileLock;
28997	29160	return SQLITE_OK;
28998	29161	}
28999	29162	case SQLITE_FCNTL_LAST_ERRNO: {
		@@ -29204,11 +29367,13 @@
29204	29367	**
29205	29368	** This function should not be called directly by other code in this file.
29206	29369	** Instead, it should be called via macro osGetpagesize().
29207	29370	*/
29208	29371	static int unixGetpagesize(void){
29209		-#if defined(_BSD_SOURCE)
	29372	+#if OS_VXWORKS
	29373	+ return 1024;
	29374	+#elif defined(_BSD_SOURCE)
29210	29375	return getpagesize();
29211	29376	#else
29212	29377	return (int)sysconf(_SC_PAGESIZE);
29213	29378	#endif
29214	29379	}
		@@ -29297,37 +29462,42 @@
29297	29462	**
29298	29463	** Locks block if the mask is exactly UNIX_SHM_C and are non-blocking
29299	29464	** otherwise.
29300	29465	*/
29301	29466	static int unixShmSystemLock(
29302		- unixShmNode pShmNode, / Apply locks to this open shared-memory segment */
	29467	+ unixFile pFile, / Open connection to the WAL file */
29303	29468	int lockType, /* F_UNLCK, F_RDLCK, or F_WRLCK */
29304	29469	int ofst, /* First byte of the locking range */
29305	29470	int n /* Number of bytes to lock */
29306	29471	){
29307		- struct flock f; /* The posix advisory locking structure */
29308		- int rc = SQLITE_OK; /* Result code form fcntl() */
	29472	+ unixShmNode pShmNode; / Apply locks to this open shared-memory segment */
	29473	+ struct flock f; /* The posix advisory locking structure */
	29474	+ int rc = SQLITE_OK; /* Result code form fcntl() */
29309	29475
29310	29476	/* Access to the unixShmNode object is serialized by the caller */
	29477	+ pShmNode = pFile->pInode->pShmNode;
29311	29478	assert( sqlite3_mutex_held(pShmNode->mutex) \|\| pShmNode->nRef==0 );
29312	29479
29313	29480	/* Shared locks never span more than one byte */
29314	29481	assert( n==1 \|\| lockType!=F_RDLCK );
29315	29482
29316	29483	/* Locks are within range */
29317	29484	assert( n>=1 && n<SQLITE_SHM_NLOCK );
29318	29485
29319	29486	if( pShmNode->h>=0 ){
	29487	+ int lkType;
29320	29488	/* Initialize the locking parameters */
29321	29489	memset(&f, 0, sizeof(f));
29322	29490	f.l_type = lockType;
29323	29491	f.l_whence = SEEK_SET;
29324	29492	f.l_start = ofst;
29325	29493	f.l_len = n;
29326	29494
29327		- rc = osFcntl(pShmNode->h, F_SETLK, &f);
	29495	+ lkType = (pFile->ctrlFlags & UNIXFILE_BLOCK)!=0 ? F_SETLKW : F_SETLK;
	29496	+ rc = osFcntl(pShmNode->h, lkType, &f);
29328	29497	rc = (rc!=(-1)) ? SQLITE_OK : SQLITE_BUSY;
	29498	+ pFile->ctrlFlags &= ~UNIXFILE_BLOCK;
29329	29499	}
29330	29500
29331	29501	/* Update the global lock state and do debug tracing */
29332	29502	#ifdef SQLITE_DEBUG
29333	29503	{ u16 mask;
		@@ -29533,17 +29703,17 @@
29533	29703
29534	29704	/* Check to see if another process is holding the dead-man switch.
29535	29705	** If not, truncate the file to zero length.
29536	29706	*/
29537	29707	rc = SQLITE_OK;
29538		- if( unixShmSystemLock(pShmNode, F_WRLCK, UNIX_SHM_DMS, 1)==SQLITE_OK ){
	29708	+ if( unixShmSystemLock(pDbFd, F_WRLCK, UNIX_SHM_DMS, 1)==SQLITE_OK ){
29539	29709	if( robust_ftruncate(pShmNode->h, 0) ){
29540	29710	rc = unixLogError(SQLITE_IOERR_SHMOPEN, "ftruncate", zShmFilename);
29541	29711	}
29542	29712	}
29543	29713	if( rc==SQLITE_OK ){
29544		- rc = unixShmSystemLock(pShmNode, F_RDLCK, UNIX_SHM_DMS, 1);
	29714	+ rc = unixShmSystemLock(pDbFd, F_RDLCK, UNIX_SHM_DMS, 1);
29545	29715	}
29546	29716	if( rc ) goto shm_open_err;
29547	29717	}
29548	29718	}
29549	29719
		@@ -29771,11 +29941,11 @@
29771	29941	allMask \|= pX->sharedMask;
29772	29942	}
29773	29943
29774	29944	/* Unlock the system-level locks */
29775	29945	if( (mask & allMask)==0 ){
29776		- rc = unixShmSystemLock(pShmNode, F_UNLCK, ofst+UNIX_SHM_BASE, n);
	29946	+ rc = unixShmSystemLock(pDbFd, F_UNLCK, ofst+UNIX_SHM_BASE, n);
29777	29947	}else{
29778	29948	rc = SQLITE_OK;
29779	29949	}
29780	29950
29781	29951	/* Undo the local locks */
		@@ -29799,11 +29969,11 @@
29799	29969	}
29800	29970
29801	29971	/* Get shared locks at the system level, if necessary */
29802	29972	if( rc==SQLITE_OK ){
29803	29973	if( (allShared & mask)==0 ){
29804		- rc = unixShmSystemLock(pShmNode, F_RDLCK, ofst+UNIX_SHM_BASE, n);
	29974	+ rc = unixShmSystemLock(pDbFd, F_RDLCK, ofst+UNIX_SHM_BASE, n);
29805	29975	}else{
29806	29976	rc = SQLITE_OK;
29807	29977	}
29808	29978	}
29809	29979
		@@ -29824,20 +29994,20 @@
29824	29994
29825	29995	/* Get the exclusive locks at the system level. Then if successful
29826	29996	** also mark the local connection as being locked.
29827	29997	*/
29828	29998	if( rc==SQLITE_OK ){
29829		- rc = unixShmSystemLock(pShmNode, F_WRLCK, ofst+UNIX_SHM_BASE, n);
	29999	+ rc = unixShmSystemLock(pDbFd, F_WRLCK, ofst+UNIX_SHM_BASE, n);
29830	30000	if( rc==SQLITE_OK ){
29831	30001	assert( (p->sharedMask & mask)==0 );
29832	30002	p->exclMask \|= mask;
29833	30003	}
29834	30004	}
29835	30005	}
29836	30006	sqlite3_mutex_leave(pShmNode->mutex);
29837	30007	OSTRACE(("SHM-LOCK shmid-%d, pid-%d got %03x,%03x\n",
29838		- p->id, getpid(), p->sharedMask, p->exclMask));
	30008	+ p->id, osGetpid(0), p->sharedMask, p->exclMask));
29839	30009	return rc;
29840	30010	}
29841	30011
29842	30012	/*
29843	30013	** Implement a memory barrier or memory fence on shared memory.
		@@ -30236,11 +30406,11 @@
30236	30406	dotlockUnlock, /* xUnlock method */
30237	30407	dotlockCheckReservedLock, /* xCheckReservedLock method */
30238	30408	0 /* xShmMap method */
30239	30409	)
30240	30410
30241		-#if SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS
	30411	+#if SQLITE_ENABLE_LOCKING_STYLE
30242	30412	IOMETHODS(
30243	30413	flockIoFinder, /* Finder function name */
30244	30414	flockIoMethods, /* sqlite3_io_methods object name */
30245	30415	1, /* shared memory is disabled */
30246	30416	flockClose, /* xClose method */
		@@ -30254,14 +30424,14 @@
30254	30424	#if OS_VXWORKS
30255	30425	IOMETHODS(
30256	30426	semIoFinder, /* Finder function name */
30257	30427	semIoMethods, /* sqlite3_io_methods object name */
30258	30428	1, /* shared memory is disabled */
30259		- semClose, /* xClose method */
30260		- semLock, /* xLock method */
30261		- semUnlock, /* xUnlock method */
30262		- semCheckReservedLock, /* xCheckReservedLock method */
	30429	+ semXClose, /* xClose method */
	30430	+ semXLock, /* xLock method */
	30431	+ semXUnlock, /* xUnlock method */
	30432	+ semXCheckReservedLock, /* xCheckReservedLock method */
30263	30433	0 /* xShmMap method */
30264	30434	)
30265	30435	#endif
30266	30436
30267	30437	#if defined(__APPLE__) && SQLITE_ENABLE_LOCKING_STYLE
		@@ -30381,19 +30551,17 @@
30381	30551	static const sqlite3_io_methods
30382	30552	(const autolockIoFinder)(const char,unixFile) = autolockIoFinderImpl;
30383	30553
30384	30554	#endif /* defined(__APPLE__) && SQLITE_ENABLE_LOCKING_STYLE */
30385	30555
30386		-#if OS_VXWORKS && SQLITE_ENABLE_LOCKING_STYLE
30387		-/*
30388		-** This "finder" function attempts to determine the best locking strategy
30389		-** for the database file "filePath". It then returns the sqlite3_io_methods
30390		-** object that implements that strategy.
30391		-**
30392		-** This is for VXWorks only.
	30556	+#if OS_VXWORKS
	30557	+/*
	30558	+** This "finder" function for VxWorks checks to see if posix advisory
	30559	+** locking works. If it does, then that is what is used. If it does not
	30560	+** work, then fallback to named semaphore locking.
30393	30561	*/
30394		-static const sqlite3_io_methods *autolockIoFinderImpl(
	30562	+static const sqlite3_io_methods *vxworksIoFinderImpl(
30395	30563	const char filePath, / name of the database file */
30396	30564	unixFile pNew / the open file object */
30397	30565	){
30398	30566	struct flock lockInfo;
30399	30567
		@@ -30415,13 +30583,13 @@
30415	30583	}else{
30416	30584	return &semIoMethods;
30417	30585	}
30418	30586	}
30419	30587	static const sqlite3_io_methods
30420		- (const autolockIoFinder)(const char,unixFile) = autolockIoFinderImpl;
	30588	+ (const vxworksIoFinder)(const char,unixFile) = vxworksIoFinderImpl;
30421	30589
30422		-#endif /* OS_VXWORKS && SQLITE_ENABLE_LOCKING_STYLE */
	30590	+#endif /* OS_VXWORKS */
30423	30591
30424	30592	/*
30425	30593	** An abstract type for a pointer to an IO method finder function:
30426	30594	*/
30427	30595	typedef const sqlite3_io_methods (finder_type)(const char,unixFile);
		@@ -30930,12 +31098,12 @@
30930	31098	/* Detect a pid change and reset the PRNG. There is a race condition
30931	31099	** here such that two or more threads all trying to open databases at
30932	31100	** the same instant might all reset the PRNG. But multiple resets
30933	31101	** are harmless.
30934	31102	*/
30935		- if( randomnessPid!=getpid() ){
30936		- randomnessPid = getpid();
	31103	+ if( randomnessPid!=osGetpid(0) ){
	31104	+ randomnessPid = osGetpid(0);
30937	31105	sqlite3_randomness(0,0);
30938	31106	}
30939	31107
30940	31108	memset(p, 0, sizeof(unixFile));
30941	31109
		@@ -31322,11 +31490,11 @@
31322	31490	** When testing, initializing zBuf[] to zero is all we do. That means
31323	31491	** that we always use the same random number sequence. This makes the
31324	31492	** tests repeatable.
31325	31493	*/
31326	31494	memset(zBuf, 0, nBuf);
31327		- randomnessPid = getpid();
	31495	+ randomnessPid = osGetpid(0);
31328	31496	#if !defined(SQLITE_TEST)
31329	31497	{
31330	31498	int fd, got;
31331	31499	fd = robust_open("/dev/urandom", O_RDONLY, 0);
31332	31500	if( fd<0 ){
		@@ -31643,11 +31811,11 @@
31643	31811	#else
31644	31812	# ifdef _CS_DARWIN_USER_TEMP_DIR
31645	31813	{
31646	31814	if( !confstr(_CS_DARWIN_USER_TEMP_DIR, lPath, maxLen) ){
31647	31815	OSTRACE(("GETLOCKPATH failed %s errno=%d pid=%d\n",
31648		- lPath, errno, getpid()));
	31816	+ lPath, errno, osGetpid(0)));
31649	31817	return SQLITE_IOERR_LOCK;
31650	31818	}
31651	31819	len = strlcat(lPath, "sqliteplocks", maxLen);
31652	31820	}
31653	31821	# else
		@@ -31665,11 +31833,11 @@
31665	31833	char c = dbPath[i];
31666	31834	lPath[i+len] = (c=='/')?'_':c;
31667	31835	}
31668	31836	lPath[i+len]='\0';
31669	31837	strlcat(lPath, ":auto:", maxLen);
31670		- OSTRACE(("GETLOCKPATH proxy lock path=%s pid=%d\n", lPath, getpid()));
	31838	+ OSTRACE(("GETLOCKPATH proxy lock path=%s pid=%d\n", lPath, osGetpid(0)));
31671	31839	return SQLITE_OK;
31672	31840	}
31673	31841
31674	31842	/*
31675	31843	** Creates the lock file and any missing directories in lockPath
		@@ -31692,20 +31860,20 @@
31692	31860	if( osMkdir(buf, SQLITE_DEFAULT_PROXYDIR_PERMISSIONS) ){
31693	31861	int err=errno;
31694	31862	if( err!=EEXIST ) {
31695	31863	OSTRACE(("CREATELOCKPATH FAILED creating %s, "
31696	31864	"'%s' proxy lock path=%s pid=%d\n",
31697		- buf, strerror(err), lockPath, getpid()));
	31865	+ buf, strerror(err), lockPath, osGetpid(0)));
31698	31866	return err;
31699	31867	}
31700	31868	}
31701	31869	}
31702	31870	start=i+1;
31703	31871	}
31704	31872	buf[i] = lockPath[i];
31705	31873	}
31706		- OSTRACE(("CREATELOCKPATH proxy lock path=%s pid=%d\n", lockPath, getpid()));
	31874	+ OSTRACE(("CREATELOCKPATH proxy lock path=%s pid=%d\n", lockPath, osGetpid(0)));
31707	31875	return 0;
31708	31876	}
31709	31877
31710	31878	/*
31711	31879	** Create a new VFS file descriptor (stored in memory obtained from
		@@ -32006,11 +32174,12 @@
32006	32174	int readLen = 0;
32007	32175	int tryOldLockPath = 0;
32008	32176	int forceNewLockPath = 0;
32009	32177
32010	32178	OSTRACE(("TAKECONCH %d for %s pid=%d\n", conchFile->h,
32011		- (pCtx->lockProxyPath ? pCtx->lockProxyPath : ":auto:"), getpid()));
	32179	+ (pCtx->lockProxyPath ? pCtx->lockProxyPath : ":auto:"),
	32180	+ osGetpid(0)));
32012	32181
32013	32182	rc = proxyGetHostID(myHostID, &pError);
32014	32183	if( (rc&0xff)==SQLITE_IOERR ){
32015	32184	storeLastErrno(pFile, pError);
32016	32185	goto end_takeconch;
		@@ -32216,11 +32385,11 @@
32216	32385
32217	32386	pCtx = (proxyLockingContext *)pFile->lockingContext;
32218	32387	conchFile = pCtx->conchFile;
32219	32388	OSTRACE(("RELEASECONCH %d for %s pid=%d\n", conchFile->h,
32220	32389	(pCtx->lockProxyPath ? pCtx->lockProxyPath : ":auto:"),
32221		- getpid()));
	32390	+ osGetpid(0)));
32222	32391	if( pCtx->conchHeld>0 ){
32223	32392	rc = conchFile->pMethod->xUnlock((sqlite3_file*)conchFile, NO_LOCK);
32224	32393	}
32225	32394	pCtx->conchHeld = 0;
32226	32395	OSTRACE(("RELEASECONCH %d %s\n", conchFile->h,
		@@ -32358,11 +32527,11 @@
32358	32527	}else{
32359	32528	lockPath=(char *)path;
32360	32529	}
32361	32530
32362	32531	OSTRACE(("TRANSPROXY %d for %s pid=%d\n", pFile->h,
32363		- (lockPath ? lockPath : ":auto:"), getpid()));
	32532	+ (lockPath ? lockPath : ":auto:"), osGetpid(0)));
32364	32533
32365	32534	pCtx = sqlite3_malloc( sizeof(*pCtx) );
32366	32535	if( pCtx==0 ){
32367	32536	return SQLITE_NOMEM;
32368	32537	}
		@@ -32699,26 +32868,28 @@
32699	32868	** Note that the sqlite3_vfs.pNext field of the VFS object is modified
32700	32869	** by the SQLite core when the VFS is registered. So the following
32701	32870	** array cannot be const.
32702	32871	*/
32703	32872	static sqlite3_vfs aVfs[] = {
32704		-#if SQLITE_ENABLE_LOCKING_STYLE && (OS_VXWORKS \|\| defined(__APPLE__))
	32873	+#if SQLITE_ENABLE_LOCKING_STYLE && defined(__APPLE__)
32705	32874	UNIXVFS("unix", autolockIoFinder ),
	32875	+#elif OS_VXWORKS
	32876	+ UNIXVFS("unix", vxworksIoFinder ),
32706	32877	#else
32707	32878	UNIXVFS("unix", posixIoFinder ),
32708	32879	#endif
32709	32880	UNIXVFS("unix-none", nolockIoFinder ),
32710	32881	UNIXVFS("unix-dotfile", dotlockIoFinder ),
32711	32882	UNIXVFS("unix-excl", posixIoFinder ),
32712	32883	#if OS_VXWORKS
32713	32884	UNIXVFS("unix-namedsem", semIoFinder ),
32714	32885	#endif
32715		-#if SQLITE_ENABLE_LOCKING_STYLE
	32886	+#if SQLITE_ENABLE_LOCKING_STYLE \|\| OS_VXWORKS
32716	32887	UNIXVFS("unix-posix", posixIoFinder ),
32717		-#if !OS_VXWORKS
	32888	+#endif
	32889	+#if SQLITE_ENABLE_LOCKING_STYLE
32718	32890	UNIXVFS("unix-flock", flockIoFinder ),
32719		-#endif
32720	32891	#endif
32721	32892	#if SQLITE_ENABLE_LOCKING_STYLE && defined(__APPLE__)
32722	32893	UNIXVFS("unix-afp", afpIoFinder ),
32723	32894	UNIXVFS("unix-nfs", nfsIoFinder ),
32724	32895	UNIXVFS("unix-proxy", proxyIoFinder ),
		@@ -39072,16 +39243,24 @@
39072	39243	sqlite3GlobalConfig.pcache2.xUnpin(p->pCache->pCache, p->pPage, 0);
39073	39244	}
39074	39245	}
39075	39246
39076	39247	/*
39077		-** Compute the number of pages of cache requested.
	39248	+** Compute the number of pages of cache requested. p->szCache is the
	39249	+** cache size requested by the "PRAGMA cache_size" statement.
	39250	+**
	39251	+**
39078	39252	*/
39079	39253	static int numberOfCachePages(PCache *p){
39080	39254	if( p->szCache>=0 ){
	39255	+ /* IMPLEMENTATION-OF: R-42059-47211 If the argument N is positive then the
	39256	+ ** suggested cache size is set to N. */
39081	39257	return p->szCache;
39082	39258	}else{
	39259	+ /* IMPLEMENTATION-OF: R-61436-13639 If the argument N is negative, then
	39260	+ ** the number of cache pages is adjusted to use approximately abs(N*1024)
	39261	+ ** bytes of memory. */
39083	39262	return (int)((-1024*(i64)p->szCache)/(p->szPage+p->szExtra));
39084	39263	}
39085	39264	}
39086	39265
39087	39266	/************************************************* General Interfaces ****
		@@ -39817,20 +39996,20 @@
39817	39996	** in pcache1 need to be protected via mutex.
39818	39997	*/
39819	39998	static void *pcache1Alloc(int nByte){
39820	39999	void *p = 0;
39821	40000	assert( sqlite3_mutex_notheld(pcache1.grp.mutex) );
39822		- sqlite3StatusSet(SQLITE_STATUS_PAGECACHE_SIZE, nByte);
39823	40001	if( nByte<=pcache1.szSlot ){
39824	40002	sqlite3_mutex_enter(pcache1.mutex);
39825	40003	p = (PgHdr1 *)pcache1.pFree;
39826	40004	if( p ){
39827	40005	pcache1.pFree = pcache1.pFree->pNext;
39828	40006	pcache1.nFreeSlot--;
39829	40007	pcache1.bUnderPressure = pcache1.nFreeSlot<pcache1.nReserve;
39830	40008	assert( pcache1.nFreeSlot>=0 );
39831		- sqlite3StatusAdd(SQLITE_STATUS_PAGECACHE_USED, 1);
	40009	+ sqlite3StatusSet(SQLITE_STATUS_PAGECACHE_SIZE, nByte);
	40010	+ sqlite3StatusUp(SQLITE_STATUS_PAGECACHE_USED, 1);
39832	40011	}
39833	40012	sqlite3_mutex_leave(pcache1.mutex);
39834	40013	}
39835	40014	if( p==0 ){
39836	40015	/* Memory is not available in the SQLITE_CONFIG_PAGECACHE pool. Get
		@@ -39839,11 +40018,12 @@
39839	40018	p = sqlite3Malloc(nByte);
39840	40019	#ifndef SQLITE_DISABLE_PAGECACHE_OVERFLOW_STATS
39841	40020	if( p ){
39842	40021	int sz = sqlite3MallocSize(p);
39843	40022	sqlite3_mutex_enter(pcache1.mutex);
39844		- sqlite3StatusAdd(SQLITE_STATUS_PAGECACHE_OVERFLOW, sz);
	40023	+ sqlite3StatusSet(SQLITE_STATUS_PAGECACHE_SIZE, nByte);
	40024	+ sqlite3StatusUp(SQLITE_STATUS_PAGECACHE_OVERFLOW, sz);
39845	40025	sqlite3_mutex_leave(pcache1.mutex);
39846	40026	}
39847	40027	#endif
39848	40028	sqlite3MemdebugSetType(p, MEMTYPE_PCACHE);
39849	40029	}
		@@ -39857,11 +40037,11 @@
39857	40037	int nFreed = 0;
39858	40038	if( p==0 ) return 0;
39859	40039	if( p>=pcache1.pStart && p<pcache1.pEnd ){
39860	40040	PgFreeslot *pSlot;
39861	40041	sqlite3_mutex_enter(pcache1.mutex);
39862		- sqlite3StatusAdd(SQLITE_STATUS_PAGECACHE_USED, -1);
	40042	+ sqlite3StatusDown(SQLITE_STATUS_PAGECACHE_USED, 1);
39863	40043	pSlot = (PgFreeslot*)p;
39864	40044	pSlot->pNext = pcache1.pFree;
39865	40045	pcache1.pFree = pSlot;
39866	40046	pcache1.nFreeSlot++;
39867	40047	pcache1.bUnderPressure = pcache1.nFreeSlot<pcache1.nReserve;
		@@ -39871,11 +40051,11 @@
39871	40051	assert( sqlite3MemdebugHasType(p, MEMTYPE_PCACHE) );
39872	40052	sqlite3MemdebugSetType(p, MEMTYPE_HEAP);
39873	40053	nFreed = sqlite3MallocSize(p);
39874	40054	#ifndef SQLITE_DISABLE_PAGECACHE_OVERFLOW_STATS
39875	40055	sqlite3_mutex_enter(pcache1.mutex);
39876		- sqlite3StatusAdd(SQLITE_STATUS_PAGECACHE_OVERFLOW, -nFreed);
	40056	+ sqlite3StatusDown(SQLITE_STATUS_PAGECACHE_OVERFLOW, nFreed);
39877	40057	sqlite3_mutex_leave(pcache1.mutex);
39878	40058	#endif
39879	40059	sqlite3_free(p);
39880	40060	}
39881	40061	return nFreed;
		@@ -40607,10 +40787,18 @@
40607	40787
40608	40788	/*
40609	40789	** Return the size of the header on each page of this PCACHE implementation.
40610	40790	*/
40611	40791	SQLITE_PRIVATE int sqlite3HeaderSizePcache1(void){ return ROUND8(sizeof(PgHdr1)); }
	40792	+
	40793	+/*
	40794	+** Return the global mutex used by this PCACHE implementation. The
	40795	+** sqlite3_status() routine needs access to this mutex.
	40796	+*/
	40797	+SQLITE_PRIVATE sqlite3_mutex *sqlite3Pcache1Mutex(void){
	40798	+ return pcache1.mutex;
	40799	+}
40612	40800
40613	40801	#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
40614	40802	/*
40615	40803	** This function is called to free superfluous dynamically allocated memory
40616	40804	** held by the pager system. Memory in use by any SQLite pager allocated
		@@ -49380,13 +49568,14 @@
49380	49568	if( pWal->exclusiveMode ) return;
49381	49569	(void)sqlite3OsShmLock(pWal->pDbFd, lockIdx, 1,
49382	49570	SQLITE_SHM_UNLOCK \| SQLITE_SHM_SHARED);
49383	49571	WALTRACE(("WAL%p: release SHARED-%s\n", pWal, walLockName(lockIdx)));
49384	49572	}
49385		-static int walLockExclusive(Wal *pWal, int lockIdx, int n){
	49573	+static int walLockExclusive(Wal *pWal, int lockIdx, int n, int fBlock){
49386	49574	int rc;
49387	49575	if( pWal->exclusiveMode ) return SQLITE_OK;
	49576	+ if( fBlock ) sqlite3OsFileControl(pWal->pDbFd, SQLITE_FCNTL_WAL_BLOCK, 0);
49388	49577	rc = sqlite3OsShmLock(pWal->pDbFd, lockIdx, n,
49389	49578	SQLITE_SHM_LOCK \| SQLITE_SHM_EXCLUSIVE);
49390	49579	WALTRACE(("WAL%p: acquire EXCLUSIVE-%s cnt=%d %s\n", pWal,
49391	49580	walLockName(lockIdx), n, rc ? "failed" : "ok"));
49392	49581	VVA_ONLY( pWal->lockError = (u8)(rc!=SQLITE_OK && rc!=SQLITE_BUSY); )
		@@ -49668,11 +49857,11 @@
49668	49857	assert( WAL_ALL_BUT_WRITE==WAL_WRITE_LOCK+1 );
49669	49858	assert( WAL_CKPT_LOCK==WAL_ALL_BUT_WRITE );
49670	49859	assert( pWal->writeLock );
49671	49860	iLock = WAL_ALL_BUT_WRITE + pWal->ckptLock;
49672	49861	nLock = SQLITE_SHM_NLOCK - iLock;
49673		- rc = walLockExclusive(pWal, iLock, nLock);
	49862	+ rc = walLockExclusive(pWal, iLock, nLock, 0);
49674	49863	if( rc ){
49675	49864	return rc;
49676	49865	}
49677	49866	WALTRACE(("WAL%p: recovery begin...\n", pWal));
49678	49867
		@@ -50202,11 +50391,11 @@
50202	50391	int lockIdx, /* Offset of first byte to lock */
50203	50392	int n /* Number of bytes to lock */
50204	50393	){
50205	50394	int rc;
50206	50395	do {
50207		- rc = walLockExclusive(pWal, lockIdx, n);
	50396	+ rc = walLockExclusive(pWal, lockIdx, n, 0);
50208	50397	}while( xBusy && rc==SQLITE_BUSY && xBusy(pBusyArg) );
50209	50398	return rc;
50210	50399	}
50211	50400
50212	50401	/*
		@@ -50635,11 +50824,11 @@
50635	50824	if( pWal->readOnly & WAL_SHM_RDONLY ){
50636	50825	if( SQLITE_OK==(rc = walLockShared(pWal, WAL_WRITE_LOCK)) ){
50637	50826	walUnlockShared(pWal, WAL_WRITE_LOCK);
50638	50827	rc = SQLITE_READONLY_RECOVERY;
50639	50828	}
50640		- }else if( SQLITE_OK==(rc = walLockExclusive(pWal, WAL_WRITE_LOCK, 1)) ){
	50829	+ }else if( SQLITE_OK==(rc = walLockExclusive(pWal, WAL_WRITE_LOCK, 1, 1)) ){
50641	50830	pWal->writeLock = 1;
50642	50831	if( SQLITE_OK==(rc = walIndexPage(pWal, 0, &page0)) ){
50643	50832	badHdr = walIndexTryHdr(pWal, pChanged);
50644	50833	if( badHdr ){
50645	50834	/* If the wal-index header is still malformed even while holding
		@@ -50841,11 +51030,11 @@
50841	51030	{
50842	51031	if( (pWal->readOnly & WAL_SHM_RDONLY)==0
50843	51032	&& (mxReadMark<pWal->hdr.mxFrame \|\| mxI==0)
50844	51033	){
50845	51034	for(i=1; i<WAL_NREADER; i++){
50846		- rc = walLockExclusive(pWal, WAL_READ_LOCK(i), 1);
	51035	+ rc = walLockExclusive(pWal, WAL_READ_LOCK(i), 1, 0);
50847	51036	if( rc==SQLITE_OK ){
50848	51037	mxReadMark = pInfo->aReadMark[i] = pWal->hdr.mxFrame;
50849	51038	mxI = i;
50850	51039	walUnlockExclusive(pWal, WAL_READ_LOCK(i), 1);
50851	51040	break;
		@@ -51097,11 +51286,11 @@
51097	51286	}
51098	51287
51099	51288	/* Only one writer allowed at a time. Get the write lock. Return
51100	51289	** SQLITE_BUSY if unable.
51101	51290	*/
51102		- rc = walLockExclusive(pWal, WAL_WRITE_LOCK, 1);
	51291	+ rc = walLockExclusive(pWal, WAL_WRITE_LOCK, 1, 0);
51103	51292	if( rc ){
51104	51293	return rc;
51105	51294	}
51106	51295	pWal->writeLock = 1;
51107	51296
		@@ -51242,11 +51431,11 @@
51242	51431	volatile WalCkptInfo *pInfo = walCkptInfo(pWal);
51243	51432	assert( pInfo->nBackfill==pWal->hdr.mxFrame );
51244	51433	if( pInfo->nBackfill>0 ){
51245	51434	u32 salt1;
51246	51435	sqlite3_randomness(4, &salt1);
51247		- rc = walLockExclusive(pWal, WAL_READ_LOCK(1), WAL_NREADER-1);
	51436	+ rc = walLockExclusive(pWal, WAL_READ_LOCK(1), WAL_NREADER-1, 0);
51248	51437	if( rc==SQLITE_OK ){
51249	51438	/* If all readers are using WAL_READ_LOCK(0) (in other words if no
51250	51439	** readers are currently using the WAL), then the transactions
51251	51440	** frames will overwrite the start of the existing log. Update the
51252	51441	** wal-index header to reflect this.
		@@ -51567,11 +51756,11 @@
51567	51756	if( pWal->readOnly ) return SQLITE_READONLY;
51568	51757	WALTRACE(("WAL%p: checkpoint begins\n", pWal));
51569	51758
51570	51759	/* IMPLEMENTATION-OF: R-62028-47212 All calls obtain an exclusive
51571	51760	** "checkpoint" lock on the database file. */
51572		- rc = walLockExclusive(pWal, WAL_CKPT_LOCK, 1);
	51761	+ rc = walLockExclusive(pWal, WAL_CKPT_LOCK, 1, 0);
51573	51762	if( rc ){
51574	51763	/* EVIDENCE-OF: R-10421-19736 If any other process is running a
51575	51764	** checkpoint operation at the same time, the lock cannot be obtained and
51576	51765	** SQLITE_BUSY is returned.
51577	51766	** EVIDENCE-OF: R-53820-33897 Even if there is a busy-handler configured,
		@@ -52569,10 +52758,11 @@
52569	52758
52570	52759	/*
52571	52760	** Exit the recursive mutex on a Btree.
52572	52761	*/
52573	52762	SQLITE_PRIVATE void sqlite3BtreeLeave(Btree *p){
	52763	+ assert( sqlite3_mutex_held(p->db->mutex) );
52574	52764	if( p->sharable ){
52575	52765	assert( p->wantToLock>0 );
52576	52766	p->wantToLock--;
52577	52767	if( p->wantToLock==0 ){
52578	52768	unlockBtreeMutex(p);
		@@ -54747,12 +54937,12 @@
54747	54937	/*
54748	54938	** The following asserts make sure that structures used by the btree are
54749	54939	** the right size. This is to guard against size changes that result
54750	54940	** when compiling on a different architecture.
54751	54941	*/
54752		- assert( sizeof(i64)==8 \|\| sizeof(i64)==4 );
54753		- assert( sizeof(u64)==8 \|\| sizeof(u64)==4 );
	54942	+ assert( sizeof(i64)==8 );
	54943	+ assert( sizeof(u64)==8 );
54754	54944	assert( sizeof(u32)==4 );
54755	54945	assert( sizeof(u16)==2 );
54756	54946	assert( sizeof(Pgno)==4 );
54757	54947
54758	54948	pBt = sqlite3MallocZero( sizeof(*pBt) );
		@@ -60210,11 +60400,12 @@
60210	60400	** the previous call, as the overflow cell data will have been
60211	60401	** copied either into the body of a database page or into the new
60212	60402	** pSpace buffer passed to the latter call to balance_nonroot().
60213	60403	*/
60214	60404	u8 *pSpace = sqlite3PageMalloc(pCur->pBt->pageSize);
60215		- rc = balance_nonroot(pParent, iIdx, pSpace, iPage==1, pCur->hints);
	60405	+ rc = balance_nonroot(pParent, iIdx, pSpace, iPage==1,
	60406	+ pCur->hints&BTREE_BULKLOAD);
60216	60407	if( pFree ){
60217	60408	/* If pFree is not NULL, it points to the pSpace buffer used
60218	60409	** by a previous call to balance_nonroot(). Its contents are
60219	60410	** now stored either on real database pages or within the
60220	60411	** new pSpace buffer, so it may be safely freed here. */
		@@ -61873,17 +62064,26 @@
61873	62064	pBt->btsFlags &= ~BTS_NO_WAL;
61874	62065	return rc;
61875	62066	}
61876	62067
61877	62068	/*
61878		-** set the mask of hint flags for cursor pCsr. Currently the only valid
61879		-** values are 0 and BTREE_BULKLOAD.
	62069	+** set the mask of hint flags for cursor pCsr.
61880	62070	*/
61881	62071	SQLITE_PRIVATE void sqlite3BtreeCursorHints(BtCursor *pCsr, unsigned int mask){
61882		- assert( mask==BTREE_BULKLOAD \|\| mask==0 );
	62072	+ assert( mask==BTREE_BULKLOAD \|\| mask==BTREE_SEEK_EQ \|\| mask==0 );
61883	62073	pCsr->hints = mask;
61884	62074	}
	62075	+
	62076	+#ifdef SQLITE_DEBUG
	62077	+/*
	62078	+** Return true if the cursor has a hint specified. This routine is
	62079	+** only used from within assert() statements
	62080	+*/
	62081	+SQLITE_PRIVATE int sqlite3BtreeCursorHasHint(BtCursor *pCsr, unsigned int mask){
	62082	+ return (pCsr->hints & mask)!=0;
	62083	+}
	62084	+#endif
61885	62085
61886	62086	/*
61887	62087	** Return true if the given Btree is read-only.
61888	62088	*/
61889	62089	SQLITE_PRIVATE int sqlite3BtreeIsReadonly(Btree *p){
		@@ -63773,11 +63973,11 @@
63773	63973	** by calling sqlite3ValueNew().
63774	63974	**
63775	63975	** Otherwise, if the second argument is non-zero, then this function is
63776	63976	** being called indirectly by sqlite3Stat4ProbeSetValue(). If it has not
63777	63977	** already been allocated, allocate the UnpackedRecord structure that
63778		-** that function will return to its caller here. Then return a pointer
	63978	+** that function will return to its caller here. Then return a pointer to
63779	63979	** an sqlite3_value within the UnpackedRecord.a[] array.
63780	63980	*/
63781	63981	static sqlite3_value valueNew(sqlite3 db, struct ValueNewStat4Ctx *p){
63782	63982	#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
63783	63983	if( p ){
		@@ -63817,10 +64017,117 @@
63817	64017	UNUSED_PARAMETER(p);
63818	64018	#endif /* defined(SQLITE_ENABLE_STAT3_OR_STAT4) */
63819	64019	return sqlite3ValueNew(db);
63820	64020	}
63821	64021
	64022	+/*
	64023	+** The expression object indicated by the second argument is guaranteed
	64024	+** to be a scalar SQL function. If
	64025	+**
	64026	+** * all function arguments are SQL literals,
	64027	+** * the SQLITE_FUNC_CONSTANT function flag is set, and
	64028	+** * the SQLITE_FUNC_NEEDCOLL function flag is not set,
	64029	+**
	64030	+** then this routine attempts to invoke the SQL function. Assuming no
	64031	+** error occurs, output parameter (*ppVal) is set to point to a value
	64032	+** object containing the result before returning SQLITE_OK.
	64033	+**
	64034	+** Affinity aff is applied to the result of the function before returning.
	64035	+** If the result is a text value, the sqlite3_value object uses encoding
	64036	+** enc.
	64037	+**
	64038	+** If the conditions above are not met, this function returns SQLITE_OK
	64039	+** and sets (ppVal) to NULL. Or, if an error occurs, (ppVal) is set to
	64040	+** NULL and an SQLite error code returned.
	64041	+*/
	64042	+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
	64043	+static int valueFromFunction(
	64044	+ sqlite3 db, / The database connection */
	64045	+ Expr p, / The expression to evaluate */
	64046	+ u8 enc, /* Encoding to use */
	64047	+ u8 aff, /* Affinity to use */
	64048	+ sqlite3_value *ppVal, / Write the new value here */
	64049	+ struct ValueNewStat4Ctx pCtx / Second argument for valueNew() */
	64050	+){
	64051	+ sqlite3_context ctx; /* Context object for function invocation */
	64052	+ sqlite3_value *apVal = 0; / Function arguments */
	64053	+ int nVal = 0; /* Size of apVal[] array */
	64054	+ FuncDef pFunc = 0; / Function definition */
	64055	+ sqlite3_value pVal = 0; / New value */
	64056	+ int rc = SQLITE_OK; /* Return code */
	64057	+ int nName; /* Size of function name in bytes */
	64058	+ ExprList pList = 0; / Function arguments */
	64059	+ int i; /* Iterator variable */
	64060	+
	64061	+ assert( pCtx!=0 );
	64062	+ assert( (p->flags & EP_TokenOnly)==0 );
	64063	+ pList = p->x.pList;
	64064	+ if( pList ) nVal = pList->nExpr;
	64065	+ nName = sqlite3Strlen30(p->u.zToken);
	64066	+ pFunc = sqlite3FindFunction(db, p->u.zToken, nName, nVal, enc, 0);
	64067	+ assert( pFunc );
	64068	+ if( (pFunc->funcFlags & SQLITE_FUNC_CONSTANT)==0
	64069	+ \|\| (pFunc->funcFlags & SQLITE_FUNC_NEEDCOLL)
	64070	+ ){
	64071	+ return SQLITE_OK;
	64072	+ }
	64073	+
	64074	+ if( pList ){
	64075	+ apVal = (sqlite3_value*)sqlite3DbMallocZero(db, sizeof(apVal[0]) nVal);
	64076	+ if( apVal==0 ){
	64077	+ rc = SQLITE_NOMEM;
	64078	+ goto value_from_function_out;
	64079	+ }
	64080	+ for(i=0; i<nVal; i++){
	64081	+ rc = sqlite3ValueFromExpr(db, pList->a[i].pExpr, enc, aff, &apVal[i]);
	64082	+ if( apVal[i]==0 \|\| rc!=SQLITE_OK ) goto value_from_function_out;
	64083	+ }
	64084	+ }
	64085	+
	64086	+ pVal = valueNew(db, pCtx);
	64087	+ if( pVal==0 ){
	64088	+ rc = SQLITE_NOMEM;
	64089	+ goto value_from_function_out;
	64090	+ }
	64091	+
	64092	+ assert( pCtx->pParse->rc==SQLITE_OK );
	64093	+ memset(&ctx, 0, sizeof(ctx));
	64094	+ ctx.pOut = pVal;
	64095	+ ctx.pFunc = pFunc;
	64096	+ pFunc->xFunc(&ctx, nVal, apVal);
	64097	+ if( ctx.isError ){
	64098	+ rc = ctx.isError;
	64099	+ sqlite3ErrorMsg(pCtx->pParse, "%s", sqlite3_value_text(pVal));
	64100	+ }else{
	64101	+ sqlite3ValueApplyAffinity(pVal, aff, SQLITE_UTF8);
	64102	+ assert( rc==SQLITE_OK );
	64103	+ rc = sqlite3VdbeChangeEncoding(pVal, enc);
	64104	+ if( rc==SQLITE_OK && sqlite3VdbeMemTooBig(pVal) ){
	64105	+ rc = SQLITE_TOOBIG;
	64106	+ pCtx->pParse->nErr++;
	64107	+ }
	64108	+ }
	64109	+ pCtx->pParse->rc = rc;
	64110	+
	64111	+ value_from_function_out:
	64112	+ if( rc!=SQLITE_OK ){
	64113	+ pVal = 0;
	64114	+ }
	64115	+ if( apVal ){
	64116	+ for(i=0; i<nVal; i++){
	64117	+ sqlite3ValueFree(apVal[i]);
	64118	+ }
	64119	+ sqlite3DbFree(db, apVal);
	64120	+ }
	64121	+
	64122	+ *ppVal = pVal;
	64123	+ return rc;
	64124	+}
	64125	+#else
	64126	+# define valueFromFunction(a,b,c,d,e,f) SQLITE_OK
	64127	+#endif /* defined(SQLITE_ENABLE_STAT3_OR_STAT4) */
	64128	+
63822	64129	/*
63823	64130	** Extract a value from the supplied expression in the manner described
63824	64131	** above sqlite3ValueFromExpr(). Allocate the sqlite3_value object
63825	64132	** using valueNew().
63826	64133	**
		@@ -63848,10 +64155,16 @@
63848	64155	*ppVal = 0;
63849	64156	return SQLITE_OK;
63850	64157	}
63851	64158	while( (op = pExpr->op)==TK_UPLUS ) pExpr = pExpr->pLeft;
63852	64159	if( NEVER(op==TK_REGISTER) ) op = pExpr->op2;
	64160	+
	64161	+ /* Compressed expressions only appear when parsing the DEFAULT clause
	64162	+ ** on a table column definition, and hence only when pCtx==0. This
	64163	+ ** check ensures that an EP_TokenOnly expression is never passed down
	64164	+ ** into valueFromFunction(). */
	64165	+ assert( (pExpr->flags & EP_TokenOnly)==0 \|\| pCtx==0 );
63853	64166
63854	64167	if( op==TK_CAST ){
63855	64168	u8 aff = sqlite3AffinityType(pExpr->u.zToken,0);
63856	64169	rc = valueFromExpr(db, pExpr->pLeft, enc, aff, ppVal, pCtx);
63857	64170	testcase( rc!=SQLITE_OK );
		@@ -63924,10 +64237,16 @@
63924	64237	assert( zVal[nVal]=='\'' );
63925	64238	sqlite3VdbeMemSetStr(pVal, sqlite3HexToBlob(db, zVal, nVal), nVal/2,
63926	64239	0, SQLITE_DYNAMIC);
63927	64240	}
63928	64241	#endif
	64242	+
	64243	+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
	64244	+ else if( op==TK_FUNCTION && pCtx!=0 ){
	64245	+ rc = valueFromFunction(db, pExpr, enc, affinity, &pVal, pCtx);
	64246	+ }
	64247	+#endif
63929	64248
63930	64249	*ppVal = pVal;
63931	64250	return rc;
63932	64251
63933	64252	no_mem:
		@@ -65377,11 +65696,11 @@
65377	65696	break;
65378	65697	}
65379	65698	#ifndef SQLITE_OMIT_VIRTUALTABLE
65380	65699	case P4_VTAB: {
65381	65700	sqlite3_vtab *pVtab = pOp->p4.pVtab->pVtab;
65382		- sqlite3_snprintf(nTemp, zTemp, "vtab:%p:%p", pVtab, pVtab->pModule);
	65701	+ sqlite3_snprintf(nTemp, zTemp, "vtab:%p", pVtab);
65383	65702	break;
65384	65703	}
65385	65704	#endif
65386	65705	case P4_INTARRAY: {
65387	65706	sqlite3_snprintf(nTemp, zTemp, "intarray");
		@@ -66041,13 +66360,13 @@
66041	66360	}
66042	66361	#ifndef SQLITE_OMIT_VIRTUALTABLE
66043	66362	else if( pCx->pVtabCursor ){
66044	66363	sqlite3_vtab_cursor *pVtabCursor = pCx->pVtabCursor;
66045	66364	const sqlite3_module *pModule = pVtabCursor->pVtab->pModule;
66046		- p->inVtabMethod = 1;
	66365	+ assert( pVtabCursor->pVtab->nRef>0 );
	66366	+ pVtabCursor->pVtab->nRef--;
66047	66367	pModule->xClose(pVtabCursor);
66048		- p->inVtabMethod = 0;
66049	66368	}
66050	66369	#endif
66051	66370	}
66052	66371
66053	66372	/*
		@@ -66402,11 +66721,11 @@
66402	66721
66403	66722	/* Delete the master journal file. This commits the transaction. After
66404	66723	** doing this the directory is synced again before any individual
66405	66724	** transaction files are deleted.
66406	66725	*/
66407		- rc = sqlite3OsDelete(pVfs, zMaster, 1);
	66726	+ rc = sqlite3OsDelete(pVfs, zMaster, needSync);
66408	66727	sqlite3DbFree(db, zMaster);
66409	66728	zMaster = 0;
66410	66729	if( rc ){
66411	66730	return rc;
66412	66731	}
		@@ -68615,10 +68934,14 @@
68615	68934	}
68616	68935	SQLITE_API const void sqlite3_value_text16le(sqlite3_value pVal){
68617	68936	return sqlite3ValueText(pVal, SQLITE_UTF16LE);
68618	68937	}
68619	68938	#endif /* SQLITE_OMIT_UTF16 */
	68939	+/* EVIDENCE-OF: R-12793-43283 Every value in SQLite has one of five
	68940	+** fundamental datatypes: 64-bit signed integer 64-bit IEEE floating
	68941	+** point number string BLOB NULL
	68942	+*/
68620	68943	SQLITE_API int sqlite3_value_type(sqlite3_value* pVal){
68621	68944	static const u8 aType[] = {
68622	68945	SQLITE_BLOB, /* 0x00 */
68623	68946	SQLITE_NULL, /* 0x01 */
68624	68947	SQLITE_TEXT, /* 0x02 */
		@@ -68811,11 +69134,11 @@
68811	69134	}
68812	69135	SQLITE_API void sqlite3_result_error_code(sqlite3_context *pCtx, int errCode){
68813	69136	pCtx->isError = errCode;
68814	69137	pCtx->fErrorOrAux = 1;
68815	69138	#ifdef SQLITE_DEBUG
68816		- pCtx->pVdbe->rcApp = errCode;
	69139	+ if( pCtx->pVdbe ) pCtx->pVdbe->rcApp = errCode;
68817	69140	#endif
68818	69141	if( pCtx->pOut->flags & MEM_Null ){
68819	69142	sqlite3VdbeMemSetStr(pCtx->pOut, sqlite3ErrStr(errCode), -1,
68820	69143	SQLITE_UTF8, SQLITE_STATIC);
68821	69144	}
		@@ -69074,20 +69397,30 @@
69074	69397	assert( p && p->pFunc );
69075	69398	return p->pOut->db;
69076	69399	}
69077	69400
69078	69401	/*
69079		-** Return the current time for a statement
	69402	+** Return the current time for a statement. If the current time
	69403	+** is requested more than once within the same run of a single prepared
	69404	+** statement, the exact same time is returned for each invocation regardless
	69405	+** of the amount of time that elapses between invocations. In other words,
	69406	+** the time returned is always the time of the first call.
69080	69407	*/
69081	69408	SQLITE_PRIVATE sqlite3_int64 sqlite3StmtCurrentTime(sqlite3_context *p){
69082		- Vdbe *v = p->pVdbe;
69083	69409	int rc;
69084		- if( v->iCurrentTime==0 ){
69085		- rc = sqlite3OsCurrentTimeInt64(p->pOut->db->pVfs, &v->iCurrentTime);
69086		- if( rc ) v->iCurrentTime = 0;
	69410	+#ifndef SQLITE_ENABLE_STAT3_OR_STAT4
	69411	+ sqlite3_int64 *piTime = &p->pVdbe->iCurrentTime;
	69412	+ assert( p->pVdbe!=0 );
	69413	+#else
	69414	+ sqlite3_int64 iTime = 0;
	69415	+ sqlite3_int64 *piTime = p->pVdbe!=0 ? &p->pVdbe->iCurrentTime : &iTime;
	69416	+#endif
	69417	+ if( *piTime==0 ){
	69418	+ rc = sqlite3OsCurrentTimeInt64(p->pOut->db->pVfs, piTime);
	69419	+ if( rc ) *piTime = 0;
69087	69420	}
69088		- return v->iCurrentTime;
	69421	+ return *piTime;
69089	69422	}
69090	69423
69091	69424	/*
69092	69425	** The following is the implementation of an SQL function that always
69093	69426	** fails with an error message stating that the function is used in the
		@@ -69153,10 +69486,15 @@
69153	69486	*/
69154	69487	SQLITE_API void sqlite3_get_auxdata(sqlite3_context pCtx, int iArg){
69155	69488	AuxData *pAuxData;
69156	69489
69157	69490	assert( sqlite3_mutex_held(pCtx->pOut->db->mutex) );
	69491	+#if SQLITE_ENABLE_STAT3_OR_STAT4
	69492	+ if( pCtx->pVdbe==0 ) return 0;
	69493	+#else
	69494	+ assert( pCtx->pVdbe!=0 );
	69495	+#endif
69158	69496	for(pAuxData=pCtx->pVdbe->pAuxData; pAuxData; pAuxData=pAuxData->pNext){
69159	69497	if( pAuxData->iOp==pCtx->iOp && pAuxData->iArg==iArg ) break;
69160	69498	}
69161	69499
69162	69500	return (pAuxData ? pAuxData->pAux : 0);
		@@ -69176,10 +69514,15 @@
69176	69514	AuxData *pAuxData;
69177	69515	Vdbe *pVdbe = pCtx->pVdbe;
69178	69516
69179	69517	assert( sqlite3_mutex_held(pCtx->pOut->db->mutex) );
69180	69518	if( iArg<0 ) goto failed;
	69519	+#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
	69520	+ if( pVdbe==0 ) goto failed;
	69521	+#else
	69522	+ assert( pVdbe!=0 );
	69523	+#endif
69181	69524
69182	69525	for(pAuxData=pVdbe->pAuxData; pAuxData; pAuxData=pAuxData->pNext){
69183	69526	if( pAuxData->iOp==pCtx->iOp && pAuxData->iArg==iArg ) break;
69184	69527	}
69185	69528	if( pAuxData==0 ){
		@@ -71290,11 +71633,11 @@
71290	71633
71291	71634	/* Opcode: String8 * P2 * P4 *
71292	71635	** Synopsis: r[P2]='P4'
71293	71636	**
71294	71637	** P4 points to a nul terminated UTF-8 string. This opcode is transformed
71295		-** into a String before it is executed for the first time. During
	71638	+** into a String opcode before it is executed for the first time. During
71296	71639	** this transformation, the length of string P4 is computed and stored
71297	71640	** as the P1 parameter.
71298	71641	*/
71299	71642	case OP_String8: { /* same as TK_STRING, out2-prerelease */
71300	71643	assert( pOp->p4.z!=0 );
		@@ -71322,22 +71665,34 @@
71322	71665	goto too_big;
71323	71666	}
71324	71667	/* Fall through to the next case, OP_String */
71325	71668	}
71326	71669
71327		-/* Opcode: String P1 P2 * P4 *
	71670	+/* Opcode: String P1 P2 P3 P4 P5
71328	71671	** Synopsis: r[P2]='P4' (len=P1)
71329	71672	**
71330	71673	** The string value P4 of length P1 (bytes) is stored in register P2.
	71674	+**
	71675	+** If P5!=0 and the content of register P3 is greater than zero, then
	71676	+** the datatype of the register P2 is converted to BLOB. The content is
	71677	+** the same sequence of bytes, it is merely interpreted as a BLOB instead
	71678	+** of a string, as if it had been CAST.
71331	71679	*/
71332	71680	case OP_String: { /* out2-prerelease */
71333	71681	assert( pOp->p4.z!=0 );
71334	71682	pOut->flags = MEM_Str\|MEM_Static\|MEM_Term;
71335	71683	pOut->z = pOp->p4.z;
71336	71684	pOut->n = pOp->p1;
71337	71685	pOut->enc = encoding;
71338	71686	UPDATE_MAX_BLOBSIZE(pOut);
	71687	+ if( pOp->p5 ){
	71688	+ assert( pOp->p3>0 );
	71689	+ assert( pOp->p3<=(p->nMem-p->nCursor) );
	71690	+ pIn3 = &aMem[pOp->p3];
	71691	+ assert( pIn3->flags & MEM_Int );
	71692	+ if( pIn3->u.i ) pOut->flags = MEM_Blob\|MEM_Static\|MEM_Term;
	71693	+ }
71339	71694	break;
71340	71695	}
71341	71696
71342	71697	/* Opcode: Null P1 P2 P3 * *
71343	71698	** Synopsis: r[P2..P3]=NULL
		@@ -71780,11 +72135,11 @@
71780	72135	** max() aggregate will set to 1 if the current row is not the minimum or
71781	72136	** maximum. The P1 register is initialized to 0 by this instruction.
71782	72137	**
71783	72138	** The interface used by the implementation of the aforementioned functions
71784	72139	** to retrieve the collation sequence set by this opcode is not available
71785		-** publicly, only to user functions defined in func.c.
	72140	+** publicly. Only built-in functions have access to this feature.
71786	72141	*/
71787	72142	case OP_CollSeq: {
71788	72143	assert( pOp->p4type==P4_COLLSEQ );
71789	72144	if( pOp->p1 ){
71790	72145	sqlite3VdbeMemSetInt64(&aMem[pOp->p1], 0);
		@@ -73325,11 +73680,16 @@
73325	73680	** the value of this counter needs to be restored too. */
73326	73681	p->nStmtDefCons = db->nDeferredCons;
73327	73682	p->nStmtDefImmCons = db->nDeferredImmCons;
73328	73683	}
73329	73684
73330		- /* Gather the schema version number for checking */
	73685	+ /* Gather the schema version number for checking:
	73686	+ ** IMPLEMENTATION-OF: R-32195-19465 The schema version is used by SQLite
	73687	+ ** each time a query is executed to ensure that the internal cache of the
	73688	+ ** schema used when compiling the SQL query matches the schema of the
	73689	+ ** database against which the compiled query is actually executed.
	73690	+ */
73331	73691	sqlite3BtreeGetMeta(pBt, BTREE_SCHEMA_VERSION, (u32 *)&iMeta);
73332	73692	iGen = db->aDb[pOp->p1].pSchema->iGeneration;
73333	73693	}else{
73334	73694	iGen = iMeta = 0;
73335	73695	}
		@@ -73493,35 +73853,33 @@
73493	73853	** cursors or a single read/write cursor but not both.
73494	73854	**
73495	73855	** See also OpenRead.
73496	73856	*/
73497	73857	case OP_ReopenIdx: {
73498		- VdbeCursor *pCur;
73499		-
73500		- assert( pOp->p5==0 );
73501		- assert( pOp->p4type==P4_KEYINFO );
73502		- pCur = p->apCsr[pOp->p1];
73503		- if( pCur && pCur->pgnoRoot==(u32)pOp->p2 ){
73504		- assert( pCur->iDb==pOp->p3 ); /* Guaranteed by the code generator */
73505		- break;
73506		- }
73507		- /* If the cursor is not currently open or is open on a different
73508		- ** index, then fall through into OP_OpenRead to force a reopen */
73509		-}
73510		-case OP_OpenRead:
73511		-case OP_OpenWrite: {
73512	73858	int nField;
73513	73859	KeyInfo *pKeyInfo;
73514	73860	int p2;
73515	73861	int iDb;
73516	73862	int wrFlag;
73517	73863	Btree *pX;
73518	73864	VdbeCursor *pCur;
73519	73865	Db *pDb;
73520	73866
73521		- assert( (pOp->p5&(OPFLAG_P2ISREG\|OPFLAG_BULKCSR))==pOp->p5 );
73522		- assert( pOp->opcode==OP_OpenWrite \|\| pOp->p5==0 );
	73867	+ assert( pOp->p5==0 \|\| pOp->p5==OPFLAG_SEEKEQ );
	73868	+ assert( pOp->p4type==P4_KEYINFO );
	73869	+ pCur = p->apCsr[pOp->p1];
	73870	+ if( pCur && pCur->pgnoRoot==(u32)pOp->p2 ){
	73871	+ assert( pCur->iDb==pOp->p3 ); /* Guaranteed by the code generator */
	73872	+ goto open_cursor_set_hints;
	73873	+ }
	73874	+ /* If the cursor is not currently open or is open on a different
	73875	+ ** index, then fall through into OP_OpenRead to force a reopen */
	73876	+case OP_OpenRead:
	73877	+case OP_OpenWrite:
	73878	+
	73879	+ assert( (pOp->p5&(OPFLAG_P2ISREG\|OPFLAG_BULKCSR\|OPFLAG_SEEKEQ))==pOp->p5 );
	73880	+ assert( pOp->opcode==OP_OpenWrite \|\| pOp->p5==0 \|\| pOp->p5==OPFLAG_SEEKEQ );
73523	73881	assert( p->bIsReader );
73524	73882	assert( pOp->opcode==OP_OpenRead \|\| pOp->opcode==OP_ReopenIdx
73525	73883	\|\| p->readOnly==0 );
73526	73884
73527	73885	if( p->expired ){
		@@ -73580,18 +73938,21 @@
73580	73938	pCur->nullRow = 1;
73581	73939	pCur->isOrdered = 1;
73582	73940	pCur->pgnoRoot = p2;
73583	73941	rc = sqlite3BtreeCursor(pX, p2, wrFlag, pKeyInfo, pCur->pCursor);
73584	73942	pCur->pKeyInfo = pKeyInfo;
73585		- assert( OPFLAG_BULKCSR==BTREE_BULKLOAD );
73586		- sqlite3BtreeCursorHints(pCur->pCursor, (pOp->p5 & OPFLAG_BULKCSR));
73587		-
73588	73943	/* Set the VdbeCursor.isTable variable. Previous versions of
73589	73944	** SQLite used to check if the root-page flags were sane at this point
73590	73945	** and report database corruption if they were not, but this check has
73591	73946	** since moved into the btree layer. */
73592	73947	pCur->isTable = pOp->p4type!=P4_KEYINFO;
	73948	+
	73949	+open_cursor_set_hints:
	73950	+ assert( OPFLAG_BULKCSR==BTREE_BULKLOAD );
	73951	+ assert( OPFLAG_SEEKEQ==BTREE_SEEK_EQ );
	73952	+ sqlite3BtreeCursorHints(pCur->pCursor,
	73953	+ (pOp->p5 & (OPFLAG_BULKCSR\|OPFLAG_SEEKEQ)));
73593	73954	break;
73594	73955	}
73595	73956
73596	73957	/* Opcode: OpenEphemeral P1 P2 * P4 P5
73597	73958	** Synopsis: nColumn=P2
		@@ -73848,10 +74209,26 @@
73848	74209	oc = pOp->opcode;
73849	74210	pC->nullRow = 0;
73850	74211	#ifdef SQLITE_DEBUG
73851	74212	pC->seekOp = pOp->opcode;
73852	74213	#endif
	74214	+
	74215	+ /* For a cursor with the BTREE_SEEK_EQ hint, only the OP_SeekGE and
	74216	+ ** OP_SeekLE opcodes are allowed, and these must be immediately followed
	74217	+ ** by an OP_IdxGT or OP_IdxLT opcode, respectively, with the same key.
	74218	+ */
	74219	+#ifdef SQLITE_DEBUG
	74220	+ if( sqlite3BtreeCursorHasHint(pC->pCursor, BTREE_SEEK_EQ) ){
	74221	+ assert( pOp->opcode==OP_SeekGE \|\| pOp->opcode==OP_SeekLE );
	74222	+ assert( pOp[1].opcode==OP_IdxLT \|\| pOp[1].opcode==OP_IdxGT );
	74223	+ assert( pOp[1].p1==pOp[0].p1 );
	74224	+ assert( pOp[1].p2==pOp[0].p2 );
	74225	+ assert( pOp[1].p3==pOp[0].p3 );
	74226	+ assert( pOp[1].p4.i==pOp[0].p4.i );
	74227	+ }
	74228	+#endif
	74229	+
73853	74230	if( pC->isTable ){
73854	74231	/* The input value in P3 might be of any type: integer, real, string,
73855	74232	** blob, or NULL. But it needs to be an integer before we can do
73856	74233	** the seek, so convert it. */
73857	74234	pIn3 = &aMem[pOp->p3];
		@@ -75187,34 +75564,19 @@
75187	75564	**
75188	75565	** See also: Clear
75189	75566	*/
75190	75567	case OP_Destroy: { /* out2-prerelease */
75191	75568	int iMoved;
75192		- int iCnt;
75193		- Vdbe *pVdbe;
75194	75569	int iDb;
75195	75570
75196	75571	assert( p->readOnly==0 );
75197		-#ifndef SQLITE_OMIT_VIRTUALTABLE
75198		- iCnt = 0;
75199		- for(pVdbe=db->pVdbe; pVdbe; pVdbe = pVdbe->pNext){
75200		- if( pVdbe->magic==VDBE_MAGIC_RUN && pVdbe->bIsReader
75201		- && pVdbe->inVtabMethod<2 && pVdbe->pc>=0
75202		- ){
75203		- iCnt++;
75204		- }
75205		- }
75206		-#else
75207		- iCnt = db->nVdbeRead;
75208		-#endif
75209	75572	pOut->flags = MEM_Null;
75210		- if( iCnt>1 ){
	75573	+ if( db->nVdbeRead > db->nVDestroy+1 ){
75211	75574	rc = SQLITE_LOCKED;
75212	75575	p->errorAction = OE_Abort;
75213	75576	}else{
75214	75577	iDb = pOp->p3;
75215		- assert( iCnt==1 );
75216	75578	assert( DbMaskTest(p->btreeMask, iDb) );
75217	75579	iMoved = 0; /* Not needed. Only to silence a warning. */
75218	75580	rc = sqlite3BtreeDropTable(db->aDb[iDb].pBt, pOp->p1, &iMoved);
75219	75581	pOut->flags = MEM_Int;
75220	75582	pOut->u.i = iMoved;
		@@ -75843,14 +76205,16 @@
75843	76205	#endif /* SQLITE_OMIT_AUTOINCREMENT */
75844	76206
75845	76207	/* Opcode: IfPos P1 P2 * * *
75846	76208	** Synopsis: if r[P1]>0 goto P2
75847	76209	**
75848		-** If the value of register P1 is 1 or greater, jump to P2.
	76210	+** Register P1 must contain an integer.
	76211	+** If the value of register P1 is 1 or greater, jump to P2 and
	76212	+** add the literal value P3 to register P1.
75849	76213	**
75850		-** It is illegal to use this instruction on a register that does
75851		-** not contain an integer. An assertion fault will result if you try.
	76214	+** If the initial value of register P1 is less than 1, then the
	76215	+** value is unchanged and control passes through to the next instruction.
75852	76216	*/
75853	76217	case OP_IfPos: { /* jump, in1 */
75854	76218	pIn1 = &aMem[pOp->p1];
75855	76219	assert( pIn1->flags&MEM_Int );
75856	76220	VdbeBranchTaken( pIn1->u.i>0, 2);
		@@ -75875,27 +76239,63 @@
75875	76239	pc = pOp->p2 - 1;
75876	76240	}
75877	76241	break;
75878	76242	}
75879	76243
75880		-/* Opcode: IfZero P1 P2 P3 * *
75881		-** Synopsis: r[P1]+=P3, if r[P1]==0 goto P2
	76244	+/* Opcode: IfNotZero P1 P2 P3 * *
	76245	+** Synopsis: if r[P1]!=0 then r[P1]+=P3, goto P2
75882	76246	**
75883		-** The register P1 must contain an integer. Add literal P3 to the
75884		-** value in register P1. If the result is exactly 0, jump to P2.
	76247	+** Register P1 must contain an integer. If the content of register P1 is
	76248	+** initially nonzero, then add P3 to P1 and jump to P2. If register P1 is
	76249	+** initially zero, leave it unchanged and fall through.
75885	76250	*/
75886		-case OP_IfZero: { /* jump, in1 */
	76251	+case OP_IfNotZero: { /* jump, in1 */
	76252	+ pIn1 = &aMem[pOp->p1];
	76253	+ assert( pIn1->flags&MEM_Int );
	76254	+ VdbeBranchTaken(pIn1->u.i<0, 2);
	76255	+ if( pIn1->u.i ){
	76256	+ pIn1->u.i += pOp->p3;
	76257	+ pc = pOp->p2 - 1;
	76258	+ }
	76259	+ break;
	76260	+}
	76261	+
	76262	+/* Opcode: DecrJumpZero P1 P2 * * *
	76263	+** Synopsis: if (--r[P1])==0 goto P2
	76264	+**
	76265	+** Register P1 must hold an integer. Decrement the value in register P1
	76266	+** then jump to P2 if the new value is exactly zero.
	76267	+*/
	76268	+case OP_DecrJumpZero: { /* jump, in1 */
75887	76269	pIn1 = &aMem[pOp->p1];
75888	76270	assert( pIn1->flags&MEM_Int );
75889		- pIn1->u.i += pOp->p3;
	76271	+ pIn1->u.i--;
75890	76272	VdbeBranchTaken(pIn1->u.i==0, 2);
75891	76273	if( pIn1->u.i==0 ){
75892	76274	pc = pOp->p2 - 1;
75893	76275	}
75894	76276	break;
75895	76277	}
75896	76278
	76279	+
	76280	+/* Opcode: JumpZeroIncr P1 P2 * * *
	76281	+** Synopsis: if (r[P1]++)==0 ) goto P2
	76282	+**
	76283	+** The register P1 must contain an integer. If register P1 is initially
	76284	+** zero, then jump to P2. Increment register P1 regardless of whether or
	76285	+** not the jump is taken.
	76286	+*/
	76287	+case OP_JumpZeroIncr: { /* jump, in1 */
	76288	+ pIn1 = &aMem[pOp->p1];
	76289	+ assert( pIn1->flags&MEM_Int );
	76290	+ VdbeBranchTaken(pIn1->u.i==0, 2);
	76291	+ if( (pIn1->u.i++)==0 ){
	76292	+ pc = pOp->p2 - 1;
	76293	+ }
	76294	+ break;
	76295	+}
	76296	+
75897	76297	/* Opcode: AggStep * P2 P3 P4 P5
75898	76298	** Synopsis: accum=r[P3] step(r[P2@P5])
75899	76299	**
75900	76300	** Execute the step function for an aggregate. The
75901	76301	** function has P5 arguments. P4 is a pointer to the FuncDef
		@@ -76229,17 +76629,33 @@
76229	76629	break;
76230	76630	}
76231	76631	#endif /* SQLITE_OMIT_VIRTUALTABLE */
76232	76632
76233	76633	#ifndef SQLITE_OMIT_VIRTUALTABLE
76234		-/* Opcode: VCreate P1 * * P4 *
	76634	+/* Opcode: VCreate P1 P2 * * *
76235	76635	**
76236		-** P4 is the name of a virtual table in database P1. Call the xCreate method
76237		-** for that table.
	76636	+** P2 is a register that holds the name of a virtual table in database
	76637	+** P1. Call the xCreate method for that table.
76238	76638	*/
76239	76639	case OP_VCreate: {
76240		- rc = sqlite3VtabCallCreate(db, pOp->p1, pOp->p4.z, &p->zErrMsg);
	76640	+ Mem sMem; /* For storing the record being decoded */
	76641	+ const char zTab; / Name of the virtual table */
	76642	+
	76643	+ memset(&sMem, 0, sizeof(sMem));
	76644	+ sMem.db = db;
	76645	+ /* Because P2 is always a static string, it is impossible for the
	76646	+ ** sqlite3VdbeMemCopy() to fail */
	76647	+ assert( (aMem[pOp->p2].flags & MEM_Str)!=0 );
	76648	+ assert( (aMem[pOp->p2].flags & MEM_Static)!=0 );
	76649	+ rc = sqlite3VdbeMemCopy(&sMem, &aMem[pOp->p2]);
	76650	+ assert( rc==SQLITE_OK );
	76651	+ zTab = (const char*)sqlite3_value_text(&sMem);
	76652	+ assert( zTab \|\| db->mallocFailed );
	76653	+ if( zTab ){
	76654	+ rc = sqlite3VtabCallCreate(db, pOp->p1, zTab, &p->zErrMsg);
	76655	+ }
	76656	+ sqlite3VdbeMemRelease(&sMem);
76241	76657	break;
76242	76658	}
76243	76659	#endif /* SQLITE_OMIT_VIRTUALTABLE */
76244	76660
76245	76661	#ifndef SQLITE_OMIT_VIRTUALTABLE
		@@ -76247,13 +76663,13 @@
76247	76663	**
76248	76664	** P4 is the name of a virtual table in database P1. Call the xDestroy method
76249	76665	** of that table.
76250	76666	*/
76251	76667	case OP_VDestroy: {
76252		- p->inVtabMethod = 2;
	76668	+ db->nVDestroy++;
76253	76669	rc = sqlite3VtabCallDestroy(db, pOp->p1, pOp->p4.z);
76254		- p->inVtabMethod = 0;
	76670	+ db->nVDestroy--;
76255	76671	break;
76256	76672	}
76257	76673	#endif /* SQLITE_OMIT_VIRTUALTABLE */
76258	76674
76259	76675	#ifndef SQLITE_OMIT_VIRTUALTABLE
		@@ -76265,18 +76681,21 @@
76265	76681	*/
76266	76682	case OP_VOpen: {
76267	76683	VdbeCursor *pCur;
76268	76684	sqlite3_vtab_cursor *pVtabCursor;
76269	76685	sqlite3_vtab *pVtab;
76270		- sqlite3_module *pModule;
	76686	+ const sqlite3_module *pModule;
76271	76687
76272	76688	assert( p->bIsReader );
76273	76689	pCur = 0;
76274	76690	pVtabCursor = 0;
76275	76691	pVtab = pOp->p4.pVtab->pVtab;
76276		- pModule = (sqlite3_module *)pVtab->pModule;
76277		- assert(pVtab && pModule);
	76692	+ if( pVtab==0 \|\| NEVER(pVtab->pModule==0) ){
	76693	+ rc = SQLITE_LOCKED;
	76694	+ break;
	76695	+ }
	76696	+ pModule = pVtab->pModule;
76278	76697	rc = pModule->xOpen(pVtab, &pVtabCursor);
76279	76698	sqlite3VtabImportErrmsg(p, pVtab);
76280	76699	if( SQLITE_OK==rc ){
76281	76700	/* Initialize sqlite3_vtab_cursor base class */
76282	76701	pVtabCursor->pVtab = pVtab;
		@@ -76283,10 +76702,11 @@
76283	76702
76284	76703	/* Initialize vdbe cursor object */
76285	76704	pCur = allocateCursor(p, pOp->p1, 0, -1, 0);
76286	76705	if( pCur ){
76287	76706	pCur->pVtabCursor = pVtabCursor;
	76707	+ pVtab->nRef++;
76288	76708	}else{
76289	76709	db->mallocFailed = 1;
76290	76710	pModule->xClose(pVtabCursor);
76291	76711	}
76292	76712	}
		@@ -76348,13 +76768,11 @@
76348	76768	apArg = p->apArg;
76349	76769	for(i = 0; i<nArg; i++){
76350	76770	apArg[i] = &pArgc[i+1];
76351	76771	}
76352	76772
76353		- p->inVtabMethod = 1;
76354	76773	rc = pModule->xFilter(pVtabCursor, iQuery, pOp->p4.z, nArg, apArg);
76355		- p->inVtabMethod = 0;
76356	76774	sqlite3VtabImportErrmsg(p, pVtab);
76357	76775	if( rc==SQLITE_OK ){
76358	76776	res = pModule->xEof(pVtabCursor);
76359	76777	}
76360	76778	VdbeBranchTaken(res!=0,2);
		@@ -76440,13 +76858,11 @@
76440	76858	** underlying implementation to return an error if one occurs during
76441	76859	** xNext(). Instead, if an error occurs, true is returned (indicating that
76442	76860	** data is available) and the error code returned when xColumn or
76443	76861	** some other method is next invoked on the save virtual table cursor.
76444	76862	*/
76445		- p->inVtabMethod = 1;
76446	76863	rc = pModule->xNext(pCur->pVtabCursor);
76447		- p->inVtabMethod = 0;
76448	76864	sqlite3VtabImportErrmsg(p, pVtab);
76449	76865	if( rc==SQLITE_OK ){
76450	76866	res = pModule->xEof(pCur->pVtabCursor);
76451	76867	}
76452	76868	VdbeBranchTaken(!res,2);
		@@ -76517,11 +76933,11 @@
76517	76933	** P5 is the error actions (OE_Replace, OE_Fail, OE_Ignore, etc) to
76518	76934	** apply in the case of a constraint failure on an insert or update.
76519	76935	*/
76520	76936	case OP_VUpdate: {
76521	76937	sqlite3_vtab *pVtab;
76522		- sqlite3_module *pModule;
	76938	+ const sqlite3_module *pModule;
76523	76939	int nArg;
76524	76940	int i;
76525	76941	sqlite_int64 rowid;
76526	76942	Mem **apArg;
76527	76943	Mem *pX;
		@@ -76529,11 +76945,15 @@
76529	76945	assert( pOp->p2==1 \|\| pOp->p5==OE_Fail \|\| pOp->p5==OE_Rollback
76530	76946	\|\| pOp->p5==OE_Abort \|\| pOp->p5==OE_Ignore \|\| pOp->p5==OE_Replace
76531	76947	);
76532	76948	assert( p->readOnly==0 );
76533	76949	pVtab = pOp->p4.pVtab->pVtab;
76534		- pModule = (sqlite3_module *)pVtab->pModule;
	76950	+ if( pVtab==0 \|\| NEVER(pVtab->pModule==0) ){
	76951	+ rc = SQLITE_LOCKED;
	76952	+ break;
	76953	+ }
	76954	+ pModule = pVtab->pModule;
76535	76955	nArg = pOp->p2;
76536	76956	assert( pOp->p4type==P4_VTAB );
76537	76957	if( ALWAYS(pModule->xUpdate) ){
76538	76958	u8 vtabOnConflict = db->vtabOnConflict;
76539	76959	apArg = p->apArg;
		@@ -78399,10 +78819,11 @@
78399	78819	sqlite3 db, / Database handle doing sort */
78400	78820	i64 nExtend, /* Attempt to extend file to this size */
78401	78821	sqlite3_file **ppFd
78402	78822	){
78403	78823	int rc;
	78824	+ if( sqlite3FaultSim(202) ) return SQLITE_IOERR_ACCESS;
78404	78825	rc = sqlite3OsOpenMalloc(db->pVfs, 0, ppFd,
78405	78826	SQLITE_OPEN_TEMP_JOURNAL \|
78406	78827	SQLITE_OPEN_READWRITE \| SQLITE_OPEN_CREATE \|
78407	78828	SQLITE_OPEN_EXCLUSIVE \| SQLITE_OPEN_DELETEONCLOSE, &rc
78408	78829	);
		@@ -81990,14 +82411,15 @@
81990	82411	** and the pExpr parameter is returned unchanged.
81991	82412	*/
81992	82413	SQLITE_PRIVATE Expr *sqlite3ExprAddCollateToken(
81993	82414	Parse pParse, / Parsing context */
81994	82415	Expr pExpr, / Add the "COLLATE" clause to this expression */
81995		- const Token pCollName / Name of collating sequence */
	82416	+ const Token pCollName, / Name of collating sequence */
	82417	+ int dequote /* True to dequote pCollName */
81996	82418	){
81997	82419	if( pCollName->n>0 ){
81998		- Expr *pNew = sqlite3ExprAlloc(pParse->db, TK_COLLATE, pCollName, 1);
	82420	+ Expr *pNew = sqlite3ExprAlloc(pParse->db, TK_COLLATE, pCollName, dequote);
81999	82421	if( pNew ){
82000	82422	pNew->pLeft = pExpr;
82001	82423	pNew->flags \|= EP_Collate\|EP_Skip;
82002	82424	pExpr = pNew;
82003	82425	}
		@@ -82007,11 +82429,11 @@
82007	82429	SQLITE_PRIVATE Expr sqlite3ExprAddCollateString(Parse pParse, Expr pExpr, const char zC){
82008	82430	Token s;
82009	82431	assert( zC!=0 );
82010	82432	s.z = zC;
82011	82433	s.n = sqlite3Strlen30(s.z);
82012		- return sqlite3ExprAddCollateToken(pParse, pExpr, &s);
	82434	+ return sqlite3ExprAddCollateToken(pParse, pExpr, &s, 0);
82013	82435	}
82014	82436
82015	82437	/*
82016	82438	** Skip over any TK_COLLATE or TK_AS operators and any unlikely()
82017	82439	** or likelihood() function at the root of an expression.
		@@ -82317,10 +82739,11 @@
82317	82739	**
82318	82740	** Also propagate all EP_Propagate flags from the Expr.x.pList into
82319	82741	** Expr.flags.
82320	82742	*/
82321	82743	SQLITE_PRIVATE void sqlite3ExprSetHeightAndFlags(Parse pParse, Expr p){
	82744	+ if( pParse->nErr ) return;
82322	82745	exprSetHeight(p);
82323	82746	sqlite3ExprCheckHeight(pParse, p->nHeight);
82324	82747	}
82325	82748
82326	82749	/*
		@@ -87031,11 +87454,14 @@
87031	87454	/* Ensure the default expression is something that sqlite3ValueFromExpr()
87032	87455	** can handle (i.e. not CURRENT_TIME etc.)
87033	87456	*/
87034	87457	if( pDflt ){
87035	87458	sqlite3_value *pVal = 0;
87036		- if( sqlite3ValueFromExpr(db, pDflt, SQLITE_UTF8, SQLITE_AFF_NONE, &pVal) ){
	87459	+ int rc;
	87460	+ rc = sqlite3ValueFromExpr(db, pDflt, SQLITE_UTF8, SQLITE_AFF_NONE, &pVal);
	87461	+ assert( rc==SQLITE_OK \|\| rc==SQLITE_NOMEM );
	87462	+ if( rc!=SQLITE_OK ){
87037	87463	db->mallocFailed = 1;
87038	87464	return;
87039	87465	}
87040	87466	if( !pVal ){
87041	87467	sqlite3ErrorMsg(pParse, "Cannot add a column with non-constant default");
		@@ -93094,10 +93520,11 @@
93094	93520	}
93095	93521	if( pIdx->onError==OE_Default ){
93096	93522	pIdx->onError = pIndex->onError;
93097	93523	}
93098	93524	}
	93525	+ pRet = pIdx;
93099	93526	goto exit_create_index;
93100	93527	}
93101	93528	}
93102	93529	}
93103	93530
		@@ -95553,11 +95980,13 @@
95553	95980
95554	95981	/*
95555	95982	** Return the collating function associated with a function.
95556	95983	*/
95557	95984	static CollSeq sqlite3GetFuncCollSeq(sqlite3_context context){
95558		- VdbeOp *pOp = &context->pVdbe->aOp[context->iOp-1];
	95985	+ VdbeOp *pOp;
	95986	+ assert( context->pVdbe!=0 );
	95987	+ pOp = &context->pVdbe->aOp[context->iOp-1];
95559	95988	assert( pOp->opcode==OP_CollSeq );
95560	95989	assert( pOp->p4type==P4_COLLSEQ );
95561	95990	return pOp->p4.pColl;
95562	95991	}
95563	95992
		@@ -97181,10 +97610,15 @@
97181	97610	** pExpr points to an expression which implements a function. If
97182	97611	** it is appropriate to apply the LIKE optimization to that function
97183	97612	** then set aWc[0] through aWc[2] to the wildcard characters and
97184	97613	** return TRUE. If the function is not a LIKE-style function then
97185	97614	** return FALSE.
	97615	+**
	97616	+** *pIsNocase is set to true if uppercase and lowercase are equivalent for
	97617	+** the function (default for LIKE). If the function makes the distinction
	97618	+** between uppercase and lowercase (as does GLOB) then *pIsNocase is set to
	97619	+** false.
97186	97620	*/
97187	97621	SQLITE_PRIVATE int sqlite3IsLikeFunction(sqlite3 db, Expr pExpr, int pIsNocase, char aWc){
97188	97622	FuncDef *pDef;
97189	97623	if( pExpr->op!=TK_FUNCTION
97190	97624	\|\| !pExpr->x.pList
		@@ -102972,10 +103406,21 @@
102972	103406	}
102973	103407
102974	103408	/* Send an SQLITE_FCNTL_PRAGMA file-control to the underlying VFS
102975	103409	** connection. If it returns SQLITE_OK, then assume that the VFS
102976	103410	** handled the pragma and generate a no-op prepared statement.
	103411	+ **
	103412	+ ** IMPLEMENTATION-OF: R-12238-55120 Whenever a PRAGMA statement is parsed,
	103413	+ ** an SQLITE_FCNTL_PRAGMA file control is sent to the open sqlite3_file
	103414	+ ** object corresponding to the database file to which the pragma
	103415	+ ** statement refers.
	103416	+ **
	103417	+ ** IMPLEMENTATION-OF: R-29875-31678 The argument to the SQLITE_FCNTL_PRAGMA
	103418	+ file control is an array of pointers to strings (char) in which the
	103419	+ ** second element of the array is the name of the pragma and the third
	103420	+ ** element is the argument to the pragma or NULL if the pragma has no
	103421	+ ** argument.
102977	103422	*/
102978	103423	aFcntl[0] = 0;
102979	103424	aFcntl[1] = zLeft;
102980	103425	aFcntl[2] = zRight;
102981	103426	aFcntl[3] = 0;
		@@ -103732,34 +104177,46 @@
103732	104177	Index *pIdx;
103733	104178	Table *pTab;
103734	104179	pIdx = sqlite3FindIndex(db, zRight, zDb);
103735	104180	if( pIdx ){
103736	104181	int i;
103737		- int mx = pPragma->iArg ? pIdx->nColumn : pIdx->nKeyCol;
	104182	+ int mx;
	104183	+ if( pPragma->iArg ){
	104184	+ /* PRAGMA index_xinfo (newer version with more rows and columns) */
	104185	+ mx = pIdx->nColumn;
	104186	+ pParse->nMem = 6;
	104187	+ }else{
	104188	+ /* PRAGMA index_info (legacy version) */
	104189	+ mx = pIdx->nKeyCol;
	104190	+ pParse->nMem = 3;
	104191	+ }
103738	104192	pTab = pIdx->pTable;
103739		- sqlite3VdbeSetNumCols(v, 6);
103740		- pParse->nMem = 6;
	104193	+ sqlite3VdbeSetNumCols(v, pParse->nMem);
103741	104194	sqlite3CodeVerifySchema(pParse, iDb);
103742	104195	sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "seqno", SQLITE_STATIC);
103743	104196	sqlite3VdbeSetColName(v, 1, COLNAME_NAME, "cid", SQLITE_STATIC);
103744	104197	sqlite3VdbeSetColName(v, 2, COLNAME_NAME, "name", SQLITE_STATIC);
103745		- sqlite3VdbeSetColName(v, 3, COLNAME_NAME, "desc", SQLITE_STATIC);
103746		- sqlite3VdbeSetColName(v, 4, COLNAME_NAME, "coll", SQLITE_STATIC);
103747		- sqlite3VdbeSetColName(v, 5, COLNAME_NAME, "key", SQLITE_STATIC);
	104198	+ if( pPragma->iArg ){
	104199	+ sqlite3VdbeSetColName(v, 3, COLNAME_NAME, "desc", SQLITE_STATIC);
	104200	+ sqlite3VdbeSetColName(v, 4, COLNAME_NAME, "coll", SQLITE_STATIC);
	104201	+ sqlite3VdbeSetColName(v, 5, COLNAME_NAME, "key", SQLITE_STATIC);
	104202	+ }
103748	104203	for(i=0; i<mx; i++){
103749	104204	i16 cnum = pIdx->aiColumn[i];
103750	104205	sqlite3VdbeAddOp2(v, OP_Integer, i, 1);
103751	104206	sqlite3VdbeAddOp2(v, OP_Integer, cnum, 2);
103752	104207	if( cnum<0 ){
103753	104208	sqlite3VdbeAddOp2(v, OP_Null, 0, 3);
103754	104209	}else{
103755	104210	sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, pTab->aCol[cnum].zName, 0);
103756	104211	}
103757		- sqlite3VdbeAddOp2(v, OP_Integer, pIdx->aSortOrder[i], 4);
103758		- sqlite3VdbeAddOp4(v, OP_String8, 0, 5, 0, pIdx->azColl[i], 0);
103759		- sqlite3VdbeAddOp2(v, OP_Integer, i<pIdx->nKeyCol, 6);
103760		- sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 6);
	104212	+ if( pPragma->iArg ){
	104213	+ sqlite3VdbeAddOp2(v, OP_Integer, pIdx->aSortOrder[i], 4);
	104214	+ sqlite3VdbeAddOp4(v, OP_String8, 0, 5, 0, pIdx->azColl[i], 0);
	104215	+ sqlite3VdbeAddOp2(v, OP_Integer, i<pIdx->nKeyCol, 6);
	104216	+ }
	104217	+ sqlite3VdbeAddOp2(v, OP_ResultRow, 1, pParse->nMem);
103761	104218	}
103762	104219	}
103763	104220	}
103764	104221	break;
103765	104222
		@@ -104457,12 +104914,13 @@
104457	104914	#endif
104458	104915
104459	104916	/*
104460	104917	** PRAGMA shrink_memory
104461	104918	**
104462		- ** This pragma attempts to free as much memory as possible from the
104463		- ** current database connection.
	104919	+ ** IMPLEMENTATION-OF: R-23445-46109 This pragma causes the database
	104920	+ ** connection on which it is invoked to free up as much memory as it
	104921	+ ** can, by calling sqlite3_db_release_memory().
104464	104922	*/
104465	104923	case PragTyp_SHRINK_MEMORY: {
104466	104924	sqlite3_db_release_memory(db);
104467	104925	break;
104468	104926	}
		@@ -104487,12 +104945,16 @@
104487	104945
104488	104946	/*
104489	104947	** PRAGMA soft_heap_limit
104490	104948	** PRAGMA soft_heap_limit = N
104491	104949	**
104492		- ** Call sqlite3_soft_heap_limit64(N). Return the result. If N is omitted,
104493		- ** use -1.
	104950	+ ** IMPLEMENTATION-OF: R-26343-45930 This pragma invokes the
	104951	+ ** sqlite3_soft_heap_limit64() interface with the argument N, if N is
	104952	+ ** specified and is a non-negative integer.
	104953	+ ** IMPLEMENTATION-OF: R-64451-07163 The soft_heap_limit pragma always
	104954	+ ** returns the same integer that would be returned by the
	104955	+ ** sqlite3_soft_heap_limit64(-1) C-language function.
104494	104956	*/
104495	104957	case PragTyp_SOFT_HEAP_LIMIT: {
104496	104958	sqlite3_int64 N;
104497	104959	if( zRight && sqlite3DecOrHexToI64(zRight, &N)==SQLITE_OK ){
104498	104960	sqlite3_soft_heap_limit64(N);
		@@ -106065,24 +106527,21 @@
106065	106527	}else{
106066	106528	op = OP_IdxInsert;
106067	106529	}
106068	106530	sqlite3VdbeAddOp2(v, op, pSort->iECursor, regRecord);
106069	106531	if( pSelect->iLimit ){
106070		- int addr1, addr2;
	106532	+ int addr;
106071	106533	int iLimit;
106072	106534	if( pSelect->iOffset ){
106073	106535	iLimit = pSelect->iOffset+1;
106074	106536	}else{
106075	106537	iLimit = pSelect->iLimit;
106076	106538	}
106077		- addr1 = sqlite3VdbeAddOp1(v, OP_IfZero, iLimit); VdbeCoverage(v);
106078		- sqlite3VdbeAddOp2(v, OP_AddImm, iLimit, -1);
106079		- addr2 = sqlite3VdbeAddOp0(v, OP_Goto);
106080		- sqlite3VdbeJumpHere(v, addr1);
	106539	+ addr = sqlite3VdbeAddOp3(v, OP_IfNotZero, iLimit, 0, -1); VdbeCoverage(v);
106081	106540	sqlite3VdbeAddOp1(v, OP_Last, pSort->iECursor);
106082	106541	sqlite3VdbeAddOp1(v, OP_Delete, pSort->iECursor);
106083		- sqlite3VdbeJumpHere(v, addr2);
	106542	+ sqlite3VdbeJumpHere(v, addr);
106084	106543	}
106085	106544	}
106086	106545
106087	106546	/*
106088	106547	** Add code to implement the OFFSET
		@@ -106475,11 +106934,11 @@
106475	106934	/* Jump to the end of the loop if the LIMIT is reached. Except, if
106476	106935	** there is a sorter, in which case the sorter has already limited
106477	106936	** the output for us.
106478	106937	*/
106479	106938	if( pSort==0 && p->iLimit ){
106480		- sqlite3VdbeAddOp3(v, OP_IfZero, p->iLimit, iBreak, -1); VdbeCoverage(v);
	106939	+ sqlite3VdbeAddOp2(v, OP_DecrJumpZero, p->iLimit, iBreak); VdbeCoverage(v);
106481	106940	}
106482	106941	}
106483	106942
106484	106943	/*
106485	106944	** Allocate a KeyInfo object sufficient for an index of N key columns and
		@@ -107328,11 +107787,11 @@
107328	107787	}
107329	107788	}else{
107330	107789	sqlite3ExprCode(pParse, p->pLimit, iLimit);
107331	107790	sqlite3VdbeAddOp1(v, OP_MustBeInt, iLimit); VdbeCoverage(v);
107332	107791	VdbeComment((v, "LIMIT counter"));
107333		- sqlite3VdbeAddOp2(v, OP_IfZero, iLimit, iBreak); VdbeCoverage(v);
	107792	+ sqlite3VdbeAddOp2(v, OP_IfNot, iLimit, iBreak); VdbeCoverage(v);
107334	107793	}
107335	107794	if( p->pOffset ){
107336	107795	p->iOffset = iOffset = ++pParse->nMem;
107337	107796	pParse->nMem++; /* Allocate an extra register for limit+offset */
107338	107797	sqlite3ExprCode(pParse, p->pOffset, iOffset);
		@@ -107547,11 +108006,11 @@
107547	108006	addrCont = sqlite3VdbeMakeLabel(v);
107548	108007	codeOffset(v, regOffset, addrCont);
107549	108008	selectInnerLoop(pParse, p, p->pEList, iCurrent,
107550	108009	0, 0, pDest, addrCont, addrBreak);
107551	108010	if( regLimit ){
107552		- sqlite3VdbeAddOp3(v, OP_IfZero, regLimit, addrBreak, -1);
	108011	+ sqlite3VdbeAddOp2(v, OP_DecrJumpZero, regLimit, addrBreak);
107553	108012	VdbeCoverage(v);
107554	108013	}
107555	108014	sqlite3VdbeResolveLabel(v, addrCont);
107556	108015
107557	108016	/* Execute the recursive SELECT taking the single row in Current as
		@@ -107772,11 +108231,11 @@
107772	108231	}
107773	108232	p->pPrior = 0;
107774	108233	p->iLimit = pPrior->iLimit;
107775	108234	p->iOffset = pPrior->iOffset;
107776	108235	if( p->iLimit ){
107777		- addr = sqlite3VdbeAddOp1(v, OP_IfZero, p->iLimit); VdbeCoverage(v);
	108236	+ addr = sqlite3VdbeAddOp1(v, OP_IfNot, p->iLimit); VdbeCoverage(v);
107778	108237	VdbeComment((v, "Jump ahead if LIMIT reached"));
107779	108238	}
107780	108239	explainSetInteger(iSub2, pParse->iNextSelectId);
107781	108240	rc = sqlite3Select(pParse, p, &dest);
107782	108241	testcase( rc!=SQLITE_OK );
		@@ -108173,11 +108632,11 @@
108173	108632	}
108174	108633
108175	108634	/* Jump to the end of the loop if the LIMIT is reached.
108176	108635	*/
108177	108636	if( p->iLimit ){
108178		- sqlite3VdbeAddOp3(v, OP_IfZero, p->iLimit, iBreak, -1); VdbeCoverage(v);
	108637	+ sqlite3VdbeAddOp2(v, OP_DecrJumpZero, p->iLimit, iBreak); VdbeCoverage(v);
108179	108638	}
108180	108639
108181	108640	/* Generate the subroutine return
108182	108641	*/
108183	108642	sqlite3VdbeResolveLabel(v, iContinue);
		@@ -109540,11 +109999,11 @@
109540	109999	sqlite3WalkSelect(pWalker, bMayRecursive ? pSel->pPrior : pSel);
109541	110000
109542	110001	for(pLeft=pSel; pLeft->pPrior; pLeft=pLeft->pPrior);
109543	110002	pEList = pLeft->pEList;
109544	110003	if( pCte->pCols ){
109545		- if( pEList->nExpr!=pCte->pCols->nExpr ){
	110004	+ if( pEList && pEList->nExpr!=pCte->pCols->nExpr ){
109546	110005	sqlite3ErrorMsg(pParse, "table %s has %d values for %d columns",
109547	110006	pCte->zName, pEList->nExpr, pCte->pCols->nExpr
109548	110007	);
109549	110008	pParse->pWith = pSavedWith;
109550	110009	return SQLITE_ERROR;
		@@ -113966,10 +114425,11 @@
113966	114425	*/
113967	114426	if( !db->init.busy ){
113968	114427	char *zStmt;
113969	114428	char *zWhere;
113970	114429	int iDb;
	114430	+ int iReg;
113971	114431	Vdbe *v;
113972	114432
113973	114433	/* Compute the complete text of the CREATE VIRTUAL TABLE statement */
113974	114434	if( pEnd ){
113975	114435	pParse->sNameToken.n = (int)(pEnd->z - pParse->sNameToken.z) + pEnd->n;
		@@ -114000,12 +114460,14 @@
114000	114460	sqlite3ChangeCookie(pParse, iDb);
114001	114461
114002	114462	sqlite3VdbeAddOp2(v, OP_Expire, 0, 0);
114003	114463	zWhere = sqlite3MPrintf(db, "name='%q' AND type='table'", pTab->zName);
114004	114464	sqlite3VdbeAddParseSchemaOp(v, iDb, zWhere);
114005		- sqlite3VdbeAddOp4(v, OP_VCreate, iDb, 0, 0,
114006		- pTab->zName, sqlite3Strlen30(pTab->zName) + 1);
	114465	+
	114466	+ iReg = ++pParse->nMem;
	114467	+ sqlite3VdbeAddOp4(v, OP_String8, 0, iReg, 0, pTab->zName, 0);
	114468	+ sqlite3VdbeAddOp2(v, OP_VCreate, iDb, iReg);
114007	114469	}
114008	114470
114009	114471	/* If we are rereading the sqlite_master table create the in-memory
114010	114472	** record of the table. The xConnect() method is not called until
114011	114473	** the first time the virtual table is used in an SQL statement. This
		@@ -114354,15 +114816,19 @@
114354	114816	int rc = SQLITE_OK;
114355	114817	Table *pTab;
114356	114818
114357	114819	pTab = sqlite3FindTable(db, zTab, db->aDb[iDb].zName);
114358	114820	if( ALWAYS(pTab!=0 && pTab->pVTable!=0) ){
114359		- VTable *p = vtabDisconnectAll(db, pTab);
114360		-
114361		- assert( rc==SQLITE_OK );
	114821	+ VTable *p;
	114822	+ for(p=pTab->pVTable; p; p=p->pNext){
	114823	+ assert( p->pVtab );
	114824	+ if( p->pVtab->nRef>0 ){
	114825	+ return SQLITE_LOCKED;
	114826	+ }
	114827	+ }
	114828	+ p = vtabDisconnectAll(db, pTab);
114362	114829	rc = p->pMod->pModule->xDestroy(p->pVtab);
114363		-
114364	114830	/* Remove the sqlite3_vtab* from the aVTrans[] array, if applicable */
114365	114831	if( rc==SQLITE_OK ){
114366	114832	assert( pTab->pVTable==p && p->pNext==0 );
114367	114833	p->pVtab = 0;
114368	114834	pTab->pVTable = 0;
		@@ -114787,10 +115253,12 @@
114787	115253	int addrNxt; /* Jump here to start the next IN combination */
114788	115254	int addrSkip; /* Jump here for next iteration of skip-scan */
114789	115255	int addrCont; /* Jump here to continue with the next loop cycle */
114790	115256	int addrFirst; /* First instruction of interior of the loop */
114791	115257	int addrBody; /* Beginning of the body of this loop */
	115258	+ int iLikeRepCntr; /* LIKE range processing counter register */
	115259	+ int addrLikeRep; /* LIKE range processing address */
114792	115260	u8 iFrom; /* Which entry in the FROM clause */
114793	115261	u8 op, p3, p5; /* Opcode, P3 & P5 of the opcode that ends the loop */
114794	115262	int p1, p2; /* Operands of the opcode used to ends the loop */
114795	115263	union { /* Information that depends on pWLoop->wsFlags */
114796	115264	struct {
		@@ -114971,11 +115439,11 @@
114971	115439	WhereOrInfo pOrInfo; / Extra information if (eOperator & WO_OR)!=0 */
114972	115440	WhereAndInfo pAndInfo; / Extra information if (eOperator& WO_AND)!=0 */
114973	115441	} u;
114974	115442	LogEst truthProb; /* Probability of truth for this expression */
114975	115443	u16 eOperator; /* A WO_xx value describing <op> */
114976		- u8 wtFlags; /* TERM_xxx bit flags. See below */
	115444	+ u16 wtFlags; /* TERM_xxx bit flags. See below */
114977	115445	u8 nChild; /* Number of children that must disable us */
114978	115446	WhereClause pWC; / The clause this term is part of */
114979	115447	Bitmask prereqRight; /* Bitmask of tables used by pExpr->pRight */
114980	115448	Bitmask prereqAll; /* Bitmask of tables referenced by pExpr */
114981	115449	};
		@@ -114993,10 +115461,13 @@
114993	115461	#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
114994	115462	# define TERM_VNULL 0x80 /* Manufactured x>NULL or x<=NULL term */
114995	115463	#else
114996	115464	# define TERM_VNULL 0x00 /* Disabled if not using stat3 */
114997	115465	#endif
	115466	+#define TERM_LIKEOPT 0x100 /* Virtual terms from the LIKE optimization */
	115467	+#define TERM_LIKECOND 0x200 /* Conditionally this LIKE operator term */
	115468	+#define TERM_LIKE 0x400 /* The original LIKE operator */
114998	115469
114999	115470	/*
115000	115471	** An instance of the WhereScan object is used as an iterator for locating
115001	115472	** terms in the WHERE clause that are useful to the query planner.
115002	115473	*/
		@@ -115368,11 +115839,11 @@
115368	115839	** WARNING: This routine might reallocate the space used to store
115369	115840	** WhereTerms. All pointers to WhereTerms should be invalidated after
115370	115841	** calling this routine. Such pointers may be reinitialized by referencing
115371	115842	** the pWC->a[] array.
115372	115843	*/
115373		-static int whereClauseInsert(WhereClause pWC, Expr p, u8 wtFlags){
	115844	+static int whereClauseInsert(WhereClause pWC, Expr p, u16 wtFlags){
115374	115845	WhereTerm *pTerm;
115375	115846	int idx;
115376	115847	testcase( wtFlags & TERM_VIRTUAL );
115377	115848	if( pWC->nTerm>=pWC->nSlot ){
115378	115849	WhereTerm *pOld = pWC->a;
		@@ -115793,11 +116264,15 @@
115793	116264	** Check to see if the given expression is a LIKE or GLOB operator that
115794	116265	** can be optimized using inequality constraints. Return TRUE if it is
115795	116266	** so and false if not.
115796	116267	**
115797	116268	** In order for the operator to be optimizible, the RHS must be a string
115798		-** literal that does not begin with a wildcard.
	116269	+** literal that does not begin with a wildcard. The LHS must be a column
	116270	+** that may only be NULL, a string, or a BLOB, never a number. (This means
	116271	+** that virtual tables cannot participate in the LIKE optimization.) If the
	116272	+** collating sequence for the column on the LHS must be appropriate for
	116273	+** the operator.
115799	116274	*/
115800	116275	static int isLikeOrGlob(
115801	116276	Parse pParse, / Parsing and code generating context */
115802	116277	Expr pExpr, / Test this expression */
115803	116278	Expr *ppPrefix, / Pointer to TK_STRING expression with pattern prefix */
		@@ -115822,11 +116297,11 @@
115822	116297	#endif
115823	116298	pList = pExpr->x.pList;
115824	116299	pLeft = pList->a[1].pExpr;
115825	116300	if( pLeft->op!=TK_COLUMN
115826	116301	\|\| sqlite3ExprAffinity(pLeft)!=SQLITE_AFF_TEXT
115827		- \|\| IsVirtual(pLeft->pTab)
	116302	+ \|\| IsVirtual(pLeft->pTab) /* Value might be numeric */
115828	116303	){
115829	116304	/* IMP: R-02065-49465 The left-hand side of the LIKE or GLOB operator must
115830	116305	** be the name of an indexed column with TEXT affinity. */
115831	116306	return 0;
115832	116307	}
		@@ -115931,10 +116406,83 @@
115931	116406	static void markTermAsChild(WhereClause *pWC, int iChild, int iParent){
115932	116407	pWC->a[iChild].iParent = iParent;
115933	116408	pWC->a[iChild].truthProb = pWC->a[iParent].truthProb;
115934	116409	pWC->a[iParent].nChild++;
115935	116410	}
	116411	+
	116412	+/*
	116413	+** Return the N-th AND-connected subterm of pTerm. Or if pTerm is not
	116414	+** a conjunction, then return just pTerm when N==0. If N is exceeds
	116415	+** the number of available subterms, return NULL.
	116416	+*/
	116417	+static WhereTerm whereNthSubterm(WhereTerm pTerm, int N){
	116418	+ if( pTerm->eOperator!=WO_AND ){
	116419	+ return N==0 ? pTerm : 0;
	116420	+ }
	116421	+ if( N<pTerm->u.pAndInfo->wc.nTerm ){
	116422	+ return &pTerm->u.pAndInfo->wc.a[N];
	116423	+ }
	116424	+ return 0;
	116425	+}
	116426	+
	116427	+/*
	116428	+** Subterms pOne and pTwo are contained within WHERE clause pWC. The
	116429	+** two subterms are in disjunction - they are OR-ed together.
	116430	+**
	116431	+** If these two terms are both of the form: "A op B" with the same
	116432	+** A and B values but different operators and if the operators are
	116433	+** compatible (if one is = and the other is <, for example) then
	116434	+** add a new virtual AND term to pWC that is the combination of the
	116435	+** two.
	116436	+**
	116437	+** Some examples:
	116438	+**
	116439	+** x<y OR x=y --> x<=y
	116440	+** x=y OR x=y --> x=y
	116441	+** x<=y OR x<y --> x<=y
	116442	+**
	116443	+** The following is NOT generated:
	116444	+**
	116445	+** x<y OR x>y --> x!=y
	116446	+*/
	116447	+static void whereCombineDisjuncts(
	116448	+ SrcList pSrc, / the FROM clause */
	116449	+ WhereClause pWC, / The complete WHERE clause */
	116450	+ WhereTerm pOne, / First disjunct */
	116451	+ WhereTerm pTwo / Second disjunct */
	116452	+){
	116453	+ u16 eOp = pOne->eOperator \| pTwo->eOperator;
	116454	+ sqlite3 db; / Database connection (for malloc) */
	116455	+ Expr pNew; / New virtual expression */
	116456	+ int op; /* Operator for the combined expression */
	116457	+ int idxNew; /* Index in pWC of the next virtual term */
	116458	+
	116459	+ if( (pOne->eOperator & (WO_EQ\|WO_LT\|WO_LE\|WO_GT\|WO_GE))==0 ) return;
	116460	+ if( (pTwo->eOperator & (WO_EQ\|WO_LT\|WO_LE\|WO_GT\|WO_GE))==0 ) return;
	116461	+ if( (eOp & (WO_EQ\|WO_LT\|WO_LE))!=eOp
	116462	+ && (eOp & (WO_EQ\|WO_GT\|WO_GE))!=eOp ) return;
	116463	+ assert( pOne->pExpr->pLeft!=0 && pOne->pExpr->pRight!=0 );
	116464	+ assert( pTwo->pExpr->pLeft!=0 && pTwo->pExpr->pRight!=0 );
	116465	+ if( sqlite3ExprCompare(pOne->pExpr->pLeft, pTwo->pExpr->pLeft, -1) ) return;
	116466	+ if( sqlite3ExprCompare(pOne->pExpr->pRight, pTwo->pExpr->pRight, -1) )return;
	116467	+ /* If we reach this point, it means the two subterms can be combined */
	116468	+ if( (eOp & (eOp-1))!=0 ){
	116469	+ if( eOp & (WO_LT\|WO_LE) ){
	116470	+ eOp = WO_LE;
	116471	+ }else{
	116472	+ assert( eOp & (WO_GT\|WO_GE) );
	116473	+ eOp = WO_GE;
	116474	+ }
	116475	+ }
	116476	+ db = pWC->pWInfo->pParse->db;
	116477	+ pNew = sqlite3ExprDup(db, pOne->pExpr, 0);
	116478	+ if( pNew==0 ) return;
	116479	+ for(op=TK_EQ; eOp!=(WO_EQ<<(op-TK_EQ)); op++){ assert( op<TK_GE ); }
	116480	+ pNew->op = op;
	116481	+ idxNew = whereClauseInsert(pWC, pNew, TERM_VIRTUAL\|TERM_DYNAMIC);
	116482	+ exprAnalyze(pSrc, pWC, idxNew);
	116483	+}
115936	116484
115937	116485	#if !defined(SQLITE_OMIT_OR_OPTIMIZATION) && !defined(SQLITE_OMIT_SUBQUERY)
115938	116486	/*
115939	116487	** Analyze a term that consists of two or more OR-connected
115940	116488	** subterms. So in:
		@@ -115956,10 +116504,11 @@
115956	116504	** (A) t1.x=t2.y OR t1.x=t2.z OR t1.y=15 OR t1.z=t3.a+5
115957	116505	** (B) x=expr1 OR expr2=x OR x=expr3
115958	116506	** (C) t1.x=t2.y OR (t1.x=t2.z AND t1.y=15)
115959	116507	** (D) x=expr1 OR (y>11 AND y<22 AND z LIKE 'hello')
115960	116508	** (E) (p.a=1 AND q.b=2 AND r.c=3) OR (p.x=4 AND q.y=5 AND r.z=6)
	116509	+** (F) x>A OR (x=A AND y>=B)
115961	116510	**
115962	116511	** CASE 1:
115963	116512	**
115964	116513	** If all subterms are of the form T.C=expr for some single column of C and
115965	116514	** a single table T (as shown in example B above) then create a new virtual
		@@ -115971,10 +116520,20 @@
115971	116520	** then create a new virtual term like this:
115972	116521	**
115973	116522	** x IN (expr1,expr2,expr3)
115974	116523	**
115975	116524	** CASE 2:
	116525	+**
	116526	+** If there are exactly two disjuncts one side has x>A and the other side
	116527	+** has x=A (for the same x and A) then add a new virtual conjunct term to the
	116528	+** WHERE clause of the form "x>=A". Example:
	116529	+**
	116530	+** x>A OR (x=A AND y>B) adds: x>=A
	116531	+**
	116532	+** The added conjunct can sometimes be helpful in query planning.
	116533	+**
	116534	+** CASE 3:
115976	116535	**
115977	116536	** If all subterms are indexable by a single table T, then set
115978	116537	**
115979	116538	** WhereTerm.eOperator = WO_OR
115980	116539	** WhereTerm.u.pOrInfo->indexable \|= the cursor number for table T
		@@ -116098,15 +116657,29 @@
116098	116657	}
116099	116658	}
116100	116659	}
116101	116660
116102	116661	/*
116103		- ** Record the set of tables that satisfy case 2. The set might be
	116662	+ ** Record the set of tables that satisfy case 3. The set might be
116104	116663	** empty.
116105	116664	*/
116106	116665	pOrInfo->indexable = indexable;
116107	116666	pTerm->eOperator = indexable==0 ? 0 : WO_OR;
	116667	+
	116668	+ /* For a two-way OR, attempt to implementation case 2.
	116669	+ */
	116670	+ if( indexable && pOrWc->nTerm==2 ){
	116671	+ int iOne = 0;
	116672	+ WhereTerm *pOne;
	116673	+ while( (pOne = whereNthSubterm(&pOrWc->a[0],iOne++))!=0 ){
	116674	+ int iTwo = 0;
	116675	+ WhereTerm *pTwo;
	116676	+ while( (pTwo = whereNthSubterm(&pOrWc->a[1],iTwo++))!=0 ){
	116677	+ whereCombineDisjuncts(pSrc, pWC, pOne, pTwo);
	116678	+ }
	116679	+ }
	116680	+ }
116108	116681
116109	116682	/*
116110	116683	** chngToIN holds a set of tables that might satisfy case 1. But
116111	116684	** we have to do some additional checking to see if case 1 really
116112	116685	** is satisfied.
		@@ -116233,11 +116806,11 @@
116233	116806	pTerm = &pWC->a[idxTerm];
116234	116807	markTermAsChild(pWC, idxNew, idxTerm);
116235	116808	}else{
116236	116809	sqlite3ExprListDelete(db, pList);
116237	116810	}
116238		- pTerm->eOperator = WO_NOOP; /* case 1 trumps case 2 */
	116811	+ pTerm->eOperator = WO_NOOP; /* case 1 trumps case 3 */
116239	116812	}
116240	116813	}
116241	116814	}
116242	116815	#endif /* !SQLITE_OMIT_OR_OPTIMIZATION && !SQLITE_OMIT_SUBQUERY */
116243	116816
		@@ -116271,11 +116844,11 @@
116271	116844	Bitmask prereqLeft; /* Prerequesites of the pExpr->pLeft */
116272	116845	Bitmask prereqAll; /* Prerequesites of pExpr */
116273	116846	Bitmask extraRight = 0; /* Extra dependencies on LEFT JOIN */
116274	116847	Expr pStr1 = 0; / RHS of LIKE/GLOB operator */
116275	116848	int isComplete = 0; /* RHS of LIKE/GLOB ends with wildcard */
116276		- int noCase = 0; /* LIKE/GLOB distinguishes case */
	116849	+ int noCase = 0; /* uppercase equivalent to lowercase */
116277	116850	int op; /* Top-level operator. pExpr->op */
116278	116851	Parse pParse = pWInfo->pParse; / Parsing context */
116279	116852	sqlite3 db = pParse->db; / Database connection */
116280	116853
116281	116854	if( db->mallocFailed ){
		@@ -116409,16 +116982,19 @@
116409	116982
116410	116983	#ifndef SQLITE_OMIT_LIKE_OPTIMIZATION
116411	116984	/* Add constraints to reduce the search space on a LIKE or GLOB
116412	116985	** operator.
116413	116986	**
116414		- ** A like pattern of the form "x LIKE 'abc%'" is changed into constraints
	116987	+ ** A like pattern of the form "x LIKE 'aBc%'" is changed into constraints
116415	116988	**
116416		- ** x>='abc' AND x<'abd' AND x LIKE 'abc%'
	116989	+ ** x>='ABC' AND x<'abd' AND x LIKE 'aBc%'
116417	116990	**
116418	116991	** The last character of the prefix "abc" is incremented to form the
116419		- ** termination condition "abd".
	116992	+ ** termination condition "abd". If case is not significant (the default
	116993	+ ** for LIKE) then the lower-bound is made all uppercase and the upper-
	116994	+ ** bound is made all lowercase so that the bounds also work when comparing
	116995	+ ** BLOBs.
116420	116996	*/
116421	116997	if( pWC->op==TK_AND
116422	116998	&& isLikeOrGlob(pParse, pExpr, &pStr1, &isComplete, &noCase)
116423	116999	){
116424	117000	Expr pLeft; / LHS of LIKE/GLOB operator */
		@@ -116425,14 +117001,30 @@
116425	117001	Expr pStr2; / Copy of pStr1 - RHS of LIKE/GLOB operator */
116426	117002	Expr *pNewExpr1;
116427	117003	Expr *pNewExpr2;
116428	117004	int idxNew1;
116429	117005	int idxNew2;
116430		- Token sCollSeqName; /* Name of collating sequence */
	117006	+ const char zCollSeqName; / Name of collating sequence */
	117007	+ const u16 wtFlags = TERM_LIKEOPT \| TERM_VIRTUAL \| TERM_DYNAMIC;
116431	117008
116432	117009	pLeft = pExpr->x.pList->a[1].pExpr;
116433	117010	pStr2 = sqlite3ExprDup(db, pStr1, 0);
	117011	+
	117012	+ /* Convert the lower bound to upper-case and the upper bound to
	117013	+ ** lower-case (upper-case is less than lower-case in ASCII) so that
	117014	+ ** the range constraints also work for BLOBs
	117015	+ */
	117016	+ if( noCase && !pParse->db->mallocFailed ){
	117017	+ int i;
	117018	+ char c;
	117019	+ pTerm->wtFlags \|= TERM_LIKE;
	117020	+ for(i=0; (c = pStr1->u.zToken[i])!=0; i++){
	117021	+ pStr1->u.zToken[i] = sqlite3Toupper(c);
	117022	+ pStr2->u.zToken[i] = sqlite3Tolower(c);
	117023	+ }
	117024	+ }
	117025	+
116434	117026	if( !db->mallocFailed ){
116435	117027	u8 c, pC; / Last character before the first wildcard */
116436	117028	pC = (u8*)&pStr2->u.zToken[sqlite3Strlen30(pStr2->u.zToken)-1];
116437	117029	c = *pC;
116438	117030	if( noCase ){
		@@ -116445,26 +117037,25 @@
116445	117037	if( c=='A'-1 ) isComplete = 0;
116446	117038	c = sqlite3UpperToLower[c];
116447	117039	}
116448	117040	*pC = c + 1;
116449	117041	}
116450		- sCollSeqName.z = noCase ? "NOCASE" : "BINARY";
116451		- sCollSeqName.n = 6;
	117042	+ zCollSeqName = noCase ? "NOCASE" : "BINARY";
116452	117043	pNewExpr1 = sqlite3ExprDup(db, pLeft, 0);
116453		- pNewExpr1 = sqlite3PExpr(pParse, TK_GE,
116454		- sqlite3ExprAddCollateToken(pParse,pNewExpr1,&sCollSeqName),
	117044	+ pNewExpr1 = sqlite3PExpr(pParse, TK_GE,
	117045	+ sqlite3ExprAddCollateString(pParse,pNewExpr1,zCollSeqName),
116455	117046	pStr1, 0);
116456	117047	transferJoinMarkings(pNewExpr1, pExpr);
116457		- idxNew1 = whereClauseInsert(pWC, pNewExpr1, TERM_VIRTUAL\|TERM_DYNAMIC);
	117048	+ idxNew1 = whereClauseInsert(pWC, pNewExpr1, wtFlags);
116458	117049	testcase( idxNew1==0 );
116459	117050	exprAnalyze(pSrc, pWC, idxNew1);
116460	117051	pNewExpr2 = sqlite3ExprDup(db, pLeft, 0);
116461	117052	pNewExpr2 = sqlite3PExpr(pParse, TK_LT,
116462		- sqlite3ExprAddCollateToken(pParse,pNewExpr2,&sCollSeqName),
	117053	+ sqlite3ExprAddCollateString(pParse,pNewExpr2,zCollSeqName),
116463	117054	pStr2, 0);
116464	117055	transferJoinMarkings(pNewExpr2, pExpr);
116465		- idxNew2 = whereClauseInsert(pWC, pNewExpr2, TERM_VIRTUAL\|TERM_DYNAMIC);
	117056	+ idxNew2 = whereClauseInsert(pWC, pNewExpr2, wtFlags);
116466	117057	testcase( idxNew2==0 );
116467	117058	exprAnalyze(pSrc, pWC, idxNew2);
116468	117059	pTerm = &pWC->a[idxTerm];
116469	117060	if( isComplete ){
116470	117061	markTermAsChild(pWC, idxNew1, idxTerm);
		@@ -117074,15 +117665,18 @@
117074	117665	#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
117075	117666	/*
117076	117667	** Estimate the location of a particular key among all keys in an
117077	117668	** index. Store the results in aStat as follows:
117078	117669	**
117079		-** aStat[0] Est. number of rows less than pVal
117080		-** aStat[1] Est. number of rows equal to pVal
	117670	+** aStat[0] Est. number of rows less than pRec
	117671	+** aStat[1] Est. number of rows equal to pRec
117081	117672	**
117082	117673	** Return the index of the sample that is the smallest sample that
117083		-** is greater than or equal to pRec.
	117674	+** is greater than or equal to pRec. Note that this index is not an index
	117675	+** into the aSample[] array - it is an index into a virtual set of samples
	117676	+** based on the contents of aSample[] and the number of fields in record
	117677	+** pRec.
117084	117678	*/
117085	117679	static int whereKeyStats(
117086	117680	Parse pParse, / Database connection */
117087	117681	Index pIdx, / Index to consider domain of */
117088	117682	UnpackedRecord pRec, / Vector of values to consider */
		@@ -117089,71 +117683,162 @@
117089	117683	int roundUp, /* Round up if true. Round down if false */
117090	117684	tRowcnt aStat / OUT: stats written here */
117091	117685	){
117092	117686	IndexSample *aSample = pIdx->aSample;
117093	117687	int iCol; /* Index of required stats in anEq[] etc. */
	117688	+ int i; /* Index of first sample >= pRec */
	117689	+ int iSample; /* Smallest sample larger than or equal to pRec */
117094	117690	int iMin = 0; /* Smallest sample not yet tested */
117095		- int i = pIdx->nSample; /* Smallest sample larger than or equal to pRec */
117096	117691	int iTest; /* Next sample to test */
117097	117692	int res; /* Result of comparison operation */
	117693	+ int nField; /* Number of fields in pRec */
	117694	+ tRowcnt iLower = 0; /* anLt[] + anEq[] of largest sample pRec is > */
117098	117695
117099	117696	#ifndef SQLITE_DEBUG
117100	117697	UNUSED_PARAMETER( pParse );
117101	117698	#endif
117102	117699	assert( pRec!=0 );
117103		- iCol = pRec->nField - 1;
117104	117700	assert( pIdx->nSample>0 );
117105		- assert( pRec->nField>0 && iCol<pIdx->nSampleCol );
	117701	+ assert( pRec->nField>0 && pRec->nField<=pIdx->nSampleCol );
	117702	+
	117703	+ /* Do a binary search to find the first sample greater than or equal
	117704	+ ** to pRec. If pRec contains a single field, the set of samples to search
	117705	+ ** is simply the aSample[] array. If the samples in aSample[] contain more
	117706	+ ** than one fields, all fields following the first are ignored.
	117707	+ **
	117708	+ ** If pRec contains N fields, where N is more than one, then as well as the
	117709	+ ** samples in aSample[] (truncated to N fields), the search also has to
	117710	+ ** consider prefixes of those samples. For example, if the set of samples
	117711	+ ** in aSample is:
	117712	+ **
	117713	+ ** aSample[0] = (a, 5)
	117714	+ ** aSample[1] = (a, 10)
	117715	+ ** aSample[2] = (b, 5)
	117716	+ ** aSample[3] = (c, 100)
	117717	+ ** aSample[4] = (c, 105)
	117718	+ **
	117719	+ ** Then the search space should ideally be the samples above and the
	117720	+ ** unique prefixes [a], [b] and [c]. But since that is hard to organize,
	117721	+ ** the code actually searches this set:
	117722	+ **
	117723	+ ** 0: (a)
	117724	+ ** 1: (a, 5)
	117725	+ ** 2: (a, 10)
	117726	+ ** 3: (a, 10)
	117727	+ ** 4: (b)
	117728	+ ** 5: (b, 5)
	117729	+ ** 6: (c)
	117730	+ ** 7: (c, 100)
	117731	+ ** 8: (c, 105)
	117732	+ ** 9: (c, 105)
	117733	+ **
	117734	+ ** For each sample in the aSample[] array, N samples are present in the
	117735	+ ** effective sample array. In the above, samples 0 and 1 are based on
	117736	+ ** sample aSample[0]. Samples 2 and 3 on aSample[1] etc.
	117737	+ **
	117738	+ ** Often, sample i of each block of N effective samples has (i+1) fields.
	117739	+ ** Except, each sample may be extended to ensure that it is greater than or
	117740	+ ** equal to the previous sample in the array. For example, in the above,
	117741	+ ** sample 2 is the first sample of a block of N samples, so at first it
	117742	+ ** appears that it should be 1 field in size. However, that would make it
	117743	+ ** smaller than sample 1, so the binary search would not work. As a result,
	117744	+ ** it is extended to two fields. The duplicates that this creates do not
	117745	+ ** cause any problems.
	117746	+ */
	117747	+ nField = pRec->nField;
	117748	+ iCol = 0;
	117749	+ iSample = pIdx->nSample * nField;
117106	117750	do{
117107		- iTest = (iMin+i)/2;
117108		- res = sqlite3VdbeRecordCompare(aSample[iTest].n, aSample[iTest].p, pRec);
	117751	+ int iSamp; /* Index in aSample[] of test sample */
	117752	+ int n; /* Number of fields in test sample */
	117753	+
	117754	+ iTest = (iMin+iSample)/2;
	117755	+ iSamp = iTest / nField;
	117756	+ if( iSamp>0 ){
	117757	+ /* The proposed effective sample is a prefix of sample aSample[iSamp].
	117758	+ ** Specifically, the shortest prefix of at least (1 + iTest%nField)
	117759	+ ** fields that is greater than the previous effective sample. */
	117760	+ for(n=(iTest % nField) + 1; n<nField; n++){
	117761	+ if( aSample[iSamp-1].anLt[n-1]!=aSample[iSamp].anLt[n-1] ) break;
	117762	+ }
	117763	+ }else{
	117764	+ n = iTest + 1;
	117765	+ }
	117766	+
	117767	+ pRec->nField = n;
	117768	+ res = sqlite3VdbeRecordCompare(aSample[iSamp].n, aSample[iSamp].p, pRec);
117109	117769	if( res<0 ){
	117770	+ iLower = aSample[iSamp].anLt[n-1] + aSample[iSamp].anEq[n-1];
	117771	+ iMin = iTest+1;
	117772	+ }else if( res==0 && n<nField ){
	117773	+ iLower = aSample[iSamp].anLt[n-1];
117110	117774	iMin = iTest+1;
	117775	+ res = -1;
117111	117776	}else{
117112		- i = iTest;
	117777	+ iSample = iTest;
	117778	+ iCol = n-1;
117113	117779	}
117114		- }while( res && iMin<i );
	117780	+ }while( res && iMin<iSample );
	117781	+ i = iSample / nField;
117115	117782
117116	117783	#ifdef SQLITE_DEBUG
117117	117784	/* The following assert statements check that the binary search code
117118	117785	** above found the right answer. This block serves no purpose other
117119	117786	** than to invoke the asserts. */
117120		- if( res==0 ){
117121		- /* If (res==0) is true, then sample $i must be equal to pRec */
117122		- assert( i<pIdx->nSample );
117123		- assert( 0==sqlite3VdbeRecordCompare(aSample[i].n, aSample[i].p, pRec)
117124		- \|\| pParse->db->mallocFailed );
117125		- }else{
117126		- /* Otherwise, pRec must be smaller than sample $i and larger than
117127		- ** sample ($i-1). */
117128		- assert( i==pIdx->nSample
117129		- \|\| sqlite3VdbeRecordCompare(aSample[i].n, aSample[i].p, pRec)>0
117130		- \|\| pParse->db->mallocFailed );
117131		- assert( i==0
117132		- \|\| sqlite3VdbeRecordCompare(aSample[i-1].n, aSample[i-1].p, pRec)<0
117133		- \|\| pParse->db->mallocFailed );
	117787	+ if( pParse->db->mallocFailed==0 ){
	117788	+ if( res==0 ){
	117789	+ /* If (res==0) is true, then pRec must be equal to sample i. */
	117790	+ assert( i<pIdx->nSample );
	117791	+ assert( iCol==nField-1 );
	117792	+ pRec->nField = nField;
	117793	+ assert( 0==sqlite3VdbeRecordCompare(aSample[i].n, aSample[i].p, pRec)
	117794	+ \|\| pParse->db->mallocFailed
	117795	+ );
	117796	+ }else{
	117797	+ /* Unless i==pIdx->nSample, indicating that pRec is larger than
	117798	+ ** all samples in the aSample[] array, pRec must be smaller than the
	117799	+ ** (iCol+1) field prefix of sample i. */
	117800	+ assert( i<=pIdx->nSample && i>=0 );
	117801	+ pRec->nField = iCol+1;
	117802	+ assert( i==pIdx->nSample
	117803	+ \|\| sqlite3VdbeRecordCompare(aSample[i].n, aSample[i].p, pRec)>0
	117804	+ \|\| pParse->db->mallocFailed );
	117805	+
	117806	+ /* if i==0 and iCol==0, then record pRec is smaller than all samples
	117807	+ ** in the aSample[] array. Otherwise, if (iCol>0) then pRec must
	117808	+ ** be greater than or equal to the (iCol) field prefix of sample i.
	117809	+ ** If (i>0), then pRec must also be greater than sample (i-1). */
	117810	+ if( iCol>0 ){
	117811	+ pRec->nField = iCol;
	117812	+ assert( sqlite3VdbeRecordCompare(aSample[i].n, aSample[i].p, pRec)<=0
	117813	+ \|\| pParse->db->mallocFailed );
	117814	+ }
	117815	+ if( i>0 ){
	117816	+ pRec->nField = nField;
	117817	+ assert( sqlite3VdbeRecordCompare(aSample[i-1].n, aSample[i-1].p, pRec)<0
	117818	+ \|\| pParse->db->mallocFailed );
	117819	+ }
	117820	+ }
117134	117821	}
117135	117822	#endif /* ifdef SQLITE_DEBUG */
117136	117823
117137		- /* At this point, aSample[i] is the first sample that is greater than
117138		- ** or equal to pVal. Or if i==pIdx->nSample, then all samples are less
117139		- ** than pVal. If aSample[i]==pVal, then res==0.
117140		- */
117141	117824	if( res==0 ){
	117825	+ /* Record pRec is equal to sample i */
	117826	+ assert( iCol==nField-1 );
117142	117827	aStat[0] = aSample[i].anLt[iCol];
117143	117828	aStat[1] = aSample[i].anEq[iCol];
117144	117829	}else{
117145		- tRowcnt iLower, iUpper, iGap;
117146		- if( i==0 ){
117147		- iLower = 0;
117148		- iUpper = aSample[0].anLt[iCol];
	117830	+ /* At this point, the (iCol+1) field prefix of aSample[i] is the first
	117831	+ ** sample that is greater than pRec. Or, if i==pIdx->nSample then pRec
	117832	+ ** is larger than all samples in the array. */
	117833	+ tRowcnt iUpper, iGap;
	117834	+ if( i>=pIdx->nSample ){
	117835	+ iUpper = sqlite3LogEstToInt(pIdx->aiRowLogEst[0]);
117149	117836	}else{
117150		- i64 nRow0 = sqlite3LogEstToInt(pIdx->aiRowLogEst[0]);
117151		- iUpper = i>=pIdx->nSample ? nRow0 : aSample[i].anLt[iCol];
117152		- iLower = aSample[i-1].anEq[iCol] + aSample[i-1].anLt[iCol];
	117837	+ iUpper = aSample[i].anLt[iCol];
117153	117838	}
117154		- aStat[1] = pIdx->aAvgEq[iCol];
	117839	+
117155	117840	if( iLower>=iUpper ){
117156	117841	iGap = 0;
117157	117842	}else{
117158	117843	iGap = iUpper - iLower;
117159	117844	}
		@@ -117161,11 +117846,15 @@
117161	117846	iGap = (iGap*2)/3;
117162	117847	}else{
117163	117848	iGap = iGap/3;
117164	117849	}
117165	117850	aStat[0] = iLower + iGap;
	117851	+ aStat[1] = pIdx->aAvgEq[iCol];
117166	117852	}
	117853	+
	117854	+ /* Restore the pRec->nField value before returning. */
	117855	+ pRec->nField = nField;
117167	117856	return i;
117168	117857	}
117169	117858	#endif /* SQLITE_ENABLE_STAT3_OR_STAT4 */
117170	117859
117171	117860	/*
		@@ -117635,24 +118324,47 @@
117635	118324	** by indices, we disable them to prevent redundant tests in the inner
117636	118325	** loop. We would get the correct results if nothing were ever disabled,
117637	118326	** but joins might run a little slower. The trick is to disable as much
117638	118327	** as we can without disabling too much. If we disabled in (1), we'd get
117639	118328	** the wrong answer. See ticket #813.
	118329	+**
	118330	+** If all the children of a term are disabled, then that term is also
	118331	+** automatically disabled. In this way, terms get disabled if derived
	118332	+** virtual terms are tested first. For example:
	118333	+**
	118334	+** x GLOB 'abc*' AND x>='abc' AND x<'acd'
	118335	+** \___________/ \______/ \_____/
	118336	+** parent child1 child2
	118337	+**
	118338	+** Only the parent term was in the original WHERE clause. The child1
	118339	+** and child2 terms were added by the LIKE optimization. If both of
	118340	+** the virtual child terms are valid, then testing of the parent can be
	118341	+** skipped.
	118342	+**
	118343	+** Usually the parent term is marked as TERM_CODED. But if the parent
	118344	+** term was originally TERM_LIKE, then the parent gets TERM_LIKECOND instead.
	118345	+** The TERM_LIKECOND marking indicates that the term should be coded inside
	118346	+** a conditional such that is only evaluated on the second pass of a
	118347	+** LIKE-optimization loop, when scanning BLOBs instead of strings.
117640	118348	*/
117641	118349	static void disableTerm(WhereLevel pLevel, WhereTerm pTerm){
117642		- if( pTerm
	118350	+ int nLoop = 0;
	118351	+ while( pTerm
117643	118352	&& (pTerm->wtFlags & TERM_CODED)==0
117644	118353	&& (pLevel->iLeftJoin==0 \|\| ExprHasProperty(pTerm->pExpr, EP_FromJoin))
117645	118354	&& (pLevel->notReady & pTerm->prereqAll)==0
117646	118355	){
117647		- pTerm->wtFlags \|= TERM_CODED;
117648		- if( pTerm->iParent>=0 ){
117649		- WhereTerm *pOther = &pTerm->pWC->a[pTerm->iParent];
117650		- if( (--pOther->nChild)==0 ){
117651		- disableTerm(pLevel, pOther);
117652		- }
	118356	+ if( nLoop && (pTerm->wtFlags & TERM_LIKE)!=0 ){
	118357	+ pTerm->wtFlags \|= TERM_LIKECOND;
	118358	+ }else{
	118359	+ pTerm->wtFlags \|= TERM_CODED;
117653	118360	}
	118361	+ if( pTerm->iParent<0 ) break;
	118362	+ pTerm = &pTerm->pWC->a[pTerm->iParent];
	118363	+ pTerm->nChild--;
	118364	+ if( pTerm->nChild!=0 ) break;
	118365	+ nLoop++;
117654	118366	}
117655	118367	}
117656	118368
117657	118369	/*
117658	118370	** Code an OP_Affinity opcode to apply the column affinity string zAff
		@@ -118132,11 +118844,38 @@
118132	118844	}
118133	118845	#else
118134	118846	# define addScanStatus(a, b, c, d) ((void)d)
118135	118847	#endif
118136	118848
118137		-
	118849	+/*
	118850	+** If the most recently coded instruction is a constant range contraint
	118851	+** that originated from the LIKE optimization, then change the P3 to be
	118852	+** pLoop->iLikeRepCntr and set P5.
	118853	+**
	118854	+** The LIKE optimization trys to evaluate "x LIKE 'abc%'" as a range
	118855	+** expression: "x>='ABC' AND x<'abd'". But this requires that the range
	118856	+** scan loop run twice, once for strings and a second time for BLOBs.
	118857	+** The OP_String opcodes on the second pass convert the upper and lower
	118858	+** bound string contants to blobs. This routine makes the necessary changes
	118859	+** to the OP_String opcodes for that to happen.
	118860	+*/
	118861	+static void whereLikeOptimizationStringFixup(
	118862	+ Vdbe v, / prepared statement under construction */
	118863	+ WhereLevel pLevel, / The loop that contains the LIKE operator */
	118864	+ WhereTerm pTerm / The upper or lower bound just coded */
	118865	+){
	118866	+ if( pTerm->wtFlags & TERM_LIKEOPT ){
	118867	+ VdbeOp *pOp;
	118868	+ assert( pLevel->iLikeRepCntr>0 );
	118869	+ pOp = sqlite3VdbeGetOp(v, -1);
	118870	+ assert( pOp!=0 );
	118871	+ assert( pOp->opcode==OP_String8
	118872	+ \|\| pTerm->pWC->pWInfo->pParse->db->mallocFailed );
	118873	+ pOp->p3 = pLevel->iLikeRepCntr;
	118874	+ pOp->p5 = 1;
	118875	+ }
	118876	+}
118138	118877
118139	118878	/*
118140	118879	** Generate code for the start of the iLevel-th loop in the WHERE clause
118141	118880	** implementation described by pWInfo.
118142	118881	*/
		@@ -118462,14 +119201,29 @@
118462	119201	*/
118463	119202	j = nEq;
118464	119203	if( pLoop->wsFlags & WHERE_BTM_LIMIT ){
118465	119204	pRangeStart = pLoop->aLTerm[j++];
118466	119205	nExtraReg = 1;
	119206	+ /* Like optimization range constraints always occur in pairs */
	119207	+ assert( (pRangeStart->wtFlags & TERM_LIKEOPT)==0 \|\|
	119208	+ (pLoop->wsFlags & WHERE_TOP_LIMIT)!=0 );
118467	119209	}
118468	119210	if( pLoop->wsFlags & WHERE_TOP_LIMIT ){
118469	119211	pRangeEnd = pLoop->aLTerm[j++];
118470	119212	nExtraReg = 1;
	119213	+ if( (pRangeEnd->wtFlags & TERM_LIKEOPT)!=0 ){
	119214	+ assert( pRangeStart!=0 ); /* LIKE opt constraints */
	119215	+ assert( pRangeStart->wtFlags & TERM_LIKEOPT ); /* occur in pairs */
	119216	+ pLevel->iLikeRepCntr = ++pParse->nMem;
	119217	+ testcase( bRev );
	119218	+ testcase( pIdx->aSortOrder[nEq]==SQLITE_SO_DESC );
	119219	+ sqlite3VdbeAddOp2(v, OP_Integer,
	119220	+ bRev ^ (pIdx->aSortOrder[nEq]==SQLITE_SO_DESC),
	119221	+ pLevel->iLikeRepCntr);
	119222	+ VdbeComment((v, "LIKE loop counter"));
	119223	+ pLevel->addrLikeRep = sqlite3VdbeCurrentAddr(v);
	119224	+ }
118471	119225	if( pRangeStart==0
118472	119226	&& (j = pIdx->aiColumn[nEq])>=0
118473	119227	&& pIdx->pTable->aCol[j].notNull==0
118474	119228	){
118475	119229	bSeekPastNull = 1;
		@@ -118508,10 +119262,11 @@
118508	119262	/* Seek the index cursor to the start of the range. */
118509	119263	nConstraint = nEq;
118510	119264	if( pRangeStart ){
118511	119265	Expr *pRight = pRangeStart->pExpr->pRight;
118512	119266	sqlite3ExprCode(pParse, pRight, regBase+nEq);
	119267	+ whereLikeOptimizationStringFixup(v, pLevel, pRangeStart);
118513	119268	if( (pRangeStart->wtFlags & TERM_VNULL)==0
118514	119269	&& sqlite3ExprCanBeNull(pRight)
118515	119270	){
118516	119271	sqlite3VdbeAddOp2(v, OP_IsNull, regBase+nEq, addrNxt);
118517	119272	VdbeCoverage(v);
		@@ -118553,10 +119308,11 @@
118553	119308	nConstraint = nEq;
118554	119309	if( pRangeEnd ){
118555	119310	Expr *pRight = pRangeEnd->pExpr->pRight;
118556	119311	sqlite3ExprCacheRemove(pParse, regBase+nEq, 1);
118557	119312	sqlite3ExprCode(pParse, pRight, regBase+nEq);
	119313	+ whereLikeOptimizationStringFixup(v, pLevel, pRangeEnd);
118558	119314	if( (pRangeEnd->wtFlags & TERM_VNULL)==0
118559	119315	&& sqlite3ExprCanBeNull(pRight)
118560	119316	){
118561	119317	sqlite3VdbeAddOp2(v, OP_IsNull, regBase+nEq, addrNxt);
118562	119318	VdbeCoverage(v);
		@@ -118780,11 +119536,12 @@
118780	119536	** eliminating duplicates from other WHERE clauses, the action for each
118781	119537	** sub-WHERE clause is to to invoke the main loop body as a subroutine.
118782	119538	*/
118783	119539	wctrlFlags = WHERE_OMIT_OPEN_CLOSE
118784	119540	\| WHERE_FORCE_TABLE
118785		- \| WHERE_ONETABLE_ONLY;
	119541	+ \| WHERE_ONETABLE_ONLY
	119542	+ \| WHERE_NO_AUTOINDEX;
118786	119543	for(ii=0; ii<pOrWc->nTerm; ii++){
118787	119544	WhereTerm *pOrTerm = &pOrWc->a[ii];
118788	119545	if( pOrTerm->leftCursor==iCur \|\| (pOrTerm->eOperator & WO_AND)!=0 ){
118789	119546	WhereInfo pSubWInfo; / Info for single OR-term scan */
118790	119547	Expr pOrExpr = pOrTerm->pExpr; / Current OR clause term */
		@@ -118942,10 +119699,11 @@
118942	119699	/* Insert code to test every subexpression that can be completely
118943	119700	** computed using the current set of tables.
118944	119701	*/
118945	119702	for(pTerm=pWC->a, j=pWC->nTerm; j>0; j--, pTerm++){
118946	119703	Expr *pE;
	119704	+ int skipLikeAddr = 0;
118947	119705	testcase( pTerm->wtFlags & TERM_VIRTUAL );
118948	119706	testcase( pTerm->wtFlags & TERM_CODED );
118949	119707	if( pTerm->wtFlags & (TERM_VIRTUAL\|TERM_CODED) ) continue;
118950	119708	if( (pTerm->prereqAll & pLevel->notReady)!=0 ){
118951	119709	testcase( pWInfo->untestedTerms==0
		@@ -118955,12 +119713,18 @@
118955	119713	}
118956	119714	pE = pTerm->pExpr;
118957	119715	assert( pE!=0 );
118958	119716	if( pLevel->iLeftJoin && !ExprHasProperty(pE, EP_FromJoin) ){
118959	119717	continue;
	119718	+ }
	119719	+ if( pTerm->wtFlags & TERM_LIKECOND ){
	119720	+ assert( pLevel->iLikeRepCntr>0 );
	119721	+ skipLikeAddr = sqlite3VdbeAddOp1(v, OP_IfNot, pLevel->iLikeRepCntr);
	119722	+ VdbeCoverage(v);
118960	119723	}
118961	119724	sqlite3ExprIfFalse(pParse, pE, addrCont, SQLITE_JUMPIFNULL);
	119725	+ if( skipLikeAddr ) sqlite3VdbeJumpHere(v, skipLikeAddr);
118962	119726	pTerm->wtFlags \|= TERM_CODED;
118963	119727	}
118964	119728
118965	119729	/* Insert code to test for implied constraints based on transitivity
118966	119730	** of the "==" operator.
		@@ -119621,10 +120385,14 @@
119621	120385	){
119622	120386	continue; /* ignore IS [NOT] NULL constraints on NOT NULL columns */
119623	120387	}
119624	120388	if( pTerm->prereqRight & pNew->maskSelf ) continue;
119625	120389
	120390	+ /* Do not allow the upper bound of a LIKE optimization range constraint
	120391	+ ** to mix with a lower range bound from some other source */
	120392	+ if( pTerm->wtFlags & TERM_LIKEOPT && pTerm->eOperator==WO_LT ) continue;
	120393	+
119626	120394	pNew->wsFlags = saved_wsFlags;
119627	120395	pNew->u.btree.nEq = saved_nEq;
119628	120396	pNew->nLTerm = saved_nLTerm;
119629	120397	if( whereLoopResize(db, pNew, pNew->nLTerm+1) ) break; /* OOM */
119630	120398	pNew->aLTerm[pNew->nLTerm++] = pTerm;
		@@ -119664,10 +120432,21 @@
119664	120432	testcase( eOp & WO_GT );
119665	120433	testcase( eOp & WO_GE );
119666	120434	pNew->wsFlags \|= WHERE_COLUMN_RANGE\|WHERE_BTM_LIMIT;
119667	120435	pBtm = pTerm;
119668	120436	pTop = 0;
	120437	+ if( pTerm->wtFlags & TERM_LIKEOPT ){
	120438	+ /* Range contraints that come from the LIKE optimization are
	120439	+ ** always used in pairs. */
	120440	+ pTop = &pTerm[1];
	120441	+ assert( (pTop-(pTerm->pWC->a))<pTerm->pWC->nTerm );
	120442	+ assert( pTop->wtFlags & TERM_LIKEOPT );
	120443	+ assert( pTop->eOperator==WO_LT );
	120444	+ if( whereLoopResize(db, pNew, pNew->nLTerm+1) ) break; /* OOM */
	120445	+ pNew->aLTerm[pNew->nLTerm++] = pTop;
	120446	+ pNew->wsFlags \|= WHERE_TOP_LIMIT;
	120447	+ }
119669	120448	}else{
119670	120449	assert( eOp & (WO_LT\|WO_LE) );
119671	120450	testcase( eOp & WO_LT );
119672	120451	testcase( eOp & WO_LE );
119673	120452	pNew->wsFlags \|= WHERE_COLUMN_RANGE\|WHERE_TOP_LIMIT;
		@@ -119974,10 +120753,11 @@
119974	120753	rLogSize = estLog(rSize);
119975	120754
119976	120755	#ifndef SQLITE_OMIT_AUTOMATIC_INDEX
119977	120756	/* Automatic indexes */
119978	120757	if( !pBuilder->pOrSet
	120758	+ && (pWInfo->wctrlFlags & WHERE_NO_AUTOINDEX)==0
119979	120759	&& (pWInfo->pParse->db->flags & SQLITE_AutoIndex)!=0
119980	120760	&& pSrc->pIndex==0
119981	120761	&& !pSrc->viaCoroutine
119982	120762	&& !pSrc->notIndexed
119983	120763	&& HasRowid(pTab)
		@@ -120857,14 +121637,14 @@
120857	121637	assert( aSortCost==0 \|\| &pSpace[nSpace]==(char*)&aSortCost[nOrderBy] );
120858	121638	assert( aSortCost!=0 \|\| &pSpace[nSpace]==(char*)pX );
120859	121639
120860	121640	/* Seed the search with a single WherePath containing zero WhereLoops.
120861	121641	**
120862		- ** TUNING: Do not let the number of iterations go above 25. If the cost
120863		- ** of computing an automatic index is not paid back within the first 25
	121642	+ ** TUNING: Do not let the number of iterations go above 28. If the cost
	121643	+ ** of computing an automatic index is not paid back within the first 28
120864	121644	** rows, then do not use the automatic index. */
120865		- aFrom[0].nRow = MIN(pParse->nQueryLoop, 46); assert( 46==sqlite3LogEst(25) );
	121645	+ aFrom[0].nRow = MIN(pParse->nQueryLoop, 48); assert( 48==sqlite3LogEst(28) );
120866	121646	nFrom = 1;
120867	121647	assert( aFrom[0].isOrdered==0 );
120868	121648	if( nOrderBy ){
120869	121649	/* If nLoop is zero, then there are no FROM terms in the query. Since
120870	121650	** in this case the query may return a maximum of one row, the results
		@@ -121658,10 +122438,16 @@
121658	122438	assert( pIx->pSchema==pTab->pSchema );
121659	122439	assert( iIndexCur>=0 );
121660	122440	if( op ){
121661	122441	sqlite3VdbeAddOp3(v, op, iIndexCur, pIx->tnum, iDb);
121662	122442	sqlite3VdbeSetP4KeyInfo(pParse, pIx);
	122443	+ if( (pLoop->wsFlags & WHERE_CONSTRAINT)!=0
	122444	+ && (pLoop->wsFlags & (WHERE_COLUMN_RANGE\|WHERE_SKIPSCAN))==0
	122445	+ && (pWInfo->wctrlFlags&WHERE_ORDERBY_MIN)==0
	122446	+ ){
	122447	+ sqlite3VdbeChangeP5(v, OPFLAG_SEEKEQ); /* Hint to COMDB2 */
	122448	+ }
121663	122449	VdbeComment((v, "%s", pIx->zName));
121664	122450	}
121665	122451	}
121666	122452	if( iDb>=0 ) sqlite3CodeVerifySchema(pParse, iDb);
121667	122453	notReady &= ~getMask(&pWInfo->sMaskSet, pTabItem->iCursor);
		@@ -121758,10 +122544,20 @@
121758	122544	if( pLevel->addrSkip ){
121759	122545	sqlite3VdbeAddOp2(v, OP_Goto, 0, pLevel->addrSkip);
121760	122546	VdbeComment((v, "next skip-scan on %s", pLoop->u.btree.pIndex->zName));
121761	122547	sqlite3VdbeJumpHere(v, pLevel->addrSkip);
121762	122548	sqlite3VdbeJumpHere(v, pLevel->addrSkip-2);
	122549	+ }
	122550	+ if( pLevel->addrLikeRep ){
	122551	+ int op;
	122552	+ if( sqlite3VdbeGetOp(v, pLevel->addrLikeRep-1)->p1 ){
	122553	+ op = OP_DecrJumpZero;
	122554	+ }else{
	122555	+ op = OP_JumpZeroIncr;
	122556	+ }
	122557	+ sqlite3VdbeAddOp2(v, op, pLevel->iLikeRepCntr, pLevel->addrLikeRep);
	122558	+ VdbeCoverage(v);
121763	122559	}
121764	122560	if( pLevel->iLeftJoin ){
121765	122561	addr = sqlite3VdbeAddOp1(v, OP_IfPos, pLevel->iLeftJoin); VdbeCoverage(v);
121766	122562	assert( (pLoop->wsFlags & WHERE_IDX_ONLY)==0
121767	122563	\|\| (pLoop->wsFlags & WHERE_INDEXED)!=0 );
		@@ -124649,11 +125445,11 @@
124649	125445	spanSet(&yygotominor.yy346, &yymsp[0].minor.yy0, &yymsp[0].minor.yy0);
124650	125446	}
124651	125447	break;
124652	125448	case 193: /* expr ::= expr COLLATE ID\|STRING */
124653	125449	{
124654		- yygotominor.yy346.pExpr = sqlite3ExprAddCollateToken(pParse, yymsp[-2].minor.yy346.pExpr, &yymsp[0].minor.yy0);
	125450	+ yygotominor.yy346.pExpr = sqlite3ExprAddCollateToken(pParse, yymsp[-2].minor.yy346.pExpr, &yymsp[0].minor.yy0, 1);
124655	125451	yygotominor.yy346.zStart = yymsp[-2].minor.yy346.zStart;
124656	125452	yygotominor.yy346.zEnd = &yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n];
124657	125453	}
124658	125454	break;
124659	125455	case 194: /* expr ::= CAST LP expr AS typetoken RP */
		@@ -124929,20 +125725,20 @@
124929	125725	case 241: /* uniqueflag ::= */
124930	125726	{yygotominor.yy328 = OE_None;}
124931	125727	break;
124932	125728	case 244: /* idxlist ::= idxlist COMMA nm collate sortorder */
124933	125729	{
124934		- Expr *p = sqlite3ExprAddCollateToken(pParse, 0, &yymsp[-1].minor.yy0);
	125730	+ Expr *p = sqlite3ExprAddCollateToken(pParse, 0, &yymsp[-1].minor.yy0, 1);
124935	125731	yygotominor.yy14 = sqlite3ExprListAppend(pParse,yymsp[-4].minor.yy14, p);
124936	125732	sqlite3ExprListSetName(pParse,yygotominor.yy14,&yymsp[-2].minor.yy0,1);
124937	125733	sqlite3ExprListCheckLength(pParse, yygotominor.yy14, "index");
124938	125734	if( yygotominor.yy14 ) yygotominor.yy14->a[yygotominor.yy14->nExpr-1].sortOrder = (u8)yymsp[0].minor.yy328;
124939	125735	}
124940	125736	break;
124941	125737	case 245: /* idxlist ::= nm collate sortorder */
124942	125738	{
124943		- Expr *p = sqlite3ExprAddCollateToken(pParse, 0, &yymsp[-1].minor.yy0);
	125739	+ Expr *p = sqlite3ExprAddCollateToken(pParse, 0, &yymsp[-1].minor.yy0, 1);
124944	125740	yygotominor.yy14 = sqlite3ExprListAppend(pParse,0, p);
124945	125741	sqlite3ExprListSetName(pParse, yygotominor.yy14, &yymsp[-2].minor.yy0, 1);
124946	125742	sqlite3ExprListCheckLength(pParse, yygotominor.yy14, "index");
124947	125743	if( yygotominor.yy14 ) yygotominor.yy14->a[yygotominor.yy14->nExpr-1].sortOrder = (u8)yymsp[0].minor.yy328;
124948	125744	}
		@@ -126197,13 +126993,15 @@
126197	126993	pParse->zTail = &zSql[i];
126198	126994	}
126199	126995	sqlite3Parser(pEngine, 0, pParse->sLastToken, pParse);
126200	126996	}
126201	126997	#ifdef YYTRACKMAXSTACKDEPTH
	126998	+ sqlite3_mutex_enter(sqlite3MallocMutex());
126202	126999	sqlite3StatusSet(SQLITE_STATUS_PARSER_STACK,
126203	127000	sqlite3ParserStackPeak(pEngine)
126204	127001	);
	127002	+ sqlite3_mutex_leave(sqlite3MallocMutex());
126205	127003	#endif /* YYDEBUG */
126206	127004	sqlite3ParserFree(pEngine, sqlite3_free);
126207	127005	db->lookaside.bEnabled = enableLookaside;
126208	127006	if( db->mallocFailed ){
126209	127007	pParse->rc = SQLITE_NOMEM;
		@@ -126769,10 +127567,15 @@
126769	127567	rc = sqlite3_wsd_init(4096, 24);
126770	127568	if( rc!=SQLITE_OK ){
126771	127569	return rc;
126772	127570	}
126773	127571	#endif
	127572	+
	127573	+ /* If the following assert() fails on some obscure processor/compiler
	127574	+ ** combination, the work-around is to set the correct pointer
	127575	+ ** size at compile-time using -DSQLITE_PTRSIZE=n compile-time option */
	127576	+ assert( SQLITE_PTRSIZE==sizeof(char*) );
126774	127577
126775	127578	/* If SQLite is already completely initialized, then this call
126776	127579	** to sqlite3_initialize() should be a no-op. But the initialization
126777	127580	** must be complete. So isInit must not be set until the very end
126778	127581	** of this routine.
		@@ -126982,30 +127785,32 @@
126982	127785	/* Mutex configuration options are only available in a threadsafe
126983	127786	** compile.
126984	127787	*/
126985	127788	#if defined(SQLITE_THREADSAFE) && SQLITE_THREADSAFE>0 /* IMP: R-54466-46756 */
126986	127789	case SQLITE_CONFIG_SINGLETHREAD: {
126987		- /* Disable all mutexing */
126988		- sqlite3GlobalConfig.bCoreMutex = 0;
126989		- sqlite3GlobalConfig.bFullMutex = 0;
	127790	+ /* EVIDENCE-OF: R-02748-19096 This option sets the threading mode to
	127791	+ ** Single-thread. */
	127792	+ sqlite3GlobalConfig.bCoreMutex = 0; /* Disable mutex on core */
	127793	+ sqlite3GlobalConfig.bFullMutex = 0; /* Disable mutex on connections */
126990	127794	break;
126991	127795	}
126992	127796	#endif
126993	127797	#if defined(SQLITE_THREADSAFE) && SQLITE_THREADSAFE>0 /* IMP: R-20520-54086 */
126994	127798	case SQLITE_CONFIG_MULTITHREAD: {
126995		- /* Disable mutexing of database connections */
126996		- /* Enable mutexing of core data structures */
126997		- sqlite3GlobalConfig.bCoreMutex = 1;
126998		- sqlite3GlobalConfig.bFullMutex = 0;
	127799	+ /* EVIDENCE-OF: R-14374-42468 This option sets the threading mode to
	127800	+ ** Multi-thread. */
	127801	+ sqlite3GlobalConfig.bCoreMutex = 1; /* Enable mutex on core */
	127802	+ sqlite3GlobalConfig.bFullMutex = 0; /* Disable mutex on connections */
126999	127803	break;
127000	127804	}
127001	127805	#endif
127002	127806	#if defined(SQLITE_THREADSAFE) && SQLITE_THREADSAFE>0 /* IMP: R-59593-21810 */
127003	127807	case SQLITE_CONFIG_SERIALIZED: {
127004		- /* Enable all mutexing */
127005		- sqlite3GlobalConfig.bCoreMutex = 1;
127006		- sqlite3GlobalConfig.bFullMutex = 1;
	127808	+ /* EVIDENCE-OF: R-41220-51800 This option sets the threading mode to
	127809	+ ** Serialized. */
	127810	+ sqlite3GlobalConfig.bCoreMutex = 1; /* Enable mutex on core */
	127811	+ sqlite3GlobalConfig.bFullMutex = 1; /* Enable mutex on connections */
127007	127812	break;
127008	127813	}
127009	127814	#endif
127010	127815	#if defined(SQLITE_THREADSAFE) && SQLITE_THREADSAFE>0 /* IMP: R-63666-48755 */
127011	127816	case SQLITE_CONFIG_MUTEX: {
		@@ -127113,11 +127918,12 @@
127113	127918	** SQLITE_ENABLE_MEMSYS5 and returns SQLITE_ERROR if invoked otherwise. */
127114	127919	#if defined(SQLITE_ENABLE_MEMSYS3) \|\| defined(SQLITE_ENABLE_MEMSYS5)
127115	127920	case SQLITE_CONFIG_HEAP: {
127116	127921	/* EVIDENCE-OF: R-19854-42126 There are three arguments to
127117	127922	** SQLITE_CONFIG_HEAP: An 8-byte aligned pointer to the memory, the
127118		- ** number of bytes in the memory buffer, and the minimum allocation size. */
	127923	+ ** number of bytes in the memory buffer, and the minimum allocation size.
	127924	+ */
127119	127925	sqlite3GlobalConfig.pHeap = va_arg(ap, void*);
127120	127926	sqlite3GlobalConfig.nHeap = va_arg(ap, int);
127121	127927	sqlite3GlobalConfig.mnReq = va_arg(ap, int);
127122	127928
127123	127929	if( sqlite3GlobalConfig.mnReq<1 ){
		@@ -127218,11 +128024,13 @@
127218	128024	** EVIDENCE-OF: R-34993-45031 The maximum allowed mmap size will be
127219	128025	** silently truncated if necessary so that it does not exceed the
127220	128026	** compile-time maximum mmap size set by the SQLITE_MAX_MMAP_SIZE
127221	128027	** compile-time option.
127222	128028	*/
127223		- if( mxMmap<0 \|\| mxMmap>SQLITE_MAX_MMAP_SIZE ) mxMmap = SQLITE_MAX_MMAP_SIZE;
	128029	+ if( mxMmap<0 \|\| mxMmap>SQLITE_MAX_MMAP_SIZE ){
	128030	+ mxMmap = SQLITE_MAX_MMAP_SIZE;
	128031	+ }
127224	128032	if( szMmap<0 ) szMmap = SQLITE_DEFAULT_MMAP_SIZE;
127225	128033	if( szMmap>mxMmap) szMmap = mxMmap;
127226	128034	sqlite3GlobalConfig.mxMmap = mxMmap;
127227	128035	sqlite3GlobalConfig.szMmap = szMmap;
127228	128036	break;
		@@ -129062,11 +129870,23 @@
129062	129870	for(iIn=0; iIn<nUri; iIn++) nByte += (zUri[iIn]=='&');
129063	129871	zFile = sqlite3_malloc(nByte);
129064	129872	if( !zFile ) return SQLITE_NOMEM;
129065	129873
129066	129874	iIn = 5;
129067		-#ifndef SQLITE_ALLOW_URI_AUTHORITY
	129875	+#ifdef SQLITE_ALLOW_URI_AUTHORITY
	129876	+ if( strncmp(zUri+5, "///", 3)==0 ){
	129877	+ iIn = 7;
	129878	+ /* The following condition causes URIs with five leading / characters
	129879	+ ** like file://///host/path to be converted into UNCs like //host/path.
	129880	+ ** The correct URI for that UNC has only two or four leading / characters
	129881	+ ** file://host/path or file:////host/path. But 5 leading slashes is a
	129882	+ ** common error, we are told, so we handle it as a special case. */
	129883	+ if( strncmp(zUri+7, "///", 3)==0 ){ iIn++; }
	129884	+ }else if( strncmp(zUri+5, "//localhost/", 12)==0 ){
	129885	+ iIn = 16;
	129886	+ }
	129887	+#else
129068	129888	/* Discard the scheme and authority segments of the URI. */
129069	129889	if( zUri[5]=='/' && zUri[6]=='/' ){
129070	129890	iIn = 7;
129071	129891	while( zUri[iIn] && zUri[iIn]!='/' ) iIn++;
129072	129892	if( iIn!=7 && (iIn!=16 \|\| memcmp("localhost", &zUri[7], 9)) ){
		@@ -129505,11 +130325,12 @@
129505	130325	sqlite3_wal_autocheckpoint(db, SQLITE_DEFAULT_WAL_AUTOCHECKPOINT);
129506	130326
129507	130327	opendb_out:
129508	130328	sqlite3_free(zOpen);
129509	130329	if( db ){
129510		- assert( db->mutex!=0 \|\| isThreadsafe==0 \|\| sqlite3GlobalConfig.bFullMutex==0 );
	130330	+ assert( db->mutex!=0 \|\| isThreadsafe==0
	130331	+ \|\| sqlite3GlobalConfig.bFullMutex==0 );
129511	130332	sqlite3_mutex_leave(db->mutex);
129512	130333	}
129513	130334	rc = sqlite3_errcode(db);
129514	130335	assert( db!=0 \|\| rc==SQLITE_NOMEM );
129515	130336	if( rc==SQLITE_NOMEM ){
		@@ -130250,21 +131071,21 @@
130250	131071	case SQLITE_TESTCTRL_ISINIT: {
130251	131072	if( sqlite3GlobalConfig.isInit==0 ) rc = SQLITE_ERROR;
130252	131073	break;
130253	131074	}
130254	131075
130255		- /* sqlite3_test_control(SQLITE_TESTCTRL_IMPOSTER, db, dbName, onOff, tnum);
	131076	+ /* sqlite3_test_control(SQLITE_TESTCTRL_IMPOSTER, db, dbName, onOff, tnum);
130256	131077	**
130257	131078	** This test control is used to create imposter tables. "db" is a pointer
130258	131079	** to the database connection. dbName is the database name (ex: "main" or
130259	131080	** "temp") which will receive the imposter. "onOff" turns imposter mode on
130260	131081	** or off. "tnum" is the root page of the b-tree to which the imposter
130261	131082	** table should connect.
130262	131083	**
130263	131084	** Enable imposter mode only when the schema has already been parsed. Then
130264		- ** run a single CREATE TABLE statement to construct the imposter table in the
130265		- ** parsed schema. Then turn imposter mode back off again.
	131085	+ ** run a single CREATE TABLE statement to construct the imposter table in
	131086	+ ** the parsed schema. Then turn imposter mode back off again.
130266	131087	**
130267	131088	** If onOff==0 and tnum>0 then reset the schema for all databases, causing
130268	131089	** the schema to be reparsed the next time it is needed. This has the
130269	131090	** effect of erasing all imposter tables.
130270	131091	*/
		@@ -132506,15 +133327,20 @@
132506	133327	** the output value undefined. Otherwise SQLITE_OK is returned.
132507	133328	**
132508	133329	** This function is used when parsing the "prefix=" FTS4 parameter.
132509	133330	*/
132510	133331	static int fts3GobbleInt(const char *pp, int pnOut){
	133332	+ const int MAX_NPREFIX = 10000000;
132511	133333	const char p; / Iterator pointer */
132512	133334	int nInt = 0; /* Output value */
132513	133335
132514	133336	for(p=*pp; p[0]>='0' && p[0]<='9'; p++){
132515	133337	nInt = nInt * 10 + (p[0] - '0');
	133338	+ if( nInt>MAX_NPREFIX ){
	133339	+ nInt = 0;
	133340	+ break;
	133341	+ }
132516	133342	}
132517	133343	if( p==*pp ) return SQLITE_ERROR;
132518	133344	*pnOut = nInt;
132519	133345	*pp = p;
132520	133346	return SQLITE_OK;
		@@ -132553,27 +133379,33 @@
132553	133379	}
132554	133380	}
132555	133381
132556	133382	aIndex = sqlite3_malloc(sizeof(struct Fts3Index) * nIndex);
132557	133383	*apIndex = aIndex;
132558		- *pnIndex = nIndex;
132559	133384	if( !aIndex ){
132560	133385	return SQLITE_NOMEM;
132561	133386	}
132562	133387
132563	133388	memset(aIndex, 0, sizeof(struct Fts3Index) * nIndex);
132564	133389	if( zParam ){
132565	133390	const char *p = zParam;
132566	133391	int i;
132567	133392	for(i=1; i<nIndex; i++){
132568		- int nPrefix;
	133393	+ int nPrefix = 0;
132569	133394	if( fts3GobbleInt(&p, &nPrefix) ) return SQLITE_ERROR;
132570		- aIndex[i].nPrefix = nPrefix;
	133395	+ assert( nPrefix>=0 );
	133396	+ if( nPrefix==0 ){
	133397	+ nIndex--;
	133398	+ i--;
	133399	+ }else{
	133400	+ aIndex[i].nPrefix = nPrefix;
	133401	+ }
132571	133402	p++;
132572	133403	}
132573	133404	}
132574	133405
	133406	+ *pnIndex = nIndex;
132575	133407	return SQLITE_OK;
132576	133408	}
132577	133409
132578	133410	/*
132579	133411	** This function is called when initializing an FTS4 table that uses the
		@@ -140349,11 +141181,11 @@
140349	141181	nName = sqlite3_value_bytes(argv[0])+1;
140350	141182
140351	141183	if( argc==2 ){
140352	141184	void *pOld;
140353	141185	int n = sqlite3_value_bytes(argv[1]);
140354		- if( n!=sizeof(pPtr) ){
	141186	+ if( zName==0 \|\| n!=sizeof(pPtr) ){
140355	141187	sqlite3_result_error(context, "argument type mismatch", -1);
140356	141188	return;
140357	141189	}
140358	141190	pPtr = (void *)sqlite3_value_blob(argv[1]);
140359	141191	pOld = sqlite3Fts3HashInsert(pHash, (void *)zName, nName, pPtr);
		@@ -140360,11 +141192,13 @@
140360	141192	if( pOld==pPtr ){
140361	141193	sqlite3_result_error(context, "out of memory", -1);
140362	141194	return;
140363	141195	}
140364	141196	}else{
140365		- pPtr = sqlite3Fts3HashFind(pHash, zName, nName);
	141197	+ if( zName ){
	141198	+ pPtr = sqlite3Fts3HashFind(pHash, zName, nName);
	141199	+ }
140366	141200	if( !pPtr ){
140367	141201	char *zErr = sqlite3_mprintf("unknown tokenizer: %s", zName);
140368	141202	sqlite3_result_error(context, zErr, -1);
140369	141203	sqlite3_free(zErr);
140370	141204	return;
		@@ -140441,10 +141275,14 @@
140441	141275	zCopy = sqlite3_mprintf("%s", zArg);
140442	141276	if( !zCopy ) return SQLITE_NOMEM;
140443	141277	zEnd = &zCopy[strlen(zCopy)];
140444	141278
140445	141279	z = (char *)sqlite3Fts3NextToken(zCopy, &n);
	141280	+ if( z==0 ){
	141281	+ assert( n==0 );
	141282	+ z = zCopy;
	141283	+ }
140446	141284	z[n] = '\0';
140447	141285	sqlite3Fts3Dequote(z);
140448	141286
140449	141287	m = (sqlite3_tokenizer_module *)sqlite3Fts3HashFind(pHash,z,(int)strlen(z)+1);
140450	141288	if( !m ){
		@@ -143086,11 +143924,14 @@
143086	143924	/*
143087	143925	** This is a comparison function used as a qsort() callback when sorting
143088	143926	** an array of pending terms by term. This occurs as part of flushing
143089	143927	** the contents of the pending-terms hash table to the database.
143090	143928	*/
143091		-static int fts3CompareElemByTerm(const void lhs, const void rhs){
	143929	+static int SQLITE_CDECL fts3CompareElemByTerm(
	143930	+ const void *lhs,
	143931	+ const void *rhs
	143932	+){
143092	143933	char z1 = fts3HashKey((Fts3HashElem **)lhs);
143093	143934	char z2 = fts3HashKey((Fts3HashElem **)rhs);
143094	143935	int n1 = fts3HashKeysize((Fts3HashElem *)lhs);
143095	143936	int n2 = fts3HashKeysize((Fts3HashElem *)rhs);
143096	143937
143097	143938

	--- src/sqlite3.c
	+++ src/sqlite3.c
	@@ -1,8 +1,8 @@
1	/******************************************************************************
2	** This file is an amalgamation of many separate C source files from SQLite
3	** version 3.8.8. By combining all the individual C code files into this
4	** single large file, the entire code can be compiled as a single translation
5	** unit. This allows many compilers to do optimizations that would not be
6	** possible if the files were compiled separately. Performance improvements
7	** of 5% or more are commonly seen when SQLite is compiled as a single
8	** translation unit.
	@@ -88,10 +88,48 @@
88	#endif /* _MSVC_H_ */
89
90	/************ End of msvc.h **********************************************/
91	/************ Continuing where we left off in sqliteInt.h ****************/
92






































93	/*
94	** These #defines should enable >2GB file support on POSIX if the
95	** underlying operating system supports it. If the OS lacks
96	** large file support, or if the OS is windows, these should be no-ops.
97	**
	@@ -223,10 +261,17 @@
223	#ifndef SQLITE_API
224	# define SQLITE_API
225	#endif
226
227







228	/*
229	** These no-op macros are used in front of interfaces to mark those
230	** interfaces as either deprecated or experimental. New applications
231	** should not use deprecated interfaces - they are supported for backwards
232	** compatibility only. Application writers should be aware that
	@@ -276,13 +321,13 @@
276	**
277	** See also: [sqlite3_libversion()],
278	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
279	** [sqlite_version()] and [sqlite_source_id()].
280	*/
281	#define SQLITE_VERSION "3.8.8"
282	#define SQLITE_VERSION_NUMBER 3008008
283	#define SQLITE_SOURCE_ID "2015-02-25 14:25:31 6d132e7a224ee68b5cefe9222944aac5760ffc20"
284
285	/*
286	** CAPI3REF: Run-Time Library Version Numbers
287	** KEYWORDS: sqlite3_version, sqlite3_sourceid
288	**
	@@ -925,18 +970,20 @@
925	**
926	** These integer constants are opcodes for the xFileControl method
927	** of the [sqlite3_io_methods] object and for the [sqlite3_file_control()]
928	** interface.
929	**


930	** The [SQLITE_FCNTL_LOCKSTATE] opcode is used for debugging. This
931	** opcode causes the xFileControl method to write the current state of
932	** the lock (one of [SQLITE_LOCK_NONE], [SQLITE_LOCK_SHARED],
933	** [SQLITE_LOCK_RESERVED], [SQLITE_LOCK_PENDING], or [SQLITE_LOCK_EXCLUSIVE])
934	** into an integer that the pArg argument points to. This capability
935	** is used during testing and only needs to be supported when SQLITE_TEST
936	** is defined.
937	** <ul>
938	** <li>[[SQLITE_FCNTL_SIZE_HINT]]
939	** The [SQLITE_FCNTL_SIZE_HINT] opcode is used by SQLite to give the VFS
940	** layer a hint of how large the database file will grow to be during the
941	** current transaction. This hint is not guaranteed to be accurate but it
942	** is often close. The underlying VFS might choose to preallocate database
	@@ -1057,11 +1104,13 @@
1057	** the error message if the pragma fails. ^If the
1058	** [SQLITE_FCNTL_PRAGMA] file control returns [SQLITE_NOTFOUND], then normal
1059	** [PRAGMA] processing continues. ^If the [SQLITE_FCNTL_PRAGMA]
1060	** file control returns [SQLITE_OK], then the parser assumes that the
1061	** VFS has handled the PRAGMA itself and the parser generates a no-op
1062	** prepared statement. ^If the [SQLITE_FCNTL_PRAGMA] file control returns


1063	** any result code other than [SQLITE_OK] or [SQLITE_NOTFOUND], that means
1064	** that the VFS encountered an error while handling the [PRAGMA] and the
1065	** compilation of the PRAGMA fails with an error. ^The [SQLITE_FCNTL_PRAGMA]
1066	** file control occurs at the beginning of pragma statement analysis and so
1067	** it is able to override built-in [PRAGMA] statements.
	@@ -1115,10 +1164,17 @@
1115	** The [SQLITE_FCNTL_WIN32_SET_HANDLE] opcode is used for debugging. This
1116	** opcode causes the xFileControl method to swap the file handle with the one
1117	** pointed to by the pArg argument. This capability is used during testing
1118	** and only needs to be supported when SQLITE_TEST is defined.
1119	**







1120	** </ul>
1121	*/
1122	#define SQLITE_FCNTL_LOCKSTATE 1
1123	#define SQLITE_FCNTL_GET_LOCKPROXYFILE 2
1124	#define SQLITE_FCNTL_SET_LOCKPROXYFILE 3
	@@ -1139,10 +1195,11 @@
1139	#define SQLITE_FCNTL_TRACE 19
1140	#define SQLITE_FCNTL_HAS_MOVED 20
1141	#define SQLITE_FCNTL_SYNC 21
1142	#define SQLITE_FCNTL_COMMIT_PHASETWO 22
1143	#define SQLITE_FCNTL_WIN32_SET_HANDLE 23

1144
1145	/* deprecated names */
1146	#define SQLITE_GET_LOCKPROXYFILE SQLITE_FCNTL_GET_LOCKPROXYFILE
1147	#define SQLITE_SET_LOCKPROXYFILE SQLITE_FCNTL_SET_LOCKPROXYFILE
1148	#define SQLITE_LAST_ERRNO SQLITE_FCNTL_LAST_ERRNO
	@@ -1705,11 +1762,11 @@
1705	** disabled, the following SQLite interfaces become non-operational:
1706	** <ul>
1707	** <li> [sqlite3_memory_used()]
1708	** <li> [sqlite3_memory_highwater()]
1709	** <li> [sqlite3_soft_heap_limit64()]
1710	** <li> [sqlite3_status()]
1711	** </ul>)^
1712	** ^Memory allocation statistics are enabled by default unless SQLite is
1713	** compiled with [SQLITE_DEFAULT_MEMSTATUS]=0 in which case memory
1714	** allocation statistics are disabled by default.
1715	** </dd>
	@@ -1916,11 +1973,10 @@
1916	** <dt>SQLITE_CONFIG_WIN32_HEAPSIZE
1917	** <dd>^The SQLITE_CONFIG_WIN32_HEAPSIZE option is only available if SQLite is
1918	** compiled for Windows with the [SQLITE_WIN32_MALLOC] pre-processor macro
1919	** defined. ^SQLITE_CONFIG_WIN32_HEAPSIZE takes a 32-bit unsigned integer value
1920	** that specifies the maximum size of the created heap.
1921	** </dl>
1922	**
1923	** [[SQLITE_CONFIG_PCACHE_HDRSZ]]
1924	** <dt>SQLITE_CONFIG_PCACHE_HDRSZ
1925	** <dd>^The SQLITE_CONFIG_PCACHE_HDRSZ option takes a single parameter which
1926	** is a pointer to an integer and writes into that integer the number of extra
	@@ -3163,15 +3219,17 @@
3163
3164
3165	/*
3166	** CAPI3REF: Error Codes And Messages
3167	**
3168	** ^The sqlite3_errcode() interface returns the numeric [result code] or
3169	** [extended result code] for the most recent failed sqlite3_* API call
3170	** associated with a [database connection]. If a prior API call failed
3171	** but the most recent API call succeeded, the return value from
3172	** sqlite3_errcode() is undefined. ^The sqlite3_extended_errcode()


3173	** interface is the same except that it always returns the
3174	** [extended result code] even when extended result codes are
3175	** disabled.
3176	**
3177	** ^The sqlite3_errmsg() and sqlite3_errmsg16() return English-language
	@@ -3356,20 +3414,18 @@
3356	** The second argument, "zSql", is the statement to be compiled, encoded
3357	** as either UTF-8 or UTF-16. The sqlite3_prepare() and sqlite3_prepare_v2()
3358	** interfaces use UTF-8, and sqlite3_prepare16() and sqlite3_prepare16_v2()
3359	** use UTF-16.
3360	**
3361	** ^If the nByte argument is less than zero, then zSql is read up to the
3362	** first zero terminator. ^If nByte is non-negative, then it is the maximum
3363	** number of bytes read from zSql. ^When nByte is non-negative, the
3364	** zSql string ends at either the first '\000' or '\u0000' character or
3365	** the nByte-th byte, whichever comes first. If the caller knows
3366	** that the supplied string is nul-terminated, then there is a small
3367	** performance advantage to be gained by passing an nByte parameter that
3368	** is equal to the number of bytes in the input string <i>including</i>
3369	** the nul-terminator bytes as this saves SQLite from having to
3370	** make a copy of the input string.
3371	**
3372	** ^If pzTail is not NULL then *pzTail is made to point to the first byte
3373	** past the end of the first SQL statement in zSql. These routines only
3374	** compile the first statement in zSql, so *pzTail is left pointing to
3375	** what remains uncompiled.
	@@ -4394,12 +4450,12 @@
4394	** DEPRECATED
4395	**
4396	** These functions are [deprecated]. In order to maintain
4397	** backwards compatibility with older code, these functions continue
4398	** to be supported. However, new applications should avoid
4399	** the use of these functions. To help encourage people to avoid
4400	** using these functions, we are not going to tell you what they do.
4401	*/
4402	#ifndef SQLITE_OMIT_DEPRECATED
4403	SQLITE_API SQLITE_DEPRECATED int sqlite3_aggregate_count(sqlite3_context*);
4404	SQLITE_API SQLITE_DEPRECATED int sqlite3_expired(sqlite3_stmt*);
4405	SQLITE_API SQLITE_DEPRECATED int sqlite3_transfer_bindings(sqlite3_stmt, sqlite3_stmt);
	@@ -5783,11 +5839,11 @@
5783	** is delivered up to the client application, the string will be automatically
5784	** freed by sqlite3_free() and the zErrMsg field will be zeroed.
5785	*/
5786	struct sqlite3_vtab {
5787	const sqlite3_module pModule; / The module for this virtual table */
5788	int nRef; /* NO LONGER USED */
5789	char zErrMsg; / Error message from sqlite3_mprintf() */
5790	/* Virtual table implementations will typically add additional fields */
5791	};
5792
5793	/*
	@@ -6461,11 +6517,11 @@
6461	#define SQLITE_TESTCTRL_LAST 25
6462
6463	/*
6464	** CAPI3REF: SQLite Runtime Status
6465	**
6466	** ^This interface is used to retrieve runtime status information
6467	** about the performance of SQLite, and optionally to reset various
6468	** highwater marks. ^The first argument is an integer code for
6469	** the specific parameter to measure. ^(Recognized integer codes
6470	** are of the form [status parameters \| SQLITE_STATUS_...].)^
6471	** ^The current value of the parameter is returned into *pCurrent.
	@@ -6475,23 +6531,26 @@
6475	** value. For those parameters
6476	** nothing is written into *pHighwater and the resetFlag is ignored.)^
6477	** ^(Other parameters record only the highwater mark and not the current
6478	** value. For these latter parameters nothing is written into *pCurrent.)^
6479	**
6480	** ^The sqlite3_status() routine returns SQLITE_OK on success and a
6481	** non-zero [error code] on failure.
6482	**
6483	** This routine is threadsafe but is not atomic. This routine can be
6484	** called while other threads are running the same or different SQLite
6485	** interfaces. However the values returned in *pCurrent and
6486	** *pHighwater reflect the status of SQLite at different points in time
6487	** and it is possible that another thread might change the parameter
6488	** in between the times when pCurrent and pHighwater are written.
6489	**
6490	** See also: [sqlite3_db_status()]
6491	*/
6492	SQLITE_API int sqlite3_status(int op, int pCurrent, int pHighwater, int resetFlag);






6493
6494
6495	/*
6496	** CAPI3REF: Status Parameters
6497	** KEYWORDS: {status parameters}
	@@ -7157,24 +7216,24 @@
7157	**
7158	** ^A return of [SQLITE_BUSY] or [SQLITE_LOCKED] from sqlite3_backup_step()
7159	** is not a permanent error and does not affect the return value of
7160	** sqlite3_backup_finish().
7161	**
7162	** [[sqlite3_backup__remaining()]] [[sqlite3_backup_pagecount()]]
7163	** <b>sqlite3_backup_remaining() and sqlite3_backup_pagecount()</b>
7164	**
7165	** ^Each call to sqlite3_backup_step() sets two values inside
7166	** the [sqlite3_backup] object: the number of pages still to be backed
7167	** up and the total number of pages in the source database file.
7168	** The sqlite3_backup_remaining() and sqlite3_backup_pagecount() interfaces
7169	** retrieve these two values, respectively.
7170	**
7171	** ^The values returned by these functions are only updated by
7172	** sqlite3_backup_step(). ^If the source database is modified during a backup
7173	** operation, then the values are not updated to account for any extra
7174	** pages that need to be updated or the size of the source database file
7175	** changing.
7176	**
7177	** <b>Concurrent Usage of Database Handles</b>
7178	**
7179	** ^The source [database connection] may be used by the application for other
7180	** purposes while a backup operation is underway or being initialized.
	@@ -8018,19 +8077,21 @@
8018	#ifndef SQLITE_MAX_FUNCTION_ARG
8019	# define SQLITE_MAX_FUNCTION_ARG 127
8020	#endif
8021
8022	/*
8023	** The maximum number of in-memory pages to use for the main database
8024	** table and for temporary tables. The SQLITE_DEFAULT_CACHE_SIZE





8025	*/
8026	#ifndef SQLITE_DEFAULT_CACHE_SIZE
8027	# define SQLITE_DEFAULT_CACHE_SIZE 2000
8028	#endif
8029	#ifndef SQLITE_DEFAULT_TEMP_CACHE_SIZE
8030	# define SQLITE_DEFAULT_TEMP_CACHE_SIZE 500
8031	#endif
8032
8033	/*
8034	** The default number of frames to accumulate in the log file before
8035	** checkpointing the database in WAL mode.
8036	*/
	@@ -8870,10 +8931,24 @@
8870	**
8871	** 0.5 -> -10 0.1 -> -33 0.0625 -> -40
8872	*/
8873	typedef INT16_TYPE LogEst;
8874














8875	/*
8876	** Macros to determine whether the machine is big or little endian,
8877	** and whether or not that determination is run-time or compile-time.
8878	**
8879	** For best performance, an attempt is made to guess at the byte-order
	@@ -9320,12 +9395,22 @@
9320	#define BTREE_DATA_VERSION 15 /* A virtual meta-value */
9321
9322	/*
9323	** Values that may be OR'd together to form the second argument of an
9324	** sqlite3BtreeCursorHints() call.









9325	*/
9326	#define BTREE_BULKLOAD 0x00000001

9327
9328	SQLITE_PRIVATE int sqlite3BtreeCursor(
9329	Btree, / BTree containing table to open */
9330	int iTable, /* Index of root page */
9331	int wrFlag, /* 1 for writing. 0 for read-only */
	@@ -9367,10 +9452,13 @@
9367	SQLITE_PRIVATE int sqlite3BtreePutData(BtCursor, u32 offset, u32 amt, void);
9368	SQLITE_PRIVATE void sqlite3BtreeIncrblobCursor(BtCursor *);
9369	SQLITE_PRIVATE void sqlite3BtreeClearCursor(BtCursor *);
9370	SQLITE_PRIVATE int sqlite3BtreeSetVersion(Btree *pBt, int iVersion);
9371	SQLITE_PRIVATE void sqlite3BtreeCursorHints(BtCursor *, unsigned int mask);



9372	SQLITE_PRIVATE int sqlite3BtreeIsReadonly(Btree *pBt);
9373	SQLITE_PRIVATE int sqlite3HeaderSizeBtree(void);
9374
9375	#ifndef NDEBUG
9376	SQLITE_PRIVATE int sqlite3BtreeCursorIsValid(BtCursor*);
	@@ -9733,27 +9821,29 @@
9733	#define OP_FkCounter 134 /* synopsis: fkctr[P1]+=P2 */
9734	#define OP_FkIfZero 135 /* synopsis: if fkctr[P1]==0 goto P2 */
9735	#define OP_MemMax 136 /* synopsis: r[P1]=max(r[P1],r[P2]) */
9736	#define OP_IfPos 137 /* synopsis: if r[P1]>0 goto P2 */
9737	#define OP_IfNeg 138 /* synopsis: r[P1]+=P3, if r[P1]<0 goto P2 */
9738	#define OP_IfZero 139 /* synopsis: r[P1]+=P3, if r[P1]==0 goto P2 */
9739	#define OP_AggFinal 140 /* synopsis: accum=r[P1] N=P2 */
9740	#define OP_IncrVacuum 141
9741	#define OP_Expire 142
9742	#define OP_TableLock 143 /* synopsis: iDb=P1 root=P2 write=P3 */
9743	#define OP_VBegin 144
9744	#define OP_VCreate 145
9745	#define OP_VDestroy 146
9746	#define OP_VOpen 147
9747	#define OP_VColumn 148 /* synopsis: r[P3]=vcolumn(P2) */
9748	#define OP_VNext 149
9749	#define OP_VRename 150
9750	#define OP_Pagecount 151
9751	#define OP_MaxPgcnt 152
9752	#define OP_Init 153 /* synopsis: Start at P2 */
9753	#define OP_Noop 154
9754	#define OP_Explain 155


9755
9756
9757	/* Properties such as "out2" or "jump" that are specified in
9758	** comments following the "case" for each opcode in the vdbe.c
9759	** are encoded into bitvectors as follows:
	@@ -9781,13 +9871,13 @@
9781	/* 96 */ 0x24, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,\
9782	/* 104 */ 0x00, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 0x00,\
9783	/* 112 */ 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x00,\
9784	/* 120 */ 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
9785	/* 128 */ 0x0c, 0x45, 0x15, 0x01, 0x02, 0x02, 0x00, 0x01,\
9786	/* 136 */ 0x08, 0x05, 0x05, 0x05, 0x00, 0x01, 0x00, 0x00,\
9787	/* 144 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x02,\
9788	/* 152 */ 0x02, 0x01, 0x00, 0x00,}
9789
9790	/************ End of opcodes.h *******************************************/
9791	/************ Continuing where we left off in vdbe.h *********************/
9792
9793	/*
	@@ -10865,10 +10955,11 @@
10865	} init;
10866	int nVdbeActive; /* Number of VDBEs currently running */
10867	int nVdbeRead; /* Number of active VDBEs that read or write */
10868	int nVdbeWrite; /* Number of active VDBEs that read and write */
10869	int nVdbeExec; /* Number of nested calls to VdbeExec() */

10870	int nExtension; /* Number of loaded extensions */
10871	void *aExtension; / Array of shared library handles */
10872	void (xTrace)(void,const char); / Trace function */
10873	void pTraceArg; / Argument to the trace function */
10874	void (xProfile)(void,const char,u64); / Profiling function */
	@@ -12022,11 +12113,11 @@
12022	#define WHERE_ONEPASS_DESIRED 0x0004 /* Want to do one-pass UPDATE/DELETE */
12023	#define WHERE_DUPLICATES_OK 0x0008 /* Ok to return a row more than once */
12024	#define WHERE_OMIT_OPEN_CLOSE 0x0010 /* Table cursors are already open */
12025	#define WHERE_FORCE_TABLE 0x0020 /* Do not use an index-only search */
12026	#define WHERE_ONETABLE_ONLY 0x0040 /* Only code the 1st table in pTabList */
12027	/* 0x0080 // not currently used */
12028	#define WHERE_GROUPBY 0x0100 /* pOrderBy is really a GROUP BY */
12029	#define WHERE_DISTINCTBY 0x0200 /* pOrderby is really a DISTINCT clause */
12030	#define WHERE_WANT_DISTINCT 0x0400 /* All output needs to be distinct */
12031	#define WHERE_SORTBYGROUP 0x0800 /* Support sqlite3WhereIsSorted() */
12032	#define WHERE_REOPEN_IDX 0x1000 /* Try to use OP_ReopenIdx */
	@@ -12459,11 +12550,12 @@
12459	#define OPFLAG_APPEND 0x08 /* This is likely to be an append */
12460	#define OPFLAG_USESEEKRESULT 0x10 /* Try to avoid a seek in BtreeInsert() */
12461	#define OPFLAG_LENGTHARG 0x40 /* OP_Column only used for length() */
12462	#define OPFLAG_TYPEOFARG 0x80 /* OP_Column only used for typeof() */
12463	#define OPFLAG_BULKCSR 0x01 /* OP_Open** used to open bulk cursor */
12464	#define OPFLAG_P2ISREG 0x02 /* P2 to OP_Open** is a register number */

12465	#define OPFLAG_PERMUTE 0x01 /* OP_Compare: use the permutation */
12466
12467	/*
12468	* Each trigger present in the database schema is stored as an instance of
12469	* struct Trigger.
	@@ -12863,14 +12955,19 @@
12863	SQLITE_PRIVATE sqlite3_mutex *sqlite3MutexAlloc(int);
12864	SQLITE_PRIVATE int sqlite3MutexInit(void);
12865	SQLITE_PRIVATE int sqlite3MutexEnd(void);
12866	#endif
12867
12868	SQLITE_PRIVATE int sqlite3StatusValue(int);
12869	SQLITE_PRIVATE void sqlite3StatusAdd(int, int);

12870	SQLITE_PRIVATE void sqlite3StatusSet(int, int);
12871




12872	#ifndef SQLITE_OMIT_FLOATING_POINT
12873	SQLITE_PRIVATE int sqlite3IsNaN(double);
12874	#else
12875	# define sqlite3IsNaN(X) 0
12876	#endif
	@@ -13246,11 +13343,11 @@
13246	SQLITE_PRIVATE const char *sqlite3ErrStr(int);
13247	SQLITE_PRIVATE int sqlite3ReadSchema(Parse *pParse);
13248	SQLITE_PRIVATE CollSeq sqlite3FindCollSeq(sqlite3,u8 enc, const char*,int);
13249	SQLITE_PRIVATE CollSeq sqlite3LocateCollSeq(Parse pParse, const char*zName);
13250	SQLITE_PRIVATE CollSeq sqlite3ExprCollSeq(Parse pParse, Expr *pExpr);
13251	SQLITE_PRIVATE Expr sqlite3ExprAddCollateToken(Parse pParse, Expr, const Token);
13252	SQLITE_PRIVATE Expr sqlite3ExprAddCollateString(Parse,Expr,const char);
13253	SQLITE_PRIVATE Expr sqlite3ExprSkipCollate(Expr);
13254	SQLITE_PRIVATE int sqlite3CheckCollSeq(Parse , CollSeq );
13255	SQLITE_PRIVATE int sqlite3CheckObjectName(Parse , const char );
13256	SQLITE_PRIVATE void sqlite3VdbeSetChanges(sqlite3 *, int);
	@@ -14633,18 +14730,10 @@
14633	** An instance of the virtual machine. This structure contains the complete
14634	** state of the virtual machine.
14635	**
14636	** The "sqlite3_stmt" structure pointer that is returned by sqlite3_prepare()
14637	** is really a pointer to an instance of this structure.
14638	**
14639	** The Vdbe.inVtabMethod variable is set to non-zero for the duration of
14640	** any virtual table method invocations made by the vdbe program. It is
14641	** set to 2 for xDestroy method calls and 1 for all other methods. This
14642	** variable is used for two purposes: to allow xDestroy methods to execute
14643	** "DROP TABLE" statements and to prevent some nasty side effects of
14644	** malloc failure when SQLite is invoked recursively by a virtual table
14645	** method function.
14646	*/
14647	struct Vdbe {
14648	sqlite3 db; / The database connection that owns this statement */
14649	Op aOp; / Space to hold the virtual machine's program */
14650	Mem aMem; / The memory locations */
	@@ -14671,11 +14760,10 @@
14671	#endif
14672	u16 nResColumn; /* Number of columns in one row of the result set */
14673	u8 errorAction; /* Recovery action to do in case of an error */
14674	u8 minWriteFileFormat; /* Minimum file format for writable database files */
14675	bft explain:2; /* True if EXPLAIN present on SQL command */
14676	bft inVtabMethod:2; /* See comments above */
14677	bft changeCntOn:1; /* True to update the change-counter */
14678	bft expired:1; /* True if the VM needs to be recompiled */
14679	bft runOnlyOnce:1; /* Automatically expire on reset */
14680	bft usesStmtJournal:1; /* True if uses a statement journal */
14681	bft readOnly:1; /* True for statements that do not write */
	@@ -14831,13 +14919,35 @@
14831	/*
14832	** Variables in which to record status information.
14833	*/
14834	typedef struct sqlite3StatType sqlite3StatType;
14835	static SQLITE_WSD struct sqlite3StatType {
14836	int nowValue[10]; /* Current value */
14837	int mxValue[10]; /* Maximum value */





14838	} sqlite3Stat = { {0,}, {0,} };

















14839
14840
14841	/* The "wsdStat" macro will resolve to the status information
14842	** state vector. If writable static data is unsupported on the target,
14843	** we have to locate the state vector at run-time. In the more common
	@@ -14851,64 +14961,110 @@
14851	# define wsdStatInit
14852	# define wsdStat sqlite3Stat
14853	#endif
14854
14855	/*
14856	** Return the current value of a status parameter.

14857	*/
14858	SQLITE_PRIVATE int sqlite3StatusValue(int op){
14859	wsdStatInit;
14860	assert( op>=0 && op<ArraySize(wsdStat.nowValue) );



14861	return wsdStat.nowValue[op];
14862	}
14863
14864	/*
14865	** Add N to the value of a status record. It is assumed that the
14866	** caller holds appropriate locks.







14867	*/
14868	SQLITE_PRIVATE void sqlite3StatusAdd(int op, int N){
14869	wsdStatInit;
14870	assert( op>=0 && op<ArraySize(wsdStat.nowValue) );



14871	wsdStat.nowValue[op] += N;
14872	if( wsdStat.nowValue[op]>wsdStat.mxValue[op] ){
14873	wsdStat.mxValue[op] = wsdStat.nowValue[op];
14874	}
14875	}









14876
14877	/*
14878	** Set the value of a status to X.

14879	*/
14880	SQLITE_PRIVATE void sqlite3StatusSet(int op, int X){
14881	wsdStatInit;
14882	assert( op>=0 && op<ArraySize(wsdStat.nowValue) );



14883	wsdStat.nowValue[op] = X;
14884	if( wsdStat.nowValue[op]>wsdStat.mxValue[op] ){
14885	wsdStat.mxValue[op] = wsdStat.nowValue[op];
14886	}
14887	}
14888
14889	/*
14890	** Query status information.
14891	**
14892	** This implementation assumes that reading or writing an aligned
14893	** 32-bit integer is an atomic operation. If that assumption is not true,
14894	** then this routine is not threadsafe.
14895	*/
14896	SQLITE_API int sqlite3_status(int op, int pCurrent, int pHighwater, int resetFlag){






14897	wsdStatInit;
14898	if( op<0 \|\| op>=ArraySize(wsdStat.nowValue) ){
14899	return SQLITE_MISUSE_BKPT;
14900	}
14901	#ifdef SQLITE_ENABLE_API_ARMOR
14902	if( pCurrent==0 \|\| pHighwater==0 ) return SQLITE_MISUSE_BKPT;
14903	#endif


14904	*pCurrent = wsdStat.nowValue[op];
14905	*pHighwater = wsdStat.mxValue[op];
14906	if( resetFlag ){
14907	wsdStat.mxValue[op] = wsdStat.nowValue[op];
14908	}


14909	return SQLITE_OK;













14910	}
14911
14912	/*
14913	** Query status information for a single database connection
14914	*/
	@@ -20358,10 +20514,17 @@
20358	*/
20359	int nearlyFull;
20360	} mem0 = { 0, 0, 0, 0, 0, 0, 0, 0 };
20361
20362	#define mem0 GLOBAL(struct Mem0Global, mem0)







20363
20364	/*
20365	** This routine runs when the memory allocator sees that the
20366	** total memory allocation is about to exceed the soft heap
20367	** limit.
	@@ -20381,11 +20544,11 @@
20381	static int sqlite3MemoryAlarm(
20382	void(xCallback)(void pArg, sqlite3_int64 used,int N),
20383	void *pArg,
20384	sqlite3_int64 iThreshold
20385	){
20386	int nUsed;
20387	sqlite3_mutex_enter(mem0.mutex);
20388	mem0.alarmCallback = xCallback;
20389	mem0.alarmArg = pArg;
20390	mem0.alarmThreshold = iThreshold;
20391	nUsed = sqlite3StatusValue(SQLITE_STATUS_MEMORY_USED);
	@@ -20550,11 +20713,11 @@
20550	void *p;
20551	assert( sqlite3_mutex_held(mem0.mutex) );
20552	nFull = sqlite3GlobalConfig.m.xRoundup(n);
20553	sqlite3StatusSet(SQLITE_STATUS_MALLOC_SIZE, n);
20554	if( mem0.alarmCallback!=0 ){
20555	int nUsed = sqlite3StatusValue(SQLITE_STATUS_MEMORY_USED);
20556	if( nUsed >= mem0.alarmThreshold - nFull ){
20557	mem0.nearlyFull = 1;
20558	sqlite3MallocAlarm(nFull);
20559	}else{
20560	mem0.nearlyFull = 0;
	@@ -20567,12 +20730,12 @@
20567	p = sqlite3GlobalConfig.m.xMalloc(nFull);
20568	}
20569	#endif
20570	if( p ){
20571	nFull = sqlite3MallocSize(p);
20572	sqlite3StatusAdd(SQLITE_STATUS_MEMORY_USED, nFull);
20573	sqlite3StatusAdd(SQLITE_STATUS_MALLOC_COUNT, 1);
20574	}
20575	*pp = p;
20576	return nFull;
20577	}
20578
	@@ -20645,18 +20808,18 @@
20645	sqlite3StatusSet(SQLITE_STATUS_SCRATCH_SIZE, n);
20646	if( mem0.nScratchFree && sqlite3GlobalConfig.szScratch>=n ){
20647	p = mem0.pScratchFree;
20648	mem0.pScratchFree = mem0.pScratchFree->pNext;
20649	mem0.nScratchFree--;
20650	sqlite3StatusAdd(SQLITE_STATUS_SCRATCH_USED, 1);
20651	sqlite3_mutex_leave(mem0.mutex);
20652	}else{
20653	sqlite3_mutex_leave(mem0.mutex);
20654	p = sqlite3Malloc(n);
20655	if( sqlite3GlobalConfig.bMemstat && p ){
20656	sqlite3_mutex_enter(mem0.mutex);
20657	sqlite3StatusAdd(SQLITE_STATUS_SCRATCH_OVERFLOW, sqlite3MallocSize(p));
20658	sqlite3_mutex_leave(mem0.mutex);
20659	}
20660	sqlite3MemdebugSetType(p, MEMTYPE_SCRATCH);
20661	}
20662	assert( sqlite3_mutex_notheld(mem0.mutex) );
	@@ -20693,23 +20856,23 @@
20693	sqlite3_mutex_enter(mem0.mutex);
20694	pSlot->pNext = mem0.pScratchFree;
20695	mem0.pScratchFree = pSlot;
20696	mem0.nScratchFree++;
20697	assert( mem0.nScratchFree <= (u32)sqlite3GlobalConfig.nScratch );
20698	sqlite3StatusAdd(SQLITE_STATUS_SCRATCH_USED, -1);
20699	sqlite3_mutex_leave(mem0.mutex);
20700	}else{
20701	/* Release memory back to the heap */
20702	assert( sqlite3MemdebugHasType(p, MEMTYPE_SCRATCH) );
20703	assert( sqlite3MemdebugNoType(p, ~MEMTYPE_SCRATCH) );
20704	sqlite3MemdebugSetType(p, MEMTYPE_HEAP);
20705	if( sqlite3GlobalConfig.bMemstat ){
20706	int iSize = sqlite3MallocSize(p);
20707	sqlite3_mutex_enter(mem0.mutex);
20708	sqlite3StatusAdd(SQLITE_STATUS_SCRATCH_OVERFLOW, -iSize);
20709	sqlite3StatusAdd(SQLITE_STATUS_MEMORY_USED, -iSize);
20710	sqlite3StatusAdd(SQLITE_STATUS_MALLOC_COUNT, -1);
20711	sqlite3GlobalConfig.m.xFree(p);
20712	sqlite3_mutex_leave(mem0.mutex);
20713	}else{
20714	sqlite3GlobalConfig.m.xFree(p);
20715	}
	@@ -20736,26 +20899,26 @@
20736	assert( sqlite3MemdebugHasType(p, MEMTYPE_HEAP) );
20737	return sqlite3GlobalConfig.m.xSize(p);
20738	}
20739	SQLITE_PRIVATE int sqlite3DbMallocSize(sqlite3 db, void p){
20740	if( db==0 ){
20741	assert( sqlite3MemdebugNoType(p, ~MEMTYPE_HEAP) );
20742	assert( sqlite3MemdebugHasType(p, MEMTYPE_HEAP) );
20743	return sqlite3MallocSize(p);
20744	}else{
20745	assert( sqlite3_mutex_held(db->mutex) );
20746	if( isLookaside(db, p) ){
20747	return db->lookaside.sz;
20748	}else{
20749	assert( sqlite3MemdebugHasType(p, (MEMTYPE_LOOKASIDE\|MEMTYPE_HEAP)) );
20750	assert( sqlite3MemdebugNoType(p, ~(MEMTYPE_LOOKASIDE\|MEMTYPE_HEAP)) );
20751	return sqlite3GlobalConfig.m.xSize(p);
20752	}
20753	}
20754	}
20755	SQLITE_API sqlite3_uint64 sqlite3_msize(void *p){
20756	assert( sqlite3MemdebugNoType(p, ~MEMTYPE_HEAP) );
20757	assert( sqlite3MemdebugHasType(p, MEMTYPE_HEAP) );
20758	return (sqlite3_uint64)sqlite3GlobalConfig.m.xSize(p);
20759	}
20760
20761	/*
	@@ -20762,15 +20925,15 @@
20762	** Free memory previously obtained from sqlite3Malloc().
20763	*/
20764	SQLITE_API void sqlite3_free(void *p){
20765	if( p==0 ) return; /* IMP: R-49053-54554 */
20766	assert( sqlite3MemdebugHasType(p, MEMTYPE_HEAP) );
20767	assert( sqlite3MemdebugNoType(p, ~MEMTYPE_HEAP) );
20768	if( sqlite3GlobalConfig.bMemstat ){
20769	sqlite3_mutex_enter(mem0.mutex);
20770	sqlite3StatusAdd(SQLITE_STATUS_MEMORY_USED, -sqlite3MallocSize(p));
20771	sqlite3StatusAdd(SQLITE_STATUS_MALLOC_COUNT, -1);
20772	sqlite3GlobalConfig.m.xFree(p);
20773	sqlite3_mutex_leave(mem0.mutex);
20774	}else{
20775	sqlite3GlobalConfig.m.xFree(p);
20776	}
	@@ -20807,11 +20970,11 @@
20807	db->lookaside.nOut--;
20808	return;
20809	}
20810	}
20811	assert( sqlite3MemdebugHasType(p, (MEMTYPE_LOOKASIDE\|MEMTYPE_HEAP)) );
20812	assert( sqlite3MemdebugNoType(p, ~(MEMTYPE_LOOKASIDE\|MEMTYPE_HEAP)) );
20813	assert( db!=0 \|\| sqlite3MemdebugNoType(p, MEMTYPE_LOOKASIDE) );
20814	sqlite3MemdebugSetType(p, MEMTYPE_HEAP);
20815	sqlite3_free(p);
20816	}
20817
	@@ -20820,11 +20983,11 @@
20820	*/
20821	SQLITE_PRIVATE void sqlite3Realloc(void pOld, u64 nBytes){
20822	int nOld, nNew, nDiff;
20823	void *pNew;
20824	assert( sqlite3MemdebugHasType(pOld, MEMTYPE_HEAP) );
20825	assert( sqlite3MemdebugNoType(pOld, ~MEMTYPE_HEAP) );
20826	if( pOld==0 ){
20827	return sqlite3Malloc(nBytes); /* IMP: R-04300-56712 */
20828	}
20829	if( nBytes==0 ){
20830	sqlite3_free(pOld); /* IMP: R-26507-47431 */
	@@ -20854,11 +21017,11 @@
20854	sqlite3MallocAlarm((int)nBytes);
20855	pNew = sqlite3GlobalConfig.m.xRealloc(pOld, nNew);
20856	}
20857	if( pNew ){
20858	nNew = sqlite3MallocSize(pNew);
20859	sqlite3StatusAdd(SQLITE_STATUS_MEMORY_USED, nNew-nOld);
20860	}
20861	sqlite3_mutex_leave(mem0.mutex);
20862	}else{
20863	pNew = sqlite3GlobalConfig.m.xRealloc(pOld, nNew);
20864	}
	@@ -20987,11 +21150,11 @@
20987	memcpy(pNew, p, db->lookaside.sz);
20988	sqlite3DbFree(db, p);
20989	}
20990	}else{
20991	assert( sqlite3MemdebugHasType(p, (MEMTYPE_LOOKASIDE\|MEMTYPE_HEAP)) );
20992	assert( sqlite3MemdebugNoType(p, ~(MEMTYPE_LOOKASIDE\|MEMTYPE_HEAP)) );
20993	sqlite3MemdebugSetType(p, MEMTYPE_HEAP);
20994	pNew = sqlite3_realloc64(p, n);
20995	if( !pNew ){
20996	db->mallocFailed = 1;
20997	}
	@@ -24969,27 +25132,29 @@
24969	/* 134 */ "FkCounter" OpHelp("fkctr[P1]+=P2"),
24970	/* 135 */ "FkIfZero" OpHelp("if fkctr[P1]==0 goto P2"),
24971	/* 136 */ "MemMax" OpHelp("r[P1]=max(r[P1],r[P2])"),
24972	/* 137 */ "IfPos" OpHelp("if r[P1]>0 goto P2"),
24973	/* 138 */ "IfNeg" OpHelp("r[P1]+=P3, if r[P1]<0 goto P2"),
24974	/* 139 */ "IfZero" OpHelp("r[P1]+=P3, if r[P1]==0 goto P2"),
24975	/* 140 */ "AggFinal" OpHelp("accum=r[P1] N=P2"),
24976	/* 141 */ "IncrVacuum" OpHelp(""),
24977	/* 142 */ "Expire" OpHelp(""),
24978	/* 143 */ "TableLock" OpHelp("iDb=P1 root=P2 write=P3"),
24979	/* 144 */ "VBegin" OpHelp(""),
24980	/* 145 */ "VCreate" OpHelp(""),
24981	/* 146 */ "VDestroy" OpHelp(""),
24982	/* 147 */ "VOpen" OpHelp(""),
24983	/* 148 */ "VColumn" OpHelp("r[P3]=vcolumn(P2)"),
24984	/* 149 */ "VNext" OpHelp(""),
24985	/* 150 */ "VRename" OpHelp(""),
24986	/* 151 */ "Pagecount" OpHelp(""),
24987	/* 152 */ "MaxPgcnt" OpHelp(""),
24988	/* 153 */ "Init" OpHelp("Start at P2"),
24989	/* 154 */ "Noop" OpHelp(""),
24990	/* 155 */ "Explain" OpHelp(""),


24991	};
24992	return azName[i];
24993	}
24994	#endif
24995
	@@ -25065,22 +25230,10 @@
25065	# else
25066	# define SQLITE_ENABLE_LOCKING_STYLE 0
25067	# endif
25068	#endif
25069
25070	/*
25071	** Define the OS_VXWORKS pre-processor macro to 1 if building on
25072	** vxworks, or 0 otherwise.
25073	*/
25074	#ifndef OS_VXWORKS
25075	# if defined(__RTP__) \|\| defined(_WRS_KERNEL)
25076	# define OS_VXWORKS 1
25077	# else
25078	# define OS_VXWORKS 0
25079	# endif
25080	#endif
25081
25082	/*
25083	** standard include files.
25084	*/
25085	#include <sys/types.h>
25086	#include <sys/stat.h>
	@@ -25091,22 +25244,23 @@
25091	#include <errno.h>
25092	#if !defined(SQLITE_OMIT_WAL) \|\| SQLITE_MAX_MMAP_SIZE>0
25093	# include <sys/mman.h>
25094	#endif
25095
25096	#if SQLITE_ENABLE_LOCKING_STYLE \|\| OS_VXWORKS
25097	# include <sys/ioctl.h>
25098	# if OS_VXWORKS
25099	# include <semaphore.h>
25100	# include <limits.h>
25101	# else
25102	# include <sys/file.h>
25103	# include <sys/param.h>
25104	# endif
25105	#endif /* SQLITE_ENABLE_LOCKING_STYLE */
25106
25107	#if defined(__APPLE__) \|\| (SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS)






25108	# include <sys/mount.h>
25109	#endif
25110
25111	#ifdef HAVE_UTIME
25112	# include <utime.h>
	@@ -25142,10 +25296,14 @@
25142
25143	/*
25144	** Maximum supported path-length.
25145	*/
25146	#define MAX_PATHNAME 512




25147
25148	/*
25149	** Only set the lastErrno if the error code is a real error and not
25150	** a normal expected return code of SQLITE_BUSY or SQLITE_OK
25151	*/
	@@ -25231,11 +25389,11 @@
25231
25232	/* This variable holds the process id (pid) from when the xRandomness()
25233	** method was called. If xOpen() is called from a different process id,
25234	** indicating that a fork() has occurred, the PRNG will be reset.
25235	*/
25236	static int randomnessPid = 0;
25237
25238	/*
25239	** Allowed values for the unixFile.ctrlFlags bitmask:
25240	*/
25241	#define UNIXFILE_EXCL 0x01 /* Connections from one process only */
	@@ -25249,10 +25407,11 @@
25249	#define UNIXFILE_PSOW 0x10 /* SQLITE_IOCAP_POWERSAFE_OVERWRITE */
25250	#define UNIXFILE_DELETE 0x20 /* Delete on close */
25251	#define UNIXFILE_URI 0x40 /* Filename might have query parameters */
25252	#define UNIXFILE_NOLOCK 0x80 /* Do no file locking */
25253	#define UNIXFILE_WARNED 0x0100 /* verifyDbFile() warnings issued */

25254
25255	/*
25256	** Include code that is common to all os_*.c files
25257	*/
25258	/************ Include os_common.h in the middle of os_unix.c *************/
	@@ -25587,11 +25746,11 @@
25587	#define osFcntl ((int(*)(int,int,...))aSyscall[7].pCurrent)
25588
25589	{ "read", (sqlite3_syscall_ptr)read, 0 },
25590	#define osRead ((ssize_t()(int,void,size_t))aSyscall[8].pCurrent)
25591
25592	#if defined(USE_PREAD) \|\| (SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS)
25593	{ "pread", (sqlite3_syscall_ptr)pread, 0 },
25594	#else
25595	{ "pread", (sqlite3_syscall_ptr)0, 0 },
25596	#endif
25597	#define osPread ((ssize_t()(int,void,size_t,off_t))aSyscall[9].pCurrent)
	@@ -25604,11 +25763,11 @@
25604	#define osPread64 ((ssize_t()(int,void,size_t,off_t))aSyscall[10].pCurrent)
25605
25606	{ "write", (sqlite3_syscall_ptr)write, 0 },
25607	#define osWrite ((ssize_t()(int,const void,size_t))aSyscall[11].pCurrent)
25608
25609	#if defined(USE_PREAD) \|\| (SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS)
25610	{ "pwrite", (sqlite3_syscall_ptr)pwrite, 0 },
25611	#else
25612	{ "pwrite", (sqlite3_syscall_ptr)0, 0 },
25613	#endif
25614	#define osPwrite ((ssize_t()(int,const void,size_t,off_t))\
	@@ -26743,11 +26902,12 @@
26743	int tErrno = 0;
26744
26745	assert( pFile );
26746	OSTRACE(("LOCK %d %s was %s(%s,%d) pid=%d (unix)\n", pFile->h,
26747	azFileLock(eFileLock), azFileLock(pFile->eFileLock),
26748	azFileLock(pFile->pInode->eFileLock), pFile->pInode->nShared , getpid()));

26749
26750	/* If there is already a lock of this type or more restrictive on the
26751	** unixFile, do nothing. Don't use the end_lock: exit path, as
26752	** unixEnterMutex() hasn't been called yet.
26753	*/
	@@ -26951,11 +27111,11 @@
26951	int rc = SQLITE_OK;
26952
26953	assert( pFile );
26954	OSTRACE(("UNLOCK %d %d was %d(%d,%d) pid=%d (unix)\n", pFile->h, eFileLock,
26955	pFile->eFileLock, pFile->pInode->eFileLock, pFile->pInode->nShared,
26956	getpid()));
26957
26958	assert( eFileLock<=SHARED_LOCK );
26959	if( pFile->eFileLock<=eFileLock ){
26960	return SQLITE_OK;
26961	}
	@@ -27378,11 +27538,11 @@
27378	char zLockFile = (char )pFile->lockingContext;
27379	int rc;
27380
27381	assert( pFile );
27382	OSTRACE(("UNLOCK %d %d was %d pid=%d (dotlock)\n", pFile->h, eFileLock,
27383	pFile->eFileLock, getpid()));
27384	assert( eFileLock<=SHARED_LOCK );
27385
27386	/* no-op if possible */
27387	if( pFile->eFileLock==eFileLock ){
27388	return SQLITE_OK;
	@@ -27441,14 +27601,13 @@
27441	** a single exclusive lock. In other words, SHARED, RESERVED, and
27442	** PENDING locks are the same thing as an EXCLUSIVE lock. SQLite
27443	** still works when you do this, but concurrency is reduced since
27444	** only a single process can be reading the database at a time.
27445	**
27446	** Omit this section if SQLITE_ENABLE_LOCKING_STYLE is turned off or if
27447	** compiling for VXWORKS.
27448	*/
27449	#if SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS
27450
27451	/*
27452	** Retry flock() calls that fail with EINTR
27453	*/
27454	#ifdef EINTR
	@@ -27597,11 +27756,11 @@
27597	static int flockUnlock(sqlite3_file *id, int eFileLock) {
27598	unixFile pFile = (unixFile)id;
27599
27600	assert( pFile );
27601	OSTRACE(("UNLOCK %d %d was %d pid=%d (flock)\n", pFile->h, eFileLock,
27602	pFile->eFileLock, getpid()));
27603	assert( eFileLock<=SHARED_LOCK );
27604
27605	/* no-op if possible */
27606	if( pFile->eFileLock==eFileLock ){
27607	return SQLITE_OK;
	@@ -27658,11 +27817,11 @@
27658	** This routine checks if there is a RESERVED lock held on the specified
27659	** file by this or any other process. If such a lock is held, set *pResOut
27660	** to a non-zero value otherwise *pResOut is set to zero. The return value
27661	** is set to SQLITE_OK unless an I/O error occurs during lock checking.
27662	*/
27663	static int semCheckReservedLock(sqlite3_file id, int pResOut) {
27664	int rc = SQLITE_OK;
27665	int reserved = 0;
27666	unixFile pFile = (unixFile)id;
27667
27668	SimulateIOError( return SQLITE_IOERR_CHECKRESERVEDLOCK; );
	@@ -27725,11 +27884,11 @@
27725	** access the file.
27726	**
27727	** This routine will only increase a lock. Use the sqlite3OsUnlock()
27728	** routine to lower a locking level.
27729	*/
27730	static int semLock(sqlite3_file *id, int eFileLock) {
27731	unixFile pFile = (unixFile)id;
27732	sem_t *pSem = pFile->pInode->pSem;
27733	int rc = SQLITE_OK;
27734
27735	/* if we already have a lock, it is exclusive.
	@@ -27758,18 +27917,18 @@
27758	** must be either NO_LOCK or SHARED_LOCK.
27759	**
27760	** If the locking level of the file descriptor is already at or below
27761	** the requested locking level, this routine is a no-op.
27762	*/
27763	static int semUnlock(sqlite3_file *id, int eFileLock) {
27764	unixFile pFile = (unixFile)id;
27765	sem_t *pSem = pFile->pInode->pSem;
27766
27767	assert( pFile );
27768	assert( pSem );
27769	OSTRACE(("UNLOCK %d %d was %d pid=%d (sem)\n", pFile->h, eFileLock,
27770	pFile->eFileLock, getpid()));
27771	assert( eFileLock<=SHARED_LOCK );
27772
27773	/* no-op if possible */
27774	if( pFile->eFileLock==eFileLock ){
27775	return SQLITE_OK;
	@@ -27795,14 +27954,14 @@
27795	}
27796
27797	/*
27798	** Close a file.
27799	*/
27800	static int semClose(sqlite3_file *id) {
27801	if( id ){
27802	unixFile pFile = (unixFile)id;
27803	semUnlock(id, NO_LOCK);
27804	assert( pFile );
27805	unixEnterMutex();
27806	releaseInodeInfo(pFile);
27807	unixLeaveMutex();
27808	closeUnixFile(id);
	@@ -27979,11 +28138,11 @@
27979	afpLockingContext context = (afpLockingContext ) pFile->lockingContext;
27980
27981	assert( pFile );
27982	OSTRACE(("LOCK %d %s was %s(%s,%d) pid=%d (afp)\n", pFile->h,
27983	azFileLock(eFileLock), azFileLock(pFile->eFileLock),
27984	azFileLock(pInode->eFileLock), pInode->nShared , getpid()));
27985
27986	/* If there is already a lock of this type or more restrictive on the
27987	** unixFile, do nothing. Don't use the afp_end_lock: exit path, as
27988	** unixEnterMutex() hasn't been called yet.
27989	*/
	@@ -28165,11 +28324,11 @@
28165	#endif
28166
28167	assert( pFile );
28168	OSTRACE(("UNLOCK %d %d was %d(%d,%d) pid=%d (afp)\n", pFile->h, eFileLock,
28169	pFile->eFileLock, pFile->pInode->eFileLock, pFile->pInode->nShared,
28170	getpid()));
28171
28172	assert( eFileLock<=SHARED_LOCK );
28173	if( pFile->eFileLock<=eFileLock ){
28174	return SQLITE_OK;
28175	}
	@@ -28990,10 +29149,14 @@
28990	** Information and control of an open file handle.
28991	*/
28992	static int unixFileControl(sqlite3_file id, int op, void pArg){
28993	unixFile pFile = (unixFile)id;
28994	switch( op ){




28995	case SQLITE_FCNTL_LOCKSTATE: {
28996	(int)pArg = pFile->eFileLock;
28997	return SQLITE_OK;
28998	}
28999	case SQLITE_FCNTL_LAST_ERRNO: {
	@@ -29204,11 +29367,13 @@
29204	**
29205	** This function should not be called directly by other code in this file.
29206	** Instead, it should be called via macro osGetpagesize().
29207	*/
29208	static int unixGetpagesize(void){
29209	#if defined(_BSD_SOURCE)


29210	return getpagesize();
29211	#else
29212	return (int)sysconf(_SC_PAGESIZE);
29213	#endif
29214	}
	@@ -29297,37 +29462,42 @@
29297	**
29298	** Locks block if the mask is exactly UNIX_SHM_C and are non-blocking
29299	** otherwise.
29300	*/
29301	static int unixShmSystemLock(
29302	unixShmNode pShmNode, / Apply locks to this open shared-memory segment */
29303	int lockType, /* F_UNLCK, F_RDLCK, or F_WRLCK */
29304	int ofst, /* First byte of the locking range */
29305	int n /* Number of bytes to lock */
29306	){
29307	struct flock f; /* The posix advisory locking structure */
29308	int rc = SQLITE_OK; /* Result code form fcntl() */

29309
29310	/* Access to the unixShmNode object is serialized by the caller */

29311	assert( sqlite3_mutex_held(pShmNode->mutex) \|\| pShmNode->nRef==0 );
29312
29313	/* Shared locks never span more than one byte */
29314	assert( n==1 \|\| lockType!=F_RDLCK );
29315
29316	/* Locks are within range */
29317	assert( n>=1 && n<SQLITE_SHM_NLOCK );
29318
29319	if( pShmNode->h>=0 ){

29320	/* Initialize the locking parameters */
29321	memset(&f, 0, sizeof(f));
29322	f.l_type = lockType;
29323	f.l_whence = SEEK_SET;
29324	f.l_start = ofst;
29325	f.l_len = n;
29326
29327	rc = osFcntl(pShmNode->h, F_SETLK, &f);

29328	rc = (rc!=(-1)) ? SQLITE_OK : SQLITE_BUSY;

29329	}
29330
29331	/* Update the global lock state and do debug tracing */
29332	#ifdef SQLITE_DEBUG
29333	{ u16 mask;
	@@ -29533,17 +29703,17 @@
29533
29534	/* Check to see if another process is holding the dead-man switch.
29535	** If not, truncate the file to zero length.
29536	*/
29537	rc = SQLITE_OK;
29538	if( unixShmSystemLock(pShmNode, F_WRLCK, UNIX_SHM_DMS, 1)==SQLITE_OK ){
29539	if( robust_ftruncate(pShmNode->h, 0) ){
29540	rc = unixLogError(SQLITE_IOERR_SHMOPEN, "ftruncate", zShmFilename);
29541	}
29542	}
29543	if( rc==SQLITE_OK ){
29544	rc = unixShmSystemLock(pShmNode, F_RDLCK, UNIX_SHM_DMS, 1);
29545	}
29546	if( rc ) goto shm_open_err;
29547	}
29548	}
29549
	@@ -29771,11 +29941,11 @@
29771	allMask \|= pX->sharedMask;
29772	}
29773
29774	/* Unlock the system-level locks */
29775	if( (mask & allMask)==0 ){
29776	rc = unixShmSystemLock(pShmNode, F_UNLCK, ofst+UNIX_SHM_BASE, n);
29777	}else{
29778	rc = SQLITE_OK;
29779	}
29780
29781	/* Undo the local locks */
	@@ -29799,11 +29969,11 @@
29799	}
29800
29801	/* Get shared locks at the system level, if necessary */
29802	if( rc==SQLITE_OK ){
29803	if( (allShared & mask)==0 ){
29804	rc = unixShmSystemLock(pShmNode, F_RDLCK, ofst+UNIX_SHM_BASE, n);
29805	}else{
29806	rc = SQLITE_OK;
29807	}
29808	}
29809
	@@ -29824,20 +29994,20 @@
29824
29825	/* Get the exclusive locks at the system level. Then if successful
29826	** also mark the local connection as being locked.
29827	*/
29828	if( rc==SQLITE_OK ){
29829	rc = unixShmSystemLock(pShmNode, F_WRLCK, ofst+UNIX_SHM_BASE, n);
29830	if( rc==SQLITE_OK ){
29831	assert( (p->sharedMask & mask)==0 );
29832	p->exclMask \|= mask;
29833	}
29834	}
29835	}
29836	sqlite3_mutex_leave(pShmNode->mutex);
29837	OSTRACE(("SHM-LOCK shmid-%d, pid-%d got %03x,%03x\n",
29838	p->id, getpid(), p->sharedMask, p->exclMask));
29839	return rc;
29840	}
29841
29842	/*
29843	** Implement a memory barrier or memory fence on shared memory.
	@@ -30236,11 +30406,11 @@
30236	dotlockUnlock, /* xUnlock method */
30237	dotlockCheckReservedLock, /* xCheckReservedLock method */
30238	0 /* xShmMap method */
30239	)
30240
30241	#if SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS
30242	IOMETHODS(
30243	flockIoFinder, /* Finder function name */
30244	flockIoMethods, /* sqlite3_io_methods object name */
30245	1, /* shared memory is disabled */
30246	flockClose, /* xClose method */
	@@ -30254,14 +30424,14 @@
30254	#if OS_VXWORKS
30255	IOMETHODS(
30256	semIoFinder, /* Finder function name */
30257	semIoMethods, /* sqlite3_io_methods object name */
30258	1, /* shared memory is disabled */
30259	semClose, /* xClose method */
30260	semLock, /* xLock method */
30261	semUnlock, /* xUnlock method */
30262	semCheckReservedLock, /* xCheckReservedLock method */
30263	0 /* xShmMap method */
30264	)
30265	#endif
30266
30267	#if defined(__APPLE__) && SQLITE_ENABLE_LOCKING_STYLE
	@@ -30381,19 +30551,17 @@
30381	static const sqlite3_io_methods
30382	(const autolockIoFinder)(const char,unixFile) = autolockIoFinderImpl;
30383
30384	#endif /* defined(__APPLE__) && SQLITE_ENABLE_LOCKING_STYLE */
30385
30386	#if OS_VXWORKS && SQLITE_ENABLE_LOCKING_STYLE
30387	/*
30388	** This "finder" function attempts to determine the best locking strategy
30389	** for the database file "filePath". It then returns the sqlite3_io_methods
30390	** object that implements that strategy.
30391	**
30392	** This is for VXWorks only.
30393	*/
30394	static const sqlite3_io_methods *autolockIoFinderImpl(
30395	const char filePath, / name of the database file */
30396	unixFile pNew / the open file object */
30397	){
30398	struct flock lockInfo;
30399
	@@ -30415,13 +30583,13 @@
30415	}else{
30416	return &semIoMethods;
30417	}
30418	}
30419	static const sqlite3_io_methods
30420	(const autolockIoFinder)(const char,unixFile) = autolockIoFinderImpl;
30421
30422	#endif /* OS_VXWORKS && SQLITE_ENABLE_LOCKING_STYLE */
30423
30424	/*
30425	** An abstract type for a pointer to an IO method finder function:
30426	*/
30427	typedef const sqlite3_io_methods (finder_type)(const char,unixFile);
	@@ -30930,12 +31098,12 @@
30930	/* Detect a pid change and reset the PRNG. There is a race condition
30931	** here such that two or more threads all trying to open databases at
30932	** the same instant might all reset the PRNG. But multiple resets
30933	** are harmless.
30934	*/
30935	if( randomnessPid!=getpid() ){
30936	randomnessPid = getpid();
30937	sqlite3_randomness(0,0);
30938	}
30939
30940	memset(p, 0, sizeof(unixFile));
30941
	@@ -31322,11 +31490,11 @@
31322	** When testing, initializing zBuf[] to zero is all we do. That means
31323	** that we always use the same random number sequence. This makes the
31324	** tests repeatable.
31325	*/
31326	memset(zBuf, 0, nBuf);
31327	randomnessPid = getpid();
31328	#if !defined(SQLITE_TEST)
31329	{
31330	int fd, got;
31331	fd = robust_open("/dev/urandom", O_RDONLY, 0);
31332	if( fd<0 ){
	@@ -31643,11 +31811,11 @@
31643	#else
31644	# ifdef _CS_DARWIN_USER_TEMP_DIR
31645	{
31646	if( !confstr(_CS_DARWIN_USER_TEMP_DIR, lPath, maxLen) ){
31647	OSTRACE(("GETLOCKPATH failed %s errno=%d pid=%d\n",
31648	lPath, errno, getpid()));
31649	return SQLITE_IOERR_LOCK;
31650	}
31651	len = strlcat(lPath, "sqliteplocks", maxLen);
31652	}
31653	# else
	@@ -31665,11 +31833,11 @@
31665	char c = dbPath[i];
31666	lPath[i+len] = (c=='/')?'_':c;
31667	}
31668	lPath[i+len]='\0';
31669	strlcat(lPath, ":auto:", maxLen);
31670	OSTRACE(("GETLOCKPATH proxy lock path=%s pid=%d\n", lPath, getpid()));
31671	return SQLITE_OK;
31672	}
31673
31674	/*
31675	** Creates the lock file and any missing directories in lockPath
	@@ -31692,20 +31860,20 @@
31692	if( osMkdir(buf, SQLITE_DEFAULT_PROXYDIR_PERMISSIONS) ){
31693	int err=errno;
31694	if( err!=EEXIST ) {
31695	OSTRACE(("CREATELOCKPATH FAILED creating %s, "
31696	"'%s' proxy lock path=%s pid=%d\n",
31697	buf, strerror(err), lockPath, getpid()));
31698	return err;
31699	}
31700	}
31701	}
31702	start=i+1;
31703	}
31704	buf[i] = lockPath[i];
31705	}
31706	OSTRACE(("CREATELOCKPATH proxy lock path=%s pid=%d\n", lockPath, getpid()));
31707	return 0;
31708	}
31709
31710	/*
31711	** Create a new VFS file descriptor (stored in memory obtained from
	@@ -32006,11 +32174,12 @@
32006	int readLen = 0;
32007	int tryOldLockPath = 0;
32008	int forceNewLockPath = 0;
32009
32010	OSTRACE(("TAKECONCH %d for %s pid=%d\n", conchFile->h,
32011	(pCtx->lockProxyPath ? pCtx->lockProxyPath : ":auto:"), getpid()));

32012
32013	rc = proxyGetHostID(myHostID, &pError);
32014	if( (rc&0xff)==SQLITE_IOERR ){
32015	storeLastErrno(pFile, pError);
32016	goto end_takeconch;
	@@ -32216,11 +32385,11 @@
32216
32217	pCtx = (proxyLockingContext *)pFile->lockingContext;
32218	conchFile = pCtx->conchFile;
32219	OSTRACE(("RELEASECONCH %d for %s pid=%d\n", conchFile->h,
32220	(pCtx->lockProxyPath ? pCtx->lockProxyPath : ":auto:"),
32221	getpid()));
32222	if( pCtx->conchHeld>0 ){
32223	rc = conchFile->pMethod->xUnlock((sqlite3_file*)conchFile, NO_LOCK);
32224	}
32225	pCtx->conchHeld = 0;
32226	OSTRACE(("RELEASECONCH %d %s\n", conchFile->h,
	@@ -32358,11 +32527,11 @@
32358	}else{
32359	lockPath=(char *)path;
32360	}
32361
32362	OSTRACE(("TRANSPROXY %d for %s pid=%d\n", pFile->h,
32363	(lockPath ? lockPath : ":auto:"), getpid()));
32364
32365	pCtx = sqlite3_malloc( sizeof(*pCtx) );
32366	if( pCtx==0 ){
32367	return SQLITE_NOMEM;
32368	}
	@@ -32699,26 +32868,28 @@
32699	** Note that the sqlite3_vfs.pNext field of the VFS object is modified
32700	** by the SQLite core when the VFS is registered. So the following
32701	** array cannot be const.
32702	*/
32703	static sqlite3_vfs aVfs[] = {
32704	#if SQLITE_ENABLE_LOCKING_STYLE && (OS_VXWORKS \|\| defined(__APPLE__))
32705	UNIXVFS("unix", autolockIoFinder ),


32706	#else
32707	UNIXVFS("unix", posixIoFinder ),
32708	#endif
32709	UNIXVFS("unix-none", nolockIoFinder ),
32710	UNIXVFS("unix-dotfile", dotlockIoFinder ),
32711	UNIXVFS("unix-excl", posixIoFinder ),
32712	#if OS_VXWORKS
32713	UNIXVFS("unix-namedsem", semIoFinder ),
32714	#endif
32715	#if SQLITE_ENABLE_LOCKING_STYLE
32716	UNIXVFS("unix-posix", posixIoFinder ),
32717	#if !OS_VXWORKS

32718	UNIXVFS("unix-flock", flockIoFinder ),
32719	#endif
32720	#endif
32721	#if SQLITE_ENABLE_LOCKING_STYLE && defined(__APPLE__)
32722	UNIXVFS("unix-afp", afpIoFinder ),
32723	UNIXVFS("unix-nfs", nfsIoFinder ),
32724	UNIXVFS("unix-proxy", proxyIoFinder ),
	@@ -39072,16 +39243,24 @@
39072	sqlite3GlobalConfig.pcache2.xUnpin(p->pCache->pCache, p->pPage, 0);
39073	}
39074	}
39075
39076	/*
39077	** Compute the number of pages of cache requested.



39078	*/
39079	static int numberOfCachePages(PCache *p){
39080	if( p->szCache>=0 ){


39081	return p->szCache;
39082	}else{



39083	return (int)((-1024*(i64)p->szCache)/(p->szPage+p->szExtra));
39084	}
39085	}
39086
39087	/************************************************* General Interfaces ****
	@@ -39817,20 +39996,20 @@
39817	** in pcache1 need to be protected via mutex.
39818	*/
39819	static void *pcache1Alloc(int nByte){
39820	void *p = 0;
39821	assert( sqlite3_mutex_notheld(pcache1.grp.mutex) );
39822	sqlite3StatusSet(SQLITE_STATUS_PAGECACHE_SIZE, nByte);
39823	if( nByte<=pcache1.szSlot ){
39824	sqlite3_mutex_enter(pcache1.mutex);
39825	p = (PgHdr1 *)pcache1.pFree;
39826	if( p ){
39827	pcache1.pFree = pcache1.pFree->pNext;
39828	pcache1.nFreeSlot--;
39829	pcache1.bUnderPressure = pcache1.nFreeSlot<pcache1.nReserve;
39830	assert( pcache1.nFreeSlot>=0 );
39831	sqlite3StatusAdd(SQLITE_STATUS_PAGECACHE_USED, 1);

39832	}
39833	sqlite3_mutex_leave(pcache1.mutex);
39834	}
39835	if( p==0 ){
39836	/* Memory is not available in the SQLITE_CONFIG_PAGECACHE pool. Get
	@@ -39839,11 +40018,12 @@
39839	p = sqlite3Malloc(nByte);
39840	#ifndef SQLITE_DISABLE_PAGECACHE_OVERFLOW_STATS
39841	if( p ){
39842	int sz = sqlite3MallocSize(p);
39843	sqlite3_mutex_enter(pcache1.mutex);
39844	sqlite3StatusAdd(SQLITE_STATUS_PAGECACHE_OVERFLOW, sz);

39845	sqlite3_mutex_leave(pcache1.mutex);
39846	}
39847	#endif
39848	sqlite3MemdebugSetType(p, MEMTYPE_PCACHE);
39849	}
	@@ -39857,11 +40037,11 @@
39857	int nFreed = 0;
39858	if( p==0 ) return 0;
39859	if( p>=pcache1.pStart && p<pcache1.pEnd ){
39860	PgFreeslot *pSlot;
39861	sqlite3_mutex_enter(pcache1.mutex);
39862	sqlite3StatusAdd(SQLITE_STATUS_PAGECACHE_USED, -1);
39863	pSlot = (PgFreeslot*)p;
39864	pSlot->pNext = pcache1.pFree;
39865	pcache1.pFree = pSlot;
39866	pcache1.nFreeSlot++;
39867	pcache1.bUnderPressure = pcache1.nFreeSlot<pcache1.nReserve;
	@@ -39871,11 +40051,11 @@
39871	assert( sqlite3MemdebugHasType(p, MEMTYPE_PCACHE) );
39872	sqlite3MemdebugSetType(p, MEMTYPE_HEAP);
39873	nFreed = sqlite3MallocSize(p);
39874	#ifndef SQLITE_DISABLE_PAGECACHE_OVERFLOW_STATS
39875	sqlite3_mutex_enter(pcache1.mutex);
39876	sqlite3StatusAdd(SQLITE_STATUS_PAGECACHE_OVERFLOW, -nFreed);
39877	sqlite3_mutex_leave(pcache1.mutex);
39878	#endif
39879	sqlite3_free(p);
39880	}
39881	return nFreed;
	@@ -40607,10 +40787,18 @@
40607
40608	/*
40609	** Return the size of the header on each page of this PCACHE implementation.
40610	*/
40611	SQLITE_PRIVATE int sqlite3HeaderSizePcache1(void){ return ROUND8(sizeof(PgHdr1)); }








40612
40613	#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
40614	/*
40615	** This function is called to free superfluous dynamically allocated memory
40616	** held by the pager system. Memory in use by any SQLite pager allocated
	@@ -49380,13 +49568,14 @@
49380	if( pWal->exclusiveMode ) return;
49381	(void)sqlite3OsShmLock(pWal->pDbFd, lockIdx, 1,
49382	SQLITE_SHM_UNLOCK \| SQLITE_SHM_SHARED);
49383	WALTRACE(("WAL%p: release SHARED-%s\n", pWal, walLockName(lockIdx)));
49384	}
49385	static int walLockExclusive(Wal *pWal, int lockIdx, int n){
49386	int rc;
49387	if( pWal->exclusiveMode ) return SQLITE_OK;

49388	rc = sqlite3OsShmLock(pWal->pDbFd, lockIdx, n,
49389	SQLITE_SHM_LOCK \| SQLITE_SHM_EXCLUSIVE);
49390	WALTRACE(("WAL%p: acquire EXCLUSIVE-%s cnt=%d %s\n", pWal,
49391	walLockName(lockIdx), n, rc ? "failed" : "ok"));
49392	VVA_ONLY( pWal->lockError = (u8)(rc!=SQLITE_OK && rc!=SQLITE_BUSY); )
	@@ -49668,11 +49857,11 @@
49668	assert( WAL_ALL_BUT_WRITE==WAL_WRITE_LOCK+1 );
49669	assert( WAL_CKPT_LOCK==WAL_ALL_BUT_WRITE );
49670	assert( pWal->writeLock );
49671	iLock = WAL_ALL_BUT_WRITE + pWal->ckptLock;
49672	nLock = SQLITE_SHM_NLOCK - iLock;
49673	rc = walLockExclusive(pWal, iLock, nLock);
49674	if( rc ){
49675	return rc;
49676	}
49677	WALTRACE(("WAL%p: recovery begin...\n", pWal));
49678
	@@ -50202,11 +50391,11 @@
50202	int lockIdx, /* Offset of first byte to lock */
50203	int n /* Number of bytes to lock */
50204	){
50205	int rc;
50206	do {
50207	rc = walLockExclusive(pWal, lockIdx, n);
50208	}while( xBusy && rc==SQLITE_BUSY && xBusy(pBusyArg) );
50209	return rc;
50210	}
50211
50212	/*
	@@ -50635,11 +50824,11 @@
50635	if( pWal->readOnly & WAL_SHM_RDONLY ){
50636	if( SQLITE_OK==(rc = walLockShared(pWal, WAL_WRITE_LOCK)) ){
50637	walUnlockShared(pWal, WAL_WRITE_LOCK);
50638	rc = SQLITE_READONLY_RECOVERY;
50639	}
50640	}else if( SQLITE_OK==(rc = walLockExclusive(pWal, WAL_WRITE_LOCK, 1)) ){
50641	pWal->writeLock = 1;
50642	if( SQLITE_OK==(rc = walIndexPage(pWal, 0, &page0)) ){
50643	badHdr = walIndexTryHdr(pWal, pChanged);
50644	if( badHdr ){
50645	/* If the wal-index header is still malformed even while holding
	@@ -50841,11 +51030,11 @@
50841	{
50842	if( (pWal->readOnly & WAL_SHM_RDONLY)==0
50843	&& (mxReadMark<pWal->hdr.mxFrame \|\| mxI==0)
50844	){
50845	for(i=1; i<WAL_NREADER; i++){
50846	rc = walLockExclusive(pWal, WAL_READ_LOCK(i), 1);
50847	if( rc==SQLITE_OK ){
50848	mxReadMark = pInfo->aReadMark[i] = pWal->hdr.mxFrame;
50849	mxI = i;
50850	walUnlockExclusive(pWal, WAL_READ_LOCK(i), 1);
50851	break;
	@@ -51097,11 +51286,11 @@
51097	}
51098
51099	/* Only one writer allowed at a time. Get the write lock. Return
51100	** SQLITE_BUSY if unable.
51101	*/
51102	rc = walLockExclusive(pWal, WAL_WRITE_LOCK, 1);
51103	if( rc ){
51104	return rc;
51105	}
51106	pWal->writeLock = 1;
51107
	@@ -51242,11 +51431,11 @@
51242	volatile WalCkptInfo *pInfo = walCkptInfo(pWal);
51243	assert( pInfo->nBackfill==pWal->hdr.mxFrame );
51244	if( pInfo->nBackfill>0 ){
51245	u32 salt1;
51246	sqlite3_randomness(4, &salt1);
51247	rc = walLockExclusive(pWal, WAL_READ_LOCK(1), WAL_NREADER-1);
51248	if( rc==SQLITE_OK ){
51249	/* If all readers are using WAL_READ_LOCK(0) (in other words if no
51250	** readers are currently using the WAL), then the transactions
51251	** frames will overwrite the start of the existing log. Update the
51252	** wal-index header to reflect this.
	@@ -51567,11 +51756,11 @@
51567	if( pWal->readOnly ) return SQLITE_READONLY;
51568	WALTRACE(("WAL%p: checkpoint begins\n", pWal));
51569
51570	/* IMPLEMENTATION-OF: R-62028-47212 All calls obtain an exclusive
51571	** "checkpoint" lock on the database file. */
51572	rc = walLockExclusive(pWal, WAL_CKPT_LOCK, 1);
51573	if( rc ){
51574	/* EVIDENCE-OF: R-10421-19736 If any other process is running a
51575	** checkpoint operation at the same time, the lock cannot be obtained and
51576	** SQLITE_BUSY is returned.
51577	** EVIDENCE-OF: R-53820-33897 Even if there is a busy-handler configured,
	@@ -52569,10 +52758,11 @@
52569
52570	/*
52571	** Exit the recursive mutex on a Btree.
52572	*/
52573	SQLITE_PRIVATE void sqlite3BtreeLeave(Btree *p){

52574	if( p->sharable ){
52575	assert( p->wantToLock>0 );
52576	p->wantToLock--;
52577	if( p->wantToLock==0 ){
52578	unlockBtreeMutex(p);
	@@ -54747,12 +54937,12 @@
54747	/*
54748	** The following asserts make sure that structures used by the btree are
54749	** the right size. This is to guard against size changes that result
54750	** when compiling on a different architecture.
54751	*/
54752	assert( sizeof(i64)==8 \|\| sizeof(i64)==4 );
54753	assert( sizeof(u64)==8 \|\| sizeof(u64)==4 );
54754	assert( sizeof(u32)==4 );
54755	assert( sizeof(u16)==2 );
54756	assert( sizeof(Pgno)==4 );
54757
54758	pBt = sqlite3MallocZero( sizeof(*pBt) );
	@@ -60210,11 +60400,12 @@
60210	** the previous call, as the overflow cell data will have been
60211	** copied either into the body of a database page or into the new
60212	** pSpace buffer passed to the latter call to balance_nonroot().
60213	*/
60214	u8 *pSpace = sqlite3PageMalloc(pCur->pBt->pageSize);
60215	rc = balance_nonroot(pParent, iIdx, pSpace, iPage==1, pCur->hints);

60216	if( pFree ){
60217	/* If pFree is not NULL, it points to the pSpace buffer used
60218	** by a previous call to balance_nonroot(). Its contents are
60219	** now stored either on real database pages or within the
60220	** new pSpace buffer, so it may be safely freed here. */
	@@ -61873,17 +62064,26 @@
61873	pBt->btsFlags &= ~BTS_NO_WAL;
61874	return rc;
61875	}
61876
61877	/*
61878	** set the mask of hint flags for cursor pCsr. Currently the only valid
61879	** values are 0 and BTREE_BULKLOAD.
61880	*/
61881	SQLITE_PRIVATE void sqlite3BtreeCursorHints(BtCursor *pCsr, unsigned int mask){
61882	assert( mask==BTREE_BULKLOAD \|\| mask==0 );
61883	pCsr->hints = mask;
61884	}










61885
61886	/*
61887	** Return true if the given Btree is read-only.
61888	*/
61889	SQLITE_PRIVATE int sqlite3BtreeIsReadonly(Btree *p){
	@@ -63773,11 +63973,11 @@
63773	** by calling sqlite3ValueNew().
63774	**
63775	** Otherwise, if the second argument is non-zero, then this function is
63776	** being called indirectly by sqlite3Stat4ProbeSetValue(). If it has not
63777	** already been allocated, allocate the UnpackedRecord structure that
63778	** that function will return to its caller here. Then return a pointer
63779	** an sqlite3_value within the UnpackedRecord.a[] array.
63780	*/
63781	static sqlite3_value valueNew(sqlite3 db, struct ValueNewStat4Ctx *p){
63782	#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
63783	if( p ){
	@@ -63817,10 +64017,117 @@
63817	UNUSED_PARAMETER(p);
63818	#endif /* defined(SQLITE_ENABLE_STAT3_OR_STAT4) */
63819	return sqlite3ValueNew(db);
63820	}
63821











































































































63822	/*
63823	** Extract a value from the supplied expression in the manner described
63824	** above sqlite3ValueFromExpr(). Allocate the sqlite3_value object
63825	** using valueNew().
63826	**
	@@ -63848,10 +64155,16 @@
63848	*ppVal = 0;
63849	return SQLITE_OK;
63850	}
63851	while( (op = pExpr->op)==TK_UPLUS ) pExpr = pExpr->pLeft;
63852	if( NEVER(op==TK_REGISTER) ) op = pExpr->op2;






63853
63854	if( op==TK_CAST ){
63855	u8 aff = sqlite3AffinityType(pExpr->u.zToken,0);
63856	rc = valueFromExpr(db, pExpr->pLeft, enc, aff, ppVal, pCtx);
63857	testcase( rc!=SQLITE_OK );
	@@ -63924,10 +64237,16 @@
63924	assert( zVal[nVal]=='\'' );
63925	sqlite3VdbeMemSetStr(pVal, sqlite3HexToBlob(db, zVal, nVal), nVal/2,
63926	0, SQLITE_DYNAMIC);
63927	}
63928	#endif






63929
63930	*ppVal = pVal;
63931	return rc;
63932
63933	no_mem:
	@@ -65377,11 +65696,11 @@
65377	break;
65378	}
65379	#ifndef SQLITE_OMIT_VIRTUALTABLE
65380	case P4_VTAB: {
65381	sqlite3_vtab *pVtab = pOp->p4.pVtab->pVtab;
65382	sqlite3_snprintf(nTemp, zTemp, "vtab:%p:%p", pVtab, pVtab->pModule);
65383	break;
65384	}
65385	#endif
65386	case P4_INTARRAY: {
65387	sqlite3_snprintf(nTemp, zTemp, "intarray");
	@@ -66041,13 +66360,13 @@
66041	}
66042	#ifndef SQLITE_OMIT_VIRTUALTABLE
66043	else if( pCx->pVtabCursor ){
66044	sqlite3_vtab_cursor *pVtabCursor = pCx->pVtabCursor;
66045	const sqlite3_module *pModule = pVtabCursor->pVtab->pModule;
66046	p->inVtabMethod = 1;

66047	pModule->xClose(pVtabCursor);
66048	p->inVtabMethod = 0;
66049	}
66050	#endif
66051	}
66052
66053	/*
	@@ -66402,11 +66721,11 @@
66402
66403	/* Delete the master journal file. This commits the transaction. After
66404	** doing this the directory is synced again before any individual
66405	** transaction files are deleted.
66406	*/
66407	rc = sqlite3OsDelete(pVfs, zMaster, 1);
66408	sqlite3DbFree(db, zMaster);
66409	zMaster = 0;
66410	if( rc ){
66411	return rc;
66412	}
	@@ -68615,10 +68934,14 @@
68615	}
68616	SQLITE_API const void sqlite3_value_text16le(sqlite3_value pVal){
68617	return sqlite3ValueText(pVal, SQLITE_UTF16LE);
68618	}
68619	#endif /* SQLITE_OMIT_UTF16 */




68620	SQLITE_API int sqlite3_value_type(sqlite3_value* pVal){
68621	static const u8 aType[] = {
68622	SQLITE_BLOB, /* 0x00 */
68623	SQLITE_NULL, /* 0x01 */
68624	SQLITE_TEXT, /* 0x02 */
	@@ -68811,11 +69134,11 @@
68811	}
68812	SQLITE_API void sqlite3_result_error_code(sqlite3_context *pCtx, int errCode){
68813	pCtx->isError = errCode;
68814	pCtx->fErrorOrAux = 1;
68815	#ifdef SQLITE_DEBUG
68816	pCtx->pVdbe->rcApp = errCode;
68817	#endif
68818	if( pCtx->pOut->flags & MEM_Null ){
68819	sqlite3VdbeMemSetStr(pCtx->pOut, sqlite3ErrStr(errCode), -1,
68820	SQLITE_UTF8, SQLITE_STATIC);
68821	}
	@@ -69074,20 +69397,30 @@
69074	assert( p && p->pFunc );
69075	return p->pOut->db;
69076	}
69077
69078	/*
69079	** Return the current time for a statement




69080	*/
69081	SQLITE_PRIVATE sqlite3_int64 sqlite3StmtCurrentTime(sqlite3_context *p){
69082	Vdbe *v = p->pVdbe;
69083	int rc;
69084	if( v->iCurrentTime==0 ){
69085	rc = sqlite3OsCurrentTimeInt64(p->pOut->db->pVfs, &v->iCurrentTime);
69086	if( rc ) v->iCurrentTime = 0;







69087	}
69088	return v->iCurrentTime;
69089	}
69090
69091	/*
69092	** The following is the implementation of an SQL function that always
69093	** fails with an error message stating that the function is used in the
	@@ -69153,10 +69486,15 @@
69153	*/
69154	SQLITE_API void sqlite3_get_auxdata(sqlite3_context pCtx, int iArg){
69155	AuxData *pAuxData;
69156
69157	assert( sqlite3_mutex_held(pCtx->pOut->db->mutex) );





69158	for(pAuxData=pCtx->pVdbe->pAuxData; pAuxData; pAuxData=pAuxData->pNext){
69159	if( pAuxData->iOp==pCtx->iOp && pAuxData->iArg==iArg ) break;
69160	}
69161
69162	return (pAuxData ? pAuxData->pAux : 0);
	@@ -69176,10 +69514,15 @@
69176	AuxData *pAuxData;
69177	Vdbe *pVdbe = pCtx->pVdbe;
69178
69179	assert( sqlite3_mutex_held(pCtx->pOut->db->mutex) );
69180	if( iArg<0 ) goto failed;





69181
69182	for(pAuxData=pVdbe->pAuxData; pAuxData; pAuxData=pAuxData->pNext){
69183	if( pAuxData->iOp==pCtx->iOp && pAuxData->iArg==iArg ) break;
69184	}
69185	if( pAuxData==0 ){
	@@ -71290,11 +71633,11 @@
71290
71291	/* Opcode: String8 * P2 * P4 *
71292	** Synopsis: r[P2]='P4'
71293	**
71294	** P4 points to a nul terminated UTF-8 string. This opcode is transformed
71295	** into a String before it is executed for the first time. During
71296	** this transformation, the length of string P4 is computed and stored
71297	** as the P1 parameter.
71298	*/
71299	case OP_String8: { /* same as TK_STRING, out2-prerelease */
71300	assert( pOp->p4.z!=0 );
	@@ -71322,22 +71665,34 @@
71322	goto too_big;
71323	}
71324	/* Fall through to the next case, OP_String */
71325	}
71326
71327	/* Opcode: String P1 P2 * P4 *
71328	** Synopsis: r[P2]='P4' (len=P1)
71329	**
71330	** The string value P4 of length P1 (bytes) is stored in register P2.





71331	*/
71332	case OP_String: { /* out2-prerelease */
71333	assert( pOp->p4.z!=0 );
71334	pOut->flags = MEM_Str\|MEM_Static\|MEM_Term;
71335	pOut->z = pOp->p4.z;
71336	pOut->n = pOp->p1;
71337	pOut->enc = encoding;
71338	UPDATE_MAX_BLOBSIZE(pOut);







71339	break;
71340	}
71341
71342	/* Opcode: Null P1 P2 P3 * *
71343	** Synopsis: r[P2..P3]=NULL
	@@ -71780,11 +72135,11 @@
71780	** max() aggregate will set to 1 if the current row is not the minimum or
71781	** maximum. The P1 register is initialized to 0 by this instruction.
71782	**
71783	** The interface used by the implementation of the aforementioned functions
71784	** to retrieve the collation sequence set by this opcode is not available
71785	** publicly, only to user functions defined in func.c.
71786	*/
71787	case OP_CollSeq: {
71788	assert( pOp->p4type==P4_COLLSEQ );
71789	if( pOp->p1 ){
71790	sqlite3VdbeMemSetInt64(&aMem[pOp->p1], 0);
	@@ -73325,11 +73680,16 @@
73325	** the value of this counter needs to be restored too. */
73326	p->nStmtDefCons = db->nDeferredCons;
73327	p->nStmtDefImmCons = db->nDeferredImmCons;
73328	}
73329
73330	/* Gather the schema version number for checking */





73331	sqlite3BtreeGetMeta(pBt, BTREE_SCHEMA_VERSION, (u32 *)&iMeta);
73332	iGen = db->aDb[pOp->p1].pSchema->iGeneration;
73333	}else{
73334	iGen = iMeta = 0;
73335	}
	@@ -73493,35 +73853,33 @@
73493	** cursors or a single read/write cursor but not both.
73494	**
73495	** See also OpenRead.
73496	*/
73497	case OP_ReopenIdx: {
73498	VdbeCursor *pCur;
73499
73500	assert( pOp->p5==0 );
73501	assert( pOp->p4type==P4_KEYINFO );
73502	pCur = p->apCsr[pOp->p1];
73503	if( pCur && pCur->pgnoRoot==(u32)pOp->p2 ){
73504	assert( pCur->iDb==pOp->p3 ); /* Guaranteed by the code generator */
73505	break;
73506	}
73507	/* If the cursor is not currently open or is open on a different
73508	** index, then fall through into OP_OpenRead to force a reopen */
73509	}
73510	case OP_OpenRead:
73511	case OP_OpenWrite: {
73512	int nField;
73513	KeyInfo *pKeyInfo;
73514	int p2;
73515	int iDb;
73516	int wrFlag;
73517	Btree *pX;
73518	VdbeCursor *pCur;
73519	Db *pDb;
73520
73521	assert( (pOp->p5&(OPFLAG_P2ISREG\|OPFLAG_BULKCSR))==pOp->p5 );
73522	assert( pOp->opcode==OP_OpenWrite \|\| pOp->p5==0 );












73523	assert( p->bIsReader );
73524	assert( pOp->opcode==OP_OpenRead \|\| pOp->opcode==OP_ReopenIdx
73525	\|\| p->readOnly==0 );
73526
73527	if( p->expired ){
	@@ -73580,18 +73938,21 @@
73580	pCur->nullRow = 1;
73581	pCur->isOrdered = 1;
73582	pCur->pgnoRoot = p2;
73583	rc = sqlite3BtreeCursor(pX, p2, wrFlag, pKeyInfo, pCur->pCursor);
73584	pCur->pKeyInfo = pKeyInfo;
73585	assert( OPFLAG_BULKCSR==BTREE_BULKLOAD );
73586	sqlite3BtreeCursorHints(pCur->pCursor, (pOp->p5 & OPFLAG_BULKCSR));
73587
73588	/* Set the VdbeCursor.isTable variable. Previous versions of
73589	** SQLite used to check if the root-page flags were sane at this point
73590	** and report database corruption if they were not, but this check has
73591	** since moved into the btree layer. */
73592	pCur->isTable = pOp->p4type!=P4_KEYINFO;






73593	break;
73594	}
73595
73596	/* Opcode: OpenEphemeral P1 P2 * P4 P5
73597	** Synopsis: nColumn=P2
	@@ -73848,10 +74209,26 @@
73848	oc = pOp->opcode;
73849	pC->nullRow = 0;
73850	#ifdef SQLITE_DEBUG
73851	pC->seekOp = pOp->opcode;
73852	#endif
















73853	if( pC->isTable ){
73854	/* The input value in P3 might be of any type: integer, real, string,
73855	** blob, or NULL. But it needs to be an integer before we can do
73856	** the seek, so convert it. */
73857	pIn3 = &aMem[pOp->p3];
	@@ -75187,34 +75564,19 @@
75187	**
75188	** See also: Clear
75189	*/
75190	case OP_Destroy: { /* out2-prerelease */
75191	int iMoved;
75192	int iCnt;
75193	Vdbe *pVdbe;
75194	int iDb;
75195
75196	assert( p->readOnly==0 );
75197	#ifndef SQLITE_OMIT_VIRTUALTABLE
75198	iCnt = 0;
75199	for(pVdbe=db->pVdbe; pVdbe; pVdbe = pVdbe->pNext){
75200	if( pVdbe->magic==VDBE_MAGIC_RUN && pVdbe->bIsReader
75201	&& pVdbe->inVtabMethod<2 && pVdbe->pc>=0
75202	){
75203	iCnt++;
75204	}
75205	}
75206	#else
75207	iCnt = db->nVdbeRead;
75208	#endif
75209	pOut->flags = MEM_Null;
75210	if( iCnt>1 ){
75211	rc = SQLITE_LOCKED;
75212	p->errorAction = OE_Abort;
75213	}else{
75214	iDb = pOp->p3;
75215	assert( iCnt==1 );
75216	assert( DbMaskTest(p->btreeMask, iDb) );
75217	iMoved = 0; /* Not needed. Only to silence a warning. */
75218	rc = sqlite3BtreeDropTable(db->aDb[iDb].pBt, pOp->p1, &iMoved);
75219	pOut->flags = MEM_Int;
75220	pOut->u.i = iMoved;
	@@ -75843,14 +76205,16 @@
75843	#endif /* SQLITE_OMIT_AUTOINCREMENT */
75844
75845	/* Opcode: IfPos P1 P2 * * *
75846	** Synopsis: if r[P1]>0 goto P2
75847	**
75848	** If the value of register P1 is 1 or greater, jump to P2.


75849	**
75850	** It is illegal to use this instruction on a register that does
75851	** not contain an integer. An assertion fault will result if you try.
75852	*/
75853	case OP_IfPos: { /* jump, in1 */
75854	pIn1 = &aMem[pOp->p1];
75855	assert( pIn1->flags&MEM_Int );
75856	VdbeBranchTaken( pIn1->u.i>0, 2);
	@@ -75875,27 +76239,63 @@
75875	pc = pOp->p2 - 1;
75876	}
75877	break;
75878	}
75879
75880	/* Opcode: IfZero P1 P2 P3 * *
75881	** Synopsis: r[P1]+=P3, if r[P1]==0 goto P2
75882	**
75883	** The register P1 must contain an integer. Add literal P3 to the
75884	** value in register P1. If the result is exactly 0, jump to P2.

75885	*/
75886	case OP_IfZero: { /* jump, in1 */

















75887	pIn1 = &aMem[pOp->p1];
75888	assert( pIn1->flags&MEM_Int );
75889	pIn1->u.i += pOp->p3;
75890	VdbeBranchTaken(pIn1->u.i==0, 2);
75891	if( pIn1->u.i==0 ){
75892	pc = pOp->p2 - 1;
75893	}
75894	break;
75895	}
75896


















75897	/* Opcode: AggStep * P2 P3 P4 P5
75898	** Synopsis: accum=r[P3] step(r[P2@P5])
75899	**
75900	** Execute the step function for an aggregate. The
75901	** function has P5 arguments. P4 is a pointer to the FuncDef
	@@ -76229,17 +76629,33 @@
76229	break;
76230	}
76231	#endif /* SQLITE_OMIT_VIRTUALTABLE */
76232
76233	#ifndef SQLITE_OMIT_VIRTUALTABLE
76234	/* Opcode: VCreate P1 * * P4 *
76235	**
76236	** P4 is the name of a virtual table in database P1. Call the xCreate method
76237	** for that table.
76238	*/
76239	case OP_VCreate: {
76240	rc = sqlite3VtabCallCreate(db, pOp->p1, pOp->p4.z, &p->zErrMsg);
















76241	break;
76242	}
76243	#endif /* SQLITE_OMIT_VIRTUALTABLE */
76244
76245	#ifndef SQLITE_OMIT_VIRTUALTABLE
	@@ -76247,13 +76663,13 @@
76247	**
76248	** P4 is the name of a virtual table in database P1. Call the xDestroy method
76249	** of that table.
76250	*/
76251	case OP_VDestroy: {
76252	p->inVtabMethod = 2;
76253	rc = sqlite3VtabCallDestroy(db, pOp->p1, pOp->p4.z);
76254	p->inVtabMethod = 0;
76255	break;
76256	}
76257	#endif /* SQLITE_OMIT_VIRTUALTABLE */
76258
76259	#ifndef SQLITE_OMIT_VIRTUALTABLE
	@@ -76265,18 +76681,21 @@
76265	*/
76266	case OP_VOpen: {
76267	VdbeCursor *pCur;
76268	sqlite3_vtab_cursor *pVtabCursor;
76269	sqlite3_vtab *pVtab;
76270	sqlite3_module *pModule;
76271
76272	assert( p->bIsReader );
76273	pCur = 0;
76274	pVtabCursor = 0;
76275	pVtab = pOp->p4.pVtab->pVtab;
76276	pModule = (sqlite3_module *)pVtab->pModule;
76277	assert(pVtab && pModule);



76278	rc = pModule->xOpen(pVtab, &pVtabCursor);
76279	sqlite3VtabImportErrmsg(p, pVtab);
76280	if( SQLITE_OK==rc ){
76281	/* Initialize sqlite3_vtab_cursor base class */
76282	pVtabCursor->pVtab = pVtab;
	@@ -76283,10 +76702,11 @@
76283
76284	/* Initialize vdbe cursor object */
76285	pCur = allocateCursor(p, pOp->p1, 0, -1, 0);
76286	if( pCur ){
76287	pCur->pVtabCursor = pVtabCursor;

76288	}else{
76289	db->mallocFailed = 1;
76290	pModule->xClose(pVtabCursor);
76291	}
76292	}
	@@ -76348,13 +76768,11 @@
76348	apArg = p->apArg;
76349	for(i = 0; i<nArg; i++){
76350	apArg[i] = &pArgc[i+1];
76351	}
76352
76353	p->inVtabMethod = 1;
76354	rc = pModule->xFilter(pVtabCursor, iQuery, pOp->p4.z, nArg, apArg);
76355	p->inVtabMethod = 0;
76356	sqlite3VtabImportErrmsg(p, pVtab);
76357	if( rc==SQLITE_OK ){
76358	res = pModule->xEof(pVtabCursor);
76359	}
76360	VdbeBranchTaken(res!=0,2);
	@@ -76440,13 +76858,11 @@
76440	** underlying implementation to return an error if one occurs during
76441	** xNext(). Instead, if an error occurs, true is returned (indicating that
76442	** data is available) and the error code returned when xColumn or
76443	** some other method is next invoked on the save virtual table cursor.
76444	*/
76445	p->inVtabMethod = 1;
76446	rc = pModule->xNext(pCur->pVtabCursor);
76447	p->inVtabMethod = 0;
76448	sqlite3VtabImportErrmsg(p, pVtab);
76449	if( rc==SQLITE_OK ){
76450	res = pModule->xEof(pCur->pVtabCursor);
76451	}
76452	VdbeBranchTaken(!res,2);
	@@ -76517,11 +76933,11 @@
76517	** P5 is the error actions (OE_Replace, OE_Fail, OE_Ignore, etc) to
76518	** apply in the case of a constraint failure on an insert or update.
76519	*/
76520	case OP_VUpdate: {
76521	sqlite3_vtab *pVtab;
76522	sqlite3_module *pModule;
76523	int nArg;
76524	int i;
76525	sqlite_int64 rowid;
76526	Mem **apArg;
76527	Mem *pX;
	@@ -76529,11 +76945,15 @@
76529	assert( pOp->p2==1 \|\| pOp->p5==OE_Fail \|\| pOp->p5==OE_Rollback
76530	\|\| pOp->p5==OE_Abort \|\| pOp->p5==OE_Ignore \|\| pOp->p5==OE_Replace
76531	);
76532	assert( p->readOnly==0 );
76533	pVtab = pOp->p4.pVtab->pVtab;
76534	pModule = (sqlite3_module *)pVtab->pModule;




76535	nArg = pOp->p2;
76536	assert( pOp->p4type==P4_VTAB );
76537	if( ALWAYS(pModule->xUpdate) ){
76538	u8 vtabOnConflict = db->vtabOnConflict;
76539	apArg = p->apArg;
	@@ -78399,10 +78819,11 @@
78399	sqlite3 db, / Database handle doing sort */
78400	i64 nExtend, /* Attempt to extend file to this size */
78401	sqlite3_file **ppFd
78402	){
78403	int rc;

78404	rc = sqlite3OsOpenMalloc(db->pVfs, 0, ppFd,
78405	SQLITE_OPEN_TEMP_JOURNAL \|
78406	SQLITE_OPEN_READWRITE \| SQLITE_OPEN_CREATE \|
78407	SQLITE_OPEN_EXCLUSIVE \| SQLITE_OPEN_DELETEONCLOSE, &rc
78408	);
	@@ -81990,14 +82411,15 @@
81990	** and the pExpr parameter is returned unchanged.
81991	*/
81992	SQLITE_PRIVATE Expr *sqlite3ExprAddCollateToken(
81993	Parse pParse, / Parsing context */
81994	Expr pExpr, / Add the "COLLATE" clause to this expression */
81995	const Token pCollName / Name of collating sequence */

81996	){
81997	if( pCollName->n>0 ){
81998	Expr *pNew = sqlite3ExprAlloc(pParse->db, TK_COLLATE, pCollName, 1);
81999	if( pNew ){
82000	pNew->pLeft = pExpr;
82001	pNew->flags \|= EP_Collate\|EP_Skip;
82002	pExpr = pNew;
82003	}
	@@ -82007,11 +82429,11 @@
82007	SQLITE_PRIVATE Expr sqlite3ExprAddCollateString(Parse pParse, Expr pExpr, const char zC){
82008	Token s;
82009	assert( zC!=0 );
82010	s.z = zC;
82011	s.n = sqlite3Strlen30(s.z);
82012	return sqlite3ExprAddCollateToken(pParse, pExpr, &s);
82013	}
82014
82015	/*
82016	** Skip over any TK_COLLATE or TK_AS operators and any unlikely()
82017	** or likelihood() function at the root of an expression.
	@@ -82317,10 +82739,11 @@
82317	**
82318	** Also propagate all EP_Propagate flags from the Expr.x.pList into
82319	** Expr.flags.
82320	*/
82321	SQLITE_PRIVATE void sqlite3ExprSetHeightAndFlags(Parse pParse, Expr p){

82322	exprSetHeight(p);
82323	sqlite3ExprCheckHeight(pParse, p->nHeight);
82324	}
82325
82326	/*
	@@ -87031,11 +87454,14 @@
87031	/* Ensure the default expression is something that sqlite3ValueFromExpr()
87032	** can handle (i.e. not CURRENT_TIME etc.)
87033	*/
87034	if( pDflt ){
87035	sqlite3_value *pVal = 0;
87036	if( sqlite3ValueFromExpr(db, pDflt, SQLITE_UTF8, SQLITE_AFF_NONE, &pVal) ){



87037	db->mallocFailed = 1;
87038	return;
87039	}
87040	if( !pVal ){
87041	sqlite3ErrorMsg(pParse, "Cannot add a column with non-constant default");
	@@ -93094,10 +93520,11 @@
93094	}
93095	if( pIdx->onError==OE_Default ){
93096	pIdx->onError = pIndex->onError;
93097	}
93098	}

93099	goto exit_create_index;
93100	}
93101	}
93102	}
93103
	@@ -95553,11 +95980,13 @@
95553
95554	/*
95555	** Return the collating function associated with a function.
95556	*/
95557	static CollSeq sqlite3GetFuncCollSeq(sqlite3_context context){
95558	VdbeOp *pOp = &context->pVdbe->aOp[context->iOp-1];


95559	assert( pOp->opcode==OP_CollSeq );
95560	assert( pOp->p4type==P4_COLLSEQ );
95561	return pOp->p4.pColl;
95562	}
95563
	@@ -97181,10 +97610,15 @@
97181	** pExpr points to an expression which implements a function. If
97182	** it is appropriate to apply the LIKE optimization to that function
97183	** then set aWc[0] through aWc[2] to the wildcard characters and
97184	** return TRUE. If the function is not a LIKE-style function then
97185	** return FALSE.





97186	*/
97187	SQLITE_PRIVATE int sqlite3IsLikeFunction(sqlite3 db, Expr pExpr, int pIsNocase, char aWc){
97188	FuncDef *pDef;
97189	if( pExpr->op!=TK_FUNCTION
97190	\|\| !pExpr->x.pList
	@@ -102972,10 +103406,21 @@
102972	}
102973
102974	/* Send an SQLITE_FCNTL_PRAGMA file-control to the underlying VFS
102975	** connection. If it returns SQLITE_OK, then assume that the VFS
102976	** handled the pragma and generate a no-op prepared statement.











102977	*/
102978	aFcntl[0] = 0;
102979	aFcntl[1] = zLeft;
102980	aFcntl[2] = zRight;
102981	aFcntl[3] = 0;
	@@ -103732,34 +104177,46 @@
103732	Index *pIdx;
103733	Table *pTab;
103734	pIdx = sqlite3FindIndex(db, zRight, zDb);
103735	if( pIdx ){
103736	int i;
103737	int mx = pPragma->iArg ? pIdx->nColumn : pIdx->nKeyCol;









103738	pTab = pIdx->pTable;
103739	sqlite3VdbeSetNumCols(v, 6);
103740	pParse->nMem = 6;
103741	sqlite3CodeVerifySchema(pParse, iDb);
103742	sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "seqno", SQLITE_STATIC);
103743	sqlite3VdbeSetColName(v, 1, COLNAME_NAME, "cid", SQLITE_STATIC);
103744	sqlite3VdbeSetColName(v, 2, COLNAME_NAME, "name", SQLITE_STATIC);
103745	sqlite3VdbeSetColName(v, 3, COLNAME_NAME, "desc", SQLITE_STATIC);
103746	sqlite3VdbeSetColName(v, 4, COLNAME_NAME, "coll", SQLITE_STATIC);
103747	sqlite3VdbeSetColName(v, 5, COLNAME_NAME, "key", SQLITE_STATIC);


103748	for(i=0; i<mx; i++){
103749	i16 cnum = pIdx->aiColumn[i];
103750	sqlite3VdbeAddOp2(v, OP_Integer, i, 1);
103751	sqlite3VdbeAddOp2(v, OP_Integer, cnum, 2);
103752	if( cnum<0 ){
103753	sqlite3VdbeAddOp2(v, OP_Null, 0, 3);
103754	}else{
103755	sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, pTab->aCol[cnum].zName, 0);
103756	}
103757	sqlite3VdbeAddOp2(v, OP_Integer, pIdx->aSortOrder[i], 4);
103758	sqlite3VdbeAddOp4(v, OP_String8, 0, 5, 0, pIdx->azColl[i], 0);
103759	sqlite3VdbeAddOp2(v, OP_Integer, i<pIdx->nKeyCol, 6);
103760	sqlite3VdbeAddOp2(v, OP_ResultRow, 1, 6);


103761	}
103762	}
103763	}
103764	break;
103765
	@@ -104457,12 +104914,13 @@
104457	#endif
104458
104459	/*
104460	** PRAGMA shrink_memory
104461	**
104462	** This pragma attempts to free as much memory as possible from the
104463	** current database connection.

104464	*/
104465	case PragTyp_SHRINK_MEMORY: {
104466	sqlite3_db_release_memory(db);
104467	break;
104468	}
	@@ -104487,12 +104945,16 @@
104487
104488	/*
104489	** PRAGMA soft_heap_limit
104490	** PRAGMA soft_heap_limit = N
104491	**
104492	** Call sqlite3_soft_heap_limit64(N). Return the result. If N is omitted,
104493	** use -1.




104494	*/
104495	case PragTyp_SOFT_HEAP_LIMIT: {
104496	sqlite3_int64 N;
104497	if( zRight && sqlite3DecOrHexToI64(zRight, &N)==SQLITE_OK ){
104498	sqlite3_soft_heap_limit64(N);
	@@ -106065,24 +106527,21 @@
106065	}else{
106066	op = OP_IdxInsert;
106067	}
106068	sqlite3VdbeAddOp2(v, op, pSort->iECursor, regRecord);
106069	if( pSelect->iLimit ){
106070	int addr1, addr2;
106071	int iLimit;
106072	if( pSelect->iOffset ){
106073	iLimit = pSelect->iOffset+1;
106074	}else{
106075	iLimit = pSelect->iLimit;
106076	}
106077	addr1 = sqlite3VdbeAddOp1(v, OP_IfZero, iLimit); VdbeCoverage(v);
106078	sqlite3VdbeAddOp2(v, OP_AddImm, iLimit, -1);
106079	addr2 = sqlite3VdbeAddOp0(v, OP_Goto);
106080	sqlite3VdbeJumpHere(v, addr1);
106081	sqlite3VdbeAddOp1(v, OP_Last, pSort->iECursor);
106082	sqlite3VdbeAddOp1(v, OP_Delete, pSort->iECursor);
106083	sqlite3VdbeJumpHere(v, addr2);
106084	}
106085	}
106086
106087	/*
106088	** Add code to implement the OFFSET
	@@ -106475,11 +106934,11 @@
106475	/* Jump to the end of the loop if the LIMIT is reached. Except, if
106476	** there is a sorter, in which case the sorter has already limited
106477	** the output for us.
106478	*/
106479	if( pSort==0 && p->iLimit ){
106480	sqlite3VdbeAddOp3(v, OP_IfZero, p->iLimit, iBreak, -1); VdbeCoverage(v);
106481	}
106482	}
106483
106484	/*
106485	** Allocate a KeyInfo object sufficient for an index of N key columns and
	@@ -107328,11 +107787,11 @@
107328	}
107329	}else{
107330	sqlite3ExprCode(pParse, p->pLimit, iLimit);
107331	sqlite3VdbeAddOp1(v, OP_MustBeInt, iLimit); VdbeCoverage(v);
107332	VdbeComment((v, "LIMIT counter"));
107333	sqlite3VdbeAddOp2(v, OP_IfZero, iLimit, iBreak); VdbeCoverage(v);
107334	}
107335	if( p->pOffset ){
107336	p->iOffset = iOffset = ++pParse->nMem;
107337	pParse->nMem++; /* Allocate an extra register for limit+offset */
107338	sqlite3ExprCode(pParse, p->pOffset, iOffset);
	@@ -107547,11 +108006,11 @@
107547	addrCont = sqlite3VdbeMakeLabel(v);
107548	codeOffset(v, regOffset, addrCont);
107549	selectInnerLoop(pParse, p, p->pEList, iCurrent,
107550	0, 0, pDest, addrCont, addrBreak);
107551	if( regLimit ){
107552	sqlite3VdbeAddOp3(v, OP_IfZero, regLimit, addrBreak, -1);
107553	VdbeCoverage(v);
107554	}
107555	sqlite3VdbeResolveLabel(v, addrCont);
107556
107557	/* Execute the recursive SELECT taking the single row in Current as
	@@ -107772,11 +108231,11 @@
107772	}
107773	p->pPrior = 0;
107774	p->iLimit = pPrior->iLimit;
107775	p->iOffset = pPrior->iOffset;
107776	if( p->iLimit ){
107777	addr = sqlite3VdbeAddOp1(v, OP_IfZero, p->iLimit); VdbeCoverage(v);
107778	VdbeComment((v, "Jump ahead if LIMIT reached"));
107779	}
107780	explainSetInteger(iSub2, pParse->iNextSelectId);
107781	rc = sqlite3Select(pParse, p, &dest);
107782	testcase( rc!=SQLITE_OK );
	@@ -108173,11 +108632,11 @@
108173	}
108174
108175	/* Jump to the end of the loop if the LIMIT is reached.
108176	*/
108177	if( p->iLimit ){
108178	sqlite3VdbeAddOp3(v, OP_IfZero, p->iLimit, iBreak, -1); VdbeCoverage(v);
108179	}
108180
108181	/* Generate the subroutine return
108182	*/
108183	sqlite3VdbeResolveLabel(v, iContinue);
	@@ -109540,11 +109999,11 @@
109540	sqlite3WalkSelect(pWalker, bMayRecursive ? pSel->pPrior : pSel);
109541
109542	for(pLeft=pSel; pLeft->pPrior; pLeft=pLeft->pPrior);
109543	pEList = pLeft->pEList;
109544	if( pCte->pCols ){
109545	if( pEList->nExpr!=pCte->pCols->nExpr ){
109546	sqlite3ErrorMsg(pParse, "table %s has %d values for %d columns",
109547	pCte->zName, pEList->nExpr, pCte->pCols->nExpr
109548	);
109549	pParse->pWith = pSavedWith;
109550	return SQLITE_ERROR;
	@@ -113966,10 +114425,11 @@
113966	*/
113967	if( !db->init.busy ){
113968	char *zStmt;
113969	char *zWhere;
113970	int iDb;

113971	Vdbe *v;
113972
113973	/* Compute the complete text of the CREATE VIRTUAL TABLE statement */
113974	if( pEnd ){
113975	pParse->sNameToken.n = (int)(pEnd->z - pParse->sNameToken.z) + pEnd->n;
	@@ -114000,12 +114460,14 @@
114000	sqlite3ChangeCookie(pParse, iDb);
114001
114002	sqlite3VdbeAddOp2(v, OP_Expire, 0, 0);
114003	zWhere = sqlite3MPrintf(db, "name='%q' AND type='table'", pTab->zName);
114004	sqlite3VdbeAddParseSchemaOp(v, iDb, zWhere);
114005	sqlite3VdbeAddOp4(v, OP_VCreate, iDb, 0, 0,
114006	pTab->zName, sqlite3Strlen30(pTab->zName) + 1);


114007	}
114008
114009	/* If we are rereading the sqlite_master table create the in-memory
114010	** record of the table. The xConnect() method is not called until
114011	** the first time the virtual table is used in an SQL statement. This
	@@ -114354,15 +114816,19 @@
114354	int rc = SQLITE_OK;
114355	Table *pTab;
114356
114357	pTab = sqlite3FindTable(db, zTab, db->aDb[iDb].zName);
114358	if( ALWAYS(pTab!=0 && pTab->pVTable!=0) ){
114359	VTable *p = vtabDisconnectAll(db, pTab);
114360
114361	assert( rc==SQLITE_OK );





114362	rc = p->pMod->pModule->xDestroy(p->pVtab);
114363
114364	/* Remove the sqlite3_vtab* from the aVTrans[] array, if applicable */
114365	if( rc==SQLITE_OK ){
114366	assert( pTab->pVTable==p && p->pNext==0 );
114367	p->pVtab = 0;
114368	pTab->pVTable = 0;
	@@ -114787,10 +115253,12 @@
114787	int addrNxt; /* Jump here to start the next IN combination */
114788	int addrSkip; /* Jump here for next iteration of skip-scan */
114789	int addrCont; /* Jump here to continue with the next loop cycle */
114790	int addrFirst; /* First instruction of interior of the loop */
114791	int addrBody; /* Beginning of the body of this loop */


114792	u8 iFrom; /* Which entry in the FROM clause */
114793	u8 op, p3, p5; /* Opcode, P3 & P5 of the opcode that ends the loop */
114794	int p1, p2; /* Operands of the opcode used to ends the loop */
114795	union { /* Information that depends on pWLoop->wsFlags */
114796	struct {
	@@ -114971,11 +115439,11 @@
114971	WhereOrInfo pOrInfo; / Extra information if (eOperator & WO_OR)!=0 */
114972	WhereAndInfo pAndInfo; / Extra information if (eOperator& WO_AND)!=0 */
114973	} u;
114974	LogEst truthProb; /* Probability of truth for this expression */
114975	u16 eOperator; /* A WO_xx value describing <op> */
114976	u8 wtFlags; /* TERM_xxx bit flags. See below */
114977	u8 nChild; /* Number of children that must disable us */
114978	WhereClause pWC; / The clause this term is part of */
114979	Bitmask prereqRight; /* Bitmask of tables used by pExpr->pRight */
114980	Bitmask prereqAll; /* Bitmask of tables referenced by pExpr */
114981	};
	@@ -114993,10 +115461,13 @@
114993	#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
114994	# define TERM_VNULL 0x80 /* Manufactured x>NULL or x<=NULL term */
114995	#else
114996	# define TERM_VNULL 0x00 /* Disabled if not using stat3 */
114997	#endif



114998
114999	/*
115000	** An instance of the WhereScan object is used as an iterator for locating
115001	** terms in the WHERE clause that are useful to the query planner.
115002	*/
	@@ -115368,11 +115839,11 @@
115368	** WARNING: This routine might reallocate the space used to store
115369	** WhereTerms. All pointers to WhereTerms should be invalidated after
115370	** calling this routine. Such pointers may be reinitialized by referencing
115371	** the pWC->a[] array.
115372	*/
115373	static int whereClauseInsert(WhereClause pWC, Expr p, u8 wtFlags){
115374	WhereTerm *pTerm;
115375	int idx;
115376	testcase( wtFlags & TERM_VIRTUAL );
115377	if( pWC->nTerm>=pWC->nSlot ){
115378	WhereTerm *pOld = pWC->a;
	@@ -115793,11 +116264,15 @@
115793	** Check to see if the given expression is a LIKE or GLOB operator that
115794	** can be optimized using inequality constraints. Return TRUE if it is
115795	** so and false if not.
115796	**
115797	** In order for the operator to be optimizible, the RHS must be a string
115798	** literal that does not begin with a wildcard.




115799	*/
115800	static int isLikeOrGlob(
115801	Parse pParse, / Parsing and code generating context */
115802	Expr pExpr, / Test this expression */
115803	Expr *ppPrefix, / Pointer to TK_STRING expression with pattern prefix */
	@@ -115822,11 +116297,11 @@
115822	#endif
115823	pList = pExpr->x.pList;
115824	pLeft = pList->a[1].pExpr;
115825	if( pLeft->op!=TK_COLUMN
115826	\|\| sqlite3ExprAffinity(pLeft)!=SQLITE_AFF_TEXT
115827	\|\| IsVirtual(pLeft->pTab)
115828	){
115829	/* IMP: R-02065-49465 The left-hand side of the LIKE or GLOB operator must
115830	** be the name of an indexed column with TEXT affinity. */
115831	return 0;
115832	}
	@@ -115931,10 +116406,83 @@
115931	static void markTermAsChild(WhereClause *pWC, int iChild, int iParent){
115932	pWC->a[iChild].iParent = iParent;
115933	pWC->a[iChild].truthProb = pWC->a[iParent].truthProb;
115934	pWC->a[iParent].nChild++;
115935	}









































































115936
115937	#if !defined(SQLITE_OMIT_OR_OPTIMIZATION) && !defined(SQLITE_OMIT_SUBQUERY)
115938	/*
115939	** Analyze a term that consists of two or more OR-connected
115940	** subterms. So in:
	@@ -115956,10 +116504,11 @@
115956	** (A) t1.x=t2.y OR t1.x=t2.z OR t1.y=15 OR t1.z=t3.a+5
115957	** (B) x=expr1 OR expr2=x OR x=expr3
115958	** (C) t1.x=t2.y OR (t1.x=t2.z AND t1.y=15)
115959	** (D) x=expr1 OR (y>11 AND y<22 AND z LIKE 'hello')
115960	** (E) (p.a=1 AND q.b=2 AND r.c=3) OR (p.x=4 AND q.y=5 AND r.z=6)

115961	**
115962	** CASE 1:
115963	**
115964	** If all subterms are of the form T.C=expr for some single column of C and
115965	** a single table T (as shown in example B above) then create a new virtual
	@@ -115971,10 +116520,20 @@
115971	** then create a new virtual term like this:
115972	**
115973	** x IN (expr1,expr2,expr3)
115974	**
115975	** CASE 2:










115976	**
115977	** If all subterms are indexable by a single table T, then set
115978	**
115979	** WhereTerm.eOperator = WO_OR
115980	** WhereTerm.u.pOrInfo->indexable \|= the cursor number for table T
	@@ -116098,15 +116657,29 @@
116098	}
116099	}
116100	}
116101
116102	/*
116103	** Record the set of tables that satisfy case 2. The set might be
116104	** empty.
116105	*/
116106	pOrInfo->indexable = indexable;
116107	pTerm->eOperator = indexable==0 ? 0 : WO_OR;














116108
116109	/*
116110	** chngToIN holds a set of tables that might satisfy case 1. But
116111	** we have to do some additional checking to see if case 1 really
116112	** is satisfied.
	@@ -116233,11 +116806,11 @@
116233	pTerm = &pWC->a[idxTerm];
116234	markTermAsChild(pWC, idxNew, idxTerm);
116235	}else{
116236	sqlite3ExprListDelete(db, pList);
116237	}
116238	pTerm->eOperator = WO_NOOP; /* case 1 trumps case 2 */
116239	}
116240	}
116241	}
116242	#endif /* !SQLITE_OMIT_OR_OPTIMIZATION && !SQLITE_OMIT_SUBQUERY */
116243
	@@ -116271,11 +116844,11 @@
116271	Bitmask prereqLeft; /* Prerequesites of the pExpr->pLeft */
116272	Bitmask prereqAll; /* Prerequesites of pExpr */
116273	Bitmask extraRight = 0; /* Extra dependencies on LEFT JOIN */
116274	Expr pStr1 = 0; / RHS of LIKE/GLOB operator */
116275	int isComplete = 0; /* RHS of LIKE/GLOB ends with wildcard */
116276	int noCase = 0; /* LIKE/GLOB distinguishes case */
116277	int op; /* Top-level operator. pExpr->op */
116278	Parse pParse = pWInfo->pParse; / Parsing context */
116279	sqlite3 db = pParse->db; / Database connection */
116280
116281	if( db->mallocFailed ){
	@@ -116409,16 +116982,19 @@
116409
116410	#ifndef SQLITE_OMIT_LIKE_OPTIMIZATION
116411	/* Add constraints to reduce the search space on a LIKE or GLOB
116412	** operator.
116413	**
116414	** A like pattern of the form "x LIKE 'abc%'" is changed into constraints
116415	**
116416	** x>='abc' AND x<'abd' AND x LIKE 'abc%'
116417	**
116418	** The last character of the prefix "abc" is incremented to form the
116419	** termination condition "abd".



116420	*/
116421	if( pWC->op==TK_AND
116422	&& isLikeOrGlob(pParse, pExpr, &pStr1, &isComplete, &noCase)
116423	){
116424	Expr pLeft; / LHS of LIKE/GLOB operator */
	@@ -116425,14 +117001,30 @@
116425	Expr pStr2; / Copy of pStr1 - RHS of LIKE/GLOB operator */
116426	Expr *pNewExpr1;
116427	Expr *pNewExpr2;
116428	int idxNew1;
116429	int idxNew2;
116430	Token sCollSeqName; /* Name of collating sequence */

116431
116432	pLeft = pExpr->x.pList->a[1].pExpr;
116433	pStr2 = sqlite3ExprDup(db, pStr1, 0);















116434	if( !db->mallocFailed ){
116435	u8 c, pC; / Last character before the first wildcard */
116436	pC = (u8*)&pStr2->u.zToken[sqlite3Strlen30(pStr2->u.zToken)-1];
116437	c = *pC;
116438	if( noCase ){
	@@ -116445,26 +117037,25 @@
116445	if( c=='A'-1 ) isComplete = 0;
116446	c = sqlite3UpperToLower[c];
116447	}
116448	*pC = c + 1;
116449	}
116450	sCollSeqName.z = noCase ? "NOCASE" : "BINARY";
116451	sCollSeqName.n = 6;
116452	pNewExpr1 = sqlite3ExprDup(db, pLeft, 0);
116453	pNewExpr1 = sqlite3PExpr(pParse, TK_GE,
116454	sqlite3ExprAddCollateToken(pParse,pNewExpr1,&sCollSeqName),
116455	pStr1, 0);
116456	transferJoinMarkings(pNewExpr1, pExpr);
116457	idxNew1 = whereClauseInsert(pWC, pNewExpr1, TERM_VIRTUAL\|TERM_DYNAMIC);
116458	testcase( idxNew1==0 );
116459	exprAnalyze(pSrc, pWC, idxNew1);
116460	pNewExpr2 = sqlite3ExprDup(db, pLeft, 0);
116461	pNewExpr2 = sqlite3PExpr(pParse, TK_LT,
116462	sqlite3ExprAddCollateToken(pParse,pNewExpr2,&sCollSeqName),
116463	pStr2, 0);
116464	transferJoinMarkings(pNewExpr2, pExpr);
116465	idxNew2 = whereClauseInsert(pWC, pNewExpr2, TERM_VIRTUAL\|TERM_DYNAMIC);
116466	testcase( idxNew2==0 );
116467	exprAnalyze(pSrc, pWC, idxNew2);
116468	pTerm = &pWC->a[idxTerm];
116469	if( isComplete ){
116470	markTermAsChild(pWC, idxNew1, idxTerm);
	@@ -117074,15 +117665,18 @@
117074	#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
117075	/*
117076	** Estimate the location of a particular key among all keys in an
117077	** index. Store the results in aStat as follows:
117078	**
117079	** aStat[0] Est. number of rows less than pVal
117080	** aStat[1] Est. number of rows equal to pVal
117081	**
117082	** Return the index of the sample that is the smallest sample that
117083	** is greater than or equal to pRec.



117084	*/
117085	static int whereKeyStats(
117086	Parse pParse, / Database connection */
117087	Index pIdx, / Index to consider domain of */
117088	UnpackedRecord pRec, / Vector of values to consider */
	@@ -117089,71 +117683,162 @@
117089	int roundUp, /* Round up if true. Round down if false */
117090	tRowcnt aStat / OUT: stats written here */
117091	){
117092	IndexSample *aSample = pIdx->aSample;
117093	int iCol; /* Index of required stats in anEq[] etc. */


117094	int iMin = 0; /* Smallest sample not yet tested */
117095	int i = pIdx->nSample; /* Smallest sample larger than or equal to pRec */
117096	int iTest; /* Next sample to test */
117097	int res; /* Result of comparison operation */


117098
117099	#ifndef SQLITE_DEBUG
117100	UNUSED_PARAMETER( pParse );
117101	#endif
117102	assert( pRec!=0 );
117103	iCol = pRec->nField - 1;
117104	assert( pIdx->nSample>0 );
117105	assert( pRec->nField>0 && iCol<pIdx->nSampleCol );
















































117106	do{
117107	iTest = (iMin+i)/2;
117108	res = sqlite3VdbeRecordCompare(aSample[iTest].n, aSample[iTest].p, pRec);
















117109	if( res<0 ){




117110	iMin = iTest+1;

117111	}else{
117112	i = iTest;

117113	}
117114	}while( res && iMin<i );

117115
117116	#ifdef SQLITE_DEBUG
117117	/* The following assert statements check that the binary search code
117118	** above found the right answer. This block serves no purpose other
117119	** than to invoke the asserts. */
117120	if( res==0 ){
117121	/* If (res==0) is true, then sample $i must be equal to pRec */
117122	assert( i<pIdx->nSample );
117123	assert( 0==sqlite3VdbeRecordCompare(aSample[i].n, aSample[i].p, pRec)
117124	\|\| pParse->db->mallocFailed );
117125	}else{
117126	/* Otherwise, pRec must be smaller than sample $i and larger than
117127	** sample ($i-1). */
117128	assert( i==pIdx->nSample
117129	\|\| sqlite3VdbeRecordCompare(aSample[i].n, aSample[i].p, pRec)>0
117130	\|\| pParse->db->mallocFailed );
117131	assert( i==0
117132	\|\| sqlite3VdbeRecordCompare(aSample[i-1].n, aSample[i-1].p, pRec)<0
117133	\|\| pParse->db->mallocFailed );




















117134	}
117135	#endif /* ifdef SQLITE_DEBUG */
117136
117137	/* At this point, aSample[i] is the first sample that is greater than
117138	** or equal to pVal. Or if i==pIdx->nSample, then all samples are less
117139	** than pVal. If aSample[i]==pVal, then res==0.
117140	*/
117141	if( res==0 ){


117142	aStat[0] = aSample[i].anLt[iCol];
117143	aStat[1] = aSample[i].anEq[iCol];
117144	}else{
117145	tRowcnt iLower, iUpper, iGap;
117146	if( i==0 ){
117147	iLower = 0;
117148	iUpper = aSample[0].anLt[iCol];


117149	}else{
117150	i64 nRow0 = sqlite3LogEstToInt(pIdx->aiRowLogEst[0]);
117151	iUpper = i>=pIdx->nSample ? nRow0 : aSample[i].anLt[iCol];
117152	iLower = aSample[i-1].anEq[iCol] + aSample[i-1].anLt[iCol];
117153	}
117154	aStat[1] = pIdx->aAvgEq[iCol];
117155	if( iLower>=iUpper ){
117156	iGap = 0;
117157	}else{
117158	iGap = iUpper - iLower;
117159	}
	@@ -117161,11 +117846,15 @@
117161	iGap = (iGap*2)/3;
117162	}else{
117163	iGap = iGap/3;
117164	}
117165	aStat[0] = iLower + iGap;

117166	}



117167	return i;
117168	}
117169	#endif /* SQLITE_ENABLE_STAT3_OR_STAT4 */
117170
117171	/*
	@@ -117635,24 +118324,47 @@
117635	** by indices, we disable them to prevent redundant tests in the inner
117636	** loop. We would get the correct results if nothing were ever disabled,
117637	** but joins might run a little slower. The trick is to disable as much
117638	** as we can without disabling too much. If we disabled in (1), we'd get
117639	** the wrong answer. See ticket #813.



















117640	*/
117641	static void disableTerm(WhereLevel pLevel, WhereTerm pTerm){
117642	if( pTerm

117643	&& (pTerm->wtFlags & TERM_CODED)==0
117644	&& (pLevel->iLeftJoin==0 \|\| ExprHasProperty(pTerm->pExpr, EP_FromJoin))
117645	&& (pLevel->notReady & pTerm->prereqAll)==0
117646	){
117647	pTerm->wtFlags \|= TERM_CODED;
117648	if( pTerm->iParent>=0 ){
117649	WhereTerm *pOther = &pTerm->pWC->a[pTerm->iParent];
117650	if( (--pOther->nChild)==0 ){
117651	disableTerm(pLevel, pOther);
117652	}
117653	}





117654	}
117655	}
117656
117657	/*
117658	** Code an OP_Affinity opcode to apply the column affinity string zAff
	@@ -118132,11 +118844,38 @@
118132	}
118133	#else
118134	# define addScanStatus(a, b, c, d) ((void)d)
118135	#endif
118136
118137



























118138
118139	/*
118140	** Generate code for the start of the iLevel-th loop in the WHERE clause
118141	** implementation described by pWInfo.
118142	*/
	@@ -118462,14 +119201,29 @@
118462	*/
118463	j = nEq;
118464	if( pLoop->wsFlags & WHERE_BTM_LIMIT ){
118465	pRangeStart = pLoop->aLTerm[j++];
118466	nExtraReg = 1;



118467	}
118468	if( pLoop->wsFlags & WHERE_TOP_LIMIT ){
118469	pRangeEnd = pLoop->aLTerm[j++];
118470	nExtraReg = 1;












118471	if( pRangeStart==0
118472	&& (j = pIdx->aiColumn[nEq])>=0
118473	&& pIdx->pTable->aCol[j].notNull==0
118474	){
118475	bSeekPastNull = 1;
	@@ -118508,10 +119262,11 @@
118508	/* Seek the index cursor to the start of the range. */
118509	nConstraint = nEq;
118510	if( pRangeStart ){
118511	Expr *pRight = pRangeStart->pExpr->pRight;
118512	sqlite3ExprCode(pParse, pRight, regBase+nEq);

118513	if( (pRangeStart->wtFlags & TERM_VNULL)==0
118514	&& sqlite3ExprCanBeNull(pRight)
118515	){
118516	sqlite3VdbeAddOp2(v, OP_IsNull, regBase+nEq, addrNxt);
118517	VdbeCoverage(v);
	@@ -118553,10 +119308,11 @@
118553	nConstraint = nEq;
118554	if( pRangeEnd ){
118555	Expr *pRight = pRangeEnd->pExpr->pRight;
118556	sqlite3ExprCacheRemove(pParse, regBase+nEq, 1);
118557	sqlite3ExprCode(pParse, pRight, regBase+nEq);

118558	if( (pRangeEnd->wtFlags & TERM_VNULL)==0
118559	&& sqlite3ExprCanBeNull(pRight)
118560	){
118561	sqlite3VdbeAddOp2(v, OP_IsNull, regBase+nEq, addrNxt);
118562	VdbeCoverage(v);
	@@ -118780,11 +119536,12 @@
118780	** eliminating duplicates from other WHERE clauses, the action for each
118781	** sub-WHERE clause is to to invoke the main loop body as a subroutine.
118782	*/
118783	wctrlFlags = WHERE_OMIT_OPEN_CLOSE
118784	\| WHERE_FORCE_TABLE
118785	\| WHERE_ONETABLE_ONLY;

118786	for(ii=0; ii<pOrWc->nTerm; ii++){
118787	WhereTerm *pOrTerm = &pOrWc->a[ii];
118788	if( pOrTerm->leftCursor==iCur \|\| (pOrTerm->eOperator & WO_AND)!=0 ){
118789	WhereInfo pSubWInfo; / Info for single OR-term scan */
118790	Expr pOrExpr = pOrTerm->pExpr; / Current OR clause term */
	@@ -118942,10 +119699,11 @@
118942	/* Insert code to test every subexpression that can be completely
118943	** computed using the current set of tables.
118944	*/
118945	for(pTerm=pWC->a, j=pWC->nTerm; j>0; j--, pTerm++){
118946	Expr *pE;

118947	testcase( pTerm->wtFlags & TERM_VIRTUAL );
118948	testcase( pTerm->wtFlags & TERM_CODED );
118949	if( pTerm->wtFlags & (TERM_VIRTUAL\|TERM_CODED) ) continue;
118950	if( (pTerm->prereqAll & pLevel->notReady)!=0 ){
118951	testcase( pWInfo->untestedTerms==0
	@@ -118955,12 +119713,18 @@
118955	}
118956	pE = pTerm->pExpr;
118957	assert( pE!=0 );
118958	if( pLevel->iLeftJoin && !ExprHasProperty(pE, EP_FromJoin) ){
118959	continue;





118960	}
118961	sqlite3ExprIfFalse(pParse, pE, addrCont, SQLITE_JUMPIFNULL);

118962	pTerm->wtFlags \|= TERM_CODED;
118963	}
118964
118965	/* Insert code to test for implied constraints based on transitivity
118966	** of the "==" operator.
	@@ -119621,10 +120385,14 @@
119621	){
119622	continue; /* ignore IS [NOT] NULL constraints on NOT NULL columns */
119623	}
119624	if( pTerm->prereqRight & pNew->maskSelf ) continue;
119625




119626	pNew->wsFlags = saved_wsFlags;
119627	pNew->u.btree.nEq = saved_nEq;
119628	pNew->nLTerm = saved_nLTerm;
119629	if( whereLoopResize(db, pNew, pNew->nLTerm+1) ) break; /* OOM */
119630	pNew->aLTerm[pNew->nLTerm++] = pTerm;
	@@ -119664,10 +120432,21 @@
119664	testcase( eOp & WO_GT );
119665	testcase( eOp & WO_GE );
119666	pNew->wsFlags \|= WHERE_COLUMN_RANGE\|WHERE_BTM_LIMIT;
119667	pBtm = pTerm;
119668	pTop = 0;











119669	}else{
119670	assert( eOp & (WO_LT\|WO_LE) );
119671	testcase( eOp & WO_LT );
119672	testcase( eOp & WO_LE );
119673	pNew->wsFlags \|= WHERE_COLUMN_RANGE\|WHERE_TOP_LIMIT;
	@@ -119974,10 +120753,11 @@
119974	rLogSize = estLog(rSize);
119975
119976	#ifndef SQLITE_OMIT_AUTOMATIC_INDEX
119977	/* Automatic indexes */
119978	if( !pBuilder->pOrSet

119979	&& (pWInfo->pParse->db->flags & SQLITE_AutoIndex)!=0
119980	&& pSrc->pIndex==0
119981	&& !pSrc->viaCoroutine
119982	&& !pSrc->notIndexed
119983	&& HasRowid(pTab)
	@@ -120857,14 +121637,14 @@
120857	assert( aSortCost==0 \|\| &pSpace[nSpace]==(char*)&aSortCost[nOrderBy] );
120858	assert( aSortCost!=0 \|\| &pSpace[nSpace]==(char*)pX );
120859
120860	/* Seed the search with a single WherePath containing zero WhereLoops.
120861	**
120862	** TUNING: Do not let the number of iterations go above 25. If the cost
120863	** of computing an automatic index is not paid back within the first 25
120864	** rows, then do not use the automatic index. */
120865	aFrom[0].nRow = MIN(pParse->nQueryLoop, 46); assert( 46==sqlite3LogEst(25) );
120866	nFrom = 1;
120867	assert( aFrom[0].isOrdered==0 );
120868	if( nOrderBy ){
120869	/* If nLoop is zero, then there are no FROM terms in the query. Since
120870	** in this case the query may return a maximum of one row, the results
	@@ -121658,10 +122438,16 @@
121658	assert( pIx->pSchema==pTab->pSchema );
121659	assert( iIndexCur>=0 );
121660	if( op ){
121661	sqlite3VdbeAddOp3(v, op, iIndexCur, pIx->tnum, iDb);
121662	sqlite3VdbeSetP4KeyInfo(pParse, pIx);






121663	VdbeComment((v, "%s", pIx->zName));
121664	}
121665	}
121666	if( iDb>=0 ) sqlite3CodeVerifySchema(pParse, iDb);
121667	notReady &= ~getMask(&pWInfo->sMaskSet, pTabItem->iCursor);
	@@ -121758,10 +122544,20 @@
121758	if( pLevel->addrSkip ){
121759	sqlite3VdbeAddOp2(v, OP_Goto, 0, pLevel->addrSkip);
121760	VdbeComment((v, "next skip-scan on %s", pLoop->u.btree.pIndex->zName));
121761	sqlite3VdbeJumpHere(v, pLevel->addrSkip);
121762	sqlite3VdbeJumpHere(v, pLevel->addrSkip-2);










121763	}
121764	if( pLevel->iLeftJoin ){
121765	addr = sqlite3VdbeAddOp1(v, OP_IfPos, pLevel->iLeftJoin); VdbeCoverage(v);
121766	assert( (pLoop->wsFlags & WHERE_IDX_ONLY)==0
121767	\|\| (pLoop->wsFlags & WHERE_INDEXED)!=0 );
	@@ -124649,11 +125445,11 @@
124649	spanSet(&yygotominor.yy346, &yymsp[0].minor.yy0, &yymsp[0].minor.yy0);
124650	}
124651	break;
124652	case 193: /* expr ::= expr COLLATE ID\|STRING */
124653	{
124654	yygotominor.yy346.pExpr = sqlite3ExprAddCollateToken(pParse, yymsp[-2].minor.yy346.pExpr, &yymsp[0].minor.yy0);
124655	yygotominor.yy346.zStart = yymsp[-2].minor.yy346.zStart;
124656	yygotominor.yy346.zEnd = &yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n];
124657	}
124658	break;
124659	case 194: /* expr ::= CAST LP expr AS typetoken RP */
	@@ -124929,20 +125725,20 @@
124929	case 241: /* uniqueflag ::= */
124930	{yygotominor.yy328 = OE_None;}
124931	break;
124932	case 244: /* idxlist ::= idxlist COMMA nm collate sortorder */
124933	{
124934	Expr *p = sqlite3ExprAddCollateToken(pParse, 0, &yymsp[-1].minor.yy0);
124935	yygotominor.yy14 = sqlite3ExprListAppend(pParse,yymsp[-4].minor.yy14, p);
124936	sqlite3ExprListSetName(pParse,yygotominor.yy14,&yymsp[-2].minor.yy0,1);
124937	sqlite3ExprListCheckLength(pParse, yygotominor.yy14, "index");
124938	if( yygotominor.yy14 ) yygotominor.yy14->a[yygotominor.yy14->nExpr-1].sortOrder = (u8)yymsp[0].minor.yy328;
124939	}
124940	break;
124941	case 245: /* idxlist ::= nm collate sortorder */
124942	{
124943	Expr *p = sqlite3ExprAddCollateToken(pParse, 0, &yymsp[-1].minor.yy0);
124944	yygotominor.yy14 = sqlite3ExprListAppend(pParse,0, p);
124945	sqlite3ExprListSetName(pParse, yygotominor.yy14, &yymsp[-2].minor.yy0, 1);
124946	sqlite3ExprListCheckLength(pParse, yygotominor.yy14, "index");
124947	if( yygotominor.yy14 ) yygotominor.yy14->a[yygotominor.yy14->nExpr-1].sortOrder = (u8)yymsp[0].minor.yy328;
124948	}
	@@ -126197,13 +126993,15 @@
126197	pParse->zTail = &zSql[i];
126198	}
126199	sqlite3Parser(pEngine, 0, pParse->sLastToken, pParse);
126200	}
126201	#ifdef YYTRACKMAXSTACKDEPTH

126202	sqlite3StatusSet(SQLITE_STATUS_PARSER_STACK,
126203	sqlite3ParserStackPeak(pEngine)
126204	);

126205	#endif /* YYDEBUG */
126206	sqlite3ParserFree(pEngine, sqlite3_free);
126207	db->lookaside.bEnabled = enableLookaside;
126208	if( db->mallocFailed ){
126209	pParse->rc = SQLITE_NOMEM;
	@@ -126769,10 +127567,15 @@
126769	rc = sqlite3_wsd_init(4096, 24);
126770	if( rc!=SQLITE_OK ){
126771	return rc;
126772	}
126773	#endif





126774
126775	/* If SQLite is already completely initialized, then this call
126776	** to sqlite3_initialize() should be a no-op. But the initialization
126777	** must be complete. So isInit must not be set until the very end
126778	** of this routine.
	@@ -126982,30 +127785,32 @@
126982	/* Mutex configuration options are only available in a threadsafe
126983	** compile.
126984	*/
126985	#if defined(SQLITE_THREADSAFE) && SQLITE_THREADSAFE>0 /* IMP: R-54466-46756 */
126986	case SQLITE_CONFIG_SINGLETHREAD: {
126987	/* Disable all mutexing */
126988	sqlite3GlobalConfig.bCoreMutex = 0;
126989	sqlite3GlobalConfig.bFullMutex = 0;

126990	break;
126991	}
126992	#endif
126993	#if defined(SQLITE_THREADSAFE) && SQLITE_THREADSAFE>0 /* IMP: R-20520-54086 */
126994	case SQLITE_CONFIG_MULTITHREAD: {
126995	/* Disable mutexing of database connections */
126996	/* Enable mutexing of core data structures */
126997	sqlite3GlobalConfig.bCoreMutex = 1;
126998	sqlite3GlobalConfig.bFullMutex = 0;
126999	break;
127000	}
127001	#endif
127002	#if defined(SQLITE_THREADSAFE) && SQLITE_THREADSAFE>0 /* IMP: R-59593-21810 */
127003	case SQLITE_CONFIG_SERIALIZED: {
127004	/* Enable all mutexing */
127005	sqlite3GlobalConfig.bCoreMutex = 1;
127006	sqlite3GlobalConfig.bFullMutex = 1;

127007	break;
127008	}
127009	#endif
127010	#if defined(SQLITE_THREADSAFE) && SQLITE_THREADSAFE>0 /* IMP: R-63666-48755 */
127011	case SQLITE_CONFIG_MUTEX: {
	@@ -127113,11 +127918,12 @@
127113	** SQLITE_ENABLE_MEMSYS5 and returns SQLITE_ERROR if invoked otherwise. */
127114	#if defined(SQLITE_ENABLE_MEMSYS3) \|\| defined(SQLITE_ENABLE_MEMSYS5)
127115	case SQLITE_CONFIG_HEAP: {
127116	/* EVIDENCE-OF: R-19854-42126 There are three arguments to
127117	** SQLITE_CONFIG_HEAP: An 8-byte aligned pointer to the memory, the
127118	** number of bytes in the memory buffer, and the minimum allocation size. */

127119	sqlite3GlobalConfig.pHeap = va_arg(ap, void*);
127120	sqlite3GlobalConfig.nHeap = va_arg(ap, int);
127121	sqlite3GlobalConfig.mnReq = va_arg(ap, int);
127122
127123	if( sqlite3GlobalConfig.mnReq<1 ){
	@@ -127218,11 +128024,13 @@
127218	** EVIDENCE-OF: R-34993-45031 The maximum allowed mmap size will be
127219	** silently truncated if necessary so that it does not exceed the
127220	** compile-time maximum mmap size set by the SQLITE_MAX_MMAP_SIZE
127221	** compile-time option.
127222	*/
127223	if( mxMmap<0 \|\| mxMmap>SQLITE_MAX_MMAP_SIZE ) mxMmap = SQLITE_MAX_MMAP_SIZE;


127224	if( szMmap<0 ) szMmap = SQLITE_DEFAULT_MMAP_SIZE;
127225	if( szMmap>mxMmap) szMmap = mxMmap;
127226	sqlite3GlobalConfig.mxMmap = mxMmap;
127227	sqlite3GlobalConfig.szMmap = szMmap;
127228	break;
	@@ -129062,11 +129870,23 @@
129062	for(iIn=0; iIn<nUri; iIn++) nByte += (zUri[iIn]=='&');
129063	zFile = sqlite3_malloc(nByte);
129064	if( !zFile ) return SQLITE_NOMEM;
129065
129066	iIn = 5;
129067	#ifndef SQLITE_ALLOW_URI_AUTHORITY












129068	/* Discard the scheme and authority segments of the URI. */
129069	if( zUri[5]=='/' && zUri[6]=='/' ){
129070	iIn = 7;
129071	while( zUri[iIn] && zUri[iIn]!='/' ) iIn++;
129072	if( iIn!=7 && (iIn!=16 \|\| memcmp("localhost", &zUri[7], 9)) ){
	@@ -129505,11 +130325,12 @@
129505	sqlite3_wal_autocheckpoint(db, SQLITE_DEFAULT_WAL_AUTOCHECKPOINT);
129506
129507	opendb_out:
129508	sqlite3_free(zOpen);
129509	if( db ){
129510	assert( db->mutex!=0 \|\| isThreadsafe==0 \|\| sqlite3GlobalConfig.bFullMutex==0 );

129511	sqlite3_mutex_leave(db->mutex);
129512	}
129513	rc = sqlite3_errcode(db);
129514	assert( db!=0 \|\| rc==SQLITE_NOMEM );
129515	if( rc==SQLITE_NOMEM ){
	@@ -130250,21 +131071,21 @@
130250	case SQLITE_TESTCTRL_ISINIT: {
130251	if( sqlite3GlobalConfig.isInit==0 ) rc = SQLITE_ERROR;
130252	break;
130253	}
130254
130255	/* sqlite3_test_control(SQLITE_TESTCTRL_IMPOSTER, db, dbName, onOff, tnum);
130256	**
130257	** This test control is used to create imposter tables. "db" is a pointer
130258	** to the database connection. dbName is the database name (ex: "main" or
130259	** "temp") which will receive the imposter. "onOff" turns imposter mode on
130260	** or off. "tnum" is the root page of the b-tree to which the imposter
130261	** table should connect.
130262	**
130263	** Enable imposter mode only when the schema has already been parsed. Then
130264	** run a single CREATE TABLE statement to construct the imposter table in the
130265	** parsed schema. Then turn imposter mode back off again.
130266	**
130267	** If onOff==0 and tnum>0 then reset the schema for all databases, causing
130268	** the schema to be reparsed the next time it is needed. This has the
130269	** effect of erasing all imposter tables.
130270	*/
	@@ -132506,15 +133327,20 @@
132506	** the output value undefined. Otherwise SQLITE_OK is returned.
132507	**
132508	** This function is used when parsing the "prefix=" FTS4 parameter.
132509	*/
132510	static int fts3GobbleInt(const char *pp, int pnOut){

132511	const char p; / Iterator pointer */
132512	int nInt = 0; /* Output value */
132513
132514	for(p=*pp; p[0]>='0' && p[0]<='9'; p++){
132515	nInt = nInt * 10 + (p[0] - '0');




132516	}
132517	if( p==*pp ) return SQLITE_ERROR;
132518	*pnOut = nInt;
132519	*pp = p;
132520	return SQLITE_OK;
	@@ -132553,27 +133379,33 @@
132553	}
132554	}
132555
132556	aIndex = sqlite3_malloc(sizeof(struct Fts3Index) * nIndex);
132557	*apIndex = aIndex;
132558	*pnIndex = nIndex;
132559	if( !aIndex ){
132560	return SQLITE_NOMEM;
132561	}
132562
132563	memset(aIndex, 0, sizeof(struct Fts3Index) * nIndex);
132564	if( zParam ){
132565	const char *p = zParam;
132566	int i;
132567	for(i=1; i<nIndex; i++){
132568	int nPrefix;
132569	if( fts3GobbleInt(&p, &nPrefix) ) return SQLITE_ERROR;
132570	aIndex[i].nPrefix = nPrefix;






132571	p++;
132572	}
132573	}
132574

132575	return SQLITE_OK;
132576	}
132577
132578	/*
132579	** This function is called when initializing an FTS4 table that uses the
	@@ -140349,11 +141181,11 @@
140349	nName = sqlite3_value_bytes(argv[0])+1;
140350
140351	if( argc==2 ){
140352	void *pOld;
140353	int n = sqlite3_value_bytes(argv[1]);
140354	if( n!=sizeof(pPtr) ){
140355	sqlite3_result_error(context, "argument type mismatch", -1);
140356	return;
140357	}
140358	pPtr = (void *)sqlite3_value_blob(argv[1]);
140359	pOld = sqlite3Fts3HashInsert(pHash, (void *)zName, nName, pPtr);
	@@ -140360,11 +141192,13 @@
140360	if( pOld==pPtr ){
140361	sqlite3_result_error(context, "out of memory", -1);
140362	return;
140363	}
140364	}else{
140365	pPtr = sqlite3Fts3HashFind(pHash, zName, nName);


140366	if( !pPtr ){
140367	char *zErr = sqlite3_mprintf("unknown tokenizer: %s", zName);
140368	sqlite3_result_error(context, zErr, -1);
140369	sqlite3_free(zErr);
140370	return;
	@@ -140441,10 +141275,14 @@
140441	zCopy = sqlite3_mprintf("%s", zArg);
140442	if( !zCopy ) return SQLITE_NOMEM;
140443	zEnd = &zCopy[strlen(zCopy)];
140444
140445	z = (char *)sqlite3Fts3NextToken(zCopy, &n);




140446	z[n] = '\0';
140447	sqlite3Fts3Dequote(z);
140448
140449	m = (sqlite3_tokenizer_module *)sqlite3Fts3HashFind(pHash,z,(int)strlen(z)+1);
140450	if( !m ){
	@@ -143086,11 +143924,14 @@
143086	/*
143087	** This is a comparison function used as a qsort() callback when sorting
143088	** an array of pending terms by term. This occurs as part of flushing
143089	** the contents of the pending-terms hash table to the database.
143090	*/
143091	static int fts3CompareElemByTerm(const void lhs, const void rhs){



143092	char z1 = fts3HashKey((Fts3HashElem **)lhs);
143093	char z2 = fts3HashKey((Fts3HashElem **)rhs);
143094	int n1 = fts3HashKeysize((Fts3HashElem *)lhs);
143095	int n2 = fts3HashKeysize((Fts3HashElem *)rhs);
143096
143097

	--- src/sqlite3.c
	+++ src/sqlite3.c
	@@ -1,8 +1,8 @@
1	/******************************************************************************
2	** This file is an amalgamation of many separate C source files from SQLite
3	** version 3.8.9. By combining all the individual C code files into this
4	** single large file, the entire code can be compiled as a single translation
5	** unit. This allows many compilers to do optimizations that would not be
6	** possible if the files were compiled separately. Performance improvements
7	** of 5% or more are commonly seen when SQLite is compiled as a single
8	** translation unit.
	@@ -88,10 +88,48 @@
88	#endif /* _MSVC_H_ */
89
90	/************ End of msvc.h **********************************************/
91	/************ Continuing where we left off in sqliteInt.h ****************/
92
93	/*
94	** Special setup for VxWorks
95	*/
96	/************ Include vxworks.h in the middle of sqliteInt.h *************/
97	/************ Begin file vxworks.h ***************************************/
98	/*
99	** 2015-03-02
100	**
101	** The author disclaims copyright to this source code. In place of
102	** a legal notice, here is a blessing:
103	**
104	** May you do good and not evil.
105	** May you find forgiveness for yourself and forgive others.
106	** May you share freely, never taking more than you give.
107	**
108	******************************************************************************
109	**
110	** This file contains code that is specific to Wind River's VxWorks
111	*/
112	#if defined(__RTP__) \|\| defined(_WRS_KERNEL)
113	/* This is VxWorks. Set up things specially for that OS
114	*/
115	#include <vxWorks.h>
116	#include <pthread.h> /* amalgamator: dontcache */
117	#define OS_VXWORKS 1
118	#define SQLITE_OS_OTHER 0
119	#define SQLITE_HOMEGROWN_RECURSIVE_MUTEX 1
120	#define SQLITE_OMIT_LOAD_EXTENSION 1
121	#define SQLITE_ENABLE_LOCKING_STYLE 0
122	#define HAVE_UTIME 1
123	#else
124	/* This is not VxWorks. */
125	#define OS_VXWORKS 0
126	#endif /* defined(_WRS_KERNEL) */
127
128	/************ End of vxworks.h *******************************************/
129	/************ Continuing where we left off in sqliteInt.h ****************/
130
131	/*
132	** These #defines should enable >2GB file support on POSIX if the
133	** underlying operating system supports it. If the OS lacks
134	** large file support, or if the OS is windows, these should be no-ops.
135	**
	@@ -223,10 +261,17 @@
261	#ifndef SQLITE_API
262	# define SQLITE_API
263	#endif
264
265
266	/*
267	** Add the ability to override 'cdecl'
268	*/
269	#ifndef SQLITE_CDECL
270	# define SQLITE_CDECL
271	#endif
272
273	/*
274	** These no-op macros are used in front of interfaces to mark those
275	** interfaces as either deprecated or experimental. New applications
276	** should not use deprecated interfaces - they are supported for backwards
277	** compatibility only. Application writers should be aware that
	@@ -276,13 +321,13 @@
321	**
322	** See also: [sqlite3_libversion()],
323	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
324	** [sqlite_version()] and [sqlite_source_id()].
325	*/
326	#define SQLITE_VERSION "3.8.9"
327	#define SQLITE_VERSION_NUMBER 3008009
328	#define SQLITE_SOURCE_ID "2015-03-24 18:19:39 436314b5728c9413f9ac2d837e1c19364f31be72"
329
330	/*
331	** CAPI3REF: Run-Time Library Version Numbers
332	** KEYWORDS: sqlite3_version, sqlite3_sourceid
333	**
	@@ -925,18 +970,20 @@
970	**
971	** These integer constants are opcodes for the xFileControl method
972	** of the [sqlite3_io_methods] object and for the [sqlite3_file_control()]
973	** interface.
974	**
975	** <ul>
976	** <li>[[SQLITE_FCNTL_LOCKSTATE]]
977	** The [SQLITE_FCNTL_LOCKSTATE] opcode is used for debugging. This
978	** opcode causes the xFileControl method to write the current state of
979	** the lock (one of [SQLITE_LOCK_NONE], [SQLITE_LOCK_SHARED],
980	** [SQLITE_LOCK_RESERVED], [SQLITE_LOCK_PENDING], or [SQLITE_LOCK_EXCLUSIVE])
981	** into an integer that the pArg argument points to. This capability
982	** is used during testing and is only available when the SQLITE_TEST
983	** compile-time option is used.
984	**
985	** <li>[[SQLITE_FCNTL_SIZE_HINT]]
986	** The [SQLITE_FCNTL_SIZE_HINT] opcode is used by SQLite to give the VFS
987	** layer a hint of how large the database file will grow to be during the
988	** current transaction. This hint is not guaranteed to be accurate but it
989	** is often close. The underlying VFS might choose to preallocate database
	@@ -1057,11 +1104,13 @@
1104	** the error message if the pragma fails. ^If the
1105	** [SQLITE_FCNTL_PRAGMA] file control returns [SQLITE_NOTFOUND], then normal
1106	** [PRAGMA] processing continues. ^If the [SQLITE_FCNTL_PRAGMA]
1107	** file control returns [SQLITE_OK], then the parser assumes that the
1108	** VFS has handled the PRAGMA itself and the parser generates a no-op
1109	** prepared statement if result string is NULL, or that returns a copy
1110	** of the result string if the string is non-NULL.
1111	** ^If the [SQLITE_FCNTL_PRAGMA] file control returns
1112	** any result code other than [SQLITE_OK] or [SQLITE_NOTFOUND], that means
1113	** that the VFS encountered an error while handling the [PRAGMA] and the
1114	** compilation of the PRAGMA fails with an error. ^The [SQLITE_FCNTL_PRAGMA]
1115	** file control occurs at the beginning of pragma statement analysis and so
1116	** it is able to override built-in [PRAGMA] statements.
	@@ -1115,10 +1164,17 @@
1164	** The [SQLITE_FCNTL_WIN32_SET_HANDLE] opcode is used for debugging. This
1165	** opcode causes the xFileControl method to swap the file handle with the one
1166	** pointed to by the pArg argument. This capability is used during testing
1167	** and only needs to be supported when SQLITE_TEST is defined.
1168	**
1169	** <li>[[SQLITE_FCNTL_WAL_BLOCK]]
1170	** The [SQLITE_FCNTL_WAL_BLOCK] is a signal to the VFS layer that it might
1171	** be advantageous to block on the next WAL lock if the lock is not immediately
1172	** available. The WAL subsystem issues this signal during rare
1173	** circumstances in order to fix a problem with priority inversion.
1174	** Applications should <em>not</em> use this file-control.
1175	**
1176	** </ul>
1177	*/
1178	#define SQLITE_FCNTL_LOCKSTATE 1
1179	#define SQLITE_FCNTL_GET_LOCKPROXYFILE 2
1180	#define SQLITE_FCNTL_SET_LOCKPROXYFILE 3
	@@ -1139,10 +1195,11 @@
1195	#define SQLITE_FCNTL_TRACE 19
1196	#define SQLITE_FCNTL_HAS_MOVED 20
1197	#define SQLITE_FCNTL_SYNC 21
1198	#define SQLITE_FCNTL_COMMIT_PHASETWO 22
1199	#define SQLITE_FCNTL_WIN32_SET_HANDLE 23
1200	#define SQLITE_FCNTL_WAL_BLOCK 24
1201
1202	/* deprecated names */
1203	#define SQLITE_GET_LOCKPROXYFILE SQLITE_FCNTL_GET_LOCKPROXYFILE
1204	#define SQLITE_SET_LOCKPROXYFILE SQLITE_FCNTL_SET_LOCKPROXYFILE
1205	#define SQLITE_LAST_ERRNO SQLITE_FCNTL_LAST_ERRNO
	@@ -1705,11 +1762,11 @@
1762	** disabled, the following SQLite interfaces become non-operational:
1763	** <ul>
1764	** <li> [sqlite3_memory_used()]
1765	** <li> [sqlite3_memory_highwater()]
1766	** <li> [sqlite3_soft_heap_limit64()]
1767	** <li> [sqlite3_status64()]
1768	** </ul>)^
1769	** ^Memory allocation statistics are enabled by default unless SQLite is
1770	** compiled with [SQLITE_DEFAULT_MEMSTATUS]=0 in which case memory
1771	** allocation statistics are disabled by default.
1772	** </dd>
	@@ -1916,11 +1973,10 @@
1973	** <dt>SQLITE_CONFIG_WIN32_HEAPSIZE
1974	** <dd>^The SQLITE_CONFIG_WIN32_HEAPSIZE option is only available if SQLite is
1975	** compiled for Windows with the [SQLITE_WIN32_MALLOC] pre-processor macro
1976	** defined. ^SQLITE_CONFIG_WIN32_HEAPSIZE takes a 32-bit unsigned integer value
1977	** that specifies the maximum size of the created heap.

1978	**
1979	** [[SQLITE_CONFIG_PCACHE_HDRSZ]]
1980	** <dt>SQLITE_CONFIG_PCACHE_HDRSZ
1981	** <dd>^The SQLITE_CONFIG_PCACHE_HDRSZ option takes a single parameter which
1982	** is a pointer to an integer and writes into that integer the number of extra
	@@ -3163,15 +3219,17 @@
3219
3220
3221	/*
3222	** CAPI3REF: Error Codes And Messages
3223	**
3224	** ^If the most recent sqlite3_* API call associated with
3225	** [database connection] D failed, then the sqlite3_errcode(D) interface
3226	** returns the numeric [result code] or [extended result code] for that
3227	** API call.
3228	** If the most recent API call was successful,
3229	** then the return value from sqlite3_errcode() is undefined.
3230	** ^The sqlite3_extended_errcode()
3231	** interface is the same except that it always returns the
3232	** [extended result code] even when extended result codes are
3233	** disabled.
3234	**
3235	** ^The sqlite3_errmsg() and sqlite3_errmsg16() return English-language
	@@ -3356,20 +3414,18 @@
3414	** The second argument, "zSql", is the statement to be compiled, encoded
3415	** as either UTF-8 or UTF-16. The sqlite3_prepare() and sqlite3_prepare_v2()
3416	** interfaces use UTF-8, and sqlite3_prepare16() and sqlite3_prepare16_v2()
3417	** use UTF-16.
3418	**
3419	** ^If the nByte argument is negative, then zSql is read up to the
3420	** first zero terminator. ^If nByte is positive, then it is the
3421	** number of bytes read from zSql. ^If nByte is zero, then no prepared
3422	** statement is generated.
3423	** If the caller knows that the supplied string is nul-terminated, then
3424	** there is a small performance advantage to passing an nByte parameter that
3425	** is the number of bytes in the input string <i>including</i>
3426	** the nul-terminator.


3427	**
3428	** ^If pzTail is not NULL then *pzTail is made to point to the first byte
3429	** past the end of the first SQL statement in zSql. These routines only
3430	** compile the first statement in zSql, so *pzTail is left pointing to
3431	** what remains uncompiled.
	@@ -4394,12 +4450,12 @@
4450	** DEPRECATED
4451	**
4452	** These functions are [deprecated]. In order to maintain
4453	** backwards compatibility with older code, these functions continue
4454	** to be supported. However, new applications should avoid
4455	** the use of these functions. To encourage programmers to avoid
4456	** these functions, we will not explain what they do.
4457	*/
4458	#ifndef SQLITE_OMIT_DEPRECATED
4459	SQLITE_API SQLITE_DEPRECATED int sqlite3_aggregate_count(sqlite3_context*);
4460	SQLITE_API SQLITE_DEPRECATED int sqlite3_expired(sqlite3_stmt*);
4461	SQLITE_API SQLITE_DEPRECATED int sqlite3_transfer_bindings(sqlite3_stmt, sqlite3_stmt);
	@@ -5783,11 +5839,11 @@
5839	** is delivered up to the client application, the string will be automatically
5840	** freed by sqlite3_free() and the zErrMsg field will be zeroed.
5841	*/
5842	struct sqlite3_vtab {
5843	const sqlite3_module pModule; / The module for this virtual table */
5844	int nRef; /* Number of open cursors */
5845	char zErrMsg; / Error message from sqlite3_mprintf() */
5846	/* Virtual table implementations will typically add additional fields */
5847	};
5848
5849	/*
	@@ -6461,11 +6517,11 @@
6517	#define SQLITE_TESTCTRL_LAST 25
6518
6519	/*
6520	** CAPI3REF: SQLite Runtime Status
6521	**
6522	** ^These interfaces are used to retrieve runtime status information
6523	** about the performance of SQLite, and optionally to reset various
6524	** highwater marks. ^The first argument is an integer code for
6525	** the specific parameter to measure. ^(Recognized integer codes
6526	** are of the form [status parameters \| SQLITE_STATUS_...].)^
6527	** ^The current value of the parameter is returned into *pCurrent.
	@@ -6475,23 +6531,26 @@
6531	** value. For those parameters
6532	** nothing is written into *pHighwater and the resetFlag is ignored.)^
6533	** ^(Other parameters record only the highwater mark and not the current
6534	** value. For these latter parameters nothing is written into *pCurrent.)^
6535	**
6536	** ^The sqlite3_status() and sqlite3_status64() routines return
6537	** SQLITE_OK on success and a non-zero [error code] on failure.
6538	**
6539	** If either the current value or the highwater mark is too large to
6540	** be represented by a 32-bit integer, then the values returned by
6541	** sqlite3_status() are undefined.



6542	**
6543	** See also: [sqlite3_db_status()]
6544	*/
6545	SQLITE_API int sqlite3_status(int op, int pCurrent, int pHighwater, int resetFlag);
6546	SQLITE_API int sqlite3_status64(
6547	int op,
6548	sqlite3_int64 *pCurrent,
6549	sqlite3_int64 *pHighwater,
6550	int resetFlag
6551	);
6552
6553
6554	/*
6555	** CAPI3REF: Status Parameters
6556	** KEYWORDS: {status parameters}
	@@ -7157,24 +7216,24 @@
7216	**
7217	** ^A return of [SQLITE_BUSY] or [SQLITE_LOCKED] from sqlite3_backup_step()
7218	** is not a permanent error and does not affect the return value of
7219	** sqlite3_backup_finish().
7220	**
7221	** [[sqlite3_backup_remaining()]] [[sqlite3_backup_pagecount()]]
7222	** <b>sqlite3_backup_remaining() and sqlite3_backup_pagecount()</b>
7223	**
7224	** ^The sqlite3_backup_remaining() routine returns the number of pages still
7225	** to be backed up at the conclusion of the most recent sqlite3_backup_step().
7226	** ^The sqlite3_backup_pagecount() routine returns the total number of pages
7227	** in the source database at the conclusion of the most recent
7228	** sqlite3_backup_step().
7229	** ^(The values returned by these functions are only updated by
7230	** sqlite3_backup_step(). If the source database is modified in a way that
7231	** changes the size of the source database or the number of pages remaining,
7232	** those changes are not reflected in the output of sqlite3_backup_pagecount()
7233	** and sqlite3_backup_remaining() until after the next
7234	** sqlite3_backup_step().)^
7235	**
7236	** <b>Concurrent Usage of Database Handles</b>
7237	**
7238	** ^The source [database connection] may be used by the application for other
7239	** purposes while a backup operation is underway or being initialized.
	@@ -8018,19 +8077,21 @@
8077	#ifndef SQLITE_MAX_FUNCTION_ARG
8078	# define SQLITE_MAX_FUNCTION_ARG 127
8079	#endif
8080
8081	/*
8082	** The suggested maximum number of in-memory pages to use for
8083	** the main database table and for temporary tables.
8084	**
8085	** IMPLEMENTATION-OF: R-31093-59126 The default suggested cache size
8086	** is 2000 pages.
8087	** IMPLEMENTATION-OF: R-48205-43578 The default suggested cache size can be
8088	** altered using the SQLITE_DEFAULT_CACHE_SIZE compile-time options.
8089	*/
8090	#ifndef SQLITE_DEFAULT_CACHE_SIZE
8091	# define SQLITE_DEFAULT_CACHE_SIZE 2000
8092	#endif



8093
8094	/*
8095	** The default number of frames to accumulate in the log file before
8096	** checkpointing the database in WAL mode.
8097	*/
	@@ -8870,10 +8931,24 @@
8931	**
8932	** 0.5 -> -10 0.1 -> -33 0.0625 -> -40
8933	*/
8934	typedef INT16_TYPE LogEst;
8935
8936	/*
8937	** Set the SQLITE_PTRSIZE macro to the number of bytes in a pointer
8938	*/
8939	#ifndef SQLITE_PTRSIZE
8940	# if defined(__SIZEOF_POINTER__)
8941	# define SQLITE_PTRSIZE __SIZEOF_POINTER__
8942	# elif defined(i386) \|\| defined(__i386__) \|\| defined(_M_IX86) \|\| \
8943	defined(_M_ARM) \|\| defined(__arm__) \|\| defined(__x86)
8944	# define SQLITE_PTRSIZE 4
8945	# else
8946	# define SQLITE_PTRSIZE 8
8947	# endif
8948	#endif
8949
8950	/*
8951	** Macros to determine whether the machine is big or little endian,
8952	** and whether or not that determination is run-time or compile-time.
8953	**
8954	** For best performance, an attempt is made to guess at the byte-order
	@@ -9320,12 +9395,22 @@
9395	#define BTREE_DATA_VERSION 15 /* A virtual meta-value */
9396
9397	/*
9398	** Values that may be OR'd together to form the second argument of an
9399	** sqlite3BtreeCursorHints() call.
9400	**
9401	** The BTREE_BULKLOAD flag is set on index cursors when the index is going
9402	** to be filled with content that is already in sorted order.
9403	**
9404	** The BTREE_SEEK_EQ flag is set on cursors that will get OP_SeekGE or
9405	** OP_SeekLE opcodes for a range search, but where the range of entries
9406	** selected will all have the same key. In other words, the cursor will
9407	** be used only for equality key searches.
9408	**
9409	*/
9410	#define BTREE_BULKLOAD 0x00000001 /* Used to full index in sorted order */
9411	#define BTREE_SEEK_EQ 0x00000002 /* EQ seeks only - no range seeks */
9412
9413	SQLITE_PRIVATE int sqlite3BtreeCursor(
9414	Btree, / BTree containing table to open */
9415	int iTable, /* Index of root page */
9416	int wrFlag, /* 1 for writing. 0 for read-only */
	@@ -9367,10 +9452,13 @@
9452	SQLITE_PRIVATE int sqlite3BtreePutData(BtCursor, u32 offset, u32 amt, void);
9453	SQLITE_PRIVATE void sqlite3BtreeIncrblobCursor(BtCursor *);
9454	SQLITE_PRIVATE void sqlite3BtreeClearCursor(BtCursor *);
9455	SQLITE_PRIVATE int sqlite3BtreeSetVersion(Btree *pBt, int iVersion);
9456	SQLITE_PRIVATE void sqlite3BtreeCursorHints(BtCursor *, unsigned int mask);
9457	#ifdef SQLITE_DEBUG
9458	SQLITE_PRIVATE int sqlite3BtreeCursorHasHint(BtCursor*, unsigned int mask);
9459	#endif
9460	SQLITE_PRIVATE int sqlite3BtreeIsReadonly(Btree *pBt);
9461	SQLITE_PRIVATE int sqlite3HeaderSizeBtree(void);
9462
9463	#ifndef NDEBUG
9464	SQLITE_PRIVATE int sqlite3BtreeCursorIsValid(BtCursor*);
	@@ -9733,27 +9821,29 @@
9821	#define OP_FkCounter 134 /* synopsis: fkctr[P1]+=P2 */
9822	#define OP_FkIfZero 135 /* synopsis: if fkctr[P1]==0 goto P2 */
9823	#define OP_MemMax 136 /* synopsis: r[P1]=max(r[P1],r[P2]) */
9824	#define OP_IfPos 137 /* synopsis: if r[P1]>0 goto P2 */
9825	#define OP_IfNeg 138 /* synopsis: r[P1]+=P3, if r[P1]<0 goto P2 */
9826	#define OP_IfNotZero 139 /* synopsis: if r[P1]!=0 then r[P1]+=P3, goto P2 */
9827	#define OP_DecrJumpZero 140 /* synopsis: if (--r[P1])==0 goto P2 */
9828	#define OP_JumpZeroIncr 141 /* synopsis: if (r[P1]++)==0 ) goto P2 */
9829	#define OP_AggFinal 142 /* synopsis: accum=r[P1] N=P2 */
9830	#define OP_IncrVacuum 143
9831	#define OP_Expire 144
9832	#define OP_TableLock 145 /* synopsis: iDb=P1 root=P2 write=P3 */
9833	#define OP_VBegin 146
9834	#define OP_VCreate 147
9835	#define OP_VDestroy 148
9836	#define OP_VOpen 149
9837	#define OP_VColumn 150 /* synopsis: r[P3]=vcolumn(P2) */
9838	#define OP_VNext 151
9839	#define OP_VRename 152
9840	#define OP_Pagecount 153
9841	#define OP_MaxPgcnt 154
9842	#define OP_Init 155 /* synopsis: Start at P2 */
9843	#define OP_Noop 156
9844	#define OP_Explain 157
9845
9846
9847	/* Properties such as "out2" or "jump" that are specified in
9848	** comments following the "case" for each opcode in the vdbe.c
9849	** are encoded into bitvectors as follows:
	@@ -9781,13 +9871,13 @@
9871	/* 96 */ 0x24, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,\
9872	/* 104 */ 0x00, 0x01, 0x01, 0x01, 0x01, 0x08, 0x08, 0x00,\
9873	/* 112 */ 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x00, 0x00,\
9874	/* 120 */ 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,\
9875	/* 128 */ 0x0c, 0x45, 0x15, 0x01, 0x02, 0x02, 0x00, 0x01,\
9876	/* 136 */ 0x08, 0x05, 0x05, 0x05, 0x05, 0x05, 0x00, 0x01,\
9877	/* 144 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,\
9878	/* 152 */ 0x00, 0x02, 0x02, 0x01, 0x00, 0x00,}
9879
9880	/************ End of opcodes.h *******************************************/
9881	/************ Continuing where we left off in vdbe.h *********************/
9882
9883	/*
	@@ -10865,10 +10955,11 @@
10955	} init;
10956	int nVdbeActive; /* Number of VDBEs currently running */
10957	int nVdbeRead; /* Number of active VDBEs that read or write */
10958	int nVdbeWrite; /* Number of active VDBEs that read and write */
10959	int nVdbeExec; /* Number of nested calls to VdbeExec() */
10960	int nVDestroy; /* Number of active OP_VDestroy operations */
10961	int nExtension; /* Number of loaded extensions */
10962	void *aExtension; / Array of shared library handles */
10963	void (xTrace)(void,const char); / Trace function */
10964	void pTraceArg; / Argument to the trace function */
10965	void (xProfile)(void,const char,u64); / Profiling function */
	@@ -12022,11 +12113,11 @@
12113	#define WHERE_ONEPASS_DESIRED 0x0004 /* Want to do one-pass UPDATE/DELETE */
12114	#define WHERE_DUPLICATES_OK 0x0008 /* Ok to return a row more than once */
12115	#define WHERE_OMIT_OPEN_CLOSE 0x0010 /* Table cursors are already open */
12116	#define WHERE_FORCE_TABLE 0x0020 /* Do not use an index-only search */
12117	#define WHERE_ONETABLE_ONLY 0x0040 /* Only code the 1st table in pTabList */
12118	#define WHERE_NO_AUTOINDEX 0x0080 /* Disallow automatic indexes */
12119	#define WHERE_GROUPBY 0x0100 /* pOrderBy is really a GROUP BY */
12120	#define WHERE_DISTINCTBY 0x0200 /* pOrderby is really a DISTINCT clause */
12121	#define WHERE_WANT_DISTINCT 0x0400 /* All output needs to be distinct */
12122	#define WHERE_SORTBYGROUP 0x0800 /* Support sqlite3WhereIsSorted() */
12123	#define WHERE_REOPEN_IDX 0x1000 /* Try to use OP_ReopenIdx */
	@@ -12459,11 +12550,12 @@
12550	#define OPFLAG_APPEND 0x08 /* This is likely to be an append */
12551	#define OPFLAG_USESEEKRESULT 0x10 /* Try to avoid a seek in BtreeInsert() */
12552	#define OPFLAG_LENGTHARG 0x40 /* OP_Column only used for length() */
12553	#define OPFLAG_TYPEOFARG 0x80 /* OP_Column only used for typeof() */
12554	#define OPFLAG_BULKCSR 0x01 /* OP_Open** used to open bulk cursor */
12555	#define OPFLAG_SEEKEQ 0x02 /* OP_Open** cursor uses EQ seek only */
12556	#define OPFLAG_P2ISREG 0x04 /* P2 to OP_Open** is a register number */
12557	#define OPFLAG_PERMUTE 0x01 /* OP_Compare: use the permutation */
12558
12559	/*
12560	* Each trigger present in the database schema is stored as an instance of
12561	* struct Trigger.
	@@ -12863,14 +12955,19 @@
12955	SQLITE_PRIVATE sqlite3_mutex *sqlite3MutexAlloc(int);
12956	SQLITE_PRIVATE int sqlite3MutexInit(void);
12957	SQLITE_PRIVATE int sqlite3MutexEnd(void);
12958	#endif
12959
12960	SQLITE_PRIVATE sqlite3_int64 sqlite3StatusValue(int);
12961	SQLITE_PRIVATE void sqlite3StatusUp(int, int);
12962	SQLITE_PRIVATE void sqlite3StatusDown(int, int);
12963	SQLITE_PRIVATE void sqlite3StatusSet(int, int);
12964
12965	/* Access to mutexes used by sqlite3_status() */
12966	SQLITE_PRIVATE sqlite3_mutex *sqlite3Pcache1Mutex(void);
12967	SQLITE_PRIVATE sqlite3_mutex *sqlite3MallocMutex(void);
12968
12969	#ifndef SQLITE_OMIT_FLOATING_POINT
12970	SQLITE_PRIVATE int sqlite3IsNaN(double);
12971	#else
12972	# define sqlite3IsNaN(X) 0
12973	#endif
	@@ -13246,11 +13343,11 @@
13343	SQLITE_PRIVATE const char *sqlite3ErrStr(int);
13344	SQLITE_PRIVATE int sqlite3ReadSchema(Parse *pParse);
13345	SQLITE_PRIVATE CollSeq sqlite3FindCollSeq(sqlite3,u8 enc, const char*,int);
13346	SQLITE_PRIVATE CollSeq sqlite3LocateCollSeq(Parse pParse, const char*zName);
13347	SQLITE_PRIVATE CollSeq sqlite3ExprCollSeq(Parse pParse, Expr *pExpr);
13348	SQLITE_PRIVATE Expr sqlite3ExprAddCollateToken(Parse pParse, Expr, const Token, int);
13349	SQLITE_PRIVATE Expr sqlite3ExprAddCollateString(Parse,Expr,const char);
13350	SQLITE_PRIVATE Expr sqlite3ExprSkipCollate(Expr);
13351	SQLITE_PRIVATE int sqlite3CheckCollSeq(Parse , CollSeq );
13352	SQLITE_PRIVATE int sqlite3CheckObjectName(Parse , const char );
13353	SQLITE_PRIVATE void sqlite3VdbeSetChanges(sqlite3 *, int);
	@@ -14633,18 +14730,10 @@
14730	** An instance of the virtual machine. This structure contains the complete
14731	** state of the virtual machine.
14732	**
14733	** The "sqlite3_stmt" structure pointer that is returned by sqlite3_prepare()
14734	** is really a pointer to an instance of this structure.








14735	*/
14736	struct Vdbe {
14737	sqlite3 db; / The database connection that owns this statement */
14738	Op aOp; / Space to hold the virtual machine's program */
14739	Mem aMem; / The memory locations */
	@@ -14671,11 +14760,10 @@
14760	#endif
14761	u16 nResColumn; /* Number of columns in one row of the result set */
14762	u8 errorAction; /* Recovery action to do in case of an error */
14763	u8 minWriteFileFormat; /* Minimum file format for writable database files */
14764	bft explain:2; /* True if EXPLAIN present on SQL command */

14765	bft changeCntOn:1; /* True to update the change-counter */
14766	bft expired:1; /* True if the VM needs to be recompiled */
14767	bft runOnlyOnce:1; /* Automatically expire on reset */
14768	bft usesStmtJournal:1; /* True if uses a statement journal */
14769	bft readOnly:1; /* True for statements that do not write */
	@@ -14831,13 +14919,35 @@
14919	/*
14920	** Variables in which to record status information.
14921	*/
14922	typedef struct sqlite3StatType sqlite3StatType;
14923	static SQLITE_WSD struct sqlite3StatType {
14924	#if SQLITE_PTRSIZE>4
14925	sqlite3_int64 nowValue[10]; /* Current value */
14926	sqlite3_int64 mxValue[10]; /* Maximum value */
14927	#else
14928	u32 nowValue[10]; /* Current value */
14929	u32 mxValue[10]; /* Maximum value */
14930	#endif
14931	} sqlite3Stat = { {0,}, {0,} };
14932
14933	/*
14934	** Elements of sqlite3Stat[] are protected by either the memory allocator
14935	** mutex, or by the pcache1 mutex. The following array determines which.
14936	*/
14937	static const char statMutex[] = {
14938	0, /* SQLITE_STATUS_MEMORY_USED */
14939	1, /* SQLITE_STATUS_PAGECACHE_USED */
14940	1, /* SQLITE_STATUS_PAGECACHE_OVERFLOW */
14941	0, /* SQLITE_STATUS_SCRATCH_USED */
14942	0, /* SQLITE_STATUS_SCRATCH_OVERFLOW */
14943	0, /* SQLITE_STATUS_MALLOC_SIZE */
14944	0, /* SQLITE_STATUS_PARSER_STACK */
14945	1, /* SQLITE_STATUS_PAGECACHE_SIZE */
14946	0, /* SQLITE_STATUS_SCRATCH_SIZE */
14947	0, /* SQLITE_STATUS_MALLOC_COUNT */
14948	};
14949
14950
14951	/* The "wsdStat" macro will resolve to the status information
14952	** state vector. If writable static data is unsupported on the target,
14953	** we have to locate the state vector at run-time. In the more common
	@@ -14851,64 +14961,110 @@
14961	# define wsdStatInit
14962	# define wsdStat sqlite3Stat
14963	#endif
14964
14965	/*
14966	** Return the current value of a status parameter. The caller must
14967	** be holding the appropriate mutex.
14968	*/
14969	SQLITE_PRIVATE sqlite3_int64 sqlite3StatusValue(int op){
14970	wsdStatInit;
14971	assert( op>=0 && op<ArraySize(wsdStat.nowValue) );
14972	assert( op>=0 && op<ArraySize(statMutex) );
14973	assert( sqlite3_mutex_held(statMutex[op] ? sqlite3Pcache1Mutex()
14974	: sqlite3MallocMutex()) );
14975	return wsdStat.nowValue[op];
14976	}
14977
14978	/*
14979	** Add N to the value of a status record. The caller must hold the
14980	** appropriate mutex. (Locking is checked by assert()).
14981	**
14982	** The StatusUp() routine can accept positive or negative values for N.
14983	** The value of N is added to the current status value and the high-water
14984	** mark is adjusted if necessary.
14985	**
14986	** The StatusDown() routine lowers the current value by N. The highwater
14987	** mark is unchanged. N must be non-negative for StatusDown().
14988	*/
14989	SQLITE_PRIVATE void sqlite3StatusUp(int op, int N){
14990	wsdStatInit;
14991	assert( op>=0 && op<ArraySize(wsdStat.nowValue) );
14992	assert( op>=0 && op<ArraySize(statMutex) );
14993	assert( sqlite3_mutex_held(statMutex[op] ? sqlite3Pcache1Mutex()
14994	: sqlite3MallocMutex()) );
14995	wsdStat.nowValue[op] += N;
14996	if( wsdStat.nowValue[op]>wsdStat.mxValue[op] ){
14997	wsdStat.mxValue[op] = wsdStat.nowValue[op];
14998	}
14999	}
15000	SQLITE_PRIVATE void sqlite3StatusDown(int op, int N){
15001	wsdStatInit;
15002	assert( N>=0 );
15003	assert( op>=0 && op<ArraySize(statMutex) );
15004	assert( sqlite3_mutex_held(statMutex[op] ? sqlite3Pcache1Mutex()
15005	: sqlite3MallocMutex()) );
15006	assert( op>=0 && op<ArraySize(wsdStat.nowValue) );
15007	wsdStat.nowValue[op] -= N;
15008	}
15009
15010	/*
15011	** Set the value of a status to X. The highwater mark is adjusted if
15012	** necessary. The caller must hold the appropriate mutex.
15013	*/
15014	SQLITE_PRIVATE void sqlite3StatusSet(int op, int X){
15015	wsdStatInit;
15016	assert( op>=0 && op<ArraySize(wsdStat.nowValue) );
15017	assert( op>=0 && op<ArraySize(statMutex) );
15018	assert( sqlite3_mutex_held(statMutex[op] ? sqlite3Pcache1Mutex()
15019	: sqlite3MallocMutex()) );
15020	wsdStat.nowValue[op] = X;
15021	if( wsdStat.nowValue[op]>wsdStat.mxValue[op] ){
15022	wsdStat.mxValue[op] = wsdStat.nowValue[op];
15023	}
15024	}
15025
15026	/*
15027	** Query status information.




15028	*/
15029	SQLITE_API int sqlite3_status64(
15030	int op,
15031	sqlite3_int64 *pCurrent,
15032	sqlite3_int64 *pHighwater,
15033	int resetFlag
15034	){
15035	sqlite3_mutex *pMutex;
15036	wsdStatInit;
15037	if( op<0 \|\| op>=ArraySize(wsdStat.nowValue) ){
15038	return SQLITE_MISUSE_BKPT;
15039	}
15040	#ifdef SQLITE_ENABLE_API_ARMOR
15041	if( pCurrent==0 \|\| pHighwater==0 ) return SQLITE_MISUSE_BKPT;
15042	#endif
15043	pMutex = statMutex[op] ? sqlite3Pcache1Mutex() : sqlite3MallocMutex();
15044	sqlite3_mutex_enter(pMutex);
15045	*pCurrent = wsdStat.nowValue[op];
15046	*pHighwater = wsdStat.mxValue[op];
15047	if( resetFlag ){
15048	wsdStat.mxValue[op] = wsdStat.nowValue[op];
15049	}
15050	sqlite3_mutex_leave(pMutex);
15051	(void)pMutex; /* Prevent warning when SQLITE_THREADSAFE=0 */
15052	return SQLITE_OK;
15053	}
15054	SQLITE_API int sqlite3_status(int op, int pCurrent, int pHighwater, int resetFlag){
15055	sqlite3_int64 iCur, iHwtr;
15056	int rc;
15057	#ifdef SQLITE_ENABLE_API_ARMOR
15058	if( pCurrent==0 \|\| pHighwater==0 ) return SQLITE_MISUSE_BKPT;
15059	#endif
15060	rc = sqlite3_status64(op, &iCur, &iHwtr, resetFlag);
15061	if( rc==0 ){
15062	*pCurrent = (int)iCur;
15063	*pHighwater = (int)iHwtr;
15064	}
15065	return rc;
15066	}
15067
15068	/*
15069	** Query status information for a single database connection
15070	*/
	@@ -20358,10 +20514,17 @@
20514	*/
20515	int nearlyFull;
20516	} mem0 = { 0, 0, 0, 0, 0, 0, 0, 0 };
20517
20518	#define mem0 GLOBAL(struct Mem0Global, mem0)
20519
20520	/*
20521	** Return the memory allocator mutex. sqlite3_status() needs it.
20522	*/
20523	SQLITE_PRIVATE sqlite3_mutex *sqlite3MallocMutex(void){
20524	return mem0.mutex;
20525	}
20526
20527	/*
20528	** This routine runs when the memory allocator sees that the
20529	** total memory allocation is about to exceed the soft heap
20530	** limit.
	@@ -20381,11 +20544,11 @@
20544	static int sqlite3MemoryAlarm(
20545	void(xCallback)(void pArg, sqlite3_int64 used,int N),
20546	void *pArg,
20547	sqlite3_int64 iThreshold
20548	){
20549	sqlite3_int64 nUsed;
20550	sqlite3_mutex_enter(mem0.mutex);
20551	mem0.alarmCallback = xCallback;
20552	mem0.alarmArg = pArg;
20553	mem0.alarmThreshold = iThreshold;
20554	nUsed = sqlite3StatusValue(SQLITE_STATUS_MEMORY_USED);
	@@ -20550,11 +20713,11 @@
20713	void *p;
20714	assert( sqlite3_mutex_held(mem0.mutex) );
20715	nFull = sqlite3GlobalConfig.m.xRoundup(n);
20716	sqlite3StatusSet(SQLITE_STATUS_MALLOC_SIZE, n);
20717	if( mem0.alarmCallback!=0 ){
20718	sqlite3_int64 nUsed = sqlite3StatusValue(SQLITE_STATUS_MEMORY_USED);
20719	if( nUsed >= mem0.alarmThreshold - nFull ){
20720	mem0.nearlyFull = 1;
20721	sqlite3MallocAlarm(nFull);
20722	}else{
20723	mem0.nearlyFull = 0;
	@@ -20567,12 +20730,12 @@
20730	p = sqlite3GlobalConfig.m.xMalloc(nFull);
20731	}
20732	#endif
20733	if( p ){
20734	nFull = sqlite3MallocSize(p);
20735	sqlite3StatusUp(SQLITE_STATUS_MEMORY_USED, nFull);
20736	sqlite3StatusUp(SQLITE_STATUS_MALLOC_COUNT, 1);
20737	}
20738	*pp = p;
20739	return nFull;
20740	}
20741
	@@ -20645,18 +20808,18 @@
20808	sqlite3StatusSet(SQLITE_STATUS_SCRATCH_SIZE, n);
20809	if( mem0.nScratchFree && sqlite3GlobalConfig.szScratch>=n ){
20810	p = mem0.pScratchFree;
20811	mem0.pScratchFree = mem0.pScratchFree->pNext;
20812	mem0.nScratchFree--;
20813	sqlite3StatusUp(SQLITE_STATUS_SCRATCH_USED, 1);
20814	sqlite3_mutex_leave(mem0.mutex);
20815	}else{
20816	sqlite3_mutex_leave(mem0.mutex);
20817	p = sqlite3Malloc(n);
20818	if( sqlite3GlobalConfig.bMemstat && p ){
20819	sqlite3_mutex_enter(mem0.mutex);
20820	sqlite3StatusUp(SQLITE_STATUS_SCRATCH_OVERFLOW, sqlite3MallocSize(p));
20821	sqlite3_mutex_leave(mem0.mutex);
20822	}
20823	sqlite3MemdebugSetType(p, MEMTYPE_SCRATCH);
20824	}
20825	assert( sqlite3_mutex_notheld(mem0.mutex) );
	@@ -20693,23 +20856,23 @@
20856	sqlite3_mutex_enter(mem0.mutex);
20857	pSlot->pNext = mem0.pScratchFree;
20858	mem0.pScratchFree = pSlot;
20859	mem0.nScratchFree++;
20860	assert( mem0.nScratchFree <= (u32)sqlite3GlobalConfig.nScratch );
20861	sqlite3StatusDown(SQLITE_STATUS_SCRATCH_USED, 1);
20862	sqlite3_mutex_leave(mem0.mutex);
20863	}else{
20864	/* Release memory back to the heap */
20865	assert( sqlite3MemdebugHasType(p, MEMTYPE_SCRATCH) );
20866	assert( sqlite3MemdebugNoType(p, (u8)~MEMTYPE_SCRATCH) );
20867	sqlite3MemdebugSetType(p, MEMTYPE_HEAP);
20868	if( sqlite3GlobalConfig.bMemstat ){
20869	int iSize = sqlite3MallocSize(p);
20870	sqlite3_mutex_enter(mem0.mutex);
20871	sqlite3StatusDown(SQLITE_STATUS_SCRATCH_OVERFLOW, iSize);
20872	sqlite3StatusDown(SQLITE_STATUS_MEMORY_USED, iSize);
20873	sqlite3StatusDown(SQLITE_STATUS_MALLOC_COUNT, 1);
20874	sqlite3GlobalConfig.m.xFree(p);
20875	sqlite3_mutex_leave(mem0.mutex);
20876	}else{
20877	sqlite3GlobalConfig.m.xFree(p);
20878	}
	@@ -20736,26 +20899,26 @@
20899	assert( sqlite3MemdebugHasType(p, MEMTYPE_HEAP) );
20900	return sqlite3GlobalConfig.m.xSize(p);
20901	}
20902	SQLITE_PRIVATE int sqlite3DbMallocSize(sqlite3 db, void p){
20903	if( db==0 ){
20904	assert( sqlite3MemdebugNoType(p, (u8)~MEMTYPE_HEAP) );
20905	assert( sqlite3MemdebugHasType(p, MEMTYPE_HEAP) );
20906	return sqlite3MallocSize(p);
20907	}else{
20908	assert( sqlite3_mutex_held(db->mutex) );
20909	if( isLookaside(db, p) ){
20910	return db->lookaside.sz;
20911	}else{
20912	assert( sqlite3MemdebugHasType(p, (MEMTYPE_LOOKASIDE\|MEMTYPE_HEAP)) );
20913	assert( sqlite3MemdebugNoType(p, (u8)~(MEMTYPE_LOOKASIDE\|MEMTYPE_HEAP)) );
20914	return sqlite3GlobalConfig.m.xSize(p);
20915	}
20916	}
20917	}
20918	SQLITE_API sqlite3_uint64 sqlite3_msize(void *p){
20919	assert( sqlite3MemdebugNoType(p, (u8)~MEMTYPE_HEAP) );
20920	assert( sqlite3MemdebugHasType(p, MEMTYPE_HEAP) );
20921	return (sqlite3_uint64)sqlite3GlobalConfig.m.xSize(p);
20922	}
20923
20924	/*
	@@ -20762,15 +20925,15 @@
20925	** Free memory previously obtained from sqlite3Malloc().
20926	*/
20927	SQLITE_API void sqlite3_free(void *p){
20928	if( p==0 ) return; /* IMP: R-49053-54554 */
20929	assert( sqlite3MemdebugHasType(p, MEMTYPE_HEAP) );
20930	assert( sqlite3MemdebugNoType(p, (u8)~MEMTYPE_HEAP) );
20931	if( sqlite3GlobalConfig.bMemstat ){
20932	sqlite3_mutex_enter(mem0.mutex);
20933	sqlite3StatusDown(SQLITE_STATUS_MEMORY_USED, sqlite3MallocSize(p));
20934	sqlite3StatusDown(SQLITE_STATUS_MALLOC_COUNT, 1);
20935	sqlite3GlobalConfig.m.xFree(p);
20936	sqlite3_mutex_leave(mem0.mutex);
20937	}else{
20938	sqlite3GlobalConfig.m.xFree(p);
20939	}
	@@ -20807,11 +20970,11 @@
20970	db->lookaside.nOut--;
20971	return;
20972	}
20973	}
20974	assert( sqlite3MemdebugHasType(p, (MEMTYPE_LOOKASIDE\|MEMTYPE_HEAP)) );
20975	assert( sqlite3MemdebugNoType(p, (u8)~(MEMTYPE_LOOKASIDE\|MEMTYPE_HEAP)) );
20976	assert( db!=0 \|\| sqlite3MemdebugNoType(p, MEMTYPE_LOOKASIDE) );
20977	sqlite3MemdebugSetType(p, MEMTYPE_HEAP);
20978	sqlite3_free(p);
20979	}
20980
	@@ -20820,11 +20983,11 @@
20983	*/
20984	SQLITE_PRIVATE void sqlite3Realloc(void pOld, u64 nBytes){
20985	int nOld, nNew, nDiff;
20986	void *pNew;
20987	assert( sqlite3MemdebugHasType(pOld, MEMTYPE_HEAP) );
20988	assert( sqlite3MemdebugNoType(pOld, (u8)~MEMTYPE_HEAP) );
20989	if( pOld==0 ){
20990	return sqlite3Malloc(nBytes); /* IMP: R-04300-56712 */
20991	}
20992	if( nBytes==0 ){
20993	sqlite3_free(pOld); /* IMP: R-26507-47431 */
	@@ -20854,11 +21017,11 @@
21017	sqlite3MallocAlarm((int)nBytes);
21018	pNew = sqlite3GlobalConfig.m.xRealloc(pOld, nNew);
21019	}
21020	if( pNew ){
21021	nNew = sqlite3MallocSize(pNew);
21022	sqlite3StatusUp(SQLITE_STATUS_MEMORY_USED, nNew-nOld);
21023	}
21024	sqlite3_mutex_leave(mem0.mutex);
21025	}else{
21026	pNew = sqlite3GlobalConfig.m.xRealloc(pOld, nNew);
21027	}
	@@ -20987,11 +21150,11 @@
21150	memcpy(pNew, p, db->lookaside.sz);
21151	sqlite3DbFree(db, p);
21152	}
21153	}else{
21154	assert( sqlite3MemdebugHasType(p, (MEMTYPE_LOOKASIDE\|MEMTYPE_HEAP)) );
21155	assert( sqlite3MemdebugNoType(p, (u8)~(MEMTYPE_LOOKASIDE\|MEMTYPE_HEAP)) );
21156	sqlite3MemdebugSetType(p, MEMTYPE_HEAP);
21157	pNew = sqlite3_realloc64(p, n);
21158	if( !pNew ){
21159	db->mallocFailed = 1;
21160	}
	@@ -24969,27 +25132,29 @@
25132	/* 134 */ "FkCounter" OpHelp("fkctr[P1]+=P2"),
25133	/* 135 */ "FkIfZero" OpHelp("if fkctr[P1]==0 goto P2"),
25134	/* 136 */ "MemMax" OpHelp("r[P1]=max(r[P1],r[P2])"),
25135	/* 137 */ "IfPos" OpHelp("if r[P1]>0 goto P2"),
25136	/* 138 */ "IfNeg" OpHelp("r[P1]+=P3, if r[P1]<0 goto P2"),
25137	/* 139 */ "IfNotZero" OpHelp("if r[P1]!=0 then r[P1]+=P3, goto P2"),
25138	/* 140 */ "DecrJumpZero" OpHelp("if (--r[P1])==0 goto P2"),
25139	/* 141 */ "JumpZeroIncr" OpHelp("if (r[P1]++)==0 ) goto P2"),
25140	/* 142 */ "AggFinal" OpHelp("accum=r[P1] N=P2"),
25141	/* 143 */ "IncrVacuum" OpHelp(""),
25142	/* 144 */ "Expire" OpHelp(""),
25143	/* 145 */ "TableLock" OpHelp("iDb=P1 root=P2 write=P3"),
25144	/* 146 */ "VBegin" OpHelp(""),
25145	/* 147 */ "VCreate" OpHelp(""),
25146	/* 148 */ "VDestroy" OpHelp(""),
25147	/* 149 */ "VOpen" OpHelp(""),
25148	/* 150 */ "VColumn" OpHelp("r[P3]=vcolumn(P2)"),
25149	/* 151 */ "VNext" OpHelp(""),
25150	/* 152 */ "VRename" OpHelp(""),
25151	/* 153 */ "Pagecount" OpHelp(""),
25152	/* 154 */ "MaxPgcnt" OpHelp(""),
25153	/* 155 */ "Init" OpHelp("Start at P2"),
25154	/* 156 */ "Noop" OpHelp(""),
25155	/* 157 */ "Explain" OpHelp(""),
25156	};
25157	return azName[i];
25158	}
25159	#endif
25160
	@@ -25065,22 +25230,10 @@
25230	# else
25231	# define SQLITE_ENABLE_LOCKING_STYLE 0
25232	# endif
25233	#endif
25234












25235	/*
25236	** standard include files.
25237	*/
25238	#include <sys/types.h>
25239	#include <sys/stat.h>
	@@ -25091,22 +25244,23 @@
25244	#include <errno.h>
25245	#if !defined(SQLITE_OMIT_WAL) \|\| SQLITE_MAX_MMAP_SIZE>0
25246	# include <sys/mman.h>
25247	#endif
25248
25249	#if SQLITE_ENABLE_LOCKING_STYLE
25250	# include <sys/ioctl.h>
25251	# include <sys/file.h>
25252	# include <sys/param.h>





25253	#endif /* SQLITE_ENABLE_LOCKING_STYLE */
25254
25255	#if OS_VXWORKS
25256	/* # include <sys/ioctl.h> */
25257	# include <semaphore.h>
25258	# include <limits.h>
25259	#endif /* OS_VXWORKS */
25260
25261	#if defined(__APPLE__) \|\| SQLITE_ENABLE_LOCKING_STYLE
25262	# include <sys/mount.h>
25263	#endif
25264
25265	#ifdef HAVE_UTIME
25266	# include <utime.h>
	@@ -25142,10 +25296,14 @@
25296
25297	/*
25298	** Maximum supported path-length.
25299	*/
25300	#define MAX_PATHNAME 512
25301
25302	/* Always cast the getpid() return type for compatibility with
25303	** kernel modules in VxWorks. */
25304	#define osGetpid(X) (pid_t)getpid()
25305
25306	/*
25307	** Only set the lastErrno if the error code is a real error and not
25308	** a normal expected return code of SQLITE_BUSY or SQLITE_OK
25309	*/
	@@ -25231,11 +25389,11 @@
25389
25390	/* This variable holds the process id (pid) from when the xRandomness()
25391	** method was called. If xOpen() is called from a different process id,
25392	** indicating that a fork() has occurred, the PRNG will be reset.
25393	*/
25394	static pid_t randomnessPid = 0;
25395
25396	/*
25397	** Allowed values for the unixFile.ctrlFlags bitmask:
25398	*/
25399	#define UNIXFILE_EXCL 0x01 /* Connections from one process only */
	@@ -25249,10 +25407,11 @@
25407	#define UNIXFILE_PSOW 0x10 /* SQLITE_IOCAP_POWERSAFE_OVERWRITE */
25408	#define UNIXFILE_DELETE 0x20 /* Delete on close */
25409	#define UNIXFILE_URI 0x40 /* Filename might have query parameters */
25410	#define UNIXFILE_NOLOCK 0x80 /* Do no file locking */
25411	#define UNIXFILE_WARNED 0x0100 /* verifyDbFile() warnings issued */
25412	#define UNIXFILE_BLOCK 0x0200 /* Next SHM lock might block */
25413
25414	/*
25415	** Include code that is common to all os_*.c files
25416	*/
25417	/************ Include os_common.h in the middle of os_unix.c *************/
	@@ -25587,11 +25746,11 @@
25746	#define osFcntl ((int(*)(int,int,...))aSyscall[7].pCurrent)
25747
25748	{ "read", (sqlite3_syscall_ptr)read, 0 },
25749	#define osRead ((ssize_t()(int,void,size_t))aSyscall[8].pCurrent)
25750
25751	#if defined(USE_PREAD) \|\| SQLITE_ENABLE_LOCKING_STYLE
25752	{ "pread", (sqlite3_syscall_ptr)pread, 0 },
25753	#else
25754	{ "pread", (sqlite3_syscall_ptr)0, 0 },
25755	#endif
25756	#define osPread ((ssize_t()(int,void,size_t,off_t))aSyscall[9].pCurrent)
	@@ -25604,11 +25763,11 @@
25763	#define osPread64 ((ssize_t()(int,void,size_t,off_t))aSyscall[10].pCurrent)
25764
25765	{ "write", (sqlite3_syscall_ptr)write, 0 },
25766	#define osWrite ((ssize_t()(int,const void,size_t))aSyscall[11].pCurrent)
25767
25768	#if defined(USE_PREAD) \|\| SQLITE_ENABLE_LOCKING_STYLE
25769	{ "pwrite", (sqlite3_syscall_ptr)pwrite, 0 },
25770	#else
25771	{ "pwrite", (sqlite3_syscall_ptr)0, 0 },
25772	#endif
25773	#define osPwrite ((ssize_t()(int,const void,size_t,off_t))\
	@@ -26743,11 +26902,12 @@
26902	int tErrno = 0;
26903
26904	assert( pFile );
26905	OSTRACE(("LOCK %d %s was %s(%s,%d) pid=%d (unix)\n", pFile->h,
26906	azFileLock(eFileLock), azFileLock(pFile->eFileLock),
26907	azFileLock(pFile->pInode->eFileLock), pFile->pInode->nShared,
26908	osGetpid(0)));
26909
26910	/* If there is already a lock of this type or more restrictive on the
26911	** unixFile, do nothing. Don't use the end_lock: exit path, as
26912	** unixEnterMutex() hasn't been called yet.
26913	*/
	@@ -26951,11 +27111,11 @@
27111	int rc = SQLITE_OK;
27112
27113	assert( pFile );
27114	OSTRACE(("UNLOCK %d %d was %d(%d,%d) pid=%d (unix)\n", pFile->h, eFileLock,
27115	pFile->eFileLock, pFile->pInode->eFileLock, pFile->pInode->nShared,
27116	osGetpid(0)));
27117
27118	assert( eFileLock<=SHARED_LOCK );
27119	if( pFile->eFileLock<=eFileLock ){
27120	return SQLITE_OK;
27121	}
	@@ -27378,11 +27538,11 @@
27538	char zLockFile = (char )pFile->lockingContext;
27539	int rc;
27540
27541	assert( pFile );
27542	OSTRACE(("UNLOCK %d %d was %d pid=%d (dotlock)\n", pFile->h, eFileLock,
27543	pFile->eFileLock, osGetpid(0)));
27544	assert( eFileLock<=SHARED_LOCK );
27545
27546	/* no-op if possible */
27547	if( pFile->eFileLock==eFileLock ){
27548	return SQLITE_OK;
	@@ -27441,14 +27601,13 @@
27601	** a single exclusive lock. In other words, SHARED, RESERVED, and
27602	** PENDING locks are the same thing as an EXCLUSIVE lock. SQLite
27603	** still works when you do this, but concurrency is reduced since
27604	** only a single process can be reading the database at a time.
27605	**
27606	** Omit this section if SQLITE_ENABLE_LOCKING_STYLE is turned off

27607	*/
27608	#if SQLITE_ENABLE_LOCKING_STYLE
27609
27610	/*
27611	** Retry flock() calls that fail with EINTR
27612	*/
27613	#ifdef EINTR
	@@ -27597,11 +27756,11 @@
27756	static int flockUnlock(sqlite3_file *id, int eFileLock) {
27757	unixFile pFile = (unixFile)id;
27758
27759	assert( pFile );
27760	OSTRACE(("UNLOCK %d %d was %d pid=%d (flock)\n", pFile->h, eFileLock,
27761	pFile->eFileLock, osGetpid(0)));
27762	assert( eFileLock<=SHARED_LOCK );
27763
27764	/* no-op if possible */
27765	if( pFile->eFileLock==eFileLock ){
27766	return SQLITE_OK;
	@@ -27658,11 +27817,11 @@
27817	** This routine checks if there is a RESERVED lock held on the specified
27818	** file by this or any other process. If such a lock is held, set *pResOut
27819	** to a non-zero value otherwise *pResOut is set to zero. The return value
27820	** is set to SQLITE_OK unless an I/O error occurs during lock checking.
27821	*/
27822	static int semXCheckReservedLock(sqlite3_file id, int pResOut) {
27823	int rc = SQLITE_OK;
27824	int reserved = 0;
27825	unixFile pFile = (unixFile)id;
27826
27827	SimulateIOError( return SQLITE_IOERR_CHECKRESERVEDLOCK; );
	@@ -27725,11 +27884,11 @@
27884	** access the file.
27885	**
27886	** This routine will only increase a lock. Use the sqlite3OsUnlock()
27887	** routine to lower a locking level.
27888	*/
27889	static int semXLock(sqlite3_file *id, int eFileLock) {
27890	unixFile pFile = (unixFile)id;
27891	sem_t *pSem = pFile->pInode->pSem;
27892	int rc = SQLITE_OK;
27893
27894	/* if we already have a lock, it is exclusive.
	@@ -27758,18 +27917,18 @@
27917	** must be either NO_LOCK or SHARED_LOCK.
27918	**
27919	** If the locking level of the file descriptor is already at or below
27920	** the requested locking level, this routine is a no-op.
27921	*/
27922	static int semXUnlock(sqlite3_file *id, int eFileLock) {
27923	unixFile pFile = (unixFile)id;
27924	sem_t *pSem = pFile->pInode->pSem;
27925
27926	assert( pFile );
27927	assert( pSem );
27928	OSTRACE(("UNLOCK %d %d was %d pid=%d (sem)\n", pFile->h, eFileLock,
27929	pFile->eFileLock, osGetpid(0)));
27930	assert( eFileLock<=SHARED_LOCK );
27931
27932	/* no-op if possible */
27933	if( pFile->eFileLock==eFileLock ){
27934	return SQLITE_OK;
	@@ -27795,14 +27954,14 @@
27954	}
27955
27956	/*
27957	** Close a file.
27958	*/
27959	static int semXClose(sqlite3_file *id) {
27960	if( id ){
27961	unixFile pFile = (unixFile)id;
27962	semXUnlock(id, NO_LOCK);
27963	assert( pFile );
27964	unixEnterMutex();
27965	releaseInodeInfo(pFile);
27966	unixLeaveMutex();
27967	closeUnixFile(id);
	@@ -27979,11 +28138,11 @@
28138	afpLockingContext context = (afpLockingContext ) pFile->lockingContext;
28139
28140	assert( pFile );
28141	OSTRACE(("LOCK %d %s was %s(%s,%d) pid=%d (afp)\n", pFile->h,
28142	azFileLock(eFileLock), azFileLock(pFile->eFileLock),
28143	azFileLock(pInode->eFileLock), pInode->nShared , osGetpid(0)));
28144
28145	/* If there is already a lock of this type or more restrictive on the
28146	** unixFile, do nothing. Don't use the afp_end_lock: exit path, as
28147	** unixEnterMutex() hasn't been called yet.
28148	*/
	@@ -28165,11 +28324,11 @@
28324	#endif
28325
28326	assert( pFile );
28327	OSTRACE(("UNLOCK %d %d was %d(%d,%d) pid=%d (afp)\n", pFile->h, eFileLock,
28328	pFile->eFileLock, pFile->pInode->eFileLock, pFile->pInode->nShared,
28329	osGetpid(0)));
28330
28331	assert( eFileLock<=SHARED_LOCK );
28332	if( pFile->eFileLock<=eFileLock ){
28333	return SQLITE_OK;
28334	}
	@@ -28990,10 +29149,14 @@
29149	** Information and control of an open file handle.
29150	*/
29151	static int unixFileControl(sqlite3_file id, int op, void pArg){
29152	unixFile pFile = (unixFile)id;
29153	switch( op ){
29154	case SQLITE_FCNTL_WAL_BLOCK: {
29155	pFile->ctrlFlags \|= UNIXFILE_BLOCK;
29156	return SQLITE_OK;
29157	}
29158	case SQLITE_FCNTL_LOCKSTATE: {
29159	(int)pArg = pFile->eFileLock;
29160	return SQLITE_OK;
29161	}
29162	case SQLITE_FCNTL_LAST_ERRNO: {
	@@ -29204,11 +29367,13 @@
29367	**
29368	** This function should not be called directly by other code in this file.
29369	** Instead, it should be called via macro osGetpagesize().
29370	*/
29371	static int unixGetpagesize(void){
29372	#if OS_VXWORKS
29373	return 1024;
29374	#elif defined(_BSD_SOURCE)
29375	return getpagesize();
29376	#else
29377	return (int)sysconf(_SC_PAGESIZE);
29378	#endif
29379	}
	@@ -29297,37 +29462,42 @@
29462	**
29463	** Locks block if the mask is exactly UNIX_SHM_C and are non-blocking
29464	** otherwise.
29465	*/
29466	static int unixShmSystemLock(
29467	unixFile pFile, / Open connection to the WAL file */
29468	int lockType, /* F_UNLCK, F_RDLCK, or F_WRLCK */
29469	int ofst, /* First byte of the locking range */
29470	int n /* Number of bytes to lock */
29471	){
29472	unixShmNode pShmNode; / Apply locks to this open shared-memory segment */
29473	struct flock f; /* The posix advisory locking structure */
29474	int rc = SQLITE_OK; /* Result code form fcntl() */
29475
29476	/* Access to the unixShmNode object is serialized by the caller */
29477	pShmNode = pFile->pInode->pShmNode;
29478	assert( sqlite3_mutex_held(pShmNode->mutex) \|\| pShmNode->nRef==0 );
29479
29480	/* Shared locks never span more than one byte */
29481	assert( n==1 \|\| lockType!=F_RDLCK );
29482
29483	/* Locks are within range */
29484	assert( n>=1 && n<SQLITE_SHM_NLOCK );
29485
29486	if( pShmNode->h>=0 ){
29487	int lkType;
29488	/* Initialize the locking parameters */
29489	memset(&f, 0, sizeof(f));
29490	f.l_type = lockType;
29491	f.l_whence = SEEK_SET;
29492	f.l_start = ofst;
29493	f.l_len = n;
29494
29495	lkType = (pFile->ctrlFlags & UNIXFILE_BLOCK)!=0 ? F_SETLKW : F_SETLK;
29496	rc = osFcntl(pShmNode->h, lkType, &f);
29497	rc = (rc!=(-1)) ? SQLITE_OK : SQLITE_BUSY;
29498	pFile->ctrlFlags &= ~UNIXFILE_BLOCK;
29499	}
29500
29501	/* Update the global lock state and do debug tracing */
29502	#ifdef SQLITE_DEBUG
29503	{ u16 mask;
	@@ -29533,17 +29703,17 @@
29703
29704	/* Check to see if another process is holding the dead-man switch.
29705	** If not, truncate the file to zero length.
29706	*/
29707	rc = SQLITE_OK;
29708	if( unixShmSystemLock(pDbFd, F_WRLCK, UNIX_SHM_DMS, 1)==SQLITE_OK ){
29709	if( robust_ftruncate(pShmNode->h, 0) ){
29710	rc = unixLogError(SQLITE_IOERR_SHMOPEN, "ftruncate", zShmFilename);
29711	}
29712	}
29713	if( rc==SQLITE_OK ){
29714	rc = unixShmSystemLock(pDbFd, F_RDLCK, UNIX_SHM_DMS, 1);
29715	}
29716	if( rc ) goto shm_open_err;
29717	}
29718	}
29719
	@@ -29771,11 +29941,11 @@
29941	allMask \|= pX->sharedMask;
29942	}
29943
29944	/* Unlock the system-level locks */
29945	if( (mask & allMask)==0 ){
29946	rc = unixShmSystemLock(pDbFd, F_UNLCK, ofst+UNIX_SHM_BASE, n);
29947	}else{
29948	rc = SQLITE_OK;
29949	}
29950
29951	/* Undo the local locks */
	@@ -29799,11 +29969,11 @@
29969	}
29970
29971	/* Get shared locks at the system level, if necessary */
29972	if( rc==SQLITE_OK ){
29973	if( (allShared & mask)==0 ){
29974	rc = unixShmSystemLock(pDbFd, F_RDLCK, ofst+UNIX_SHM_BASE, n);
29975	}else{
29976	rc = SQLITE_OK;
29977	}
29978	}
29979
	@@ -29824,20 +29994,20 @@
29994
29995	/* Get the exclusive locks at the system level. Then if successful
29996	** also mark the local connection as being locked.
29997	*/
29998	if( rc==SQLITE_OK ){
29999	rc = unixShmSystemLock(pDbFd, F_WRLCK, ofst+UNIX_SHM_BASE, n);
30000	if( rc==SQLITE_OK ){
30001	assert( (p->sharedMask & mask)==0 );
30002	p->exclMask \|= mask;
30003	}
30004	}
30005	}
30006	sqlite3_mutex_leave(pShmNode->mutex);
30007	OSTRACE(("SHM-LOCK shmid-%d, pid-%d got %03x,%03x\n",
30008	p->id, osGetpid(0), p->sharedMask, p->exclMask));
30009	return rc;
30010	}
30011
30012	/*
30013	** Implement a memory barrier or memory fence on shared memory.
	@@ -30236,11 +30406,11 @@
30406	dotlockUnlock, /* xUnlock method */
30407	dotlockCheckReservedLock, /* xCheckReservedLock method */
30408	0 /* xShmMap method */
30409	)
30410
30411	#if SQLITE_ENABLE_LOCKING_STYLE
30412	IOMETHODS(
30413	flockIoFinder, /* Finder function name */
30414	flockIoMethods, /* sqlite3_io_methods object name */
30415	1, /* shared memory is disabled */
30416	flockClose, /* xClose method */
	@@ -30254,14 +30424,14 @@
30424	#if OS_VXWORKS
30425	IOMETHODS(
30426	semIoFinder, /* Finder function name */
30427	semIoMethods, /* sqlite3_io_methods object name */
30428	1, /* shared memory is disabled */
30429	semXClose, /* xClose method */
30430	semXLock, /* xLock method */
30431	semXUnlock, /* xUnlock method */
30432	semXCheckReservedLock, /* xCheckReservedLock method */
30433	0 /* xShmMap method */
30434	)
30435	#endif
30436
30437	#if defined(__APPLE__) && SQLITE_ENABLE_LOCKING_STYLE
	@@ -30381,19 +30551,17 @@
30551	static const sqlite3_io_methods
30552	(const autolockIoFinder)(const char,unixFile) = autolockIoFinderImpl;
30553
30554	#endif /* defined(__APPLE__) && SQLITE_ENABLE_LOCKING_STYLE */
30555
30556	#if OS_VXWORKS
30557	/*
30558	** This "finder" function for VxWorks checks to see if posix advisory
30559	** locking works. If it does, then that is what is used. If it does not
30560	** work, then fallback to named semaphore locking.


30561	*/
30562	static const sqlite3_io_methods *vxworksIoFinderImpl(
30563	const char filePath, / name of the database file */
30564	unixFile pNew / the open file object */
30565	){
30566	struct flock lockInfo;
30567
	@@ -30415,13 +30583,13 @@
30583	}else{
30584	return &semIoMethods;
30585	}
30586	}
30587	static const sqlite3_io_methods
30588	(const vxworksIoFinder)(const char,unixFile) = vxworksIoFinderImpl;
30589
30590	#endif /* OS_VXWORKS */
30591
30592	/*
30593	** An abstract type for a pointer to an IO method finder function:
30594	*/
30595	typedef const sqlite3_io_methods (finder_type)(const char,unixFile);
	@@ -30930,12 +31098,12 @@
31098	/* Detect a pid change and reset the PRNG. There is a race condition
31099	** here such that two or more threads all trying to open databases at
31100	** the same instant might all reset the PRNG. But multiple resets
31101	** are harmless.
31102	*/
31103	if( randomnessPid!=osGetpid(0) ){
31104	randomnessPid = osGetpid(0);
31105	sqlite3_randomness(0,0);
31106	}
31107
31108	memset(p, 0, sizeof(unixFile));
31109
	@@ -31322,11 +31490,11 @@
31490	** When testing, initializing zBuf[] to zero is all we do. That means
31491	** that we always use the same random number sequence. This makes the
31492	** tests repeatable.
31493	*/
31494	memset(zBuf, 0, nBuf);
31495	randomnessPid = osGetpid(0);
31496	#if !defined(SQLITE_TEST)
31497	{
31498	int fd, got;
31499	fd = robust_open("/dev/urandom", O_RDONLY, 0);
31500	if( fd<0 ){
	@@ -31643,11 +31811,11 @@
31811	#else
31812	# ifdef _CS_DARWIN_USER_TEMP_DIR
31813	{
31814	if( !confstr(_CS_DARWIN_USER_TEMP_DIR, lPath, maxLen) ){
31815	OSTRACE(("GETLOCKPATH failed %s errno=%d pid=%d\n",
31816	lPath, errno, osGetpid(0)));
31817	return SQLITE_IOERR_LOCK;
31818	}
31819	len = strlcat(lPath, "sqliteplocks", maxLen);
31820	}
31821	# else
	@@ -31665,11 +31833,11 @@
31833	char c = dbPath[i];
31834	lPath[i+len] = (c=='/')?'_':c;
31835	}
31836	lPath[i+len]='\0';
31837	strlcat(lPath, ":auto:", maxLen);
31838	OSTRACE(("GETLOCKPATH proxy lock path=%s pid=%d\n", lPath, osGetpid(0)));
31839	return SQLITE_OK;
31840	}
31841
31842	/*
31843	** Creates the lock file and any missing directories in lockPath
	@@ -31692,20 +31860,20 @@
31860	if( osMkdir(buf, SQLITE_DEFAULT_PROXYDIR_PERMISSIONS) ){
31861	int err=errno;
31862	if( err!=EEXIST ) {
31863	OSTRACE(("CREATELOCKPATH FAILED creating %s, "
31864	"'%s' proxy lock path=%s pid=%d\n",
31865	buf, strerror(err), lockPath, osGetpid(0)));
31866	return err;
31867	}
31868	}
31869	}
31870	start=i+1;
31871	}
31872	buf[i] = lockPath[i];
31873	}
31874	OSTRACE(("CREATELOCKPATH proxy lock path=%s pid=%d\n", lockPath, osGetpid(0)));
31875	return 0;
31876	}
31877
31878	/*
31879	** Create a new VFS file descriptor (stored in memory obtained from
	@@ -32006,11 +32174,12 @@
32174	int readLen = 0;
32175	int tryOldLockPath = 0;
32176	int forceNewLockPath = 0;
32177
32178	OSTRACE(("TAKECONCH %d for %s pid=%d\n", conchFile->h,
32179	(pCtx->lockProxyPath ? pCtx->lockProxyPath : ":auto:"),
32180	osGetpid(0)));
32181
32182	rc = proxyGetHostID(myHostID, &pError);
32183	if( (rc&0xff)==SQLITE_IOERR ){
32184	storeLastErrno(pFile, pError);
32185	goto end_takeconch;
	@@ -32216,11 +32385,11 @@
32385
32386	pCtx = (proxyLockingContext *)pFile->lockingContext;
32387	conchFile = pCtx->conchFile;
32388	OSTRACE(("RELEASECONCH %d for %s pid=%d\n", conchFile->h,
32389	(pCtx->lockProxyPath ? pCtx->lockProxyPath : ":auto:"),
32390	osGetpid(0)));
32391	if( pCtx->conchHeld>0 ){
32392	rc = conchFile->pMethod->xUnlock((sqlite3_file*)conchFile, NO_LOCK);
32393	}
32394	pCtx->conchHeld = 0;
32395	OSTRACE(("RELEASECONCH %d %s\n", conchFile->h,
	@@ -32358,11 +32527,11 @@
32527	}else{
32528	lockPath=(char *)path;
32529	}
32530
32531	OSTRACE(("TRANSPROXY %d for %s pid=%d\n", pFile->h,
32532	(lockPath ? lockPath : ":auto:"), osGetpid(0)));
32533
32534	pCtx = sqlite3_malloc( sizeof(*pCtx) );
32535	if( pCtx==0 ){
32536	return SQLITE_NOMEM;
32537	}
	@@ -32699,26 +32868,28 @@
32868	** Note that the sqlite3_vfs.pNext field of the VFS object is modified
32869	** by the SQLite core when the VFS is registered. So the following
32870	** array cannot be const.
32871	*/
32872	static sqlite3_vfs aVfs[] = {
32873	#if SQLITE_ENABLE_LOCKING_STYLE && defined(__APPLE__)
32874	UNIXVFS("unix", autolockIoFinder ),
32875	#elif OS_VXWORKS
32876	UNIXVFS("unix", vxworksIoFinder ),
32877	#else
32878	UNIXVFS("unix", posixIoFinder ),
32879	#endif
32880	UNIXVFS("unix-none", nolockIoFinder ),
32881	UNIXVFS("unix-dotfile", dotlockIoFinder ),
32882	UNIXVFS("unix-excl", posixIoFinder ),
32883	#if OS_VXWORKS
32884	UNIXVFS("unix-namedsem", semIoFinder ),
32885	#endif
32886	#if SQLITE_ENABLE_LOCKING_STYLE \|\| OS_VXWORKS
32887	UNIXVFS("unix-posix", posixIoFinder ),
32888	#endif
32889	#if SQLITE_ENABLE_LOCKING_STYLE
32890	UNIXVFS("unix-flock", flockIoFinder ),

32891	#endif
32892	#if SQLITE_ENABLE_LOCKING_STYLE && defined(__APPLE__)
32893	UNIXVFS("unix-afp", afpIoFinder ),
32894	UNIXVFS("unix-nfs", nfsIoFinder ),
32895	UNIXVFS("unix-proxy", proxyIoFinder ),
	@@ -39072,16 +39243,24 @@
39243	sqlite3GlobalConfig.pcache2.xUnpin(p->pCache->pCache, p->pPage, 0);
39244	}
39245	}
39246
39247	/*
39248	** Compute the number of pages of cache requested. p->szCache is the
39249	** cache size requested by the "PRAGMA cache_size" statement.
39250	**
39251	**
39252	*/
39253	static int numberOfCachePages(PCache *p){
39254	if( p->szCache>=0 ){
39255	/* IMPLEMENTATION-OF: R-42059-47211 If the argument N is positive then the
39256	** suggested cache size is set to N. */
39257	return p->szCache;
39258	}else{
39259	/* IMPLEMENTATION-OF: R-61436-13639 If the argument N is negative, then
39260	** the number of cache pages is adjusted to use approximately abs(N*1024)
39261	** bytes of memory. */
39262	return (int)((-1024*(i64)p->szCache)/(p->szPage+p->szExtra));
39263	}
39264	}
39265
39266	/************************************************* General Interfaces ****
	@@ -39817,20 +39996,20 @@
39996	** in pcache1 need to be protected via mutex.
39997	*/
39998	static void *pcache1Alloc(int nByte){
39999	void *p = 0;
40000	assert( sqlite3_mutex_notheld(pcache1.grp.mutex) );

40001	if( nByte<=pcache1.szSlot ){
40002	sqlite3_mutex_enter(pcache1.mutex);
40003	p = (PgHdr1 *)pcache1.pFree;
40004	if( p ){
40005	pcache1.pFree = pcache1.pFree->pNext;
40006	pcache1.nFreeSlot--;
40007	pcache1.bUnderPressure = pcache1.nFreeSlot<pcache1.nReserve;
40008	assert( pcache1.nFreeSlot>=0 );
40009	sqlite3StatusSet(SQLITE_STATUS_PAGECACHE_SIZE, nByte);
40010	sqlite3StatusUp(SQLITE_STATUS_PAGECACHE_USED, 1);
40011	}
40012	sqlite3_mutex_leave(pcache1.mutex);
40013	}
40014	if( p==0 ){
40015	/* Memory is not available in the SQLITE_CONFIG_PAGECACHE pool. Get
	@@ -39839,11 +40018,12 @@
40018	p = sqlite3Malloc(nByte);
40019	#ifndef SQLITE_DISABLE_PAGECACHE_OVERFLOW_STATS
40020	if( p ){
40021	int sz = sqlite3MallocSize(p);
40022	sqlite3_mutex_enter(pcache1.mutex);
40023	sqlite3StatusSet(SQLITE_STATUS_PAGECACHE_SIZE, nByte);
40024	sqlite3StatusUp(SQLITE_STATUS_PAGECACHE_OVERFLOW, sz);
40025	sqlite3_mutex_leave(pcache1.mutex);
40026	}
40027	#endif
40028	sqlite3MemdebugSetType(p, MEMTYPE_PCACHE);
40029	}
	@@ -39857,11 +40037,11 @@
40037	int nFreed = 0;
40038	if( p==0 ) return 0;
40039	if( p>=pcache1.pStart && p<pcache1.pEnd ){
40040	PgFreeslot *pSlot;
40041	sqlite3_mutex_enter(pcache1.mutex);
40042	sqlite3StatusDown(SQLITE_STATUS_PAGECACHE_USED, 1);
40043	pSlot = (PgFreeslot*)p;
40044	pSlot->pNext = pcache1.pFree;
40045	pcache1.pFree = pSlot;
40046	pcache1.nFreeSlot++;
40047	pcache1.bUnderPressure = pcache1.nFreeSlot<pcache1.nReserve;
	@@ -39871,11 +40051,11 @@
40051	assert( sqlite3MemdebugHasType(p, MEMTYPE_PCACHE) );
40052	sqlite3MemdebugSetType(p, MEMTYPE_HEAP);
40053	nFreed = sqlite3MallocSize(p);
40054	#ifndef SQLITE_DISABLE_PAGECACHE_OVERFLOW_STATS
40055	sqlite3_mutex_enter(pcache1.mutex);
40056	sqlite3StatusDown(SQLITE_STATUS_PAGECACHE_OVERFLOW, nFreed);
40057	sqlite3_mutex_leave(pcache1.mutex);
40058	#endif
40059	sqlite3_free(p);
40060	}
40061	return nFreed;
	@@ -40607,10 +40787,18 @@
40787
40788	/*
40789	** Return the size of the header on each page of this PCACHE implementation.
40790	*/
40791	SQLITE_PRIVATE int sqlite3HeaderSizePcache1(void){ return ROUND8(sizeof(PgHdr1)); }
40792
40793	/*
40794	** Return the global mutex used by this PCACHE implementation. The
40795	** sqlite3_status() routine needs access to this mutex.
40796	*/
40797	SQLITE_PRIVATE sqlite3_mutex *sqlite3Pcache1Mutex(void){
40798	return pcache1.mutex;
40799	}
40800
40801	#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
40802	/*
40803	** This function is called to free superfluous dynamically allocated memory
40804	** held by the pager system. Memory in use by any SQLite pager allocated
	@@ -49380,13 +49568,14 @@
49568	if( pWal->exclusiveMode ) return;
49569	(void)sqlite3OsShmLock(pWal->pDbFd, lockIdx, 1,
49570	SQLITE_SHM_UNLOCK \| SQLITE_SHM_SHARED);
49571	WALTRACE(("WAL%p: release SHARED-%s\n", pWal, walLockName(lockIdx)));
49572	}
49573	static int walLockExclusive(Wal *pWal, int lockIdx, int n, int fBlock){
49574	int rc;
49575	if( pWal->exclusiveMode ) return SQLITE_OK;
49576	if( fBlock ) sqlite3OsFileControl(pWal->pDbFd, SQLITE_FCNTL_WAL_BLOCK, 0);
49577	rc = sqlite3OsShmLock(pWal->pDbFd, lockIdx, n,
49578	SQLITE_SHM_LOCK \| SQLITE_SHM_EXCLUSIVE);
49579	WALTRACE(("WAL%p: acquire EXCLUSIVE-%s cnt=%d %s\n", pWal,
49580	walLockName(lockIdx), n, rc ? "failed" : "ok"));
49581	VVA_ONLY( pWal->lockError = (u8)(rc!=SQLITE_OK && rc!=SQLITE_BUSY); )
	@@ -49668,11 +49857,11 @@
49857	assert( WAL_ALL_BUT_WRITE==WAL_WRITE_LOCK+1 );
49858	assert( WAL_CKPT_LOCK==WAL_ALL_BUT_WRITE );
49859	assert( pWal->writeLock );
49860	iLock = WAL_ALL_BUT_WRITE + pWal->ckptLock;
49861	nLock = SQLITE_SHM_NLOCK - iLock;
49862	rc = walLockExclusive(pWal, iLock, nLock, 0);
49863	if( rc ){
49864	return rc;
49865	}
49866	WALTRACE(("WAL%p: recovery begin...\n", pWal));
49867
	@@ -50202,11 +50391,11 @@
50391	int lockIdx, /* Offset of first byte to lock */
50392	int n /* Number of bytes to lock */
50393	){
50394	int rc;
50395	do {
50396	rc = walLockExclusive(pWal, lockIdx, n, 0);
50397	}while( xBusy && rc==SQLITE_BUSY && xBusy(pBusyArg) );
50398	return rc;
50399	}
50400
50401	/*
	@@ -50635,11 +50824,11 @@
50824	if( pWal->readOnly & WAL_SHM_RDONLY ){
50825	if( SQLITE_OK==(rc = walLockShared(pWal, WAL_WRITE_LOCK)) ){
50826	walUnlockShared(pWal, WAL_WRITE_LOCK);
50827	rc = SQLITE_READONLY_RECOVERY;
50828	}
50829	}else if( SQLITE_OK==(rc = walLockExclusive(pWal, WAL_WRITE_LOCK, 1, 1)) ){
50830	pWal->writeLock = 1;
50831	if( SQLITE_OK==(rc = walIndexPage(pWal, 0, &page0)) ){
50832	badHdr = walIndexTryHdr(pWal, pChanged);
50833	if( badHdr ){
50834	/* If the wal-index header is still malformed even while holding
	@@ -50841,11 +51030,11 @@
51030	{
51031	if( (pWal->readOnly & WAL_SHM_RDONLY)==0
51032	&& (mxReadMark<pWal->hdr.mxFrame \|\| mxI==0)
51033	){
51034	for(i=1; i<WAL_NREADER; i++){
51035	rc = walLockExclusive(pWal, WAL_READ_LOCK(i), 1, 0);
51036	if( rc==SQLITE_OK ){
51037	mxReadMark = pInfo->aReadMark[i] = pWal->hdr.mxFrame;
51038	mxI = i;
51039	walUnlockExclusive(pWal, WAL_READ_LOCK(i), 1);
51040	break;
	@@ -51097,11 +51286,11 @@
51286	}
51287
51288	/* Only one writer allowed at a time. Get the write lock. Return
51289	** SQLITE_BUSY if unable.
51290	*/
51291	rc = walLockExclusive(pWal, WAL_WRITE_LOCK, 1, 0);
51292	if( rc ){
51293	return rc;
51294	}
51295	pWal->writeLock = 1;
51296
	@@ -51242,11 +51431,11 @@
51431	volatile WalCkptInfo *pInfo = walCkptInfo(pWal);
51432	assert( pInfo->nBackfill==pWal->hdr.mxFrame );
51433	if( pInfo->nBackfill>0 ){
51434	u32 salt1;
51435	sqlite3_randomness(4, &salt1);
51436	rc = walLockExclusive(pWal, WAL_READ_LOCK(1), WAL_NREADER-1, 0);
51437	if( rc==SQLITE_OK ){
51438	/* If all readers are using WAL_READ_LOCK(0) (in other words if no
51439	** readers are currently using the WAL), then the transactions
51440	** frames will overwrite the start of the existing log. Update the
51441	** wal-index header to reflect this.
	@@ -51567,11 +51756,11 @@
51756	if( pWal->readOnly ) return SQLITE_READONLY;
51757	WALTRACE(("WAL%p: checkpoint begins\n", pWal));
51758
51759	/* IMPLEMENTATION-OF: R-62028-47212 All calls obtain an exclusive
51760	** "checkpoint" lock on the database file. */
51761	rc = walLockExclusive(pWal, WAL_CKPT_LOCK, 1, 0);
51762	if( rc ){
51763	/* EVIDENCE-OF: R-10421-19736 If any other process is running a
51764	** checkpoint operation at the same time, the lock cannot be obtained and
51765	** SQLITE_BUSY is returned.
51766	** EVIDENCE-OF: R-53820-33897 Even if there is a busy-handler configured,
	@@ -52569,10 +52758,11 @@
52758
52759	/*
52760	** Exit the recursive mutex on a Btree.
52761	*/
52762	SQLITE_PRIVATE void sqlite3BtreeLeave(Btree *p){
52763	assert( sqlite3_mutex_held(p->db->mutex) );
52764	if( p->sharable ){
52765	assert( p->wantToLock>0 );
52766	p->wantToLock--;
52767	if( p->wantToLock==0 ){
52768	unlockBtreeMutex(p);
	@@ -54747,12 +54937,12 @@
54937	/*
54938	** The following asserts make sure that structures used by the btree are
54939	** the right size. This is to guard against size changes that result
54940	** when compiling on a different architecture.
54941	*/
54942	assert( sizeof(i64)==8 );
54943	assert( sizeof(u64)==8 );
54944	assert( sizeof(u32)==4 );
54945	assert( sizeof(u16)==2 );
54946	assert( sizeof(Pgno)==4 );
54947
54948	pBt = sqlite3MallocZero( sizeof(*pBt) );
	@@ -60210,11 +60400,12 @@
60400	** the previous call, as the overflow cell data will have been
60401	** copied either into the body of a database page or into the new
60402	** pSpace buffer passed to the latter call to balance_nonroot().
60403	*/
60404	u8 *pSpace = sqlite3PageMalloc(pCur->pBt->pageSize);
60405	rc = balance_nonroot(pParent, iIdx, pSpace, iPage==1,
60406	pCur->hints&BTREE_BULKLOAD);
60407	if( pFree ){
60408	/* If pFree is not NULL, it points to the pSpace buffer used
60409	** by a previous call to balance_nonroot(). Its contents are
60410	** now stored either on real database pages or within the
60411	** new pSpace buffer, so it may be safely freed here. */
	@@ -61873,17 +62064,26 @@
62064	pBt->btsFlags &= ~BTS_NO_WAL;
62065	return rc;
62066	}
62067
62068	/*
62069	** set the mask of hint flags for cursor pCsr.

62070	*/
62071	SQLITE_PRIVATE void sqlite3BtreeCursorHints(BtCursor *pCsr, unsigned int mask){
62072	assert( mask==BTREE_BULKLOAD \|\| mask==BTREE_SEEK_EQ \|\| mask==0 );
62073	pCsr->hints = mask;
62074	}
62075
62076	#ifdef SQLITE_DEBUG
62077	/*
62078	** Return true if the cursor has a hint specified. This routine is
62079	** only used from within assert() statements
62080	*/
62081	SQLITE_PRIVATE int sqlite3BtreeCursorHasHint(BtCursor *pCsr, unsigned int mask){
62082	return (pCsr->hints & mask)!=0;
62083	}
62084	#endif
62085
62086	/*
62087	** Return true if the given Btree is read-only.
62088	*/
62089	SQLITE_PRIVATE int sqlite3BtreeIsReadonly(Btree *p){
	@@ -63773,11 +63973,11 @@
63973	** by calling sqlite3ValueNew().
63974	**
63975	** Otherwise, if the second argument is non-zero, then this function is
63976	** being called indirectly by sqlite3Stat4ProbeSetValue(). If it has not
63977	** already been allocated, allocate the UnpackedRecord structure that
63978	** that function will return to its caller here. Then return a pointer to
63979	** an sqlite3_value within the UnpackedRecord.a[] array.
63980	*/
63981	static sqlite3_value valueNew(sqlite3 db, struct ValueNewStat4Ctx *p){
63982	#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
63983	if( p ){
	@@ -63817,10 +64017,117 @@
64017	UNUSED_PARAMETER(p);
64018	#endif /* defined(SQLITE_ENABLE_STAT3_OR_STAT4) */
64019	return sqlite3ValueNew(db);
64020	}
64021
64022	/*
64023	** The expression object indicated by the second argument is guaranteed
64024	** to be a scalar SQL function. If
64025	**
64026	** * all function arguments are SQL literals,
64027	** * the SQLITE_FUNC_CONSTANT function flag is set, and
64028	** * the SQLITE_FUNC_NEEDCOLL function flag is not set,
64029	**
64030	** then this routine attempts to invoke the SQL function. Assuming no
64031	** error occurs, output parameter (*ppVal) is set to point to a value
64032	** object containing the result before returning SQLITE_OK.
64033	**
64034	** Affinity aff is applied to the result of the function before returning.
64035	** If the result is a text value, the sqlite3_value object uses encoding
64036	** enc.
64037	**
64038	** If the conditions above are not met, this function returns SQLITE_OK
64039	** and sets (ppVal) to NULL. Or, if an error occurs, (ppVal) is set to
64040	** NULL and an SQLite error code returned.
64041	*/
64042	#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
64043	static int valueFromFunction(
64044	sqlite3 db, / The database connection */
64045	Expr p, / The expression to evaluate */
64046	u8 enc, /* Encoding to use */
64047	u8 aff, /* Affinity to use */
64048	sqlite3_value *ppVal, / Write the new value here */
64049	struct ValueNewStat4Ctx pCtx / Second argument for valueNew() */
64050	){
64051	sqlite3_context ctx; /* Context object for function invocation */
64052	sqlite3_value *apVal = 0; / Function arguments */
64053	int nVal = 0; /* Size of apVal[] array */
64054	FuncDef pFunc = 0; / Function definition */
64055	sqlite3_value pVal = 0; / New value */
64056	int rc = SQLITE_OK; /* Return code */
64057	int nName; /* Size of function name in bytes */
64058	ExprList pList = 0; / Function arguments */
64059	int i; /* Iterator variable */
64060
64061	assert( pCtx!=0 );
64062	assert( (p->flags & EP_TokenOnly)==0 );
64063	pList = p->x.pList;
64064	if( pList ) nVal = pList->nExpr;
64065	nName = sqlite3Strlen30(p->u.zToken);
64066	pFunc = sqlite3FindFunction(db, p->u.zToken, nName, nVal, enc, 0);
64067	assert( pFunc );
64068	if( (pFunc->funcFlags & SQLITE_FUNC_CONSTANT)==0
64069	\|\| (pFunc->funcFlags & SQLITE_FUNC_NEEDCOLL)
64070	){
64071	return SQLITE_OK;
64072	}
64073
64074	if( pList ){
64075	apVal = (sqlite3_value*)sqlite3DbMallocZero(db, sizeof(apVal[0]) nVal);
64076	if( apVal==0 ){
64077	rc = SQLITE_NOMEM;
64078	goto value_from_function_out;
64079	}
64080	for(i=0; i<nVal; i++){
64081	rc = sqlite3ValueFromExpr(db, pList->a[i].pExpr, enc, aff, &apVal[i]);
64082	if( apVal[i]==0 \|\| rc!=SQLITE_OK ) goto value_from_function_out;
64083	}
64084	}
64085
64086	pVal = valueNew(db, pCtx);
64087	if( pVal==0 ){
64088	rc = SQLITE_NOMEM;
64089	goto value_from_function_out;
64090	}
64091
64092	assert( pCtx->pParse->rc==SQLITE_OK );
64093	memset(&ctx, 0, sizeof(ctx));
64094	ctx.pOut = pVal;
64095	ctx.pFunc = pFunc;
64096	pFunc->xFunc(&ctx, nVal, apVal);
64097	if( ctx.isError ){
64098	rc = ctx.isError;
64099	sqlite3ErrorMsg(pCtx->pParse, "%s", sqlite3_value_text(pVal));
64100	}else{
64101	sqlite3ValueApplyAffinity(pVal, aff, SQLITE_UTF8);
64102	assert( rc==SQLITE_OK );
64103	rc = sqlite3VdbeChangeEncoding(pVal, enc);
64104	if( rc==SQLITE_OK && sqlite3VdbeMemTooBig(pVal) ){
64105	rc = SQLITE_TOOBIG;
64106	pCtx->pParse->nErr++;
64107	}
64108	}
64109	pCtx->pParse->rc = rc;
64110
64111	value_from_function_out:
64112	if( rc!=SQLITE_OK ){
64113	pVal = 0;
64114	}
64115	if( apVal ){
64116	for(i=0; i<nVal; i++){
64117	sqlite3ValueFree(apVal[i]);
64118	}
64119	sqlite3DbFree(db, apVal);
64120	}
64121
64122	*ppVal = pVal;
64123	return rc;
64124	}
64125	#else
64126	# define valueFromFunction(a,b,c,d,e,f) SQLITE_OK
64127	#endif /* defined(SQLITE_ENABLE_STAT3_OR_STAT4) */
64128
64129	/*
64130	** Extract a value from the supplied expression in the manner described
64131	** above sqlite3ValueFromExpr(). Allocate the sqlite3_value object
64132	** using valueNew().
64133	**
	@@ -63848,10 +64155,16 @@
64155	*ppVal = 0;
64156	return SQLITE_OK;
64157	}
64158	while( (op = pExpr->op)==TK_UPLUS ) pExpr = pExpr->pLeft;
64159	if( NEVER(op==TK_REGISTER) ) op = pExpr->op2;
64160
64161	/* Compressed expressions only appear when parsing the DEFAULT clause
64162	** on a table column definition, and hence only when pCtx==0. This
64163	** check ensures that an EP_TokenOnly expression is never passed down
64164	** into valueFromFunction(). */
64165	assert( (pExpr->flags & EP_TokenOnly)==0 \|\| pCtx==0 );
64166
64167	if( op==TK_CAST ){
64168	u8 aff = sqlite3AffinityType(pExpr->u.zToken,0);
64169	rc = valueFromExpr(db, pExpr->pLeft, enc, aff, ppVal, pCtx);
64170	testcase( rc!=SQLITE_OK );
	@@ -63924,10 +64237,16 @@
64237	assert( zVal[nVal]=='\'' );
64238	sqlite3VdbeMemSetStr(pVal, sqlite3HexToBlob(db, zVal, nVal), nVal/2,
64239	0, SQLITE_DYNAMIC);
64240	}
64241	#endif
64242
64243	#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
64244	else if( op==TK_FUNCTION && pCtx!=0 ){
64245	rc = valueFromFunction(db, pExpr, enc, affinity, &pVal, pCtx);
64246	}
64247	#endif
64248
64249	*ppVal = pVal;
64250	return rc;
64251
64252	no_mem:
	@@ -65377,11 +65696,11 @@
65696	break;
65697	}
65698	#ifndef SQLITE_OMIT_VIRTUALTABLE
65699	case P4_VTAB: {
65700	sqlite3_vtab *pVtab = pOp->p4.pVtab->pVtab;
65701	sqlite3_snprintf(nTemp, zTemp, "vtab:%p", pVtab);
65702	break;
65703	}
65704	#endif
65705	case P4_INTARRAY: {
65706	sqlite3_snprintf(nTemp, zTemp, "intarray");
	@@ -66041,13 +66360,13 @@
66360	}
66361	#ifndef SQLITE_OMIT_VIRTUALTABLE
66362	else if( pCx->pVtabCursor ){
66363	sqlite3_vtab_cursor *pVtabCursor = pCx->pVtabCursor;
66364	const sqlite3_module *pModule = pVtabCursor->pVtab->pModule;
66365	assert( pVtabCursor->pVtab->nRef>0 );
66366	pVtabCursor->pVtab->nRef--;
66367	pModule->xClose(pVtabCursor);

66368	}
66369	#endif
66370	}
66371
66372	/*
	@@ -66402,11 +66721,11 @@
66721
66722	/* Delete the master journal file. This commits the transaction. After
66723	** doing this the directory is synced again before any individual
66724	** transaction files are deleted.
66725	*/
66726	rc = sqlite3OsDelete(pVfs, zMaster, needSync);
66727	sqlite3DbFree(db, zMaster);
66728	zMaster = 0;
66729	if( rc ){
66730	return rc;
66731	}
	@@ -68615,10 +68934,14 @@
68934	}
68935	SQLITE_API const void sqlite3_value_text16le(sqlite3_value pVal){
68936	return sqlite3ValueText(pVal, SQLITE_UTF16LE);
68937	}
68938	#endif /* SQLITE_OMIT_UTF16 */
68939	/* EVIDENCE-OF: R-12793-43283 Every value in SQLite has one of five
68940	** fundamental datatypes: 64-bit signed integer 64-bit IEEE floating
68941	** point number string BLOB NULL
68942	*/
68943	SQLITE_API int sqlite3_value_type(sqlite3_value* pVal){
68944	static const u8 aType[] = {
68945	SQLITE_BLOB, /* 0x00 */
68946	SQLITE_NULL, /* 0x01 */
68947	SQLITE_TEXT, /* 0x02 */
	@@ -68811,11 +69134,11 @@
69134	}
69135	SQLITE_API void sqlite3_result_error_code(sqlite3_context *pCtx, int errCode){
69136	pCtx->isError = errCode;
69137	pCtx->fErrorOrAux = 1;
69138	#ifdef SQLITE_DEBUG
69139	if( pCtx->pVdbe ) pCtx->pVdbe->rcApp = errCode;
69140	#endif
69141	if( pCtx->pOut->flags & MEM_Null ){
69142	sqlite3VdbeMemSetStr(pCtx->pOut, sqlite3ErrStr(errCode), -1,
69143	SQLITE_UTF8, SQLITE_STATIC);
69144	}
	@@ -69074,20 +69397,30 @@
69397	assert( p && p->pFunc );
69398	return p->pOut->db;
69399	}
69400
69401	/*
69402	** Return the current time for a statement. If the current time
69403	** is requested more than once within the same run of a single prepared
69404	** statement, the exact same time is returned for each invocation regardless
69405	** of the amount of time that elapses between invocations. In other words,
69406	** the time returned is always the time of the first call.
69407	*/
69408	SQLITE_PRIVATE sqlite3_int64 sqlite3StmtCurrentTime(sqlite3_context *p){

69409	int rc;
69410	#ifndef SQLITE_ENABLE_STAT3_OR_STAT4
69411	sqlite3_int64 *piTime = &p->pVdbe->iCurrentTime;
69412	assert( p->pVdbe!=0 );
69413	#else
69414	sqlite3_int64 iTime = 0;
69415	sqlite3_int64 *piTime = p->pVdbe!=0 ? &p->pVdbe->iCurrentTime : &iTime;
69416	#endif
69417	if( *piTime==0 ){
69418	rc = sqlite3OsCurrentTimeInt64(p->pOut->db->pVfs, piTime);
69419	if( rc ) *piTime = 0;
69420	}
69421	return *piTime;
69422	}
69423
69424	/*
69425	** The following is the implementation of an SQL function that always
69426	** fails with an error message stating that the function is used in the
	@@ -69153,10 +69486,15 @@
69486	*/
69487	SQLITE_API void sqlite3_get_auxdata(sqlite3_context pCtx, int iArg){
69488	AuxData *pAuxData;
69489
69490	assert( sqlite3_mutex_held(pCtx->pOut->db->mutex) );
69491	#if SQLITE_ENABLE_STAT3_OR_STAT4
69492	if( pCtx->pVdbe==0 ) return 0;
69493	#else
69494	assert( pCtx->pVdbe!=0 );
69495	#endif
69496	for(pAuxData=pCtx->pVdbe->pAuxData; pAuxData; pAuxData=pAuxData->pNext){
69497	if( pAuxData->iOp==pCtx->iOp && pAuxData->iArg==iArg ) break;
69498	}
69499
69500	return (pAuxData ? pAuxData->pAux : 0);
	@@ -69176,10 +69514,15 @@
69514	AuxData *pAuxData;
69515	Vdbe *pVdbe = pCtx->pVdbe;
69516
69517	assert( sqlite3_mutex_held(pCtx->pOut->db->mutex) );
69518	if( iArg<0 ) goto failed;
69519	#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
69520	if( pVdbe==0 ) goto failed;
69521	#else
69522	assert( pVdbe!=0 );
69523	#endif
69524
69525	for(pAuxData=pVdbe->pAuxData; pAuxData; pAuxData=pAuxData->pNext){
69526	if( pAuxData->iOp==pCtx->iOp && pAuxData->iArg==iArg ) break;
69527	}
69528	if( pAuxData==0 ){
	@@ -71290,11 +71633,11 @@
71633
71634	/* Opcode: String8 * P2 * P4 *
71635	** Synopsis: r[P2]='P4'
71636	**
71637	** P4 points to a nul terminated UTF-8 string. This opcode is transformed
71638	** into a String opcode before it is executed for the first time. During
71639	** this transformation, the length of string P4 is computed and stored
71640	** as the P1 parameter.
71641	*/
71642	case OP_String8: { /* same as TK_STRING, out2-prerelease */
71643	assert( pOp->p4.z!=0 );
	@@ -71322,22 +71665,34 @@
71665	goto too_big;
71666	}
71667	/* Fall through to the next case, OP_String */
71668	}
71669
71670	/* Opcode: String P1 P2 P3 P4 P5
71671	** Synopsis: r[P2]='P4' (len=P1)
71672	**
71673	** The string value P4 of length P1 (bytes) is stored in register P2.
71674	**
71675	** If P5!=0 and the content of register P3 is greater than zero, then
71676	** the datatype of the register P2 is converted to BLOB. The content is
71677	** the same sequence of bytes, it is merely interpreted as a BLOB instead
71678	** of a string, as if it had been CAST.
71679	*/
71680	case OP_String: { /* out2-prerelease */
71681	assert( pOp->p4.z!=0 );
71682	pOut->flags = MEM_Str\|MEM_Static\|MEM_Term;
71683	pOut->z = pOp->p4.z;
71684	pOut->n = pOp->p1;
71685	pOut->enc = encoding;
71686	UPDATE_MAX_BLOBSIZE(pOut);
71687	if( pOp->p5 ){
71688	assert( pOp->p3>0 );
71689	assert( pOp->p3<=(p->nMem-p->nCursor) );
71690	pIn3 = &aMem[pOp->p3];
71691	assert( pIn3->flags & MEM_Int );
71692	if( pIn3->u.i ) pOut->flags = MEM_Blob\|MEM_Static\|MEM_Term;
71693	}
71694	break;
71695	}
71696
71697	/* Opcode: Null P1 P2 P3 * *
71698	** Synopsis: r[P2..P3]=NULL
	@@ -71780,11 +72135,11 @@
72135	** max() aggregate will set to 1 if the current row is not the minimum or
72136	** maximum. The P1 register is initialized to 0 by this instruction.
72137	**
72138	** The interface used by the implementation of the aforementioned functions
72139	** to retrieve the collation sequence set by this opcode is not available
72140	** publicly. Only built-in functions have access to this feature.
72141	*/
72142	case OP_CollSeq: {
72143	assert( pOp->p4type==P4_COLLSEQ );
72144	if( pOp->p1 ){
72145	sqlite3VdbeMemSetInt64(&aMem[pOp->p1], 0);
	@@ -73325,11 +73680,16 @@
73680	** the value of this counter needs to be restored too. */
73681	p->nStmtDefCons = db->nDeferredCons;
73682	p->nStmtDefImmCons = db->nDeferredImmCons;
73683	}
73684
73685	/* Gather the schema version number for checking:
73686	** IMPLEMENTATION-OF: R-32195-19465 The schema version is used by SQLite
73687	** each time a query is executed to ensure that the internal cache of the
73688	** schema used when compiling the SQL query matches the schema of the
73689	** database against which the compiled query is actually executed.
73690	*/
73691	sqlite3BtreeGetMeta(pBt, BTREE_SCHEMA_VERSION, (u32 *)&iMeta);
73692	iGen = db->aDb[pOp->p1].pSchema->iGeneration;
73693	}else{
73694	iGen = iMeta = 0;
73695	}
	@@ -73493,35 +73853,33 @@
73853	** cursors or a single read/write cursor but not both.
73854	**
73855	** See also OpenRead.
73856	*/
73857	case OP_ReopenIdx: {














73858	int nField;
73859	KeyInfo *pKeyInfo;
73860	int p2;
73861	int iDb;
73862	int wrFlag;
73863	Btree *pX;
73864	VdbeCursor *pCur;
73865	Db *pDb;
73866
73867	assert( pOp->p5==0 \|\| pOp->p5==OPFLAG_SEEKEQ );
73868	assert( pOp->p4type==P4_KEYINFO );
73869	pCur = p->apCsr[pOp->p1];
73870	if( pCur && pCur->pgnoRoot==(u32)pOp->p2 ){
73871	assert( pCur->iDb==pOp->p3 ); /* Guaranteed by the code generator */
73872	goto open_cursor_set_hints;
73873	}
73874	/* If the cursor is not currently open or is open on a different
73875	** index, then fall through into OP_OpenRead to force a reopen */
73876	case OP_OpenRead:
73877	case OP_OpenWrite:
73878
73879	assert( (pOp->p5&(OPFLAG_P2ISREG\|OPFLAG_BULKCSR\|OPFLAG_SEEKEQ))==pOp->p5 );
73880	assert( pOp->opcode==OP_OpenWrite \|\| pOp->p5==0 \|\| pOp->p5==OPFLAG_SEEKEQ );
73881	assert( p->bIsReader );
73882	assert( pOp->opcode==OP_OpenRead \|\| pOp->opcode==OP_ReopenIdx
73883	\|\| p->readOnly==0 );
73884
73885	if( p->expired ){
	@@ -73580,18 +73938,21 @@
73938	pCur->nullRow = 1;
73939	pCur->isOrdered = 1;
73940	pCur->pgnoRoot = p2;
73941	rc = sqlite3BtreeCursor(pX, p2, wrFlag, pKeyInfo, pCur->pCursor);
73942	pCur->pKeyInfo = pKeyInfo;



73943	/* Set the VdbeCursor.isTable variable. Previous versions of
73944	** SQLite used to check if the root-page flags were sane at this point
73945	** and report database corruption if they were not, but this check has
73946	** since moved into the btree layer. */
73947	pCur->isTable = pOp->p4type!=P4_KEYINFO;
73948
73949	open_cursor_set_hints:
73950	assert( OPFLAG_BULKCSR==BTREE_BULKLOAD );
73951	assert( OPFLAG_SEEKEQ==BTREE_SEEK_EQ );
73952	sqlite3BtreeCursorHints(pCur->pCursor,
73953	(pOp->p5 & (OPFLAG_BULKCSR\|OPFLAG_SEEKEQ)));
73954	break;
73955	}
73956
73957	/* Opcode: OpenEphemeral P1 P2 * P4 P5
73958	** Synopsis: nColumn=P2
	@@ -73848,10 +74209,26 @@
74209	oc = pOp->opcode;
74210	pC->nullRow = 0;
74211	#ifdef SQLITE_DEBUG
74212	pC->seekOp = pOp->opcode;
74213	#endif
74214
74215	/* For a cursor with the BTREE_SEEK_EQ hint, only the OP_SeekGE and
74216	** OP_SeekLE opcodes are allowed, and these must be immediately followed
74217	** by an OP_IdxGT or OP_IdxLT opcode, respectively, with the same key.
74218	*/
74219	#ifdef SQLITE_DEBUG
74220	if( sqlite3BtreeCursorHasHint(pC->pCursor, BTREE_SEEK_EQ) ){
74221	assert( pOp->opcode==OP_SeekGE \|\| pOp->opcode==OP_SeekLE );
74222	assert( pOp[1].opcode==OP_IdxLT \|\| pOp[1].opcode==OP_IdxGT );
74223	assert( pOp[1].p1==pOp[0].p1 );
74224	assert( pOp[1].p2==pOp[0].p2 );
74225	assert( pOp[1].p3==pOp[0].p3 );
74226	assert( pOp[1].p4.i==pOp[0].p4.i );
74227	}
74228	#endif
74229
74230	if( pC->isTable ){
74231	/* The input value in P3 might be of any type: integer, real, string,
74232	** blob, or NULL. But it needs to be an integer before we can do
74233	** the seek, so convert it. */
74234	pIn3 = &aMem[pOp->p3];
	@@ -75187,34 +75564,19 @@
75564	**
75565	** See also: Clear
75566	*/
75567	case OP_Destroy: { /* out2-prerelease */
75568	int iMoved;


75569	int iDb;
75570
75571	assert( p->readOnly==0 );












75572	pOut->flags = MEM_Null;
75573	if( db->nVdbeRead > db->nVDestroy+1 ){
75574	rc = SQLITE_LOCKED;
75575	p->errorAction = OE_Abort;
75576	}else{
75577	iDb = pOp->p3;

75578	assert( DbMaskTest(p->btreeMask, iDb) );
75579	iMoved = 0; /* Not needed. Only to silence a warning. */
75580	rc = sqlite3BtreeDropTable(db->aDb[iDb].pBt, pOp->p1, &iMoved);
75581	pOut->flags = MEM_Int;
75582	pOut->u.i = iMoved;
	@@ -75843,14 +76205,16 @@
76205	#endif /* SQLITE_OMIT_AUTOINCREMENT */
76206
76207	/* Opcode: IfPos P1 P2 * * *
76208	** Synopsis: if r[P1]>0 goto P2
76209	**
76210	** Register P1 must contain an integer.
76211	** If the value of register P1 is 1 or greater, jump to P2 and
76212	** add the literal value P3 to register P1.
76213	**
76214	** If the initial value of register P1 is less than 1, then the
76215	** value is unchanged and control passes through to the next instruction.
76216	*/
76217	case OP_IfPos: { /* jump, in1 */
76218	pIn1 = &aMem[pOp->p1];
76219	assert( pIn1->flags&MEM_Int );
76220	VdbeBranchTaken( pIn1->u.i>0, 2);
	@@ -75875,27 +76239,63 @@
76239	pc = pOp->p2 - 1;
76240	}
76241	break;
76242	}
76243
76244	/* Opcode: IfNotZero P1 P2 P3 * *
76245	** Synopsis: if r[P1]!=0 then r[P1]+=P3, goto P2
76246	**
76247	** Register P1 must contain an integer. If the content of register P1 is
76248	** initially nonzero, then add P3 to P1 and jump to P2. If register P1 is
76249	** initially zero, leave it unchanged and fall through.
76250	*/
76251	case OP_IfNotZero: { /* jump, in1 */
76252	pIn1 = &aMem[pOp->p1];
76253	assert( pIn1->flags&MEM_Int );
76254	VdbeBranchTaken(pIn1->u.i<0, 2);
76255	if( pIn1->u.i ){
76256	pIn1->u.i += pOp->p3;
76257	pc = pOp->p2 - 1;
76258	}
76259	break;
76260	}
76261
76262	/* Opcode: DecrJumpZero P1 P2 * * *
76263	** Synopsis: if (--r[P1])==0 goto P2
76264	**
76265	** Register P1 must hold an integer. Decrement the value in register P1
76266	** then jump to P2 if the new value is exactly zero.
76267	*/
76268	case OP_DecrJumpZero: { /* jump, in1 */
76269	pIn1 = &aMem[pOp->p1];
76270	assert( pIn1->flags&MEM_Int );
76271	pIn1->u.i--;
76272	VdbeBranchTaken(pIn1->u.i==0, 2);
76273	if( pIn1->u.i==0 ){
76274	pc = pOp->p2 - 1;
76275	}
76276	break;
76277	}
76278
76279
76280	/* Opcode: JumpZeroIncr P1 P2 * * *
76281	** Synopsis: if (r[P1]++)==0 ) goto P2
76282	**
76283	** The register P1 must contain an integer. If register P1 is initially
76284	** zero, then jump to P2. Increment register P1 regardless of whether or
76285	** not the jump is taken.
76286	*/
76287	case OP_JumpZeroIncr: { /* jump, in1 */
76288	pIn1 = &aMem[pOp->p1];
76289	assert( pIn1->flags&MEM_Int );
76290	VdbeBranchTaken(pIn1->u.i==0, 2);
76291	if( (pIn1->u.i++)==0 ){
76292	pc = pOp->p2 - 1;
76293	}
76294	break;
76295	}
76296
76297	/* Opcode: AggStep * P2 P3 P4 P5
76298	** Synopsis: accum=r[P3] step(r[P2@P5])
76299	**
76300	** Execute the step function for an aggregate. The
76301	** function has P5 arguments. P4 is a pointer to the FuncDef
	@@ -76229,17 +76629,33 @@
76629	break;
76630	}
76631	#endif /* SQLITE_OMIT_VIRTUALTABLE */
76632
76633	#ifndef SQLITE_OMIT_VIRTUALTABLE
76634	/* Opcode: VCreate P1 P2 * * *
76635	**
76636	** P2 is a register that holds the name of a virtual table in database
76637	** P1. Call the xCreate method for that table.
76638	*/
76639	case OP_VCreate: {
76640	Mem sMem; /* For storing the record being decoded */
76641	const char zTab; / Name of the virtual table */
76642
76643	memset(&sMem, 0, sizeof(sMem));
76644	sMem.db = db;
76645	/* Because P2 is always a static string, it is impossible for the
76646	** sqlite3VdbeMemCopy() to fail */
76647	assert( (aMem[pOp->p2].flags & MEM_Str)!=0 );
76648	assert( (aMem[pOp->p2].flags & MEM_Static)!=0 );
76649	rc = sqlite3VdbeMemCopy(&sMem, &aMem[pOp->p2]);
76650	assert( rc==SQLITE_OK );
76651	zTab = (const char*)sqlite3_value_text(&sMem);
76652	assert( zTab \|\| db->mallocFailed );
76653	if( zTab ){
76654	rc = sqlite3VtabCallCreate(db, pOp->p1, zTab, &p->zErrMsg);
76655	}
76656	sqlite3VdbeMemRelease(&sMem);
76657	break;
76658	}
76659	#endif /* SQLITE_OMIT_VIRTUALTABLE */
76660
76661	#ifndef SQLITE_OMIT_VIRTUALTABLE
	@@ -76247,13 +76663,13 @@
76663	**
76664	** P4 is the name of a virtual table in database P1. Call the xDestroy method
76665	** of that table.
76666	*/
76667	case OP_VDestroy: {
76668	db->nVDestroy++;
76669	rc = sqlite3VtabCallDestroy(db, pOp->p1, pOp->p4.z);
76670	db->nVDestroy--;
76671	break;
76672	}
76673	#endif /* SQLITE_OMIT_VIRTUALTABLE */
76674
76675	#ifndef SQLITE_OMIT_VIRTUALTABLE
	@@ -76265,18 +76681,21 @@
76681	*/
76682	case OP_VOpen: {
76683	VdbeCursor *pCur;
76684	sqlite3_vtab_cursor *pVtabCursor;
76685	sqlite3_vtab *pVtab;
76686	const sqlite3_module *pModule;
76687
76688	assert( p->bIsReader );
76689	pCur = 0;
76690	pVtabCursor = 0;
76691	pVtab = pOp->p4.pVtab->pVtab;
76692	if( pVtab==0 \|\| NEVER(pVtab->pModule==0) ){
76693	rc = SQLITE_LOCKED;
76694	break;
76695	}
76696	pModule = pVtab->pModule;
76697	rc = pModule->xOpen(pVtab, &pVtabCursor);
76698	sqlite3VtabImportErrmsg(p, pVtab);
76699	if( SQLITE_OK==rc ){
76700	/* Initialize sqlite3_vtab_cursor base class */
76701	pVtabCursor->pVtab = pVtab;
	@@ -76283,10 +76702,11 @@
76702
76703	/* Initialize vdbe cursor object */
76704	pCur = allocateCursor(p, pOp->p1, 0, -1, 0);
76705	if( pCur ){
76706	pCur->pVtabCursor = pVtabCursor;
76707	pVtab->nRef++;
76708	}else{
76709	db->mallocFailed = 1;
76710	pModule->xClose(pVtabCursor);
76711	}
76712	}
	@@ -76348,13 +76768,11 @@
76768	apArg = p->apArg;
76769	for(i = 0; i<nArg; i++){
76770	apArg[i] = &pArgc[i+1];
76771	}
76772

76773	rc = pModule->xFilter(pVtabCursor, iQuery, pOp->p4.z, nArg, apArg);

76774	sqlite3VtabImportErrmsg(p, pVtab);
76775	if( rc==SQLITE_OK ){
76776	res = pModule->xEof(pVtabCursor);
76777	}
76778	VdbeBranchTaken(res!=0,2);
	@@ -76440,13 +76858,11 @@
76858	** underlying implementation to return an error if one occurs during
76859	** xNext(). Instead, if an error occurs, true is returned (indicating that
76860	** data is available) and the error code returned when xColumn or
76861	** some other method is next invoked on the save virtual table cursor.
76862	*/

76863	rc = pModule->xNext(pCur->pVtabCursor);

76864	sqlite3VtabImportErrmsg(p, pVtab);
76865	if( rc==SQLITE_OK ){
76866	res = pModule->xEof(pCur->pVtabCursor);
76867	}
76868	VdbeBranchTaken(!res,2);
	@@ -76517,11 +76933,11 @@
76933	** P5 is the error actions (OE_Replace, OE_Fail, OE_Ignore, etc) to
76934	** apply in the case of a constraint failure on an insert or update.
76935	*/
76936	case OP_VUpdate: {
76937	sqlite3_vtab *pVtab;
76938	const sqlite3_module *pModule;
76939	int nArg;
76940	int i;
76941	sqlite_int64 rowid;
76942	Mem **apArg;
76943	Mem *pX;
	@@ -76529,11 +76945,15 @@
76945	assert( pOp->p2==1 \|\| pOp->p5==OE_Fail \|\| pOp->p5==OE_Rollback
76946	\|\| pOp->p5==OE_Abort \|\| pOp->p5==OE_Ignore \|\| pOp->p5==OE_Replace
76947	);
76948	assert( p->readOnly==0 );
76949	pVtab = pOp->p4.pVtab->pVtab;
76950	if( pVtab==0 \|\| NEVER(pVtab->pModule==0) ){
76951	rc = SQLITE_LOCKED;
76952	break;
76953	}
76954	pModule = pVtab->pModule;
76955	nArg = pOp->p2;
76956	assert( pOp->p4type==P4_VTAB );
76957	if( ALWAYS(pModule->xUpdate) ){
76958	u8 vtabOnConflict = db->vtabOnConflict;
76959	apArg = p->apArg;
	@@ -78399,10 +78819,11 @@
78819	sqlite3 db, / Database handle doing sort */
78820	i64 nExtend, /* Attempt to extend file to this size */
78821	sqlite3_file **ppFd
78822	){
78823	int rc;
78824	if( sqlite3FaultSim(202) ) return SQLITE_IOERR_ACCESS;
78825	rc = sqlite3OsOpenMalloc(db->pVfs, 0, ppFd,
78826	SQLITE_OPEN_TEMP_JOURNAL \|
78827	SQLITE_OPEN_READWRITE \| SQLITE_OPEN_CREATE \|
78828	SQLITE_OPEN_EXCLUSIVE \| SQLITE_OPEN_DELETEONCLOSE, &rc
78829	);
	@@ -81990,14 +82411,15 @@
82411	** and the pExpr parameter is returned unchanged.
82412	*/
82413	SQLITE_PRIVATE Expr *sqlite3ExprAddCollateToken(
82414	Parse pParse, / Parsing context */
82415	Expr pExpr, / Add the "COLLATE" clause to this expression */
82416	const Token pCollName, / Name of collating sequence */
82417	int dequote /* True to dequote pCollName */
82418	){
82419	if( pCollName->n>0 ){
82420	Expr *pNew = sqlite3ExprAlloc(pParse->db, TK_COLLATE, pCollName, dequote);
82421	if( pNew ){
82422	pNew->pLeft = pExpr;
82423	pNew->flags \|= EP_Collate\|EP_Skip;
82424	pExpr = pNew;
82425	}
	@@ -82007,11 +82429,11 @@
82429	SQLITE_PRIVATE Expr sqlite3ExprAddCollateString(Parse pParse, Expr pExpr, const char zC){
82430	Token s;
82431	assert( zC!=0 );
82432	s.z = zC;
82433	s.n = sqlite3Strlen30(s.z);
82434	return sqlite3ExprAddCollateToken(pParse, pExpr, &s, 0);
82435	}
82436
82437	/*
82438	** Skip over any TK_COLLATE or TK_AS operators and any unlikely()
82439	** or likelihood() function at the root of an expression.
	@@ -82317,10 +82739,11 @@
82739	**
82740	** Also propagate all EP_Propagate flags from the Expr.x.pList into
82741	** Expr.flags.
82742	*/
82743	SQLITE_PRIVATE void sqlite3ExprSetHeightAndFlags(Parse pParse, Expr p){
82744	if( pParse->nErr ) return;
82745	exprSetHeight(p);
82746	sqlite3ExprCheckHeight(pParse, p->nHeight);
82747	}
82748
82749	/*
	@@ -87031,11 +87454,14 @@
87454	/* Ensure the default expression is something that sqlite3ValueFromExpr()
87455	** can handle (i.e. not CURRENT_TIME etc.)
87456	*/
87457	if( pDflt ){
87458	sqlite3_value *pVal = 0;
87459	int rc;
87460	rc = sqlite3ValueFromExpr(db, pDflt, SQLITE_UTF8, SQLITE_AFF_NONE, &pVal);
87461	assert( rc==SQLITE_OK \|\| rc==SQLITE_NOMEM );
87462	if( rc!=SQLITE_OK ){
87463	db->mallocFailed = 1;
87464	return;
87465	}
87466	if( !pVal ){
87467	sqlite3ErrorMsg(pParse, "Cannot add a column with non-constant default");
	@@ -93094,10 +93520,11 @@
93520	}
93521	if( pIdx->onError==OE_Default ){
93522	pIdx->onError = pIndex->onError;
93523	}
93524	}
93525	pRet = pIdx;
93526	goto exit_create_index;
93527	}
93528	}
93529	}
93530
	@@ -95553,11 +95980,13 @@
95980
95981	/*
95982	** Return the collating function associated with a function.
95983	*/
95984	static CollSeq sqlite3GetFuncCollSeq(sqlite3_context context){
95985	VdbeOp *pOp;
95986	assert( context->pVdbe!=0 );
95987	pOp = &context->pVdbe->aOp[context->iOp-1];
95988	assert( pOp->opcode==OP_CollSeq );
95989	assert( pOp->p4type==P4_COLLSEQ );
95990	return pOp->p4.pColl;
95991	}
95992
	@@ -97181,10 +97610,15 @@
97610	** pExpr points to an expression which implements a function. If
97611	** it is appropriate to apply the LIKE optimization to that function
97612	** then set aWc[0] through aWc[2] to the wildcard characters and
97613	** return TRUE. If the function is not a LIKE-style function then
97614	** return FALSE.
97615	**
97616	** *pIsNocase is set to true if uppercase and lowercase are equivalent for
97617	** the function (default for LIKE). If the function makes the distinction
97618	** between uppercase and lowercase (as does GLOB) then *pIsNocase is set to
97619	** false.
97620	*/
97621	SQLITE_PRIVATE int sqlite3IsLikeFunction(sqlite3 db, Expr pExpr, int pIsNocase, char aWc){
97622	FuncDef *pDef;
97623	if( pExpr->op!=TK_FUNCTION
97624	\|\| !pExpr->x.pList
	@@ -102972,10 +103406,21 @@
103406	}
103407
103408	/* Send an SQLITE_FCNTL_PRAGMA file-control to the underlying VFS
103409	** connection. If it returns SQLITE_OK, then assume that the VFS
103410	** handled the pragma and generate a no-op prepared statement.
103411	**
103412	** IMPLEMENTATION-OF: R-12238-55120 Whenever a PRAGMA statement is parsed,
103413	** an SQLITE_FCNTL_PRAGMA file control is sent to the open sqlite3_file
103414	** object corresponding to the database file to which the pragma
103415	** statement refers.
103416	**
103417	** IMPLEMENTATION-OF: R-29875-31678 The argument to the SQLITE_FCNTL_PRAGMA
103418	file control is an array of pointers to strings (char) in which the
103419	** second element of the array is the name of the pragma and the third
103420	** element is the argument to the pragma or NULL if the pragma has no
103421	** argument.
103422	*/
103423	aFcntl[0] = 0;
103424	aFcntl[1] = zLeft;
103425	aFcntl[2] = zRight;
103426	aFcntl[3] = 0;
	@@ -103732,34 +104177,46 @@
104177	Index *pIdx;
104178	Table *pTab;
104179	pIdx = sqlite3FindIndex(db, zRight, zDb);
104180	if( pIdx ){
104181	int i;
104182	int mx;
104183	if( pPragma->iArg ){
104184	/* PRAGMA index_xinfo (newer version with more rows and columns) */
104185	mx = pIdx->nColumn;
104186	pParse->nMem = 6;
104187	}else{
104188	/* PRAGMA index_info (legacy version) */
104189	mx = pIdx->nKeyCol;
104190	pParse->nMem = 3;
104191	}
104192	pTab = pIdx->pTable;
104193	sqlite3VdbeSetNumCols(v, pParse->nMem);

104194	sqlite3CodeVerifySchema(pParse, iDb);
104195	sqlite3VdbeSetColName(v, 0, COLNAME_NAME, "seqno", SQLITE_STATIC);
104196	sqlite3VdbeSetColName(v, 1, COLNAME_NAME, "cid", SQLITE_STATIC);
104197	sqlite3VdbeSetColName(v, 2, COLNAME_NAME, "name", SQLITE_STATIC);
104198	if( pPragma->iArg ){
104199	sqlite3VdbeSetColName(v, 3, COLNAME_NAME, "desc", SQLITE_STATIC);
104200	sqlite3VdbeSetColName(v, 4, COLNAME_NAME, "coll", SQLITE_STATIC);
104201	sqlite3VdbeSetColName(v, 5, COLNAME_NAME, "key", SQLITE_STATIC);
104202	}
104203	for(i=0; i<mx; i++){
104204	i16 cnum = pIdx->aiColumn[i];
104205	sqlite3VdbeAddOp2(v, OP_Integer, i, 1);
104206	sqlite3VdbeAddOp2(v, OP_Integer, cnum, 2);
104207	if( cnum<0 ){
104208	sqlite3VdbeAddOp2(v, OP_Null, 0, 3);
104209	}else{
104210	sqlite3VdbeAddOp4(v, OP_String8, 0, 3, 0, pTab->aCol[cnum].zName, 0);
104211	}
104212	if( pPragma->iArg ){
104213	sqlite3VdbeAddOp2(v, OP_Integer, pIdx->aSortOrder[i], 4);
104214	sqlite3VdbeAddOp4(v, OP_String8, 0, 5, 0, pIdx->azColl[i], 0);
104215	sqlite3VdbeAddOp2(v, OP_Integer, i<pIdx->nKeyCol, 6);
104216	}
104217	sqlite3VdbeAddOp2(v, OP_ResultRow, 1, pParse->nMem);
104218	}
104219	}
104220	}
104221	break;
104222
	@@ -104457,12 +104914,13 @@
104914	#endif
104915
104916	/*
104917	** PRAGMA shrink_memory
104918	**
104919	** IMPLEMENTATION-OF: R-23445-46109 This pragma causes the database
104920	** connection on which it is invoked to free up as much memory as it
104921	** can, by calling sqlite3_db_release_memory().
104922	*/
104923	case PragTyp_SHRINK_MEMORY: {
104924	sqlite3_db_release_memory(db);
104925	break;
104926	}
	@@ -104487,12 +104945,16 @@
104945
104946	/*
104947	** PRAGMA soft_heap_limit
104948	** PRAGMA soft_heap_limit = N
104949	**
104950	** IMPLEMENTATION-OF: R-26343-45930 This pragma invokes the
104951	** sqlite3_soft_heap_limit64() interface with the argument N, if N is
104952	** specified and is a non-negative integer.
104953	** IMPLEMENTATION-OF: R-64451-07163 The soft_heap_limit pragma always
104954	** returns the same integer that would be returned by the
104955	** sqlite3_soft_heap_limit64(-1) C-language function.
104956	*/
104957	case PragTyp_SOFT_HEAP_LIMIT: {
104958	sqlite3_int64 N;
104959	if( zRight && sqlite3DecOrHexToI64(zRight, &N)==SQLITE_OK ){
104960	sqlite3_soft_heap_limit64(N);
	@@ -106065,24 +106527,21 @@
106527	}else{
106528	op = OP_IdxInsert;
106529	}
106530	sqlite3VdbeAddOp2(v, op, pSort->iECursor, regRecord);
106531	if( pSelect->iLimit ){
106532	int addr;
106533	int iLimit;
106534	if( pSelect->iOffset ){
106535	iLimit = pSelect->iOffset+1;
106536	}else{
106537	iLimit = pSelect->iLimit;
106538	}
106539	addr = sqlite3VdbeAddOp3(v, OP_IfNotZero, iLimit, 0, -1); VdbeCoverage(v);



106540	sqlite3VdbeAddOp1(v, OP_Last, pSort->iECursor);
106541	sqlite3VdbeAddOp1(v, OP_Delete, pSort->iECursor);
106542	sqlite3VdbeJumpHere(v, addr);
106543	}
106544	}
106545
106546	/*
106547	** Add code to implement the OFFSET
	@@ -106475,11 +106934,11 @@
106934	/* Jump to the end of the loop if the LIMIT is reached. Except, if
106935	** there is a sorter, in which case the sorter has already limited
106936	** the output for us.
106937	*/
106938	if( pSort==0 && p->iLimit ){
106939	sqlite3VdbeAddOp2(v, OP_DecrJumpZero, p->iLimit, iBreak); VdbeCoverage(v);
106940	}
106941	}
106942
106943	/*
106944	** Allocate a KeyInfo object sufficient for an index of N key columns and
	@@ -107328,11 +107787,11 @@
107787	}
107788	}else{
107789	sqlite3ExprCode(pParse, p->pLimit, iLimit);
107790	sqlite3VdbeAddOp1(v, OP_MustBeInt, iLimit); VdbeCoverage(v);
107791	VdbeComment((v, "LIMIT counter"));
107792	sqlite3VdbeAddOp2(v, OP_IfNot, iLimit, iBreak); VdbeCoverage(v);
107793	}
107794	if( p->pOffset ){
107795	p->iOffset = iOffset = ++pParse->nMem;
107796	pParse->nMem++; /* Allocate an extra register for limit+offset */
107797	sqlite3ExprCode(pParse, p->pOffset, iOffset);
	@@ -107547,11 +108006,11 @@
108006	addrCont = sqlite3VdbeMakeLabel(v);
108007	codeOffset(v, regOffset, addrCont);
108008	selectInnerLoop(pParse, p, p->pEList, iCurrent,
108009	0, 0, pDest, addrCont, addrBreak);
108010	if( regLimit ){
108011	sqlite3VdbeAddOp2(v, OP_DecrJumpZero, regLimit, addrBreak);
108012	VdbeCoverage(v);
108013	}
108014	sqlite3VdbeResolveLabel(v, addrCont);
108015
108016	/* Execute the recursive SELECT taking the single row in Current as
	@@ -107772,11 +108231,11 @@
108231	}
108232	p->pPrior = 0;
108233	p->iLimit = pPrior->iLimit;
108234	p->iOffset = pPrior->iOffset;
108235	if( p->iLimit ){
108236	addr = sqlite3VdbeAddOp1(v, OP_IfNot, p->iLimit); VdbeCoverage(v);
108237	VdbeComment((v, "Jump ahead if LIMIT reached"));
108238	}
108239	explainSetInteger(iSub2, pParse->iNextSelectId);
108240	rc = sqlite3Select(pParse, p, &dest);
108241	testcase( rc!=SQLITE_OK );
	@@ -108173,11 +108632,11 @@
108632	}
108633
108634	/* Jump to the end of the loop if the LIMIT is reached.
108635	*/
108636	if( p->iLimit ){
108637	sqlite3VdbeAddOp2(v, OP_DecrJumpZero, p->iLimit, iBreak); VdbeCoverage(v);
108638	}
108639
108640	/* Generate the subroutine return
108641	*/
108642	sqlite3VdbeResolveLabel(v, iContinue);
	@@ -109540,11 +109999,11 @@
109999	sqlite3WalkSelect(pWalker, bMayRecursive ? pSel->pPrior : pSel);
110000
110001	for(pLeft=pSel; pLeft->pPrior; pLeft=pLeft->pPrior);
110002	pEList = pLeft->pEList;
110003	if( pCte->pCols ){
110004	if( pEList && pEList->nExpr!=pCte->pCols->nExpr ){
110005	sqlite3ErrorMsg(pParse, "table %s has %d values for %d columns",
110006	pCte->zName, pEList->nExpr, pCte->pCols->nExpr
110007	);
110008	pParse->pWith = pSavedWith;
110009	return SQLITE_ERROR;
	@@ -113966,10 +114425,11 @@
114425	*/
114426	if( !db->init.busy ){
114427	char *zStmt;
114428	char *zWhere;
114429	int iDb;
114430	int iReg;
114431	Vdbe *v;
114432
114433	/* Compute the complete text of the CREATE VIRTUAL TABLE statement */
114434	if( pEnd ){
114435	pParse->sNameToken.n = (int)(pEnd->z - pParse->sNameToken.z) + pEnd->n;
	@@ -114000,12 +114460,14 @@
114460	sqlite3ChangeCookie(pParse, iDb);
114461
114462	sqlite3VdbeAddOp2(v, OP_Expire, 0, 0);
114463	zWhere = sqlite3MPrintf(db, "name='%q' AND type='table'", pTab->zName);
114464	sqlite3VdbeAddParseSchemaOp(v, iDb, zWhere);
114465
114466	iReg = ++pParse->nMem;
114467	sqlite3VdbeAddOp4(v, OP_String8, 0, iReg, 0, pTab->zName, 0);
114468	sqlite3VdbeAddOp2(v, OP_VCreate, iDb, iReg);
114469	}
114470
114471	/* If we are rereading the sqlite_master table create the in-memory
114472	** record of the table. The xConnect() method is not called until
114473	** the first time the virtual table is used in an SQL statement. This
	@@ -114354,15 +114816,19 @@
114816	int rc = SQLITE_OK;
114817	Table *pTab;
114818
114819	pTab = sqlite3FindTable(db, zTab, db->aDb[iDb].zName);
114820	if( ALWAYS(pTab!=0 && pTab->pVTable!=0) ){
114821	VTable *p;
114822	for(p=pTab->pVTable; p; p=p->pNext){
114823	assert( p->pVtab );
114824	if( p->pVtab->nRef>0 ){
114825	return SQLITE_LOCKED;
114826	}
114827	}
114828	p = vtabDisconnectAll(db, pTab);
114829	rc = p->pMod->pModule->xDestroy(p->pVtab);

114830	/* Remove the sqlite3_vtab* from the aVTrans[] array, if applicable */
114831	if( rc==SQLITE_OK ){
114832	assert( pTab->pVTable==p && p->pNext==0 );
114833	p->pVtab = 0;
114834	pTab->pVTable = 0;
	@@ -114787,10 +115253,12 @@
115253	int addrNxt; /* Jump here to start the next IN combination */
115254	int addrSkip; /* Jump here for next iteration of skip-scan */
115255	int addrCont; /* Jump here to continue with the next loop cycle */
115256	int addrFirst; /* First instruction of interior of the loop */
115257	int addrBody; /* Beginning of the body of this loop */
115258	int iLikeRepCntr; /* LIKE range processing counter register */
115259	int addrLikeRep; /* LIKE range processing address */
115260	u8 iFrom; /* Which entry in the FROM clause */
115261	u8 op, p3, p5; /* Opcode, P3 & P5 of the opcode that ends the loop */
115262	int p1, p2; /* Operands of the opcode used to ends the loop */
115263	union { /* Information that depends on pWLoop->wsFlags */
115264	struct {
	@@ -114971,11 +115439,11 @@
115439	WhereOrInfo pOrInfo; / Extra information if (eOperator & WO_OR)!=0 */
115440	WhereAndInfo pAndInfo; / Extra information if (eOperator& WO_AND)!=0 */
115441	} u;
115442	LogEst truthProb; /* Probability of truth for this expression */
115443	u16 eOperator; /* A WO_xx value describing <op> */
115444	u16 wtFlags; /* TERM_xxx bit flags. See below */
115445	u8 nChild; /* Number of children that must disable us */
115446	WhereClause pWC; / The clause this term is part of */
115447	Bitmask prereqRight; /* Bitmask of tables used by pExpr->pRight */
115448	Bitmask prereqAll; /* Bitmask of tables referenced by pExpr */
115449	};
	@@ -114993,10 +115461,13 @@
115461	#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
115462	# define TERM_VNULL 0x80 /* Manufactured x>NULL or x<=NULL term */
115463	#else
115464	# define TERM_VNULL 0x00 /* Disabled if not using stat3 */
115465	#endif
115466	#define TERM_LIKEOPT 0x100 /* Virtual terms from the LIKE optimization */
115467	#define TERM_LIKECOND 0x200 /* Conditionally this LIKE operator term */
115468	#define TERM_LIKE 0x400 /* The original LIKE operator */
115469
115470	/*
115471	** An instance of the WhereScan object is used as an iterator for locating
115472	** terms in the WHERE clause that are useful to the query planner.
115473	*/
	@@ -115368,11 +115839,11 @@
115839	** WARNING: This routine might reallocate the space used to store
115840	** WhereTerms. All pointers to WhereTerms should be invalidated after
115841	** calling this routine. Such pointers may be reinitialized by referencing
115842	** the pWC->a[] array.
115843	*/
115844	static int whereClauseInsert(WhereClause pWC, Expr p, u16 wtFlags){
115845	WhereTerm *pTerm;
115846	int idx;
115847	testcase( wtFlags & TERM_VIRTUAL );
115848	if( pWC->nTerm>=pWC->nSlot ){
115849	WhereTerm *pOld = pWC->a;
	@@ -115793,11 +116264,15 @@
116264	** Check to see if the given expression is a LIKE or GLOB operator that
116265	** can be optimized using inequality constraints. Return TRUE if it is
116266	** so and false if not.
116267	**
116268	** In order for the operator to be optimizible, the RHS must be a string
116269	** literal that does not begin with a wildcard. The LHS must be a column
116270	** that may only be NULL, a string, or a BLOB, never a number. (This means
116271	** that virtual tables cannot participate in the LIKE optimization.) If the
116272	** collating sequence for the column on the LHS must be appropriate for
116273	** the operator.
116274	*/
116275	static int isLikeOrGlob(
116276	Parse pParse, / Parsing and code generating context */
116277	Expr pExpr, / Test this expression */
116278	Expr *ppPrefix, / Pointer to TK_STRING expression with pattern prefix */
	@@ -115822,11 +116297,11 @@
116297	#endif
116298	pList = pExpr->x.pList;
116299	pLeft = pList->a[1].pExpr;
116300	if( pLeft->op!=TK_COLUMN
116301	\|\| sqlite3ExprAffinity(pLeft)!=SQLITE_AFF_TEXT
116302	\|\| IsVirtual(pLeft->pTab) /* Value might be numeric */
116303	){
116304	/* IMP: R-02065-49465 The left-hand side of the LIKE or GLOB operator must
116305	** be the name of an indexed column with TEXT affinity. */
116306	return 0;
116307	}
	@@ -115931,10 +116406,83 @@
116406	static void markTermAsChild(WhereClause *pWC, int iChild, int iParent){
116407	pWC->a[iChild].iParent = iParent;
116408	pWC->a[iChild].truthProb = pWC->a[iParent].truthProb;
116409	pWC->a[iParent].nChild++;
116410	}
116411
116412	/*
116413	** Return the N-th AND-connected subterm of pTerm. Or if pTerm is not
116414	** a conjunction, then return just pTerm when N==0. If N is exceeds
116415	** the number of available subterms, return NULL.
116416	*/
116417	static WhereTerm whereNthSubterm(WhereTerm pTerm, int N){
116418	if( pTerm->eOperator!=WO_AND ){
116419	return N==0 ? pTerm : 0;
116420	}
116421	if( N<pTerm->u.pAndInfo->wc.nTerm ){
116422	return &pTerm->u.pAndInfo->wc.a[N];
116423	}
116424	return 0;
116425	}
116426
116427	/*
116428	** Subterms pOne and pTwo are contained within WHERE clause pWC. The
116429	** two subterms are in disjunction - they are OR-ed together.
116430	**
116431	** If these two terms are both of the form: "A op B" with the same
116432	** A and B values but different operators and if the operators are
116433	** compatible (if one is = and the other is <, for example) then
116434	** add a new virtual AND term to pWC that is the combination of the
116435	** two.
116436	**
116437	** Some examples:
116438	**
116439	** x<y OR x=y --> x<=y
116440	** x=y OR x=y --> x=y
116441	** x<=y OR x<y --> x<=y
116442	**
116443	** The following is NOT generated:
116444	**
116445	** x<y OR x>y --> x!=y
116446	*/
116447	static void whereCombineDisjuncts(
116448	SrcList pSrc, / the FROM clause */
116449	WhereClause pWC, / The complete WHERE clause */
116450	WhereTerm pOne, / First disjunct */
116451	WhereTerm pTwo / Second disjunct */
116452	){
116453	u16 eOp = pOne->eOperator \| pTwo->eOperator;
116454	sqlite3 db; / Database connection (for malloc) */
116455	Expr pNew; / New virtual expression */
116456	int op; /* Operator for the combined expression */
116457	int idxNew; /* Index in pWC of the next virtual term */
116458
116459	if( (pOne->eOperator & (WO_EQ\|WO_LT\|WO_LE\|WO_GT\|WO_GE))==0 ) return;
116460	if( (pTwo->eOperator & (WO_EQ\|WO_LT\|WO_LE\|WO_GT\|WO_GE))==0 ) return;
116461	if( (eOp & (WO_EQ\|WO_LT\|WO_LE))!=eOp
116462	&& (eOp & (WO_EQ\|WO_GT\|WO_GE))!=eOp ) return;
116463	assert( pOne->pExpr->pLeft!=0 && pOne->pExpr->pRight!=0 );
116464	assert( pTwo->pExpr->pLeft!=0 && pTwo->pExpr->pRight!=0 );
116465	if( sqlite3ExprCompare(pOne->pExpr->pLeft, pTwo->pExpr->pLeft, -1) ) return;
116466	if( sqlite3ExprCompare(pOne->pExpr->pRight, pTwo->pExpr->pRight, -1) )return;
116467	/* If we reach this point, it means the two subterms can be combined */
116468	if( (eOp & (eOp-1))!=0 ){
116469	if( eOp & (WO_LT\|WO_LE) ){
116470	eOp = WO_LE;
116471	}else{
116472	assert( eOp & (WO_GT\|WO_GE) );
116473	eOp = WO_GE;
116474	}
116475	}
116476	db = pWC->pWInfo->pParse->db;
116477	pNew = sqlite3ExprDup(db, pOne->pExpr, 0);
116478	if( pNew==0 ) return;
116479	for(op=TK_EQ; eOp!=(WO_EQ<<(op-TK_EQ)); op++){ assert( op<TK_GE ); }
116480	pNew->op = op;
116481	idxNew = whereClauseInsert(pWC, pNew, TERM_VIRTUAL\|TERM_DYNAMIC);
116482	exprAnalyze(pSrc, pWC, idxNew);
116483	}
116484
116485	#if !defined(SQLITE_OMIT_OR_OPTIMIZATION) && !defined(SQLITE_OMIT_SUBQUERY)
116486	/*
116487	** Analyze a term that consists of two or more OR-connected
116488	** subterms. So in:
	@@ -115956,10 +116504,11 @@
116504	** (A) t1.x=t2.y OR t1.x=t2.z OR t1.y=15 OR t1.z=t3.a+5
116505	** (B) x=expr1 OR expr2=x OR x=expr3
116506	** (C) t1.x=t2.y OR (t1.x=t2.z AND t1.y=15)
116507	** (D) x=expr1 OR (y>11 AND y<22 AND z LIKE 'hello')
116508	** (E) (p.a=1 AND q.b=2 AND r.c=3) OR (p.x=4 AND q.y=5 AND r.z=6)
116509	** (F) x>A OR (x=A AND y>=B)
116510	**
116511	** CASE 1:
116512	**
116513	** If all subterms are of the form T.C=expr for some single column of C and
116514	** a single table T (as shown in example B above) then create a new virtual
	@@ -115971,10 +116520,20 @@
116520	** then create a new virtual term like this:
116521	**
116522	** x IN (expr1,expr2,expr3)
116523	**
116524	** CASE 2:
116525	**
116526	** If there are exactly two disjuncts one side has x>A and the other side
116527	** has x=A (for the same x and A) then add a new virtual conjunct term to the
116528	** WHERE clause of the form "x>=A". Example:
116529	**
116530	** x>A OR (x=A AND y>B) adds: x>=A
116531	**
116532	** The added conjunct can sometimes be helpful in query planning.
116533	**
116534	** CASE 3:
116535	**
116536	** If all subterms are indexable by a single table T, then set
116537	**
116538	** WhereTerm.eOperator = WO_OR
116539	** WhereTerm.u.pOrInfo->indexable \|= the cursor number for table T
	@@ -116098,15 +116657,29 @@
116657	}
116658	}
116659	}
116660
116661	/*
116662	** Record the set of tables that satisfy case 3. The set might be
116663	** empty.
116664	*/
116665	pOrInfo->indexable = indexable;
116666	pTerm->eOperator = indexable==0 ? 0 : WO_OR;
116667
116668	/* For a two-way OR, attempt to implementation case 2.
116669	*/
116670	if( indexable && pOrWc->nTerm==2 ){
116671	int iOne = 0;
116672	WhereTerm *pOne;
116673	while( (pOne = whereNthSubterm(&pOrWc->a[0],iOne++))!=0 ){
116674	int iTwo = 0;
116675	WhereTerm *pTwo;
116676	while( (pTwo = whereNthSubterm(&pOrWc->a[1],iTwo++))!=0 ){
116677	whereCombineDisjuncts(pSrc, pWC, pOne, pTwo);
116678	}
116679	}
116680	}
116681
116682	/*
116683	** chngToIN holds a set of tables that might satisfy case 1. But
116684	** we have to do some additional checking to see if case 1 really
116685	** is satisfied.
	@@ -116233,11 +116806,11 @@
116806	pTerm = &pWC->a[idxTerm];
116807	markTermAsChild(pWC, idxNew, idxTerm);
116808	}else{
116809	sqlite3ExprListDelete(db, pList);
116810	}
116811	pTerm->eOperator = WO_NOOP; /* case 1 trumps case 3 */
116812	}
116813	}
116814	}
116815	#endif /* !SQLITE_OMIT_OR_OPTIMIZATION && !SQLITE_OMIT_SUBQUERY */
116816
	@@ -116271,11 +116844,11 @@
116844	Bitmask prereqLeft; /* Prerequesites of the pExpr->pLeft */
116845	Bitmask prereqAll; /* Prerequesites of pExpr */
116846	Bitmask extraRight = 0; /* Extra dependencies on LEFT JOIN */
116847	Expr pStr1 = 0; / RHS of LIKE/GLOB operator */
116848	int isComplete = 0; /* RHS of LIKE/GLOB ends with wildcard */
116849	int noCase = 0; /* uppercase equivalent to lowercase */
116850	int op; /* Top-level operator. pExpr->op */
116851	Parse pParse = pWInfo->pParse; / Parsing context */
116852	sqlite3 db = pParse->db; / Database connection */
116853
116854	if( db->mallocFailed ){
	@@ -116409,16 +116982,19 @@
116982
116983	#ifndef SQLITE_OMIT_LIKE_OPTIMIZATION
116984	/* Add constraints to reduce the search space on a LIKE or GLOB
116985	** operator.
116986	**
116987	** A like pattern of the form "x LIKE 'aBc%'" is changed into constraints
116988	**
116989	** x>='ABC' AND x<'abd' AND x LIKE 'aBc%'
116990	**
116991	** The last character of the prefix "abc" is incremented to form the
116992	** termination condition "abd". If case is not significant (the default
116993	** for LIKE) then the lower-bound is made all uppercase and the upper-
116994	** bound is made all lowercase so that the bounds also work when comparing
116995	** BLOBs.
116996	*/
116997	if( pWC->op==TK_AND
116998	&& isLikeOrGlob(pParse, pExpr, &pStr1, &isComplete, &noCase)
116999	){
117000	Expr pLeft; / LHS of LIKE/GLOB operator */
	@@ -116425,14 +117001,30 @@
117001	Expr pStr2; / Copy of pStr1 - RHS of LIKE/GLOB operator */
117002	Expr *pNewExpr1;
117003	Expr *pNewExpr2;
117004	int idxNew1;
117005	int idxNew2;
117006	const char zCollSeqName; / Name of collating sequence */
117007	const u16 wtFlags = TERM_LIKEOPT \| TERM_VIRTUAL \| TERM_DYNAMIC;
117008
117009	pLeft = pExpr->x.pList->a[1].pExpr;
117010	pStr2 = sqlite3ExprDup(db, pStr1, 0);
117011
117012	/* Convert the lower bound to upper-case and the upper bound to
117013	** lower-case (upper-case is less than lower-case in ASCII) so that
117014	** the range constraints also work for BLOBs
117015	*/
117016	if( noCase && !pParse->db->mallocFailed ){
117017	int i;
117018	char c;
117019	pTerm->wtFlags \|= TERM_LIKE;
117020	for(i=0; (c = pStr1->u.zToken[i])!=0; i++){
117021	pStr1->u.zToken[i] = sqlite3Toupper(c);
117022	pStr2->u.zToken[i] = sqlite3Tolower(c);
117023	}
117024	}
117025
117026	if( !db->mallocFailed ){
117027	u8 c, pC; / Last character before the first wildcard */
117028	pC = (u8*)&pStr2->u.zToken[sqlite3Strlen30(pStr2->u.zToken)-1];
117029	c = *pC;
117030	if( noCase ){
	@@ -116445,26 +117037,25 @@
117037	if( c=='A'-1 ) isComplete = 0;
117038	c = sqlite3UpperToLower[c];
117039	}
117040	*pC = c + 1;
117041	}
117042	zCollSeqName = noCase ? "NOCASE" : "BINARY";

117043	pNewExpr1 = sqlite3ExprDup(db, pLeft, 0);
117044	pNewExpr1 = sqlite3PExpr(pParse, TK_GE,
117045	sqlite3ExprAddCollateString(pParse,pNewExpr1,zCollSeqName),
117046	pStr1, 0);
117047	transferJoinMarkings(pNewExpr1, pExpr);
117048	idxNew1 = whereClauseInsert(pWC, pNewExpr1, wtFlags);
117049	testcase( idxNew1==0 );
117050	exprAnalyze(pSrc, pWC, idxNew1);
117051	pNewExpr2 = sqlite3ExprDup(db, pLeft, 0);
117052	pNewExpr2 = sqlite3PExpr(pParse, TK_LT,
117053	sqlite3ExprAddCollateString(pParse,pNewExpr2,zCollSeqName),
117054	pStr2, 0);
117055	transferJoinMarkings(pNewExpr2, pExpr);
117056	idxNew2 = whereClauseInsert(pWC, pNewExpr2, wtFlags);
117057	testcase( idxNew2==0 );
117058	exprAnalyze(pSrc, pWC, idxNew2);
117059	pTerm = &pWC->a[idxTerm];
117060	if( isComplete ){
117061	markTermAsChild(pWC, idxNew1, idxTerm);
	@@ -117074,15 +117665,18 @@
117665	#ifdef SQLITE_ENABLE_STAT3_OR_STAT4
117666	/*
117667	** Estimate the location of a particular key among all keys in an
117668	** index. Store the results in aStat as follows:
117669	**
117670	** aStat[0] Est. number of rows less than pRec
117671	** aStat[1] Est. number of rows equal to pRec
117672	**
117673	** Return the index of the sample that is the smallest sample that
117674	** is greater than or equal to pRec. Note that this index is not an index
117675	** into the aSample[] array - it is an index into a virtual set of samples
117676	** based on the contents of aSample[] and the number of fields in record
117677	** pRec.
117678	*/
117679	static int whereKeyStats(
117680	Parse pParse, / Database connection */
117681	Index pIdx, / Index to consider domain of */
117682	UnpackedRecord pRec, / Vector of values to consider */
	@@ -117089,71 +117683,162 @@
117683	int roundUp, /* Round up if true. Round down if false */
117684	tRowcnt aStat / OUT: stats written here */
117685	){
117686	IndexSample *aSample = pIdx->aSample;
117687	int iCol; /* Index of required stats in anEq[] etc. */
117688	int i; /* Index of first sample >= pRec */
117689	int iSample; /* Smallest sample larger than or equal to pRec */
117690	int iMin = 0; /* Smallest sample not yet tested */

117691	int iTest; /* Next sample to test */
117692	int res; /* Result of comparison operation */
117693	int nField; /* Number of fields in pRec */
117694	tRowcnt iLower = 0; /* anLt[] + anEq[] of largest sample pRec is > */
117695
117696	#ifndef SQLITE_DEBUG
117697	UNUSED_PARAMETER( pParse );
117698	#endif
117699	assert( pRec!=0 );

117700	assert( pIdx->nSample>0 );
117701	assert( pRec->nField>0 && pRec->nField<=pIdx->nSampleCol );
117702
117703	/* Do a binary search to find the first sample greater than or equal
117704	** to pRec. If pRec contains a single field, the set of samples to search
117705	** is simply the aSample[] array. If the samples in aSample[] contain more
117706	** than one fields, all fields following the first are ignored.
117707	**
117708	** If pRec contains N fields, where N is more than one, then as well as the
117709	** samples in aSample[] (truncated to N fields), the search also has to
117710	** consider prefixes of those samples. For example, if the set of samples
117711	** in aSample is:
117712	**
117713	** aSample[0] = (a, 5)
117714	** aSample[1] = (a, 10)
117715	** aSample[2] = (b, 5)
117716	** aSample[3] = (c, 100)
117717	** aSample[4] = (c, 105)
117718	**
117719	** Then the search space should ideally be the samples above and the
117720	** unique prefixes [a], [b] and [c]. But since that is hard to organize,
117721	** the code actually searches this set:
117722	**
117723	** 0: (a)
117724	** 1: (a, 5)
117725	** 2: (a, 10)
117726	** 3: (a, 10)
117727	** 4: (b)
117728	** 5: (b, 5)
117729	** 6: (c)
117730	** 7: (c, 100)
117731	** 8: (c, 105)
117732	** 9: (c, 105)
117733	**
117734	** For each sample in the aSample[] array, N samples are present in the
117735	** effective sample array. In the above, samples 0 and 1 are based on
117736	** sample aSample[0]. Samples 2 and 3 on aSample[1] etc.
117737	**
117738	** Often, sample i of each block of N effective samples has (i+1) fields.
117739	** Except, each sample may be extended to ensure that it is greater than or
117740	** equal to the previous sample in the array. For example, in the above,
117741	** sample 2 is the first sample of a block of N samples, so at first it
117742	** appears that it should be 1 field in size. However, that would make it
117743	** smaller than sample 1, so the binary search would not work. As a result,
117744	** it is extended to two fields. The duplicates that this creates do not
117745	** cause any problems.
117746	*/
117747	nField = pRec->nField;
117748	iCol = 0;
117749	iSample = pIdx->nSample * nField;
117750	do{
117751	int iSamp; /* Index in aSample[] of test sample */
117752	int n; /* Number of fields in test sample */
117753
117754	iTest = (iMin+iSample)/2;
117755	iSamp = iTest / nField;
117756	if( iSamp>0 ){
117757	/* The proposed effective sample is a prefix of sample aSample[iSamp].
117758	** Specifically, the shortest prefix of at least (1 + iTest%nField)
117759	** fields that is greater than the previous effective sample. */
117760	for(n=(iTest % nField) + 1; n<nField; n++){
117761	if( aSample[iSamp-1].anLt[n-1]!=aSample[iSamp].anLt[n-1] ) break;
117762	}
117763	}else{
117764	n = iTest + 1;
117765	}
117766
117767	pRec->nField = n;
117768	res = sqlite3VdbeRecordCompare(aSample[iSamp].n, aSample[iSamp].p, pRec);
117769	if( res<0 ){
117770	iLower = aSample[iSamp].anLt[n-1] + aSample[iSamp].anEq[n-1];
117771	iMin = iTest+1;
117772	}else if( res==0 && n<nField ){
117773	iLower = aSample[iSamp].anLt[n-1];
117774	iMin = iTest+1;
117775	res = -1;
117776	}else{
117777	iSample = iTest;
117778	iCol = n-1;
117779	}
117780	}while( res && iMin<iSample );
117781	i = iSample / nField;
117782
117783	#ifdef SQLITE_DEBUG
117784	/* The following assert statements check that the binary search code
117785	** above found the right answer. This block serves no purpose other
117786	** than to invoke the asserts. */
117787	if( pParse->db->mallocFailed==0 ){
117788	if( res==0 ){
117789	/* If (res==0) is true, then pRec must be equal to sample i. */
117790	assert( i<pIdx->nSample );
117791	assert( iCol==nField-1 );
117792	pRec->nField = nField;
117793	assert( 0==sqlite3VdbeRecordCompare(aSample[i].n, aSample[i].p, pRec)
117794	\|\| pParse->db->mallocFailed
117795	);
117796	}else{
117797	/* Unless i==pIdx->nSample, indicating that pRec is larger than
117798	** all samples in the aSample[] array, pRec must be smaller than the
117799	** (iCol+1) field prefix of sample i. */
117800	assert( i<=pIdx->nSample && i>=0 );
117801	pRec->nField = iCol+1;
117802	assert( i==pIdx->nSample
117803	\|\| sqlite3VdbeRecordCompare(aSample[i].n, aSample[i].p, pRec)>0
117804	\|\| pParse->db->mallocFailed );
117805
117806	/* if i==0 and iCol==0, then record pRec is smaller than all samples
117807	** in the aSample[] array. Otherwise, if (iCol>0) then pRec must
117808	** be greater than or equal to the (iCol) field prefix of sample i.
117809	** If (i>0), then pRec must also be greater than sample (i-1). */
117810	if( iCol>0 ){
117811	pRec->nField = iCol;
117812	assert( sqlite3VdbeRecordCompare(aSample[i].n, aSample[i].p, pRec)<=0
117813	\|\| pParse->db->mallocFailed );
117814	}
117815	if( i>0 ){
117816	pRec->nField = nField;
117817	assert( sqlite3VdbeRecordCompare(aSample[i-1].n, aSample[i-1].p, pRec)<0
117818	\|\| pParse->db->mallocFailed );
117819	}
117820	}
117821	}
117822	#endif /* ifdef SQLITE_DEBUG */
117823




117824	if( res==0 ){
117825	/* Record pRec is equal to sample i */
117826	assert( iCol==nField-1 );
117827	aStat[0] = aSample[i].anLt[iCol];
117828	aStat[1] = aSample[i].anEq[iCol];
117829	}else{
117830	/* At this point, the (iCol+1) field prefix of aSample[i] is the first
117831	** sample that is greater than pRec. Or, if i==pIdx->nSample then pRec
117832	** is larger than all samples in the array. */
117833	tRowcnt iUpper, iGap;
117834	if( i>=pIdx->nSample ){
117835	iUpper = sqlite3LogEstToInt(pIdx->aiRowLogEst[0]);
117836	}else{
117837	iUpper = aSample[i].anLt[iCol];


117838	}
117839
117840	if( iLower>=iUpper ){
117841	iGap = 0;
117842	}else{
117843	iGap = iUpper - iLower;
117844	}
	@@ -117161,11 +117846,15 @@
117846	iGap = (iGap*2)/3;
117847	}else{
117848	iGap = iGap/3;
117849	}
117850	aStat[0] = iLower + iGap;
117851	aStat[1] = pIdx->aAvgEq[iCol];
117852	}
117853
117854	/* Restore the pRec->nField value before returning. */
117855	pRec->nField = nField;
117856	return i;
117857	}
117858	#endif /* SQLITE_ENABLE_STAT3_OR_STAT4 */
117859
117860	/*
	@@ -117635,24 +118324,47 @@
118324	** by indices, we disable them to prevent redundant tests in the inner
118325	** loop. We would get the correct results if nothing were ever disabled,
118326	** but joins might run a little slower. The trick is to disable as much
118327	** as we can without disabling too much. If we disabled in (1), we'd get
118328	** the wrong answer. See ticket #813.
118329	**
118330	** If all the children of a term are disabled, then that term is also
118331	** automatically disabled. In this way, terms get disabled if derived
118332	** virtual terms are tested first. For example:
118333	**
118334	** x GLOB 'abc*' AND x>='abc' AND x<'acd'
118335	** \___________/ \______/ \_____/
118336	** parent child1 child2
118337	**
118338	** Only the parent term was in the original WHERE clause. The child1
118339	** and child2 terms were added by the LIKE optimization. If both of
118340	** the virtual child terms are valid, then testing of the parent can be
118341	** skipped.
118342	**
118343	** Usually the parent term is marked as TERM_CODED. But if the parent
118344	** term was originally TERM_LIKE, then the parent gets TERM_LIKECOND instead.
118345	** The TERM_LIKECOND marking indicates that the term should be coded inside
118346	** a conditional such that is only evaluated on the second pass of a
118347	** LIKE-optimization loop, when scanning BLOBs instead of strings.
118348	*/
118349	static void disableTerm(WhereLevel pLevel, WhereTerm pTerm){
118350	int nLoop = 0;
118351	while( pTerm
118352	&& (pTerm->wtFlags & TERM_CODED)==0
118353	&& (pLevel->iLeftJoin==0 \|\| ExprHasProperty(pTerm->pExpr, EP_FromJoin))
118354	&& (pLevel->notReady & pTerm->prereqAll)==0
118355	){
118356	if( nLoop && (pTerm->wtFlags & TERM_LIKE)!=0 ){
118357	pTerm->wtFlags \|= TERM_LIKECOND;
118358	}else{
118359	pTerm->wtFlags \|= TERM_CODED;


118360	}
118361	if( pTerm->iParent<0 ) break;
118362	pTerm = &pTerm->pWC->a[pTerm->iParent];
118363	pTerm->nChild--;
118364	if( pTerm->nChild!=0 ) break;
118365	nLoop++;
118366	}
118367	}
118368
118369	/*
118370	** Code an OP_Affinity opcode to apply the column affinity string zAff
	@@ -118132,11 +118844,38 @@
118844	}
118845	#else
118846	# define addScanStatus(a, b, c, d) ((void)d)
118847	#endif
118848
118849	/*
118850	** If the most recently coded instruction is a constant range contraint
118851	** that originated from the LIKE optimization, then change the P3 to be
118852	** pLoop->iLikeRepCntr and set P5.
118853	**
118854	** The LIKE optimization trys to evaluate "x LIKE 'abc%'" as a range
118855	** expression: "x>='ABC' AND x<'abd'". But this requires that the range
118856	** scan loop run twice, once for strings and a second time for BLOBs.
118857	** The OP_String opcodes on the second pass convert the upper and lower
118858	** bound string contants to blobs. This routine makes the necessary changes
118859	** to the OP_String opcodes for that to happen.
118860	*/
118861	static void whereLikeOptimizationStringFixup(
118862	Vdbe v, / prepared statement under construction */
118863	WhereLevel pLevel, / The loop that contains the LIKE operator */
118864	WhereTerm pTerm / The upper or lower bound just coded */
118865	){
118866	if( pTerm->wtFlags & TERM_LIKEOPT ){
118867	VdbeOp *pOp;
118868	assert( pLevel->iLikeRepCntr>0 );
118869	pOp = sqlite3VdbeGetOp(v, -1);
118870	assert( pOp!=0 );
118871	assert( pOp->opcode==OP_String8
118872	\|\| pTerm->pWC->pWInfo->pParse->db->mallocFailed );
118873	pOp->p3 = pLevel->iLikeRepCntr;
118874	pOp->p5 = 1;
118875	}
118876	}
118877
118878	/*
118879	** Generate code for the start of the iLevel-th loop in the WHERE clause
118880	** implementation described by pWInfo.
118881	*/
	@@ -118462,14 +119201,29 @@
119201	*/
119202	j = nEq;
119203	if( pLoop->wsFlags & WHERE_BTM_LIMIT ){
119204	pRangeStart = pLoop->aLTerm[j++];
119205	nExtraReg = 1;
119206	/* Like optimization range constraints always occur in pairs */
119207	assert( (pRangeStart->wtFlags & TERM_LIKEOPT)==0 \|\|
119208	(pLoop->wsFlags & WHERE_TOP_LIMIT)!=0 );
119209	}
119210	if( pLoop->wsFlags & WHERE_TOP_LIMIT ){
119211	pRangeEnd = pLoop->aLTerm[j++];
119212	nExtraReg = 1;
119213	if( (pRangeEnd->wtFlags & TERM_LIKEOPT)!=0 ){
119214	assert( pRangeStart!=0 ); /* LIKE opt constraints */
119215	assert( pRangeStart->wtFlags & TERM_LIKEOPT ); /* occur in pairs */
119216	pLevel->iLikeRepCntr = ++pParse->nMem;
119217	testcase( bRev );
119218	testcase( pIdx->aSortOrder[nEq]==SQLITE_SO_DESC );
119219	sqlite3VdbeAddOp2(v, OP_Integer,
119220	bRev ^ (pIdx->aSortOrder[nEq]==SQLITE_SO_DESC),
119221	pLevel->iLikeRepCntr);
119222	VdbeComment((v, "LIKE loop counter"));
119223	pLevel->addrLikeRep = sqlite3VdbeCurrentAddr(v);
119224	}
119225	if( pRangeStart==0
119226	&& (j = pIdx->aiColumn[nEq])>=0
119227	&& pIdx->pTable->aCol[j].notNull==0
119228	){
119229	bSeekPastNull = 1;
	@@ -118508,10 +119262,11 @@
119262	/* Seek the index cursor to the start of the range. */
119263	nConstraint = nEq;
119264	if( pRangeStart ){
119265	Expr *pRight = pRangeStart->pExpr->pRight;
119266	sqlite3ExprCode(pParse, pRight, regBase+nEq);
119267	whereLikeOptimizationStringFixup(v, pLevel, pRangeStart);
119268	if( (pRangeStart->wtFlags & TERM_VNULL)==0
119269	&& sqlite3ExprCanBeNull(pRight)
119270	){
119271	sqlite3VdbeAddOp2(v, OP_IsNull, regBase+nEq, addrNxt);
119272	VdbeCoverage(v);
	@@ -118553,10 +119308,11 @@
119308	nConstraint = nEq;
119309	if( pRangeEnd ){
119310	Expr *pRight = pRangeEnd->pExpr->pRight;
119311	sqlite3ExprCacheRemove(pParse, regBase+nEq, 1);
119312	sqlite3ExprCode(pParse, pRight, regBase+nEq);
119313	whereLikeOptimizationStringFixup(v, pLevel, pRangeEnd);
119314	if( (pRangeEnd->wtFlags & TERM_VNULL)==0
119315	&& sqlite3ExprCanBeNull(pRight)
119316	){
119317	sqlite3VdbeAddOp2(v, OP_IsNull, regBase+nEq, addrNxt);
119318	VdbeCoverage(v);
	@@ -118780,11 +119536,12 @@
119536	** eliminating duplicates from other WHERE clauses, the action for each
119537	** sub-WHERE clause is to to invoke the main loop body as a subroutine.
119538	*/
119539	wctrlFlags = WHERE_OMIT_OPEN_CLOSE
119540	\| WHERE_FORCE_TABLE
119541	\| WHERE_ONETABLE_ONLY
119542	\| WHERE_NO_AUTOINDEX;
119543	for(ii=0; ii<pOrWc->nTerm; ii++){
119544	WhereTerm *pOrTerm = &pOrWc->a[ii];
119545	if( pOrTerm->leftCursor==iCur \|\| (pOrTerm->eOperator & WO_AND)!=0 ){
119546	WhereInfo pSubWInfo; / Info for single OR-term scan */
119547	Expr pOrExpr = pOrTerm->pExpr; / Current OR clause term */
	@@ -118942,10 +119699,11 @@
119699	/* Insert code to test every subexpression that can be completely
119700	** computed using the current set of tables.
119701	*/
119702	for(pTerm=pWC->a, j=pWC->nTerm; j>0; j--, pTerm++){
119703	Expr *pE;
119704	int skipLikeAddr = 0;
119705	testcase( pTerm->wtFlags & TERM_VIRTUAL );
119706	testcase( pTerm->wtFlags & TERM_CODED );
119707	if( pTerm->wtFlags & (TERM_VIRTUAL\|TERM_CODED) ) continue;
119708	if( (pTerm->prereqAll & pLevel->notReady)!=0 ){
119709	testcase( pWInfo->untestedTerms==0
	@@ -118955,12 +119713,18 @@
119713	}
119714	pE = pTerm->pExpr;
119715	assert( pE!=0 );
119716	if( pLevel->iLeftJoin && !ExprHasProperty(pE, EP_FromJoin) ){
119717	continue;
119718	}
119719	if( pTerm->wtFlags & TERM_LIKECOND ){
119720	assert( pLevel->iLikeRepCntr>0 );
119721	skipLikeAddr = sqlite3VdbeAddOp1(v, OP_IfNot, pLevel->iLikeRepCntr);
119722	VdbeCoverage(v);
119723	}
119724	sqlite3ExprIfFalse(pParse, pE, addrCont, SQLITE_JUMPIFNULL);
119725	if( skipLikeAddr ) sqlite3VdbeJumpHere(v, skipLikeAddr);
119726	pTerm->wtFlags \|= TERM_CODED;
119727	}
119728
119729	/* Insert code to test for implied constraints based on transitivity
119730	** of the "==" operator.
	@@ -119621,10 +120385,14 @@
120385	){
120386	continue; /* ignore IS [NOT] NULL constraints on NOT NULL columns */
120387	}
120388	if( pTerm->prereqRight & pNew->maskSelf ) continue;
120389
120390	/* Do not allow the upper bound of a LIKE optimization range constraint
120391	** to mix with a lower range bound from some other source */
120392	if( pTerm->wtFlags & TERM_LIKEOPT && pTerm->eOperator==WO_LT ) continue;
120393
120394	pNew->wsFlags = saved_wsFlags;
120395	pNew->u.btree.nEq = saved_nEq;
120396	pNew->nLTerm = saved_nLTerm;
120397	if( whereLoopResize(db, pNew, pNew->nLTerm+1) ) break; /* OOM */
120398	pNew->aLTerm[pNew->nLTerm++] = pTerm;
	@@ -119664,10 +120432,21 @@
120432	testcase( eOp & WO_GT );
120433	testcase( eOp & WO_GE );
120434	pNew->wsFlags \|= WHERE_COLUMN_RANGE\|WHERE_BTM_LIMIT;
120435	pBtm = pTerm;
120436	pTop = 0;
120437	if( pTerm->wtFlags & TERM_LIKEOPT ){
120438	/* Range contraints that come from the LIKE optimization are
120439	** always used in pairs. */
120440	pTop = &pTerm[1];
120441	assert( (pTop-(pTerm->pWC->a))<pTerm->pWC->nTerm );
120442	assert( pTop->wtFlags & TERM_LIKEOPT );
120443	assert( pTop->eOperator==WO_LT );
120444	if( whereLoopResize(db, pNew, pNew->nLTerm+1) ) break; /* OOM */
120445	pNew->aLTerm[pNew->nLTerm++] = pTop;
120446	pNew->wsFlags \|= WHERE_TOP_LIMIT;
120447	}
120448	}else{
120449	assert( eOp & (WO_LT\|WO_LE) );
120450	testcase( eOp & WO_LT );
120451	testcase( eOp & WO_LE );
120452	pNew->wsFlags \|= WHERE_COLUMN_RANGE\|WHERE_TOP_LIMIT;
	@@ -119974,10 +120753,11 @@
120753	rLogSize = estLog(rSize);
120754
120755	#ifndef SQLITE_OMIT_AUTOMATIC_INDEX
120756	/* Automatic indexes */
120757	if( !pBuilder->pOrSet
120758	&& (pWInfo->wctrlFlags & WHERE_NO_AUTOINDEX)==0
120759	&& (pWInfo->pParse->db->flags & SQLITE_AutoIndex)!=0
120760	&& pSrc->pIndex==0
120761	&& !pSrc->viaCoroutine
120762	&& !pSrc->notIndexed
120763	&& HasRowid(pTab)
	@@ -120857,14 +121637,14 @@
121637	assert( aSortCost==0 \|\| &pSpace[nSpace]==(char*)&aSortCost[nOrderBy] );
121638	assert( aSortCost!=0 \|\| &pSpace[nSpace]==(char*)pX );
121639
121640	/* Seed the search with a single WherePath containing zero WhereLoops.
121641	**
121642	** TUNING: Do not let the number of iterations go above 28. If the cost
121643	** of computing an automatic index is not paid back within the first 28
121644	** rows, then do not use the automatic index. */
121645	aFrom[0].nRow = MIN(pParse->nQueryLoop, 48); assert( 48==sqlite3LogEst(28) );
121646	nFrom = 1;
121647	assert( aFrom[0].isOrdered==0 );
121648	if( nOrderBy ){
121649	/* If nLoop is zero, then there are no FROM terms in the query. Since
121650	** in this case the query may return a maximum of one row, the results
	@@ -121658,10 +122438,16 @@
122438	assert( pIx->pSchema==pTab->pSchema );
122439	assert( iIndexCur>=0 );
122440	if( op ){
122441	sqlite3VdbeAddOp3(v, op, iIndexCur, pIx->tnum, iDb);
122442	sqlite3VdbeSetP4KeyInfo(pParse, pIx);
122443	if( (pLoop->wsFlags & WHERE_CONSTRAINT)!=0
122444	&& (pLoop->wsFlags & (WHERE_COLUMN_RANGE\|WHERE_SKIPSCAN))==0
122445	&& (pWInfo->wctrlFlags&WHERE_ORDERBY_MIN)==0
122446	){
122447	sqlite3VdbeChangeP5(v, OPFLAG_SEEKEQ); /* Hint to COMDB2 */
122448	}
122449	VdbeComment((v, "%s", pIx->zName));
122450	}
122451	}
122452	if( iDb>=0 ) sqlite3CodeVerifySchema(pParse, iDb);
122453	notReady &= ~getMask(&pWInfo->sMaskSet, pTabItem->iCursor);
	@@ -121758,10 +122544,20 @@
122544	if( pLevel->addrSkip ){
122545	sqlite3VdbeAddOp2(v, OP_Goto, 0, pLevel->addrSkip);
122546	VdbeComment((v, "next skip-scan on %s", pLoop->u.btree.pIndex->zName));
122547	sqlite3VdbeJumpHere(v, pLevel->addrSkip);
122548	sqlite3VdbeJumpHere(v, pLevel->addrSkip-2);
122549	}
122550	if( pLevel->addrLikeRep ){
122551	int op;
122552	if( sqlite3VdbeGetOp(v, pLevel->addrLikeRep-1)->p1 ){
122553	op = OP_DecrJumpZero;
122554	}else{
122555	op = OP_JumpZeroIncr;
122556	}
122557	sqlite3VdbeAddOp2(v, op, pLevel->iLikeRepCntr, pLevel->addrLikeRep);
122558	VdbeCoverage(v);
122559	}
122560	if( pLevel->iLeftJoin ){
122561	addr = sqlite3VdbeAddOp1(v, OP_IfPos, pLevel->iLeftJoin); VdbeCoverage(v);
122562	assert( (pLoop->wsFlags & WHERE_IDX_ONLY)==0
122563	\|\| (pLoop->wsFlags & WHERE_INDEXED)!=0 );
	@@ -124649,11 +125445,11 @@
125445	spanSet(&yygotominor.yy346, &yymsp[0].minor.yy0, &yymsp[0].minor.yy0);
125446	}
125447	break;
125448	case 193: /* expr ::= expr COLLATE ID\|STRING */
125449	{
125450	yygotominor.yy346.pExpr = sqlite3ExprAddCollateToken(pParse, yymsp[-2].minor.yy346.pExpr, &yymsp[0].minor.yy0, 1);
125451	yygotominor.yy346.zStart = yymsp[-2].minor.yy346.zStart;
125452	yygotominor.yy346.zEnd = &yymsp[0].minor.yy0.z[yymsp[0].minor.yy0.n];
125453	}
125454	break;
125455	case 194: /* expr ::= CAST LP expr AS typetoken RP */
	@@ -124929,20 +125725,20 @@
125725	case 241: /* uniqueflag ::= */
125726	{yygotominor.yy328 = OE_None;}
125727	break;
125728	case 244: /* idxlist ::= idxlist COMMA nm collate sortorder */
125729	{
125730	Expr *p = sqlite3ExprAddCollateToken(pParse, 0, &yymsp[-1].minor.yy0, 1);
125731	yygotominor.yy14 = sqlite3ExprListAppend(pParse,yymsp[-4].minor.yy14, p);
125732	sqlite3ExprListSetName(pParse,yygotominor.yy14,&yymsp[-2].minor.yy0,1);
125733	sqlite3ExprListCheckLength(pParse, yygotominor.yy14, "index");
125734	if( yygotominor.yy14 ) yygotominor.yy14->a[yygotominor.yy14->nExpr-1].sortOrder = (u8)yymsp[0].minor.yy328;
125735	}
125736	break;
125737	case 245: /* idxlist ::= nm collate sortorder */
125738	{
125739	Expr *p = sqlite3ExprAddCollateToken(pParse, 0, &yymsp[-1].minor.yy0, 1);
125740	yygotominor.yy14 = sqlite3ExprListAppend(pParse,0, p);
125741	sqlite3ExprListSetName(pParse, yygotominor.yy14, &yymsp[-2].minor.yy0, 1);
125742	sqlite3ExprListCheckLength(pParse, yygotominor.yy14, "index");
125743	if( yygotominor.yy14 ) yygotominor.yy14->a[yygotominor.yy14->nExpr-1].sortOrder = (u8)yymsp[0].minor.yy328;
125744	}
	@@ -126197,13 +126993,15 @@
126993	pParse->zTail = &zSql[i];
126994	}
126995	sqlite3Parser(pEngine, 0, pParse->sLastToken, pParse);
126996	}
126997	#ifdef YYTRACKMAXSTACKDEPTH
126998	sqlite3_mutex_enter(sqlite3MallocMutex());
126999	sqlite3StatusSet(SQLITE_STATUS_PARSER_STACK,
127000	sqlite3ParserStackPeak(pEngine)
127001	);
127002	sqlite3_mutex_leave(sqlite3MallocMutex());
127003	#endif /* YYDEBUG */
127004	sqlite3ParserFree(pEngine, sqlite3_free);
127005	db->lookaside.bEnabled = enableLookaside;
127006	if( db->mallocFailed ){
127007	pParse->rc = SQLITE_NOMEM;
	@@ -126769,10 +127567,15 @@
127567	rc = sqlite3_wsd_init(4096, 24);
127568	if( rc!=SQLITE_OK ){
127569	return rc;
127570	}
127571	#endif
127572
127573	/* If the following assert() fails on some obscure processor/compiler
127574	** combination, the work-around is to set the correct pointer
127575	** size at compile-time using -DSQLITE_PTRSIZE=n compile-time option */
127576	assert( SQLITE_PTRSIZE==sizeof(char*) );
127577
127578	/* If SQLite is already completely initialized, then this call
127579	** to sqlite3_initialize() should be a no-op. But the initialization
127580	** must be complete. So isInit must not be set until the very end
127581	** of this routine.
	@@ -126982,30 +127785,32 @@
127785	/* Mutex configuration options are only available in a threadsafe
127786	** compile.
127787	*/
127788	#if defined(SQLITE_THREADSAFE) && SQLITE_THREADSAFE>0 /* IMP: R-54466-46756 */
127789	case SQLITE_CONFIG_SINGLETHREAD: {
127790	/* EVIDENCE-OF: R-02748-19096 This option sets the threading mode to
127791	** Single-thread. */
127792	sqlite3GlobalConfig.bCoreMutex = 0; /* Disable mutex on core */
127793	sqlite3GlobalConfig.bFullMutex = 0; /* Disable mutex on connections */
127794	break;
127795	}
127796	#endif
127797	#if defined(SQLITE_THREADSAFE) && SQLITE_THREADSAFE>0 /* IMP: R-20520-54086 */
127798	case SQLITE_CONFIG_MULTITHREAD: {
127799	/* EVIDENCE-OF: R-14374-42468 This option sets the threading mode to
127800	** Multi-thread. */
127801	sqlite3GlobalConfig.bCoreMutex = 1; /* Enable mutex on core */
127802	sqlite3GlobalConfig.bFullMutex = 0; /* Disable mutex on connections */
127803	break;
127804	}
127805	#endif
127806	#if defined(SQLITE_THREADSAFE) && SQLITE_THREADSAFE>0 /* IMP: R-59593-21810 */
127807	case SQLITE_CONFIG_SERIALIZED: {
127808	/* EVIDENCE-OF: R-41220-51800 This option sets the threading mode to
127809	** Serialized. */
127810	sqlite3GlobalConfig.bCoreMutex = 1; /* Enable mutex on core */
127811	sqlite3GlobalConfig.bFullMutex = 1; /* Enable mutex on connections */
127812	break;
127813	}
127814	#endif
127815	#if defined(SQLITE_THREADSAFE) && SQLITE_THREADSAFE>0 /* IMP: R-63666-48755 */
127816	case SQLITE_CONFIG_MUTEX: {
	@@ -127113,11 +127918,12 @@
127918	** SQLITE_ENABLE_MEMSYS5 and returns SQLITE_ERROR if invoked otherwise. */
127919	#if defined(SQLITE_ENABLE_MEMSYS3) \|\| defined(SQLITE_ENABLE_MEMSYS5)
127920	case SQLITE_CONFIG_HEAP: {
127921	/* EVIDENCE-OF: R-19854-42126 There are three arguments to
127922	** SQLITE_CONFIG_HEAP: An 8-byte aligned pointer to the memory, the
127923	** number of bytes in the memory buffer, and the minimum allocation size.
127924	*/
127925	sqlite3GlobalConfig.pHeap = va_arg(ap, void*);
127926	sqlite3GlobalConfig.nHeap = va_arg(ap, int);
127927	sqlite3GlobalConfig.mnReq = va_arg(ap, int);
127928
127929	if( sqlite3GlobalConfig.mnReq<1 ){
	@@ -127218,11 +128024,13 @@
128024	** EVIDENCE-OF: R-34993-45031 The maximum allowed mmap size will be
128025	** silently truncated if necessary so that it does not exceed the
128026	** compile-time maximum mmap size set by the SQLITE_MAX_MMAP_SIZE
128027	** compile-time option.
128028	*/
128029	if( mxMmap<0 \|\| mxMmap>SQLITE_MAX_MMAP_SIZE ){
128030	mxMmap = SQLITE_MAX_MMAP_SIZE;
128031	}
128032	if( szMmap<0 ) szMmap = SQLITE_DEFAULT_MMAP_SIZE;
128033	if( szMmap>mxMmap) szMmap = mxMmap;
128034	sqlite3GlobalConfig.mxMmap = mxMmap;
128035	sqlite3GlobalConfig.szMmap = szMmap;
128036	break;
	@@ -129062,11 +129870,23 @@
129870	for(iIn=0; iIn<nUri; iIn++) nByte += (zUri[iIn]=='&');
129871	zFile = sqlite3_malloc(nByte);
129872	if( !zFile ) return SQLITE_NOMEM;
129873
129874	iIn = 5;
129875	#ifdef SQLITE_ALLOW_URI_AUTHORITY
129876	if( strncmp(zUri+5, "///", 3)==0 ){
129877	iIn = 7;
129878	/* The following condition causes URIs with five leading / characters
129879	** like file://///host/path to be converted into UNCs like //host/path.
129880	** The correct URI for that UNC has only two or four leading / characters
129881	** file://host/path or file:////host/path. But 5 leading slashes is a
129882	** common error, we are told, so we handle it as a special case. */
129883	if( strncmp(zUri+7, "///", 3)==0 ){ iIn++; }
129884	}else if( strncmp(zUri+5, "//localhost/", 12)==0 ){
129885	iIn = 16;
129886	}
129887	#else
129888	/* Discard the scheme and authority segments of the URI. */
129889	if( zUri[5]=='/' && zUri[6]=='/' ){
129890	iIn = 7;
129891	while( zUri[iIn] && zUri[iIn]!='/' ) iIn++;
129892	if( iIn!=7 && (iIn!=16 \|\| memcmp("localhost", &zUri[7], 9)) ){
	@@ -129505,11 +130325,12 @@
130325	sqlite3_wal_autocheckpoint(db, SQLITE_DEFAULT_WAL_AUTOCHECKPOINT);
130326
130327	opendb_out:
130328	sqlite3_free(zOpen);
130329	if( db ){
130330	assert( db->mutex!=0 \|\| isThreadsafe==0
130331	\|\| sqlite3GlobalConfig.bFullMutex==0 );
130332	sqlite3_mutex_leave(db->mutex);
130333	}
130334	rc = sqlite3_errcode(db);
130335	assert( db!=0 \|\| rc==SQLITE_NOMEM );
130336	if( rc==SQLITE_NOMEM ){
	@@ -130250,21 +131071,21 @@
131071	case SQLITE_TESTCTRL_ISINIT: {
131072	if( sqlite3GlobalConfig.isInit==0 ) rc = SQLITE_ERROR;
131073	break;
131074	}
131075
131076	/* sqlite3_test_control(SQLITE_TESTCTRL_IMPOSTER, db, dbName, onOff, tnum);
131077	**
131078	** This test control is used to create imposter tables. "db" is a pointer
131079	** to the database connection. dbName is the database name (ex: "main" or
131080	** "temp") which will receive the imposter. "onOff" turns imposter mode on
131081	** or off. "tnum" is the root page of the b-tree to which the imposter
131082	** table should connect.
131083	**
131084	** Enable imposter mode only when the schema has already been parsed. Then
131085	** run a single CREATE TABLE statement to construct the imposter table in
131086	** the parsed schema. Then turn imposter mode back off again.
131087	**
131088	** If onOff==0 and tnum>0 then reset the schema for all databases, causing
131089	** the schema to be reparsed the next time it is needed. This has the
131090	** effect of erasing all imposter tables.
131091	*/
	@@ -132506,15 +133327,20 @@
133327	** the output value undefined. Otherwise SQLITE_OK is returned.
133328	**
133329	** This function is used when parsing the "prefix=" FTS4 parameter.
133330	*/
133331	static int fts3GobbleInt(const char *pp, int pnOut){
133332	const int MAX_NPREFIX = 10000000;
133333	const char p; / Iterator pointer */
133334	int nInt = 0; /* Output value */
133335
133336	for(p=*pp; p[0]>='0' && p[0]<='9'; p++){
133337	nInt = nInt * 10 + (p[0] - '0');
133338	if( nInt>MAX_NPREFIX ){
133339	nInt = 0;
133340	break;
133341	}
133342	}
133343	if( p==*pp ) return SQLITE_ERROR;
133344	*pnOut = nInt;
133345	*pp = p;
133346	return SQLITE_OK;
	@@ -132553,27 +133379,33 @@
133379	}
133380	}
133381
133382	aIndex = sqlite3_malloc(sizeof(struct Fts3Index) * nIndex);
133383	*apIndex = aIndex;

133384	if( !aIndex ){
133385	return SQLITE_NOMEM;
133386	}
133387
133388	memset(aIndex, 0, sizeof(struct Fts3Index) * nIndex);
133389	if( zParam ){
133390	const char *p = zParam;
133391	int i;
133392	for(i=1; i<nIndex; i++){
133393	int nPrefix = 0;
133394	if( fts3GobbleInt(&p, &nPrefix) ) return SQLITE_ERROR;
133395	assert( nPrefix>=0 );
133396	if( nPrefix==0 ){
133397	nIndex--;
133398	i--;
133399	}else{
133400	aIndex[i].nPrefix = nPrefix;
133401	}
133402	p++;
133403	}
133404	}
133405
133406	*pnIndex = nIndex;
133407	return SQLITE_OK;
133408	}
133409
133410	/*
133411	** This function is called when initializing an FTS4 table that uses the
	@@ -140349,11 +141181,11 @@
141181	nName = sqlite3_value_bytes(argv[0])+1;
141182
141183	if( argc==2 ){
141184	void *pOld;
141185	int n = sqlite3_value_bytes(argv[1]);
141186	if( zName==0 \|\| n!=sizeof(pPtr) ){
141187	sqlite3_result_error(context, "argument type mismatch", -1);
141188	return;
141189	}
141190	pPtr = (void *)sqlite3_value_blob(argv[1]);
141191	pOld = sqlite3Fts3HashInsert(pHash, (void *)zName, nName, pPtr);
	@@ -140360,11 +141192,13 @@
141192	if( pOld==pPtr ){
141193	sqlite3_result_error(context, "out of memory", -1);
141194	return;
141195	}
141196	}else{
141197	if( zName ){
141198	pPtr = sqlite3Fts3HashFind(pHash, zName, nName);
141199	}
141200	if( !pPtr ){
141201	char *zErr = sqlite3_mprintf("unknown tokenizer: %s", zName);
141202	sqlite3_result_error(context, zErr, -1);
141203	sqlite3_free(zErr);
141204	return;
	@@ -140441,10 +141275,14 @@
141275	zCopy = sqlite3_mprintf("%s", zArg);
141276	if( !zCopy ) return SQLITE_NOMEM;
141277	zEnd = &zCopy[strlen(zCopy)];
141278
141279	z = (char *)sqlite3Fts3NextToken(zCopy, &n);
141280	if( z==0 ){
141281	assert( n==0 );
141282	z = zCopy;
141283	}
141284	z[n] = '\0';
141285	sqlite3Fts3Dequote(z);
141286
141287	m = (sqlite3_tokenizer_module *)sqlite3Fts3HashFind(pHash,z,(int)strlen(z)+1);
141288	if( !m ){
	@@ -143086,11 +143924,14 @@
143924	/*
143925	** This is a comparison function used as a qsort() callback when sorting
143926	** an array of pending terms by term. This occurs as part of flushing
143927	** the contents of the pending-terms hash table to the database.
143928	*/
143929	static int SQLITE_CDECL fts3CompareElemByTerm(
143930	const void *lhs,
143931	const void *rhs
143932	){
143933	char z1 = fts3HashKey((Fts3HashElem **)lhs);
143934	char z2 = fts3HashKey((Fts3HashElem **)rhs);
143935	int n1 = fts3HashKeysize((Fts3HashElem *)lhs);
143936	int n2 = fts3HashKeysize((Fts3HashElem *)rhs);
143937
143938

M src/sqlite3.h

+69 -48

		--- src/sqlite3.h
		+++ src/sqlite3.h
		@@ -52,10 +52,17 @@
52	52	#ifndef SQLITE_API
53	53	# define SQLITE_API
54	54	#endif
55	55
56	56
	57	+/*
	58	+** Add the ability to override 'cdecl'
	59	+*/
	60	+#ifndef SQLITE_CDECL
	61	+# define SQLITE_CDECL
	62	+#endif
	63	+
57	64	/*
58	65	** These no-op macros are used in front of interfaces to mark those
59	66	** interfaces as either deprecated or experimental. New applications
60	67	** should not use deprecated interfaces - they are supported for backwards
61	68	** compatibility only. Application writers should be aware that
		@@ -105,13 +112,13 @@
105	112	**
106	113	** See also: [sqlite3_libversion()],
107	114	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108	115	** [sqlite_version()] and [sqlite_source_id()].
109	116	*/
110		-#define SQLITE_VERSION "3.8.8"
111		-#define SQLITE_VERSION_NUMBER 3008008
112		-#define SQLITE_SOURCE_ID "2015-02-25 14:25:31 6d132e7a224ee68b5cefe9222944aac5760ffc20"
	117	+#define SQLITE_VERSION "3.8.9"
	118	+#define SQLITE_VERSION_NUMBER 3008009
	119	+#define SQLITE_SOURCE_ID "2015-03-24 18:19:39 436314b5728c9413f9ac2d837e1c19364f31be72"
113	120
114	121	/*
115	122	** CAPI3REF: Run-Time Library Version Numbers
116	123	** KEYWORDS: sqlite3_version, sqlite3_sourceid
117	124	**
		@@ -754,18 +761,20 @@
754	761	**
755	762	** These integer constants are opcodes for the xFileControl method
756	763	** of the [sqlite3_io_methods] object and for the [sqlite3_file_control()]
757	764	** interface.
758	765	**
	766	+** <ul>
	767	+** <li>[[SQLITE_FCNTL_LOCKSTATE]]
759	768	** The [SQLITE_FCNTL_LOCKSTATE] opcode is used for debugging. This
760	769	** opcode causes the xFileControl method to write the current state of
761	770	** the lock (one of [SQLITE_LOCK_NONE], [SQLITE_LOCK_SHARED],
762	771	** [SQLITE_LOCK_RESERVED], [SQLITE_LOCK_PENDING], or [SQLITE_LOCK_EXCLUSIVE])
763	772	** into an integer that the pArg argument points to. This capability
764		-** is used during testing and only needs to be supported when SQLITE_TEST
765		-** is defined.
766		-** <ul>
	773	+** is used during testing and is only available when the SQLITE_TEST
	774	+** compile-time option is used.
	775	+**
767	776	** <li>[[SQLITE_FCNTL_SIZE_HINT]]
768	777	** The [SQLITE_FCNTL_SIZE_HINT] opcode is used by SQLite to give the VFS
769	778	** layer a hint of how large the database file will grow to be during the
770	779	** current transaction. This hint is not guaranteed to be accurate but it
771	780	** is often close. The underlying VFS might choose to preallocate database
		@@ -886,11 +895,13 @@
886	895	** the error message if the pragma fails. ^If the
887	896	** [SQLITE_FCNTL_PRAGMA] file control returns [SQLITE_NOTFOUND], then normal
888	897	** [PRAGMA] processing continues. ^If the [SQLITE_FCNTL_PRAGMA]
889	898	** file control returns [SQLITE_OK], then the parser assumes that the
890	899	** VFS has handled the PRAGMA itself and the parser generates a no-op
891		-** prepared statement. ^If the [SQLITE_FCNTL_PRAGMA] file control returns
	900	+** prepared statement if result string is NULL, or that returns a copy
	901	+** of the result string if the string is non-NULL.
	902	+** ^If the [SQLITE_FCNTL_PRAGMA] file control returns
892	903	** any result code other than [SQLITE_OK] or [SQLITE_NOTFOUND], that means
893	904	** that the VFS encountered an error while handling the [PRAGMA] and the
894	905	** compilation of the PRAGMA fails with an error. ^The [SQLITE_FCNTL_PRAGMA]
895	906	** file control occurs at the beginning of pragma statement analysis and so
896	907	** it is able to override built-in [PRAGMA] statements.
		@@ -944,10 +955,17 @@
944	955	** The [SQLITE_FCNTL_WIN32_SET_HANDLE] opcode is used for debugging. This
945	956	** opcode causes the xFileControl method to swap the file handle with the one
946	957	** pointed to by the pArg argument. This capability is used during testing
947	958	** and only needs to be supported when SQLITE_TEST is defined.
948	959	**
	960	+** <li>[[SQLITE_FCNTL_WAL_BLOCK]]
	961	+** The [SQLITE_FCNTL_WAL_BLOCK] is a signal to the VFS layer that it might
	962	+** be advantageous to block on the next WAL lock if the lock is not immediately
	963	+** available. The WAL subsystem issues this signal during rare
	964	+** circumstances in order to fix a problem with priority inversion.
	965	+** Applications should <em>not</em> use this file-control.
	966	+**
949	967	** </ul>
950	968	*/
951	969	#define SQLITE_FCNTL_LOCKSTATE 1
952	970	#define SQLITE_FCNTL_GET_LOCKPROXYFILE 2
953	971	#define SQLITE_FCNTL_SET_LOCKPROXYFILE 3
		@@ -968,10 +986,11 @@
968	986	#define SQLITE_FCNTL_TRACE 19
969	987	#define SQLITE_FCNTL_HAS_MOVED 20
970	988	#define SQLITE_FCNTL_SYNC 21
971	989	#define SQLITE_FCNTL_COMMIT_PHASETWO 22
972	990	#define SQLITE_FCNTL_WIN32_SET_HANDLE 23
	991	+#define SQLITE_FCNTL_WAL_BLOCK 24
973	992
974	993	/* deprecated names */
975	994	#define SQLITE_GET_LOCKPROXYFILE SQLITE_FCNTL_GET_LOCKPROXYFILE
976	995	#define SQLITE_SET_LOCKPROXYFILE SQLITE_FCNTL_SET_LOCKPROXYFILE
977	996	#define SQLITE_LAST_ERRNO SQLITE_FCNTL_LAST_ERRNO
		@@ -1534,11 +1553,11 @@
1534	1553	** disabled, the following SQLite interfaces become non-operational:
1535	1554	** <ul>
1536	1555	** <li> [sqlite3_memory_used()]
1537	1556	** <li> [sqlite3_memory_highwater()]
1538	1557	** <li> [sqlite3_soft_heap_limit64()]
1539		-** <li> [sqlite3_status()]
	1558	+** <li> [sqlite3_status64()]
1540	1559	** </ul>)^
1541	1560	** ^Memory allocation statistics are enabled by default unless SQLite is
1542	1561	** compiled with [SQLITE_DEFAULT_MEMSTATUS]=0 in which case memory
1543	1562	** allocation statistics are disabled by default.
1544	1563	** </dd>
		@@ -1745,11 +1764,10 @@
1745	1764	** <dt>SQLITE_CONFIG_WIN32_HEAPSIZE
1746	1765	** <dd>^The SQLITE_CONFIG_WIN32_HEAPSIZE option is only available if SQLite is
1747	1766	** compiled for Windows with the [SQLITE_WIN32_MALLOC] pre-processor macro
1748	1767	** defined. ^SQLITE_CONFIG_WIN32_HEAPSIZE takes a 32-bit unsigned integer value
1749	1768	** that specifies the maximum size of the created heap.
1750		-** </dl>
1751	1769	**
1752	1770	** [[SQLITE_CONFIG_PCACHE_HDRSZ]]
1753	1771	** <dt>SQLITE_CONFIG_PCACHE_HDRSZ
1754	1772	** <dd>^The SQLITE_CONFIG_PCACHE_HDRSZ option takes a single parameter which
1755	1773	** is a pointer to an integer and writes into that integer the number of extra
		@@ -2992,15 +3010,17 @@
2992	3010
2993	3011
2994	3012	/*
2995	3013	** CAPI3REF: Error Codes And Messages
2996	3014	**
2997		-** ^The sqlite3_errcode() interface returns the numeric [result code] or
2998		-** [extended result code] for the most recent failed sqlite3_* API call
2999		-** associated with a [database connection]. If a prior API call failed
3000		-** but the most recent API call succeeded, the return value from
3001		-** sqlite3_errcode() is undefined. ^The sqlite3_extended_errcode()
	3015	+** ^If the most recent sqlite3_* API call associated with
	3016	+** [database connection] D failed, then the sqlite3_errcode(D) interface
	3017	+** returns the numeric [result code] or [extended result code] for that
	3018	+** API call.
	3019	+** If the most recent API call was successful,
	3020	+** then the return value from sqlite3_errcode() is undefined.
	3021	+** ^The sqlite3_extended_errcode()
3002	3022	** interface is the same except that it always returns the
3003	3023	** [extended result code] even when extended result codes are
3004	3024	** disabled.
3005	3025	**
3006	3026	** ^The sqlite3_errmsg() and sqlite3_errmsg16() return English-language
		@@ -3185,20 +3205,18 @@
3185	3205	** The second argument, "zSql", is the statement to be compiled, encoded
3186	3206	** as either UTF-8 or UTF-16. The sqlite3_prepare() and sqlite3_prepare_v2()
3187	3207	** interfaces use UTF-8, and sqlite3_prepare16() and sqlite3_prepare16_v2()
3188	3208	** use UTF-16.
3189	3209	**
3190		-** ^If the nByte argument is less than zero, then zSql is read up to the
3191		-** first zero terminator. ^If nByte is non-negative, then it is the maximum
3192		-** number of bytes read from zSql. ^When nByte is non-negative, the
3193		-** zSql string ends at either the first '\000' or '\u0000' character or
3194		-** the nByte-th byte, whichever comes first. If the caller knows
3195		-** that the supplied string is nul-terminated, then there is a small
3196		-** performance advantage to be gained by passing an nByte parameter that
3197		-** is equal to the number of bytes in the input string <i>including</i>
3198		-** the nul-terminator bytes as this saves SQLite from having to
3199		-** make a copy of the input string.
	3210	+** ^If the nByte argument is negative, then zSql is read up to the
	3211	+** first zero terminator. ^If nByte is positive, then it is the
	3212	+** number of bytes read from zSql. ^If nByte is zero, then no prepared
	3213	+** statement is generated.
	3214	+** If the caller knows that the supplied string is nul-terminated, then
	3215	+** there is a small performance advantage to passing an nByte parameter that
	3216	+** is the number of bytes in the input string <i>including</i>
	3217	+** the nul-terminator.
3200	3218	**
3201	3219	** ^If pzTail is not NULL then *pzTail is made to point to the first byte
3202	3220	** past the end of the first SQL statement in zSql. These routines only
3203	3221	** compile the first statement in zSql, so *pzTail is left pointing to
3204	3222	** what remains uncompiled.
		@@ -4223,12 +4241,12 @@
4223	4241	** DEPRECATED
4224	4242	**
4225	4243	** These functions are [deprecated]. In order to maintain
4226	4244	** backwards compatibility with older code, these functions continue
4227	4245	** to be supported. However, new applications should avoid
4228		-** the use of these functions. To help encourage people to avoid
4229		-** using these functions, we are not going to tell you what they do.
	4246	+** the use of these functions. To encourage programmers to avoid
	4247	+** these functions, we will not explain what they do.
4230	4248	*/
4231	4249	#ifndef SQLITE_OMIT_DEPRECATED
4232	4250	SQLITE_API SQLITE_DEPRECATED int sqlite3_aggregate_count(sqlite3_context*);
4233	4251	SQLITE_API SQLITE_DEPRECATED int sqlite3_expired(sqlite3_stmt*);
4234	4252	SQLITE_API SQLITE_DEPRECATED int sqlite3_transfer_bindings(sqlite3_stmt, sqlite3_stmt);
		@@ -5612,11 +5630,11 @@
5612	5630	** is delivered up to the client application, the string will be automatically
5613	5631	** freed by sqlite3_free() and the zErrMsg field will be zeroed.
5614	5632	*/
5615	5633	struct sqlite3_vtab {
5616	5634	const sqlite3_module pModule; / The module for this virtual table */
5617		- int nRef; /* NO LONGER USED */
	5635	+ int nRef; /* Number of open cursors */
5618	5636	char zErrMsg; / Error message from sqlite3_mprintf() */
5619	5637	/* Virtual table implementations will typically add additional fields */
5620	5638	};
5621	5639
5622	5640	/*
		@@ -6290,11 +6308,11 @@
6290	6308	#define SQLITE_TESTCTRL_LAST 25
6291	6309
6292	6310	/*
6293	6311	** CAPI3REF: SQLite Runtime Status
6294	6312	**
6295		-** ^This interface is used to retrieve runtime status information
	6313	+** ^These interfaces are used to retrieve runtime status information
6296	6314	** about the performance of SQLite, and optionally to reset various
6297	6315	** highwater marks. ^The first argument is an integer code for
6298	6316	** the specific parameter to measure. ^(Recognized integer codes
6299	6317	** are of the form [status parameters \| SQLITE_STATUS_...].)^
6300	6318	** ^The current value of the parameter is returned into *pCurrent.
		@@ -6304,23 +6322,26 @@
6304	6322	** value. For those parameters
6305	6323	** nothing is written into *pHighwater and the resetFlag is ignored.)^
6306	6324	** ^(Other parameters record only the highwater mark and not the current
6307	6325	** value. For these latter parameters nothing is written into *pCurrent.)^
6308	6326	**
6309		-** ^The sqlite3_status() routine returns SQLITE_OK on success and a
6310		-** non-zero [error code] on failure.
	6327	+** ^The sqlite3_status() and sqlite3_status64() routines return
	6328	+** SQLITE_OK on success and a non-zero [error code] on failure.
6311	6329	**
6312		-** This routine is threadsafe but is not atomic. This routine can be
6313		-** called while other threads are running the same or different SQLite
6314		-** interfaces. However the values returned in *pCurrent and
6315		-** *pHighwater reflect the status of SQLite at different points in time
6316		-** and it is possible that another thread might change the parameter
6317		-** in between the times when pCurrent and pHighwater are written.
	6330	+** If either the current value or the highwater mark is too large to
	6331	+** be represented by a 32-bit integer, then the values returned by
	6332	+** sqlite3_status() are undefined.
6318	6333	**
6319	6334	** See also: [sqlite3_db_status()]
6320	6335	*/
6321	6336	SQLITE_API int sqlite3_status(int op, int pCurrent, int pHighwater, int resetFlag);
	6337	+SQLITE_API int sqlite3_status64(
	6338	+ int op,
	6339	+ sqlite3_int64 *pCurrent,
	6340	+ sqlite3_int64 *pHighwater,
	6341	+ int resetFlag
	6342	+);
6322	6343
6323	6344
6324	6345	/*
6325	6346	** CAPI3REF: Status Parameters
6326	6347	** KEYWORDS: {status parameters}
		@@ -6986,24 +7007,24 @@
6986	7007	**
6987	7008	** ^A return of [SQLITE_BUSY] or [SQLITE_LOCKED] from sqlite3_backup_step()
6988	7009	** is not a permanent error and does not affect the return value of
6989	7010	** sqlite3_backup_finish().
6990	7011	**
6991		-** [[sqlite3_backup__remaining()]] [[sqlite3_backup_pagecount()]]
	7012	+** [[sqlite3_backup_remaining()]] [[sqlite3_backup_pagecount()]]
6992	7013	** <b>sqlite3_backup_remaining() and sqlite3_backup_pagecount()</b>
6993	7014	**
6994		-** ^Each call to sqlite3_backup_step() sets two values inside
6995		-** the [sqlite3_backup] object: the number of pages still to be backed
6996		-** up and the total number of pages in the source database file.
6997		-** The sqlite3_backup_remaining() and sqlite3_backup_pagecount() interfaces
6998		-** retrieve these two values, respectively.
6999		-**
7000		-** ^The values returned by these functions are only updated by
7001		-** sqlite3_backup_step(). ^If the source database is modified during a backup
7002		-** operation, then the values are not updated to account for any extra
7003		-** pages that need to be updated or the size of the source database file
7004		-** changing.
	7015	+** ^The sqlite3_backup_remaining() routine returns the number of pages still
	7016	+** to be backed up at the conclusion of the most recent sqlite3_backup_step().
	7017	+** ^The sqlite3_backup_pagecount() routine returns the total number of pages
	7018	+** in the source database at the conclusion of the most recent
	7019	+** sqlite3_backup_step().
	7020	+** ^(The values returned by these functions are only updated by
	7021	+** sqlite3_backup_step(). If the source database is modified in a way that
	7022	+** changes the size of the source database or the number of pages remaining,
	7023	+** those changes are not reflected in the output of sqlite3_backup_pagecount()
	7024	+** and sqlite3_backup_remaining() until after the next
	7025	+** sqlite3_backup_step().)^
7005	7026	**
7006	7027	** <b>Concurrent Usage of Database Handles</b>
7007	7028	**
7008	7029	** ^The source [database connection] may be used by the application for other
7009	7030	** purposes while a backup operation is underway or being initialized.
7010	7031

	--- src/sqlite3.h
	+++ src/sqlite3.h
	@@ -52,10 +52,17 @@
52	#ifndef SQLITE_API
53	# define SQLITE_API
54	#endif
55
56







57	/*
58	** These no-op macros are used in front of interfaces to mark those
59	** interfaces as either deprecated or experimental. New applications
60	** should not use deprecated interfaces - they are supported for backwards
61	** compatibility only. Application writers should be aware that
	@@ -105,13 +112,13 @@
105	**
106	** See also: [sqlite3_libversion()],
107	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
108	** [sqlite_version()] and [sqlite_source_id()].
109	*/
110	#define SQLITE_VERSION "3.8.8"
111	#define SQLITE_VERSION_NUMBER 3008008
112	#define SQLITE_SOURCE_ID "2015-02-25 14:25:31 6d132e7a224ee68b5cefe9222944aac5760ffc20"
113
114	/*
115	** CAPI3REF: Run-Time Library Version Numbers
116	** KEYWORDS: sqlite3_version, sqlite3_sourceid
117	**
	@@ -754,18 +761,20 @@
754	**
755	** These integer constants are opcodes for the xFileControl method
756	** of the [sqlite3_io_methods] object and for the [sqlite3_file_control()]
757	** interface.
758	**


759	** The [SQLITE_FCNTL_LOCKSTATE] opcode is used for debugging. This
760	** opcode causes the xFileControl method to write the current state of
761	** the lock (one of [SQLITE_LOCK_NONE], [SQLITE_LOCK_SHARED],
762	** [SQLITE_LOCK_RESERVED], [SQLITE_LOCK_PENDING], or [SQLITE_LOCK_EXCLUSIVE])
763	** into an integer that the pArg argument points to. This capability
764	** is used during testing and only needs to be supported when SQLITE_TEST
765	** is defined.
766	** <ul>
767	** <li>[[SQLITE_FCNTL_SIZE_HINT]]
768	** The [SQLITE_FCNTL_SIZE_HINT] opcode is used by SQLite to give the VFS
769	** layer a hint of how large the database file will grow to be during the
770	** current transaction. This hint is not guaranteed to be accurate but it
771	** is often close. The underlying VFS might choose to preallocate database
	@@ -886,11 +895,13 @@
886	** the error message if the pragma fails. ^If the
887	** [SQLITE_FCNTL_PRAGMA] file control returns [SQLITE_NOTFOUND], then normal
888	** [PRAGMA] processing continues. ^If the [SQLITE_FCNTL_PRAGMA]
889	** file control returns [SQLITE_OK], then the parser assumes that the
890	** VFS has handled the PRAGMA itself and the parser generates a no-op
891	** prepared statement. ^If the [SQLITE_FCNTL_PRAGMA] file control returns


892	** any result code other than [SQLITE_OK] or [SQLITE_NOTFOUND], that means
893	** that the VFS encountered an error while handling the [PRAGMA] and the
894	** compilation of the PRAGMA fails with an error. ^The [SQLITE_FCNTL_PRAGMA]
895	** file control occurs at the beginning of pragma statement analysis and so
896	** it is able to override built-in [PRAGMA] statements.
	@@ -944,10 +955,17 @@
944	** The [SQLITE_FCNTL_WIN32_SET_HANDLE] opcode is used for debugging. This
945	** opcode causes the xFileControl method to swap the file handle with the one
946	** pointed to by the pArg argument. This capability is used during testing
947	** and only needs to be supported when SQLITE_TEST is defined.
948	**







949	** </ul>
950	*/
951	#define SQLITE_FCNTL_LOCKSTATE 1
952	#define SQLITE_FCNTL_GET_LOCKPROXYFILE 2
953	#define SQLITE_FCNTL_SET_LOCKPROXYFILE 3
	@@ -968,10 +986,11 @@
968	#define SQLITE_FCNTL_TRACE 19
969	#define SQLITE_FCNTL_HAS_MOVED 20
970	#define SQLITE_FCNTL_SYNC 21
971	#define SQLITE_FCNTL_COMMIT_PHASETWO 22
972	#define SQLITE_FCNTL_WIN32_SET_HANDLE 23

973
974	/* deprecated names */
975	#define SQLITE_GET_LOCKPROXYFILE SQLITE_FCNTL_GET_LOCKPROXYFILE
976	#define SQLITE_SET_LOCKPROXYFILE SQLITE_FCNTL_SET_LOCKPROXYFILE
977	#define SQLITE_LAST_ERRNO SQLITE_FCNTL_LAST_ERRNO
	@@ -1534,11 +1553,11 @@
1534	** disabled, the following SQLite interfaces become non-operational:
1535	** <ul>
1536	** <li> [sqlite3_memory_used()]
1537	** <li> [sqlite3_memory_highwater()]
1538	** <li> [sqlite3_soft_heap_limit64()]
1539	** <li> [sqlite3_status()]
1540	** </ul>)^
1541	** ^Memory allocation statistics are enabled by default unless SQLite is
1542	** compiled with [SQLITE_DEFAULT_MEMSTATUS]=0 in which case memory
1543	** allocation statistics are disabled by default.
1544	** </dd>
	@@ -1745,11 +1764,10 @@
1745	** <dt>SQLITE_CONFIG_WIN32_HEAPSIZE
1746	** <dd>^The SQLITE_CONFIG_WIN32_HEAPSIZE option is only available if SQLite is
1747	** compiled for Windows with the [SQLITE_WIN32_MALLOC] pre-processor macro
1748	** defined. ^SQLITE_CONFIG_WIN32_HEAPSIZE takes a 32-bit unsigned integer value
1749	** that specifies the maximum size of the created heap.
1750	** </dl>
1751	**
1752	** [[SQLITE_CONFIG_PCACHE_HDRSZ]]
1753	** <dt>SQLITE_CONFIG_PCACHE_HDRSZ
1754	** <dd>^The SQLITE_CONFIG_PCACHE_HDRSZ option takes a single parameter which
1755	** is a pointer to an integer and writes into that integer the number of extra
	@@ -2992,15 +3010,17 @@
2992
2993
2994	/*
2995	** CAPI3REF: Error Codes And Messages
2996	**
2997	** ^The sqlite3_errcode() interface returns the numeric [result code] or
2998	** [extended result code] for the most recent failed sqlite3_* API call
2999	** associated with a [database connection]. If a prior API call failed
3000	** but the most recent API call succeeded, the return value from
3001	** sqlite3_errcode() is undefined. ^The sqlite3_extended_errcode()


3002	** interface is the same except that it always returns the
3003	** [extended result code] even when extended result codes are
3004	** disabled.
3005	**
3006	** ^The sqlite3_errmsg() and sqlite3_errmsg16() return English-language
	@@ -3185,20 +3205,18 @@
3185	** The second argument, "zSql", is the statement to be compiled, encoded
3186	** as either UTF-8 or UTF-16. The sqlite3_prepare() and sqlite3_prepare_v2()
3187	** interfaces use UTF-8, and sqlite3_prepare16() and sqlite3_prepare16_v2()
3188	** use UTF-16.
3189	**
3190	** ^If the nByte argument is less than zero, then zSql is read up to the
3191	** first zero terminator. ^If nByte is non-negative, then it is the maximum
3192	** number of bytes read from zSql. ^When nByte is non-negative, the
3193	** zSql string ends at either the first '\000' or '\u0000' character or
3194	** the nByte-th byte, whichever comes first. If the caller knows
3195	** that the supplied string is nul-terminated, then there is a small
3196	** performance advantage to be gained by passing an nByte parameter that
3197	** is equal to the number of bytes in the input string <i>including</i>
3198	** the nul-terminator bytes as this saves SQLite from having to
3199	** make a copy of the input string.
3200	**
3201	** ^If pzTail is not NULL then *pzTail is made to point to the first byte
3202	** past the end of the first SQL statement in zSql. These routines only
3203	** compile the first statement in zSql, so *pzTail is left pointing to
3204	** what remains uncompiled.
	@@ -4223,12 +4241,12 @@
4223	** DEPRECATED
4224	**
4225	** These functions are [deprecated]. In order to maintain
4226	** backwards compatibility with older code, these functions continue
4227	** to be supported. However, new applications should avoid
4228	** the use of these functions. To help encourage people to avoid
4229	** using these functions, we are not going to tell you what they do.
4230	*/
4231	#ifndef SQLITE_OMIT_DEPRECATED
4232	SQLITE_API SQLITE_DEPRECATED int sqlite3_aggregate_count(sqlite3_context*);
4233	SQLITE_API SQLITE_DEPRECATED int sqlite3_expired(sqlite3_stmt*);
4234	SQLITE_API SQLITE_DEPRECATED int sqlite3_transfer_bindings(sqlite3_stmt, sqlite3_stmt);
	@@ -5612,11 +5630,11 @@
5612	** is delivered up to the client application, the string will be automatically
5613	** freed by sqlite3_free() and the zErrMsg field will be zeroed.
5614	*/
5615	struct sqlite3_vtab {
5616	const sqlite3_module pModule; / The module for this virtual table */
5617	int nRef; /* NO LONGER USED */
5618	char zErrMsg; / Error message from sqlite3_mprintf() */
5619	/* Virtual table implementations will typically add additional fields */
5620	};
5621
5622	/*
	@@ -6290,11 +6308,11 @@
6290	#define SQLITE_TESTCTRL_LAST 25
6291
6292	/*
6293	** CAPI3REF: SQLite Runtime Status
6294	**
6295	** ^This interface is used to retrieve runtime status information
6296	** about the performance of SQLite, and optionally to reset various
6297	** highwater marks. ^The first argument is an integer code for
6298	** the specific parameter to measure. ^(Recognized integer codes
6299	** are of the form [status parameters \| SQLITE_STATUS_...].)^
6300	** ^The current value of the parameter is returned into *pCurrent.
	@@ -6304,23 +6322,26 @@
6304	** value. For those parameters
6305	** nothing is written into *pHighwater and the resetFlag is ignored.)^
6306	** ^(Other parameters record only the highwater mark and not the current
6307	** value. For these latter parameters nothing is written into *pCurrent.)^
6308	**
6309	** ^The sqlite3_status() routine returns SQLITE_OK on success and a
6310	** non-zero [error code] on failure.
6311	**
6312	** This routine is threadsafe but is not atomic. This routine can be
6313	** called while other threads are running the same or different SQLite
6314	** interfaces. However the values returned in *pCurrent and
6315	** *pHighwater reflect the status of SQLite at different points in time
6316	** and it is possible that another thread might change the parameter
6317	** in between the times when pCurrent and pHighwater are written.
6318	**
6319	** See also: [sqlite3_db_status()]
6320	*/
6321	SQLITE_API int sqlite3_status(int op, int pCurrent, int pHighwater, int resetFlag);






6322
6323
6324	/*
6325	** CAPI3REF: Status Parameters
6326	** KEYWORDS: {status parameters}
	@@ -6986,24 +7007,24 @@
6986	**
6987	** ^A return of [SQLITE_BUSY] or [SQLITE_LOCKED] from sqlite3_backup_step()
6988	** is not a permanent error and does not affect the return value of
6989	** sqlite3_backup_finish().
6990	**
6991	** [[sqlite3_backup__remaining()]] [[sqlite3_backup_pagecount()]]
6992	** <b>sqlite3_backup_remaining() and sqlite3_backup_pagecount()</b>
6993	**
6994	** ^Each call to sqlite3_backup_step() sets two values inside
6995	** the [sqlite3_backup] object: the number of pages still to be backed
6996	** up and the total number of pages in the source database file.
6997	** The sqlite3_backup_remaining() and sqlite3_backup_pagecount() interfaces
6998	** retrieve these two values, respectively.
6999	**
7000	** ^The values returned by these functions are only updated by
7001	** sqlite3_backup_step(). ^If the source database is modified during a backup
7002	** operation, then the values are not updated to account for any extra
7003	** pages that need to be updated or the size of the source database file
7004	** changing.
7005	**
7006	** <b>Concurrent Usage of Database Handles</b>
7007	**
7008	** ^The source [database connection] may be used by the application for other
7009	** purposes while a backup operation is underway or being initialized.
7010

	--- src/sqlite3.h
	+++ src/sqlite3.h
	@@ -52,10 +52,17 @@
52	#ifndef SQLITE_API
53	# define SQLITE_API
54	#endif
55
56
57	/*
58	** Add the ability to override 'cdecl'
59	*/
60	#ifndef SQLITE_CDECL
61	# define SQLITE_CDECL
62	#endif
63
64	/*
65	** These no-op macros are used in front of interfaces to mark those
66	** interfaces as either deprecated or experimental. New applications
67	** should not use deprecated interfaces - they are supported for backwards
68	** compatibility only. Application writers should be aware that
	@@ -105,13 +112,13 @@
112	**
113	** See also: [sqlite3_libversion()],
114	** [sqlite3_libversion_number()], [sqlite3_sourceid()],
115	** [sqlite_version()] and [sqlite_source_id()].
116	*/
117	#define SQLITE_VERSION "3.8.9"
118	#define SQLITE_VERSION_NUMBER 3008009
119	#define SQLITE_SOURCE_ID "2015-03-24 18:19:39 436314b5728c9413f9ac2d837e1c19364f31be72"
120
121	/*
122	** CAPI3REF: Run-Time Library Version Numbers
123	** KEYWORDS: sqlite3_version, sqlite3_sourceid
124	**
	@@ -754,18 +761,20 @@
761	**
762	** These integer constants are opcodes for the xFileControl method
763	** of the [sqlite3_io_methods] object and for the [sqlite3_file_control()]
764	** interface.
765	**
766	** <ul>
767	** <li>[[SQLITE_FCNTL_LOCKSTATE]]
768	** The [SQLITE_FCNTL_LOCKSTATE] opcode is used for debugging. This
769	** opcode causes the xFileControl method to write the current state of
770	** the lock (one of [SQLITE_LOCK_NONE], [SQLITE_LOCK_SHARED],
771	** [SQLITE_LOCK_RESERVED], [SQLITE_LOCK_PENDING], or [SQLITE_LOCK_EXCLUSIVE])
772	** into an integer that the pArg argument points to. This capability
773	** is used during testing and is only available when the SQLITE_TEST
774	** compile-time option is used.
775	**
776	** <li>[[SQLITE_FCNTL_SIZE_HINT]]
777	** The [SQLITE_FCNTL_SIZE_HINT] opcode is used by SQLite to give the VFS
778	** layer a hint of how large the database file will grow to be during the
779	** current transaction. This hint is not guaranteed to be accurate but it
780	** is often close. The underlying VFS might choose to preallocate database
	@@ -886,11 +895,13 @@
895	** the error message if the pragma fails. ^If the
896	** [SQLITE_FCNTL_PRAGMA] file control returns [SQLITE_NOTFOUND], then normal
897	** [PRAGMA] processing continues. ^If the [SQLITE_FCNTL_PRAGMA]
898	** file control returns [SQLITE_OK], then the parser assumes that the
899	** VFS has handled the PRAGMA itself and the parser generates a no-op
900	** prepared statement if result string is NULL, or that returns a copy
901	** of the result string if the string is non-NULL.
902	** ^If the [SQLITE_FCNTL_PRAGMA] file control returns
903	** any result code other than [SQLITE_OK] or [SQLITE_NOTFOUND], that means
904	** that the VFS encountered an error while handling the [PRAGMA] and the
905	** compilation of the PRAGMA fails with an error. ^The [SQLITE_FCNTL_PRAGMA]
906	** file control occurs at the beginning of pragma statement analysis and so
907	** it is able to override built-in [PRAGMA] statements.
	@@ -944,10 +955,17 @@
955	** The [SQLITE_FCNTL_WIN32_SET_HANDLE] opcode is used for debugging. This
956	** opcode causes the xFileControl method to swap the file handle with the one
957	** pointed to by the pArg argument. This capability is used during testing
958	** and only needs to be supported when SQLITE_TEST is defined.
959	**
960	** <li>[[SQLITE_FCNTL_WAL_BLOCK]]
961	** The [SQLITE_FCNTL_WAL_BLOCK] is a signal to the VFS layer that it might
962	** be advantageous to block on the next WAL lock if the lock is not immediately
963	** available. The WAL subsystem issues this signal during rare
964	** circumstances in order to fix a problem with priority inversion.
965	** Applications should <em>not</em> use this file-control.
966	**
967	** </ul>
968	*/
969	#define SQLITE_FCNTL_LOCKSTATE 1
970	#define SQLITE_FCNTL_GET_LOCKPROXYFILE 2
971	#define SQLITE_FCNTL_SET_LOCKPROXYFILE 3
	@@ -968,10 +986,11 @@
986	#define SQLITE_FCNTL_TRACE 19
987	#define SQLITE_FCNTL_HAS_MOVED 20
988	#define SQLITE_FCNTL_SYNC 21
989	#define SQLITE_FCNTL_COMMIT_PHASETWO 22
990	#define SQLITE_FCNTL_WIN32_SET_HANDLE 23
991	#define SQLITE_FCNTL_WAL_BLOCK 24
992
993	/* deprecated names */
994	#define SQLITE_GET_LOCKPROXYFILE SQLITE_FCNTL_GET_LOCKPROXYFILE
995	#define SQLITE_SET_LOCKPROXYFILE SQLITE_FCNTL_SET_LOCKPROXYFILE
996	#define SQLITE_LAST_ERRNO SQLITE_FCNTL_LAST_ERRNO
	@@ -1534,11 +1553,11 @@
1553	** disabled, the following SQLite interfaces become non-operational:
1554	** <ul>
1555	** <li> [sqlite3_memory_used()]
1556	** <li> [sqlite3_memory_highwater()]
1557	** <li> [sqlite3_soft_heap_limit64()]
1558	** <li> [sqlite3_status64()]
1559	** </ul>)^
1560	** ^Memory allocation statistics are enabled by default unless SQLite is
1561	** compiled with [SQLITE_DEFAULT_MEMSTATUS]=0 in which case memory
1562	** allocation statistics are disabled by default.
1563	** </dd>
	@@ -1745,11 +1764,10 @@
1764	** <dt>SQLITE_CONFIG_WIN32_HEAPSIZE
1765	** <dd>^The SQLITE_CONFIG_WIN32_HEAPSIZE option is only available if SQLite is
1766	** compiled for Windows with the [SQLITE_WIN32_MALLOC] pre-processor macro
1767	** defined. ^SQLITE_CONFIG_WIN32_HEAPSIZE takes a 32-bit unsigned integer value
1768	** that specifies the maximum size of the created heap.

1769	**
1770	** [[SQLITE_CONFIG_PCACHE_HDRSZ]]
1771	** <dt>SQLITE_CONFIG_PCACHE_HDRSZ
1772	** <dd>^The SQLITE_CONFIG_PCACHE_HDRSZ option takes a single parameter which
1773	** is a pointer to an integer and writes into that integer the number of extra
	@@ -2992,15 +3010,17 @@
3010
3011
3012	/*
3013	** CAPI3REF: Error Codes And Messages
3014	**
3015	** ^If the most recent sqlite3_* API call associated with
3016	** [database connection] D failed, then the sqlite3_errcode(D) interface
3017	** returns the numeric [result code] or [extended result code] for that
3018	** API call.
3019	** If the most recent API call was successful,
3020	** then the return value from sqlite3_errcode() is undefined.
3021	** ^The sqlite3_extended_errcode()
3022	** interface is the same except that it always returns the
3023	** [extended result code] even when extended result codes are
3024	** disabled.
3025	**
3026	** ^The sqlite3_errmsg() and sqlite3_errmsg16() return English-language
	@@ -3185,20 +3205,18 @@
3205	** The second argument, "zSql", is the statement to be compiled, encoded
3206	** as either UTF-8 or UTF-16. The sqlite3_prepare() and sqlite3_prepare_v2()
3207	** interfaces use UTF-8, and sqlite3_prepare16() and sqlite3_prepare16_v2()
3208	** use UTF-16.
3209	**
3210	** ^If the nByte argument is negative, then zSql is read up to the
3211	** first zero terminator. ^If nByte is positive, then it is the
3212	** number of bytes read from zSql. ^If nByte is zero, then no prepared
3213	** statement is generated.
3214	** If the caller knows that the supplied string is nul-terminated, then
3215	** there is a small performance advantage to passing an nByte parameter that
3216	** is the number of bytes in the input string <i>including</i>
3217	** the nul-terminator.


3218	**
3219	** ^If pzTail is not NULL then *pzTail is made to point to the first byte
3220	** past the end of the first SQL statement in zSql. These routines only
3221	** compile the first statement in zSql, so *pzTail is left pointing to
3222	** what remains uncompiled.
	@@ -4223,12 +4241,12 @@
4241	** DEPRECATED
4242	**
4243	** These functions are [deprecated]. In order to maintain
4244	** backwards compatibility with older code, these functions continue
4245	** to be supported. However, new applications should avoid
4246	** the use of these functions. To encourage programmers to avoid
4247	** these functions, we will not explain what they do.
4248	*/
4249	#ifndef SQLITE_OMIT_DEPRECATED
4250	SQLITE_API SQLITE_DEPRECATED int sqlite3_aggregate_count(sqlite3_context*);
4251	SQLITE_API SQLITE_DEPRECATED int sqlite3_expired(sqlite3_stmt*);
4252	SQLITE_API SQLITE_DEPRECATED int sqlite3_transfer_bindings(sqlite3_stmt, sqlite3_stmt);
	@@ -5612,11 +5630,11 @@
5630	** is delivered up to the client application, the string will be automatically
5631	** freed by sqlite3_free() and the zErrMsg field will be zeroed.
5632	*/
5633	struct sqlite3_vtab {
5634	const sqlite3_module pModule; / The module for this virtual table */
5635	int nRef; /* Number of open cursors */
5636	char zErrMsg; / Error message from sqlite3_mprintf() */
5637	/* Virtual table implementations will typically add additional fields */
5638	};
5639
5640	/*
	@@ -6290,11 +6308,11 @@
6308	#define SQLITE_TESTCTRL_LAST 25
6309
6310	/*
6311	** CAPI3REF: SQLite Runtime Status
6312	**
6313	** ^These interfaces are used to retrieve runtime status information
6314	** about the performance of SQLite, and optionally to reset various
6315	** highwater marks. ^The first argument is an integer code for
6316	** the specific parameter to measure. ^(Recognized integer codes
6317	** are of the form [status parameters \| SQLITE_STATUS_...].)^
6318	** ^The current value of the parameter is returned into *pCurrent.
	@@ -6304,23 +6322,26 @@
6322	** value. For those parameters
6323	** nothing is written into *pHighwater and the resetFlag is ignored.)^
6324	** ^(Other parameters record only the highwater mark and not the current
6325	** value. For these latter parameters nothing is written into *pCurrent.)^
6326	**
6327	** ^The sqlite3_status() and sqlite3_status64() routines return
6328	** SQLITE_OK on success and a non-zero [error code] on failure.
6329	**
6330	** If either the current value or the highwater mark is too large to
6331	** be represented by a 32-bit integer, then the values returned by
6332	** sqlite3_status() are undefined.



6333	**
6334	** See also: [sqlite3_db_status()]
6335	*/
6336	SQLITE_API int sqlite3_status(int op, int pCurrent, int pHighwater, int resetFlag);
6337	SQLITE_API int sqlite3_status64(
6338	int op,
6339	sqlite3_int64 *pCurrent,
6340	sqlite3_int64 *pHighwater,
6341	int resetFlag
6342	);
6343
6344
6345	/*
6346	** CAPI3REF: Status Parameters
6347	** KEYWORDS: {status parameters}
	@@ -6986,24 +7007,24 @@
7007	**
7008	** ^A return of [SQLITE_BUSY] or [SQLITE_LOCKED] from sqlite3_backup_step()
7009	** is not a permanent error and does not affect the return value of
7010	** sqlite3_backup_finish().
7011	**
7012	** [[sqlite3_backup_remaining()]] [[sqlite3_backup_pagecount()]]
7013	** <b>sqlite3_backup_remaining() and sqlite3_backup_pagecount()</b>
7014	**
7015	** ^The sqlite3_backup_remaining() routine returns the number of pages still
7016	** to be backed up at the conclusion of the most recent sqlite3_backup_step().
7017	** ^The sqlite3_backup_pagecount() routine returns the total number of pages
7018	** in the source database at the conclusion of the most recent
7019	** sqlite3_backup_step().
7020	** ^(The values returned by these functions are only updated by
7021	** sqlite3_backup_step(). If the source database is modified in a way that
7022	** changes the size of the source database or the number of pages remaining,
7023	** those changes are not reflected in the output of sqlite3_backup_pagecount()
7024	** and sqlite3_backup_remaining() until after the next
7025	** sqlite3_backup_step().)^
7026	**
7027	** <b>Concurrent Usage of Database Handles</b>
7028	**
7029	** ^The source [database connection] may be used by the application for other
7030	** purposes while a backup operation is underway or being initialized.
7031

M src/style.c

+2 -4

		--- src/style.c
		+++ src/style.c
		@@ -325,16 +325,14 @@
325	325	static void url_var(
326	326	const char *zVarPrefix,
327	327	const char *zConfigName,
328	328	const char *zPageName
329	329	){
330		- char *zMtime = db_get_mtime(zConfigName, 0, 0);
331		- char *zUrl = mprintf("%s/%s/%s%.5s", g.zTop, zPageName, zMtime,
332		- MANIFEST_UUID);
333	330	char *zVarName = mprintf("%s_url", zVarPrefix);
	331	+ char *zUrl = mprintf("%s/%s?id=%x", g.zTop, zPageName,
	332	+ skin_id(zConfigName));
334	333	Th_Store(zVarName, zUrl);
335		- free(zMtime);
336	334	free(zUrl);
337	335	free(zVarName);
338	336	}
339	337
340	338	/*
341	339

	--- src/style.c
	+++ src/style.c
	@@ -325,16 +325,14 @@
325	static void url_var(
326	const char *zVarPrefix,
327	const char *zConfigName,
328	const char *zPageName
329	){
330	char *zMtime = db_get_mtime(zConfigName, 0, 0);
331	char *zUrl = mprintf("%s/%s/%s%.5s", g.zTop, zPageName, zMtime,
332	MANIFEST_UUID);
333	char *zVarName = mprintf("%s_url", zVarPrefix);


334	Th_Store(zVarName, zUrl);
335	free(zMtime);
336	free(zUrl);
337	free(zVarName);
338	}
339
340	/*
341

	--- src/style.c
	+++ src/style.c
	@@ -325,16 +325,14 @@
325	static void url_var(
326	const char *zVarPrefix,
327	const char *zConfigName,
328	const char *zPageName
329	){



330	char *zVarName = mprintf("%s_url", zVarPrefix);
331	char *zUrl = mprintf("%s/%s?id=%x", g.zTop, zPageName,
332	skin_id(zConfigName));
333	Th_Store(zVarName, zUrl);

334	free(zUrl);
335	free(zVarName);
336	}
337
338	/*
339

M src/th_main.c

+28 -2

		--- src/th_main.c
		+++ src/th_main.c
		@@ -1833,10 +1833,16 @@
1833	1833	** Make sure that the TH1 script error was not caused by a "missing"
1834	1834	** command hook handler as that is not actually an error condition.
1835	1835	*/
1836	1836	if( memcmp(zResult, NO_COMMAND_HOOK_ERROR, nResult)!=0 ){
1837	1837	sendError(zResult, nResult, 0);
	1838	+ }else{
	1839	+ /*
	1840	+ ** There is no command hook handler "installed". This situation
	1841	+ ** is NOT actually an error.
	1842	+ */
	1843	+ rc = TH_OK;
1838	1844	}
1839	1845	}
1840	1846	/*
1841	1847	** If the script returned TH_ERROR (e.g. the "command_hook" TH1 command does
1842	1848	** not exist because commands are not being hooked), return TH_OK because we
		@@ -1853,11 +1859,11 @@
1853	1859	** clean it up now. This is very important because some commands do not
1854	1860	** expect the repository and/or the configuration ("user") database to be
1855	1861	** open prior to their own code doing so.
1856	1862	*/
1857	1863	if( TH_INIT_HOOK & TH_INIT_NEED_CONFIG ) Th_CloseConfig(1);
1858		- return (rc != TH_ERROR) ? rc : TH_OK;
	1864	+ return rc;
1859	1865	}
1860	1866
1861	1867	/*
1862	1868	** This function is called by Fossil just after dispatching a command.
1863	1869	** Returning a value other than TH_OK from this function (i.e. via an
		@@ -1914,10 +1920,16 @@
1914	1920	** Make sure that the TH1 script error was not caused by a "missing"
1915	1921	** webpage hook handler as that is not actually an error condition.
1916	1922	*/
1917	1923	if( memcmp(zResult, NO_WEBPAGE_HOOK_ERROR, nResult)!=0 ){
1918	1924	sendError(zResult, nResult, 1);
	1925	+ }else{
	1926	+ /*
	1927	+ ** There is no webpage hook handler "installed". This situation
	1928	+ ** is NOT actually an error.
	1929	+ */
	1930	+ rc = TH_OK;
1919	1931	}
1920	1932	}
1921	1933	/*
1922	1934	** If the script returned TH_ERROR (e.g. the "webpage_hook" TH1 command does
1923	1935	** not exist because commands are not being hooked), return TH_OK because we
		@@ -1934,11 +1946,11 @@
1934	1946	** clean it up now. This is very important because some commands do not
1935	1947	** expect the repository and/or the configuration ("user") database to be
1936	1948	** open prior to their own code doing so.
1937	1949	*/
1938	1950	if( TH_INIT_HOOK & TH_INIT_NEED_CONFIG ) Th_CloseConfig(1);
1939		- return (rc != TH_ERROR) ? rc : TH_OK;
	1951	+ return rc;
1940	1952	}
1941	1953
1942	1954	/*
1943	1955	** This function is called by Fossil just after processing a web page.
1944	1956	** Returning a value other than TH_OK from this function (i.e. via an
		@@ -1969,10 +1981,24 @@
1969	1981	*/
1970	1982	if( TH_INIT_HOOK & TH_INIT_NEED_CONFIG ) Th_CloseConfig(1);
1971	1983	return rc;
1972	1984	}
1973	1985	#endif
	1986	+
	1987	+
	1988	+#ifdef FOSSIL_ENABLE_TH1_DOCS
	1989	+/*
	1990	+** This function determines if TH1 docs are enabled for the repository.
	1991	+*/
	1992	+int Th_AreDocsEnabled(void){
	1993	+ if( fossil_getenv("TH1_ENABLE_DOCS")!=0 ){
	1994	+ return 1;
	1995	+ }
	1996	+ return db_get_boolean("th1-docs", 0);
	1997	+}
	1998	+#endif
	1999	+
1974	2000
1975	2001	/*
1976	2002	** The z[] input contains text mixed with TH1 scripts.
1977	2003	** The TH1 scripts are contained within <th1>...</th1>.
1978	2004	** TH1 variables are $aaa or $<aaa>. The first form of
1979	2005

	--- src/th_main.c
	+++ src/th_main.c
	@@ -1833,10 +1833,16 @@
1833	** Make sure that the TH1 script error was not caused by a "missing"
1834	** command hook handler as that is not actually an error condition.
1835	*/
1836	if( memcmp(zResult, NO_COMMAND_HOOK_ERROR, nResult)!=0 ){
1837	sendError(zResult, nResult, 0);






1838	}
1839	}
1840	/*
1841	** If the script returned TH_ERROR (e.g. the "command_hook" TH1 command does
1842	** not exist because commands are not being hooked), return TH_OK because we
	@@ -1853,11 +1859,11 @@
1853	** clean it up now. This is very important because some commands do not
1854	** expect the repository and/or the configuration ("user") database to be
1855	** open prior to their own code doing so.
1856	*/
1857	if( TH_INIT_HOOK & TH_INIT_NEED_CONFIG ) Th_CloseConfig(1);
1858	return (rc != TH_ERROR) ? rc : TH_OK;
1859	}
1860
1861	/*
1862	** This function is called by Fossil just after dispatching a command.
1863	** Returning a value other than TH_OK from this function (i.e. via an
	@@ -1914,10 +1920,16 @@
1914	** Make sure that the TH1 script error was not caused by a "missing"
1915	** webpage hook handler as that is not actually an error condition.
1916	*/
1917	if( memcmp(zResult, NO_WEBPAGE_HOOK_ERROR, nResult)!=0 ){
1918	sendError(zResult, nResult, 1);






1919	}
1920	}
1921	/*
1922	** If the script returned TH_ERROR (e.g. the "webpage_hook" TH1 command does
1923	** not exist because commands are not being hooked), return TH_OK because we
	@@ -1934,11 +1946,11 @@
1934	** clean it up now. This is very important because some commands do not
1935	** expect the repository and/or the configuration ("user") database to be
1936	** open prior to their own code doing so.
1937	*/
1938	if( TH_INIT_HOOK & TH_INIT_NEED_CONFIG ) Th_CloseConfig(1);
1939	return (rc != TH_ERROR) ? rc : TH_OK;
1940	}
1941
1942	/*
1943	** This function is called by Fossil just after processing a web page.
1944	** Returning a value other than TH_OK from this function (i.e. via an
	@@ -1969,10 +1981,24 @@
1969	*/
1970	if( TH_INIT_HOOK & TH_INIT_NEED_CONFIG ) Th_CloseConfig(1);
1971	return rc;
1972	}
1973	#endif














1974
1975	/*
1976	** The z[] input contains text mixed with TH1 scripts.
1977	** The TH1 scripts are contained within <th1>...</th1>.
1978	** TH1 variables are $aaa or $<aaa>. The first form of
1979

	--- src/th_main.c
	+++ src/th_main.c
	@@ -1833,10 +1833,16 @@
1833	** Make sure that the TH1 script error was not caused by a "missing"
1834	** command hook handler as that is not actually an error condition.
1835	*/
1836	if( memcmp(zResult, NO_COMMAND_HOOK_ERROR, nResult)!=0 ){
1837	sendError(zResult, nResult, 0);
1838	}else{
1839	/*
1840	** There is no command hook handler "installed". This situation
1841	** is NOT actually an error.
1842	*/
1843	rc = TH_OK;
1844	}
1845	}
1846	/*
1847	** If the script returned TH_ERROR (e.g. the "command_hook" TH1 command does
1848	** not exist because commands are not being hooked), return TH_OK because we
	@@ -1853,11 +1859,11 @@
1859	** clean it up now. This is very important because some commands do not
1860	** expect the repository and/or the configuration ("user") database to be
1861	** open prior to their own code doing so.
1862	*/
1863	if( TH_INIT_HOOK & TH_INIT_NEED_CONFIG ) Th_CloseConfig(1);
1864	return rc;
1865	}
1866
1867	/*
1868	** This function is called by Fossil just after dispatching a command.
1869	** Returning a value other than TH_OK from this function (i.e. via an
	@@ -1914,10 +1920,16 @@
1920	** Make sure that the TH1 script error was not caused by a "missing"
1921	** webpage hook handler as that is not actually an error condition.
1922	*/
1923	if( memcmp(zResult, NO_WEBPAGE_HOOK_ERROR, nResult)!=0 ){
1924	sendError(zResult, nResult, 1);
1925	}else{
1926	/*
1927	** There is no webpage hook handler "installed". This situation
1928	** is NOT actually an error.
1929	*/
1930	rc = TH_OK;
1931	}
1932	}
1933	/*
1934	** If the script returned TH_ERROR (e.g. the "webpage_hook" TH1 command does
1935	** not exist because commands are not being hooked), return TH_OK because we
	@@ -1934,11 +1946,11 @@
1946	** clean it up now. This is very important because some commands do not
1947	** expect the repository and/or the configuration ("user") database to be
1948	** open prior to their own code doing so.
1949	*/
1950	if( TH_INIT_HOOK & TH_INIT_NEED_CONFIG ) Th_CloseConfig(1);
1951	return rc;
1952	}
1953
1954	/*
1955	** This function is called by Fossil just after processing a web page.
1956	** Returning a value other than TH_OK from this function (i.e. via an
	@@ -1969,10 +1981,24 @@
1981	*/
1982	if( TH_INIT_HOOK & TH_INIT_NEED_CONFIG ) Th_CloseConfig(1);
1983	return rc;
1984	}
1985	#endif
1986
1987
1988	#ifdef FOSSIL_ENABLE_TH1_DOCS
1989	/*
1990	** This function determines if TH1 docs are enabled for the repository.
1991	*/
1992	int Th_AreDocsEnabled(void){
1993	if( fossil_getenv("TH1_ENABLE_DOCS")!=0 ){
1994	return 1;
1995	}
1996	return db_get_boolean("th1-docs", 0);
1997	}
1998	#endif
1999
2000
2001	/*
2002	** The z[] input contains text mixed with TH1 scripts.
2003	** The TH1 scripts are contained within <th1>...</th1>.
2004	** TH1 variables are $aaa or $<aaa>. The first form of
2005

M src/timeline.c

+35 -18

		--- src/timeline.c
		+++ src/timeline.c
		@@ -752,25 +752,25 @@
752	752	@ }while( obj = obj.offsetParent );
753	753	@ }
754	754	@ return left;
755	755	@ }
756	756	@ function drawUpArrow(x,y0,y1){
757		- @ drawBox(lineClr,x,y0+5,x+1,y1);
	757	+ @ drawBox(lineClr,x,y0+4,x+1,y1);
758	758	@ var n = document.createElement("div"),
759	759	@ l = x-2,
760	760	@ t = y0;
761	761	@ n.style.position = "absolute";
762	762	@ n.style.left = l+"px";
763	763	@ n.style.top = t+"px";
764	764	@ n.style.width = 0;
765	765	@ n.style.height = 0;
	766	+ @ n.style.transform = "scale(.999)";
766	767	@ n.style.borderWidth = 0;
767	768	@ n.style.borderStyle = "solid";
768	769	@ n.style.borderColor = "transparent";
769	770	@ n.style.borderRightWidth = "3px";
770		- @ n.style.borderBottomColor = "#000";
771		- @ n.style.borderBottomStyle = "outset";
	771	+ @ n.style.borderBottomColor = lineClr;
772	772	@ n.style.borderLeftWidth = "3px";
773	773	@ if( y0+10>=y1 ){
774	774	@ n.style.borderBottomWidth = "5px";
775	775	@ } else {
776	776	@ n.style.borderBottomWidth = "7px";
		@@ -782,27 +782,26 @@
782	782	@ t = y-2;
783	783	@ n.style.position = "absolute";
784	784	@ n.style.top = t+"px";
785	785	@ n.style.width = 0;
786	786	@ n.style.height = "1px";
	787	+ @ n.style.transform = "scale(.999)";
787	788	@ n.style.borderWidth = 0;
788	789	@ n.style.borderStyle = "solid";
789	790	@ n.style.borderColor = "transparent";
790	791	@ n.style.borderTopWidth = "2px";
791	792	@ n.style.borderBottomWidth = "2px";
792	793	@ if( xFrom<xTo ){
793	794	@ drawBox(lineClr,xFrom,y,xTo-3,y);
794	795	@ n.style.left = xTo-3+"px";
795		- @ n.style.borderLeftStyle = "inset";
796	796	@ n.style.borderLeftWidth = "3px";
797		- @ n.style.borderLeftColor = "#000";
	797	+ @ n.style.borderLeftColor = lineClr;
798	798	@ }else{
799	799	@ drawBox(lineClr,xTo+3,y,xFrom,y);
800	800	@ n.style.left = xTo+1+"px";
801		- @ n.style.borderRightStyle = "outset";
802	801	@ n.style.borderRightWidth = "3px";
803		- @ n.style.borderRightColor = "#000";
	802	+ @ n.style.borderRightColor = lineClr;
804	803	@ }
805	804	@ cDiv.appendChild(n);
806	805	@ }
807	806	@ function drawThinLine(x0,y0,x1,y1){
808	807	@ drawBox(lineClr,x0,y0,x1,y1);
		@@ -851,16 +850,16 @@
851	850	@ n.style.position = "absolute";
852	851	@ n.style.top = t+"px";
853	852	@ n.style.left = l+"px";
854	853	@ n.style.width = 0;
855	854	@ n.style.height = 0;
	855	+ @ n.style.transform = "scale(.999)";
856	856	@ n.style.borderWidth = 0;
857	857	@ n.style.borderStyle = "solid";
858	858	@ n.style.borderColor = "transparent";
859	859	@ n.style.borderTopWidth = "3px";
860	860	@ n.style.borderBottomWidth = "3px";
861		- @ n.style.borderLeftStyle = "inset";
862	861	@ n.style.borderLeftWidth = "7px";
863	862	@ n.style.borderLeftColor = "#600000";
864	863	@ cDiv.appendChild(n);
865	864	@ }
866	865	@ }
		@@ -1421,11 +1420,11 @@
1421	1420	if( (tmFlags & TIMELINE_UNHIDE)==0 ){
1422	1421	timeline_submenu(&url, "Unhide", "unhide", "", 0);
1423	1422	}
1424	1423	}else{
1425	1424	/* Otherwise, a timeline based on a span of time */
1426		- int n;
	1425	+ int n, nBefore, nAfter;
1427	1426	const char *zEType = "timeline item";
1428	1427	char *zDate;
1429	1428	if( zUses ){
1430	1429	blob_append_sql(&sql, " AND event.objid IN usesfile ");
1431	1430	}
		@@ -1629,20 +1628,38 @@
1629	1628	}
1630	1629	if( zSearch ){
1631	1630	blob_appendf(&desc, " matching \"%h\"", zSearch);
1632	1631	}
1633	1632	if( g.perm.Hyperlink ){
1634		- if( zAfter \|\| n==nEntry ){
	1633	+ if( zCirca && rCirca ){
	1634	+ nBefore = db_int(0,
	1635	+ "SELECT count(*) FROM timeline WHERE etype!='div'"
	1636	+ " AND sortby<=%f /scan/", rCirca);
	1637	+ nAfter = db_int(0,
	1638	+ "SELECT count(*) FROM timeline WHERE etype!='div'"
	1639	+ " AND sortby>=%f /scan/", rCirca);
1635	1640	zDate = db_text(0, "SELECT min(timestamp) FROM timeline /scan/");
1636		- timeline_submenu(&url, "Older", "b", zDate, "a");
1637		- zOlderButton = fossil_strdup(url_render(&url, "b", zDate, "a", 0));
1638		- free(zDate);
1639		- }
1640		- if( zBefore \|\| (zAfter && n==nEntry) ){
1641		- zDate = db_text(0, "SELECT max(timestamp) FROM timeline /scan/");
1642		- timeline_submenu(&url, "Newer", "a", zDate, "b");
1643		- free(zDate);
	1641	+ if( nBefore>=nEntry ){
	1642	+ timeline_submenu(&url, "Older", "b", zDate, "c");
	1643	+ zOlderButton = fossil_strdup(url_render(&url, "b", zDate, "c", 0));
	1644	+ }
	1645	+ if( nAfter>=nEntry ){
	1646	+ timeline_submenu(&url, "Newer", "a", zDate, "c");
	1647	+ }
	1648	+ free(zDate);
	1649	+ }else{
	1650	+ if( zAfter \|\| n==nEntry ){
	1651	+ zDate = db_text(0, "SELECT min(timestamp) FROM timeline /scan/");
	1652	+ timeline_submenu(&url, "Older", "b", zDate, "a");
	1653	+ zOlderButton = fossil_strdup(url_render(&url, "b", zDate, "a", 0));
	1654	+ free(zDate);
	1655	+ }
	1656	+ if( zBefore \|\| (zAfter && n==nEntry) ){
	1657	+ zDate = db_text(0, "SELECT max(timestamp) FROM timeline /scan/");
	1658	+ timeline_submenu(&url, "Newer", "a", zDate, "b");
	1659	+ free(zDate);
	1660	+ }
1644	1661	}
1645	1662	if( zType[0]=='a' \|\| zType[0]=='c' ){
1646	1663	if( (tmFlags & TIMELINE_UNHIDE)==0 ){
1647	1664	timeline_submenu(&url, "Unhide", "unhide", "", 0);
1648	1665	}
1649	1666

	--- src/timeline.c
	+++ src/timeline.c
	@@ -752,25 +752,25 @@
752	@ }while( obj = obj.offsetParent );
753	@ }
754	@ return left;
755	@ }
756	@ function drawUpArrow(x,y0,y1){
757	@ drawBox(lineClr,x,y0+5,x+1,y1);
758	@ var n = document.createElement("div"),
759	@ l = x-2,
760	@ t = y0;
761	@ n.style.position = "absolute";
762	@ n.style.left = l+"px";
763	@ n.style.top = t+"px";
764	@ n.style.width = 0;
765	@ n.style.height = 0;

766	@ n.style.borderWidth = 0;
767	@ n.style.borderStyle = "solid";
768	@ n.style.borderColor = "transparent";
769	@ n.style.borderRightWidth = "3px";
770	@ n.style.borderBottomColor = "#000";
771	@ n.style.borderBottomStyle = "outset";
772	@ n.style.borderLeftWidth = "3px";
773	@ if( y0+10>=y1 ){
774	@ n.style.borderBottomWidth = "5px";
775	@ } else {
776	@ n.style.borderBottomWidth = "7px";
	@@ -782,27 +782,26 @@
782	@ t = y-2;
783	@ n.style.position = "absolute";
784	@ n.style.top = t+"px";
785	@ n.style.width = 0;
786	@ n.style.height = "1px";

787	@ n.style.borderWidth = 0;
788	@ n.style.borderStyle = "solid";
789	@ n.style.borderColor = "transparent";
790	@ n.style.borderTopWidth = "2px";
791	@ n.style.borderBottomWidth = "2px";
792	@ if( xFrom<xTo ){
793	@ drawBox(lineClr,xFrom,y,xTo-3,y);
794	@ n.style.left = xTo-3+"px";
795	@ n.style.borderLeftStyle = "inset";
796	@ n.style.borderLeftWidth = "3px";
797	@ n.style.borderLeftColor = "#000";
798	@ }else{
799	@ drawBox(lineClr,xTo+3,y,xFrom,y);
800	@ n.style.left = xTo+1+"px";
801	@ n.style.borderRightStyle = "outset";
802	@ n.style.borderRightWidth = "3px";
803	@ n.style.borderRightColor = "#000";
804	@ }
805	@ cDiv.appendChild(n);
806	@ }
807	@ function drawThinLine(x0,y0,x1,y1){
808	@ drawBox(lineClr,x0,y0,x1,y1);
	@@ -851,16 +850,16 @@
851	@ n.style.position = "absolute";
852	@ n.style.top = t+"px";
853	@ n.style.left = l+"px";
854	@ n.style.width = 0;
855	@ n.style.height = 0;

856	@ n.style.borderWidth = 0;
857	@ n.style.borderStyle = "solid";
858	@ n.style.borderColor = "transparent";
859	@ n.style.borderTopWidth = "3px";
860	@ n.style.borderBottomWidth = "3px";
861	@ n.style.borderLeftStyle = "inset";
862	@ n.style.borderLeftWidth = "7px";
863	@ n.style.borderLeftColor = "#600000";
864	@ cDiv.appendChild(n);
865	@ }
866	@ }
	@@ -1421,11 +1420,11 @@
1421	if( (tmFlags & TIMELINE_UNHIDE)==0 ){
1422	timeline_submenu(&url, "Unhide", "unhide", "", 0);
1423	}
1424	}else{
1425	/* Otherwise, a timeline based on a span of time */
1426	int n;
1427	const char *zEType = "timeline item";
1428	char *zDate;
1429	if( zUses ){
1430	blob_append_sql(&sql, " AND event.objid IN usesfile ");
1431	}
	@@ -1629,20 +1628,38 @@
1629	}
1630	if( zSearch ){
1631	blob_appendf(&desc, " matching \"%h\"", zSearch);
1632	}
1633	if( g.perm.Hyperlink ){
1634	if( zAfter \|\| n==nEntry ){






1635	zDate = db_text(0, "SELECT min(timestamp) FROM timeline /scan/");
1636	timeline_submenu(&url, "Older", "b", zDate, "a");
1637	zOlderButton = fossil_strdup(url_render(&url, "b", zDate, "a", 0));
1638	free(zDate);
1639	}
1640	if( zBefore \|\| (zAfter && n==nEntry) ){
1641	zDate = db_text(0, "SELECT max(timestamp) FROM timeline /scan/");
1642	timeline_submenu(&url, "Newer", "a", zDate, "b");
1643	free(zDate);












1644	}
1645	if( zType[0]=='a' \|\| zType[0]=='c' ){
1646	if( (tmFlags & TIMELINE_UNHIDE)==0 ){
1647	timeline_submenu(&url, "Unhide", "unhide", "", 0);
1648	}
1649

	--- src/timeline.c
	+++ src/timeline.c
	@@ -752,25 +752,25 @@
752	@ }while( obj = obj.offsetParent );
753	@ }
754	@ return left;
755	@ }
756	@ function drawUpArrow(x,y0,y1){
757	@ drawBox(lineClr,x,y0+4,x+1,y1);
758	@ var n = document.createElement("div"),
759	@ l = x-2,
760	@ t = y0;
761	@ n.style.position = "absolute";
762	@ n.style.left = l+"px";
763	@ n.style.top = t+"px";
764	@ n.style.width = 0;
765	@ n.style.height = 0;
766	@ n.style.transform = "scale(.999)";
767	@ n.style.borderWidth = 0;
768	@ n.style.borderStyle = "solid";
769	@ n.style.borderColor = "transparent";
770	@ n.style.borderRightWidth = "3px";
771	@ n.style.borderBottomColor = lineClr;

772	@ n.style.borderLeftWidth = "3px";
773	@ if( y0+10>=y1 ){
774	@ n.style.borderBottomWidth = "5px";
775	@ } else {
776	@ n.style.borderBottomWidth = "7px";
	@@ -782,27 +782,26 @@
782	@ t = y-2;
783	@ n.style.position = "absolute";
784	@ n.style.top = t+"px";
785	@ n.style.width = 0;
786	@ n.style.height = "1px";
787	@ n.style.transform = "scale(.999)";
788	@ n.style.borderWidth = 0;
789	@ n.style.borderStyle = "solid";
790	@ n.style.borderColor = "transparent";
791	@ n.style.borderTopWidth = "2px";
792	@ n.style.borderBottomWidth = "2px";
793	@ if( xFrom<xTo ){
794	@ drawBox(lineClr,xFrom,y,xTo-3,y);
795	@ n.style.left = xTo-3+"px";

796	@ n.style.borderLeftWidth = "3px";
797	@ n.style.borderLeftColor = lineClr;
798	@ }else{
799	@ drawBox(lineClr,xTo+3,y,xFrom,y);
800	@ n.style.left = xTo+1+"px";

801	@ n.style.borderRightWidth = "3px";
802	@ n.style.borderRightColor = lineClr;
803	@ }
804	@ cDiv.appendChild(n);
805	@ }
806	@ function drawThinLine(x0,y0,x1,y1){
807	@ drawBox(lineClr,x0,y0,x1,y1);
	@@ -851,16 +850,16 @@
850	@ n.style.position = "absolute";
851	@ n.style.top = t+"px";
852	@ n.style.left = l+"px";
853	@ n.style.width = 0;
854	@ n.style.height = 0;
855	@ n.style.transform = "scale(.999)";
856	@ n.style.borderWidth = 0;
857	@ n.style.borderStyle = "solid";
858	@ n.style.borderColor = "transparent";
859	@ n.style.borderTopWidth = "3px";
860	@ n.style.borderBottomWidth = "3px";

861	@ n.style.borderLeftWidth = "7px";
862	@ n.style.borderLeftColor = "#600000";
863	@ cDiv.appendChild(n);
864	@ }
865	@ }
	@@ -1421,11 +1420,11 @@
1420	if( (tmFlags & TIMELINE_UNHIDE)==0 ){
1421	timeline_submenu(&url, "Unhide", "unhide", "", 0);
1422	}
1423	}else{
1424	/* Otherwise, a timeline based on a span of time */
1425	int n, nBefore, nAfter;
1426	const char *zEType = "timeline item";
1427	char *zDate;
1428	if( zUses ){
1429	blob_append_sql(&sql, " AND event.objid IN usesfile ");
1430	}
	@@ -1629,20 +1628,38 @@
1628	}
1629	if( zSearch ){
1630	blob_appendf(&desc, " matching \"%h\"", zSearch);
1631	}
1632	if( g.perm.Hyperlink ){
1633	if( zCirca && rCirca ){
1634	nBefore = db_int(0,
1635	"SELECT count(*) FROM timeline WHERE etype!='div'"
1636	" AND sortby<=%f /scan/", rCirca);
1637	nAfter = db_int(0,
1638	"SELECT count(*) FROM timeline WHERE etype!='div'"
1639	" AND sortby>=%f /scan/", rCirca);
1640	zDate = db_text(0, "SELECT min(timestamp) FROM timeline /scan/");
1641	if( nBefore>=nEntry ){
1642	timeline_submenu(&url, "Older", "b", zDate, "c");
1643	zOlderButton = fossil_strdup(url_render(&url, "b", zDate, "c", 0));
1644	}
1645	if( nAfter>=nEntry ){
1646	timeline_submenu(&url, "Newer", "a", zDate, "c");
1647	}
1648	free(zDate);
1649	}else{
1650	if( zAfter \|\| n==nEntry ){
1651	zDate = db_text(0, "SELECT min(timestamp) FROM timeline /scan/");
1652	timeline_submenu(&url, "Older", "b", zDate, "a");
1653	zOlderButton = fossil_strdup(url_render(&url, "b", zDate, "a", 0));
1654	free(zDate);
1655	}
1656	if( zBefore \|\| (zAfter && n==nEntry) ){
1657	zDate = db_text(0, "SELECT max(timestamp) FROM timeline /scan/");
1658	timeline_submenu(&url, "Newer", "a", zDate, "b");
1659	free(zDate);
1660	}
1661	}
1662	if( zType[0]=='a' \|\| zType[0]=='c' ){
1663	if( (tmFlags & TIMELINE_UNHIDE)==0 ){
1664	timeline_submenu(&url, "Unhide", "unhide", "", 0);
1665	}
1666

M src/wikiformat.c

		--- src/wikiformat.c
		+++ src/wikiformat.c
		@@ -1250,10 +1250,12 @@
1250	1250	zTerm = "]</span>";
1251	1251	}
1252	1252	}else if( g.perm.Hyperlink ){
1253	1253	blob_appendf(p->pOut, "%z[",href("%R/info/%s", zTarget));
1254	1254	zTerm = "]</a>";
	1255	+ }else{
	1256	+ zTerm = "";
1255	1257	}
1256	1258	}else if( strlen(zTarget)>=10 && fossil_isdigit(zTarget[0]) && zTarget[4]=='-'
1257	1259	&& db_int(0, "SELECT datetime(%Q) NOT NULL", zTarget) ){
1258	1260	blob_appendf(p->pOut, "<a href=\"%R/timeline?c=%T\">", zTarget);
1259	1261	}else if( (z = validWikiPageName(p, zTarget))!=0 ){
1260	1262

	--- src/wikiformat.c
	+++ src/wikiformat.c
	@@ -1250,10 +1250,12 @@
1250	zTerm = "]</span>";
1251	}
1252	}else if( g.perm.Hyperlink ){
1253	blob_appendf(p->pOut, "%z[",href("%R/info/%s", zTarget));
1254	zTerm = "]</a>";


1255	}
1256	}else if( strlen(zTarget)>=10 && fossil_isdigit(zTarget[0]) && zTarget[4]=='-'
1257	&& db_int(0, "SELECT datetime(%Q) NOT NULL", zTarget) ){
1258	blob_appendf(p->pOut, "<a href=\"%R/timeline?c=%T\">", zTarget);
1259	}else if( (z = validWikiPageName(p, zTarget))!=0 ){
1260

	--- src/wikiformat.c
	+++ src/wikiformat.c
	@@ -1250,10 +1250,12 @@
1250	zTerm = "]</span>";
1251	}
1252	}else if( g.perm.Hyperlink ){
1253	blob_appendf(p->pOut, "%z[",href("%R/info/%s", zTarget));
1254	zTerm = "]</a>";
1255	}else{
1256	zTerm = "";
1257	}
1258	}else if( strlen(zTarget)>=10 && fossil_isdigit(zTarget[0]) && zTarget[4]=='-'
1259	&& db_int(0, "SELECT datetime(%Q) NOT NULL", zTarget) ){
1260	blob_appendf(p->pOut, "<a href=\"%R/timeline?c=%T\">", zTarget);
1261	}else if( (z = validWikiPageName(p, zTarget))!=0 ){
1262

M src/xfersetup.c

+18 -17

		--- src/xfersetup.c
		+++ src/xfersetup.c
		@@ -33,11 +33,11 @@
33	33	return;
34	34	}
35	35
36	36	style_header("Transfer Setup");
37	37
38		- @ <table border="0" cellspacing="20">
	38	+ @ <table class="xfersetup">
39	39	setup_menu_entry("Common", "xfersetup_com",
40	40	"Common TH1 code run before all transfer request processing.");
41	41	setup_menu_entry("Push", "xfersetup_push",
42	42	"Specific TH1 code to run after \"push\" transfer requests.");
43	43	setup_menu_entry("Commit", "xfersetup_commit",
		@@ -60,33 +60,33 @@
60	60	syncFlags = SYNC_PUSH \| SYNC_PULL;
61	61	zButton = "Synchronize";
62	62	zWarning = mprintf("WARNING: Pushing to \"%s\" is enabled.",
63	63	g.url.canonical);
64	64	}
65		- if( P("sync") ){
66		- user_select();
67		- url_enable_proxy(0);
68		- client_sync(syncFlags, 0, 0);
69		- }
70		- @ <p>Press the %h(zButton) button below to synchronize with the
71		- @ "%h(g.url.canonical)" repository now. This may be useful when
72		- @ testing the various transfer scripts.</p>
73		- @ <p>You can use the "http -async" command in your scripts, but
74		- @ make sure the "th1-uri-regexp" setting is set first.</p>
	65	+ @ <p>Press the <strong>%h(zButton)</strong> button below to
	66	+ @ synchronize with the <em>%h(g.url.canonical)</em> repository now.<br/>
	67	+ @ This may be useful when testing the various transfer scripts.</p>
	68	+ @ <p>You can use the <code>http -async</code> command in your scripts, but
	69	+ @ make sure the <code>th1-uri-regexp</code> setting is set first.</p>
75	70	if( zWarning ){
76	71	@
77	72	@ <big><b>%h(zWarning)</b></big>
78	73	free(zWarning);
79	74	}
80	75	@
81		- @ <blockquote>
82	76	@ <form method="post" action="%s(g.zTop)/%s(g.zPath)"><div>
83	77	login_insert_csrf_secret();
84	78	@ <input type="submit" name="sync" value="%h(zButton)" />
85	79	@ </div></form>
86		- @ </blockquote>
87	80	@
	81	+ if( P("sync") ){
	82	+ user_select();
	83	+ url_enable_proxy(0);
	84	+ @ <pre class="xfersetup">
	85	+ client_sync(syncFlags, 0, 0);
	86	+ @ </pre>
	87	+ }
88	88	}
89	89
90	90	style_footer();
91	91	}
92	92
		@@ -137,18 +137,18 @@
137	137	}
138	138	@ <form action="%s(g.zTop)/%s(g.zPath)" method="post"><div>
139	139	login_insert_csrf_secret();
140	140	@ <p>%s(zDesc)</p>
141	141	@ <textarea name="x" rows="%d(height)" cols="80">%h(z)</textarea>
142		- @ <blockquote><p>
	142	+ @ <p>
143	143	@ <input type="submit" name="submit" value="Apply Changes" />
144	144	@ <input type="submit" name="clear" value="Revert To Default" />
145	145	@ <input type="submit" name="setup" value="Cancel" />
146		- @ </p></blockquote>
	146	+ @ </p>
147	147	@ </div></form>
148		- @ <hr />
149	148	if ( zDfltValue ){
	149	+ @ <hr />
150	150	@ <h2>Default %s(zTitle)</h2>
151	151	@ <blockquote><pre>
152	152	@ %h(zDfltValue)
153	153	@ </pre></blockquote>
154	154	}
		@@ -181,11 +181,12 @@
181	181	/*
182	182	** WEBPAGE: xfersetup_push
183	183	*/
184	184	void xfersetup_push_page(void){
185	185	static const char zDesc[] =
186		- @ Enter TH1 script that runs after processing "push" transfer requests.
	186	+ @ Enter TH1 script that runs after processing <strong>push</strong>
	187	+ @ transfer requests.
187	188	;
188	189	xfersetup_generic(
189	190	"Transfer Push Script",
190	191	"xfer-push-script",
191	192	zDefaultXferPush,
192	193
193	194	ADDED test/fileStat.th1

	--- src/xfersetup.c
	+++ src/xfersetup.c
	@@ -33,11 +33,11 @@
33	return;
34	}
35
36	style_header("Transfer Setup");
37
38	@ <table border="0" cellspacing="20">
39	setup_menu_entry("Common", "xfersetup_com",
40	"Common TH1 code run before all transfer request processing.");
41	setup_menu_entry("Push", "xfersetup_push",
42	"Specific TH1 code to run after \"push\" transfer requests.");
43	setup_menu_entry("Commit", "xfersetup_commit",
	@@ -60,33 +60,33 @@
60	syncFlags = SYNC_PUSH \| SYNC_PULL;
61	zButton = "Synchronize";
62	zWarning = mprintf("WARNING: Pushing to \"%s\" is enabled.",
63	g.url.canonical);
64	}
65	if( P("sync") ){
66	user_select();
67	url_enable_proxy(0);
68	client_sync(syncFlags, 0, 0);
69	}
70	@ <p>Press the %h(zButton) button below to synchronize with the
71	@ "%h(g.url.canonical)" repository now. This may be useful when
72	@ testing the various transfer scripts.</p>
73	@ <p>You can use the "http -async" command in your scripts, but
74	@ make sure the "th1-uri-regexp" setting is set first.</p>
75	if( zWarning ){
76	@
77	@ <big><b>%h(zWarning)</b></big>
78	free(zWarning);
79	}
80	@
81	@ <blockquote>
82	@ <form method="post" action="%s(g.zTop)/%s(g.zPath)"><div>
83	login_insert_csrf_secret();
84	@ <input type="submit" name="sync" value="%h(zButton)" />
85	@ </div></form>
86	@ </blockquote>
87	@







88	}
89
90	style_footer();
91	}
92
	@@ -137,18 +137,18 @@
137	}
138	@ <form action="%s(g.zTop)/%s(g.zPath)" method="post"><div>
139	login_insert_csrf_secret();
140	@ <p>%s(zDesc)</p>
141	@ <textarea name="x" rows="%d(height)" cols="80">%h(z)</textarea>
142	@ <blockquote><p>
143	@ <input type="submit" name="submit" value="Apply Changes" />
144	@ <input type="submit" name="clear" value="Revert To Default" />
145	@ <input type="submit" name="setup" value="Cancel" />
146	@ </p></blockquote>
147	@ </div></form>
148	@ <hr />
149	if ( zDfltValue ){

150	@ <h2>Default %s(zTitle)</h2>
151	@ <blockquote><pre>
152	@ %h(zDfltValue)
153	@ </pre></blockquote>
154	}
	@@ -181,11 +181,12 @@
181	/*
182	** WEBPAGE: xfersetup_push
183	*/
184	void xfersetup_push_page(void){
185	static const char zDesc[] =
186	@ Enter TH1 script that runs after processing "push" transfer requests.

187	;
188	xfersetup_generic(
189	"Transfer Push Script",
190	"xfer-push-script",
191	zDefaultXferPush,
192
193	DDED test/fileStat.th1

	--- src/xfersetup.c
	+++ src/xfersetup.c
	@@ -33,11 +33,11 @@
33	return;
34	}
35
36	style_header("Transfer Setup");
37
38	@ <table class="xfersetup">
39	setup_menu_entry("Common", "xfersetup_com",
40	"Common TH1 code run before all transfer request processing.");
41	setup_menu_entry("Push", "xfersetup_push",
42	"Specific TH1 code to run after \"push\" transfer requests.");
43	setup_menu_entry("Commit", "xfersetup_commit",
	@@ -60,33 +60,33 @@
60	syncFlags = SYNC_PUSH \| SYNC_PULL;
61	zButton = "Synchronize";
62	zWarning = mprintf("WARNING: Pushing to \"%s\" is enabled.",
63	g.url.canonical);
64	}
65	@ <p>Press the <strong>%h(zButton)</strong> button below to
66	@ synchronize with the <em>%h(g.url.canonical)</em> repository now.<br/>
67	@ This may be useful when testing the various transfer scripts.</p>
68	@ <p>You can use the <code>http -async</code> command in your scripts, but
69	@ make sure the <code>th1-uri-regexp</code> setting is set first.</p>





70	if( zWarning ){
71	@
72	@ <big><b>%h(zWarning)</b></big>
73	free(zWarning);
74	}
75	@

76	@ <form method="post" action="%s(g.zTop)/%s(g.zPath)"><div>
77	login_insert_csrf_secret();
78	@ <input type="submit" name="sync" value="%h(zButton)" />
79	@ </div></form>

80	@
81	if( P("sync") ){
82	user_select();
83	url_enable_proxy(0);
84	@ <pre class="xfersetup">
85	client_sync(syncFlags, 0, 0);
86	@ </pre>
87	}
88	}
89
90	style_footer();
91	}
92
	@@ -137,18 +137,18 @@
137	}
138	@ <form action="%s(g.zTop)/%s(g.zPath)" method="post"><div>
139	login_insert_csrf_secret();
140	@ <p>%s(zDesc)</p>
141	@ <textarea name="x" rows="%d(height)" cols="80">%h(z)</textarea>
142	@ <p>
143	@ <input type="submit" name="submit" value="Apply Changes" />
144	@ <input type="submit" name="clear" value="Revert To Default" />
145	@ <input type="submit" name="setup" value="Cancel" />
146	@ </p>
147	@ </div></form>

148	if ( zDfltValue ){
149	@ <hr />
150	@ <h2>Default %s(zTitle)</h2>
151	@ <blockquote><pre>
152	@ %h(zDfltValue)
153	@ </pre></blockquote>
154	}
	@@ -181,11 +181,12 @@
181	/*
182	** WEBPAGE: xfersetup_push
183	*/
184	void xfersetup_push_page(void){
185	static const char zDesc[] =
186	@ Enter TH1 script that runs after processing <strong>push</strong>
187	@ transfer requests.
188	;
189	xfersetup_generic(
190	"Transfer Push Script",
191	"xfer-push-script",
192	zDefaultXferPush,
193
194	DDED test/fileStat.th1

M test/fileStat.th1

+29

		--- a/test/fileStat.th1
		+++ b/test/fileStat.th1
		@@ -0,0 +1,29 @@
	1	+<th1>
	2	+ proc doSomeTclSetup {} {
	3	+ #
	4	+ # NOTE: Copy repository file name to the Tcl interpreter. This is
	5	+ # done first (once) because it will be necessary for almost
	6	+ # everything else later on.
	7	+ #
	8	+ tclInvoke set repository [repository]
	9	+
	10	+ #
	11	+ # NOTE: Create some procedures in the Tcl interpreter to perform
	12	+ # useful operations. This could also do things like load
	13	+ # packages, etc.
	14	+ #
	15	+ tclEval {
	16	+ #
	17	+ # NOTE: Returns an [exec] command for Fossil, using the provided
	18	+ # sub-command and arguments, suitable for use with [eval]
	19	+ # or [catch].
	20	+ #
	21	+ proc getFossilCommand { repository user args } {
	22	+ global env
	23	+
	24	+ lappend result exec [info nameofexecutable]
	25	+
	26	+ if {[info exists env(GATEWAY_INTERFACE)]} then {
	27	+ #
	28	+ # NOTE: This option is required when calling
	29	+ # out to

	--- a/test/fileStat.th1
	+++ b/test/fileStat.th1
	@@ -0,0 +1,29 @@

	--- a/test/fileStat.th1
	+++ b/test/fileStat.th1
	@@ -0,0 +1,29 @@
1	<th1>
2	proc doSomeTclSetup {} {
3	#
4	# NOTE: Copy repository file name to the Tcl interpreter. This is
5	# done first (once) because it will be necessary for almost
6	# everything else later on.
7	#
8	tclInvoke set repository [repository]
9
10	#
11	# NOTE: Create some procedures in the Tcl interpreter to perform
12	# useful operations. This could also do things like load
13	# packages, etc.
14	#
15	tclEval {
16	#
17	# NOTE: Returns an [exec] command for Fossil, using the provided
18	# sub-command and arguments, suitable for use with [eval]
19	# or [catch].
20	#
21	proc getFossilCommand { repository user args } {
22	global env
23
24	lappend result exec [info nameofexecutable]
25
26	if {[info exists env(GATEWAY_INTERFACE)]} then {
27	#
28	# NOTE: This option is required when calling
29	# out to

M test/tester.tcl

+66

		--- test/tester.tcl
		+++ test/tester.tcl
		@@ -328,10 +328,76 @@
328	328	}
329	329	append out \n$line
330	330	}
331	331	return [string range $out 1 end]
332	332	}
	333	+
	334	+# Executes the "fossil http" command. The entire content of the HTTP request
	335	+# is read from the data file name, with [subst] being performed on it prior to
	336	+# submission. Temporary input and output files are created and deleted. The
	337	+# result will be the contents of the temoprary output file.
	338	+proc test_fossil_http { repository dataFileName url } {
	339	+ set suffix [appendArgs [pid] - [getSeqNo] - [clock seconds] .txt]
	340	+ set inFileName [file join $::tempPath [appendArgs test-http-in- $suffix]]
	341	+ set outFileName [file join $::tempPath [appendArgs test-http-out- $suffix]]
	342	+ set data [subst [read_file $dataFileName]]
	343	+
	344	+ write_file $inFileName $data
	345	+ fossil http $inFileName $outFileName 127.0.0.1 $repository --localauth
	346	+ set result [expr {[file exists $outFileName] ? [read_file $outFileName] : ""}]
	347	+
	348	+ if {1} then {
	349	+ catch {file delete $inFileName}
	350	+ catch {file delete $outFileName}
	351	+ }
	352	+
	353	+ return $result
	354	+}
	355	+
	356	+# obtains and increments a "sequence number" for this test run.
	357	+proc getSeqNo {} {
	358	+ upvar #0 seqNo seqNo
	359	+ if {![info exists seqNo]} {
	360	+ set seqNo 0
	361	+ }
	362	+ return [incr seqNo]
	363	+}
	364	+
	365	+# fixup the whitespace in the result to make it easier to compare.
	366	+proc normalize_result {} {
	367	+ return [string map [list \r\n \n] [string trim $::RESULT]]
	368	+}
	369	+
	370	+# returns the first line of the normalized result.
	371	+proc first_data_line {} {
	372	+ return [lindex [split [normalize_result] \n] 0]
	373	+}
	374	+
	375	+# returns the second line of the normalized result.
	376	+proc second_data_line {} {
	377	+ return [lindex [split [normalize_result] \n] 1]
	378	+}
	379	+
	380	+# returns the third line of the normalized result.
	381	+proc third_data_line {} {
	382	+ return [lindex [split [normalize_result] \n] 2]
	383	+}
	384	+
	385	+# returns the last line of the normalized result.
	386	+proc last_data_line {} {
	387	+ return [lindex [split [normalize_result] \n] end]
	388	+}
	389	+
	390	+# returns the second to last line of the normalized result.
	391	+proc next_to_last_data_line {} {
	392	+ return [lindex [split [normalize_result] \n] end-1]
	393	+}
	394	+
	395	+# returns the third to last line of the normalized result.
	396	+proc third_to_last_data_line {} {
	397	+ return [lindex [split [normalize_result] \n] end-2]
	398	+}
333	399
334	400	protInit $fossilexe
335	401	foreach testfile $argv {
336	402	set dir [file root [file tail $testfile]]
337	403	file delete -force $dir
338	404
339	405	ADDED test/th1-docs-input.txt
340	406	ADDED test/th1-docs.test

	--- test/tester.tcl
	+++ test/tester.tcl
	@@ -328,10 +328,76 @@
328	}
329	append out \n$line
330	}
331	return [string range $out 1 end]
332	}


































































333
334	protInit $fossilexe
335	foreach testfile $argv {
336	set dir [file root [file tail $testfile]]
337	file delete -force $dir
338
339	DDED test/th1-docs-input.txt
340	DDED test/th1-docs.test

	--- test/tester.tcl
	+++ test/tester.tcl
	@@ -328,10 +328,76 @@
328	}
329	append out \n$line
330	}
331	return [string range $out 1 end]
332	}
333
334	# Executes the "fossil http" command. The entire content of the HTTP request
335	# is read from the data file name, with [subst] being performed on it prior to
336	# submission. Temporary input and output files are created and deleted. The
337	# result will be the contents of the temoprary output file.
338	proc test_fossil_http { repository dataFileName url } {
339	set suffix [appendArgs [pid] - [getSeqNo] - [clock seconds] .txt]
340	set inFileName [file join $::tempPath [appendArgs test-http-in- $suffix]]
341	set outFileName [file join $::tempPath [appendArgs test-http-out- $suffix]]
342	set data [subst [read_file $dataFileName]]
343
344	write_file $inFileName $data
345	fossil http $inFileName $outFileName 127.0.0.1 $repository --localauth
346	set result [expr {[file exists $outFileName] ? [read_file $outFileName] : ""}]
347
348	if {1} then {
349	catch {file delete $inFileName}
350	catch {file delete $outFileName}
351	}
352
353	return $result
354	}
355
356	# obtains and increments a "sequence number" for this test run.
357	proc getSeqNo {} {
358	upvar #0 seqNo seqNo
359	if {![info exists seqNo]} {
360	set seqNo 0
361	}
362	return [incr seqNo]
363	}
364
365	# fixup the whitespace in the result to make it easier to compare.
366	proc normalize_result {} {
367	return [string map [list \r\n \n] [string trim $::RESULT]]
368	}
369
370	# returns the first line of the normalized result.
371	proc first_data_line {} {
372	return [lindex [split [normalize_result] \n] 0]
373	}
374
375	# returns the second line of the normalized result.
376	proc second_data_line {} {
377	return [lindex [split [normalize_result] \n] 1]
378	}
379
380	# returns the third line of the normalized result.
381	proc third_data_line {} {
382	return [lindex [split [normalize_result] \n] 2]
383	}
384
385	# returns the last line of the normalized result.
386	proc last_data_line {} {
387	return [lindex [split [normalize_result] \n] end]
388	}
389
390	# returns the second to last line of the normalized result.
391	proc next_to_last_data_line {} {
392	return [lindex [split [normalize_result] \n] end-1]
393	}
394
395	# returns the third to last line of the normalized result.
396	proc third_to_last_data_line {} {
397	return [lindex [split [normalize_result] \n] end-2]
398	}
399
400	protInit $fossilexe
401	foreach testfile $argv {
402	set dir [file root [file tail $testfile]]
403	file delete -force $dir
404
405	DDED test/th1-docs-input.txt
406	DDED test/th1-docs.test

M test/th1-docs-input.txt

		--- a/test/th1-docs-input.txt
		+++ b/test/th1-docs-input.txt
		@@ -0,0 +1,4 @@
	1	+GET ${url} HTTP/1.1
	2	+Host: localhost
	3	+User-Agent: Fossil
	4	+

	--- a/test/th1-docs-input.txt
	+++ b/test/th1-docs-input.txt
	@@ -0,0 +1,4 @@

	--- a/test/th1-docs-input.txt
	+++ b/test/th1-docs-input.txt
	@@ -0,0 +1,4 @@
1	GET ${url} HTTP/1.1
2	Host: localhost
3	User-Agent: Fossil
4

M test/th1-docs.test

		--- a/test/th1-docs.test
		+++ b/test/th1-docs.test
		@@ -0,0 +1 @@
	1	+thenthenthenset data [fossil info]

	--- a/test/th1-docs.test
	+++ b/test/th1-docs.test
	@@ -0,0 +1 @@

	--- a/test/th1-docs.test
	+++ b/test/th1-docs.test
	@@ -0,0 +1 @@
1	thenthenthenset data [fossil info]

M test/th1-hooks.test

+44 -53

		--- test/th1-hooks.test
		+++ test/th1-hooks.test
		@@ -28,50 +28,10 @@
28	28
29	29	set env(TH1_ENABLE_HOOKS) 1; # TH1 hooks must be enabled for this test.
30	30
31	31	###############################################################################
32	32
33		-proc fossil_th1_hook_http { repository url } {
34		- set suffix [appendArgs [pid] - [clock seconds] .txt]
35		- set inFileName [file join $::tempPath [appendArgs test-http-in- $suffix]]
36		- set outFileName [file join $::tempPath [appendArgs test-http-out- $suffix]]
37		- set data [subst [read_file [file join $::testdir th1-hooks-input.txt]]]
38		-
39		- write_file $inFileName $data
40		- fossil http $repository $inFileName $outFileName 127.0.0.1
41		- set result [expr {[file exists $outFileName] ? [read_file $outFileName] : ""}]
42		-
43		- if {1} then {
44		- catch {file delete $inFileName}
45		- catch {file delete $outFileName}
46		- }
47		-
48		- return $result
49		-}
50		-
51		-proc first_data_line {} {
52		- return [lindex [split [string trim $::RESULT] \r\n] 0]
53		-}
54		-
55		-proc second_data_line {} {
56		- return [lindex [split [string trim $::RESULT] \r\n] 1]
57		-}
58		-
59		-proc third_data_line {} {
60		- return [lindex [split [string trim $::RESULT] \r\n] 2]
61		-}
62		-
63		-proc last_data_line {} {
64		- return [lindex [split [string trim $::RESULT] \r\n] end]
65		-}
66		-
67		-proc next_to_last_data_line {} {
68		- return [lindex [split [string trim $::RESULT] \r\n] end-1]
69		-}
70		-
71		-###############################################################################
72		-
73	33	set testTh1Setup {
74	34	proc initialize_hook_log {} {
75	35	if {![info exists ::hook_log]} {
76	36	set ::hook_log ""
77	37	}
		@@ -103,13 +63,18 @@
103	63	break "TH_BREAK return code"
104	64	} elseif {$::cmd_name eq "test4"} {
105	65	emit_hook_log
106	66	return -code 2 "TH_RETURN return code"
107	67	} elseif {$::cmd_name eq "timeline"} {
108		- if {$::cmd_args eq "custom"} {
	68	+ set length [llength $::cmd_args]
	69	+ set length [expr {$length - 1}]
	70	+ if {[lindex $::cmd_args $length] eq "custom"} {
109	71	emit_hook_log
110	72	return "custom timeline"
	73	+ } elseif {[lindex $::cmd_args $length] eq "now"} {
	74	+ emit_hook_log
	75	+ return "now timeline"
111	76	} else {
112	77	emit_hook_log
113	78	error "unsupported timeline"
114	79	}
115	80	}
		@@ -139,63 +104,89 @@
139	104	regexp -line -- {^repository: (.*)$} $data dummy repository
140	105
141	106	if {[string length $repository] == 0 \|\| ![file exists $repository]} then {
142	107	error "unable to locate repository"
143	108	}
	109	+
	110	+set dataFileName [file join $::testdir th1-hooks-input.txt]
144	111
145	112	###############################################################################
146	113
147	114	saveTh1SetupFile; writeTh1SetupFile $testTh1Setup
148	115
149	116	###############################################################################
150	117
151	118	fossil timeline custom; # NOTE: Bad "WHEN" argument.
152		-test th1-cmd-hooks-1a {[string map [list \r\n \n] [string trim $RESULT]] eq {<h1><b>command_hook timeline</b></h1>
153		-ERROR: unsupported timeline
	119	+test th1-cmd-hooks-1a {[normalize_result] eq \
	120	+{<h1><b>command_hook timeline</b></h1>
154	121	+++ no more data (0) +++
155	122
156	123	<h1><b>command_hook timeline command_notify timeline</b></h1>}}
157	124
158	125	###############################################################################
159	126
160	127	fossil timeline
161		-test th1-cmd-hooks-2a {[first_data_line] eq {<h1><b>command_hook timeline</b></h1>}}
	128	+test th1-cmd-hooks-2a {[first_data_line] eq \
	129	+ {<h1><b>command_hook timeline</b></h1>}}
	130	+
162	131	test th1-cmd-hooks-2b {[second_data_line] eq {ERROR: unsupported timeline}}
163		-test th1-cmd-hooks-2c {[regexp -- {=== \d{4}-\d{2}-\d{2} ===} [third_data_line]]}
164		-test th1-cmd-hooks-2d {[last_data_line] eq {<h1><b>command_hook timeline command_notify timeline</b></h1>}}
	132	+
	133	+###############################################################################
	134	+
	135	+fossil timeline now
	136	+test th1-cmd-hooks-3a {[first_data_line] eq \
	137	+ {<h1><b>command_hook timeline</b></h1>}}
	138	+
	139	+test th1-cmd-hooks-3b \
	140	+ {[regexp -- {=== \d{4}-\d{2}-\d{2} ===} [second_data_line]]}
	141	+
	142	+test th1-cmd-hooks-3c \
	143	+ {[regexp -- {--- line limit $\d+$ reached ---} [third_to_last_data_line]]}
	144	+
	145	+test th1-cmd-hooks-3d {[last_data_line] eq \
	146	+ {<h1><b>command_hook timeline command_notify timeline</b></h1>}}
165	147
166	148	###############################################################################
167	149
168	150	fossil test1
169	151	test th1-custom-cmd-1a {[next_to_last_data_line] eq $repository}
170		-test th1-custom-cmd-1b {[last_data_line] eq {<h1><b>command_hook test1 command_notify test1</b></h1>}}
	152	+
	153	+test th1-custom-cmd-1b {[last_data_line] eq \
	154	+ {<h1><b>command_hook test1 command_notify test1</b></h1>}}
171	155
172	156	###############################################################################
173	157
174	158	fossil test2
175	159	test th1-custom-cmd-2a {[first_data_line] eq {ERROR: unsupported command}}
176	160
177	161	###############################################################################
178	162
179	163	fossil test3
180		-test th1-custom-cmd-3a {[string trim $RESULT] eq {<h1><b>command_hook test3</b></h1>}}
	164	+test th1-custom-cmd-3a {[string trim $RESULT] eq \
	165	+ {<h1><b>command_hook test3</b></h1>}}
181	166
182	167	###############################################################################
183	168
184	169	fossil test4
185		-test th1-custom-cmd-4a {[string trim $RESULT] eq {<h1><b>command_hook test4</b></h1>}}
	170	+test th1-custom-cmd-4a {[string trim $RESULT] eq \
	171	+ {<h1><b>command_hook test4</b></h1>}}
186	172
187	173	###############################################################################
188	174
189		-set RESULT [fossil_th1_hook_http $repository /timeline]
	175	+set RESULT [test_fossil_http $repository $dataFileName /timeline]
190	176	test th1-web-hooks-1a {[regexp {<title>Fossil: Timeline</title>} $RESULT]}
191		-test th1-web-hooks-1b {[regexp {<h1><b>command_hook http webpage_hook timeline webpage_notify timeline</b></h1>} $RESULT]}
	177	+
	178	+test th1-web-hooks-1b {[regexp [appendArgs \
	179	+ {<h1><b>command_hook http webpage_hook timeline} " " \
	180	+ {webpage_notify timeline</b></h1>}] $RESULT]}
192	181
193	182	###############################################################################
194	183
195		-set RESULT [fossil_th1_hook_http $repository /test1]
	184	+set RESULT [test_fossil_http $repository $dataFileName /test1]
196	185	test th1-custom-web-1a {[next_to_last_data_line] eq $repository}
197		-test th1-custom-web-1b {[last_data_line] eq {<h1><b>command_hook http webpage_hook test1 webpage_notify test1</b></h1>}}
	186	+
	187	+test th1-custom-web-1b {[last_data_line] eq \
	188	+ {<h1><b>command_hook http webpage_hook test1 webpage_notify test1</b></h1>}}
198	189
199	190	###############################################################################
200	191
201	192	restoreTh1SetupFile
202	193

	--- test/th1-hooks.test
	+++ test/th1-hooks.test
	@@ -28,50 +28,10 @@
28
29	set env(TH1_ENABLE_HOOKS) 1; # TH1 hooks must be enabled for this test.
30
31	###############################################################################
32
33	proc fossil_th1_hook_http { repository url } {
34	set suffix [appendArgs [pid] - [clock seconds] .txt]
35	set inFileName [file join $::tempPath [appendArgs test-http-in- $suffix]]
36	set outFileName [file join $::tempPath [appendArgs test-http-out- $suffix]]
37	set data [subst [read_file [file join $::testdir th1-hooks-input.txt]]]
38
39	write_file $inFileName $data
40	fossil http $repository $inFileName $outFileName 127.0.0.1
41	set result [expr {[file exists $outFileName] ? [read_file $outFileName] : ""}]
42
43	if {1} then {
44	catch {file delete $inFileName}
45	catch {file delete $outFileName}
46	}
47
48	return $result
49	}
50
51	proc first_data_line {} {
52	return [lindex [split [string trim $::RESULT] \r\n] 0]
53	}
54
55	proc second_data_line {} {
56	return [lindex [split [string trim $::RESULT] \r\n] 1]
57	}
58
59	proc third_data_line {} {
60	return [lindex [split [string trim $::RESULT] \r\n] 2]
61	}
62
63	proc last_data_line {} {
64	return [lindex [split [string trim $::RESULT] \r\n] end]
65	}
66
67	proc next_to_last_data_line {} {
68	return [lindex [split [string trim $::RESULT] \r\n] end-1]
69	}
70
71	###############################################################################
72
73	set testTh1Setup {
74	proc initialize_hook_log {} {
75	if {![info exists ::hook_log]} {
76	set ::hook_log ""
77	}
	@@ -103,13 +63,18 @@
103	break "TH_BREAK return code"
104	} elseif {$::cmd_name eq "test4"} {
105	emit_hook_log
106	return -code 2 "TH_RETURN return code"
107	} elseif {$::cmd_name eq "timeline"} {
108	if {$::cmd_args eq "custom"} {


109	emit_hook_log
110	return "custom timeline"



111	} else {
112	emit_hook_log
113	error "unsupported timeline"
114	}
115	}
	@@ -139,63 +104,89 @@
139	regexp -line -- {^repository: (.*)$} $data dummy repository
140
141	if {[string length $repository] == 0 \|\| ![file exists $repository]} then {
142	error "unable to locate repository"
143	}


144
145	###############################################################################
146
147	saveTh1SetupFile; writeTh1SetupFile $testTh1Setup
148
149	###############################################################################
150
151	fossil timeline custom; # NOTE: Bad "WHEN" argument.
152	test th1-cmd-hooks-1a {[string map [list \r\n \n] [string trim $RESULT]] eq {<h1><b>command_hook timeline</b></h1>
153	ERROR: unsupported timeline
154	+++ no more data (0) +++
155
156	<h1><b>command_hook timeline command_notify timeline</b></h1>}}
157
158	###############################################################################
159
160	fossil timeline
161	test th1-cmd-hooks-2a {[first_data_line] eq {<h1><b>command_hook timeline</b></h1>}}


162	test th1-cmd-hooks-2b {[second_data_line] eq {ERROR: unsupported timeline}}
163	test th1-cmd-hooks-2c {[regexp -- {=== \d{4}-\d{2}-\d{2} ===} [third_data_line]]}
164	test th1-cmd-hooks-2d {[last_data_line] eq {<h1><b>command_hook timeline command_notify timeline</b></h1>}}













165
166	###############################################################################
167
168	fossil test1
169	test th1-custom-cmd-1a {[next_to_last_data_line] eq $repository}
170	test th1-custom-cmd-1b {[last_data_line] eq {<h1><b>command_hook test1 command_notify test1</b></h1>}}


171
172	###############################################################################
173
174	fossil test2
175	test th1-custom-cmd-2a {[first_data_line] eq {ERROR: unsupported command}}
176
177	###############################################################################
178
179	fossil test3
180	test th1-custom-cmd-3a {[string trim $RESULT] eq {<h1><b>command_hook test3</b></h1>}}

181
182	###############################################################################
183
184	fossil test4
185	test th1-custom-cmd-4a {[string trim $RESULT] eq {<h1><b>command_hook test4</b></h1>}}

186
187	###############################################################################
188
189	set RESULT [fossil_th1_hook_http $repository /timeline]
190	test th1-web-hooks-1a {[regexp {<title>Fossil: Timeline</title>} $RESULT]}
191	test th1-web-hooks-1b {[regexp {<h1><b>command_hook http webpage_hook timeline webpage_notify timeline</b></h1>} $RESULT]}



192
193	###############################################################################
194
195	set RESULT [fossil_th1_hook_http $repository /test1]
196	test th1-custom-web-1a {[next_to_last_data_line] eq $repository}
197	test th1-custom-web-1b {[last_data_line] eq {<h1><b>command_hook http webpage_hook test1 webpage_notify test1</b></h1>}}


198
199	###############################################################################
200
201	restoreTh1SetupFile
202

	--- test/th1-hooks.test
	+++ test/th1-hooks.test
	@@ -28,50 +28,10 @@
28
29	set env(TH1_ENABLE_HOOKS) 1; # TH1 hooks must be enabled for this test.
30
31	###############################################################################
32








































33	set testTh1Setup {
34	proc initialize_hook_log {} {
35	if {![info exists ::hook_log]} {
36	set ::hook_log ""
37	}
	@@ -103,13 +63,18 @@
63	break "TH_BREAK return code"
64	} elseif {$::cmd_name eq "test4"} {
65	emit_hook_log
66	return -code 2 "TH_RETURN return code"
67	} elseif {$::cmd_name eq "timeline"} {
68	set length [llength $::cmd_args]
69	set length [expr {$length - 1}]
70	if {[lindex $::cmd_args $length] eq "custom"} {
71	emit_hook_log
72	return "custom timeline"
73	} elseif {[lindex $::cmd_args $length] eq "now"} {
74	emit_hook_log
75	return "now timeline"
76	} else {
77	emit_hook_log
78	error "unsupported timeline"
79	}
80	}
	@@ -139,63 +104,89 @@
104	regexp -line -- {^repository: (.*)$} $data dummy repository
105
106	if {[string length $repository] == 0 \|\| ![file exists $repository]} then {
107	error "unable to locate repository"
108	}
109
110	set dataFileName [file join $::testdir th1-hooks-input.txt]
111
112	###############################################################################
113
114	saveTh1SetupFile; writeTh1SetupFile $testTh1Setup
115
116	###############################################################################
117
118	fossil timeline custom; # NOTE: Bad "WHEN" argument.
119	test th1-cmd-hooks-1a {[normalize_result] eq \
120	{<h1><b>command_hook timeline</b></h1>
121	+++ no more data (0) +++
122
123	<h1><b>command_hook timeline command_notify timeline</b></h1>}}
124
125	###############################################################################
126
127	fossil timeline
128	test th1-cmd-hooks-2a {[first_data_line] eq \
129	{<h1><b>command_hook timeline</b></h1>}}
130
131	test th1-cmd-hooks-2b {[second_data_line] eq {ERROR: unsupported timeline}}
132
133	###############################################################################
134
135	fossil timeline now
136	test th1-cmd-hooks-3a {[first_data_line] eq \
137	{<h1><b>command_hook timeline</b></h1>}}
138
139	test th1-cmd-hooks-3b \
140	{[regexp -- {=== \d{4}-\d{2}-\d{2} ===} [second_data_line]]}
141
142	test th1-cmd-hooks-3c \
143	{[regexp -- {--- line limit $\d+$ reached ---} [third_to_last_data_line]]}
144
145	test th1-cmd-hooks-3d {[last_data_line] eq \
146	{<h1><b>command_hook timeline command_notify timeline</b></h1>}}
147
148	###############################################################################
149
150	fossil test1
151	test th1-custom-cmd-1a {[next_to_last_data_line] eq $repository}
152
153	test th1-custom-cmd-1b {[last_data_line] eq \
154	{<h1><b>command_hook test1 command_notify test1</b></h1>}}
155
156	###############################################################################
157
158	fossil test2
159	test th1-custom-cmd-2a {[first_data_line] eq {ERROR: unsupported command}}
160
161	###############################################################################
162
163	fossil test3
164	test th1-custom-cmd-3a {[string trim $RESULT] eq \
165	{<h1><b>command_hook test3</b></h1>}}
166
167	###############################################################################
168
169	fossil test4
170	test th1-custom-cmd-4a {[string trim $RESULT] eq \
171	{<h1><b>command_hook test4</b></h1>}}
172
173	###############################################################################
174
175	set RESULT [test_fossil_http $repository $dataFileName /timeline]
176	test th1-web-hooks-1a {[regexp {<title>Fossil: Timeline</title>} $RESULT]}
177
178	test th1-web-hooks-1b {[regexp [appendArgs \
179	{<h1><b>command_hook http webpage_hook timeline} " " \
180	{webpage_notify timeline</b></h1>}] $RESULT]}
181
182	###############################################################################
183
184	set RESULT [test_fossil_http $repository $dataFileName /test1]
185	test th1-custom-web-1a {[next_to_last_data_line] eq $repository}
186
187	test th1-custom-web-1b {[last_data_line] eq \
188	{<h1><b>command_hook http webpage_hook test1 webpage_notify test1</b></h1>}}
189
190	###############################################################################
191
192	restoreTh1SetupFile
193

M win/Makefile.mingw

+12 -4

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -146,11 +146,11 @@
146	146	#### The directories where the OpenSSL include and library files are located.
147	147	# The recommended usage here is to use the Sysinternals junction tool
148	148	# to create a hard link between an "openssl-1.x" sub-directory of the
149	149	# Fossil source code directory and the target OpenSSL source directory.
150	150	#
151		-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2
	151	+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2a
152	152	OPENSSLINCDIR = $(OPENSSLDIR)/include
153	153	OPENSSLLIBDIR = $(OPENSSLDIR)
154	154
155	155	#### Either the directory where the Tcl library is installed or the Tcl
156	156	# source code directory resides (depending on the value of the macro
		@@ -488,25 +488,33 @@
488	488
489	489	EXTRA_FILES = \
490	490	$(SRCDIR)/../skins/black_and_white/css.txt \
491	491	$(SRCDIR)/../skins/black_and_white/footer.txt \
492	492	$(SRCDIR)/../skins/black_and_white/header.txt \
	493	+ $(SRCDIR)/../skins/blitz/css.txt \
	494	+ $(SRCDIR)/../skins/blitz/footer.txt \
	495	+ $(SRCDIR)/../skins/blitz/header.txt \
	496	+ $(SRCDIR)/../skins/blitz/ticket.txt \
	497	+ $(SRCDIR)/../skins/blitz_no_logo/css.txt \
	498	+ $(SRCDIR)/../skins/blitz_no_logo/footer.txt \
	499	+ $(SRCDIR)/../skins/blitz_no_logo/header.txt \
	500	+ $(SRCDIR)/../skins/blitz_no_logo/ticket.txt \
493	501	$(SRCDIR)/../skins/default/css.txt \
494	502	$(SRCDIR)/../skins/default/footer.txt \
495	503	$(SRCDIR)/../skins/default/header.txt \
496	504	$(SRCDIR)/../skins/eagle/css.txt \
497	505	$(SRCDIR)/../skins/eagle/footer.txt \
498	506	$(SRCDIR)/../skins/eagle/header.txt \
499	507	$(SRCDIR)/../skins/enhanced1/css.txt \
500	508	$(SRCDIR)/../skins/enhanced1/footer.txt \
501	509	$(SRCDIR)/../skins/enhanced1/header.txt \
502		- $(SRCDIR)/../skins/etienne1/css.txt \
503		- $(SRCDIR)/../skins/etienne1/footer.txt \
504		- $(SRCDIR)/../skins/etienne1/header.txt \
505	510	$(SRCDIR)/../skins/khaki/css.txt \
506	511	$(SRCDIR)/../skins/khaki/footer.txt \
507	512	$(SRCDIR)/../skins/khaki/header.txt \
	513	+ $(SRCDIR)/../skins/original/css.txt \
	514	+ $(SRCDIR)/../skins/original/footer.txt \
	515	+ $(SRCDIR)/../skins/original/header.txt \
508	516	$(SRCDIR)/../skins/plain_gray/css.txt \
509	517	$(SRCDIR)/../skins/plain_gray/footer.txt \
510	518	$(SRCDIR)/../skins/plain_gray/header.txt \
511	519	$(SRCDIR)/../skins/rounded1/css.txt \
512	520	$(SRCDIR)/../skins/rounded1/footer.txt \
513	521

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -146,11 +146,11 @@
146	#### The directories where the OpenSSL include and library files are located.
147	# The recommended usage here is to use the Sysinternals junction tool
148	# to create a hard link between an "openssl-1.x" sub-directory of the
149	# Fossil source code directory and the target OpenSSL source directory.
150	#
151	OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2
152	OPENSSLINCDIR = $(OPENSSLDIR)/include
153	OPENSSLLIBDIR = $(OPENSSLDIR)
154
155	#### Either the directory where the Tcl library is installed or the Tcl
156	# source code directory resides (depending on the value of the macro
	@@ -488,25 +488,33 @@
488
489	EXTRA_FILES = \
490	$(SRCDIR)/../skins/black_and_white/css.txt \
491	$(SRCDIR)/../skins/black_and_white/footer.txt \
492	$(SRCDIR)/../skins/black_and_white/header.txt \








493	$(SRCDIR)/../skins/default/css.txt \
494	$(SRCDIR)/../skins/default/footer.txt \
495	$(SRCDIR)/../skins/default/header.txt \
496	$(SRCDIR)/../skins/eagle/css.txt \
497	$(SRCDIR)/../skins/eagle/footer.txt \
498	$(SRCDIR)/../skins/eagle/header.txt \
499	$(SRCDIR)/../skins/enhanced1/css.txt \
500	$(SRCDIR)/../skins/enhanced1/footer.txt \
501	$(SRCDIR)/../skins/enhanced1/header.txt \
502	$(SRCDIR)/../skins/etienne1/css.txt \
503	$(SRCDIR)/../skins/etienne1/footer.txt \
504	$(SRCDIR)/../skins/etienne1/header.txt \
505	$(SRCDIR)/../skins/khaki/css.txt \
506	$(SRCDIR)/../skins/khaki/footer.txt \
507	$(SRCDIR)/../skins/khaki/header.txt \



508	$(SRCDIR)/../skins/plain_gray/css.txt \
509	$(SRCDIR)/../skins/plain_gray/footer.txt \
510	$(SRCDIR)/../skins/plain_gray/header.txt \
511	$(SRCDIR)/../skins/rounded1/css.txt \
512	$(SRCDIR)/../skins/rounded1/footer.txt \
513

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -146,11 +146,11 @@
146	#### The directories where the OpenSSL include and library files are located.
147	# The recommended usage here is to use the Sysinternals junction tool
148	# to create a hard link between an "openssl-1.x" sub-directory of the
149	# Fossil source code directory and the target OpenSSL source directory.
150	#
151	OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2a
152	OPENSSLINCDIR = $(OPENSSLDIR)/include
153	OPENSSLLIBDIR = $(OPENSSLDIR)
154
155	#### Either the directory where the Tcl library is installed or the Tcl
156	# source code directory resides (depending on the value of the macro
	@@ -488,25 +488,33 @@
488
489	EXTRA_FILES = \
490	$(SRCDIR)/../skins/black_and_white/css.txt \
491	$(SRCDIR)/../skins/black_and_white/footer.txt \
492	$(SRCDIR)/../skins/black_and_white/header.txt \
493	$(SRCDIR)/../skins/blitz/css.txt \
494	$(SRCDIR)/../skins/blitz/footer.txt \
495	$(SRCDIR)/../skins/blitz/header.txt \
496	$(SRCDIR)/../skins/blitz/ticket.txt \
497	$(SRCDIR)/../skins/blitz_no_logo/css.txt \
498	$(SRCDIR)/../skins/blitz_no_logo/footer.txt \
499	$(SRCDIR)/../skins/blitz_no_logo/header.txt \
500	$(SRCDIR)/../skins/blitz_no_logo/ticket.txt \
501	$(SRCDIR)/../skins/default/css.txt \
502	$(SRCDIR)/../skins/default/footer.txt \
503	$(SRCDIR)/../skins/default/header.txt \
504	$(SRCDIR)/../skins/eagle/css.txt \
505	$(SRCDIR)/../skins/eagle/footer.txt \
506	$(SRCDIR)/../skins/eagle/header.txt \
507	$(SRCDIR)/../skins/enhanced1/css.txt \
508	$(SRCDIR)/../skins/enhanced1/footer.txt \
509	$(SRCDIR)/../skins/enhanced1/header.txt \



510	$(SRCDIR)/../skins/khaki/css.txt \
511	$(SRCDIR)/../skins/khaki/footer.txt \
512	$(SRCDIR)/../skins/khaki/header.txt \
513	$(SRCDIR)/../skins/original/css.txt \
514	$(SRCDIR)/../skins/original/footer.txt \
515	$(SRCDIR)/../skins/original/header.txt \
516	$(SRCDIR)/../skins/plain_gray/css.txt \
517	$(SRCDIR)/../skins/plain_gray/footer.txt \
518	$(SRCDIR)/../skins/plain_gray/header.txt \
519	$(SRCDIR)/../skins/rounded1/css.txt \
520	$(SRCDIR)/../skins/rounded1/footer.txt \
521

M win/Makefile.mingw.mistachkin

+13 -5

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -55,11 +55,11 @@
55	55	#
56	56	# FOSSIL_BUILD_SSL = 1
57	57
58	58	#### Enable TH1 scripts in embedded documentation files
59	59	#
60		-# FOSSIL_ENABLE_TH1_DOCS = 1
	60	+FOSSIL_ENABLE_TH1_DOCS = 1
61	61
62	62	#### Enable hooks for commands and web pages via TH1
63	63	#
64	64	FOSSIL_ENABLE_TH1_HOOKS = 1
65	65
		@@ -146,11 +146,11 @@
146	146	#### The directories where the OpenSSL include and library files are located.
147	147	# The recommended usage here is to use the Sysinternals junction tool
148	148	# to create a hard link between an "openssl-1.x" sub-directory of the
149	149	# Fossil source code directory and the target OpenSSL source directory.
150	150	#
151		-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2
	151	+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2a
152	152	OPENSSLINCDIR = $(OPENSSLDIR)/include
153	153	OPENSSLLIBDIR = $(OPENSSLDIR)
154	154
155	155	#### Either the directory where the Tcl library is installed or the Tcl
156	156	# source code directory resides (depending on the value of the macro
		@@ -488,25 +488,33 @@
488	488
489	489	EXTRA_FILES = \
490	490	$(SRCDIR)/../skins/black_and_white/css.txt \
491	491	$(SRCDIR)/../skins/black_and_white/footer.txt \
492	492	$(SRCDIR)/../skins/black_and_white/header.txt \
	493	+ $(SRCDIR)/../skins/blitz/css.txt \
	494	+ $(SRCDIR)/../skins/blitz/footer.txt \
	495	+ $(SRCDIR)/../skins/blitz/header.txt \
	496	+ $(SRCDIR)/../skins/blitz/ticket.txt \
	497	+ $(SRCDIR)/../skins/blitz_no_logo/css.txt \
	498	+ $(SRCDIR)/../skins/blitz_no_logo/footer.txt \
	499	+ $(SRCDIR)/../skins/blitz_no_logo/header.txt \
	500	+ $(SRCDIR)/../skins/blitz_no_logo/ticket.txt \
493	501	$(SRCDIR)/../skins/default/css.txt \
494	502	$(SRCDIR)/../skins/default/footer.txt \
495	503	$(SRCDIR)/../skins/default/header.txt \
496	504	$(SRCDIR)/../skins/eagle/css.txt \
497	505	$(SRCDIR)/../skins/eagle/footer.txt \
498	506	$(SRCDIR)/../skins/eagle/header.txt \
499	507	$(SRCDIR)/../skins/enhanced1/css.txt \
500	508	$(SRCDIR)/../skins/enhanced1/footer.txt \
501	509	$(SRCDIR)/../skins/enhanced1/header.txt \
502		- $(SRCDIR)/../skins/etienne1/css.txt \
503		- $(SRCDIR)/../skins/etienne1/footer.txt \
504		- $(SRCDIR)/../skins/etienne1/header.txt \
505	510	$(SRCDIR)/../skins/khaki/css.txt \
506	511	$(SRCDIR)/../skins/khaki/footer.txt \
507	512	$(SRCDIR)/../skins/khaki/header.txt \
	513	+ $(SRCDIR)/../skins/original/css.txt \
	514	+ $(SRCDIR)/../skins/original/footer.txt \
	515	+ $(SRCDIR)/../skins/original/header.txt \
508	516	$(SRCDIR)/../skins/plain_gray/css.txt \
509	517	$(SRCDIR)/../skins/plain_gray/footer.txt \
510	518	$(SRCDIR)/../skins/plain_gray/header.txt \
511	519	$(SRCDIR)/../skins/rounded1/css.txt \
512	520	$(SRCDIR)/../skins/rounded1/footer.txt \
513	521

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -55,11 +55,11 @@
55	#
56	# FOSSIL_BUILD_SSL = 1
57
58	#### Enable TH1 scripts in embedded documentation files
59	#
60	# FOSSIL_ENABLE_TH1_DOCS = 1
61
62	#### Enable hooks for commands and web pages via TH1
63	#
64	FOSSIL_ENABLE_TH1_HOOKS = 1
65
	@@ -146,11 +146,11 @@
146	#### The directories where the OpenSSL include and library files are located.
147	# The recommended usage here is to use the Sysinternals junction tool
148	# to create a hard link between an "openssl-1.x" sub-directory of the
149	# Fossil source code directory and the target OpenSSL source directory.
150	#
151	OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2
152	OPENSSLINCDIR = $(OPENSSLDIR)/include
153	OPENSSLLIBDIR = $(OPENSSLDIR)
154
155	#### Either the directory where the Tcl library is installed or the Tcl
156	# source code directory resides (depending on the value of the macro
	@@ -488,25 +488,33 @@
488
489	EXTRA_FILES = \
490	$(SRCDIR)/../skins/black_and_white/css.txt \
491	$(SRCDIR)/../skins/black_and_white/footer.txt \
492	$(SRCDIR)/../skins/black_and_white/header.txt \








493	$(SRCDIR)/../skins/default/css.txt \
494	$(SRCDIR)/../skins/default/footer.txt \
495	$(SRCDIR)/../skins/default/header.txt \
496	$(SRCDIR)/../skins/eagle/css.txt \
497	$(SRCDIR)/../skins/eagle/footer.txt \
498	$(SRCDIR)/../skins/eagle/header.txt \
499	$(SRCDIR)/../skins/enhanced1/css.txt \
500	$(SRCDIR)/../skins/enhanced1/footer.txt \
501	$(SRCDIR)/../skins/enhanced1/header.txt \
502	$(SRCDIR)/../skins/etienne1/css.txt \
503	$(SRCDIR)/../skins/etienne1/footer.txt \
504	$(SRCDIR)/../skins/etienne1/header.txt \
505	$(SRCDIR)/../skins/khaki/css.txt \
506	$(SRCDIR)/../skins/khaki/footer.txt \
507	$(SRCDIR)/../skins/khaki/header.txt \



508	$(SRCDIR)/../skins/plain_gray/css.txt \
509	$(SRCDIR)/../skins/plain_gray/footer.txt \
510	$(SRCDIR)/../skins/plain_gray/header.txt \
511	$(SRCDIR)/../skins/rounded1/css.txt \
512	$(SRCDIR)/../skins/rounded1/footer.txt \
513

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -55,11 +55,11 @@
55	#
56	# FOSSIL_BUILD_SSL = 1
57
58	#### Enable TH1 scripts in embedded documentation files
59	#
60	FOSSIL_ENABLE_TH1_DOCS = 1
61
62	#### Enable hooks for commands and web pages via TH1
63	#
64	FOSSIL_ENABLE_TH1_HOOKS = 1
65
	@@ -146,11 +146,11 @@
146	#### The directories where the OpenSSL include and library files are located.
147	# The recommended usage here is to use the Sysinternals junction tool
148	# to create a hard link between an "openssl-1.x" sub-directory of the
149	# Fossil source code directory and the target OpenSSL source directory.
150	#
151	OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2a
152	OPENSSLINCDIR = $(OPENSSLDIR)/include
153	OPENSSLLIBDIR = $(OPENSSLDIR)
154
155	#### Either the directory where the Tcl library is installed or the Tcl
156	# source code directory resides (depending on the value of the macro
	@@ -488,25 +488,33 @@
488
489	EXTRA_FILES = \
490	$(SRCDIR)/../skins/black_and_white/css.txt \
491	$(SRCDIR)/../skins/black_and_white/footer.txt \
492	$(SRCDIR)/../skins/black_and_white/header.txt \
493	$(SRCDIR)/../skins/blitz/css.txt \
494	$(SRCDIR)/../skins/blitz/footer.txt \
495	$(SRCDIR)/../skins/blitz/header.txt \
496	$(SRCDIR)/../skins/blitz/ticket.txt \
497	$(SRCDIR)/../skins/blitz_no_logo/css.txt \
498	$(SRCDIR)/../skins/blitz_no_logo/footer.txt \
499	$(SRCDIR)/../skins/blitz_no_logo/header.txt \
500	$(SRCDIR)/../skins/blitz_no_logo/ticket.txt \
501	$(SRCDIR)/../skins/default/css.txt \
502	$(SRCDIR)/../skins/default/footer.txt \
503	$(SRCDIR)/../skins/default/header.txt \
504	$(SRCDIR)/../skins/eagle/css.txt \
505	$(SRCDIR)/../skins/eagle/footer.txt \
506	$(SRCDIR)/../skins/eagle/header.txt \
507	$(SRCDIR)/../skins/enhanced1/css.txt \
508	$(SRCDIR)/../skins/enhanced1/footer.txt \
509	$(SRCDIR)/../skins/enhanced1/header.txt \



510	$(SRCDIR)/../skins/khaki/css.txt \
511	$(SRCDIR)/../skins/khaki/footer.txt \
512	$(SRCDIR)/../skins/khaki/header.txt \
513	$(SRCDIR)/../skins/original/css.txt \
514	$(SRCDIR)/../skins/original/footer.txt \
515	$(SRCDIR)/../skins/original/header.txt \
516	$(SRCDIR)/../skins/plain_gray/css.txt \
517	$(SRCDIR)/../skins/plain_gray/footer.txt \
518	$(SRCDIR)/../skins/plain_gray/header.txt \
519	$(SRCDIR)/../skins/rounded1/css.txt \
520	$(SRCDIR)/../skins/rounded1/footer.txt \
521

M win/Makefile.msc

+12 -4

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -55,11 +55,11 @@
55	55
56	56	# Uncomment to enable Tcl support
57	57	# FOSSIL_ENABLE_TCL = 1
58	58
59	59	!ifdef FOSSIL_ENABLE_SSL
60		-SSLDIR = $(B)\compat\openssl-1.0.2
	60	+SSLDIR = $(B)\compat\openssl-1.0.2a
61	61	SSLINCDIR = $(SSLDIR)\inc32
62	62	SSLLIBDIR = $(SSLDIR)\out32
63	63	SSLLFLAGS = /nologo /opt:ref /debug
64	64	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
65	65	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
		@@ -328,25 +328,33 @@
328	328	zip_.c
329	329
330	330	EXTRA_FILES = $(SRCDIR)\../skins/black_and_white/css.txt \
331	331	$(SRCDIR)\../skins/black_and_white/footer.txt \
332	332	$(SRCDIR)\../skins/black_and_white/header.txt \
	333	+ $(SRCDIR)\../skins/blitz/css.txt \
	334	+ $(SRCDIR)\../skins/blitz/footer.txt \
	335	+ $(SRCDIR)\../skins/blitz/header.txt \
	336	+ $(SRCDIR)\../skins/blitz/ticket.txt \
	337	+ $(SRCDIR)\../skins/blitz_no_logo/css.txt \
	338	+ $(SRCDIR)\../skins/blitz_no_logo/footer.txt \
	339	+ $(SRCDIR)\../skins/blitz_no_logo/header.txt \
	340	+ $(SRCDIR)\../skins/blitz_no_logo/ticket.txt \
333	341	$(SRCDIR)\../skins/default/css.txt \
334	342	$(SRCDIR)\../skins/default/footer.txt \
335	343	$(SRCDIR)\../skins/default/header.txt \
336	344	$(SRCDIR)\../skins/eagle/css.txt \
337	345	$(SRCDIR)\../skins/eagle/footer.txt \
338	346	$(SRCDIR)\../skins/eagle/header.txt \
339	347	$(SRCDIR)\../skins/enhanced1/css.txt \
340	348	$(SRCDIR)\../skins/enhanced1/footer.txt \
341	349	$(SRCDIR)\../skins/enhanced1/header.txt \
342		- $(SRCDIR)\../skins/etienne1/css.txt \
343		- $(SRCDIR)\../skins/etienne1/footer.txt \
344		- $(SRCDIR)\../skins/etienne1/header.txt \
345	350	$(SRCDIR)\../skins/khaki/css.txt \
346	351	$(SRCDIR)\../skins/khaki/footer.txt \
347	352	$(SRCDIR)\../skins/khaki/header.txt \
	353	+ $(SRCDIR)\../skins/original/css.txt \
	354	+ $(SRCDIR)\../skins/original/footer.txt \
	355	+ $(SRCDIR)\../skins/original/header.txt \
348	356	$(SRCDIR)\../skins/plain_gray/css.txt \
349	357	$(SRCDIR)\../skins/plain_gray/footer.txt \
350	358	$(SRCDIR)\../skins/plain_gray/header.txt \
351	359	$(SRCDIR)\../skins/rounded1/css.txt \
352	360	$(SRCDIR)\../skins/rounded1/footer.txt \
353	361

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -55,11 +55,11 @@
55
56	# Uncomment to enable Tcl support
57	# FOSSIL_ENABLE_TCL = 1
58
59	!ifdef FOSSIL_ENABLE_SSL
60	SSLDIR = $(B)\compat\openssl-1.0.2
61	SSLINCDIR = $(SSLDIR)\inc32
62	SSLLIBDIR = $(SSLDIR)\out32
63	SSLLFLAGS = /nologo /opt:ref /debug
64	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
65	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
	@@ -328,25 +328,33 @@
328	zip_.c
329
330	EXTRA_FILES = $(SRCDIR)\../skins/black_and_white/css.txt \
331	$(SRCDIR)\../skins/black_and_white/footer.txt \
332	$(SRCDIR)\../skins/black_and_white/header.txt \








333	$(SRCDIR)\../skins/default/css.txt \
334	$(SRCDIR)\../skins/default/footer.txt \
335	$(SRCDIR)\../skins/default/header.txt \
336	$(SRCDIR)\../skins/eagle/css.txt \
337	$(SRCDIR)\../skins/eagle/footer.txt \
338	$(SRCDIR)\../skins/eagle/header.txt \
339	$(SRCDIR)\../skins/enhanced1/css.txt \
340	$(SRCDIR)\../skins/enhanced1/footer.txt \
341	$(SRCDIR)\../skins/enhanced1/header.txt \
342	$(SRCDIR)\../skins/etienne1/css.txt \
343	$(SRCDIR)\../skins/etienne1/footer.txt \
344	$(SRCDIR)\../skins/etienne1/header.txt \
345	$(SRCDIR)\../skins/khaki/css.txt \
346	$(SRCDIR)\../skins/khaki/footer.txt \
347	$(SRCDIR)\../skins/khaki/header.txt \



348	$(SRCDIR)\../skins/plain_gray/css.txt \
349	$(SRCDIR)\../skins/plain_gray/footer.txt \
350	$(SRCDIR)\../skins/plain_gray/header.txt \
351	$(SRCDIR)\../skins/rounded1/css.txt \
352	$(SRCDIR)\../skins/rounded1/footer.txt \
353

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -55,11 +55,11 @@
55
56	# Uncomment to enable Tcl support
57	# FOSSIL_ENABLE_TCL = 1
58
59	!ifdef FOSSIL_ENABLE_SSL
60	SSLDIR = $(B)\compat\openssl-1.0.2a
61	SSLINCDIR = $(SSLDIR)\inc32
62	SSLLIBDIR = $(SSLDIR)\out32
63	SSLLFLAGS = /nologo /opt:ref /debug
64	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
65	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
	@@ -328,25 +328,33 @@
328	zip_.c
329
330	EXTRA_FILES = $(SRCDIR)\../skins/black_and_white/css.txt \
331	$(SRCDIR)\../skins/black_and_white/footer.txt \
332	$(SRCDIR)\../skins/black_and_white/header.txt \
333	$(SRCDIR)\../skins/blitz/css.txt \
334	$(SRCDIR)\../skins/blitz/footer.txt \
335	$(SRCDIR)\../skins/blitz/header.txt \
336	$(SRCDIR)\../skins/blitz/ticket.txt \
337	$(SRCDIR)\../skins/blitz_no_logo/css.txt \
338	$(SRCDIR)\../skins/blitz_no_logo/footer.txt \
339	$(SRCDIR)\../skins/blitz_no_logo/header.txt \
340	$(SRCDIR)\../skins/blitz_no_logo/ticket.txt \
341	$(SRCDIR)\../skins/default/css.txt \
342	$(SRCDIR)\../skins/default/footer.txt \
343	$(SRCDIR)\../skins/default/header.txt \
344	$(SRCDIR)\../skins/eagle/css.txt \
345	$(SRCDIR)\../skins/eagle/footer.txt \
346	$(SRCDIR)\../skins/eagle/header.txt \
347	$(SRCDIR)\../skins/enhanced1/css.txt \
348	$(SRCDIR)\../skins/enhanced1/footer.txt \
349	$(SRCDIR)\../skins/enhanced1/header.txt \



350	$(SRCDIR)\../skins/khaki/css.txt \
351	$(SRCDIR)\../skins/khaki/footer.txt \
352	$(SRCDIR)\../skins/khaki/header.txt \
353	$(SRCDIR)\../skins/original/css.txt \
354	$(SRCDIR)\../skins/original/footer.txt \
355	$(SRCDIR)\../skins/original/header.txt \
356	$(SRCDIR)\../skins/plain_gray/css.txt \
357	$(SRCDIR)\../skins/plain_gray/footer.txt \
358	$(SRCDIR)\../skins/plain_gray/header.txt \
359	$(SRCDIR)\../skins/rounded1/css.txt \
360	$(SRCDIR)\../skins/rounded1/footer.txt \
361

M www/build.wiki

+1 -1

		--- www/build.wiki
		+++ www/build.wiki
		@@ -125,11 +125,11 @@
125	125	the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
126	126	first <a href="https://www.openssl.org/source/">download the official
127	127	source code for OpenSSL</a> and extract it to an appropriately named
128	128	"<b>openssl-X.Y.ZA</b>" subdirectory within the local
129	129	[/tree?ci=trunk&name=compat \| compat] directory (e.g.
130		-"<b>compat/openssl-1.0.2</b>"), then make sure that some recent
	130	+"<b>compat/openssl-1.0.2a</b>"), then make sure that some recent
131	131	<a href="http://www.perl.org/">Perl</a> binaries are installed locally,
132	132	and finally run one of the following commands:
133	133	<blockquote><pre>
134	134	nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
135	135	</pre></blockquote>
136	136

	--- www/build.wiki
	+++ www/build.wiki
	@@ -125,11 +125,11 @@
125	the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
126	first <a href="https://www.openssl.org/source/">download the official
127	source code for OpenSSL</a> and extract it to an appropriately named
128	"<b>openssl-X.Y.ZA</b>" subdirectory within the local
129	[/tree?ci=trunk&name=compat \| compat] directory (e.g.
130	"<b>compat/openssl-1.0.2</b>"), then make sure that some recent
131	<a href="http://www.perl.org/">Perl</a> binaries are installed locally,
132	and finally run one of the following commands:
133	<blockquote><pre>
134	nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
135	</pre></blockquote>
136

	--- www/build.wiki
	+++ www/build.wiki
	@@ -125,11 +125,11 @@
125	the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
126	first <a href="https://www.openssl.org/source/">download the official
127	source code for OpenSSL</a> and extract it to an appropriately named
128	"<b>openssl-X.Y.ZA</b>" subdirectory within the local
129	[/tree?ci=trunk&name=compat \| compat] directory (e.g.
130	"<b>compat/openssl-1.0.2a</b>"), then make sure that some recent
131	<a href="http://www.perl.org/">Perl</a> binaries are installed locally,
132	and finally run one of the following commands:
133	<blockquote><pre>
134	nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
135	</pre></blockquote>
136

M www/changes.wiki

+5 -1

		--- www/changes.wiki
		+++ www/changes.wiki
		@@ -1,8 +1,12 @@
1	1	<title>Change Log</title>
2	2
3		-<h2>Changes for Version 1.32 (2015-03-??)</h2>
	3	+<h2>Changes for Version 1.33 (not released yet)</h2>
	4	+ * Add [/help?cmd=import\|fossil import --svn], for importing a subversion
	5	+ repository into fossil which was exported using "svnadmin dump".
	6	+
	7	+<h2>Changes for Version 1.32 (2015-03-14)</h2>
4	8	* When creating a new repository using [/help?cmd=init\|fossil init], ensure
5	9	that the new repository is fully compatible with historical versions of
6	10	Fossil by having a valid manifest as RID 1.
7	11	* Anti-aliased rendering of arrowheads on timeline graphs.
8	12	* Added vi/less-style key bindings to the --tk diff GUI.
9	13

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -1,8 +1,12 @@
1	<title>Change Log</title>
2
3	<h2>Changes for Version 1.32 (2015-03-??)</h2>




4	* When creating a new repository using [/help?cmd=init\|fossil init], ensure
5	that the new repository is fully compatible with historical versions of
6	Fossil by having a valid manifest as RID 1.
7	* Anti-aliased rendering of arrowheads on timeline graphs.
8	* Added vi/less-style key bindings to the --tk diff GUI.
9

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -1,8 +1,12 @@
1	<title>Change Log</title>
2
3	<h2>Changes for Version 1.33 (not released yet)</h2>
4	* Add [/help?cmd=import\|fossil import --svn], for importing a subversion
5	repository into fossil which was exported using "svnadmin dump".
6
7	<h2>Changes for Version 1.32 (2015-03-14)</h2>
8	* When creating a new repository using [/help?cmd=init\|fossil init], ensure
9	that the new repository is fully compatible with historical versions of
10	Fossil by having a valid manifest as RID 1.
11	* Anti-aliased rendering of arrowheads on timeline graphs.
12	* Added vi/less-style key bindings to the --tk diff GUI.
13

M www/mkdownload.tcl

+11 -17

		--- www/mkdownload.tcl
		+++ www/mkdownload.tcl
		@@ -53,27 +53,21 @@
53	53	}
54	54
55	55	# Find all all unique timestamps.
56	56	#
57	57	foreach file [glob -nocomplain download/fossil-*.zip] {
58		- if {[regexp {(\d+).zip$} $file all datetime]
59		- && [string length $datetime]>=14} {
60		- set adate($datetime) 1
	58	+ if {[regexp -- {-(\d\.\d+).zip$} $file all version]} {
	59	+ set avers($version) 1
61	60	}
62	61	}
63	62
64		-# Do all dates from newest to oldest
65		-#
66		-foreach datetime [lsort -decr [array names adate]] {
67		- set dt [string range $datetime 0 3]-[string range $datetime 4 5]-
68		- append dt "[string range $datetime 6 7] "
69		- append dt "[string range $datetime 8 9]:[string range $datetime 10 11]:"
70		- append dt "[string range $datetime 12 13]"
71		- set link [string map {{ } +} $dt]
72		- set hr "/fossil/timeline?c=$link&y=ci"
73		- puts $out "<tr><td colspan=6 align=left><hr>"
74		- puts $out "<center><b><a href=\"$hr\">$dt</a></b></center>"
	63	+# Do all versions from newest to oldest
	64	+#
	65	+foreach vers [lsort -decr -real [array names avers]] {
	66	+ set hr "/fossil/timeline?c=version-$vers;y=ci"
	67	+ puts $out "<tr><td colspan=6 align=left><hr>"
	68	+ puts $out "<center><b><a href=\"$hr\">Version $vers</a></b></center>"
75	69	puts $out "</td></tr>"
76	70	puts $out "<tr>"
77	71
78	72	foreach {prefix suffix img desc} {
79	73	fossil-linux-x86 zip linux.gif {Linux 3.x x86}
		@@ -80,11 +74,11 @@
80	74	fossil-macosx-x86 zip mac.gif {Mac 10.x x86}
81	75	fossil-openbsd-x86 zip openbsd.gif {OpenBSD 4.x x86}
82	76	fossil-w32 zip win32.gif {Windows}
83	77	fossil-src tar.gz src.gif {Source Tarball}
84	78	} {
85		- set filename download/$prefix-$datetime.$suffix
	79	+ set filename download/$prefix-$vers.$suffix
86	80	if {[file exists $filename]} {
87	81	set size [file size $filename]
88	82	set units bytes
89	83	if {$size>1024*1024} {
90	84	set size [format %.2f [expr {$size/(1024.0*1024.0)}]]
		@@ -99,13 +93,13 @@
99	93	} else {
100	94	puts $out "<td> </td>"
101	95	}
102	96	}
103	97	puts $out "</tr>"
104		- if {[file exists download/releasenotes-$datetime.html]} {
	98	+ if {[file exists download/releasenotes-$vers.html]} {
105	99	puts $out "<tr><td colspan=6 align=left>"
106		- set rn [open download/releasenotes-$datetime.html]
	100	+ set rn [open download/releasenotes-$vers.html]
107	101	fconfigure $rn -encoding utf-8
108	102	puts $out "[read $rn]"
109	103	close $rn
110	104	puts $out "</td></tr>"
111	105	}
112	106

	--- www/mkdownload.tcl
	+++ www/mkdownload.tcl
	@@ -53,27 +53,21 @@
53	}
54
55	# Find all all unique timestamps.
56	#
57	foreach file [glob -nocomplain download/fossil-*.zip] {
58	if {[regexp {(\d+).zip$} $file all datetime]
59	&& [string length $datetime]>=14} {
60	set adate($datetime) 1
61	}
62	}
63
64	# Do all dates from newest to oldest
65	#
66	foreach datetime [lsort -decr [array names adate]] {
67	set dt [string range $datetime 0 3]-[string range $datetime 4 5]-
68	append dt "[string range $datetime 6 7] "
69	append dt "[string range $datetime 8 9]:[string range $datetime 10 11]:"
70	append dt "[string range $datetime 12 13]"
71	set link [string map {{ } +} $dt]
72	set hr "/fossil/timeline?c=$link&y=ci"
73	puts $out "<tr><td colspan=6 align=left><hr>"
74	puts $out "<center><b><a href=\"$hr\">$dt</a></b></center>"
75	puts $out "</td></tr>"
76	puts $out "<tr>"
77
78	foreach {prefix suffix img desc} {
79	fossil-linux-x86 zip linux.gif {Linux 3.x x86}
	@@ -80,11 +74,11 @@
80	fossil-macosx-x86 zip mac.gif {Mac 10.x x86}
81	fossil-openbsd-x86 zip openbsd.gif {OpenBSD 4.x x86}
82	fossil-w32 zip win32.gif {Windows}
83	fossil-src tar.gz src.gif {Source Tarball}
84	} {
85	set filename download/$prefix-$datetime.$suffix
86	if {[file exists $filename]} {
87	set size [file size $filename]
88	set units bytes
89	if {$size>1024*1024} {
90	set size [format %.2f [expr {$size/(1024.0*1024.0)}]]
	@@ -99,13 +93,13 @@
99	} else {
100	puts $out "<td> </td>"
101	}
102	}
103	puts $out "</tr>"
104	if {[file exists download/releasenotes-$datetime.html]} {
105	puts $out "<tr><td colspan=6 align=left>"
106	set rn [open download/releasenotes-$datetime.html]
107	fconfigure $rn -encoding utf-8
108	puts $out "[read $rn]"
109	close $rn
110	puts $out "</td></tr>"
111	}
112

	--- www/mkdownload.tcl
	+++ www/mkdownload.tcl
	@@ -53,27 +53,21 @@
53	}
54
55	# Find all all unique timestamps.
56	#
57	foreach file [glob -nocomplain download/fossil-*.zip] {
58	if {[regexp -- {-(\d\.\d+).zip$} $file all version]} {
59	set avers($version) 1

60	}
61	}
62
63	# Do all versions from newest to oldest
64	#
65	foreach vers [lsort -decr -real [array names avers]] {
66	set hr "/fossil/timeline?c=version-$vers;y=ci"
67	puts $out "<tr><td colspan=6 align=left><hr>"
68	puts $out "<center><b><a href=\"$hr\">Version $vers</a></b></center>"





69	puts $out "</td></tr>"
70	puts $out "<tr>"
71
72	foreach {prefix suffix img desc} {
73	fossil-linux-x86 zip linux.gif {Linux 3.x x86}
	@@ -80,11 +74,11 @@
74	fossil-macosx-x86 zip mac.gif {Mac 10.x x86}
75	fossil-openbsd-x86 zip openbsd.gif {OpenBSD 4.x x86}
76	fossil-w32 zip win32.gif {Windows}
77	fossil-src tar.gz src.gif {Source Tarball}
78	} {
79	set filename download/$prefix-$vers.$suffix
80	if {[file exists $filename]} {
81	set size [file size $filename]
82	set units bytes
83	if {$size>1024*1024} {
84	set size [format %.2f [expr {$size/(1024.0*1024.0)}]]
	@@ -99,13 +93,13 @@
93	} else {
94	puts $out "<td> </td>"
95	}
96	}
97	puts $out "</tr>"
98	if {[file exists download/releasenotes-$vers.html]} {
99	puts $out "<tr><td colspan=6 align=left>"
100	set rn [open download/releasenotes-$vers.html]
101	fconfigure $rn -encoding utf-8
102	puts $out "[read $rn]"
103	close $rn
104	puts $out "</td></tr>"
105	}
106

M www/sync.wiki

+4 -5

		--- www/sync.wiki
		+++ www/sync.wiki
		@@ -247,13 +247,11 @@
247	247	<b>push</b> <i>servercode projectcode</i><br>
248	248	<b>pull</b> <i>servercode projectcode</i>
249	249	</blockquote>
250	250
251	251	<p>The <i>servercode</i> argument is the repository ID for the
252		-client. The server will only allow the transaction to proceed
253		-if the servercode is different from its own servercode. This
254		-prevents a sync-loop. The <i>projectcode</i> is the identifier
	252	+client. The <i>projectcode</i> is the identifier
255	253	of the software project that the client repository contains.
256	254	The projectcode for the client and server must match in order
257	255	for the transaction to proceed.</p>
258	256
259	257	<p>The server will also send a push card back to the client
		@@ -384,11 +382,11 @@
384	382
385	383	<blockquote>
386	384	<b>reqconfig</b> <i>configuration-name</i>
387	385	</blockquote>
388	386
389		-<p>As of [/timeline?r=trunk&c=2015-01-24+00%3A17%3A55&n=20\|2015-01-24], the configuration-name must be one of the
	387	+<p>As of [/timeline?r=trunk&c=2015-03-19+03%3A57%3A46&n=20\|2015-03-19], the configuration-name must be one of the
390	388	following values:
391	389
392	390	<center><table border=0>
393	391	<tr><td valign="top">
394	392	<ul>
		@@ -420,16 +418,17 @@
420	418	<li> keep-glob
421	419	<li> crnl-glob
422	420	<li> encoding-glob
423	421	<li> empty-dirs
424	422	<li> allow-symlinks
	423	+<li> dotfiles
425	424	<li> ticket-table
426	425	<li> ticket-common
427	426	<li> ticket-change
428	427	<li> ticket-newpage
429		-<li> ticket-viewpage
430	428	<ul></td><td valign="top"><ul>
	429	+<li> ticket-viewpage
431	430	<li> ticket-editpage
432	431	<li> ticket-reportlist
433	432	<li> ticket-report-template
434	433	<li> ticket-key-template
435	434	<li> ticket-title-expr
436	435

	--- www/sync.wiki
	+++ www/sync.wiki
	@@ -247,13 +247,11 @@
247	<b>push</b> <i>servercode projectcode</i><br>
248	<b>pull</b> <i>servercode projectcode</i>
249	</blockquote>
250
251	<p>The <i>servercode</i> argument is the repository ID for the
252	client. The server will only allow the transaction to proceed
253	if the servercode is different from its own servercode. This
254	prevents a sync-loop. The <i>projectcode</i> is the identifier
255	of the software project that the client repository contains.
256	The projectcode for the client and server must match in order
257	for the transaction to proceed.</p>
258
259	<p>The server will also send a push card back to the client
	@@ -384,11 +382,11 @@
384
385	<blockquote>
386	<b>reqconfig</b> <i>configuration-name</i>
387	</blockquote>
388
389	<p>As of [/timeline?r=trunk&c=2015-01-24+00%3A17%3A55&n=20\|2015-01-24], the configuration-name must be one of the
390	following values:
391
392	<center><table border=0>
393	<tr><td valign="top">
394	<ul>
	@@ -420,16 +418,17 @@
420	<li> keep-glob
421	<li> crnl-glob
422	<li> encoding-glob
423	<li> empty-dirs
424	<li> allow-symlinks

425	<li> ticket-table
426	<li> ticket-common
427	<li> ticket-change
428	<li> ticket-newpage
429	<li> ticket-viewpage
430	<ul></td><td valign="top"><ul>

431	<li> ticket-editpage
432	<li> ticket-reportlist
433	<li> ticket-report-template
434	<li> ticket-key-template
435	<li> ticket-title-expr
436

	--- www/sync.wiki
	+++ www/sync.wiki
	@@ -247,13 +247,11 @@
247	<b>push</b> <i>servercode projectcode</i><br>
248	<b>pull</b> <i>servercode projectcode</i>
249	</blockquote>
250
251	<p>The <i>servercode</i> argument is the repository ID for the
252	client. The <i>projectcode</i> is the identifier


253	of the software project that the client repository contains.
254	The projectcode for the client and server must match in order
255	for the transaction to proceed.</p>
256
257	<p>The server will also send a push card back to the client
	@@ -384,11 +382,11 @@
382
383	<blockquote>
384	<b>reqconfig</b> <i>configuration-name</i>
385	</blockquote>
386
387	<p>As of [/timeline?r=trunk&c=2015-03-19+03%3A57%3A46&n=20\|2015-03-19], the configuration-name must be one of the
388	following values:
389
390	<center><table border=0>
391	<tr><td valign="top">
392	<ul>
	@@ -420,16 +418,17 @@
418	<li> keep-glob
419	<li> crnl-glob
420	<li> encoding-glob
421	<li> empty-dirs
422	<li> allow-symlinks
423	<li> dotfiles
424	<li> ticket-table
425	<li> ticket-common
426	<li> ticket-change
427	<li> ticket-newpage

428	<ul></td><td valign="top"><ul>
429	<li> ticket-viewpage
430	<li> ticket-editpage
431	<li> ticket-reportlist
432	<li> ticket-report-template
433	<li> ticket-key-template
434	<li> ticket-title-expr
435

Fossil SCM

Keyboard Shortcuts