1 |
commit: 5c428ae31d0a6189f17ce70609175e409304ddba |
2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
3 |
AuthorDate: Sun May 5 01:28:48 2019 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 5 19:04:00 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c428ae3 |
7 |
|
8 |
dev-db/sqlite: Version bump (3.28.0). |
9 |
|
10 |
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> |
11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
12 |
|
13 |
dev-db/sqlite/Manifest | 3 + |
14 |
.../files/sqlite-3.28.0-full_archive-build.patch | 461 ++++++++++ |
15 |
...8.0-full_archive-segmentation_fault_fixes.patch | 954 +++++++++++++++++++++ |
16 |
.../files/sqlite-3.28.0-full_archive-tests.patch | 19 + |
17 |
...-nonfull_archive-segmentation_fault_fixes.patch | 114 +++ |
18 |
dev-db/sqlite/sqlite-3.28.0.ebuild | 330 +++++++ |
19 |
6 files changed, 1881 insertions(+) |
20 |
|
21 |
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest |
22 |
index e40683c22fb..7b659592e7a 100644 |
23 |
--- a/dev-db/sqlite/Manifest |
24 |
+++ b/dev-db/sqlite/Manifest |
25 |
@@ -2,11 +2,14 @@ DIST sqlite-autoconf-3250300.tar.gz 2764429 BLAKE2B 6a79a8785c1e84002c031a86c656 |
26 |
DIST sqlite-autoconf-3260000.tar.gz 2779667 BLAKE2B f4d737eb2249ce32fcb7541ba92f7362d417e84adb5f5c63778b6f427b3270b7e0b16e19daaef7fc7e4fca9ab462c96cdb00c65a731a90102f6bb256a27d84ae SHA512 8c3306b3814a0e9bc69b741f62bdb6efc9f1e07163ca3e3a1581994465de163a7924223522e812d6b3663c1525c7012a6f6d73ad333556eba9f97ce9326fbdb8 |
27 |
DIST sqlite-autoconf-3270100.tar.gz 2797765 BLAKE2B a610528b626229e5379037cb2b8b405a564fecf7f999608bcd41b4ee3531259216c69897e4f2e1cdd78d092edf62c3fec40b6cb377d3c767b9f1bee05b09fa01 SHA512 1dca61b82ce1dbae2fe9c568ff97e0671900bab46b354bd0aadc1946cbc46b3ea84bd1504ae922f795d1ce10791bf7861a2873f045887646609e26b74919e8e4 |
28 |
DIST sqlite-autoconf-3270200.tar.gz 2797531 BLAKE2B e4d0de32308e519e4f5f68dc0ff1e2098209325ab962a09814aa6af517cb408d1ac70f32fff56cca4ad78bec7d6dedb5b21f222ae391e0fe7e20df5abd37f65a SHA512 0ac2515c7816932a4f725e657122c9f202bd7aba637bad9af5b4592b85efdd10a55ad34ac621b60a7aea91b1021c2ef0924c6ddfe05b2edb4f70e3d34b005972 |
29 |
+DIST sqlite-autoconf-3280000.tar.gz 2810415 BLAKE2B e1af03476d97f96ef78d4e0a9df6ae69a06fb08e48046c843ed668b3f8c00c58263df07a4e8a22a1c7cfc920fd005fa6c2525dceeec4f724b43df7589ca3f777 SHA512 e800c0d9e6c8c01ccf1d714c6c4da4b98e9610c4c06557dda6393d0792a8ae09788703d4a74dcb21844c49b3629ff7ed95a4a86ff79872aafd2b49c672c7a570 |
30 |
DIST sqlite-doc-3250300.zip 9265285 BLAKE2B 0722f00d849b18dabf82d317eb0deeb5567534a9cb55e189f28b18e7a26b863190911a02a26e21cf39b3106e7e1a872c445a3d8b53876a16d245e77affb6abc4 SHA512 a57cefbb2338a87721fb34f7a0d19129a58fbce026f80719af7dbbeb7512c91ab59e07719d860cc1cf742807ab7b0b5f92cff3bf52f4dbbad8c6ca34ad0a68ac |
31 |
DIST sqlite-doc-3260000.zip 9321276 BLAKE2B 8e3802212eb938a3997bf8eef971baf8802895a8c38e959b2409857228e9a92b24c3f51679f7dc4847df8d9800f0fff2c09e391b3e30de8b2782bbc5267d5d40 SHA512 e59f74369adb3ffe3afc235e4369101b8ba077f9cac34d524e2425278c3a30f63340613e5baa0fc3c693265525377b6830a1c6b5e97fb06702b89eb604b1eade |
32 |
DIST sqlite-doc-3270100.zip 9361284 BLAKE2B d9705bc5d3a40ec70df2fa16c9f3f7d3d4824ddcb59e101bc6d45bc5f6396c11ed9e5d548f59bc2f48cb515417bb03419e67f669a7e85678d05cb0c71a3a2c27 SHA512 a56cfe57702ab1ab342c24536bcd3c01c3c57fb9e863fc775f07275d236fc0617f7eb832ca5173bf5c4c5c4b7a0b4b80e2d19b91e7724b838bf141cf0852cc1f |
33 |
DIST sqlite-doc-3270200.zip 9371606 BLAKE2B 6d65f59f21eafab82ede6c89d09b8828e5a5e6f7ad7233877fe938773be0aee6fd347d7bba0101cc1d2e376181e4cfbcc2e36d47567b65af9167c4d1ba7f3540 SHA512 00a7c51aeaea2d9338662553c331addca8cd4ae656f4090630b4b2c2e6ceffffd9bd3c6a97117915577cfd6dafeddf9da21f865ab378f86c4832ba0b1c419a2f |
34 |
+DIST sqlite-doc-3280000.zip 9421770 BLAKE2B 695eab96f718307a7aff8a171d9e416ddb4b17039ef7230a458dc7d256e2f07a5b41d3aa1a3f085e5e418c297b5dd1d2ba5e4827434329d1ed61d3dd1f618f3d SHA512 83e23dff00614d31d501c66c29d8d4aa780b38859242b58937243235d185fe3db2f9f3c1accf9bf2df0b457a6e32612a00e82f503a8665aad4f19602e2b36396 |
35 |
DIST sqlite-src-3250300.zip 11384253 BLAKE2B dbc1d989b1f7ae26e34d629ae7926cfebacc0e3b9e07abb98ac6e6d2d801f111624d5b3f5a1d486580559ff0b42140bb798aa862df60946efa77d8b26c47fbd0 SHA512 7d6a38aea5626f7a32960fcdd109c647dd24a22ecf0772f01ffdba389f70fdfe6455f69733b22c220d4114a7d61d3d10097c23859d303e02d126988a1f663b65 |
36 |
DIST sqlite-src-3260000.zip 11939787 BLAKE2B 89fc5294c203473a8817d23496b05b743aa9d64ac7c67c258432b6a48dfe41d554b09ed14820854333fe555442029e9c9ccea736be7b10be42d9184502938557 SHA512 02faacd831781f25a12ffc8858d648f481d8bbdb68814b18c4c96e3a661233d0e25d675b95feeb35eee4b5ea88e5e0a1fc5fbaecbe434d3f7246d80e81bff6a3 |
37 |
DIST sqlite-src-3270100.zip 12247922 BLAKE2B 324488f345e1b15c4d31772d709a7591e9e278842267d84e44cf62e63cbf0acc4a8da2e0d280a5d43d48f67235c067fd97f791d67916803746c83310cbb62c49 SHA512 5ae0d3ee747df85e5dcd7cb64057ec64843079cfcf163558aa793194ec8ba0ad5570d9c8cb152b6510357ec074da6dba7cfd2f64466f06565c54cd175d9f8945 |
38 |
DIST sqlite-src-3270200.zip 12248529 BLAKE2B b3c79b85bbfa376b31ebb4ad33aea3f0b60c1f6d1e6505e02758cffff41e44ea0c5b8c24892f0757502ed6213c0f97f00957632ddf0e5ffe25e9f8b7f62c6e9a SHA512 52f61e2fa54558b953dba62b27961eef8563f40e6b4a62638087cb22c7d1fdf2c915ea1071939e2e98f3ce6041da2c9bfb1bdbc1e8b8b4a049b8148e878a4e5e |
39 |
+DIST sqlite-src-3280000.zip 12477204 BLAKE2B e62e0f36f0bebf89990f8ec91cb1e508a5ebc92bb212eaf9c80eb0febecb5623f5938ecd31c210837314f1f9aab19a18189824f82a106799384d8184ca5f65ab SHA512 49c35c65fa686a2326e13218db583c54fa5fe8f48f0caddd11a942601803b3023f7d32ffbab16641e0d72dc9ed288ad26eaa7226c865ac54e1f181859125651f |
40 |
|
41 |
diff --git a/dev-db/sqlite/files/sqlite-3.28.0-full_archive-build.patch b/dev-db/sqlite/files/sqlite-3.28.0-full_archive-build.patch |
42 |
new file mode 100644 |
43 |
index 00000000000..95b53328c43 |
44 |
--- /dev/null |
45 |
+++ b/dev-db/sqlite/files/sqlite-3.28.0-full_archive-build.patch |
46 |
@@ -0,0 +1,461 @@ |
47 |
+Move some code to libsqlite3.so to avoid duplication. |
48 |
+Link executables against libsqlite3.so. |
49 |
+Increase timeout for fuzzcheck. |
50 |
+Fix building with dlopen() not available. |
51 |
+ |
52 |
+--- /Makefile.in |
53 |
++++ /Makefile.in |
54 |
+@@ -311,6 +311,9 @@ |
55 |
+ # Source code for extensions |
56 |
+ # |
57 |
+ SRC += \ |
58 |
++ $(TOP)/ext/expert/sqlite3expert.c \ |
59 |
++ $(TOP)/ext/expert/sqlite3expert.h |
60 |
++SRC += \ |
61 |
+ $(TOP)/ext/fts1/fts1.c \ |
62 |
+ $(TOP)/ext/fts1/fts1.h \ |
63 |
+ $(TOP)/ext/fts1/fts1_hash.c \ |
64 |
+@@ -363,8 +366,11 @@ |
65 |
+ $(TOP)/ext/rbu/sqlite3rbu.h \ |
66 |
+ $(TOP)/ext/rbu/sqlite3rbu.c |
67 |
+ SRC += \ |
68 |
++ $(TOP)/ext/misc/appendvfs.c \ |
69 |
+ $(TOP)/ext/misc/json1.c \ |
70 |
+- $(TOP)/ext/misc/stmt.c |
71 |
++ $(TOP)/ext/misc/sqlar.c \ |
72 |
++ $(TOP)/ext/misc/stmt.c \ |
73 |
++ $(TOP)/ext/misc/zipfile.c |
74 |
+ |
75 |
+ # Generated source code files |
76 |
+ # |
77 |
+@@ -435,7 +441,6 @@ |
78 |
+ # Statically linked extensions |
79 |
+ # |
80 |
+ TESTSRC += \ |
81 |
+- $(TOP)/ext/expert/sqlite3expert.c \ |
82 |
+ $(TOP)/ext/expert/test_expert.c \ |
83 |
+ $(TOP)/ext/misc/amatch.c \ |
84 |
+ $(TOP)/ext/misc/carray.c \ |
85 |
+@@ -461,7 +466,6 @@ |
86 |
+ $(TOP)/ext/misc/totype.c \ |
87 |
+ $(TOP)/ext/misc/unionvtab.c \ |
88 |
+ $(TOP)/ext/misc/wholenumber.c \ |
89 |
+- $(TOP)/ext/misc/zipfile.c \ |
90 |
+ $(TOP)/ext/userauth/userauth.c |
91 |
+ |
92 |
+ # Source code to the library files needed by the test fixture |
93 |
+@@ -640,25 +644,25 @@ |
94 |
+ |
95 |
+ libtclsqlite3.la: tclsqlite.lo libsqlite3.la |
96 |
+ $(LTLINK) -no-undefined -o $@ tclsqlite.lo \ |
97 |
+- libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \ |
98 |
++ libsqlite3.la @TCL_STUB_LIB_SPEC@ \ |
99 |
+ -rpath "$(TCLLIBDIR)" \ |
100 |
+ -version-info "8:6:8" \ |
101 |
+ -avoid-version |
102 |
+ |
103 |
+-sqlite3$(TEXE): shell.c sqlite3.c |
104 |
+- $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \ |
105 |
+- shell.c sqlite3.c \ |
106 |
+- $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)" |
107 |
++sqlite3$(TEXE): shell.c libsqlite3.la |
108 |
++ $(LTLINK) $(READLINE_FLAGS) -o $@ \ |
109 |
++ shell.c libsqlite3.la \ |
110 |
++ $(LIBREADLINE) |
111 |
+ |
112 |
+-sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h |
113 |
+- $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS) |
114 |
++sqldiff$(TEXE): $(TOP)/tool/sqldiff.c libsqlite3.la |
115 |
++ $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c libsqlite3.la |
116 |
+ |
117 |
+-dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h |
118 |
+- $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS) |
119 |
++dbhash$(TEXE): $(TOP)/tool/dbhash.c libsqlite3.la |
120 |
++ $(LTLINK) -o $@ $(TOP)/tool/dbhash.c libsqlite3.la |
121 |
+ |
122 |
+-scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.lo |
123 |
++scrub$(TEXE): $(TOP)/ext/misc/scrub.c libsqlite3.la |
124 |
+ $(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \ |
125 |
+- $(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS) |
126 |
++ $(TOP)/ext/misc/scrub.c libsqlite3.la |
127 |
+ |
128 |
+ srcck1$(BEXE): $(TOP)/tool/srcck1.c |
129 |
+ $(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c |
130 |
+@@ -768,7 +772,7 @@ |
131 |
+ # Rule to build the amalgamation |
132 |
+ # |
133 |
+ sqlite3.lo: sqlite3.c |
134 |
+- $(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c |
135 |
++ $(LTCOMPILE) $(SHELL_OPT) $(TEMP_STORE) -c sqlite3.c |
136 |
+ |
137 |
+ # Rules to build the LEMON compiler generator |
138 |
+ # |
139 |
+@@ -1065,14 +1069,9 @@ |
140 |
+ # Source files that go into making shell.c |
141 |
+ SHELL_SRC = \ |
142 |
+ $(TOP)/src/shell.c.in \ |
143 |
+- $(TOP)/ext/misc/appendvfs.c \ |
144 |
+ $(TOP)/ext/misc/shathree.c \ |
145 |
+ $(TOP)/ext/misc/fileio.c \ |
146 |
+ $(TOP)/ext/misc/completion.c \ |
147 |
+- $(TOP)/ext/misc/sqlar.c \ |
148 |
+- $(TOP)/ext/expert/sqlite3expert.c \ |
149 |
+- $(TOP)/ext/expert/sqlite3expert.h \ |
150 |
+- $(TOP)/ext/misc/zipfile.c \ |
151 |
+ $(TOP)/ext/misc/memtrace.c \ |
152 |
+ $(TOP)/src/test_windirent.c |
153 |
+ |
154 |
+@@ -1240,15 +1239,15 @@ |
155 |
+ |
156 |
+ # Fuzz testing |
157 |
+ fuzztest: fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db |
158 |
+- ./fuzzcheck$(TEXE) $(FUZZDATA) |
159 |
++ ./fuzzcheck$(TEXE) --timeout 3600 $(FUZZDATA) |
160 |
+ ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db |
161 |
+ |
162 |
+ fastfuzztest: fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db |
163 |
+- ./fuzzcheck$(TEXE) --limit-mem 100M $(FUZZDATA) |
164 |
++ ./fuzzcheck$(TEXE) --limit-mem 100M --timeout 3600 $(FUZZDATA) |
165 |
+ ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db |
166 |
+ |
167 |
+ valgrindfuzz: fuzzcheck$(TEXT) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db |
168 |
+- valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA) |
169 |
++ valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 3600 $(FUZZDATA) |
170 |
+ valgrind ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db |
171 |
+ |
172 |
+ # The veryquick.test TCL tests. |
173 |
+@@ -1279,24 +1278,23 @@ |
174 |
+ smoketest: $(TESTPROGS) fuzzcheck$(TEXE) |
175 |
+ ./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS) |
176 |
+ |
177 |
+-sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in |
178 |
++sqlite3_analyzer.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in |
179 |
+ $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c |
180 |
+ |
181 |
+-sqlite3_analyzer$(TEXE): sqlite3_analyzer.c |
182 |
+- $(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS) |
183 |
++sqlite3_analyzer$(TEXE): sqlite3_analyzer.c libsqlite3.la |
184 |
++ $(LTLINK) sqlite3_analyzer.c -o $@ libsqlite3.la $(LIBTCL) |
185 |
+ |
186 |
+-sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/ext/misc/appendvfs.c $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in |
187 |
++sqltclsh.c: $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in |
188 |
+ $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c |
189 |
+ |
190 |
+-sqltclsh$(TEXE): sqltclsh.c |
191 |
+- $(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS) |
192 |
++sqltclsh$(TEXE): sqltclsh.c libsqlite3.la |
193 |
++ $(LTLINK) sqltclsh.c -o $@ libsqlite3.la $(LIBTCL) |
194 |
+ |
195 |
+-sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c |
196 |
+- $(LTLINK) $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(TLIBS) |
197 |
++sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/expert.c libsqlite3.la |
198 |
++ $(LTLINK) $(TOP)/ext/expert/expert.c -o sqlite3_expert libsqlite3.la |
199 |
+ |
200 |
+ CHECKER_DEPS =\ |
201 |
+ $(TOP)/tool/mkccode.tcl \ |
202 |
+- sqlite3.c \ |
203 |
+ $(TOP)/src/tclsqlite.c \ |
204 |
+ $(TOP)/ext/repair/sqlite3_checker.tcl \ |
205 |
+ $(TOP)/ext/repair/checkindex.c \ |
206 |
+@@ -1307,36 +1305,36 @@ |
207 |
+ sqlite3_checker.c: $(CHECKER_DEPS) |
208 |
+ $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@ |
209 |
+ |
210 |
+-sqlite3_checker$(TEXE): sqlite3_checker.c |
211 |
+- $(LTLINK) sqlite3_checker.c -o $@ $(LIBTCL) $(TLIBS) |
212 |
++sqlite3_checker$(TEXE): sqlite3_checker.c libsqlite3.la |
213 |
++ $(LTLINK) sqlite3_checker.c -o $@ libsqlite3.la $(LIBTCL) |
214 |
+ |
215 |
+-dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo |
216 |
++dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c libsqlite3.la |
217 |
+ $(LTLINK) -DDBDUMP_STANDALONE -o $@ \ |
218 |
+- $(TOP)/ext/misc/dbdump.c sqlite3.lo $(TLIBS) |
219 |
++ $(TOP)/ext/misc/dbdump.c libsqlite3.la |
220 |
+ |
221 |
+-dbtotxt$(TEXE): $(TOP)/tool/dbtotxt.c |
222 |
+- $(LTLINK)-o $@ $(TOP)/tool/dbtotxt.c |
223 |
++dbtotxt$(TEXE): $(TOP)/tool/dbtotxt.c |
224 |
++ $(LTLINK) -o $@ $(TOP)/tool/dbtotxt.c |
225 |
+ |
226 |
+-showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.lo |
227 |
+- $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS) |
228 |
++showdb$(TEXE): $(TOP)/tool/showdb.c libsqlite3.la |
229 |
++ $(LTLINK) -o $@ $(TOP)/tool/showdb.c libsqlite3.la |
230 |
+ |
231 |
+-showstat4$(TEXE): $(TOP)/tool/showstat4.c sqlite3.lo |
232 |
+- $(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS) |
233 |
++showstat4$(TEXE): $(TOP)/tool/showstat4.c libsqlite3.la |
234 |
++ $(LTLINK) -o $@ $(TOP)/tool/showstat4.c libsqlite3.la |
235 |
+ |
236 |
+-showjournal$(TEXE): $(TOP)/tool/showjournal.c sqlite3.lo |
237 |
+- $(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS) |
238 |
++showjournal$(TEXE): $(TOP)/tool/showjournal.c |
239 |
++ $(LTLINK) -o $@ $(TOP)/tool/showjournal.c |
240 |
+ |
241 |
+-showwal$(TEXE): $(TOP)/tool/showwal.c sqlite3.lo |
242 |
+- $(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS) |
243 |
++showwal$(TEXE): $(TOP)/tool/showwal.c |
244 |
++ $(LTLINK) -o $@ $(TOP)/tool/showwal.c |
245 |
+ |
246 |
+ showshm$(TEXE): $(TOP)/tool/showshm.c |
247 |
+ $(LTLINK) -o $@ $(TOP)/tool/showshm.c |
248 |
+ |
249 |
+-index_usage$(TEXE): $(TOP)/tool/index_usage.c sqlite3.lo |
250 |
+- $(LTLINK) $(SHELL_OPT) -o $@ $(TOP)/tool/index_usage.c sqlite3.lo $(TLIBS) |
251 |
++index_usage$(TEXE): $(TOP)/tool/index_usage.c libsqlite3.la |
252 |
++ $(LTLINK) -o $@ $(TOP)/tool/index_usage.c libsqlite3.la |
253 |
+ |
254 |
+-changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.lo |
255 |
+- $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.lo $(TLIBS) |
256 |
++changeset$(TEXE): $(TOP)/ext/session/changeset.c libsqlite3.la |
257 |
++ $(LTLINK) -o $@ $(TOP)/ext/session/changeset.c libsqlite3.la |
258 |
+ |
259 |
+ changesetfuzz$(TEXE): $(TOP)/ext/session/changesetfuzz.c sqlite3.lo |
260 |
+ $(LTLINK) -o $@ $(TOP)/ext/session/changesetfuzz.c sqlite3.lo $(TLIBS) |
261 |
+@@ -1361,11 +1359,11 @@ |
262 |
+ kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c |
263 |
+ $(LTLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(TLIBS) |
264 |
+ |
265 |
+-rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.lo |
266 |
+- $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.lo $(TLIBS) |
267 |
++rbu$(EXE): $(TOP)/ext/rbu/rbu.c libsqlite3.la |
268 |
++ $(LTLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c libsqlite3.la |
269 |
+ |
270 |
+-loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la |
271 |
+- $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ $(TLIBS) |
272 |
++loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la |
273 |
++ $(LTLINK) $(TOP)/tool/loadfts.c libsqlite3.la -o $@ |
274 |
+ |
275 |
+ # This target will fail if the SQLite amalgamation contains any exported |
276 |
+ # symbols that do not begin with "sqlite3_". It is run as part of the |
277 |
+--- /configure.ac |
278 |
++++ /configure.ac |
279 |
+@@ -587,6 +587,9 @@ |
280 |
+ if test "${enable_load_extension}" = "yes" ; then |
281 |
+ OPT_FEATURE_FLAGS="" |
282 |
+ AC_SEARCH_LIBS(dlopen, dl) |
283 |
++ if test "${ac_cv_search_dlopen}" = "no" ; then |
284 |
++ OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" |
285 |
++ fi |
286 |
+ else |
287 |
+ OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" |
288 |
+ fi |
289 |
+--- /ext/misc/sqlar.c |
290 |
++++ /ext/misc/sqlar.c |
291 |
+@@ -14,6 +14,8 @@ |
292 |
+ ** for working with sqlar archives and used by the shell tool's built-in |
293 |
+ ** sqlar support. |
294 |
+ */ |
295 |
++#ifdef SQLITE_HAVE_ZLIB |
296 |
++ |
297 |
+ #include "sqlite3ext.h" |
298 |
+ SQLITE_EXTENSION_INIT1 |
299 |
+ #include <zlib.h> |
300 |
+@@ -119,3 +121,5 @@ |
301 |
+ } |
302 |
+ return rc; |
303 |
+ } |
304 |
++ |
305 |
++#endif /* SQLITE_HAVE_ZLIB */ |
306 |
+--- /ext/misc/zipfile.c |
307 |
++++ /ext/misc/zipfile.c |
308 |
+@@ -24,6 +24,8 @@ |
309 |
+ ** * No support for zip64 extensions |
310 |
+ ** * Only the "inflate/deflate" (zlib) compression method is supported |
311 |
+ */ |
312 |
++#ifdef SQLITE_HAVE_ZLIB |
313 |
++ |
314 |
+ #include "sqlite3ext.h" |
315 |
+ SQLITE_EXTENSION_INIT1 |
316 |
+ #include <stdio.h> |
317 |
+@@ -2176,3 +2178,5 @@ |
318 |
+ (void)pzErrMsg; /* Unused parameter */ |
319 |
+ return zipfileRegister(db); |
320 |
+ } |
321 |
++ |
322 |
++#endif /* SQLITE_HAVE_ZLIB */ |
323 |
+--- /ext/repair/sqlite3_checker.c.in |
324 |
++++ /ext/repair/sqlite3_checker.c.in |
325 |
+@@ -2,6 +2,7 @@ |
326 |
+ ** Read an SQLite database file and analyze its space utilization. Generate |
327 |
+ ** text on standard output. |
328 |
+ */ |
329 |
++#define SQLITE_CORE 1 |
330 |
+ #define TCLSH_INIT_PROC sqlite3_checker_init_proc |
331 |
+ #define SQLITE_ENABLE_DBPAGE_VTAB 1 |
332 |
+ #define SQLITE_ENABLE_JSON1 1 |
333 |
+@@ -14,7 +15,7 @@ |
334 |
+ #define SQLITE_OMIT_SHARED_CACHE 1 |
335 |
+ #define SQLITE_DEFAULT_MEMSTATUS 0 |
336 |
+ #define SQLITE_MAX_EXPR_DEPTH 0 |
337 |
+-INCLUDE sqlite3.c |
338 |
++#include "sqlite3.h" |
339 |
+ INCLUDE $ROOT/src/tclsqlite.c |
340 |
+ INCLUDE $ROOT/ext/misc/btreeinfo.c |
341 |
+ INCLUDE $ROOT/ext/repair/checkindex.c |
342 |
+--- /src/shell.c.in |
343 |
++++ /src/shell.c.in |
344 |
+@@ -61,6 +61,7 @@ |
345 |
+ #include <stdio.h> |
346 |
+ #include <assert.h> |
347 |
+ #include "sqlite3.h" |
348 |
++#include "ext/expert/sqlite3expert.h" |
349 |
+ typedef sqlite3_int64 i64; |
350 |
+ typedef sqlite3_uint64 u64; |
351 |
+ typedef unsigned char u8; |
352 |
+@@ -127,6 +128,10 @@ |
353 |
+ # define SHELL_USE_LOCAL_GETLINE 1 |
354 |
+ #endif |
355 |
+ |
356 |
++#ifdef SQLITE_HAVE_ZLIB |
357 |
++#include <zlib.h> |
358 |
++#endif |
359 |
++ |
360 |
+ |
361 |
+ #if defined(_WIN32) || defined(WIN32) |
362 |
+ # include <io.h> |
363 |
+@@ -939,14 +944,7 @@ |
364 |
+ INCLUDE ../ext/misc/shathree.c |
365 |
+ INCLUDE ../ext/misc/fileio.c |
366 |
+ INCLUDE ../ext/misc/completion.c |
367 |
+-INCLUDE ../ext/misc/appendvfs.c |
368 |
+ INCLUDE ../ext/misc/memtrace.c |
369 |
+-#ifdef SQLITE_HAVE_ZLIB |
370 |
+-INCLUDE ../ext/misc/zipfile.c |
371 |
+-INCLUDE ../ext/misc/sqlar.c |
372 |
+-#endif |
373 |
+-INCLUDE ../ext/expert/sqlite3expert.h |
374 |
+-INCLUDE ../ext/expert/sqlite3expert.c |
375 |
+ |
376 |
+ #if defined(SQLITE_ENABLE_SESSION) |
377 |
+ /* |
378 |
+@@ -4000,7 +3998,9 @@ |
379 |
+ sqlite3_shathree_init(p->db, 0, 0); |
380 |
+ sqlite3_completion_init(p->db, 0, 0); |
381 |
+ #ifdef SQLITE_HAVE_ZLIB |
382 |
++ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *); |
383 |
+ sqlite3_zipfile_init(p->db, 0, 0); |
384 |
++ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *); |
385 |
+ sqlite3_sqlar_init(p->db, 0, 0); |
386 |
+ #endif |
387 |
+ sqlite3_create_function(p->db, "shell_add_schema", 3, SQLITE_UTF8, 0, |
388 |
+@@ -5971,6 +5971,7 @@ |
389 |
+ goto end_ar_command; |
390 |
+ } |
391 |
+ sqlite3_fileio_init(cmd.db, 0, 0); |
392 |
++ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *); |
393 |
+ sqlite3_sqlar_init(cmd.db, 0, 0); |
394 |
+ sqlite3_create_function(cmd.db, "shell_putsnl", 1, SQLITE_UTF8, cmd.p, |
395 |
+ shellPutsFunc, 0, 0); |
396 |
+@@ -9260,6 +9261,7 @@ |
397 |
+ #endif |
398 |
+ } |
399 |
+ data.out = stdout; |
400 |
++ extern int sqlite3_appendvfs_init(sqlite3 *, char **, const sqlite3_api_routines *); |
401 |
+ sqlite3_appendvfs_init(0,0,0); |
402 |
+ |
403 |
+ /* Go ahead and open the database file if it already exists. If the |
404 |
+--- /test/sessionfuzz.c |
405 |
++++ /test/sessionfuzz.c |
406 |
+@@ -700,42 +700,6 @@ |
407 |
+ #include <assert.h> |
408 |
+ #include "zlib.h" |
409 |
+ |
410 |
+-/* |
411 |
+-** Implementation of the "sqlar_uncompress(X,SZ)" SQL function |
412 |
+-** |
413 |
+-** Parameter SZ is interpreted as an integer. If it is less than or |
414 |
+-** equal to zero, then this function returns a copy of X. Or, if |
415 |
+-** SZ is equal to the size of X when interpreted as a blob, also |
416 |
+-** return a copy of X. Otherwise, decompress blob X using zlib |
417 |
+-** utility function uncompress() and return the results (another |
418 |
+-** blob). |
419 |
+-*/ |
420 |
+-static void sqlarUncompressFunc( |
421 |
+- sqlite3_context *context, |
422 |
+- int argc, |
423 |
+- sqlite3_value **argv |
424 |
+-){ |
425 |
+- uLong nData; |
426 |
+- uLongf sz; |
427 |
+- |
428 |
+- assert( argc==2 ); |
429 |
+- sz = sqlite3_value_int(argv[1]); |
430 |
+- |
431 |
+- if( sz<=0 || sz==(nData = sqlite3_value_bytes(argv[0])) ){ |
432 |
+- sqlite3_result_value(context, argv[0]); |
433 |
+- }else{ |
434 |
+- const Bytef *pData= sqlite3_value_blob(argv[0]); |
435 |
+- Bytef *pOut = sqlite3_malloc(sz); |
436 |
+- if( Z_OK!=uncompress(pOut, &sz, pData, nData) ){ |
437 |
+- sqlite3_result_error(context, "error in uncompress()", -1); |
438 |
+- }else{ |
439 |
+- sqlite3_result_blob(context, pOut, sz, SQLITE_TRANSIENT); |
440 |
+- } |
441 |
+- sqlite3_free(pOut); |
442 |
+- } |
443 |
+-} |
444 |
+- |
445 |
+- |
446 |
+ /* Run a chunk of SQL. If any errors happen, print an error message |
447 |
+ ** and exit. |
448 |
+ */ |
449 |
+--- /tool/mksqlite3c.tcl |
450 |
++++ /tool/mksqlite3c.tcl |
451 |
+@@ -117,6 +117,7 @@ |
452 |
+ rtree.h |
453 |
+ sqlite3session.h |
454 |
+ sqlite3.h |
455 |
++ sqlite3expert.h |
456 |
+ sqlite3ext.h |
457 |
+ sqlite3rbu.h |
458 |
+ sqliteicu.h |
459 |
+@@ -403,6 +404,10 @@ |
460 |
+ sqlite3session.c |
461 |
+ fts5.c |
462 |
+ stmt.c |
463 |
++ appendvfs.c |
464 |
++ sqlar.c |
465 |
++ sqlite3expert.c |
466 |
++ zipfile.c |
467 |
+ } { |
468 |
+ copy_file tsrc/$file |
469 |
+ } |
470 |
+--- /tool/sqlite3_analyzer.c.in |
471 |
++++ /tool/sqlite3_analyzer.c.in |
472 |
+@@ -14,9 +14,6 @@ |
473 |
+ #define SQLITE_DEFAULT_MEMSTATUS 0 |
474 |
+ #define SQLITE_MAX_EXPR_DEPTH 0 |
475 |
+ #define SQLITE_OMIT_LOAD_EXTENSION 1 |
476 |
+-#ifndef USE_EXTERNAL_SQLITE |
477 |
+-INCLUDE sqlite3.c |
478 |
+-#endif |
479 |
+ INCLUDE $ROOT/src/tclsqlite.c |
480 |
+ |
481 |
+ const char *sqlite3_analyzer_init_proc(Tcl_Interp *interp){ |
482 |
+--- /tool/sqltclsh.c.in |
483 |
++++ /tool/sqltclsh.c.in |
484 |
+@@ -27,19 +27,17 @@ |
485 |
+ #define SQLITE_OMIT_SHARED_CACHE 1 |
486 |
+ #define SQLITE_DEFAULT_MEMSTATUS 0 |
487 |
+ #define SQLITE_MAX_EXPR_DEPTH 0 |
488 |
+-INCLUDE sqlite3.c |
489 |
+-INCLUDE $ROOT/ext/misc/appendvfs.c |
490 |
+-#ifdef SQLITE_HAVE_ZLIB |
491 |
+-INCLUDE $ROOT/ext/misc/zipfile.c |
492 |
+-INCLUDE $ROOT/ext/misc/sqlar.c |
493 |
+-#endif |
494 |
++#include "sqlite3.h" |
495 |
+ INCLUDE $ROOT/src/tclsqlite.c |
496 |
+ |
497 |
+ const char *sqlite3_tclapp_init_proc(Tcl_Interp *interp){ |
498 |
+ (void)interp; |
499 |
++ extern int sqlite3_appendvfs_init(sqlite3 *,char **, const sqlite3_api_routines *); |
500 |
+ sqlite3_appendvfs_init(0,0,0); |
501 |
+ #ifdef SQLITE_HAVE_ZLIB |
502 |
++ extern int sqlite3_sqlar_init(sqlite3 *, char **, const sqlite3_api_routines *); |
503 |
+ sqlite3_auto_extension((void(*)(void))sqlite3_sqlar_init); |
504 |
++ extern int sqlite3_zipfile_init(sqlite3 *, char **, const sqlite3_api_routines *); |
505 |
+ sqlite3_auto_extension((void(*)(void))sqlite3_zipfile_init); |
506 |
+ #endif |
507 |
+ |
508 |
|
509 |
diff --git a/dev-db/sqlite/files/sqlite-3.28.0-full_archive-segmentation_fault_fixes.patch b/dev-db/sqlite/files/sqlite-3.28.0-full_archive-segmentation_fault_fixes.patch |
510 |
new file mode 100644 |
511 |
index 00000000000..cf430a9ddc5 |
512 |
--- /dev/null |
513 |
+++ b/dev-db/sqlite/files/sqlite-3.28.0-full_archive-segmentation_fault_fixes.patch |
514 |
@@ -0,0 +1,954 @@ |
515 |
+https://sqlite.org/src/info/b2ce5ed175cb5029 |
516 |
+https://sqlite.org/src/info/6e4a5f22811bcd14 |
517 |
+https://sqlite.org/src/info/516ca8945150bdc1 |
518 |
+https://sqlite.org/src/info/e1724f1d618cfbcf |
519 |
+https://sqlite.org/src/info/c621fc668c6538f9 |
520 |
+https://sqlite.org/src/info/c509d8a8aebe0da4 |
521 |
+https://sqlite.org/src/info/a9b90aa12eecdd9f |
522 |
+ |
523 |
+--- /ext/fts3/fts3_write.c |
524 |
++++ /ext/fts3/fts3_write.c |
525 |
+@@ -3754,7 +3754,7 @@ |
526 |
+ } |
527 |
+ p->iOff += fts3GetVarint32(&p->aNode[p->iOff], &nSuffix); |
528 |
+ |
529 |
+- if( nPrefix>p->iOff || nSuffix>p->nNode-p->iOff ){ |
530 |
++ if( nPrefix>p->term.n || nSuffix>p->nNode-p->iOff || nSuffix==0 ){ |
531 |
+ return FTS_CORRUPT_VTAB; |
532 |
+ } |
533 |
+ blobGrowBuffer(&p->term, nPrefix+nSuffix, &rc); |
534 |
+@@ -3773,7 +3773,7 @@ |
535 |
+ } |
536 |
+ } |
537 |
+ |
538 |
+- assert( p->iOff<=p->nNode ); |
539 |
++ assert_fts3_nc( p->iOff<=p->nNode ); |
540 |
+ return rc; |
541 |
+ } |
542 |
+ |
543 |
+--- /ext/fts5/fts5_buffer.c |
544 |
++++ /ext/fts5/fts5_buffer.c |
545 |
+@@ -178,7 +178,11 @@ |
546 |
+ i64 iOff = *piOff; |
547 |
+ int iVal; |
548 |
+ fts5FastGetVarint32(a, i, iVal); |
549 |
+- if( iVal==1 ){ |
550 |
++ if( iVal<=1 ){ |
551 |
++ if( iVal==0 ){ |
552 |
++ *pi = i; |
553 |
++ return 0; |
554 |
++ } |
555 |
+ fts5FastGetVarint32(a, i, iVal); |
556 |
+ iOff = ((i64)iVal) << 32; |
557 |
+ fts5FastGetVarint32(a, i, iVal); |
558 |
+--- /ext/fts5/test/fts5corrupt3.test |
559 |
++++ /ext/fts5/test/fts5corrupt3.test |
560 |
+@@ -8128,6 +8128,215 @@ |
561 |
+ INSERT INTO t1(t1) VALUES('optimize') |
562 |
+ } {1 {database disk image is malformed}} |
563 |
+ |
564 |
++#------------------------------------------------------------------------- |
565 |
++reset_db |
566 |
++do_test 58.0 { |
567 |
++ sqlite3 db {} |
568 |
++ db deserialize [decode_hexdb { |
569 |
++.open --hexdb |
570 |
++| size 24576 pagesize 4096 filename crash-5a5acd0ab42d31.db |
571 |
++| page 1 offset 0 |
572 |
++| 0: 53 51 4c 69 74 65 20 66 6f 72 6d 61 74 20 33 00 SQLite format 3. |
573 |
++| 16: 10 00 01 01 00 40 20 20 00 00 00 00 00 00 00 00 .....@ ........ |
574 |
++| 96: 00 00 00 00 0d 00 00 00 06 0e 0f 00 0f aa 0f 53 ...............S |
575 |
++| 112: 0e e8 0e 8b 0e 33 0e 0f 00 00 00 00 00 00 00 00 .....3.......... |
576 |
++| 3584: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 22 ................ |
577 |
++| 3600: 06 06 17 11 11 01 31 74 61 62 6c 65 62 62 62 62 ......1tablebbbb |
578 |
++| 3616: 06 43 52 45 41 54 45 20 54 41 42 4c 45 20 62 62 .CREATE TABLE bb |
579 |
++| 3632: 28 61 29 56 05 06 17 1f 1f 01 7d 74 61 62 6c 65 (a)V.......table |
580 |
++| 3648: 74 31 5f 63 2a 6e 66 69 68 74 31 5f 63 6f 6e 66 t1_c*nfiht1_conf |
581 |
++| 3664: 69 67 05 43 52 45 41 54 45 20 54 41 42 4c 45 20 ig.CREATE TABLE |
582 |
++| 3680: 27 74 31 5f 63 6f 6e 66 69 67 27 28 6b 20 50 52 't1_config'(k PR |
583 |
++| 3696: 49 4d 41 52 59 20 4b 45 59 2c 20 76 29 20 57 49 IMARY KEY, v) WI |
584 |
++| 3712: 54 48 4f 55 54 20 52 4f 57 49 44 5b 04 07 17 21 THOUT ROWID[...! |
585 |
++| 3728: 21 01 81 01 74 61 62 6c 65 74 31 5f 64 6f 73 73 !...tablet1_doss |
586 |
++| 3744: 69 7a 65 74 31 5f 64 6f 63 73 69 7a 65 04 43 52 izet1_docsize.CR |
587 |
++| 3760: 45 41 54 45 20 54 41 42 4c 45 20 27 74 31 5f 64 EATE TABLE 't1_d |
588 |
++| 3776: 6f 63 73 69 7a 65 27 28 69 64 20 49 4e 54 45 47 ocsize'(id INTEG |
589 |
++| 3792: 45 52 20 50 52 49 4d 41 52 59 20 4b 45 59 2c 20 ER PRIMARY KEY, |
590 |
++| 3808: 73 7a 20 42 4c 4f 42 29 69 03 07 17 19 19 01 81 sz BLOB)i....... |
591 |
++| 3824: 2d 74 61 62 6c 65 74 31 5f 69 64 78 74 31 5f 69 -tablet1_idxt1_i |
592 |
++| 3840: 64 78 03 43 52 45 41 54 45 20 54 41 42 4c 45 20 dx.CREATE TABLE |
593 |
++| 3856: 27 74 31 5f 69 64 78 27 28 73 65 67 69 64 2c 20 't1_idx'(segid, |
594 |
++| 3872: 74 65 72 6d 2c 20 70 67 6e 6f 2c 20 50 52 49 4d term, pgno, PRIM |
595 |
++| 3888: 41 52 59 20 4b 45 59 28 73 65 67 69 64 2c 20 74 ARY KEY(segid, t |
596 |
++| 3904: 65 72 6d 29 29 20 57 49 54 48 4f 55 54 20 52 4f erm)) WITHOUT RO |
597 |
++| 3920: 57 49 44 55 02 07 17 1b 1b 01 81 01 74 61 62 6c WIDU........tabl |
598 |
++| 3936: 65 74 31 5f 64 61 74 61 74 31 5f 64 61 74 61 02 et1_datat1_data. |
599 |
++| 3952: 43 52 45 41 54 45 20 54 41 42 4c 45 20 27 74 31 CREATE TABLE 't1 |
600 |
++| 3968: 5f 64 61 74 61 27 28 69 64 20 49 4e 54 45 47 45 _data'(id INTEGE |
601 |
++| 3984: 52 20 50 52 49 4d 41 52 59 20 4b 45 59 2c 20 62 R PRIMARY KEY, b |
602 |
++| 4000: 6c 6f 63 6b 20 42 4c 4f 42 29 54 01 07 17 11 11 lock BLOB)T..... |
603 |
++| 4016: 08 81 15 74 61 62 6c 65 74 31 74 31 43 52 45 41 ...tablet1t1CREA |
604 |
++| 4032: 54 45 20 56 49 52 54 55 41 4c 20 54 41 42 4c 45 TE VIRTUAL TABLE |
605 |
++| 4048: 20 74 31 20 55 53 49 4e 47 20 66 74 73 35 28 61 t1 USING fts5(a |
606 |
++| 4064: 2c 62 2c 70 72 65 66 69 78 3d 22 32 2c 32 2c 33 ,b,prefix=.2,2,3 |
607 |
++| 4080: 2c 34 22 2c 20 63 6f 6e 74 65 6e 74 3d 22 22 29 ,4., content=..) |
608 |
++| page 2 offset 4096 |
609 |
++| 0: 0d 0b 6a 00 37 09 4c 02 0f e7 09 4c 0f c6 0f a4 ..j.7.L....L.... |
610 |
++| 16: 0f 88 0f 6d 0f 4b 0f 2c 0f 0e 0e ec 0e cd 0e ae ...m.K.,........ |
611 |
++| 32: 0e 8e 0e 6c 0e 4b 0e 29 0e 08 0d e6 0d c4 0d b5 ...l.K.)........ |
612 |
++| 48: 0d 97 0d 76 0d 54 0d 30 fd 15 0c f3 0c d3 0c b5 ...v.T.0........ |
613 |
++| 64: 0c 95 0c 73 0c 54 0c 32 0c 10 0b ee 0b cc 0b b0 ...s.T.2........ |
614 |
++| 80: 0b 8d 0b 7e 0b 48 0b 2e 0b 0b 0a ef 0a cc 0a ad ...~.H.......... |
615 |
++| 96: 0a 8c 0a 6d 0a 4d 0a 2b 0a 0c 00 00 00 00 00 00 ...m.M.+........ |
616 |
++| 2368: 00 00 00 00 00 00 00 00 00 00 00 00 15 0a 03 00 ................ |
617 |
++| 2384: 30 00 00 00 9c 01 03 35 00 03 01 01 12 02 01 12 0......5........ |
618 |
++| 2400: 03 01 11 1c 8c 80 80 80 80 10 03 00 3e 00 00 00 ............>... |
619 |
++| 2416: 17 01 05 05 34 74 61 62 6c 03 02 03 01 04 77 68 ....4tabl.....wh |
620 |
++| 2432: 65 72 03 02 06 09 1b 8c 80 80 80 80 0f 03 00 3c er.............< |
621 |
++| 2448: 00 00 00 16 05 34 66 74 73 34 03 02 02 01 04 6e .....4fts4.....n |
622 |
++| 2464: 75 6d 62 03 06 01 04 09 1b 8c 80 80 80 80 0e 03 umb............. |
623 |
++| 2480: 00 3c 00 00 00 16 04 33 74 68 65 03 06 01 01 04 .<.....3the..... |
624 |
++| 2496: 01 03 77 68 65 03 02 04 04 0a 1b 8c 80 80 80 80 ..whe........... |
625 |
++| 2512: 0d 03 00 3c 00 00 00 16 04 33 6e 75 6d 03 06 01 ...<.....3num... |
626 |
++| 2528: 01 05 01 03 74 61 62 05 62 03 04 0a 19 8c 80 80 ....tab.b....... |
627 |
++| 2544: 80 80 0c 03 00 38 00 00 00 14 03 39 a7 68 03 02 .....8.....9.h.. |
628 |
++| 2560: 04 10 04 33 66 74 73 03 02 02 04 07 18 8c 80 80 ...3fts......... |
629 |
++| 2576: 80 80 0b 03 00 36 00 00 00 13 03 32 74 61 03 02 .....6.....2ta.. |
630 |
++| 2592: 03 02 01 68 03 06 01 01 04 04 07 1b 8c 80 80 80 ...h............ |
631 |
++| 2608: 80 0a 03 00 3c 00 00 00 16 03 32 6e 75 03 06 01 ....<.....2nu... |
632 |
++| 2624: 01 05 01 02 6f 66 03 06 01 01 06 04 09 19 8c 80 ....of.......... |
633 |
++| 2640: 80 80 80 09 03 00 38 00 00 00 14 03 32 66 74 03 ......8.....2ft. |
634 |
++| 2656: 02 02 01 02 69 73 03 06 01 01 03 04 07 18 8c 80 ....is.......... |
635 |
++| 2672: 80 80 80 08 03 00 36 00 00 00 13 02 31 74 03 08 ......6.....1t.. |
636 |
++| 2688: 03 01 01 04 01 01 77 03 02 04 04 09 1a 8c 80 80 ......w......... |
637 |
++| 2704: 80 80 07 03 00 3a ff 00 00 15 02 31 6e 03 08 01 .....:.....1n... |
638 |
++| 2720: 01 02 05 01 01 6f 03 06 01 01 06 04 09 18 8c 80 .....o.......... |
639 |
++| 2736: 80 80 80 06 03 00 36 00 00 00 13 04 02 31 66 03 ......6......1f. |
640 |
++| 2752: 02 01 f1 01 69 03 06 01 01 03 05 06 1c 8c 80 80 ....i........... |
641 |
++| 2768: 80 80 05 03 00 3e 00 00 00 17 04 30 74 68 65 03 .....>.....0the. |
642 |
++| 2784: 06 01 01 14 01 05 77 68 65 72 65 03 02 04 0a 15 ......where..... |
643 |
++| 2800: 8c 80 80 80 80 04 03 00 30 00 00 00 11 01 01 06 ........0....... |
644 |
++| 2816: 06 30 74 61 62 6c cc 03 02 03 07 1c 8c 80 80 80 .0tabl.......... |
645 |
++| 2832: 80 03 03 00 3e 00 00 00 17 07 30 6e 75 6d 62 65 ....>.....0numbe |
646 |
++| 2848: 72 03 06 01 01 05 01 02 6f 66 02 06 04 0d 13 8c r.......of...... |
647 |
++| 2864: 80 80 80 80 02 03 00 2c 00 00 00 0f 01 01 03 02 .......,........ |
648 |
++| 2880: 30 6e 03 06 01 01 02 07 1b 8c 80 80 80 80 01 03 0n.............. |
649 |
++| 2896: 00 3c 00 00 00 16 08 30 66 74 73 34 61 75 78 03 .<.....0fts4aux. |
650 |
++| 2912: 02 02 01 02 69 73 03 06 04 0c 00 00 00 14 2a 00 ....is........*. |
651 |
++| 2928: 00 00 01 01 02 24 00 02 01 01 12 02 01 12 08 88 .....$.......... |
652 |
++| 2944: 80 80 80 80 12 03 00 16 00 00 00 05 02 1c 88 80 ................ |
653 |
++| 2960: 80 80 80 11 03 00 3e 00 00 00 17 05 34 72 6f 77 ......>.....4row |
654 |
++| 2976: 73 02 06 01 01 05 01 04 74 68 65 72 02 02 04 0b s.......ther.... |
655 |
++| 2992: 15 88 80 80 80 80 10 03 00 3e 10 00 00 11 02 01 .........>...... |
656 |
++| 3008: 01 07 05 34 62 65 74 77 02 02 04 08 1b 88 80 80 ...4betw........ |
657 |
++| 3024: 80 80 0f 03 00 3c 00 00 00 16 04 04 33 72 6f 77 .....<......3row |
658 |
++| 3040: 02 06 01 01 05 01 03 74 68 65 02 08 05 0a 1b 88 .......the...... |
659 |
++| 3056: 80 80 80 80 0e 03 05 0c 00 00 00 16 01 01 02 04 ................ |
660 |
++| 3072: 33 61 72 65 02 02 03 01 03 62 65 74 02 02 07 08 3are.....bet.... |
661 |
++| 3088: 1b 88 80 80 80 80 0d 03 00 3c 00 00 00 16 03 32 .........<.....2 |
662 |
++| 3104: 74 68 02 08 02 01 01 07 00 04 33 61 6e 64 02 06 th........3and.. |
663 |
++| 3120: 04 01 1b 88 80 80 80 80 0c 03 00 3c 00 00 00 16 ...........<.... |
664 |
++| 3136: 03 32 69 6e 02 06 01 01 06 01 02 72 6f 02 06 01 .2in.......ro... |
665 |
++| 3152: 01 05 04 09 18 88 80 80 80 80 0b 03 00 36 00 00 .............6.. |
666 |
++| 3168: 00 13 02 03 32 61 72 02 02 03 01 02 62 65 02 02 ....2ar.....be.. |
667 |
++| 3184: 04 05 07 1b 88 80 bf 80 80 0a 03 00 3c 00 00 00 ............<... |
668 |
++| 3200: 16 02 31 74 02 08 02 01 01 07 00 03 32 61 6e 02 ..1t........2an. |
669 |
++| 3216: 06 01 01 04 09 19 88 80 80 80 80 09 03 00 38 00 ..............8. |
670 |
++| 3232: 00 00 14 02 31 6e 02 06 01 01 03 01 01 72 02 06 ....1n.......r.. |
671 |
++| 3248: 01 01 05 03 08 17 88 80 80 80 80 08 03 00 34 00 ..............4. |
672 |
++| 3264: 01 00 12 02 31 62 02 02 04 01 01 69 02 06 01 01 ....1b.....i.... |
673 |
++| 3280: 06 04 06 19 88 80 80 80 80 07 03 00 38 00 00 00 ............8... |
674 |
++| 3296: 14 04 02 31 32 02 02 05 01 01 61 02 08 03 01 01 ...12.....a..... |
675 |
++| 3312: 02 05 06 1b 88 80 80 80 80 06 03 00 3c 00 00 00 ............<... |
676 |
++| 3328: 16 06 30 74 68 65 72 65 02 12 02 00 02 31 31 02 ..0there.....11. |
677 |
++| 3344: 06 01 01 04 0a 15 88 80 80 80 80 05 03 00 30 00 ..............0. |
678 |
++| 3360: 00 00 11 01 01 05 04 30 74 68 65 02 06 71 01 07 .......0the..q.. |
679 |
++| 3376: 07 1c 88 80 80 80 80 04 03 00 3e 00 00 00 17 01 ..........>..... |
680 |
++| 3392: 01 06 02 30 6e 02 06 01 01 03 01 04 72 6f 77 73 ...0n.......rows |
681 |
++| 3408: 02 06 07 08 1b 88 80 80 80 80 03 03 00 3c 00 00 .............<.. |
682 |
++| 3424: 00 16 08 30 62 65 74 77 65 65 6e 02 02 04 01 02 ...0between..... |
683 |
++| 3440: 69 6e 02 06 04 0c 1a 88 80 80 80 80 02 03 00 3a in.............: |
684 |
++| 3456: 08 f0 00 15 04 30 61 6e 64 02 06 01 01 02 02 02 .....0and....... |
685 |
++| 3472: 72 65 02 02 03 04 0a 17 88 80 80 80 80 01 03 00 re.............. |
686 |
++| 3488: 34 00 00 00 12 02 30 31 02 06 01 01 04 01 01 32 4.....01.......2 |
687 |
++| 3504: 02 02 07 04 08 08 84 80 80 80 80 12 03 00 16 00 ................ |
688 |
++| 3520: 00 00 05 04 1b 84 80 80 80 80 11 03 00 3c 00 00 .............<.. |
689 |
++| 3536: 00 16 05 34 74 61 62 6c 01 06 01 01 05 02 03 65 ...4tabl.......e |
690 |
++| 3552: 72 6d 01 02 04 0b 1b 84 80 80 80 80 10 03 00 3c rm.............< |
691 |
++| 3568: 00 00 00 16 05 34 65 61 63 68 01 02 03 01 04 70 .....4each.....p |
692 |
++| 3584: 72 65 73 01 02 05 04 09 1a 84 80 80 80 80 0f 03 res............. |
693 |
++| 3600: 00 3a 00 00 00 15 04 33 74 65 72 01 02 04 02 02 .:.....3ter..... |
694 |
++| 3616: 68 65 01 06 01 01 03 04 08 1b 84 80 80 80 80 0e he.............. |
695 |
++| 3632: 03 00 3c 00 00 00 16 04 33 70 72 65 01 02 05 01 ..<.....3pre.... |
696 |
++| 3648: 03 74 61 62 01 06 01 01 05 04 08 1a 84 80 80 80 .tab............ |
697 |
++| 3664: 80 0d 03 00 3a 00 00 00 15 04 33 66 6f 72 01 02 ....:.....3for.. |
698 |
++| 3680: 02 02 02 74 73 01 06 01 01 04 03 f8 1b 84 80 80 ...ts........... |
699 |
++| 3696: 80 80 0c 03 00 3c 00 00 00 16 03 32 74 68 01 06 .....<.....2th.. |
700 |
++| 3712: 01 01 03 00 04 33 65 61 63 01 02 03 04 09 18 84 .....3eac....... |
701 |
++| 3728: 80 80 80 80 0b 03 00 36 00 00 00 13 03 32 74 61 .......6.....2ta |
702 |
++| 3744: 01 06 01 01 05 02 01 65 00 02 04 04 09 19 84 80 .......e........ |
703 |
++| 3760: 80 80 80 0a 03 10 38 00 00 00 14 03 32 69 6e 01 ......8.....2in. |
704 |
++| 3776: 06 01 01 02 01 02 70 72 01 02 05 04 09 18 84 80 ......pr........ |
705 |
++| 3792: 80 80 80 09 03 00 36 00 00 00 13 03 32 66 6f 01 ......6.....2fo. |
706 |
++| 3808: 02 02 02 01 74 01 06 01 01 04 04 07 1b 84 80 80 ....t........... |
707 |
++| 3824: 80 80 08 03 00 3c 00 00 00 16 02 31 74 01 0a 04 .....<.....1t... |
708 |
++| 3840: 01 00 03 04 00 03 32 65 61 01 02 03 04 0a 17 84 ......2ea....... |
709 |
++| 3856: 80 80 80 80 07 03 00 34 00 00 00 12 02 31 69 01 .......4.....1i. |
710 |
++| 3872: 06 01 01 02 de 01 70 01 02 05 04 08 18 84 80 80 ......p......... |
711 |
++| 3888: 80 80 06 03 00 36 00 00 00 13 02 31 65 01 02 03 .....6.....1e... |
712 |
++| 3904: 01 01 66 01 08 02 01 01 04 04 06 1b 84 80 80 80 ..f............. |
713 |
++| 3920: 80 05 03 00 3c 00 00 00 16 05 30 74 65 72 6d 01 ....<.....0term. |
714 |
++| 3936: 02 04 02 02 68 65 01 06 01 01 03 04 09 14 84 80 ....he.......... |
715 |
++| 3952: 80 80 80 04 03 00 2e 00 00 00 10 06 30 74 61 62 ............0tab |
716 |
++| 3968: 6c 65 01 06 01 01 05 04 15 84 80 80 80 80 03 03 le.............. |
717 |
++| 3984: 00 30 00 00 00 11 02 08 30 70 72 65 73 65 6e 74 .0......0present |
718 |
++| 4000: 01 02 05 05 1b 84 80 80 80 80 02 03 00 3c 00 00 .............<.. |
719 |
++| 4016: 00 16 04 30 66 74 73 01 06 01 01 04 01 02 69 6e ...0fts.......in |
720 |
++| 4032: 01 06 01 01 04 0a 1a 84 80 80 80 80 01 03 00 3a ...............: |
721 |
++| 4048: 00 00 00 15 05 30 65 61 63 68 00 f2 03 01 03 66 .....0each.....f |
722 |
++| 4064: 6f 72 01 02 02 04 09 06 01 03 00 12 03 0b 0f 00 or.............. |
723 |
++| 4080: 00 08 8c 80 80 80 80 11 03 00 16 00 00 00 05 04 ................ |
724 |
++| page 3 offset 8192 |
725 |
++| 0: 0a 00 00 00 32 0e 4f 00 0f fa 0f f1 0f e9 0f e1 ....2.O......... |
726 |
++| 16: 0f d8 0f d1 0f c9 0f c1 0f b9 0f c1 0f a9 0f a0 ................ |
727 |
++| 32: 0f 98 0f 90 0f 87 0f 80 0f 78 0f 71 0f 68 0f 5f .........x.q.h._ |
728 |
++| 48: 0f 56 0f 4d 0f 41 0f 38 0f 2f 0f 26 0f 1d 0f 13 .V.M.A.8./.&.... |
729 |
++| 64: 0f 0a 0f 01 0e f7 0e ee 0e e6 0e dd 0e d7 0e cd ................ |
730 |
++| 80: 0e c3 0e ba 0e b0 0e a8 0e 9f 0e 96 0e 8e 0e 85 ................ |
731 |
++| 3648: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 08 ................ |
732 |
++| 3664: 04 01 10 01 03 34 74 20 07 04 01 0e 01 03 34 1e .....4t ......4. |
733 |
++| 3680: 09 04 01 12 34 03 33 74 68 1c 08 04 01 10 01 03 ....4.3th....... |
734 |
++| 3696: 33 6e 1a 08 04 01 10 01 03 32 77 18 08 04 01 10 3n.......2w..... |
735 |
++| 3712: 01 03 32 74 16 08 04 01 10 01 03 32 6e 14 07 04 ..2t.......2n... |
736 |
++| 3728: 01 0e 01 03 32 12 08 04 01 0f f1 03 31 74 10 08 ....2.......1t.. |
737 |
++| 3744: 04 01 10 01 03 31 6e 0e 07 04 01 0e 01 03 30 fc .....1n.......0. |
738 |
++| 3760: 09 04 01 12 01 03 30 74 68 0a 08 04 01 10 01 03 ......0th....... |
739 |
++| 3776: 30 74 08 09 04 01 12 01 03 30 6e 75 06 08 04 01 0t.......0nu.... |
740 |
++| 3792: 10 01 03 30 6e 04 06 04 01 0c 01 05 52 08 04 01 ...0n.......R... |
741 |
++| 3808: 10 01 02 34 72 22 07 04 01 0e 01 02 34 20 08 04 ...4r.......4 .. |
742 |
++| 3824: 01 10 01 02 33 72 1e 09 04 01 12 01 02 33 61 72 ....3r.......3ar |
743 |
++| 3840: 1c 08 04 01 10 01 02 32 74 1a 08 04 01 10 b3 02 .......2t....... |
744 |
++| 3856: 32 69 18 09 04 01 12 01 02 32 61 72 16 08 04 01 2i.......2ar.... |
745 |
++| 3872: 10 01 02 31 74 14 08 04 01 10 01 02 31 6e 12 08 ...1t.......1n.. |
746 |
++| 3888: 04 01 10 01 02 31 62 10 08 04 01 10 01 02 31 32 .....1b.......12 |
747 |
++| 3904: 0e 0b 04 01 16 01 02 30 74 68 65 72 0c 08 04 01 .......0ther.... |
748 |
++| 3920: 10 01 02 30 74 0a 08 04 01 10 01 02 30 6e 08 08 ...0t.......0n.. |
749 |
++| 3936: 04 01 10 01 02 30 62 06 09 04 01 10 01 02 30 61 .....0b.......0a |
750 |
++| 3952: 04 06 04 01 0c 01 02 02 07 04 09 10 01 34 74 22 .............4t. |
751 |
++| 3968: 06 04 09 0e 01 34 20 08 04 09 12 01 33 74 65 1e .....4 .....3te. |
752 |
++| 3984: 07 04 09 10 01 33 70 1c 07 f4 09 11 01 33 66 1a .....3p......3f. |
753 |
++| 4000: 08 04 09 12 01 32 74 68 18 07 04 09 10 01 32 e4 .....2th......2. |
754 |
++| 4016: 16 07 04 09 10 01 32 69 14 07 04 09 10 01 32 66 ......2i......2f |
755 |
++| 4032: 12 07 04 09 10 01 31 74 10 07 04 09 10 01 31 69 ......1t......1i |
756 |
++| 4048: 0e 06 04 09 0e 01 31 0c 08 04 09 12 01 30 74 65 ......1......0te |
757 |
++| 4064: 0a 07 04 09 10 01 30 74 08 00 00 00 00 00 00 00 ......0t........ |
758 |
++| page 4 offset 12288 |
759 |
++| 4064: 00 00 00 00 00 00 00 00 00 00 00 05 03 03 00 10 ................ |
760 |
++| 4080: 03 05 05 02 03 00 10 04 06 05 01 03 00 10 04 04 ................ |
761 |
++| page 5 offset 16384 |
762 |
++| 0: 0a 00 00 00 02 0f eb 00 0f eb 0f f4 00 00 00 00 ................ |
763 |
++| 4064: 00 00 00 00 00 00 00 00 00 00 00 08 03 15 01 70 ...............p |
764 |
++| 4080: 67 73 7a 18 0b 03 1b 01 76 65 72 73 69 6f 6e 04 gsz.....version. |
765 |
++| page 6 offset 20480 |
766 |
++| 4080: 00 00 23 03 02 01 03 03 02 00 00 00 00 00 00 00 ..#............. |
767 |
++| end crash-5a5acd0ab42d31.db |
768 |
++}]} {} |
769 |
++ |
770 |
++do_execsql_test 58.1 { |
771 |
++ SELECT * FROM t1('t*'); |
772 |
++} {{} {} {} {} {} {}} |
773 |
+ |
774 |
+ sqlite3_fts5_may_be_corrupt 0 |
775 |
+ finish_test |
776 |
+--- /src/btree.c |
777 |
++++ /src/btree.c |
778 |
+@@ -4284,10 +4284,9 @@ |
779 |
+ rc = newDatabase(pBt); |
780 |
+ pBt->nPage = get4byte(28 + pBt->pPage1->aData); |
781 |
+ |
782 |
+- /* The database size was written into the offset 28 of the header |
783 |
+- ** when the transaction started, so we know that the value at offset |
784 |
+- ** 28 is nonzero. */ |
785 |
+- assert( pBt->nPage>0 ); |
786 |
++ /* pBt->nPage might be zero if the database was corrupt when |
787 |
++ ** the transaction was started. Otherwise, it must be at least 1. */ |
788 |
++ assert( CORRUPT_DB || pBt->nPage>0 ); |
789 |
+ } |
790 |
+ sqlite3BtreeLeave(p); |
791 |
+ } |
792 |
+@@ -7637,6 +7636,7 @@ |
793 |
+ u16 maskPage = pOld->maskPage; |
794 |
+ u8 *piCell = aData + pOld->cellOffset; |
795 |
+ u8 *piEnd; |
796 |
++ VVA_ONLY( int nCellAtStart = b.nCell; ) |
797 |
+ |
798 |
+ /* Verify that all sibling pages are of the same "type" (table-leaf, |
799 |
+ ** table-interior, index-leaf, or index-interior). |
800 |
+@@ -7665,6 +7665,10 @@ |
801 |
+ */ |
802 |
+ memset(&b.szCell[b.nCell], 0, sizeof(b.szCell[0])*(limit+pOld->nOverflow)); |
803 |
+ if( pOld->nOverflow>0 ){ |
804 |
++ if( limit<pOld->aiOvfl[0] ){ |
805 |
++ rc = SQLITE_CORRUPT_BKPT; |
806 |
++ goto balance_cleanup; |
807 |
++ } |
808 |
+ limit = pOld->aiOvfl[0]; |
809 |
+ for(j=0; j<limit; j++){ |
810 |
+ b.apCell[b.nCell] = aData + (maskPage & get2byteAligned(piCell)); |
811 |
+@@ -7684,6 +7688,7 @@ |
812 |
+ piCell += 2; |
813 |
+ b.nCell++; |
814 |
+ } |
815 |
++ assert( (b.nCell-nCellAtStart)==(pOld->nCell+pOld->nOverflow) ); |
816 |
+ |
817 |
+ cntOld[i] = b.nCell; |
818 |
+ if( i<nOld-1 && !leafData){ |
819 |
+--- /src/resolve.c |
820 |
++++ /src/resolve.c |
821 |
+@@ -866,7 +866,9 @@ |
822 |
+ #ifndef SQLITE_OMIT_WINDOWFUNC |
823 |
+ if( pExpr->y.pWin ){ |
824 |
+ Select *pSel = pNC->pWinSelect; |
825 |
+- sqlite3WindowUpdate(pParse, pSel->pWinDefn, pExpr->y.pWin, pDef); |
826 |
++ if( IN_RENAME_OBJECT==0 ){ |
827 |
++ sqlite3WindowUpdate(pParse, pSel->pWinDefn, pExpr->y.pWin, pDef); |
828 |
++ } |
829 |
+ sqlite3WalkExprList(pWalker, pExpr->y.pWin->pPartition); |
830 |
+ sqlite3WalkExprList(pWalker, pExpr->y.pWin->pOrderBy); |
831 |
+ sqlite3WalkExpr(pWalker, pExpr->y.pWin->pFilter); |
832 |
+--- /src/vdbe.c |
833 |
++++ /src/vdbe.c |
834 |
+@@ -264,7 +264,7 @@ |
835 |
+ ** is clear. Otherwise, if this is an ephemeral cursor created by |
836 |
+ ** OP_OpenDup, the cursor will not be closed and will still be part |
837 |
+ ** of a BtShared.pCursor list. */ |
838 |
+- p->apCsr[iCur]->isEphemeral = 0; |
839 |
++ if( p->apCsr[iCur]->pBtx==0 ) p->apCsr[iCur]->isEphemeral = 0; |
840 |
+ sqlite3VdbeFreeCursor(p, p->apCsr[iCur]); |
841 |
+ p->apCsr[iCur] = 0; |
842 |
+ } |
843 |
+@@ -3686,7 +3686,10 @@ |
844 |
+ if( pCx ){ |
845 |
+ /* If the ephermeral table is already open, erase all existing content |
846 |
+ ** so that the table is empty again, rather than creating a new table. */ |
847 |
+- rc = sqlite3BtreeClearTable(pCx->pBtx, pCx->pgnoRoot, 0); |
848 |
++ assert( pCx->isEphemeral ); |
849 |
++ if( pCx->pBtx ){ |
850 |
++ rc = sqlite3BtreeClearTable(pCx->pBtx, pCx->pgnoRoot, 0); |
851 |
++ } |
852 |
+ }else{ |
853 |
+ pCx = allocateCursor(p, pOp->p1, pOp->p2, -1, CURTYPE_BTREE); |
854 |
+ if( pCx==0 ) goto no_mem; |
855 |
+--- /test/altertab3.test |
856 |
++++ /test/altertab3.test |
857 |
+@@ -142,6 +142,39 @@ |
858 |
+ ALTER TABLE Table0 RENAME Col0 TO Col0; |
859 |
+ } |
860 |
+ |
861 |
++#------------------------------------------------------------------------- |
862 |
++reset_db |
863 |
++do_execsql_test 7.1.0 { |
864 |
++ CREATE TABLE t1(a,b,c); |
865 |
++ CREATE TRIGGER AFTER INSERT ON t1 BEGIN |
866 |
++ SELECT a, rank() OVER w1 FROM t1 |
867 |
++ WINDOW w1 AS (PARTITION BY b, percent_rank() OVER w1); |
868 |
++ END; |
869 |
++} |
870 |
++ |
871 |
++do_execsql_test 7.1.2 { |
872 |
++ ALTER TABLE t1 RENAME TO t1x; |
873 |
++ SELECT sql FROM sqlite_master; |
874 |
++} { |
875 |
++ {CREATE TABLE "t1x"(a,b,c)} |
876 |
++ {CREATE TRIGGER AFTER INSERT ON "t1x" BEGIN |
877 |
++ SELECT a, rank() OVER w1 FROM "t1x" |
878 |
++ WINDOW w1 AS (PARTITION BY b, percent_rank() OVER w1); |
879 |
++ END} |
880 |
++} |
881 |
++ |
882 |
++do_execsql_test 7.2.1 { |
883 |
++ DROP TRIGGER after; |
884 |
++ CREATE TRIGGER AFTER INSERT ON t1x BEGIN |
885 |
++ SELECT a, rank() OVER w1 FROM t1x |
886 |
++ WINDOW w1 AS (PARTITION BY b, percent_rank() OVER w1 ORDER BY d); |
887 |
++ END; |
888 |
++} |
889 |
++ |
890 |
++do_catchsql_test 7.2.2 { |
891 |
++ ALTER TABLE t1x RENAME TO t1; |
892 |
++} {1 {error in trigger AFTER: no such column: d}} |
893 |
++ |
894 |
+ finish_test |
895 |
+ |
896 |
+ |
897 |
+--- /test/corruptL.test |
898 |
++++ /test/corruptL.test |
899 |
+@@ -838,4 +838,32 @@ |
900 |
+ INSERT INTO t3 SELECT * FROM t2; |
901 |
+ } {1 {database disk image is malformed}} |
902 |
+ |
903 |
++#------------------------------------------------------------------------- |
904 |
++reset_db |
905 |
++do_test 9.0 { |
906 |
++ sqlite3 db {} |
907 |
++ db deserialize [decode_hexdb { |
908 |
++| size 8192 pagesize 4096 filename crash-ab10597e4e1c32.db |
909 |
++| page 1 offset 0 |
910 |
++| 0: 53 51 4c 69 74 65 20 66 6f 72 6d 61 74 20 33 00 SQLite format 3. |
911 |
++| 16: 10 00 01 01 00 40 20 20 00 00 00 00 00 00 00 00 .....@ ........ |
912 |
++| 96: 00 00 00 00 0d 00 00 00 01 0f d6 00 0f d6 00 00 ................ |
913 |
++| 4048: 00 00 00 00 00 00 28 01 06 17 11 11 01 3d 74 61 ......(......=ta |
914 |
++| 4064: 62 6c 65 74 31 74 31 02 43 52 45 41 54 45 20 54 blet1t1.CREATE T |
915 |
++| 4080: 41 42 4c 45 20 74 31 28 61 2c 62 2c 63 2c 64 29 ABLE t1(a,b,c,d) |
916 |
++| page 2 offset 4096 |
917 |
++| 0: 0d 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ |
918 |
++| end crash-ab10597e4e1c32.db |
919 |
++}]} {} |
920 |
++ |
921 |
++do_execsql_test 9.1 { |
922 |
++ SAVEPOINT one; |
923 |
++} |
924 |
++do_catchsql_test 9.3 { |
925 |
++ INSERT INTO t1(b,c) VALUES(5,6); |
926 |
++} {1 {database disk image is malformed}} |
927 |
++do_execsql_test 9.3 { |
928 |
++ ROLLBACK TO one; |
929 |
++} |
930 |
++ |
931 |
+ finish_test |
932 |
+--- /test/fts3corrupt4.test |
933 |
++++ /test/fts3corrupt4.test |
934 |
+@@ -3915,5 +3915,491 @@ |
935 |
+ SELECT 'FyzLy'FROM t1 WHERE t1 MATCH 'j'; |
936 |
+ } {1 {database disk image is malformed}} |
937 |
+ |
938 |
++#------------------------------------------------------------------------- |
939 |
++reset_db |
940 |
++do_test 24.0 { |
941 |
++ sqlite3 db {} |
942 |
++ db deserialize [decode_hexdb { |
943 |
++.open --hexdb |
944 |
++| size 28672 pagesize 4096 filename crash-369d042958c29b.db |
945 |
++| page 1 offset 0 |
946 |
++| 0: 53 51 4c 69 74 65 20 66 6f 72 6d 61 74 20 33 00 SQLite format 3. |
947 |
++| 16: 10 00 01 01 00 40 20 20 00 00 03 10 00 00 00 00 .....@ ........ |
948 |
++| 96: 00 00 00 00 0d 0e b1 00 06 0d a4 00 0f 8d 0f 21 ...............! |
949 |
++| 112: 0e b9 0d c8 0e 7e 0d a4 00 00 00 00 00 00 00 00 .....~.......... |
950 |
++| 3488: 00 00 00 00 22 07 06 17 11 11 01 31 74 61 62 6c ...........1tabl |
951 |
++| 3504: 65 74 32 74 32 07 43 52 45 41 54 45 20 54 41 42 et2t2.CREATE TAB |
952 |
++| 3520: 4c 45 20 74 32 28 78 29 81 33 05 07 17 1f 1f 01 LE t2(x).3...... |
953 |
++| 3536: 82 35 74 61 62 6c 65 74 31 5f 73 65 67 64 69 72 .5tablet1_segdir |
954 |
++| 3552: 74 31 5f 73 65 67 64 69 72 05 43 52 45 41 54 45 t1_segdir.CREATE |
955 |
++| 3568: 20 54 41 42 4c 45 20 27 74 31 5f 73 65 67 64 69 TABLE 't1_segdi |
956 |
++| 3584: 72 27 28 6c 65 76 65 6c 20 49 4e 54 45 47 45 52 r'(level INTEGER |
957 |
++| 3600: 2c 69 64 78 20 49 4e 54 45 47 45 52 2c 73 74 61 ,idx INTEGER,sta |
958 |
++| 3616: 72 74 5f 62 6c 6f 63 6b 20 49 4e 54 45 47 45 52 rt_block INTEGER |
959 |
++| 3632: 2c 6c 65 61 76 65 73 5f 65 6e 64 5f 62 6c 6f 63 ,leaves_end_bloc |
960 |
++| 3648: 6b 20 49 4e 54 45 47 45 52 2c 65 6e 64 5f 62 6c k INTEGER,end_bl |
961 |
++| 3664: 6f 63 6b 20 49 4e 54 45 47 45 52 2c 72 6f 6f 74 ock INTEGER,root |
962 |
++| 3680: 20 42 4c 4f 42 2c 50 52 49 4d 41 52 59 20 4b 45 BLOB,PRIMARY KE |
963 |
++| 3696: 59 28 6c 65 76 65 6c 2c 20 69 64 78 29 29 31 06 Y(level, idx))1. |
964 |
++| 3712: 06 17 45 1f 01 00 69 6e 64 65 78 73 71 6c 69 74 ..E...indexsqlit |
965 |
++| 3728: 65 5f 61 75 74 6f 69 6e 64 65 78 5f 74 31 5f 73 e_autoindex_t1_s |
966 |
++| 3744: 65 67 64 69 72 5f 31 74 31 5f 73 65 67 64 69 72 egdir_1t1_segdir |
967 |
++| 3760: 06 0f c7 00 08 00 10 00 00 66 04 07 17 23 23 01 .........f...##. |
968 |
++| 3776: 81 13 74 61 62 6c 65 74 31 5f 73 65 67 6d 65 6e ..tablet1_segmen |
969 |
++| 3792: 64 73 74 31 5f 73 65 67 6d 65 6e 74 73 04 43 52 dst1_segments.CR |
970 |
++| 3808: 45 41 54 45 20 54 41 42 4c 45 20 27 74 31 5f 73 EATE TABLE 't1_s |
971 |
++| 3824: 65 67 6d 65 6e 74 73 27 28 62 6c 6f 63 6b 69 64 egments'(blockid |
972 |
++| 3840: 20 49 4e 54 45 47 45 52 20 50 52 49 4d 41 52 59 INTEGER PRIMARY |
973 |
++| 3856: 20 4b 45 59 2c 20 62 6c 6f 63 6b 20 42 4c 4f 42 KEY, block BLOB |
974 |
++| 3872: 29 6a 03 07 17 21 21 01 81 1f 74 61 62 6c 65 74 )j...!!...tablet |
975 |
++| 3888: 31 4f 63 6f 6e 74 65 6e 74 74 31 5f 63 6f 6e 74 1Ocontentt1_cont |
976 |
++| 3904: 65 6e 74 03 43 52 45 41 54 45 20 54 41 42 4c 45 ent.CREATE TABLE |
977 |
++| 3920: 20 27 74 31 5f 63 6f 6e 74 65 6e 74 27 28 64 6f 't1_content'(do |
978 |
++| 3936: 63 69 64 20 49 4e 54 45 47 45 52 20 50 52 39 4d cid INTEGER PR9M |
979 |
++| 3952: 41 52 59 20 4b 45 59 2c 20 27 63 30 61 27 2c 20 ARY KEY, 'c0a', |
980 |
++| 3968: 27 63 31 62 27 2c 20 27 63 32 63 27 29 38 02 06 'c1b', 'c2c')8.. |
981 |
++| 3984: 17 11 11 08 5f 74 61 62 6c 65 74 31 74 31 43 52 ...._tablet1t1CR |
982 |
++| 4000: 45 41 54 45 20 56 49 52 54 55 41 4c 20 54 41 42 EATE VIRTUAL TAB |
983 |
++| 4016: 4c 45 20 74 31 20 55 53 49 4e 47 20 66 74 73 33 LE t1 USING fts3 |
984 |
++| 4032: 28 61 2c 62 2c 63 29 00 00 00 00 00 00 00 00 00 (a,b,c)......... |
985 |
++| page 3 offset 8192 |
986 |
++| 0: 0d 00 00 00 26 0b 48 0e 0f d8 0f af 0f 86 0f 74 ....&.H........t |
987 |
++| 16: 0f 61 0f 4e 0f 2f 0f 0f 0e ef 0e d7 0e be 0e a5 .a.N./.......... |
988 |
++| 32: 0e 8d 0e 74 0e 5b 0e 40 0e 24 0e 08 0d ef 0d d5 ...t.[.@.$...... |
989 |
++| 48: 0d bb 0d a0 0e 94 03 28 0d 4f 0d 35 0d 1b 05 0b .......(.O.5.... |
990 |
++| 64: 0c da 0c b9 0c 99 0c 78 0c 57 0c 3e 0c 24 0c 0a .......x.W.>.$.. |
991 |
++| 2880: 00 00 00 00 00 00 00 00 81 3f 25 06 00 72 7f 00 .........?%..r.. |
992 |
++| 2896: 00 43 4f 4d 50 49 4c 45 52 3d 67 63 63 2d 35 2e .COMPILER=gcc-5. |
993 |
++| 2912: 34 2e 30 20 32 30 31 36 30 36 30 39 20 44 55 42 4.0 20160609 DUB |
994 |
++| 2928: 55 47 20 45 4e 41 e4 7c 45 20 44 42 53 54 41 54 UG ENA.|E DBSTAT |
995 |
++| 2944: e4 d1 54 41 42 20 45 4e 41 42 4c 45 20 46 54 53 ..TAB ENABLE FTS |
996 |
++| 2960: 34 20 45 4e 41 42 4c 45 20 46 54 53 35 20 45 4e 4 ENABLE FTS5 EN |
997 |
++| 2976: 41 42 4c 45 20 47 45 4f 50 4f 4c 59 20 45 4e 41 ABLE GEOPOLY ENA |
998 |
++| 2992: 42 4c 45 20 4a 53 4f 4e 31 20 45 4e 41 42 4c 45 BLE JSON1 ENABLE |
999 |
++| 3008: 20 4d 45 4d 53 59 53 35 20 45 4e 41 42 4c 45 20 MEMSYS5 ENABLE |
1000 |
++| 3024: 42 54 52 45 45 20 4d 41 58 20 4d 45 4d 4f 52 59 BTREE MAX MEMORY |
1001 |
++| 3040: 3d 35 30 30 30 30 30 30 30 20 4f 4c 49 54 20 4c =50000000 OLIT L |
1002 |
++| 3056: 4f 41 43 20 45 58 54 45 4e 53 49 4f 4e 21 54 48 OAC EXTENSION!TH |
1003 |
++| 3072: 52 45 41 44 53 41 46 45 3d 30 18 24 05 00 25 0f READSAFE=0.$..%. |
1004 |
++| 3088: 19 54 48 52 45 41 44 53 41 46 45 3d 30 58 42 49 .THREADSAFE=0XBI |
1005 |
++| 3104: 4e 41 52 59 18 23 05 00 25 0f 19 54 48 52 45 41 NARY.#..%..THREA |
1006 |
++| 3120: 44 53 41 4b 75 3d 30 58 4d 4f 43 41 53 45 17 22 DSAKu=0XMOCASE.. |
1007 |
++| 3136: 05 00 25 0f 17 54 48 52 45 41 44 53 41 46 46 3d ..%..THREADSAFF= |
1008 |
++| 3152: 30 58 52 54 52 49 4d 1f 21 05 00 33 0f 19 4f 4d 0XRTRIM.!..3..OM |
1009 |
++| 3168: 49 54 20 4c 4f 41 44 20 45 58 54 45 4e 52 49 4f IT LOAD EXTENRIO |
1010 |
++| 3184: 4e 58 42 49 4e 41 52 59 1f 20 05 00 33 0f 19 4f NXBINARY. ..3..O |
1011 |
++| 3200: 4d 49 54 20 4c 4f 41 44 20 45 58 54 45 4e 53 49 MIT LOAD EXTENSI |
1012 |
++| 3216: 4f 4e 58 4e 4f 43 41 53 45 1e 1f 05 00 33 0f 17 ONXNOCASE....3.. |
1013 |
++| 3232: 4f 4d 49 54 20 4c 4f 41 44 20 45 58 54 45 4e 53 OMIT LOAD EXTENS |
1014 |
++| 3248: 49 4f 4e 58 52 54 52 49 4d 1f 1e 05 00 33 0f 19 IONXRTRIM....3.. |
1015 |
++| 3264: 4d 41 58 20 4d 45 4d 4f 52 59 3d 35 30 30 30 30 MAX MEMORY=50000 |
1016 |
++| 3280: 30 30 30 58 42 49 4e 41 52 59 1f 1d 05 00 33 0f 000XBINARY....3. |
1017 |
++| 3296: 19 4d 41 58 20 4d 45 4d 4f 52 59 3d 35 30 30 30 .MAX MEMORY=5000 |
1018 |
++| 3312: 30 30 30 30 58 4e 4f 43 41 53 45 1e 1c 05 00 33 0000XNOCASE....3 |
1019 |
++| 3328: 0f 17 4d 42 b8 20 4d 45 4d 4f 52 59 3d 35 30 30 ..MB. MEMORY=500 |
1020 |
++| 3344: 30 30 30 30 30 58 52 54 52 49 4d 18 1b 05 00 25 00000XRTRIM....% |
1021 |
++| 3360: 0f 19 45 4e 41 42 4c 45 20 52 54 52 45 45 58 42 ..ENABLE RTREEXB |
1022 |
++| 3376: 49 4e 41 52 59 18 1a 05 0d a5 0f 19 45 4e 41 42 INARY.......ENAB |
1023 |
++| 3392: 4c 45 20 52 54 52 45 45 58 4e 4f 43 41 53 45 17 LE RTREEXNOCASE. |
1024 |
++| 3408: 19 1c 00 25 0f 17 45 4e 41 42 4c 45 20 52 54 52 ...%..ENABLE RTR |
1025 |
++| 3424: 45 45 58 52 54 52 49 4d 1a 18 05 00 29 0f 19 45 EEXRTRIM....)..E |
1026 |
++| 3440: 4e 41 42 4c 45 20 4d 45 4d 53 59 53 35 58 42 49 NABLE MEMSYS5XBI |
1027 |
++| 3456: 4e 41 52 59 1a 17 05 00 29 0f 19 45 4e 41 42 4c NARY....)..ENABL |
1028 |
++| 3472: 45 20 4d 45 4d 53 59 53 35 58 4e 4f 43 41 53 45 E MEMSYS5XNOCASE |
1029 |
++| 3488: 19 16 05 00 29 0f 17 45 4e 41 42 4c 45 20 4d 45 ....)..ENABLE ME |
1030 |
++| 3504: 4d 53 59 53 35 58 52 54 52 49 4d 18 14 05 01 25 MSYS5XRTRIM....% |
1031 |
++| 3520: 0f 19 45 4e 12 42 4c 45 20 4a 53 4f 4e 31 58 42 ..EN.BLE JSON1XB |
1032 |
++| 3536: 49 4e 41 52 59 18 14 05 00 25 09 d9 45 4e 41 42 INARY....%..ENAB |
1033 |
++| 3552: 4c 45 20 4a 53 4f 3e 31 58 4e 4f 43 41 53 45 17 LE JSO>1XNOCASE. |
1034 |
++| 3568: 13 05 00 25 0f 17 45 4e 40 42 4c 45 20 4a 53 4f ...%..EN@BLE JSO |
1035 |
++| 3584: 4e 31 58 52 54 52 49 4d 1a 12 05 82 29 0f 19 45 N1XRTRIM....)..E |
1036 |
++| 3600: 4e 41 42 4c 45 20 47 45 4f 50 4f 4c 59 58 42 49 NABLE GEOPOLYXBI |
1037 |
++| 3616: 4e 41 52 59 1a 11 05 c9 29 e8 19 46 4e 41 42 4c NARY....)..FNABL |
1038 |
++| 3632: 48 c0 47 45 4f 50 4f 4c 59 58 4e 74 43 41 53 45 H.GEOPOLYXNtCASE |
1039 |
++| 3648: 19 10 05 00 29 0f 17 45 4e 41 42 4c 45 20 47 45 ....)..ENABLE GE |
1040 |
++| 3664: 4f 50 4f 4c 59 58 52 54 52 49 4d 17 0f 05 00 23 OPOLYXRTRIM....# |
1041 |
++| 3680: 0f 19 45 4e 41 42 4c 45 30 46 54 53 35 58 42 49 ..ENABLE0FTS5XBI |
1042 |
++| 3696: 4e 41 52 59 17 0e 05 00 23 0f 19 45 4e 41 42 4c NARY....#..ENABL |
1043 |
++| 3712: 45 20 46 54 53 35 58 4e 4f 43 41 53 45 16 0e 05 E FTS5XNOCASE... |
1044 |
++| 3728: 00 23 0f 17 45 4e 41 42 4c 45 20 46 54 53 35 58 .#..ENABLE FTS5X |
1045 |
++| 3744: 52 54 52 49 4d 17 0c 05 00 23 0f 19 45 4e 41 42 RTRIM....#..ENAB |
1046 |
++| 3760: 4c 45 20 46 54 53 34 58 42 49 4e 41 52 59 17 0b LE FTS4XBINARY.. |
1047 |
++| 3776: 05 00 23 0f 19 45 4e 41 42 4c 45 20 46 54 53 34 ..#..ENABLE FTS4 |
1048 |
++| 3792: 58 4e 4f 43 41 53 45 16 0a 05 00 23 0f 17 45 4e XNOCASE....#..EN |
1049 |
++| 3808: 41 42 4c 45 20 46 54 53 34 58 52 54 52 49 4d 1e ABLE FTS4XRTRIM. |
1050 |
++| 3824: 09 05 00 31 0f 19 45 4e 42 42 4c 45 20 44 42 53 ...1..ENBBLE DBS |
1051 |
++| 3840: 54 41 54 20 56 54 41 42 58 42 49 4e 41 52 59 1e TAT VTABXBINARY. |
1052 |
++| 3856: 08 05 00 31 0f 19 45 4e 41 42 4c 45 20 44 42 53 ...1..ENABLE DBS |
1053 |
++| 3872: 54 41 54 20 56 54 41 42 58 4e 4f 43 41 53 45 1d TAT VTABXNOCASE. |
1054 |
++| 3888: 07 05 00 31 0f 17 45 4e 41 42 4c 45 20 44 42 53 ...1..ENABLE DBS |
1055 |
++| 3904: 54 41 54 20 56 54 41 42 58 52 54 52 4a 4d 11 06 TAT VTABXRTRJM.. |
1056 |
++| 3920: 05 f0 17 0f 19 44 45 42 55 47 58 42 49 4e 41 52 .....DEBUGXBINAR |
1057 |
++| 3936: 59 11 05 05 00 17 0e 19 44 45 42 55 47 58 4e 4f Y.......DEBUGXNO |
1058 |
++| 3952: 43 41 53 45 10 04 05 00 17 0f 16 44 45 42 55 47 CASE.......DEBUG |
1059 |
++| 3968: 58 52 54 52 49 4d 27 03 05 00 43 0f 19 43 4f 4d XRTRIM'...C..COM |
1060 |
++| 3984: 50 49 4c 45 52 3d 67 63 63 2d 35 2e 34 2e 30 20 PILER=gcc-5.4.0 |
1061 |
++| 4000: 32 30 31 36 30 36 30 39 58 42 49 4e 41 52 59 27 20160609XBINARY' |
1062 |
++| 4016: 02 05 00 43 0f 19 43 4f 4d 50 49 4c 45 52 3d 67 ...C..COMPILER=g |
1063 |
++| 4032: 63 63 2d 35 2e 34 2e 30 20 32 30 31 36 30 36 30 cc-5.4.0 2016060 |
1064 |
++| 4048: 39 58 4e 4f 43 41 53 45 26 01 06 00 43 0f 17 43 9XNOCASE&...C..C |
1065 |
++| 4064: 4f 4d 50 49 4b 45 52 3d 67 63 63 2d 35 2e 34 2e OMPIKER=gcc-5.4. |
1066 |
++| 4080: 30 20 32 30 31 36 30 36 40 39 58 29 54 52 49 4d 0 201606@9X)TRIM |
1067 |
++| page 4 offset 12288 |
1068 |
++| 0: 0d 00 10 00 00 10 00 00 00 00 00 00 00 01 00 00 ................ |
1069 |
++| page 5 offset 16384 |
1070 |
++| 0: 0d 00 00 00 02 0b a0 00 0c ad 0b a0 00 00 00 00 ................ |
1071 |
++| 2976: 82 0a 02 08 08 09 08 08 17 84 06 30 20 32 35 33 ...........0 253 |
1072 |
++| 2992: 00 01 30 04 25 06 1b 00 00 08 32 30 31 36 30 36 ..0.%.....201606 |
1073 |
++| 3008: 30 39 03 25 07 00 00 01 34 03 25 05 00 00 01 35 09.%....4.%....5 |
1074 |
++| 3024: 03 25 04 00 01 07 30 30 30 30 30 30 30 03 25 1a .%....0000000.%. |
1075 |
++| 3040: 00 00 08 63 6f 6d 70 69 6c 65 72 03 25 02 00 00 ...compiler.%... |
1076 |
++| 3056: 06 64 62 73 74 61 74 03 25 0a 00 01 04 65 62 75 .dbstat.%....ebu |
1077 |
++| 3072: 67 03 25 08 00 00 06 65 6e 61 62 6c 65 09 25 09 g.%....enable.%. |
1078 |
++| 3088: 05 04 04 04 04 04 00 01 08 78 74 65 6e 73 69 6f .........xtensio |
1079 |
++| 3104: 6e 03 25 1d 00 00 04 66 74 73 34 03 25 0d 00 03 n.%....fts4.%... |
1080 |
++| 3120: 01 35 03 25 0f 00 00 03 67 63 63 03 25 03 00 01 .5.%....gcc.%... |
1081 |
++| 3136: 06 65 6f 70 6f 6c 79 03 25 11 00 00 05 6a 73 6f .eopoly.%....jso |
1082 |
++| 3152: 6e 31 03 25 13 00 00 04 6c 6f 61 64 03 25 1c 00 n1.%....load.%.. |
1083 |
++| 3168: 00 03 6d 61 78 03 25 18 00 01 05 65 6e 6f 72 79 ..max.%....enory |
1084 |
++| 3184: 03 25 19 00 03 04 ce 79 73 4d 03 25 15 00 00 04 .%.....ysM.%.... |
1085 |
++| 3200: 6f 6d 69 74 03 25 1b 00 00 05 72 74 72 65 65 03 omit.%....rtree. |
1086 |
++| 3216: 25 17 00 00 0a 74 68 72 65 61 64 73 61 66 65 03 %....threadsafe. |
1087 |
++| 3232: 25 0e 00 00 04 76 74 61 62 03 25 0b 00 86 50 01 %....vtab.%...P. |
1088 |
++| 3248: 08 08 08 08 08 17 8d 12 30 20 38 33 35 00 01 30 ........0 835..0 |
1089 |
++| 3264: 12 01 06 00 01 06 00 01 06 00 1f 03 00 01 03 09 ................ |
1090 |
++| 3280: 51 03 00 00 08 32 30 31 36 30 36 30 39 09 01 07 Q....20160609... |
1091 |
++| 3296: 00 01 07 00 01 07 00 00 01 34 09 01 05 00 01 05 .........4...... |
1092 |
++| 3312: 00 01 05 00 00 01 35 09 01 04 00 01 04 00 01 04 ......5......... |
1093 |
++| 3328: 00 01 07 30 30 30 30 30 30 30 09 1c 04 00 01 04 ...0000000...... |
1094 |
++| 3344: 00 01 04 00 00 06 62 69 6e 61 72 79 3c 03 01 02 ......binary<... |
1095 |
++| 3360: 02 00 03 01 02 02 00 03 01 02 02 00 03 01 02 02 ................ |
1096 |
++| 3376: 00 03 01 02 02 00 02 f1 02 02 00 03 01 02 02 00 ................ |
1097 |
++| 3392: 03 01 02 02 00 03 01 02 02 00 03 01 02 02 00 03 ................ |
1098 |
++| 3408: 01 02 02 00 03 01 02 02 00 00 08 63 6f 6d 70 69 ...........compi |
1099 |
++| 3424: 6c 65 72 09 01 02 00 01 02 00 01 02 00 00 06 67 ler............g |
1100 |
++| 3440: d2 73 74 61 74 09 07 03 00 01 03 00 01 03 00 01 .stat........... |
1101 |
++| 3456: 04 65 62 75 67 09 04 02 00 01 02 00 01 02 00 00 .ebug........... |
1102 |
++| 3472: 06 65 6e 6f 82 6c 65 3f 07 02 00 01 02 00 01 02 .eno.le?........ |
1103 |
++| 3488: b0 01 02 00 01 02 00 11 02 00 01 02 00 01 02 00 ................ |
1104 |
++| 3504: 01 02 00 01 02 00 01 02 00 01 a6 00 01 02 00 01 ................ |
1105 |
++| 3520: 02 05 51 02 00 01 02 00 01 02 00 01 02 00 01 02 ..Q............. |
1106 |
++| 3536: 00 01 02 00 01 02 00 01 08 78 74 65 6e 73 69 6f .........xtensio |
1107 |
++| 3552: 6e 09 1f 04 00 01 04 00 00 04 00 00 04 66 74 73 n............fts |
1108 |
++| 3568: 34 09 0a 03 00 01 03 00 01 03 00 03 01 35 09 0d 4............5.. |
1109 |
++| 3584: 03 00 01 03 00 01 03 00 00 03 67 63 63 09 01 03 ..........gcc... |
1110 |
++| 3600: 00 01 03 00 01 03 00 01 06 65 6f 70 73 6c 79 09 .........eopsly. |
1111 |
++| 3616: 10 03 00 01 03 00 01 03 00 00 05 6a 73 6f 6e 31 ...........json1 |
1112 |
++| 3632: 09 13 03 00 01 03 00 01 03 00 00 04 6c 6f 61 64 ............load |
1113 |
++| 3648: 09 1f 03 00 01 03 00 01 03 00 00 03 6d 61 78 09 ............max. |
1114 |
++| 3664: 1c 02 00 01 02 00 01 02 00 01 05 65 6d 6f 72 79 ...........emory |
1115 |
++| 3680: 09 1c 03 00 01 03 00 01 03 00 03 04 73 79 73 35 ............sys5 |
1116 |
++| 3696: 09 16 03 00 01 03 00 01 03 00 00 06 6e 6f 63 61 ............noca |
1117 |
++| 3712: 73 65 3c 02 01 02 02 00 03 01 12 02 00 03 01 02 se<............. |
1118 |
++| 3728: 02 00 03 01 02 02 00 03 01 02 02 00 03 01 02 02 ................ |
1119 |
++| 3744: 00 03 01 02 02 00 03 01 02 02 00 03 01 02 02 00 ................ |
1120 |
++| 3760: 03 01 02 02 00 03 01 02 02 00 03 01 02 02 00 00 ................ |
1121 |
++| 3776: 04 6f 6d 69 74 09 1f 02 00 01 02 00 01 02 00 00 .omit........... |
1122 |
++| 3792: 05 72 74 72 65 65 09 19 03 00 01 03 00 01 03 00 .rtree.......... |
1123 |
++| 3808: 03 02 69 6d 3c 01 01 02 02 00 03 01 02 02 00 03 ..im<........... |
1124 |
++| 3824: 01 02 02 00 03 01 02 02 00 03 01 02 02 00 03 01 ................ |
1125 |
++| 3840: 02 02 00 03 01 02 02 00 03 01 02 02 00 03 01 02 ................ |
1126 |
++| 3856: 02 00 03 01 02 02 00 03 01 02 02 00 03 01 02 02 ................ |
1127 |
++| 3872: 00 00 0a 74 68 72 65 61 64 73 61 66 65 09 22 02 ...threadsafe... |
1128 |
++| 3888: 00 01 02 00 01 02 00 00 04 76 74 61 62 09 07 04 .........vtab... |
1129 |
++| 3904: 00 01 04 00 01 03 ff ff 01 78 b4 01 01 01 01 02 .........x...... |
1130 |
++| 3920: 00 01 01 01 02 00 01 01 01 02 00 01 01 01 02 00 ................ |
1131 |
++| 3936: 01 01 01 02 00 01 01 01 02 00 01 01 01 02 00 01 ................ |
1132 |
++| 3952: 01 01 02 00 01 01 01 07 30 01 01 01 02 00 01 01 ........0....... |
1133 |
++| 3968: 01 02 00 11 01 01 02 00 01 01 01 02 00 11 01 01 ................ |
1134 |
++| 3984: 02 00 01 01 01 02 00 01 01 01 02 00 01 01 01 02 ................ |
1135 |
++| 4000: 00 01 01 01 02 00 01 01 01 02 00 01 01 01 02 00 ................ |
1136 |
++| 4016: 01 01 01 01 ff 01 01 01 02 00 01 01 01 02 00 01 ................ |
1137 |
++| 4032: 01 01 02 00 01 01 01 02 00 01 01 01 02 00 01 01 ................ |
1138 |
++| 4048: 01 02 00 01 01 09 c2 00 01 01 01 02 00 01 01 01 ................ |
1139 |
++| 4064: 02 00 01 01 01 02 00 01 01 01 02 00 01 01 01 02 ................ |
1140 |
++| 4080: 00 01 01 01 02 00 01 01 01 02 00 01 01 01 02 00 ................ |
1141 |
++| page 6 offset 20480 |
1142 |
++| 0: 0a 00 00 00 02 0f f5 00 0f fb 0f f5 00 00 00 00 ................ |
1143 |
++| 4080: 00 00 00 00 00 05 04 08 09 01 02 04 04 08 08 09 ................ |
1144 |
++| page 7 offset 24576 |
1145 |
++| 0: 0d 00 00 00 05 0f b8 00 0e f4 0f e9 10 d6 0f c7 ................ |
1146 |
++| 4016: 00 00 00 00 00 00 00 00 0d 05 02 23 61 75 74 6f ...........#auto |
1147 |
++| 4032: 6d 65 72 67 65 3d 35 0d 04 02 23 6d 65 72 67 65 merge=5...#merge |
1148 |
++| 4048: 3d 31 00 00 00 00 00 00 00 00 00 00 00 00 00 00 =1.............. |
1149 |
++| end crash-369d042958c29b.db |
1150 |
++}]} {} |
1151 |
++ |
1152 |
++do_catchsql_test 24.1 { |
1153 |
++ WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT '4hE'+x FROM c WHERE x<72) |
1154 |
++ INSERT INTO t1(a) SELECT randomblob(2829) FROM c; |
1155 |
++} {0 {}} |
1156 |
++ |
1157 |
++do_catchsql_test 24.2 { |
1158 |
++ UPDATE t1 SET b=quote((true) ) WHERE t1 MATCH 'h'; |
1159 |
++} {0 {}} |
1160 |
++ |
1161 |
++do_catchsql_test 24.3 { |
1162 |
++ WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT 3+x FROM c WHERE x<72) |
1163 |
++ INSERT INTO t1(a) SELECT randomblob(2829) FROM c; |
1164 |
++} {0 {}} |
1165 |
++ |
1166 |
++do_catchsql_test 24.4 { |
1167 |
++ WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT null<<x FROM c WHERE x<72) |
1168 |
++ INSERT INTO t1(a) SELECT randomblob(2829) FROM c; |
1169 |
++} {0 {}} |
1170 |
++ |
1171 |
++do_catchsql_test 24.5 { |
1172 |
++ WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT 3+x FROM c WHERE x<72) |
1173 |
++ INSERT INTO t1(a) SELECT randomblob(2829) FROM c; |
1174 |
++} {0 {}} |
1175 |
++ |
1176 |
++do_catchsql_test 24.7 { |
1177 |
++ INSERT INTO t1(t1) SELECT x FROM t2; |
1178 |
++} {1 {database disk image is malformed}} |
1179 |
++ |
1180 |
++#------------------------------------------------------------------------- |
1181 |
++#------------------------------------------------------------------------- |
1182 |
++reset_db |
1183 |
++do_test 25.0 { |
1184 |
++ sqlite3 db {} |
1185 |
++ db deserialize [decode_hexdb { |
1186 |
++.open --hexdb |
1187 |
++| size 28672 pagesize 4096 filename crash-dde9e76ed8ab2d.db |
1188 |
++| page 1 offset 0 |
1189 |
++| 0: 53 51 4c 69 74 65 20 66 6f 72 6d 61 74 20 33 00 SQLite format 3. |
1190 |
++| 16: 10 00 01 01 00 40 20 20 00 00 03 10 00 00 00 00 .....@ ........ |
1191 |
++| 96: 00 00 00 00 0d 0e b1 00 06 0d a4 00 0f 8d 0f 21 ...............! |
1192 |
++| 112: 0e b9 0d c8 0e 7e 0d a4 00 00 00 00 00 00 00 00 .....~.......... |
1193 |
++| 3488: 00 00 00 00 22 07 06 17 11 11 01 31 74 61 62 6c ...........1tabl |
1194 |
++| 3504: 65 74 32 74 32 07 43 52 45 41 54 45 20 54 41 42 et2t2.CREATE TAB |
1195 |
++| 3520: 4c 45 20 74 32 28 78 29 81 33 05 07 17 1f 1f 01 LE t2(x).3...... |
1196 |
++| 3536: 82 35 74 61 62 6c 65 74 31 5f 73 65 67 64 69 72 .5tablet1_segdir |
1197 |
++| 3552: 74 31 5f 73 65 67 64 69 72 05 43 52 45 41 54 45 t1_segdir.CREATE |
1198 |
++| 3568: 20 54 41 42 4c 45 20 27 74 31 5f 73 65 67 64 69 TABLE 't1_segdi |
1199 |
++| 3584: 72 27 28 6c 65 76 65 6c 20 49 4e 54 45 47 45 52 r'(level INTEGER |
1200 |
++| 3600: 2c 69 64 78 20 49 4e 54 45 47 45 52 2c 73 74 61 ,idx INTEGER,sta |
1201 |
++| 3616: 72 74 5f 62 6c 6f 63 6b 20 49 4e 54 45 47 45 52 rt_block INTEGER |
1202 |
++| 3632: 2c 6c 65 61 76 65 73 5f 65 6e 64 5f 62 6c 6f 63 ,leaves_end_bloc |
1203 |
++| 3648: 6b 20 49 4e 54 45 47 45 52 2c 65 6e 64 5f 62 6c k INTEGER,end_bl |
1204 |
++| 3664: 6f 63 6b 20 49 4e 54 45 47 45 52 2c 72 6f 6f 74 ock INTEGER,root |
1205 |
++| 3680: 20 42 4c 4f 42 2c 50 52 49 4d 41 52 59 20 4b 45 BLOB,PRIMARY KE |
1206 |
++| 3696: 59 28 6c 65 76 65 6c 2c 20 69 64 78 29 29 31 06 Y(level, idx))1. |
1207 |
++| 3712: 06 17 45 1f 01 00 69 6e 64 65 78 73 71 6c 69 74 ..E...indexsqlit |
1208 |
++| 3728: 65 5f 61 75 74 6f 69 6e 64 65 78 5f 74 31 5f 73 e_autoindex_t1_s |
1209 |
++| 3744: 65 67 64 69 72 5f 31 74 31 5f 73 65 67 64 69 72 egdir_1t1_segdir |
1210 |
++| 3760: 06 0f c7 00 08 00 00 00 00 66 04 07 17 23 23 01 .........f...##. |
1211 |
++| 3776: 81 13 74 61 62 6c 65 74 31 5f 73 65 67 6d 65 6e ..tablet1_segmen |
1212 |
++| 3792: 64 73 74 31 5f 73 65 67 6d 65 6e 74 73 04 43 52 dst1_segments.CR |
1213 |
++| 3808: 45 41 54 45 20 54 41 42 4c 45 20 27 74 31 5f 73 EATE TABLE 't1_s |
1214 |
++| 3824: 65 67 6d 65 6e 74 73 27 28 62 6c 6f 63 6b 69 64 egments'(blockid |
1215 |
++| 3840: 20 49 4e 54 45 47 45 52 20 50 52 49 4d 41 52 59 INTEGER PRIMARY |
1216 |
++| 3856: 20 4b 45 59 2c 20 62 6c 6f 63 6b 20 42 4c 4f 42 KEY, block BLOB |
1217 |
++| 3872: 29 6a 03 07 17 21 21 01 81 1f 74 61 62 6c 65 74 )j...!!...tablet |
1218 |
++| 3888: 31 5f 63 6f 6e 74 65 6e 74 74 31 5f 63 6f 6e 74 1_contentt1_cont |
1219 |
++| 3904: 65 6e 74 03 43 52 45 41 54 45 20 54 41 42 4c 45 ent.CREATE TABLE |
1220 |
++| 3920: 20 27 74 31 5f 63 6f 6e 74 65 6e 74 27 28 64 6f 't1_content'(do |
1221 |
++| 3936: 63 69 64 20 49 4e 54 45 47 45 52 20 50 52 39 4d cid INTEGER PR9M |
1222 |
++| 3952: 41 52 59 20 4b 45 59 2c 20 27 63 30 61 27 2c 20 ARY KEY, 'c0a', |
1223 |
++| 3968: 27 63 31 62 27 2c 20 27 63 32 63 27 29 38 02 06 'c1b', 'c2c')8.. |
1224 |
++| 3984: 17 11 11 08 5f 74 61 62 6c 65 74 31 74 31 43 52 ...._tablet1t1CR |
1225 |
++| 4000: 45 41 54 45 20 56 49 52 54 55 41 4c 20 54 41 42 EATE VIRTUAL TAB |
1226 |
++| 4016: 4c 45 20 74 31 20 55 53 49 4e 47 20 66 74 73 33 LE t1 USING fts3 |
1227 |
++| 4032: 28 61 2c 62 2c 63 29 00 00 00 00 00 00 00 00 00 (a,b,c)......... |
1228 |
++| page 3 offset 8192 |
1229 |
++| 0: 0d 00 00 00 26 0b 48 0e 0f d8 0f af 0f 86 0f 74 ....&.H........t |
1230 |
++| 16: 0f 61 0f 4e 0f 2f 0f 0f 0e ef 0e d7 0e be 0e a5 .a.N./.......... |
1231 |
++| 32: 0e 8d 0e 74 0e 5b 0e 40 0e 24 0e 08 0d ef 0d d5 ...t.[.@.$...... |
1232 |
++| 48: 0d bb 0d a0 0e 94 03 28 0d 4f 0d 35 0d 1b 05 0b .......(.O.5.... |
1233 |
++| 64: 0c da 0c b9 0c 99 0c 78 0c 57 0c 3e 0c 24 0c 0a .......x.W.>.$.. |
1234 |
++| 2880: 00 00 00 00 00 00 00 00 81 3f 25 06 00 72 7f 00 .........?%..r.. |
1235 |
++| 2896: 00 43 4f 4d 50 49 4c 45 52 3d 67 63 63 2d 35 2e .COMPILER=gcc-5. |
1236 |
++| 2912: 34 2e 30 20 32 30 31 36 30 36 30 39 20 44 55 42 4.0 20160609 DUB |
1237 |
++| 2928: 55 47 20 45 4e 41 e4 7c 45 20 44 42 53 54 41 54 UG ENA.|E DBSTAT |
1238 |
++| 2944: e4 46 54 41 42 20 45 4e 41 42 4c 45 20 46 54 53 .FTAB ENABLE FTS |
1239 |
++| 2960: 34 20 45 4e 41 42 4c 45 20 46 54 53 35 20 45 4e 4 ENABLE FTS5 EN |
1240 |
++| 2976: 41 42 4c 45 20 47 45 4f 50 4f 4c 59 20 45 4e 41 ABLE GEOPOLY ENA |
1241 |
++| 2992: 42 4c 45 20 4a 53 4f 4e 31 20 45 4e 41 42 4c 45 BLE JSON1 ENABLE |
1242 |
++| 3008: 20 4d 45 4d 53 59 53 35 20 45 4e 41 42 4c 45 20 MEMSYS5 ENABLE |
1243 |
++| 3024: 42 54 52 45 45 20 4d 41 58 20 4d 45 4d 4f 52 59 BTREE MAX MEMORY |
1244 |
++| 3040: 3d 35 30 30 30 30 30 30 30 20 4f 4c 49 54 20 4c =50000000 OLIT L |
1245 |
++| 3056: 4f 41 43 20 45 58 54 45 4e 53 49 4f 4e 21 54 48 OAC EXTENSION!TH |
1246 |
++| 3072: 52 45 41 44 53 41 46 45 3d 30 18 24 05 00 25 0f READSAFE=0.$..%. |
1247 |
++| 3088: 19 54 48 52 45 41 44 53 41 46 45 3d 30 58 42 49 .THREADSAFE=0XBI |
1248 |
++| 3104: 4e 41 52 59 18 23 05 00 25 0f 19 54 48 52 45 41 NARY.#..%..THREA |
1249 |
++| 3120: 44 53 41 4b 75 3d 30 58 4d 4f 43 41 53 45 17 22 DSAKu=0XMOCASE.. |
1250 |
++| 3136: 05 00 25 0f 17 54 48 52 45 41 44 53 41 46 46 3d ..%..THREADSAFF= |
1251 |
++| 3152: 30 58 52 54 52 49 4d 1f 21 05 00 33 0f 19 4f 4d 0XRTRIM.!..3..OM |
1252 |
++| 3168: 49 54 20 4c 4f 41 44 20 45 58 54 45 4e 52 49 4f IT LOAD EXTENRIO |
1253 |
++| 3184: 4e 58 42 49 4e 41 52 59 1f 20 05 00 33 0f 19 4f NXBINARY. ..3..O |
1254 |
++| 3200: 4d 49 54 20 4c 4f 41 44 20 45 58 54 45 4e 53 49 MIT LOAD EXTENSI |
1255 |
++| 3216: 4f 4e 58 4e 4f 43 41 53 45 1e 1f 05 00 33 0f 17 ONXNOCASE....3.. |
1256 |
++| 3232: 4f 4d 49 54 20 4c 4f 41 44 20 45 58 54 45 4e 53 OMIT LOAD EXTENS |
1257 |
++| 3248: 49 4f 4e 58 52 54 52 49 4d 1f 1e 05 00 33 0f 19 IONXRTRIM....3.. |
1258 |
++| 3264: 4d 41 58 20 4d 45 4d 4f 52 59 3d 35 30 30 30 30 MAX MEMORY=50000 |
1259 |
++| 3280: 30 30 30 58 42 49 4e 41 52 59 1f 1d 05 00 33 0f 000XBINARY....3. |
1260 |
++| 3296: 19 4d 41 58 20 4d 45 4d 4f 52 59 3d 35 30 30 30 .MAX MEMORY=5000 |
1261 |
++| 3312: 30 30 30 30 58 4e 4f 43 41 53 45 1e 1c 05 00 33 0000XNOCASE....3 |
1262 |
++| 3328: 0f 17 4d 42 b8 20 4d 45 4d 4f 52 59 3d 35 30 30 ..MB. MEMORY=500 |
1263 |
++| 3344: 30 30 30 30 30 58 52 54 52 49 4d 18 1b 05 00 25 00000XRTRIM....% |
1264 |
++| 3360: 0f 19 45 4e 41 42 4c 45 20 52 54 52 45 45 58 42 ..ENABLE RTREEXB |
1265 |
++| 3376: 49 4e 41 52 59 18 1a 05 0d a5 0f 19 45 4e 41 42 INARY.......ENAB |
1266 |
++| 3392: 4c 45 20 52 54 52 45 45 58 4e 4f 43 41 53 45 17 LE RTREEXNOCASE. |
1267 |
++| 3408: 19 1c 00 25 0f 17 45 4e 41 42 4c 45 20 52 54 52 ...%..ENABLE RTR |
1268 |
++| 3424: 45 45 58 52 54 52 49 4d 1a 18 05 00 29 0f 19 45 EEXRTRIM....)..E |
1269 |
++| 3440: 4e 41 42 4c 45 20 4d 45 4d 53 59 53 35 58 42 49 NABLE MEMSYS5XBI |
1270 |
++| 3456: 4e 41 52 59 1a 17 05 00 29 0f 19 45 4e 41 42 4c NARY....)..ENABL |
1271 |
++| 3472: 45 20 4d 45 4d 53 59 53 35 58 4e 4f 43 41 53 45 E MEMSYS5XNOCASE |
1272 |
++| 3488: 19 16 05 00 29 0f 17 45 4e 41 42 4c 45 20 4d 45 ....)..ENABLE ME |
1273 |
++| 3504: 4d 53 59 53 35 58 52 54 52 49 4d 18 14 05 01 25 MSYS5XRTRIM....% |
1274 |
++| 3520: 0f 19 45 4e 12 42 4c 45 20 4a 53 4f 4e 31 58 42 ..EN.BLE JSON1XB |
1275 |
++| 3536: 49 4e 41 52 59 18 14 05 00 25 09 d9 45 4e 41 42 INARY....%..ENAB |
1276 |
++| 3552: 4c 45 20 4a 53 4f 3e 31 58 4e 4f 43 41 53 45 17 LE JSO>1XNOCASE. |
1277 |
++| 3568: 13 05 00 25 0f 17 45 4e 40 42 4c 45 20 4a 53 4f ...%..EN@BLE JSO |
1278 |
++| 3584: 4e 31 58 52 54 52 49 4d 1a 12 05 82 29 0f 19 45 N1XRTRIM....)..E |
1279 |
++| 3600: 4e 41 42 4c 45 20 47 45 4f 50 4f 4c 59 58 42 49 NABLE GEOPOLYXBI |
1280 |
++| 3616: 4e 41 52 59 1a 11 05 c9 29 e8 19 46 4e 41 42 4c NARY....)..FNABL |
1281 |
++| 3632: 48 c0 47 45 4f 50 4f 4c 59 58 4e 74 43 41 53 45 H.GEOPOLYXNtCASE |
1282 |
++| 3648: 19 10 05 00 29 0f 17 45 4e 41 42 4c 45 20 47 45 ....)..ENABLE GE |
1283 |
++| 3664: 4f 50 4f 4c 59 58 52 54 52 49 4d 17 0f 05 00 23 OPOLYXRTRIM....# |
1284 |
++| 3680: 0f 19 45 4e 41 42 4c 45 30 46 54 53 35 58 42 49 ..ENABLE0FTS5XBI |
1285 |
++| 3696: 4e 41 52 59 17 0e 05 00 23 0f 19 45 4e 41 42 4c NARY....#..ENABL |
1286 |
++| 3712: 45 20 46 54 53 35 58 4e 4f 43 41 53 45 16 0e 05 E FTS5XNOCASE... |
1287 |
++| 3728: 00 23 0f 17 45 4e 41 42 4c 45 20 46 54 53 35 58 .#..ENABLE FTS5X |
1288 |
++| 3744: 52 54 52 49 4d 17 0c 05 00 23 0f 19 45 4e 41 42 RTRIM....#..ENAB |
1289 |
++| 3760: 4c 45 20 46 54 53 34 58 42 49 4e 41 52 59 17 0b LE FTS4XBINARY.. |
1290 |
++| 3776: 05 00 23 0f 19 45 4e 41 42 4c 45 20 46 54 53 34 ..#..ENABLE FTS4 |
1291 |
++| 3792: 58 4e 4f 43 41 53 45 16 0a 05 00 23 0f 17 45 4e XNOCASE....#..EN |
1292 |
++| 3808: 41 42 4c 45 20 46 54 53 34 58 52 54 52 49 4d 1e ABLE FTS4XRTRIM. |
1293 |
++| 3824: 09 05 00 31 0f 19 45 4e 42 42 4c 45 20 44 42 53 ...1..ENBBLE DBS |
1294 |
++| 3840: 54 41 54 20 56 54 41 42 58 42 49 4e 41 52 59 1e TAT VTABXBINARY. |
1295 |
++| 3856: 08 05 00 31 0f 19 45 4e 41 42 4c 45 20 44 42 53 ...1..ENABLE DBS |
1296 |
++| 3872: 54 41 54 20 56 54 41 42 58 4e 4f 43 41 53 45 1d TAT VTABXNOCASE. |
1297 |
++| 3888: 07 05 00 31 0f 17 45 4e 41 42 4c 45 20 44 42 53 ...1..ENABLE DBS |
1298 |
++| 3904: 54 41 54 20 56 54 41 42 58 52 54 52 4a 4d 11 06 TAT VTABXRTRJM.. |
1299 |
++| 3920: 05 f0 17 0f 19 44 45 42 55 47 58 42 49 4e 41 52 .....DEBUGXBINAR |
1300 |
++| 3936: 59 11 05 05 00 17 0e 19 44 45 42 55 47 58 4e 4f Y.......DEBUGXNO |
1301 |
++| 3952: 43 41 53 45 10 04 05 00 17 0f 16 44 45 42 55 47 CASE.......DEBUG |
1302 |
++| 3968: 58 52 54 52 49 4d 27 03 05 00 43 0f 19 43 4f 4d XRTRIM'...C..COM |
1303 |
++| 3984: 50 49 4c 45 52 3d 67 63 63 2d 35 2e 34 2e 30 20 PILER=gcc-5.4.0 |
1304 |
++| 4000: 32 30 31 36 30 36 30 39 58 42 49 4e 41 52 59 27 20160609XBINARY' |
1305 |
++| 4016: 02 05 00 43 0f 19 43 4f 4d 50 49 4c 45 52 3d 67 ...C..COMPILER=g |
1306 |
++| 4032: 63 63 2d 35 2e 34 2e 30 20 32 30 31 36 30 36 30 cc-5.4.0 2016060 |
1307 |
++| 4048: 39 58 4e 4f 43 41 53 45 26 01 06 00 43 0f 17 43 9XNOCASE&...C..C |
1308 |
++| 4064: 4f 4d 50 49 4b 45 52 3d 67 63 63 2d 35 2e 34 2e OMPIKER=gcc-5.4. |
1309 |
++| 4080: 30 20 32 30 31 36 30 36 40 39 58 29 54 52 49 4d 0 201606@9X)TRIM |
1310 |
++| page 4 offset 12288 |
1311 |
++| 0: 0d 00 10 00 00 10 00 00 00 00 00 00 00 01 00 00 ................ |
1312 |
++| page 5 offset 16384 |
1313 |
++| 0: 0d 00 00 00 02 0b a0 00 0c ad 0b a0 00 00 00 00 ................ |
1314 |
++| 2976: 82 0a 02 08 08 09 08 08 17 84 06 30 20 32 35 33 ...........0 253 |
1315 |
++| 2992: 00 01 30 04 25 06 1b 00 00 08 32 30 31 36 30 36 ..0.%.....201606 |
1316 |
++| 3008: 30 39 03 25 07 00 00 01 34 03 25 05 00 00 01 35 09.%....4.%....5 |
1317 |
++| 3024: 03 25 04 00 01 07 30 30 30 30 30 30 30 03 25 1a .%....0000000.%. |
1318 |
++| 3040: 00 00 08 63 6f 6d 70 69 6c 65 72 03 25 02 00 00 ...compiler.%... |
1319 |
++| 3056: 06 64 62 73 74 61 74 03 25 0a 00 01 04 65 62 75 .dbstat.%....ebu |
1320 |
++| 3072: 67 03 25 08 00 00 06 65 6e 61 62 6c 65 09 25 09 g.%....enable.%. |
1321 |
++| 3088: 05 04 04 04 04 04 00 01 08 78 74 65 6e 73 69 6f .........xtensio |
1322 |
++| 3104: 6e 03 25 1d 00 00 04 66 74 73 34 03 25 0d 00 03 n.%....fts4.%... |
1323 |
++| 3120: 01 35 03 25 0f 00 00 03 67 63 63 03 25 03 00 01 .5.%....gcc.%... |
1324 |
++| 3136: 06 65 6f 70 6f 6c 79 03 25 11 00 00 05 6a 73 6f .eopoly.%....jso |
1325 |
++| 3152: 6e 31 03 25 13 00 00 04 6c 6f 61 64 03 25 1c 00 n1.%....load.%.. |
1326 |
++| 3168: 00 03 6d 61 78 03 25 18 00 01 05 65 6e 6f 72 79 ..max.%....enory |
1327 |
++| 3184: 03 25 19 00 03 04 ce 79 73 4d 03 25 15 00 00 04 .%.....ysM.%.... |
1328 |
++| 3200: 6f 6d 69 74 03 25 1b 00 00 05 72 74 72 65 65 03 omit.%....rtree. |
1329 |
++| 3216: 25 17 00 00 0a 74 68 72 65 61 64 73 61 66 65 03 %....threadsafe. |
1330 |
++| 3232: 25 0e 00 00 04 76 74 61 62 03 25 0b 00 86 50 01 %....vtab.%...P. |
1331 |
++| 3248: 08 08 08 08 08 17 8d 12 30 20 38 33 35 00 01 30 ........0 835..0 |
1332 |
++| 3264: 12 01 06 00 01 06 00 01 06 00 1f 03 00 01 03 09 ................ |
1333 |
++| 3280: 51 03 00 00 08 32 30 31 36 30 36 30 39 09 01 07 Q....20160609... |
1334 |
++| 3296: 00 01 07 00 01 07 00 00 01 34 09 01 05 00 01 05 .........4...... |
1335 |
++| 3312: 00 01 05 00 00 01 35 09 01 04 00 01 04 00 01 04 ......5......... |
1336 |
++| 3328: 00 01 07 30 30 30 30 30 30 30 09 1c 04 00 01 04 ...0000000...... |
1337 |
++| 3344: 00 01 04 00 00 06 62 69 6e 61 72 79 3c 03 01 02 ......binary<... |
1338 |
++| 3360: 02 00 03 01 02 02 00 03 01 02 02 00 03 01 02 02 ................ |
1339 |
++| 3376: 00 03 01 02 02 00 02 f1 02 02 00 03 01 02 02 00 ................ |
1340 |
++| 3392: 03 01 02 02 00 03 01 02 02 00 03 01 02 02 00 03 ................ |
1341 |
++| 3408: 01 02 02 00 03 01 02 02 00 00 08 63 6f 6d 70 69 ...........compi |
1342 |
++| 3424: 6c 65 72 09 01 02 00 01 02 00 01 02 00 00 06 67 ler............g |
1343 |
++| 3440: d2 73 74 61 74 09 07 03 00 01 03 00 01 03 00 01 .stat........... |
1344 |
++| 3456: 04 65 62 75 67 09 04 02 00 01 02 00 01 02 00 00 .ebug........... |
1345 |
++| 3472: 06 65 6e 6f 82 6c 65 3f 07 02 00 01 02 00 01 02 .eno.le?........ |
1346 |
++| 3488: b0 01 02 00 01 02 00 11 02 00 01 02 00 01 02 00 ................ |
1347 |
++| 3504: 01 02 00 01 02 00 01 02 00 01 a6 00 01 02 00 01 ................ |
1348 |
++| 3520: 02 05 51 02 00 01 02 00 01 02 00 01 02 00 01 02 ..Q............. |
1349 |
++| 3536: 00 01 02 00 01 02 00 01 08 78 74 65 6e 73 69 6f .........xtensio |
1350 |
++| 3552: 6e 09 1f 04 00 01 04 00 00 04 00 00 04 66 74 73 n............fts |
1351 |
++| 3568: 34 09 0a 03 00 01 03 00 01 03 00 03 01 35 09 0d 4............5.. |
1352 |
++| 3584: 03 00 01 03 00 01 03 00 00 03 67 63 63 09 01 03 ..........gcc... |
1353 |
++| 3600: 00 01 03 00 01 03 00 01 06 65 6f 70 73 6c 79 09 .........eopsly. |
1354 |
++| 3616: 10 03 00 01 03 00 01 03 00 00 05 6a 73 6f 6e 31 ...........json1 |
1355 |
++| 3632: 09 13 03 00 01 03 00 01 03 00 00 04 6c 6f 61 64 ............load |
1356 |
++| 3648: 09 1f 03 00 01 03 00 01 03 00 00 03 6d 61 78 09 ............max. |
1357 |
++| 3664: 1c 02 00 01 02 00 01 02 00 01 05 65 6d 6f 72 79 ...........emory |
1358 |
++| 3680: 09 1c 03 00 01 03 00 01 03 00 03 04 73 79 73 35 ............sys5 |
1359 |
++| 3696: 09 16 03 00 01 03 00 01 03 00 00 06 6e 6f 63 61 ............noca |
1360 |
++| 3712: 73 65 3c 02 01 02 02 00 03 01 12 02 00 03 01 02 se<............. |
1361 |
++| 3728: 02 00 03 01 02 02 00 03 01 02 02 00 03 01 02 02 ................ |
1362 |
++| 3744: 00 03 01 02 02 00 03 01 02 02 00 03 01 02 02 00 ................ |
1363 |
++| 3760: 03 01 02 02 00 03 01 02 02 00 03 01 02 02 00 00 ................ |
1364 |
++| 3776: 0e 9f 6d 69 74 09 1f 02 00 01 02 00 01 02 00 00 ..mit........... |
1365 |
++| 3792: 05 72 74 72 65 65 09 19 03 00 01 03 00 01 03 00 .rtree.......... |
1366 |
++| 3808: 03 02 69 6d 3c 01 01 02 02 00 03 01 02 02 00 03 ..im<........... |
1367 |
++| 3824: 01 02 02 00 03 01 02 02 00 03 01 02 02 00 03 01 ................ |
1368 |
++| 3840: 02 02 00 03 01 02 02 00 03 01 02 02 00 03 01 02 ................ |
1369 |
++| 3856: 02 00 03 01 02 02 00 03 01 02 02 00 03 01 02 02 ................ |
1370 |
++| 3872: 00 00 0a 74 68 72 65 61 64 73 61 66 65 09 22 02 ...threadsafe... |
1371 |
++| 3888: 00 01 02 00 01 02 00 00 04 76 74 61 62 09 07 04 .........vtab... |
1372 |
++| 3904: 00 01 04 00 01 04 00 00 01 78 b4 01 01 01 01 02 .........x...... |
1373 |
++| 3920: 00 01 01 01 02 00 01 01 01 02 00 01 01 01 02 00 ................ |
1374 |
++| 3936: 01 01 01 02 00 01 01 01 02 00 01 01 01 02 00 01 ................ |
1375 |
++| 3952: 01 01 02 00 01 01 01 07 30 01 01 01 02 00 01 01 ........0....... |
1376 |
++| 3968: 01 02 00 11 01 01 02 00 01 01 01 02 00 11 01 01 ................ |
1377 |
++| 3984: 02 00 01 01 01 02 00 01 01 01 02 00 01 01 01 02 ................ |
1378 |
++| 4000: 00 01 01 01 02 00 01 01 01 02 00 01 01 01 02 00 ................ |
1379 |
++| 4016: 01 01 01 01 ff 01 01 01 02 00 01 01 01 02 00 01 ................ |
1380 |
++| 4032: 01 01 02 00 01 01 01 02 00 01 01 01 02 00 01 01 ................ |
1381 |
++| 4048: 01 02 00 01 01 01 02 00 01 01 01 02 00 01 01 01 ................ |
1382 |
++| 4064: 02 00 01 01 01 02 00 01 01 01 02 00 01 01 01 02 ................ |
1383 |
++| 4080: 00 01 01 01 02 00 01 01 01 02 00 01 01 01 02 00 ................ |
1384 |
++| page 6 offset 20480 |
1385 |
++| 0: 0a 00 00 00 02 0f f5 00 0f fb 0f f5 00 00 00 00 ................ |
1386 |
++| 4080: 00 00 00 00 00 05 04 08 09 01 02 04 04 08 08 09 ................ |
1387 |
++| page 7 offset 24576 |
1388 |
++| 0: 0d 00 00 00 05 0f b8 00 0e f4 0f e9 10 d6 0f c7 ................ |
1389 |
++| 4016: 00 00 00 00 00 00 00 00 0d 05 02 23 61 75 74 6f ...........#auto |
1390 |
++| 4032: 6d 65 72 67 65 3d 35 0d 04 02 23 6d 65 72 67 65 merge=5...#merge |
1391 |
++| 4048: 3d 31 00 00 00 00 00 00 00 00 00 00 00 00 00 00 =1.............. |
1392 |
++| end crash-dde9e76ed8ab2d.db |
1393 |
++}]} {} |
1394 |
++ |
1395 |
++do_catchsql_test 25.1 { |
1396 |
++ WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x%1 FROM c WHERE x<599237) |
1397 |
++ INSERT INTO t1( a ) SELECT randomblob(3000) FROM t2 ; |
1398 |
++} {0 {}} |
1399 |
++ |
1400 |
++do_catchsql_test 25.2 { |
1401 |
++ UPDATE t1 SET b=quote((true) ) WHERE t1 MATCH 'h*'; |
1402 |
++} {0 {}} |
1403 |
++ |
1404 |
++do_catchsql_test 25.3 { |
1405 |
++ WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x +x FROM c WHERE 72<x) |
1406 |
++ INSERT INTO t1(a) SELECT randomblob(2829) FROM c; |
1407 |
++} {0 {}} |
1408 |
++ |
1409 |
++do_catchsql_test 25.4 { |
1410 |
++ WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x%1 FROM c WHERE 599237<x) |
1411 |
++ INSERT INTO t1(a) SELECT randomblob(3000) FROM t2 ; |
1412 |
++} {0 {}} |
1413 |
++ |
1414 |
++do_catchsql_test 25.5 { |
1415 |
++ WITH RECURSIVE c(x) AS (VALUES(1) UNION ALL SELECT x%1 FROM c WHERE x<599237) |
1416 |
++ INSERT INTO t1( a ) SELECT randomblob(3000) FROM t2 ; |
1417 |
++} {0 {}} |
1418 |
++ |
1419 |
++do_catchsql_test 25.6 { |
1420 |
++ INSERT INTO t1(t1) SELECT x FROM t2; |
1421 |
++ INSERT INTO t1(t1) SELECT x FROM t2; |
1422 |
++} {1 {database disk image is malformed}} |
1423 |
++ |
1424 |
+ finish_test |
1425 |
+ |
1426 |
+--- /test/with3.test |
1427 |
++++ /test/with3.test |
1428 |
+@@ -130,4 +130,40 @@ |
1429 |
+ `--SEARCH TABLE w1 USING INTEGER PRIMARY KEY (rowid=?) |
1430 |
+ } |
1431 |
+ |
1432 |
++do_execsql_test 4.0 { |
1433 |
++ WITH t5(t5col1) AS ( |
1434 |
++ SELECT ( |
1435 |
++ WITH t3(t3col1) AS ( |
1436 |
++ WITH t2 AS ( |
1437 |
++ WITH t1 AS (SELECT 1 AS c1 GROUP BY 1) |
1438 |
++ SELECT a.c1 FROM t1 AS a, t1 AS b |
1439 |
++ WHERE anoncol1 = 1 |
1440 |
++ ) |
1441 |
++ SELECT (SELECT 1 FROM t2) FROM t2 |
1442 |
++ ) |
1443 |
++ SELECT t3col1 FROM t3 WHERE t3col1 |
1444 |
++ ) FROM (SELECT 1 AS anoncol1) |
1445 |
++ ) |
1446 |
++ SELECT t5col1, t5col1 FROM t5 |
1447 |
++} {1 1} |
1448 |
++do_execsql_test 4.1 { |
1449 |
++ SELECT EXISTS ( |
1450 |
++ WITH RECURSIVE Table0 AS ( |
1451 |
++ WITH RECURSIVE Table0(Col0) AS (SELECT ALL 1 ) |
1452 |
++ SELECT ALL ( |
1453 |
++ WITH RECURSIVE Table0 AS ( |
1454 |
++ WITH RECURSIVE Table0 AS ( |
1455 |
++ WITH RECURSIVE Table0 AS (SELECT DISTINCT 1 GROUP BY 1 ) |
1456 |
++ SELECT DISTINCT * FROM Table0 NATURAL INNER JOIN Table0 |
1457 |
++ WHERE Col0 = 1 |
1458 |
++ ) |
1459 |
++ SELECT ALL (SELECT DISTINCT * FROM Table0) FROM Table0 WHERE Col0 = 1 |
1460 |
++ ) |
1461 |
++ SELECT ALL * FROM Table0 NATURAL INNER JOIN Table0 |
1462 |
++ ) FROM Table0 ) |
1463 |
++ SELECT DISTINCT * FROM Table0 NATURAL INNER JOIN Table0 |
1464 |
++ ); |
1465 |
++} {1} |
1466 |
++ |
1467 |
++ |
1468 |
+ finish_test |
1469 |
|
1470 |
diff --git a/dev-db/sqlite/files/sqlite-3.28.0-full_archive-tests.patch b/dev-db/sqlite/files/sqlite-3.28.0-full_archive-tests.patch |
1471 |
new file mode 100644 |
1472 |
index 00000000000..aaa6c580f5f |
1473 |
--- /dev/null |
1474 |
+++ b/dev-db/sqlite/files/sqlite-3.28.0-full_archive-tests.patch |
1475 |
@@ -0,0 +1,19 @@ |
1476 |
+https://sqlite.org/src/info/af53c41a127c314c |
1477 |
+ |
1478 |
+--- /test/like3.test |
1479 |
++++ /test/like3.test |
1480 |
+@@ -182,6 +182,7 @@ |
1481 |
+ # Verify that the LIKE optimization works with an ESCAPE clause when |
1482 |
+ # using PRAGMA case_sensitive_like=ON. |
1483 |
+ # |
1484 |
++ifcapable !icu { |
1485 |
+ do_execsql_test like3-6.100 { |
1486 |
+ DROP TABLE IF EXISTS t1; |
1487 |
+ CREATE TABLE t1(path TEXT COLLATE nocase PRIMARY KEY,a,b,c) WITHOUT ROWID; |
1488 |
+@@ -229,5 +230,6 @@ |
1489 |
+ QUERY PLAN |
1490 |
+ `--SEARCH TABLE t2 USING INDEX t2path2 (path>? AND path<?) |
1491 |
+ } |
1492 |
++} |
1493 |
+ |
1494 |
+ finish_test |
1495 |
|
1496 |
diff --git a/dev-db/sqlite/files/sqlite-3.28.0-nonfull_archive-segmentation_fault_fixes.patch b/dev-db/sqlite/files/sqlite-3.28.0-nonfull_archive-segmentation_fault_fixes.patch |
1497 |
new file mode 100644 |
1498 |
index 00000000000..7278c12b377 |
1499 |
--- /dev/null |
1500 |
+++ b/dev-db/sqlite/files/sqlite-3.28.0-nonfull_archive-segmentation_fault_fixes.patch |
1501 |
@@ -0,0 +1,114 @@ |
1502 |
+https://sqlite.org/src/info/b2ce5ed175cb5029 |
1503 |
+https://sqlite.org/src/info/6e4a5f22811bcd14 |
1504 |
+https://sqlite.org/src/info/516ca8945150bdc1 |
1505 |
+https://sqlite.org/src/info/e1724f1d618cfbcf |
1506 |
+https://sqlite.org/src/info/c621fc668c6538f9 |
1507 |
+https://sqlite.org/src/info/c509d8a8aebe0da4 |
1508 |
+https://sqlite.org/src/info/a9b90aa12eecdd9f |
1509 |
+ |
1510 |
+--- /sqlite3.c |
1511 |
++++ /sqlite3.c |
1512 |
+@@ -67472,10 +67472,9 @@ |
1513 |
+ rc = newDatabase(pBt); |
1514 |
+ pBt->nPage = get4byte(28 + pBt->pPage1->aData); |
1515 |
+ |
1516 |
+- /* The database size was written into the offset 28 of the header |
1517 |
+- ** when the transaction started, so we know that the value at offset |
1518 |
+- ** 28 is nonzero. */ |
1519 |
+- assert( pBt->nPage>0 ); |
1520 |
++ /* pBt->nPage might be zero if the database was corrupt when |
1521 |
++ ** the transaction was started. Otherwise, it must be at least 1. */ |
1522 |
++ assert( CORRUPT_DB || pBt->nPage>0 ); |
1523 |
+ } |
1524 |
+ sqlite3BtreeLeave(p); |
1525 |
+ } |
1526 |
+@@ -70825,6 +70824,7 @@ |
1527 |
+ u16 maskPage = pOld->maskPage; |
1528 |
+ u8 *piCell = aData + pOld->cellOffset; |
1529 |
+ u8 *piEnd; |
1530 |
++ VVA_ONLY( int nCellAtStart = b.nCell; ) |
1531 |
+ |
1532 |
+ /* Verify that all sibling pages are of the same "type" (table-leaf, |
1533 |
+ ** table-interior, index-leaf, or index-interior). |
1534 |
+@@ -70853,6 +70853,10 @@ |
1535 |
+ */ |
1536 |
+ memset(&b.szCell[b.nCell], 0, sizeof(b.szCell[0])*(limit+pOld->nOverflow)); |
1537 |
+ if( pOld->nOverflow>0 ){ |
1538 |
++ if( limit<pOld->aiOvfl[0] ){ |
1539 |
++ rc = SQLITE_CORRUPT_BKPT; |
1540 |
++ goto balance_cleanup; |
1541 |
++ } |
1542 |
+ limit = pOld->aiOvfl[0]; |
1543 |
+ for(j=0; j<limit; j++){ |
1544 |
+ b.apCell[b.nCell] = aData + (maskPage & get2byteAligned(piCell)); |
1545 |
+@@ -70872,6 +70876,7 @@ |
1546 |
+ piCell += 2; |
1547 |
+ b.nCell++; |
1548 |
+ } |
1549 |
++ assert( (b.nCell-nCellAtStart)==(pOld->nCell+pOld->nOverflow) ); |
1550 |
+ |
1551 |
+ cntOld[i] = b.nCell; |
1552 |
+ if( i<nOld-1 && !leafData){ |
1553 |
+@@ -83747,7 +83752,7 @@ |
1554 |
+ ** is clear. Otherwise, if this is an ephemeral cursor created by |
1555 |
+ ** OP_OpenDup, the cursor will not be closed and will still be part |
1556 |
+ ** of a BtShared.pCursor list. */ |
1557 |
+- p->apCsr[iCur]->isEphemeral = 0; |
1558 |
++ if( p->apCsr[iCur]->pBtx==0 ) p->apCsr[iCur]->isEphemeral = 0; |
1559 |
+ sqlite3VdbeFreeCursor(p, p->apCsr[iCur]); |
1560 |
+ p->apCsr[iCur] = 0; |
1561 |
+ } |
1562 |
+@@ -87258,7 +87263,10 @@ |
1563 |
+ if( pCx ){ |
1564 |
+ /* If the ephermeral table is already open, erase all existing content |
1565 |
+ ** so that the table is empty again, rather than creating a new table. */ |
1566 |
+- rc = sqlite3BtreeClearTable(pCx->pBtx, pCx->pgnoRoot, 0); |
1567 |
++ assert( pCx->isEphemeral ); |
1568 |
++ if( pCx->pBtx ){ |
1569 |
++ rc = sqlite3BtreeClearTable(pCx->pBtx, pCx->pgnoRoot, 0); |
1570 |
++ } |
1571 |
+ }else{ |
1572 |
+ pCx = allocateCursor(p, pOp->p1, pOp->p2, -1, CURTYPE_BTREE); |
1573 |
+ if( pCx==0 ) goto no_mem; |
1574 |
+@@ -95979,7 +95987,9 @@ |
1575 |
+ #ifndef SQLITE_OMIT_WINDOWFUNC |
1576 |
+ if( pExpr->y.pWin ){ |
1577 |
+ Select *pSel = pNC->pWinSelect; |
1578 |
+- sqlite3WindowUpdate(pParse, pSel->pWinDefn, pExpr->y.pWin, pDef); |
1579 |
++ if( IN_RENAME_OBJECT==0 ){ |
1580 |
++ sqlite3WindowUpdate(pParse, pSel->pWinDefn, pExpr->y.pWin, pDef); |
1581 |
++ } |
1582 |
+ sqlite3WalkExprList(pWalker, pExpr->y.pWin->pPartition); |
1583 |
+ sqlite3WalkExprList(pWalker, pExpr->y.pWin->pOrderBy); |
1584 |
+ sqlite3WalkExpr(pWalker, pExpr->y.pWin->pFilter); |
1585 |
+@@ -174132,7 +174142,7 @@ |
1586 |
+ } |
1587 |
+ p->iOff += fts3GetVarint32(&p->aNode[p->iOff], &nSuffix); |
1588 |
+ |
1589 |
+- if( nPrefix>p->iOff || nSuffix>p->nNode-p->iOff ){ |
1590 |
++ if( nPrefix>p->term.n || nSuffix>p->nNode-p->iOff || nSuffix==0 ){ |
1591 |
+ return FTS_CORRUPT_VTAB; |
1592 |
+ } |
1593 |
+ blobGrowBuffer(&p->term, nPrefix+nSuffix, &rc); |
1594 |
+@@ -174151,7 +174161,7 @@ |
1595 |
+ } |
1596 |
+ } |
1597 |
+ |
1598 |
+- assert( p->iOff<=p->nNode ); |
1599 |
++ assert_fts3_nc( p->iOff<=p->nNode ); |
1600 |
+ return rc; |
1601 |
+ } |
1602 |
+ |
1603 |
+@@ -204287,7 +204297,11 @@ |
1604 |
+ i64 iOff = *piOff; |
1605 |
+ int iVal; |
1606 |
+ fts5FastGetVarint32(a, i, iVal); |
1607 |
+- if( iVal==1 ){ |
1608 |
++ if( iVal<=1 ){ |
1609 |
++ if( iVal==0 ){ |
1610 |
++ *pi = i; |
1611 |
++ return 0; |
1612 |
++ } |
1613 |
+ fts5FastGetVarint32(a, i, iVal); |
1614 |
+ iOff = ((i64)iVal) << 32; |
1615 |
+ fts5FastGetVarint32(a, i, iVal); |
1616 |
|
1617 |
diff --git a/dev-db/sqlite/sqlite-3.28.0.ebuild b/dev-db/sqlite/sqlite-3.28.0.ebuild |
1618 |
new file mode 100644 |
1619 |
index 00000000000..f4eee96e244 |
1620 |
--- /dev/null |
1621 |
+++ b/dev-db/sqlite/sqlite-3.28.0.ebuild |
1622 |
@@ -0,0 +1,330 @@ |
1623 |
+# Copyright 1999-2019 Arfrever Frehtes Taifersar Arahesis and others |
1624 |
+# Distributed under the terms of the GNU General Public License v2 |
1625 |
+ |
1626 |
+EAPI="7" |
1627 |
+ |
1628 |
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs |
1629 |
+ |
1630 |
+SRC_PV="$(printf "%u%02u%02u%02u" $(ver_rs 1- " "))" |
1631 |
+DOC_PV="${SRC_PV}" |
1632 |
+# DOC_PV="$(printf "%u%02u%02u00" $(ver_rs 1-3 " "))" |
1633 |
+ |
1634 |
+DESCRIPTION="SQL database engine" |
1635 |
+HOMEPAGE="https://sqlite.org/" |
1636 |
+SRC_URI="doc? ( https://sqlite.org/2019/${PN}-doc-${DOC_PV}.zip ) |
1637 |
+ tcl? ( https://sqlite.org/2019/${PN}-src-${SRC_PV}.zip ) |
1638 |
+ test? ( https://sqlite.org/2019/${PN}-src-${SRC_PV}.zip ) |
1639 |
+ tools? ( https://sqlite.org/2019/${PN}-src-${SRC_PV}.zip ) |
1640 |
+ !tcl? ( !test? ( !tools? ( https://sqlite.org/2019/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )" |
1641 |
+ |
1642 |
+LICENSE="public-domain" |
1643 |
+SLOT="3" |
1644 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
1645 |
+IUSE="debug doc icu +readline secure-delete static-libs tcl test tools" |
1646 |
+RESTRICT="!test? ( test )" |
1647 |
+ |
1648 |
+BDEPEND="doc? ( app-arch/unzip ) |
1649 |
+ tcl? ( |
1650 |
+ app-arch/unzip |
1651 |
+ >=dev-lang/tcl-8.6:0 |
1652 |
+ ) |
1653 |
+ test? ( |
1654 |
+ app-arch/unzip |
1655 |
+ >=dev-lang/tcl-8.6:0 |
1656 |
+ ) |
1657 |
+ tools? ( |
1658 |
+ app-arch/unzip |
1659 |
+ >=dev-lang/tcl-8.6:0 |
1660 |
+ )" |
1661 |
+RDEPEND="sys-libs/zlib:0=[${MULTILIB_USEDEP}] |
1662 |
+ icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) |
1663 |
+ readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] ) |
1664 |
+ tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] ) |
1665 |
+ tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )" |
1666 |
+DEPEND="${RDEPEND} |
1667 |
+ test? ( >=dev-lang/tcl-8.6:0[${MULTILIB_USEDEP}] )" |
1668 |
+ |
1669 |
+full_archive() { |
1670 |
+ use tcl || use test || use tools |
1671 |
+} |
1672 |
+ |
1673 |
+pkg_setup() { |
1674 |
+ if full_archive; then |
1675 |
+ S="${WORKDIR}/${PN}-src-${SRC_PV}" |
1676 |
+ else |
1677 |
+ S="${WORKDIR}/${PN}-autoconf-${SRC_PV}" |
1678 |
+ fi |
1679 |
+} |
1680 |
+ |
1681 |
+src_prepare() { |
1682 |
+ if full_archive; then |
1683 |
+ eapply "${FILESDIR}/${PN}-3.28.0-full_archive-build.patch" |
1684 |
+ eapply "${FILESDIR}/${PN}-3.28.0-full_archive-segmentation_fault_fixes.patch" |
1685 |
+ eapply "${FILESDIR}/${PN}-3.28.0-full_archive-tests.patch" |
1686 |
+ |
1687 |
+ eapply_user |
1688 |
+ |
1689 |
+ # Fix AC_CHECK_FUNCS. |
1690 |
+ # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html |
1691 |
+ sed -e "s/AC_CHECK_FUNCS(.*)/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" -i configure.ac || die "sed failed" |
1692 |
+ else |
1693 |
+ eapply "${FILESDIR}/${PN}-3.25.0-nonfull_archive-build.patch" |
1694 |
+ eapply "${FILESDIR}/${PN}-3.28.0-nonfull_archive-segmentation_fault_fixes.patch" |
1695 |
+ |
1696 |
+ eapply_user |
1697 |
+ |
1698 |
+ # Fix AC_CHECK_FUNCS. |
1699 |
+ # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2016-March/002762.html |
1700 |
+ sed \ |
1701 |
+ -e "s/AC_CHECK_FUNCS(\[fdatasync.*/AC_CHECK_FUNCS([fdatasync fullfsync gmtime_r isnan localtime_r localtime_s malloc_usable_size posix_fallocate pread pread64 pwrite pwrite64 strchrnul usleep utime])/" \ |
1702 |
+ -e "/AC_CHECK_FUNCS(posix_fallocate)/d" \ |
1703 |
+ -i configure.ac || die "sed failed" |
1704 |
+ fi |
1705 |
+ |
1706 |
+ eautoreconf |
1707 |
+ |
1708 |
+ multilib_copy_sources |
1709 |
+} |
1710 |
+ |
1711 |
+multilib_src_configure() { |
1712 |
+ local CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" options=() |
1713 |
+ |
1714 |
+ options+=( |
1715 |
+ --enable-$(full_archive && echo load-extension || echo dynamic-extensions) |
1716 |
+ --enable-threadsafe |
1717 |
+ ) |
1718 |
+ if ! full_archive; then |
1719 |
+ options+=(--disable-static-shell) |
1720 |
+ fi |
1721 |
+ |
1722 |
+ # Support detection of misuse of SQLite API. |
1723 |
+ # https://sqlite.org/compile.html#enable_api_armor |
1724 |
+ append-cppflags -DSQLITE_ENABLE_API_ARMOR |
1725 |
+ |
1726 |
+ # Support column metadata functions. |
1727 |
+ # https://sqlite.org/c3ref/column_database_name.html |
1728 |
+ append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA |
1729 |
+ |
1730 |
+ # Support sqlite_dbpage virtual table. |
1731 |
+ # https://sqlite.org/compile.html#enable_dbpage_vtab |
1732 |
+ append-cppflags -DSQLITE_ENABLE_DBPAGE_VTAB |
1733 |
+ |
1734 |
+ # Support dbstat virtual table. |
1735 |
+ # https://sqlite.org/dbstat.html |
1736 |
+ append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB |
1737 |
+ |
1738 |
+ # Support sqlite3_serialize() and sqlite3_deserialize() functions. |
1739 |
+ # https://sqlite.org/compile.html#enable_deserialize |
1740 |
+ # https://sqlite.org/c3ref/serialize.html |
1741 |
+ # https://sqlite.org/c3ref/deserialize.html |
1742 |
+ append-cppflags -DSQLITE_ENABLE_DESERIALIZE |
1743 |
+ |
1744 |
+ # Support comments in output of EXPLAIN. |
1745 |
+ # https://sqlite.org/compile.html#enable_explain_comments |
1746 |
+ append-cppflags -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
1747 |
+ |
1748 |
+ # Support Full-Text Search versions 3, 4 and 5. |
1749 |
+ # https://sqlite.org/fts3.html |
1750 |
+ # https://sqlite.org/fts5.html |
1751 |
+ append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 |
1752 |
+ options+=(--enable-fts5) |
1753 |
+ |
1754 |
+ # Support hidden columns. |
1755 |
+ append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS |
1756 |
+ |
1757 |
+ # Support JSON1 extension. |
1758 |
+ # https://sqlite.org/json1.html |
1759 |
+ append-cppflags -DSQLITE_ENABLE_JSON1 |
1760 |
+ |
1761 |
+ # Support memsys5 memory allocator. |
1762 |
+ # https://sqlite.org/malloc.html#memsys5 |
1763 |
+ append-cppflags -DSQLITE_ENABLE_MEMSYS5 |
1764 |
+ |
1765 |
+ # Support sqlite3_normalized_sql() function. |
1766 |
+ # https://sqlite.org/c3ref/expanded_sql.html |
1767 |
+ append-cppflags -DSQLITE_ENABLE_NORMALIZE |
1768 |
+ |
1769 |
+ # Support sqlite_offset() function. |
1770 |
+ # https://sqlite.org/lang_corefunc.html#sqlite_offset |
1771 |
+ append-cppflags -DSQLITE_ENABLE_OFFSET_SQL_FUNC |
1772 |
+ |
1773 |
+ # Support pre-update hook functions. |
1774 |
+ # https://sqlite.org/c3ref/preupdate_count.html |
1775 |
+ append-cppflags -DSQLITE_ENABLE_PREUPDATE_HOOK |
1776 |
+ |
1777 |
+ # Support Resumable Bulk Update extension. |
1778 |
+ # https://sqlite.org/rbu.html |
1779 |
+ append-cppflags -DSQLITE_ENABLE_RBU |
1780 |
+ |
1781 |
+ # Support R*Trees. |
1782 |
+ # https://sqlite.org/rtree.html |
1783 |
+ # https://sqlite.org/geopoly.html |
1784 |
+ append-cppflags -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY |
1785 |
+ |
1786 |
+ # Support scan status functions. |
1787 |
+ # https://sqlite.org/c3ref/stmt_scanstatus.html |
1788 |
+ # https://sqlite.org/c3ref/stmt_scanstatus_reset.html |
1789 |
+ append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS |
1790 |
+ |
1791 |
+ # Support sqlite_stmt virtual table. |
1792 |
+ # https://sqlite.org/stmt.html |
1793 |
+ append-cppflags -DSQLITE_ENABLE_STMTVTAB |
1794 |
+ |
1795 |
+ # Support Session extension. |
1796 |
+ # https://sqlite.org/sessionintro.html |
1797 |
+ options+=(--enable-session) |
1798 |
+ |
1799 |
+ # Support unknown() function. |
1800 |
+ # https://sqlite.org/compile.html#enable_unknown_sql_function |
1801 |
+ append-cppflags -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION |
1802 |
+ |
1803 |
+ # Support unlock notification. |
1804 |
+ # https://sqlite.org/unlock_notify.html |
1805 |
+ append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY |
1806 |
+ |
1807 |
+ # Support LIMIT and ORDER BY clauses on DELETE and UPDATE statements. |
1808 |
+ # https://sqlite.org/compile.html#enable_update_delete_limit |
1809 |
+ append-cppflags -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT |
1810 |
+ |
1811 |
+ # Support PRAGMA function_list, PRAGMA module_list and PRAGMA pragma_list statements. |
1812 |
+ # https://sqlite.org/pragma.html#pragma_function_list |
1813 |
+ # https://sqlite.org/pragma.html#pragma_module_list |
1814 |
+ # https://sqlite.org/pragma.html#pragma_pragma_list |
1815 |
+ append-cppflags -DSQLITE_INTROSPECTION_PRAGMAS |
1816 |
+ |
1817 |
+ # Support soundex() function. |
1818 |
+ # https://sqlite.org/lang_corefunc.html#soundex |
1819 |
+ append-cppflags -DSQLITE_SOUNDEX |
1820 |
+ |
1821 |
+ # Support URI filenames. |
1822 |
+ # https://sqlite.org/uri.html |
1823 |
+ append-cppflags -DSQLITE_USE_URI |
1824 |
+ |
1825 |
+ # debug USE flag. |
1826 |
+ if full_archive; then |
1827 |
+ options+=($(use_enable debug)) |
1828 |
+ else |
1829 |
+ if use debug; then |
1830 |
+ append-cppflags -DSQLITE_DEBUG |
1831 |
+ else |
1832 |
+ append-cppflags -DNDEBUG |
1833 |
+ fi |
1834 |
+ fi |
1835 |
+ |
1836 |
+ # icu USE flag. |
1837 |
+ if use icu; then |
1838 |
+ # Support ICU extension. |
1839 |
+ # https://sqlite.org/compile.html#enable_icu |
1840 |
+ append-cppflags -DSQLITE_ENABLE_ICU |
1841 |
+ if full_archive; then |
1842 |
+ sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" |
1843 |
+ else |
1844 |
+ sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed" |
1845 |
+ fi |
1846 |
+ fi |
1847 |
+ |
1848 |
+ # readline USE flag. |
1849 |
+ options+=( |
1850 |
+ --disable-editline |
1851 |
+ $(use_enable readline) |
1852 |
+ ) |
1853 |
+ if full_archive && use readline; then |
1854 |
+ options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline") |
1855 |
+ fi |
1856 |
+ |
1857 |
+ # secure-delete USE flag. |
1858 |
+ if use secure-delete; then |
1859 |
+ # Enable secure_delete pragma by default. |
1860 |
+ # https://sqlite.org/pragma.html#pragma_secure_delete |
1861 |
+ append-cppflags -DSQLITE_SECURE_DELETE |
1862 |
+ fi |
1863 |
+ |
1864 |
+ # static-libs USE flag. |
1865 |
+ options+=($(use_enable static-libs static)) |
1866 |
+ |
1867 |
+ # tcl, test, tools USE flags. |
1868 |
+ if full_archive; then |
1869 |
+ options+=(--enable-tcl) |
1870 |
+ fi |
1871 |
+ |
1872 |
+ if [[ "${CHOST}" == *-mint* ]]; then |
1873 |
+ append-cppflags -DSQLITE_OMIT_WAL |
1874 |
+ fi |
1875 |
+ |
1876 |
+ if [[ "${ABI}" == "x86" ]]; then |
1877 |
+ if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} -E -P -dM - < /dev/null 2> /dev/null | grep -q "^#define __SSE__ 1$"; then |
1878 |
+ append-cflags -mfpmath=sse |
1879 |
+ else |
1880 |
+ append-cflags -ffloat-store |
1881 |
+ fi |
1882 |
+ fi |
1883 |
+ |
1884 |
+ econf "${options[@]}" |
1885 |
+} |
1886 |
+ |
1887 |
+multilib_src_compile() { |
1888 |
+ emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" |
1889 |
+ |
1890 |
+ if use tools && multilib_is_native_abi; then |
1891 |
+ emake changeset dbdump dbhash dbtotxt index_usage rbu scrub showdb showjournal showshm showstat4 showwal sqldiff sqlite3_analyzer sqlite3_checker sqlite3_expert sqltclsh |
1892 |
+ fi |
1893 |
+} |
1894 |
+ |
1895 |
+multilib_src_test() { |
1896 |
+ if [[ "${EUID}" -eq 0 ]]; then |
1897 |
+ ewarn "Skipping tests due to root permissions" |
1898 |
+ return |
1899 |
+ fi |
1900 |
+ |
1901 |
+ local -x SQLITE_HISTORY="${T}/sqlite_history_${ABI}" |
1902 |
+ |
1903 |
+ emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test) |
1904 |
+} |
1905 |
+ |
1906 |
+multilib_src_install() { |
1907 |
+ emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install |
1908 |
+ |
1909 |
+ if use tools && multilib_is_native_abi; then |
1910 |
+ install_tool() { |
1911 |
+ if [[ -f ".libs/${1}" ]]; then |
1912 |
+ newbin ".libs/${1}" "${2}" |
1913 |
+ else |
1914 |
+ newbin "${1}" "${2}" |
1915 |
+ fi |
1916 |
+ } |
1917 |
+ |
1918 |
+ install_tool changeset sqlite3-changeset |
1919 |
+ install_tool dbdump sqlite3-db-dump |
1920 |
+ install_tool dbhash sqlite3-db-hash |
1921 |
+ install_tool dbtotxt sqlite3-db-to-txt |
1922 |
+ install_tool index_usage sqlite3-index-usage |
1923 |
+ install_tool rbu sqlite3-rbu |
1924 |
+ install_tool scrub sqlite3-scrub |
1925 |
+ install_tool showdb sqlite3-show-db |
1926 |
+ install_tool showjournal sqlite3-show-journal |
1927 |
+ install_tool showshm sqlite3-show-shm |
1928 |
+ install_tool showstat4 sqlite3-show-stat4 |
1929 |
+ install_tool showwal sqlite3-show-wal |
1930 |
+ install_tool sqldiff sqlite3-diff |
1931 |
+ install_tool sqlite3_analyzer sqlite3-analyzer |
1932 |
+ install_tool sqlite3_checker sqlite3-checker |
1933 |
+ install_tool sqlite3_expert sqlite3-expert |
1934 |
+ install_tool sqltclsh sqlite3-tclsh |
1935 |
+ |
1936 |
+ unset -f install_tool |
1937 |
+ fi |
1938 |
+} |
1939 |
+ |
1940 |
+multilib_src_install_all() { |
1941 |
+ find "${D}" -name "*.la" -delete || die |
1942 |
+ |
1943 |
+ doman sqlite3.1 |
1944 |
+ |
1945 |
+ if use doc; then |
1946 |
+ rm "${WORKDIR}/${PN}-doc-${DOC_PV}/"*.{db,txt} |
1947 |
+ ( |
1948 |
+ docinto html |
1949 |
+ dodoc -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"* |
1950 |
+ ) |
1951 |
+ fi |
1952 |
+} |