b1f4efd20b
Fix a harmless uninitialized variable access.
...
FossilOrigin-Name: 398522e686b34e7f82a62e62d8b0a0ea924de064
2016-02-19 14:20:46 +00:00
81fd3497f4
Make sure WhereClause objects are fully initialized before use when
...
planning OR queries.
FossilOrigin-Name: 162053021795ff40c447498a76de4d31d58aa808
2016-02-19 14:10:44 +00:00
9a1e85ee2e
Fix (harmless) compiler warnings in some of the TCL-based test code.
...
FossilOrigin-Name: 7c26d2b47025edaa289bd4a383b5c1536482ec11
2016-02-19 13:29:52 +00:00
469753d949
Add an SQLITE_DISABLE_INTRINSIC #ifdef to the sqlite3Put4Byte() function.
...
FossilOrigin-Name: ba9c6827d0890aaed9168c221fefbdbe89f4f9d3
2016-02-19 13:20:02 +00:00
51381c208e
Omit the unused yyzerominor constant.
...
FossilOrigin-Name: 60ad68a9f569d2446d76a6453be4fa1c4ed2cd93
2016-02-19 13:19:22 +00:00
9e2cfad18a
Add an "#ifndef SQLITE_AMALGAMATION" guard around a typedef in fts5_test_mi.c to avoid redefining "u32" if it is compiled as part of the amalgamation. Cherrypick of [f9c49ba1].
...
FossilOrigin-Name: ce0f1ed517e387ca6a687b805088d7c529cd257b
2016-02-19 10:19:43 +00:00
92b859292d
Add an "#ifndef SQLITE_AMALGAMATION" guard around a typedef in fts5_test_mi.c to avoid redefining "u32" if it is compiled as part of the amalgamation.
...
FossilOrigin-Name: f9c49ba1edf13cb8c48d73f1b2e3f80c46b3c030
2016-02-19 10:18:36 +00:00
b0c99afeda
Modify the MSVC batch build tool to support the MSVC autoconf Makefile.
...
FossilOrigin-Name: 72b10e5e7d2db436c7b03cc3735a2e9d0e53ab5d
2016-02-19 05:07:56 +00:00
9751730f83
Further improvements to the MSVC batch build tool.
...
FossilOrigin-Name: b9626b5954068ae2e7733dd14f906a1f6d7090a5
2016-02-19 00:48:23 +00:00
b9076ba4c9
Further improvements to the MSVC batch build tool.
...
FossilOrigin-Name: 90dd6eb1fec22460473d670519d0e730bb37067d
2016-02-19 00:47:18 +00:00
d8945d1707
Correct the install location for the UWP VSIX package.
...
FossilOrigin-Name: f74de325ffb01a1ca8ddd4f011188e38296c3402
2016-02-18 21:15:12 +00:00
45dc877f76
Correct the install location for the UWP VSIX package.
...
FossilOrigin-Name: b47d03027e973e3c8d77246a2d2100881f6a9bd2
2016-02-18 21:00:29 +00:00
557d0383ff
Remove SQLITE_TEST macros from fts5_test_mi.c. Add the SQLITE_FTS5_ENABLE_TEST_MI compile time symbol - to make it easier to create builds that include the fts5 matchinfo demo by default.
...
FossilOrigin-Name: e2ef6667772eeac6eee3aed5d0609c2a0ef5d8cf
2016-02-18 16:16:43 +00:00
b2bddbbc2d
Avoid a potential buffer overrun if an SQL statement being parsed ends
...
with an illegal "!" token. (This problem was detected by fuzzcheck
running under valgrind. The problem was introduced by check-in [9570b6b43df3].)
FossilOrigin-Name: 2a8d97e7c8976df0312e1294e8c1da8b15686654
2016-02-18 14:49:28 +00:00
4c9d22819f
Improved handling of the -v option on the fuzzcheck test program.
...
FossilOrigin-Name: c8cd7804dc905b2b20cd7c0192bcfaceaaa7e2a8
2016-02-18 14:03:15 +00:00
a0c2d3c155
Remove an unnecessary "include <tcl.h>" line from fts5_test_mi.c.
...
FossilOrigin-Name: 31d8b69e9e0747e573516570bfe2770384e99134
2016-02-18 13:32:34 +00:00
5b081d8a28
Add extra API armor on the sqlite3_bind_blob() interface.
...
FossilOrigin-Name: 80de1ad5eb4c3839756b6467d5b8195b4abfb1f8
2016-02-18 01:29:12 +00:00
7f149e5173
When VDBE opcodes fail, they cause an immediate exit from the loop, rather
...
than depending on the rc==SQLITE_OK test at the top of the loop. This is
faster and smaller.
FossilOrigin-Name: 24c7151c1aabeaffcb8bb5836404e70a3ec4681b
2016-02-17 20:47:24 +00:00
9467abf3dd
Fix up all VDBE opcodes so that they cause an immediate exit on any kind of
...
error, and thereby eliminate the need to test "rc" at the top of the loop.
Resulting code is a little smaller and faster.
FossilOrigin-Name: a444633a827642bcf4d02a461e7e5f66769d39fd
2016-02-17 18:44:11 +00:00
b5a55ce77d
Bump the version number to 3.12.0.
...
FossilOrigin-Name: c17d7276b8c114df5fe6e9ea14d59758443c281b
2016-02-17 15:01:18 +00:00
5e29f38d2c
Remove the "#ifdef SQLITE_TEST" condition from fts5_test_mi.c. Update fts5_main.c so that if SQLITE_FTS5_TEST_MI is defined when it is built the fts5_test_mi.c entry point is automatically called. This makes it easier to build versions of fts5 that include the matchinfo() demo by default.
...
FossilOrigin-Name: 87e6e225aea3a4d10476d16eab4a6403a4a128c9
2016-02-17 14:48:26 +00:00
87d6b35541
Improve test coverage of demo code in fts5_test_mi.c.
...
FossilOrigin-Name: 8a78050dc0e374a0df0f29716df60250e2c4b4f7
2016-02-17 14:11:06 +00:00
b7997fe3a9
Enhance Lemon to generate more compact and efficient code for yy_reduce().
...
Update the main SQL grammar to take advantage of the new capabilities.
FossilOrigin-Name: 53fd040c98d9647ea135d43c493777bf8da4aebd
2016-02-17 13:24:12 +00:00
43303de97e
More agressive use of /*A-overwrites-X*/ in the parser. Fix an off-by-one
...
error in parser stack overflow detection.
FossilOrigin-Name: 417e777701bbf4bd67626d4ca3bc2c5d847f6cd0
2016-02-17 12:34:03 +00:00
0ccbc64fd6
Documentation typo on sqlite3_wal_hook(). No changes to code.
...
FossilOrigin-Name: fc2043ebaa3f106529500164936bb82f9b921b1c
2016-02-17 11:13:20 +00:00
cf82f0d3d2
Enhance Lemon so that if reduce code contains a comment of the form
...
"/*A-overwrites-X*/" then a LHS label A is allowed to overwrite the
RHS label X.
FossilOrigin-Name: 5cfe9545d478a2c500083613dd20e14b2ffce645
2016-02-17 04:33:10 +00:00
dabd04c656
Further improvements to the Lemon-generated code for yy_reduce().
...
FossilOrigin-Name: ef95a7d6490e33a9af4bc7b4b622de7328742ca7
2016-02-17 01:46:19 +00:00
4dd0d3f819
In Lemon, add the ability for the left-most RHS label to be the same as the
...
LHS label, causing the LHS values to be written directly into the stack.
FossilOrigin-Name: 4bb94c7c4c3cb3ccad72c2451d88684130dde845
2016-02-17 01:18:33 +00:00
45f31be85d
Experimental changes to Lemon for improved parser performance.
...
FossilOrigin-Name: a65d583ce97b8c08157268bd054479cda3957a94
2016-02-16 21:19:49 +00:00
30c14728b4
Minor simplification to the tokenizer. Slightly smaller and faster.
...
FossilOrigin-Name: 9570b6b43df3bc5ce314cded20bca8be9e968efe
2016-02-16 13:04:19 +00:00
dab943cf3d
Improve the Lemon parser template (lempar.c) so that it avoids unnecessary
...
work when the grammer defines YYNOERRORRECOVERY (as SQLite does). Slightly
smaller and faster code results.
FossilOrigin-Name: 9235b0cf6a37712ae9e5deeb1e5ee064dd5511fa
2016-02-16 01:01:43 +00:00
7ff89807e0
Fix a harmless compiler warning in FTS5.
...
FossilOrigin-Name: e52c90758c53cbb0f74e0d8582e4c3c1bee04150
2016-02-15 23:46:36 +00:00
b71aef3461
Readability improvements for winRandomness.
...
FossilOrigin-Name: 1640f814c7a5210f08c81e52e5a3fb89ac26f4d4
2016-02-15 22:37:18 +00:00
0ead47d1c7
Fix comment. No changes to code.
...
FossilOrigin-Name: 2e1f2eff27e25280fe626c07b6260b0a7aa903d3
2016-02-15 22:28:50 +00:00
bfc9b3f45c
Revise compiler checks for the rand_s() function.
...
FossilOrigin-Name: 287f508dd6abc1b9ffdbec6a685ebe79eeac992b
2016-02-15 22:01:24 +00:00
51d5ed97f5
On windows systems when rand_s() is available, use it to obtain additional
...
seed material in winRandomness().
FossilOrigin-Name: 139081bef9f63c3ebbe9e992408597b1349bdf37
2016-02-15 21:31:51 +00:00
8eb3790a8d
Improved entropy gathering for the implementation of winRandomness().
...
FossilOrigin-Name: fea3705e7750d276a8c8300b7a82dfae2d5979c0
2016-02-15 20:41:56 +00:00
4b7b1c9c12
Add working -q and --help options to testfixture.
...
FossilOrigin-Name: 404494e52b6385671ccde1c83b7b868986645536
2016-02-15 19:38:17 +00:00
3719d10d11
In the tool/warning.sh script, disable Android-specific compiler warning tests
...
when not running on Linux.
FossilOrigin-Name: 153f01a821e9844d0a2e418eb83c60f6c7695c8d
2016-02-15 18:58:37 +00:00
e683b89880
Fix harmless compiler warnings previously seen in 64-bit MSVC builds.
...
FossilOrigin-Name: 7026246300392a83cc23817dbc54c2c66bf1f2b3
2016-02-15 18:47:26 +00:00
32c49904a6
Add the SQLITE_NOMEM_BKPT macro to enhance the ability to debug OOM errors.
...
Only effective with compiling with SQLITE_DEBUG.
FossilOrigin-Name: 9b3454762d142113f5923d754ca6bd2edefbd362
2016-02-15 18:15:15 +00:00
66acf297fd
Minor code simplifications.
...
FossilOrigin-Name: c3b38efd50c3c07b6dee5dea4c1f95b37d1c0994
2016-02-15 18:02:13 +00:00
3bff397248
Make the application-defined SQL function logic more compact and faster,
...
especially faster for the case where an application defines thousands of
new SQL functions.
FossilOrigin-Name: 7d49ed32a7262ec95d72ce520ab75402633386a1
2016-02-15 17:56:35 +00:00
7f219fad58
Merge 3.11.0 changes.
...
FossilOrigin-Name: 631023dd9aa19cd8d92d712941d58e7148821995
2016-02-15 17:39:10 +00:00
195c8d5eba
Version 3.11.0
...
FossilOrigin-Name: 3d862f207e3adc00f78066799ac5a8c282430a5f
2016-02-15 17:29:24 +00:00
8e0cea1a5d
Make sure the codec is invoked when overwriting existing frames of the
...
WAL file. Yikes!
FossilOrigin-Name: f694e60a79024967a3f4574e3928f0b28589d381
2016-02-15 15:06:47 +00:00
80738d9c3e
Improvements to the application-defined function mechanism so that it is
...
more compact and runs faster, especially when the application defines
thousands of new SQL functions.
FossilOrigin-Name: 3201fbcc5105d23132e6b8b7ac825e66af4f8a39
2016-02-15 00:34:16 +00:00
8fd8413aaa
Update a comment.
...
FossilOrigin-Name: e9753d9a2c1269050f886e6cb9bc9cba0a8df6ce
2016-02-14 00:14:35 +00:00
fad3039c51
Enhance ability to debug out-of-memory errors.
...
FossilOrigin-Name: 6a9c4a3ebfb7cc0738ef6634440ccab44a21ff28
2016-02-13 23:43:46 +00:00
e75a9eb9bb
Provide Sqlite3_SafeInit() and Sqlite3_SafeUnload() entry points on the TCL
...
interface, but have the always return TCL_ERROR, because the non-standard
TCL builds on Macs require this.
FossilOrigin-Name: 37ec3015ec95035d31e3672f520908a0d36c9d67
2016-02-13 18:54:10 +00:00
a66e386225
Fix another test problem in sessionfault.test.
...
FossilOrigin-Name: f6d1cf79437f892220e93635c377513160ee7fd7
2016-02-13 15:08:25 +00:00
50d348b1e1
Harden sqlite3session_delete() against trying to delete a session that
...
is not currently on the session list.
FossilOrigin-Name: 6c2d34df76fb7823f307c11a1135ab30674421a9
2016-02-13 14:45:56 +00:00
6fee795885
Fix a problem in sessionfault.test causing it to segfault following a test failure. This commit does not fix the actual test failure - just the subsequent segfault.
...
FossilOrigin-Name: 582b2ae77d65b1e142ceb5774f37b0aaa3851378
2016-02-13 14:39:46 +00:00
d8b7d6e44c
Merge the changes for the 3.11.0 release candidate from trunk.
...
FossilOrigin-Name: 4d7a802e73ef0352f840bc8d74c560afb7666ff7
2016-02-13 14:07:56 +00:00
53ff9c2972
Fix a potential buffer overread provoked by invalid utf-8 in fts5.
...
FossilOrigin-Name: a049fbbde5da2e43d41aa8c2b41f9eb21507ac76
2016-02-12 18:48:09 +00:00
f2d328fa25
Fix a fairly obscure buffer overread in fts5.
...
FossilOrigin-Name: 130580207ab5cee762b2893808acef7c8afad027
2016-02-12 17:56:27 +00:00
aa622c1f4f
Fix a documentation typo. No changes to code.
...
FossilOrigin-Name: d9c985878cf7c74a79ccdb9cf94a2d48fdde3e6f
2016-02-12 17:30:39 +00:00
cd42352526
Enhance mptester so that it takes great care to delete its test database
...
prior to start-up, including checking the return code from unlink() and
retrying after a delay if unlink() fails. Hopefully this will clear
intermittant startup problems on Windows.
FossilOrigin-Name: 6ea84ec1e02f0a48953bc758027ab7148529c36e
2016-02-12 17:27:32 +00:00
a819aed880
Naming updates for Universal Windows Platform.
...
FossilOrigin-Name: 717c1fc41a2246e27b324a4071073c286bac4efc
2016-02-12 05:19:29 +00:00
f981093760
Remove an unused parameter from whereSortingCost().
...
FossilOrigin-Name: b5d771991686bf86a679b7dff9f16301a5029c8b
2016-02-12 00:13:38 +00:00
4553f6ea91
Automatically disable FTS3 and FTS4 when building with SQLITE_OMIT_VIRTUALTABLE.
...
FossilOrigin-Name: 0beb32d20d8dd698138cdb2de6b6056de176754d
2016-02-11 22:41:04 +00:00
30470c5162
Enhance the MSVC makefile to enable building 'testfixture' fully from source code.
...
FossilOrigin-Name: f183e05990608d1a4002fa8a02c2d2eea6bc94b6
2016-02-11 21:59:02 +00:00
c50d5908b4
Remove the unexplained extra 3.0 cost factor for the B-tree sorting that is
...
done to implement DISTINCT in the absence of an index to help.
FossilOrigin-Name: 52571991fcfa2629e8a8354e0c9a62e749a092bf
2016-02-11 21:55:23 +00:00
5d2e2f1267
Remove the unused fts5BlobCompare() routine.
...
FossilOrigin-Name: defc762dd11144402abd591278819768a080d5ea
2016-02-11 21:53:57 +00:00
e2eb259fce
Prevent 'expanded command line X too long' errors during the batch 'for' loops used for copying files.
...
FossilOrigin-Name: 67ee9b5af10a8b57a37f19ac040e49fdfcec4145
2016-02-11 21:38:05 +00:00
c04c54b842
Enhance the MSVC makefile to enable building 'testfixture' fully from source code.
...
FossilOrigin-Name: 54ff3a26bc45a1c3c0690119e8fd00b02e2a16ba
2016-02-11 21:28:16 +00:00
df9c59f74d
Fix another unused variable warning in fts5 code.
...
FossilOrigin-Name: 61b4c120540afd80a4021b0d3990f13acc38a059
2016-02-11 18:18:33 +00:00
2a44b3d877
Avoid a buffer overread when reading a corrupt fts5 structure record.
...
FossilOrigin-Name: facbc424e555061135aced7b134bf6c19f54e484
2016-02-11 18:08:38 +00:00
22e8356368
Handle parser stack overflow when parsing fts5 query expressions. Fix some compiler warnings in fts5 code.
...
FossilOrigin-Name: bc3f7900d5a06829d123814a5ac7b951bcfc1560
2016-02-11 17:01:32 +00:00
df3a907ecc
Add JSON1 and FTS5 to the set of extensions subject to close compiler warning
...
analysis. Fix some warnings in each. More (harmless) warnings still exist
in FTS5.
FossilOrigin-Name: cfe2eb88b504f5e9b1351022036641b1ac4c3e78
2016-02-11 15:37:18 +00:00
c41c132cf0
Minor simplifications deferred to the next release.
...
FossilOrigin-Name: a863729ccb75a56330460d3b7d558e639ad733d1
2016-02-11 13:30:36 +00:00
8988aeef60
In the MSVC makefile, include the working directory so that it can pickup build generated files (e.g. sqlite3.h, etc).
...
FossilOrigin-Name: e9e6000bd2f7e0ef85178db2b5b8f20e4cf0093c
2016-02-10 21:45:25 +00:00
05723a9e3c
Add testcase() macros to the CHECK constraint avoidance logic. Avoid creating
...
an unused VDBE label during CHECK constraint code generation.
FossilOrigin-Name: 970881befd5da6cc837c474d6e917de0bf029350
2016-02-10 19:10:50 +00:00
98bfa16db2
Fix to previous check-in: Make sure CHECK constraints involving the ROWID
...
are not ignored when the ROWID changes.
FossilOrigin-Name: 7782cb1dd5914b867caf5ff2f0f837407abbfd7a
2016-02-10 18:24:05 +00:00
2a0b527b37
Omit unnecessary CHECK constraints in UPDATE statements, when none of the
...
columns referenced in the CHECK constraint are modified.
FossilOrigin-Name: 02fbdbc782dd98f080bf4482d820f36c0ef3d519
2016-02-10 16:52:24 +00:00
bdb00225ab
Omit NOT NULL checks on unchanging columns in an UPDATE.
...
FossilOrigin-Name: 6a3aaedfb41735996470abbae6d3cd1be1f508b3
2016-02-10 16:03:20 +00:00
dd2b59b01d
When generating the snapshot-tarball, truncate the date/time in the name to
...
12 significant digits (YYYYMMDDhhmm) omitting the seconds and fractional
seconds.
FossilOrigin-Name: 604f77754797a4066f6cf275c7bc8a68d2839c2d
2016-02-10 13:36:17 +00:00
0d4f9354db
Updates to the autoconf tarball README.txt file.
...
FossilOrigin-Name: a3e911e3aa3e35446bed7f300bfe03f66e1494db
2016-02-10 13:17:14 +00:00
8809d821b4
Update the snapshot tarball name to use the date (ISO8601 format) instead
...
of the SHA1 hash in its name.
FossilOrigin-Name: 070ec66f677cdcd30087871feb8afd010a184b75
2016-02-09 22:54:39 +00:00
07f76568da
Add the new "snapshot-tarball" target to the unix makefiles, for building
...
a tarball similar to "amalgamation-tarball" but named by the SHA1 hash of
the current check-out rather than by the version number.
FossilOrigin-Name: 4f360b2ae78b3d4ccfe6c40ac6b27a00fc70cf23
2016-02-09 22:39:39 +00:00
c5286de0ee
Update the MSVC autoconf makefile with the recent changes from the primary one.
...
FossilOrigin-Name: c7242aa3e9c08e0c019388e89a785a6e59c915d5
2016-02-09 22:00:48 +00:00
949c5d3cfc
Fix the makefiles in the autoconf-tarball so that they build the command-line
...
shell with SQLITE_ENABLE_EXPLAIN_COMMENTS.
FossilOrigin-Name: 1135ad014aac8a4ae5169375af1b368feaa8331b
2016-02-09 20:37:46 +00:00
6d94555914
In the shell, use the appropriate string constant instead of a literal new-line.
...
FossilOrigin-Name: 61951b153d47096f30ebc8b84af408d9d709637c
2016-02-09 20:31:50 +00:00
d4e2857815
Enhance the command-line shell to be in auto-explain mode by default. It is
...
no longer necessary to use the ".explain" command to put the shell into a mode
where the EXPLAIN output is formatted nicely. That now happens automatically.
FossilOrigin-Name: 751915cb7e4981661a40dc5e4d029ab27434c2d9
2016-02-09 20:11:14 +00:00
87a24aa1ca
Improved auto-detection of EXPLAIN output in the shell.
...
FossilOrigin-Name: 6c6d7a6e89e67cdb0813d3eebb869aafb43d43ed
2016-02-09 20:04:07 +00:00
700c252a72
Add auto-explain mode to the command-line shell. Default on. Auto-explain
...
tries to automatically detect EXPLAIN queries and format them appropriately.
FossilOrigin-Name: 1d62aa6b315df47cafb33da7ca79d3386a2fdd48
2016-02-09 18:39:25 +00:00
406eeff6ff
Fix MSVC makefile options that enable control-flow guard.
...
FossilOrigin-Name: 51b6823f4c9376d549f572f5a33cac1e4c9783a2
2016-02-09 18:28:20 +00:00
74cf74ab7f
Fix the top-level makefiles to always include SQLITE_ENABLE_EXPLAIN_COMMENTS
...
when building the shell. Still need to fix main.mk and the
amalgamation tarball.
FossilOrigin-Name: 992282399cd2d1fc52ff5a1a4bff59f30b62899a
2016-02-09 17:12:22 +00:00
bbde018230
Code simplification: ALTER TABLE ADD COLUMN always upgrades the file_format
...
to 4 if is not there already. No need to upgrade to only 2 or 3 since format
4 has now been supported for over 10 years.
FossilOrigin-Name: e1d8ec85546caeca3bb7a05ad962a2aed91194ce
2016-02-09 16:09:22 +00:00
1a606f8246
Merge enhancements and fixes from trunk.
...
FossilOrigin-Name: f040a5bb62f3473fba6450c97c68f538d1df21ef
2016-02-09 15:44:18 +00:00
2fade2f791
Make sure every co-routines has its own set of temporary registers and does
...
not share temporaries, since a co-routine might expect the content of a
temporary register to be preserved across an OP_Yield.
Proposed fix for ticket [d06a25c84454a].
FossilOrigin-Name: ca72be8618e5d466d6f35819ca8bbd2b84269959
2016-02-09 02:12:20 +00:00
e48f1ed9bf
Fix spelling error in MSVC makefile comments.
...
FossilOrigin-Name: 6eab74c9ae57676044b5bc82fa14e92fd2448008
2016-02-08 20:45:37 +00:00
55e88d96ed
More work on Windows 10 SDK integration.
...
FossilOrigin-Name: 1e563c6ebbb02d2e89760c7a7f95aa69964629c6
2016-02-08 20:40:57 +00:00
c2d0b56e6a
Fix a signed/unsigned comparison warning in fts5.
...
FossilOrigin-Name: 85eb05ddbc3a7cff986af13c3dab6c0063e62171
2016-02-08 20:14:41 +00:00
83d7920e55
Fix a compiler warning when compiling without SQLITE_ENABLE_FTS3_TOKENIZER.
...
FossilOrigin-Name: 6926f28cd56bf61f7c92877baa54024bee7cbab5
2016-02-08 20:06:52 +00:00
e064c4066c
Disable the two-argument form of the fts3_tokenizer() SQL function unless the library is built with -DSQLITE_ENABLE_FTS3_TOKENIZER.
...
FossilOrigin-Name: e0eb217aca7e4aadf9c44ed20822b78139f7c83c
2016-02-08 19:40:17 +00:00
e96f361995
Changes to help the tokenizer run about 33% faster.
...
FossilOrigin-Name: a050e6f096d40aa5b6275797b96e62c228044f5a
2016-02-08 19:36:46 +00:00
34dcee6544
Add code to get the tokenizer character-class logic working for EBCDIC.
...
FossilOrigin-Name: 04f7da77c13925c1f1e287f4579bb85518297d81
2016-02-08 19:15:48 +00:00
41aab89b31
Faster keywordCode() implementation by taking advantage of the fact that
...
the input is always pure ASCII alphabetic and underscore and that the keyword
table is always upper-case.
FossilOrigin-Name: ff406b9701ebe3a01834837f380641c6f0c495bc
2016-02-08 03:23:46 +00:00
8974331fc3
Demonstrate a much faster sqlite3GetToken() routine by using a lookup table
...
to map initial token characters into a character class. This check-in does
not work for EBCDIC. More optimization needed.
FossilOrigin-Name: 9115baa1919584dc8ca25bbff54d3b65748a9631
2016-02-08 02:30:50 +00:00
27b6997e9c
Fix harmless compiler warning in 'srcck1' tool and add it to the clean targets.
...
FossilOrigin-Name: 852a529a8b112049f67a3126f677c06ae4a22d73
2016-02-07 20:39:27 +00:00
fd0d93fd71
Add the sourcetest target to Makefile.msc.
...
FossilOrigin-Name: ab269e720552483c5617906837e294c1be3e0a57
2016-02-07 00:08:08 +00:00
cc5f8a46b9
Add a utility program that looks for assert(), NEVER(), ALWAYS(), and
...
testcase() macros that have side-effects, and reports errors when they are
found. Also fix a bug that this utility detected as it was being tested.
FossilOrigin-Name: b0b4624fc5d53bb0cc9fae7dad51984837d946ac
2016-02-06 22:32:06 +00:00
f5818aa560
Make sure variable declarations occur at the beginning of blocks, even
...
with SQLITE_DEBUG enabled.
FossilOrigin-Name: 2f7778e64d93ef237e23ceac01ea9808df5cf2a1
2016-02-06 19:48:50 +00:00
bb3da060e3
Fix an assert() to have a test instead of a side effect
...
FossilOrigin-Name: a2952231ac7abe165ed070875728f752ae0be608
2016-02-06 14:14:43 +00:00
d120a1e3ab
Add tests for and remove unreachable branches from fts5 in order to restore test coverage.
...
FossilOrigin-Name: 22589018ac3321f7bd89ce9fa69e57eae395e324
2016-02-05 21:09:26 +00:00
a6f28893ed
More work on Windows 10 SDK integration.
...
FossilOrigin-Name: ebace2c99b6af9230c4bbc31a764c7f397200148
2016-02-05 19:40:23 +00:00
b80b8f482c
Further streamlining of fts5 prefix query code.
...
FossilOrigin-Name: ca91bd8ac70a5b3fef127364f73ec675e58bb92c
2016-02-05 19:18:02 +00:00
1cd0f05492
Make sure the "bak.db" database file does not actually exist before
...
starting the "quota.test" testing.
FossilOrigin-Name: 1cac6c45eeb7dbbcda0c76ba7d3a2ca77bc725cd
2016-02-05 17:49:43 +00:00
a23bc8a345
From test scripts, remove stray "breakpoint" commands and blank lines
...
at the ends of files.
FossilOrigin-Name: a6b35273239669189f33402144f58328b133d182
2016-02-05 16:46:09 +00:00
0ac7cfaf99
Merge enhancements from trunk.
...
FossilOrigin-Name: a533608cb0de3cbc1e28a794aab99864b8c249f4
2016-02-05 14:15:34 +00:00
0539702b8e
Improvements to the way out-of-memory conditions are handled, resulting
...
in an almost 1% performance gain in the commmon case where OOM errors do
not occur.
FossilOrigin-Name: b082538da774ac77f284fd7e22f9b1b9c2abc343
2016-02-05 14:11:12 +00:00
575fad6500
Add the slightly faster sqlite3DbMallocRawNN(db,n) routine for the majority
...
cases where db is guaranteed to be not NULL.
FossilOrigin-Name: 0a802e96ab06e2643834b83671fa8353da1a348d
2016-02-05 13:38:36 +00:00
b91d2214fe
Improve ERRORLEVEL handling in the MSVC batch build tool sub-routine 'fn_UnsetVariable'.
...
FossilOrigin-Name: fe123ab4f17f97ba9d64a7e0589ac47fd9d43877
2016-02-05 04:55:01 +00:00
98c7a12c00
OOM failures on sqlite3_errmsg16() in an app-defined function are no longer
...
benign.
FossilOrigin-Name: 9efb223f4ce8ccc00515f8f016f7c494c9ae5096
2016-02-05 04:50:27 +00:00
02de84e562
Another small tweak to the MSVC batch build tool.
...
FossilOrigin-Name: 76718bbce775e13a82893be519ddd98b2f3a4942
2016-02-05 04:39:11 +00:00
17a936f84a
Minor simplification of schema error reporting.
...
FossilOrigin-Name: a8846aeed9992c6c9f1c8bd6e996a4cbe891751e
2016-02-05 02:50:11 +00:00
b84e574c89
Further performance improvements that fall out of the mallocFailed changes.
...
FossilOrigin-Name: d94416ddca8f7ed727dd335d38155ea5945a86b7
2016-02-05 02:42:54 +00:00
4a642b6060
Improvements to the way that OOM errors are processed.
...
FossilOrigin-Name: c3ef03478a5788c855b3aef385d43ae7f494f440
2016-02-05 01:55:27 +00:00
e514f651d0
Temporarily back out the 0.5% performance improvement from
...
check-in [632071bac5ff32]. Need a more elaborate solution that works
with reentrant virtual tables and SQL functions.
FossilOrigin-Name: 42736fb0adc82a0fb692850ff3dd3f9b501cbf1f
2016-02-04 19:50:33 +00:00
4786cf5a20
Further improve performance of unindexed fts5 prefix queries.
...
FossilOrigin-Name: c9c6457d8ea911f6cc63967127e58da3146fd3ef
2016-02-04 19:45:19 +00:00
be7721d103
Avoid running some particularly time-consuming tests as part of veryquick.test.
...
FossilOrigin-Name: f465944b75a800ddc6920229ad32c2f39ff91e19
2016-02-04 17:31:03 +00:00
4df86af329
Remove unnecessary sets of db->mallocFailed.
...
FossilOrigin-Name: b787165b25a240fd5b4a5c7f73b395f30213a1d7
2016-02-04 11:48:00 +00:00
c4703eedab
Use sqlite3_malloc64() instead of sqlite3_malloc() in the spellfix extension.
...
FossilOrigin-Name: 634d008c34bd237fc9cfb88dc291394fc5d31efa
2016-02-04 11:15:57 +00:00
3b7f9a68d5
Escape control characters in JSON.
...
Fix for ticket [ad2559db380abf8].
FossilOrigin-Name: 4f1b5229a3bbc9d40b7433a5eb3139d59d31dcb1
2016-02-04 10:28:57 +00:00
6d258995e6
Refinements to synchronous logic:
...
(1) Use PAGER_SYNCHRONOUS_FULL rather than the corresponding magic number.
(2) Honor SQLITE_NO_SYNC on xDelete calls with sync
(3) Count xDelete syncs during testing
(4) Fix #ifs on SQLITE_EXTRA_DURABLE so that directory syncs on journal
unlink are off by default.
FossilOrigin-Name: e3157cb5ad0d22758e766a95fb1463a7810f7d7f
2016-02-04 09:48:12 +00:00
fabe393da8
In the VDBE loop, only check for OOM errors at jumps rather than after every
...
opcode, for about a 0.5% performance increase.
FossilOrigin-Name: 632071bac5ff324a74cec9bdbba2deb60c0945e9
2016-02-03 22:14:38 +00:00
eb715c62f9
Improve performance of fts5 prefix queries on detail=col tables.
...
FossilOrigin-Name: ca11f46db047e7f131cef3893f73824758a2076b
2016-02-03 20:04:59 +00:00
19d720d3a7
Fix markup errors in comments used to generate the documentation - specifically
...
in the documentation on the OP_Seek opcode.
FossilOrigin-Name: ef252bc4b59d272460aaebdc0d4b8e347b0d25a8
2016-02-03 19:52:06 +00:00
6841b1cb3d
Add "PRAGMA synchronous=EXTRA" which syncs the directory containing the
...
rollback journal when the rollback journal is deleted in order to commit a
transaction in DELETE mode.
FossilOrigin-Name: af92401826f5cf49e62c278f344ab75252a18da2
2016-02-03 19:20:15 +00:00
1b32554b80
Enhance the internal sqlite3VdbeAddOpList() interface to automatically update
...
jump destinations. Use this feature to simplify the AUTOINCREMENT code
generator.
FossilOrigin-Name: ae8b9d2edf1b5aef6108e729754911db7682b6a3
2016-02-03 01:55:44 +00:00
b06347a5dc
Add tests to restore full coverage of fts5 code.
...
FossilOrigin-Name: 063755c81574800e7db12a42e17d982a8c1e5181
2016-02-02 21:19:21 +00:00
735ff4a809
Enhance the performance of fts5 AND and OR queries.
...
FossilOrigin-Name: 62ea9e5ab8bc1a20245beebceb5ea62dcd7ec84e
2016-02-02 17:40:41 +00:00
33c1eb6477
Merge all recent enhancements from trunk.
...
FossilOrigin-Name: f3f9200115caf4b356f90ec97c351d1afbcb9bf6
2016-02-02 02:22:30 +00:00
b8db549832
Enhance the comment on the sqlite3_index_constraint object to bring attention
...
to the fact than iColumn field can be negative for a rowid.
FossilOrigin-Name: d8b7b1996eefae7768bfcb82d4ff22c69392aa63
2016-02-02 02:04:21 +00:00
1861afcdbb
Change the OP_SetCookie instruction to write the literal P3 value, not the
...
value in register P3.
FossilOrigin-Name: 6d7d4703ebf3754bec74123d5ba7e861a705f90f
2016-02-01 21:48:34 +00:00
df015945e3
Improve performance of fts5 queries.
...
FossilOrigin-Name: 2334e88244afe6387208be5d527aba9b5ddf4e4c
2016-02-01 20:12:41 +00:00
ed94af5eb9
Number VDBE opcodes starting with 0 instead of 1, as this obviates the
...
lower-bound test on "switch(opcode){...}", making the code smaller and faster.
FossilOrigin-Name: 4c9222f75bfac47f5422fff86b2d69a61933b3a2
2016-02-01 17:20:08 +00:00
3b37bc4206
Update walcrash.test to ensure that, during a particular test, enough data is written to cause SQLite to sync the wal file 14 times.
...
FossilOrigin-Name: 5d7c092869137a0ba69f93324fe4ed56a05b5985
2016-02-01 16:36:47 +00:00
cddb6ba03b
Fix a problem causing the OR/covering-index optimization to be disabled if compile time parameter SQLITE_MAX_ATTACHED were set to greater than 30.
...
FossilOrigin-Name: a17712bf8d98dd485560f434a5350e6381cf1411
2016-02-01 13:58:56 +00:00
b0c886510f
Minor simplification to the OP_AutoCommit opcode. Fix some code comments
...
related to transaction control.
FossilOrigin-Name: a9b6a0672f84dd205f9333951e4c2a608d027d71
2016-02-01 13:21:13 +00:00
38bace84cd
Fix an assert() that might fail on a corrupt database.
...
FossilOrigin-Name: 22eaced7274764eaf7ab4b5fc52cc2fcfc285708
2016-02-01 00:21:08 +00:00
482721ab75
Fix new test cases in stat.test so that they work with -DSQLITE_DEFAULT_AUTOVACUUM=1 builds.
...
FossilOrigin-Name: a2810cf65db13479e2ab255c37abac7841ee985d
2016-01-30 21:09:02 +00:00
52f5d1ba6b
Performance enhancement for fts5 column filter queries on detail=full tables.
...
FossilOrigin-Name: 13fb4aa6a87c5c6258979953da82eedc1a7bf14f
2016-01-30 19:16:11 +00:00
784c1b93fb
Merge the implementation of OP_IdxRowid and OP_Seek so that OP_Seek no longer
...
requires the rowid register and a separate OP_IdxRowid call. Shorter and
faster prepared statements result.
FossilOrigin-Name: 9bec50a1e7796a6e038db9b1cc7cc1e7e350bf74
2016-01-30 16:59:56 +00:00
b8d66dc4ec
Only honor the register subtype value if the MEM_Subtype flag is set.
...
Revised and improved fix for ticket [f45ac567eaa9f9].
FossilOrigin-Name: 1f4c667f37d63fc3ef2e8f2581ecd3a66c054426
2016-01-30 15:52:39 +00:00
5b6c8e4e1d
A different way to clear the subtype on VDBE registers when the value of the register is overwritten with new content. To fix [[f45ac567eaa9f93].
...
FossilOrigin-Name: 2e9fb1295cd31fc29c97444c3dec82fef68e939f
2016-01-30 15:46:03 +00:00
af30fdf6ed
Output subtype information on register traces for PRAGMA vdbe_trace.
...
FossilOrigin-Name: 96b780209cc95c3f3769bb880591380d94bfe38d
2016-01-30 14:17:10 +00:00
4b09ec6e11
Add the BTREE_FORDELETE and BTREE_AUXDELETE flags to the b-tree layer interface
...
and use them. Add assert() statement to verify that they are correct.
FossilOrigin-Name: 85c467041c9378cae3038756da815e9117ee8c7d
2016-01-30 13:32:30 +00:00
5f4a686f8c
Simplification and size reduction to the printf logic. Remove the bFlags
...
parameter from sqlite3VXPrintf() and sqlite3XPrintf(). Use sqlite3XPrintf()
instead of sqlite3_snprintf() for rendering P4 values in EXPLAIN output.
FossilOrigin-Name: 0bdb41c45aa1cc8e5c136aaa6605d54b401483bd
2016-01-30 12:50:25 +00:00
8ea0056d5c
Make use of covering indexes in the OR optimization.
...
FossilOrigin-Name: 9de3d7123007636aa97da1c70bc34344b0391078
2016-01-30 02:10:38 +00:00
b17020265b
Change the P4_INTARRAY so that always begins with a length integer. Print
...
the content of the INTARRAY on EXPLAIN output.
FossilOrigin-Name: 6c520d5726e80b4251338c43c405270d150ea81e
2016-01-30 00:45:18 +00:00
eaa6cd87e8
Add tests for the change on this branch.
...
FossilOrigin-Name: 7cb697f82932a2581af69350117a29c9c8a2544f
2016-01-29 21:16:13 +00:00
945d302215
Different comment on the alternative cursor fields of VdbeCursor.
...
FossilOrigin-Name: 6e3dcb6d7d960bb513d9a4a002b6cf5ab7159686
2016-01-29 20:58:40 +00:00
de892d9660
Experimental attempt to make better use of covering indexes within OR queries.
...
FossilOrigin-Name: a323ac3a9d42bd5cb38d724c7e1180584b91054c
2016-01-29 19:29:45 +00:00
df31221d33
Improvements to FORDELETE processing, including bug fixes and adding
...
assert() statements to help verify correct operation.
FossilOrigin-Name: 46080b0474363ca6594d2e5c249a280e2b4fc67a
2016-01-29 19:04:11 +00:00
47ab455c2b
Remove a stray "exit" in a test script.
...
FossilOrigin-Name: 10c88bf9f2c238abbbb54797ee2327ab72713e6f
2016-01-29 18:48:08 +00:00
65875f37bc
Avoid unnecessary WHERE clause term tests when coding a join where one of the tables contains a OR constraint.
...
FossilOrigin-Name: 512caa1ad30e6f699e2d006d5ab7674d55d2c746
2016-01-29 18:11:04 +00:00
83f0ab8087
Prepend "rc!=SQLITE_OK || " to the nExtraDelete assert() condition.
...
FossilOrigin-Name: 2a055ed0afd56e8c6b17cfc31e7808debe9ec765
2016-01-29 18:04:31 +00:00
3b83f0cd8f
Avoid unnecessary WHERE clause term tests when coding a join where one
...
of the tables contains a OR constraint.
FossilOrigin-Name: ab94603974a0ad5342e5aee27603162652e70492
2016-01-29 16:57:06 +00:00
98a4d5a7fa
Avoid two more instances of pointer arithmetic on freed pointers.
...
FossilOrigin-Name: 2910ef64097b890c9f8929bf609ea2827db7ac97
2016-01-29 08:38:35 +00:00
895c00e16a
Modify the order of terms in an "if" condition to avoid implicitly comparing a dangling pointer to NULL following an OOM error.
...
FossilOrigin-Name: 5372f800835da61736a64dcee8b476bbe7ee2e46
2016-01-28 18:22:46 +00:00
e61bbf4417
Modifications to ensure the nExtraDelete-related assert() statement does not fail.
...
FossilOrigin-Name: f43ff8f82d6c1239e6f9a32e7716421c1180ac74
2016-01-28 17:06:17 +00:00
d5cafb380e
Remove a duplicate "p->magic = VDBE_MAGIC_RUN;" line from vdbeaux.c.
...
FossilOrigin-Name: 688eb3b400a3f2f8005c341e8259f4c1485cb0ed
2016-01-28 08:58:45 +00:00
ba60fbb621
Fix for pthread detection in the configure scripts.
...
FossilOrigin-Name: 47633ffdbfead3ce7b1f6560660df99f950d24f8
2016-01-28 02:47:32 +00:00
00029a1add
Minor correction to the batch tool changes in the previous check-in.
...
FossilOrigin-Name: 7c89d75de1e8d44d7ebd8eac1320b50dd6c221a8
2016-01-28 00:04:32 +00:00
5a2412f418
Match the MSVC batch build tool sub-routine 'fn_UnsetVariable' a bit more robust.
...
FossilOrigin-Name: 1edd5f31b9e6f91bb5434055a539428c000f1084
2016-01-27 23:50:14 +00:00
def19e3b48
Change the name of the BTREE_IDXDELETE flag to BTREE_AUXDELETE, to better
...
reflect its purpose.
FossilOrigin-Name: 1d3bf6bebdda9f96734bc139601e9b05344ea0b4
2016-01-27 16:26:25 +00:00
127f720240
Fix tests in fordelete.test to test for the BTREE_AUXDELETE flag.
...
FossilOrigin-Name: bbd25cf179df5bda1fe729928d6746248f06e46f
2016-01-27 16:17:41 +00:00
b89aeb6aa2
Add assert() statements on the nExtraDelete variable in vdbe.c to try to verify
...
that the FORDELETE and IDXDELETE flags are being generated correctly. Those
flags are not currently generated correctly, and so the assert()s trip on this
check-in.
FossilOrigin-Name: dde1db0dd2e2cf04706117629756c352b178ebb8
2016-01-27 15:49:32 +00:00
d5be6f01cd
Support building for Windows 10 desktop using 'MinCore.lib'.
...
FossilOrigin-Name: 4bf89891fbb076364dc45a6bf3246efa6bc33d5d
2016-01-27 07:28:33 +00:00
8716bfd8cd
Merge all recent trunk enhancements.
...
FossilOrigin-Name: 9a71d56dcea953cb965f1fdda9a8b8f158cdeff6
2016-01-26 23:32:55 +00:00
2f36f06e10
Performance improvements for fts5, particularly detail=col mode.
...
FossilOrigin-Name: a3d7b8ac53f94d29a11362f193fd1967f30583df
2016-01-26 20:19:55 +00:00
18205c781d
Further minor performance improvements and code-size reductions related to fts5 column filters on detail=col tables.
...
FossilOrigin-Name: b4ac61aeee976296e7719949cd4fb496147a29e8
2016-01-26 20:08:50 +00:00
1c16bccb79
Improve the performance of fts5 column filters on detail=col tables.
...
FossilOrigin-Name: 249a2d070c34bf884a04cb248b9691e239f2871c
2016-01-26 19:30:49 +00:00
fee981e5b9
Enhance fts5txt2db.tcl, a script used to generate fts5/fts4 databases for performance testing.
...
FossilOrigin-Name: c646e40350e5aa91abcf52de61fb31275bad38f9
2016-01-26 17:08:22 +00:00
8770677c1e
Fix issues on unix with opening database files via symlinks that are not in the current working directory. And with nested symlinks.
...
FossilOrigin-Name: 4003db4a49c6b623750e56f626fa492c8402067f
2016-01-26 14:48:02 +00:00
2349670262
Ensure that unixFullpathname() always nul-terminates its output buffer, even when returning an error.
...
FossilOrigin-Name: 4a4385564dd3887a7953820b60c99d6ce289f96a
2016-01-26 13:56:42 +00:00
f0fc992936
Remove an unused variable.
...
FossilOrigin-Name: 1c2656c1d37906230edc142d3a4253b16b6e925f
2016-01-26 00:12:42 +00:00
9e0caad428
Add the ability to do Windows builds to the amalgamation tarball.
...
FossilOrigin-Name: abd2b357c55fdcdbc8e66a81a3fbb7f822ea0a4f
2016-01-25 23:24:38 +00:00
a72d15b5f0
Minor changes to the autoconf/README.txt file.
...
FossilOrigin-Name: 6df8a9c00a9d067f67d492da7a4617908070c6c0
2016-01-25 23:19:58 +00:00
2aac8c7ba1
Fix a compiler warning about doing pointer arithmetic involving a NULL pointer
...
even though the result of computation is never used.
FossilOrigin-Name: 7c49a9478bd36564e81d33458ca1f4063ddaca83
2016-01-25 22:08:11 +00:00
af1b36b1df
Only use lstat() if the HAVE_LSTAT macro is defined. Fix some test file issues.
...
FossilOrigin-Name: 8a6e4147a680ad6c5fdd588468b6daac82349d2c
2016-01-25 18:43:05 +00:00
caf6b150a1
Simplify the unixFullpathname() function. This adds a dependency on lstat().
...
FossilOrigin-Name: f71249d3db9242b8f38955db51a7a5789d002803
2016-01-25 18:05:49 +00:00
e88ec187cd
Fix issues on unix with opening database files via symlinks that are not in the current working directory. And with nested symlinks.
...
FossilOrigin-Name: 80398fd44fb232193450103808e1854e0eba5652
2016-01-25 17:04:48 +00:00
cc2fa4cf55
Replace the OP_SetIfNotPos operator with OP_OffsetLimit in the VDBE, for
...
simpler and smaller code.
FossilOrigin-Name: 7ac017a498b6fb28343eef2d24e400c7800660d6
2016-01-25 15:57:29 +00:00
164c957b09
Add the SQLITE_EXTRA_DURABLE compile-time option.
...
FossilOrigin-Name: 30671345b1c1ee55a2d1aa17273213f1849efd81
2016-01-25 13:55:47 +00:00
a7dc4a321d
Small simplification to the prepare statement opcode memory reuse logic.
...
Easier to read, and slightly smaller and faster.
FossilOrigin-Name: 8a1deae497edf3fa43fa96152d140405398c5ed6
2016-01-25 02:15:02 +00:00
d0d0f8dc67
Small simplification and performance improvement in memsys5Free().
...
FossilOrigin-Name: 0a9cff5c4822874b74e90bfca3963bc7e5c753a5
2016-01-25 01:07:59 +00:00
9084ec1d96
Add the SQLITE_SPELLFIX_STACKALLOC_SZ compile-time option to control how much
...
stack space is available for use as the Wagner matrix in editDest3 of the
spellfix extension.
FossilOrigin-Name: dd0100dd87e2c7c70fabb2d3188f0906e605583d
2016-01-23 22:55:53 +00:00
76d4b1b835
More updates to the README.
...
FossilOrigin-Name: 9f02868df71d902a2b9118d0b06df18ee92b666b
2016-01-23 21:57:46 +00:00
74f6e6ccf8
Updates to the autoconf README file.
...
FossilOrigin-Name: 4ce60fa42d8486d219d40d25d785d7f2cabe5e06
2016-01-23 20:43:48 +00:00
021f9a6605
Move Makefile.min.msc into the autoconf subdir where it belongs and change
...
its name to Makefile.msc. Adjust build scripts accordingly.
FossilOrigin-Name: 12eb8db79697ef55228c78011d275f36f58271e1
2016-01-23 20:34:27 +00:00
4a25549b08
Minor coding style tweaks for the mkmsvcmin tool.
...
FossilOrigin-Name: c15e0fc4be08b92547bea1f1cac65581ef497409
2016-01-23 20:16:40 +00:00
ac779bcbe9
Adjust the amalgamation-tarball build process so that it includes the
...
MSVC makefile and the sqlite3.rc resource file.
FossilOrigin-Name: e420f3dc93a0e3364f0773950b7a125f5221a109
2016-01-23 20:09:30 +00:00
06cee48728
Improved comments on the transformation script and on the generated Makefile.
...
FossilOrigin-Name: c6e633ab73812fe38f3e969f1652f1b5759096e4
2016-01-23 19:47:00 +00:00
408273e722
Use the -integer option when sorting list elements.
...
FossilOrigin-Name: 949aa614e1401f6ab61cbb2e0469c60d764e6880
2016-01-23 19:24:19 +00:00
e9eb1593f5
Fix an fts5 problem with using both xPhraseFirst() and xPhraseFirstColumn() within a single statement in detail=col mode.
...
FossilOrigin-Name: 72d53699bf0dcdb9d2a22e229989d7435f061399
2016-01-23 18:51:59 +00:00
c6aab32144
Changes to spellfix to try to get it to use stack space instead of heap space
...
in cases where that makes sense.
FossilOrigin-Name: dfcebc7393a3a780ee9c4f257723c303bb633064
2016-01-23 18:24:52 +00:00
e17b646fd5
Merge trunk changes (including fixes for warnings in fts5) with this branch.
...
FossilOrigin-Name: ceccc9ad788fb4da9120915741995b9f088f85ff
2016-01-23 16:20:16 +00:00
c66d03f1e1
Fix some signed/unsigned comparison compiler warnings in fts5.
...
FossilOrigin-Name: 3be336aa893f9eb0837d7d66c83bab1489792b9a
2016-01-23 15:57:06 +00:00
8498f387be
Fix a problem involving detail=col and column filters.
...
FossilOrigin-Name: 7558a0ad2276e91f2faced8ea405d9fdb4fa0c6e
2016-01-23 14:45:36 +00:00
c615097d3d
Remove an assert() that can be false if compiled with SQLITE_USE_ALLOCA.
...
FossilOrigin-Name: f0a551edf87ef061deae34d88b02c3b484ae9adc
2016-01-23 14:05:27 +00:00
3e7860938b
Add tooling to create an MSVC Makefile capable of building the core library and shell only, using a pre-built amalgamation.
...
FossilOrigin-Name: c46f1a13cb00264d1164399059250884c7be4ea0
2016-01-23 07:53:04 +00:00
6cc16fc070
Cleanup localtime() support for Windows CE.
...
FossilOrigin-Name: 39759a553208d8ef72964bdd539a0883e1d99cf6
2016-01-23 01:54:15 +00:00
4cfea5c794
More work on the MSVC build.
...
FossilOrigin-Name: a79c46bc61a35edbaf6112c26e8052314b0eb16a
2016-01-23 00:07:51 +00:00
147ef39486
In the TCL interface, if a database connection object was opened with
...
the -uri 1 option, then also honor URI filenames for the "backup" and
"restore" commands.
FossilOrigin-Name: a1c8116ced62d81f3f5ca26bbe0877e829d4cc56
2016-01-22 23:17:51 +00:00
a8a1873485
More MSVC makefile cleanup.
...
FossilOrigin-Name: df22556fd75997111e52f96572da8379dfe948be
2016-01-22 22:16:50 +00:00
795502d26c
Experimental performance enhancements for fts5.
...
FossilOrigin-Name: b5a57b812fd6a734cf2a342bf0b730ae18912d73
2016-01-22 19:48:34 +00:00
c3dfa5eba7
Reenable the xCurrentTime and xGetLastError methods on the unix VFSes as long
...
as SQLITE_OMIT_DEPRECATED is not defined.
FossilOrigin-Name: c11c85fdb6514cae54bb44945cc197dcaba72307
2016-01-22 19:44:03 +00:00
40aced5c65
Add the sqlite3TokenInit() utility function.
...
FossilOrigin-Name: 7323175337b7ba85ac932ca892b28860f6a5b688
2016-01-22 17:48:09 +00:00
b5c557b87e
Have the dbstat module dequote any argument passed to the CREATE VIRTUAL TABLE statement before attempting to match it against the names of attached databases.
...
FossilOrigin-Name: e60461e984b8df09256bb0d733dbfae52568a145
2016-01-22 15:44:07 +00:00
d7d305a25a
Enable FTS4 when building the shell with the MSVC makefile.
...
FossilOrigin-Name: e4c07df557cd50786b05eecf011bf94708e6e31b
2016-01-22 04:22:36 +00:00
5d4d941e94
Further refinements to the MSVC makefile.
...
FossilOrigin-Name: 67625b963a6f5a0c6dff1a04a323e693569c2d94
2016-01-22 03:54:36 +00:00
edcb4ebba1
MSVC makefile enhancements for use with the Windows 10 SDK.
...
FossilOrigin-Name: ac2e9d3de54d299f92fc35927b6df6d3aaa2dc59
2016-01-22 01:25:15 +00:00
153d3e91db
Fix typo in 'Makefile.in'.
...
FossilOrigin-Name: 29a51c6dcc0ef7cab51aba0024e9c5bec89c6973
2016-01-21 18:56:10 +00:00
2beb2c390b
Disable the RESTRICT foreign key action if "PRAGMA defer_foreign_keys" is set.
...
FossilOrigin-Name: 82470d1c3a41221c78bcdd402b2219c4c21c43af
2016-01-21 17:25:56 +00:00
e807bdba86
Add a new hint bit on the flags parameter of sqlite3BtreeDelete(). The new
...
BTREE_IDXDELETE bit indicates that the call is to delete an index entry
corresponding to a table row that has already been deleted.
FossilOrigin-Name: ac2cbadd8000947c097da5b00c00090fe58fdcff
2016-01-21 17:06:33 +00:00
9c0c57a4ca
Improved comments on the FORDELETE hint. No logic changes.
...
FossilOrigin-Name: a3cec529f0238e4ca1196fec420f2de80d28db78
2016-01-21 15:55:37 +00:00
b5a5a23e92
Add 'rbu' to the clean targets.
...
FossilOrigin-Name: f60f025027ab3acdbc97701f81ff9c11c8463022
2016-01-20 18:47:59 +00:00
bd5af9ea31
Add a -detail option to the loadfts5.tcl script. For creating tables with the detail= option set.
...
FossilOrigin-Name: 81e830e21f81b6428209afa0b8f42f2fd9bd7aab
2016-01-20 16:36:10 +00:00
e1ed0bb607
Merge the LIKE-operator bug fix from trunk.
...
FossilOrigin-Name: 36cb3d6e274a06a78693ca506feaad0b14bde11d
2016-01-20 16:02:48 +00:00
30908c97ac
Fix a problem in autoconf/configure.ac causing --enable-readline to fail if libedit was not present.
...
FossilOrigin-Name: e8adeb64d4e463772feb58dbd6f00715b92e735c
2016-01-20 15:19:56 +00:00
fb3972602c
Case folding in the LIKE operator should look at all bits of the character,
...
not just the lower 8 bits. Fix for ticket [80369eddd5c94]. This is a
back-out of check-in [0a99a8c4facf] with a testcase added.
FossilOrigin-Name: 204432ee72fda8e82d244c4aa18de7ec4811b8e1
2016-01-20 14:22:41 +00:00
20f272c96f
Merge recent enhancements from trunk.
...
FossilOrigin-Name: 327af5f644a49b2f41d5456958f9d61a2b704e1c
2016-01-20 11:33:37 +00:00
5c3aa0517e
Improve performance of sqlite3VtabImportErrmsg().
...
FossilOrigin-Name: 18d61c8e40ed1466b6a3a2f53bf0eeb09687c20e
2016-01-20 08:47:55 +00:00
1da26a48dd
Performance improvement in sqlite3DbMallocRaw().
...
FossilOrigin-Name: ff8eadbed5004ab03438f737492387dee6b9750a
2016-01-20 03:36:32 +00:00
939e778bc8
Suppress the display of the P4 operand in EXPLAIN output when an opcode
...
has been converted into a No-op.
FossilOrigin-Name: 9f8297f862a110ded686d091854fae20c6bc393c
2016-01-20 02:36:12 +00:00
9bfb024de0
Remove an unnecessary memset() from the symbol name resolver.
...
FossilOrigin-Name: da527ddae06460ab4b706cdb871de2188ebaf5ac
2016-01-20 02:21:50 +00:00
4b31bda2c5
Remove an unnecessary memset() for a small size reduction and speed improvement.
...
FossilOrigin-Name: 730d7efb6fef54ed7c1f4ae27e3b55778ea6ff01
2016-01-20 02:01:02 +00:00
6d664b4bb3
During compilation, transfer the azVar[0..nzVar-1] array from Parse to Vdbe
...
rather than copying it. Smaller and faster code.
FossilOrigin-Name: 80dd495f378614e4eca72e71e43061b1b94ee450
2016-01-20 01:48:25 +00:00
36b78ee7d8
Very small simplification to the btree balancer.
...
FossilOrigin-Name: f421adf54c9db91ba6ca64a8ba3751680e47924a
2016-01-20 01:32:00 +00:00
e40cf40c1a
Fix an incorrect VFS version number check in the threadtest3.c test program.
...
FossilOrigin-Name: 5bf6442bec83977006bc5049adcdbd4dd39369fe
2016-01-19 21:36:26 +00:00
b8763639bb
Fix two harmless compiler warnings about comparisons of dangling pointers.
...
FossilOrigin-Name: 86944f193f1f06b64471953bb5713ecea7f3d803
2016-01-19 17:54:21 +00:00
4684ffd495
Add further fts5 tests. 100% code coverage is finally restored.
...
FossilOrigin-Name: b914ece0d146cfc8adba4dc4e8633e14f174d6ea
2016-01-19 16:06:23 +00:00
6d3c2889ec
Add tests for fts5. Fix a crash that can occur in fts5 if the database content is corrupted.
...
FossilOrigin-Name: acaf426449bf6fd3140fd63141750ff69d1119a5
2016-01-18 17:48:28 +00:00
c263f7c4b3
Avoid unnecessary calls to memset() for a small performance improvement.
...
FossilOrigin-Name: 9e8c23acf74944a165c733682a956948b15bd401
2016-01-18 13:18:54 +00:00
0536a07c0e
Add a debugging function to print human-readable versions of fts5 detail=none leaf pages.
...
FossilOrigin-Name: 8358af3658d888516cdef5f8c8d89e9bdee53f91
2016-01-18 09:08:56 +00:00
e617bc8c0c
Simplification of the VDBE bytecode for incremental blob I/O.
...
FossilOrigin-Name: d23849f64a110e336f26282bf2b961a2a2372468
2016-01-18 00:46:11 +00:00
dad300d8e1
Fix a problem with SQLITE_TEST_REALLOC_STRESS.
...
FossilOrigin-Name: 0aaf3febb00f622c5ef0853b2491d69f7ca7a21e
2016-01-18 00:20:26 +00:00
3ed7029921
Add extra tests to cover untested branches in fts5.
...
FossilOrigin-Name: 61deab043dcea860070dba6b02601a7de627fff1
2016-01-16 21:06:41 +00:00
2ce1865dd8
Improvements to the way sqlite3VdbeAddOpList() works, resulting in a slightly
...
smaller and faster binary.
FossilOrigin-Name: 88ceb588bcdb3ca86d0c58cfdeb61b5fe070872f
2016-01-16 20:50:21 +00:00
8631402e6a
Add further tests for fts5. Fix some problems with detail=col mode and auxiliary functions.
...
FossilOrigin-Name: de77d6026e8035c505a704e7b8cfe5af6579d35f
2016-01-16 18:58:51 +00:00
9b34abee30
Use sqlite3VdbeAddOp4() rather than a separate sqlite3VdbeChangeP4() call, for
...
a slightly smaller and faster binary.
FossilOrigin-Name: a4258cd4613c55acacb5c7b61faa3de7eb0759d2
2016-01-16 15:12:35 +00:00
095fb474ef
Fix a potential use-after-free problem when compiling with SQLITE_HAS_CODEC.
...
FossilOrigin-Name: 653ea15ad8e23b333e234eb5dde7b80134db2baf
2016-01-16 03:16:19 +00:00
079d446dd2
Remove an unnecessary memset().
...
FossilOrigin-Name: 689421a9f73ceeab9786840a2d6ee008124d1f25
2016-01-15 21:55:46 +00:00
25247435be
Rationalize some code in fts5_storage.c. Add tests to cover recently added branches in fts5.
...
FossilOrigin-Name: 3b72df405ac9b3a71144f45317d32e25f0084c4b
2016-01-15 19:54:47 +00:00
241873e55c
Remove unnecessary de-initialization of the Parse object.
...
FossilOrigin-Name: 75ab30c5fcb51e556342dc3112f9acf122f79947
2016-01-15 16:11:58 +00:00
055f298ad4
Work toward making the schema parsing logic simplier and more compact.
...
FossilOrigin-Name: c52ca2c0662bb30ab34574f933429512655b19ff
2016-01-15 15:06:41 +00:00
1e38927c12
Fix a couple C99-isms in FTS5 that cause compile errors on MSVC.
...
FossilOrigin-Name: 584848d4396d7755027fab377c97e40fbcc90d21
2016-01-15 05:39:55 +00:00
2d80151f32
Combine the xFunc and xStep pointers of the FuncDef object into a single
...
pointer xSFunc.
FossilOrigin-Name: 0d1b3d7d3ca66cb0b97493f1aeade1703af3c9f4
2016-01-14 22:19:58 +00:00
2cfe049f40
Add a test to verify that the fts3 and fts5 "unicode61" tokenizers are byte for byte compatible.
...
FossilOrigin-Name: 8ec8314354edc9d6f7d1c8a6370fd984a552a52f
2016-01-14 20:05:59 +00:00
3349620e9e
Simplification to the ISO8610 parser in the imnplementation of date/time
...
functions.
FossilOrigin-Name: b9159f42a517a95ae52464c96431708c00b7bb36
2016-01-14 19:32:46 +00:00
83a2253409
Minor adjustments to the MSVC makefile.
...
FossilOrigin-Name: e2cba1bbfdcb24e35b2275e29071d8a4e4943417
2016-01-14 18:01:16 +00:00
cb75bff3f7
Merge the latest fixes and enhancements from trunk.
...
FossilOrigin-Name: 007e5c6df60f9743ac6914332f59925e4a7a861c
2016-01-14 14:48:17 +00:00
0ea94db612
Yet another change to FTS5 trying to get it to merge successfully into sessions.
...
FossilOrigin-Name: 8dedff3b9ac3e6bf9c131fee19f7d26dc1ebd61f
2016-01-14 14:33:36 +00:00
d625adb8db
Fix more compiler warnings in FTS5.
...
FossilOrigin-Name: f791fc7009d68941c60d7bf953bab19d86112133
2016-01-14 14:29:57 +00:00
17535393b9
Fix another compiler warning in fts5 code.
...
FossilOrigin-Name: d17bc2c92f4d086280e49a3cc72993be7fee2da7
2016-01-14 14:19:50 +00:00
f705e9deab
Fix compiler warnings in fts5.
...
FossilOrigin-Name: 5a343cc0336bba056df4449e6cd2e3fb9e75a105
2016-01-14 14:15:54 +00:00
7647377f52
Fix harmless compiler warnings in RBU and add RBU to the autoconf and windows
...
makefiles.
FossilOrigin-Name: fabe78c5d8ab353988f6fe0decacd651edc17ec2
2016-01-14 13:22:24 +00:00
62e63bb9a9
Fix harmless compiler warnings in sqldiff.c.
...
FossilOrigin-Name: 74808a79ea3194f6cc00084b9dccc380846a6051
2016-01-14 12:23:16 +00:00
b4acd6a8d6
Fix the build so that it works for SQLITE_OMIT_WAL again.
...
FossilOrigin-Name: d55a557bc70460c46a67ae5acd9f8a8356a580c2
2016-01-14 01:56:43 +00:00
13c808a9fc
Look for pthread_mutexattr_init() instead of pthread_create() in autoconf
...
scripts, to work around issues with ASAN.
FossilOrigin-Name: 9c3a0dc2e8bf202cd846841bd5d4ea67aa189c1a
2016-01-13 21:23:48 +00:00
7f50d69359
Add documentation for new API functions to the comments in fts5.h.
...
FossilOrigin-Name: 14d296fa7b43b4999a1fd070cf030f83fe1b94c3
2016-01-13 18:25:36 +00:00
31a2313fa8
Add the SQLITE_FCNTL_JOURNAL_POINTER file control.
...
FossilOrigin-Name: ad3daa5427672d2d236939ad3285b765f4601801
2016-01-13 18:12:44 +00:00
504ef44022
Add documentation for the SQLITE_FCNTL_JOURNAL_POINTER file-control.
...
FossilOrigin-Name: 807c5aee2e5e5c01eb33688a199755c345c3664e
2016-01-13 18:06:08 +00:00
a04a8be2c2
When the [ https://www.sqlite.org/queryplanner.html#partialsort |block sorting optimization]
...
is used in a scalar subquery, be sure to exit the loop as soon as the first
valid output row is received. Fix for ticket [cb3aa0641d9a4].
FossilOrigin-Name: cdbb0947f9ce18d6d7e29ffab5ea6a2ee5365fbb
2016-01-13 17:50:10 +00:00
8656b24144
Add the "detail" option to fts5. Used to reduce the amount of information stored in an fts5 index.
...
FossilOrigin-Name: a220e85fe535af5ef2da6ef5fb76abe5a96b5abf
2016-01-12 19:45:01 +00:00
b19e7352c1
Add the ".vfslist" command to the command-line shell.
...
FossilOrigin-Name: 5727562b75edf25102cd72607c420d245379c96d
2016-01-12 19:37:20 +00:00
fd7601a125
Improve performance of fts5 low level iterators.
...
FossilOrigin-Name: bc5118f40a11f64ffb4e1c086277fa80b9764745
2016-01-12 19:28:51 +00:00
d1dd7507e4
Fix a harmless use of an uninitialized variable following system errors
...
in the multi-threaded sorter.
FossilOrigin-Name: 4bb2c1df105c2d21f5c4c7ef656ff1d6e15f78bc
2016-01-12 14:10:05 +00:00
8f3f65ec1c
Remove an unused field from the MemPage object.
...
FossilOrigin-Name: 5fc0a4c1f353c4c06fcbc4bce8bbe1897ef49eee
2016-01-12 04:08:54 +00:00
869aaf0941
Make sure all bytes of the WAL file are initialized even if the checksums are
...
not being computed until commit due to WAL overwrite.
FossilOrigin-Name: 1f44a9bdc1577aed088d9b91882527228015dcd3
2016-01-12 02:28:19 +00:00
9ca33fa4c2
Fix an uninitialized field in the Select object when SELECTTRACE is enabled.
...
FossilOrigin-Name: fc62851667d9120f98a2641c87bbc5a2485482b2
2016-01-12 02:00:24 +00:00
e2258a2076
Various #ifdef enhancements for improved VxWorks support.
...
FossilOrigin-Name: 75cd41ff179e29c5d45f9d7fed784bc339e0d7a0
2016-01-12 00:37:55 +00:00
00dcecab19
Performance optimization in the sqlite3VdbeChangeP4() routine of the
...
code generator.
FossilOrigin-Name: 28bd8d5fc541464b69886b7e886939035b42a869
2016-01-11 22:58:50 +00:00
46414c29ba
Fix duplicate test number in 'waloverwrite'.
...
FossilOrigin-Name: f5fb82686697e5fa1937323b1c1b35cf90ad0302
2016-01-11 22:43:04 +00:00
166e7e9705
Merge trunk with this branch.
...
FossilOrigin-Name: a73d245f2e523a57163bc93d9fb6a74c4cdf21e7
2016-01-11 18:30:34 +00:00
6a657b2477
Add the fts5speed.tcl script to ext/fts5/tool/.
...
FossilOrigin-Name: 2c0b93553ebb00a70c611eb8dac021877933f088
2016-01-11 18:23:07 +00:00
69f6e2587b
Performance optimization on the Column opcode.
...
FossilOrigin-Name: ecc98bef43c2fd07d64e4efddf340929a875ebac
2016-01-11 18:05:00 +00:00
aaf17c41ec
Fix bugs in fts5 synonym processing for detail=col and other modes.
...
FossilOrigin-Name: 0e3c545423246231ddac8fed2f103d71d556e17f
2016-01-11 17:30:28 +00:00
50922cfc7c
Performance optimization in sqlite3WalkExpr().
...
FossilOrigin-Name: 2f8bd5fab8cc51d1f8932c3490fd24dbccf6ef31
2016-01-11 14:19:14 +00:00
604ce70448
Merge recent enhancements, and especially the WAL overwrite change, from trunk.
...
FossilOrigin-Name: c4a858b228a164be2f89f5b01833f0b5e0d7735b
2016-01-11 13:10:41 +00:00
2fca70569d
Increase the version number to 3.11.0 due to the WAL overwrite enhancement.
...
FossilOrigin-Name: 8e807bfaa197027d0cb73532baa96755ce71ea12
2016-01-11 12:52:55 +00:00
87dc2bc841
If a single page is written to the wal file more than once, instead of appending the second and subsequent copy to the wal file, overwrite the first.
...
FossilOrigin-Name: d493d4f1186c15da50558a13490cba0191e6f649
2016-01-11 12:13:47 +00:00
c3bd870f09
Add a test case to waloverwrite.test to check that savepoint rollback does not cause a problem.
...
FossilOrigin-Name: 87dae56c322454094d445e474ae36a4f464272a4
2016-01-11 08:12:40 +00:00
07e8347221
Slightly smaller and faster LIKE/GLOB comparison implementation.
...
FossilOrigin-Name: 5dddcc78eec5bcd0c7e8fe1b70875ce775488f0c
2016-01-11 03:48:18 +00:00
8997087a00
Improved testability.
...
FossilOrigin-Name: e83d3a2a4e06665e8a056f63063bd6df03f063b9
2016-01-11 00:52:32 +00:00
b7c2f86b85
All WAL frame overwrites even if there are active savepoints. This is safe
...
because a ROLLBACK TO will cause all reverted pages to be rewritten to the
WAL file prior to COMMIT.
FossilOrigin-Name: 99b31a6b491c1c51227f478d3713b020d37a17cf
2016-01-09 23:55:47 +00:00
c9a9022b21
If it is known that checksums will be recalculated on transaction commit, skip calculating checksums when appending frames to the wal file. When recalculating checksums, recalculate them starting with the first overwritten frame - not the first frame in the transaction.
...
FossilOrigin-Name: 16b34f2537bbc7846d8e6dc2b35daae5af241c1b
2016-01-09 18:57:35 +00:00
d6f7c97952
If a single page is written to the wal file more than once, have each subsequent copy overwrite the original frame.
...
FossilOrigin-Name: 5d113aef2c7d746e8eda88d4e36c04a39b0a11be
2016-01-09 16:39:29 +00:00
a829992969
Typo fix in the previous commit.
...
FossilOrigin-Name: 52c166039831cc8423e2252019ef64a21b9d7c2a
2016-01-08 22:31:00 +00:00
24dbeae6f5
More #ifdef fixes for the unix VFS.
...
FossilOrigin-Name: 122c111e360761de8166e16ca151cb7260ee9bf8
2016-01-08 22:18:00 +00:00
5a1fb1885a
Fix the build for SQLITE_OMIT_SHARED_CACHE, which was broken, possibly
...
by check-in [2d96aeba].
FossilOrigin-Name: 3392f8fa2ddf2c10ffe91ddd92470040c909b36d
2016-01-08 19:34:39 +00:00
e4a08f9e39
Fix a problem with #ifdefs on the system calls in the unix VFS that causes
...
problems when compiling with SQLITE_OMIT_WAL.
FossilOrigin-Name: ceceea4c5ee242b20ebf216593c15c11ce2c369a
2016-01-08 19:17:30 +00:00
c0fba6d8e8
Remove an obsolete #ifdef related to iOS support.
...
FossilOrigin-Name: e9a51d2a580daa0fb152fe4c891149caa8025b9d
2016-01-08 17:28:24 +00:00
4f40cc6f3d
Begin adding fts5 tests involving synonyms and detail=none/col tables.
...
FossilOrigin-Name: b3e6f15ec2d9a834e2c80b91ffd7097553816228
2016-01-08 17:21:18 +00:00
ca3862dc6e
Reduce the number of calls to memset() in sqlite3DbMallocZero().
...
FossilOrigin-Name: cede2bf8e42ac140a8cc75a1d173083f543ba467
2016-01-08 12:46:39 +00:00
33d09da1f8
Fix test file vtabH.test so that it works with SQLITE_ENABLE_ICU builds.
...
FossilOrigin-Name: 19c1f4483e3df7fa1e9ac7c8a510fa1c906ac7c7
2016-01-08 08:35:14 +00:00
4ca02079cf
Fix fts5vocab.test so that it works with detail=none tables.
...
FossilOrigin-Name: d9135cc723fc4227aace6dcf4ffa4630c9d23aa0
2016-01-08 07:53:09 +00:00
21d61853e7
Add the experimental SQLITE_FCNTL_JOURNAL_POINTER file control for obtaining
...
the sqlite3_file pointer associated with a rollback journal or WAL file.
FossilOrigin-Name: a02ace9a746ff02fc1a5969bf13939b568624f93
2016-01-08 02:27:01 +00:00
c9d6d1b67b
Omit performance tracking from the memsys5 memory allocator if neither
...
SQLITE_DEBUG nor SQLITE_TEST are defined.
FossilOrigin-Name: af5c7714e993f060841f1e893f754ddf3870e6d0
2016-01-07 21:12:40 +00:00
2598b833f0
Update the fts5vocab module to work with detail=col and detail=none tables.
...
FossilOrigin-Name: eedd095dc1c81ce45df00093ba237dd7b3cdff3d
2016-01-07 20:07:41 +00:00
cad2486543
Fix to cause BtShared.db to be set correctly on shared-cache
...
connections in SQLITE_THREADSAFE=0 builds. Added assert()s to verify
the correct setting of BtShared.db.
FossilOrigin-Name: 2d96aeba2460779a0a20356739a0ba49144c8a85
2016-01-07 17:19:24 +00:00
8549d55ead
Small performance and size optimization spotted while working on the
...
shared-cache problem.
FossilOrigin-Name: 828958ff77a5c239d55302f570077835c093e0fa
2016-01-07 17:09:43 +00:00
7a2347e20b
Add some assert() statements to verify, where possible, that BtShared.db is set correctly.
...
FossilOrigin-Name: 359277e0e5338f6d7743d58cf99e1c934a8460d5
2016-01-07 16:43:54 +00:00
20d876fa1c
Have the vdbe layer call sqlite3BtreeEnter() on all b-trees in use from within sqlite3VdbeExec() even in SQLITE_THREADSAFE=0 builds. This ensures that BtShared.db is set correctly.
...
FossilOrigin-Name: d0214602d44d6b84b7463d530720e2560aee6edf
2016-01-07 16:06:22 +00:00
72bf6a3e9c
Add the "sqlite3 -sourceid" command in the TCL interface. Use that command and
...
others to output additional information about the test configuration at the
conclusion of a TCL test.
FossilOrigin-Name: 4f80440bf566959306f6ca8cbb1fd29d138ee38b
2016-01-07 02:06:55 +00:00
e787cbbe2a
Merge updates from trunk.
...
FossilOrigin-Name: 5cbab63756f6f276996f39d16d70b178581f63cd
2016-01-06 20:50:02 +00:00
7c230dd99c
Fix a test script problem caused by a change in constraint handling within the core.
...
FossilOrigin-Name: 625695b3d7d4eae7536b5f761b96cd7519ac6ada
2016-01-06 19:43:26 +00:00
4d14398a61
Merge latest trunk changes into this branch.
...
FossilOrigin-Name: e7dcd013516723941c2fb78ecdc96806d49d310b
2016-01-06 19:35:52 +00:00
4364e5c9f7
Fix an fts5 problem involving detail=none, "ORDER BY rowid DESC" and deleted items. Also add tests to verify that the documented operator precedences are correct.
...
FossilOrigin-Name: 8d05cfd48db1462dfd3efd502d53bd33214403fb
2016-01-06 18:53:57 +00:00
8d52c3b767
Disable the --limit-mem option on fuzzcheck unless the SQLITE_ENABLE_MEMSYS5 or
...
SQLITE_ENABLE_MEMSYS3 compile-time options are used.
FossilOrigin-Name: 55a11fd627eaf046b3783622b2925399a50a65b4
2016-01-06 15:54:53 +00:00
f56a2a07ff
Merge changes for version 3.10.0.
...
FossilOrigin-Name: fa4705c91f9650ecd7ec967dbbf0028aabd8a98c
2016-01-06 15:14:53 +00:00
02a59fab74
Version 3.10.0
...
FossilOrigin-Name: fd0a50f0797d154fefff724624f00548b5320566
2016-01-06 11:01:07 +00:00
f062d676ef
Fix a problem with the xPhraseFirstColumn() API in detail=col mode. Remove some unused test code from fts5ac.test.
...
FossilOrigin-Name: a4e55f73b3c81e28b917395089c0201f9a2c9178
2016-01-06 10:17:26 +00:00
10e1535dee
Rationalize and extend some fts5 test code. Fix bugs revealed by the same.
...
FossilOrigin-Name: fd217fdb396cf22278a496de0e9dec7902ba8b1f
2016-01-05 21:04:35 +00:00
9d4c9824da
Always use -DSQLITE_ENABLE_MEMSYS5 for fuzzcheck so that the --limit-mem
...
option will work.
FossilOrigin-Name: a855697719e288c908ddb7950d32fd17ef546509
2016-01-05 03:39:52 +00:00
0816905cdd
Another attempt to get reuse of excess opcode array space working correctly
...
on all architectures and platforms.
FossilOrigin-Name: 2f8583748abab1e15029d3a8693ba9a66c978c2b
2016-01-05 03:39:25 +00:00
98486c046f
Permit the 'test_fs' test module to be compiled and used on MinGW.
...
FossilOrigin-Name: ac27f38eef7a241d56124c263d9f8c91f372a77f
2016-01-05 01:48:29 +00:00
11e3e538d6
Fix a corner case in the opcode-array reuse logic where the number of bytes of
...
reusable space might be computed to be a negative number, due to unusual
system alignment restrictions and rounding error.
FossilOrigin-Name: 1aa530144643582658c8c1dd66548662f950efe3
2016-01-04 23:43:47 +00:00
211bd3a20a
Fix an OOM handling problem in fts5 detail=none and detail=col modes. Also a bug in the xInst() API when used with detail=col and column filtering expressions. Update the matchinfo() test function so that 'b' is fast with detail=col tables.
...
FossilOrigin-Name: ee38f9dff5e9239c541515cd8a1aa3d81fdc0ae9
2016-01-04 19:12:00 +00:00
721f26dc9a
Merge in last-minute patches for the 3.10.0 beta.
...
FossilOrigin-Name: c785cd7813e4ef6d6f2cb362a0f822713db6bcea
2016-01-04 19:02:47 +00:00
5af1019691
Update more fts5 tests to run in detail=none and detail=column modes as well as the default detail=full.
...
FossilOrigin-Name: 3fcf3b1e24483b2cd1c1710f053ed8403e09106d
2016-01-04 16:19:51 +00:00
4b4da16344
Fix the conflict2.test module which was broken by check-in [e30062e9f6c].
...
FossilOrigin-Name: b779ca8a7580e2a0bb1176316c4540867b635229
2016-01-04 13:06:53 +00:00
fa385edff3
A new approach to very large sqlite3_mprintf() strings: Back out the
...
[d655a665] check-in and instead make the size fields in StrAccum unsigned.
Strings generated by sqlite3_mprintf() can now be as large as 2^31-1 bytes.
FossilOrigin-Name: 7adb789f45698e5569b840d23f3f9488db3ed109
2016-01-04 12:07:27 +00:00
cc54f43442
Improved comment on the vtabH-3.1 test.
...
FossilOrigin-Name: 22abe08038cc7b66cbc25e733246d210197c9215
2016-01-04 04:44:31 +00:00
5a60c7d142
Adjust the vtabH.test module to ignore files in the root directory of Windows
...
machines that contain the "$" character.
FossilOrigin-Name: 73e3355004b8b7ce2e1bb937725f429795528a4f
2016-01-04 04:41:13 +00:00
6044bf8bf3
Limit the length of sqlite3_mprintf() output to 2^30 bytes, even if
...
SQLITE_MAX_LENGTH is set larger at compile-time.
FossilOrigin-Name: d655a665acfae676d30e90e3731f483bee6acc63
2016-01-04 04:28:11 +00:00
9fbc885afc
Fix a harmless compiler warning.
...
FossilOrigin-Name: 4b404a99aa9bfa6cfe8998f5dc1f84f8be20b840
2016-01-04 03:48:46 +00:00
7f10579a82
Add releasetest.tcl cases for SQLITE_LIKE_DOESNT_MATCH_BLOB and
...
for SQLITE_ENABLE_CURSOR_HINTS.
FossilOrigin-Name: f300c35efa5f7383b2a74b1c9466c243c17815e4
2016-01-04 01:08:50 +00:00
710b33b999
Alternative to [76f5efa6], move definition of utf8_printf up.
...
FossilOrigin-Name: 54c5522dda239cb9775709495ed7eb56a5dd8e11
2016-01-03 18:59:28 +00:00
dc0b1f1c29
Bug fix: the conflict resolution behavior for the implied NOT NULL constraint
...
on the PRIMARY KEY of a WITHOUT ROWID table should be ABORT.
FossilOrigin-Name: e30062e9f6cae980150dda7df440b36dfdcb7bbe
2016-01-03 18:07:57 +00:00
41d0ba72ae
Fix a premature reference to utf8_printf in shell.c.
...
FossilOrigin-Name: 76f5efa68728d899a63a74f2528dfd0c497aa5f0
2016-01-03 11:27:47 +00:00
573d88e8ed
Add the number of cores used and the name of the host computer to the
...
summary at the end of releasetest.tcl.
FossilOrigin-Name: cd3ae0f14c6b28b328b208431d0effcb7b062ec6
2016-01-03 11:17:04 +00:00
fe0c3cfee1
Changes to run many fts5 tests with detail=none and detail=col tables as well as the default detail=full. Also fixes for the bugs uncovered by running said tests.
...
FossilOrigin-Name: 6322a1d984e7946735bace8a069ef24b31754b3b
2016-01-02 19:01:56 +00:00
9abe841e9e
Fix a (harmless) typo in an #ifdef for SQLITE_ENABLE_CURSOR_HINTS
...
FossilOrigin-Name: 2047d2deabf2021ea05d620c3dd4919448027b11
2016-01-02 05:00:31 +00:00
bd57308eef
Remember the size of the Vdbe.aOp[] array in bytes, to avoid unnecessary
...
calls to sqlite3_msize().
FossilOrigin-Name: 3e852804c85a5c9f4c4ffafd55d03af6d19fe5cc
2016-01-01 16:42:09 +00:00
3c19bb60d1
Avoid misaligned memory allocations on Sparc in sqlite3VdbeMakeReady().
...
FossilOrigin-Name: a304e34675404aee860fcc97fa4ffcc57c014812
2016-01-01 16:26:22 +00:00
8de1d77c60
Merge the latest enhancements from trunk.
...
FossilOrigin-Name: c0be246a740c8f33a7c07e1414688364dee56ece
2016-01-01 13:25:06 +00:00
a660caf2f0
Fix an assert() that might be false for a corrupt database.
...
FossilOrigin-Name: 68360cd2211b7ab25dd4ca55a2e82e31f51f2976
2016-01-01 03:37:44 +00:00
2307926ea9
Remove unreachable branches from the new JSON aggregate functions.
...
FossilOrigin-Name: 6e30f8c6c3af9b0df39783888a1479f88271f989
2016-01-01 00:15:59 +00:00
bdfa1b94e9
Fix the ieee754.test module so that it works both on systems that report
...
infinity as "inf" and as "Inf".
FossilOrigin-Name: d41d4d7396fba60895535f21c438f8c75e7b2097
2015-12-31 22:29:36 +00:00
aae280ef8b
In the shell, use utf8_printf() when any string formatting is present and raw_printf() otherwise.
...
FossilOrigin-Name: 8cf01fff232d15d3c7b7b62b2d890d983e1945f2
2015-12-31 19:06:24 +00:00
5905f86b33
Fix harmless compiler warning seen with MSVC.
...
FossilOrigin-Name: 98ec778daac835d9ae103f6460b7d897981a5dd6
2015-12-31 19:04:42 +00:00
811501e237
Fix the fts5 integrity-check code so that it works with detail=none tables.
...
FossilOrigin-Name: 3a1df69e58e5830da1dff158eedbe3817743f58f
2015-12-31 18:39:14 +00:00
841243156f
Fix some problems with fts5 detail=none tables. Some still remain.
...
FossilOrigin-Name: 6a6f7bc40d6b4c8a4a254a9098c9d2f31fde69ca
2015-12-31 17:36:58 +00:00
e6110505c9
Fix harmless compiler warnings associated with SQLITE_ENABLE_HIDDEN_COLUMNS.
...
FossilOrigin-Name: 9c392c1019ee15f27c8e05b41246d2844f91f6c0
2015-12-31 15:34:03 +00:00
e5520e2f06
Small size and performance optimization to the VDBE comparison opcodes.
...
FossilOrigin-Name: 7a0b9413fa94d3f4fa9751ddf9b213a1238954f1
2015-12-31 04:34:26 +00:00
d11e397b2c
Updates to fts5 to support detail=none mode. As of this commit, many cases are still broken.
...
FossilOrigin-Name: ac8f4cf0cede6bcbe47eeefb85d80a27e9278212
2015-12-30 19:58:57 +00:00
13778518e7
Reduce the size of the CellInfo object from 32 to 24 bytes on 64-bit machines,
...
for a small performance increase and library size reduction.
FossilOrigin-Name: 6a4cfc7ab62046eb718ce59eff6b632f239312ac
2015-12-30 18:18:46 +00:00
9906738494
Enhance the command-line shell so that it can handle MBCS characters on
...
input and output.
FossilOrigin-Name: 3d81dfe3bc5ca9588b7796769d9be7a182f38b1c
2015-12-30 17:03:40 +00:00
f19aa5fa6f
Changes to the way that the default BINARY collating sequence is recorded
...
result in a slightly smaller and slightly faster executable. More work could
be done to make this cleaner.
FossilOrigin-Name: 2081d75767dc590b4c8457e5f8e5f18ba5f8eaa7
2015-12-30 16:51:20 +00:00
0472af91ec
Simplification to the xfer-optimization logic.
...
FossilOrigin-Name: f35ba018da843897acca58f70541b940598bc271
2015-12-30 15:18:16 +00:00
31d175dde4
Remove unnecessary tests from the LIKE pattern matcher. Slightly faster and
...
slightly smaller, and it should also now works with EBCDIC.
FossilOrigin-Name: 0a99a8c4facf65ec67d8d86108c9a3f723f7cbd6
2015-12-30 14:06:22 +00:00
e05461cc8e
Enhance the command-line shell to handle MBCS characters on input and output.
...
FossilOrigin-Name: a0a08b8c0bbd4d71955261f6b7e997701ca68e18
2015-12-30 13:36:57 +00:00
ff135ae4c3
Add the json_group_array() and json_group_object() aggregate functions to
...
the JSON1 extension.
FossilOrigin-Name: 7f386a9332237100a345035ca213327e21d95855
2015-12-30 01:07:02 +00:00
9a3a5275cd
Add the xPhraseFirstColumn() and xPhraseNextColumn() API functions to fts5. For iterating through the set of columns that contain intances of a phrase.
...
FossilOrigin-Name: 8c30605bcd0a78a5015948171145bc6f640b8358
2015-12-29 19:35:03 +00:00
9f44deed93
Change the name of the offsets=0 option to "detail=column". Have the xInst, xPhraseFirst and other API functions work by parsing the original text for detail=column tables.
...
FossilOrigin-Name: 228b4d10e38f7d70e1b008c3c9b4a1ae3e32e30d
2015-12-28 19:55:00 +00:00
e1462a762c
Avoid a harmless compiler warning on systems where the byteorder cannot
...
be determined at compile-time.
FossilOrigin-Name: 7c7b7f26306b6aa6ff35b871ad756f43f5db9838
2015-12-24 14:53:27 +00:00
3e6a141130
Fix some harmless gcc compiler warnings. Mostly in fts5, but also two in the core code.
...
FossilOrigin-Name: 5d44d4a6cf5c6b983cbd846d9bc34251df8f4bc5
2015-12-23 16:42:27 +00:00
caeca516a7
Enhance the 'utc' modifier on date/time functions so that if the LHS is
...
already known to be in UTC, the modifier becomes a no-op. This is not an
incompatibility because the behavior is documented as "undefined" in that
scenario.
FossilOrigin-Name: b910a3d53769689d9212a06f974ccce54844bbe4
2015-12-23 10:54:48 +00:00
8f9ced636f
Updates so that fts5 API functions xInst, xPhraseFirst and xPhraseNext work with the offsets=0 option.
...
FossilOrigin-Name: 69bffc1632c8a8f3bfe5bf92607e64fed982e48c
2015-12-22 18:54:16 +00:00
159fd77e0f
Fix an fts5 integrity-check problem that affects offsets=0 tables with prefix indexes.
...
FossilOrigin-Name: 609a0bc7f34e6dae74ce756aff920f3df78fe828
2015-12-21 18:45:09 +00:00
1c75c9d7f1
Ensure that the Expr objects that describe indexed expressions are not modified
...
by code generation. Fix for an assert() problem found by Jon Metzman using AFL.
FossilOrigin-Name: 34073ce87d88a02313217023ae92e15939192cd9
2015-12-21 15:22:13 +00:00
c58b9eeaaa
Fix a problem with prefix queries on fts5 offsets=0 tables.
...
FossilOrigin-Name: ad0987d83c252dd8d6a69321893629d7be805c28
2015-12-18 19:07:14 +00:00
d319b8c143
Micro-optimizations and comment fixes on the mem5.c memory allocator module.
...
FossilOrigin-Name: 8bf5e056eb8beb6e0ed5874fb24d7fe9f0b66d2b
2015-12-18 16:29:47 +00:00
45ac1c70b3
Reduce the size of the CellInfo object from 32 to 24 bytes on 64-bit machines.
...
FossilOrigin-Name: 7850715406458a61cff9eba5ad915f61f6d99482
2015-12-18 03:59:16 +00:00
b12dc84fbb
Add the "offsets=0" option to fts5, to create a smaller index without term offset information. A few things are currently broken on this branch.
...
FossilOrigin-Name: 40b5bbf02a824ca73b33aa4ae1c7d5f65b7cda10
2015-12-17 20:36:13 +00:00
1db0a72be2
Fix the spellfix1_scriptcode() function to ignore whitespace and punctuation,
...
and to recognize hebrew and arabic scripts.
FossilOrigin-Name: 7adfa4a5794e47f97491c08abeaaac90e826b331
2015-12-17 14:18:21 +00:00
5732671db9
Fixes for harmless compiler warnings.
...
FossilOrigin-Name: 85ebd46c701e0a094a4690cd8f1d0cbae9aa257c
2015-12-17 13:28:50 +00:00
b9becaa268
Fix even more harmless compiler warnings.
...
FossilOrigin-Name: 1d0e6aa119da8e15d35508f5d75ffc729979da92
2015-12-16 23:30:30 +00:00
8ccdef6be4
Fix some more harmless compiler warnings.
...
FossilOrigin-Name: 18f531e1cf3c8bb986d912c9c5e3f5698360c93e
2015-12-16 22:06:52 +00:00
8c7cd6a9d8
Fix compiler warning seen with MSVC.
...
FossilOrigin-Name: 18a4c0540bf4f02335e9e9def1f2b0d4d784ef08
2015-12-16 21:09:53 +00:00
173b60999e
Merge recent enhancements from trunk.
...
FossilOrigin-Name: f6c9273cab877b8b6b327250195f3392393d060a
2015-12-16 19:47:54 +00:00
8b0ba7b0b8
Make greater use of the SQLITE_WITHIN macro.
...
FossilOrigin-Name: f2fc3aede55c8fa0351697f9f5ce4e544334c9af
2015-12-16 13:07:35 +00:00
991c5d6413
Update the mkautoconfamal.sh script to make the building of the sqlite3-autoconf-VERSION.tar.gz package more orthodox.
...
FossilOrigin-Name: 1928f8945b7cdf733129619b7ab02d1addf63478
2015-12-15 19:32:12 +00:00
3592680734
Add the SQLITE_OMIT_PARSER_TRACE compile-time option.
...
FossilOrigin-Name: 2fda43e6e097a4a5510cce7784c31ceedc3d6e6d
2015-12-15 13:50:22 +00:00
b1d6b53694
Add a missing memAboutToChange() macro to vdbe.c, the lack of which was causing an assert() to fail incorrectly. Problem found by libfuzzer.
...
FossilOrigin-Name: 1a24791109da607d502ac41f179fe6c1dc46c774
2015-12-14 19:42:19 +00:00
0f308f5d47
Add a new assert() statement to the snapshot-specific part of sqlite3WalBeginReadTrans().
...
FossilOrigin-Name: d8a12023be32bdc6df18b0a5f38b917799854342
2015-12-11 14:59:49 +00:00
567a43bbc3
Simplified alignment constraints in the memory reuse logic of
...
sqlite3VdbeMakeReady().
FossilOrigin-Name: e998513e442ce1206b12dc28bdc996d7b5f9f94d
2015-12-11 13:51:02 +00:00
cc99e24491
Add the experimental snapshot interface. Because it is experimental, it is
...
subject to change or removal at a later date.
FossilOrigin-Name: 9b124a5a310aec0145495c9980bc0c1308fcca02
2015-12-11 12:44:52 +00:00
9b810ae8f3
Fix a memory allocation bug introduced last week by check-in
...
[a9e819082ba]. The bug only appears on systems where the size of a structure
is not always a multiple of 8 - which in practice means only on 32-bit
windows systems.
FossilOrigin-Name: 96d3e99ffe59b5280b8b7fc269c94a72e15c345b
2015-12-11 04:11:17 +00:00
5a6e89c644
Mention that the snapshot interfaces are only available if SQLite is compiled
...
with SQLITE_ENABLE_SNAPSHOT.
FossilOrigin-Name: 843c15a552657ca43ff200edb7da7566752d7941
2015-12-11 03:27:36 +00:00
68d28ea4f0
Disable the snapshot test scripts if not compiled with SQLITE_ENABLE_SNAPSHOT.
...
FossilOrigin-Name: 5fd008f0433833e4341d526dcc2387570ffe1fea
2015-12-11 03:20:39 +00:00
c49e960d41
Fix a variable type mismatch problem in the snapshot logic.
...
FossilOrigin-Name: 93fb8010e4999b6b832d63a7c5a152f65d4415a3
2015-12-11 03:16:54 +00:00
71b62fa456
Fix a bad assert related to snapshots.
...
FossilOrigin-Name: 767ee30efa5dd469e3a51d4e44cbe473061819b9
2015-12-11 01:22:22 +00:00
e230a8994e
Snapshot documentation updates. Comment changes only - no changes to code.
...
FossilOrigin-Name: ef51a398a04963508389ffe2f9d8359c1ec48261
2015-12-10 22:48:22 +00:00
7116dc60dc
Update the sqlite3_snapshot_get() API so that if the caller does not have an open read transaction on the named database, one is automatically opened.
...
FossilOrigin-Name: b9c90f10297d8516a661449e8af898e682c930aa
2015-12-10 20:03:08 +00:00
745c14eb15
Add tests to snapshot.test.
...
FossilOrigin-Name: f3b743623a4501833478c8a86c0922931955aeb6
2015-12-10 19:44:34 +00:00
a7aeb39836
Return SQLITE_BUSY (not SQLITE_BUSY_SNAPSHOT) if sqlite3_snapshot_open() fails to obtain the shared checkpointer lock.
...
FossilOrigin-Name: 5343060bcc6c99029f731f8020d2cba3f405f207
2015-12-10 19:11:34 +00:00
7d15979420
Add tests to ensure that an sqlite3_snapshot_open() client cannot be tricked into reading a corrupt snapshot even if another process fails mid-checkpoint.
...
FossilOrigin-Name: b908048b6cfa1ee2fe1f7a17bae475ddd9d0376c
2015-12-10 18:06:21 +00:00
34628b4b4f
Move pointer range comparisons into a macro, where they can be dealt with in a more portable way.
...
FossilOrigin-Name: 05bc4f920ce23da48d1da6cd36a956fd6fd7c862
2015-12-10 17:59:50 +00:00
3bf83ccd70
Have sqlite3_snapshot_open() avoid a race condition by taking a shared CHECKPOINTER lock while checking pInfo->nBackfillAttempted.
...
FossilOrigin-Name: 8084eae0bc4f6513b1147fb890a6b2813f1c0a09
2015-12-10 15:45:15 +00:00
ac536e613a
Move pointer range comparisons into a macro, where they can be dealt with
...
in a more portable way.
FossilOrigin-Name: ad3124c834b080aaaf24934d6f08b3601ac3ae53
2015-12-10 15:09:17 +00:00
c9fb38e7ad
Fix spacing typo in comment. No changes to code.
...
FossilOrigin-Name: 3a18526fc2253658dad84c5e600481c8a62efe40
2015-12-10 03:16:47 +00:00
998147ec38
Add the nBackfillAttempted field in formerly unused space in WalCkptInfo and
...
use that field to close the race condition on opening a snapshot.
FossilOrigin-Name: cb68e9d0738fc7db7316947b4d2aab91aae819f2
2015-12-10 02:15:03 +00:00
65127cd57d
Update sqlite3_snapshot_open() to reduce the chances of reading a corrupt snapshot created by a checkpointer process exiting unexpectedly.
...
FossilOrigin-Name: 7315f7cbf4179aadda0f1a0baa1526a9b9f9729f
2015-12-09 20:05:27 +00:00
5ef09bf918
Further simplifications to the VDBE code generation logic that flow out
...
of the previous check-in.
FossilOrigin-Name: 6a5dfe85b519b920ce8c842057767a8793d92236
2015-12-09 17:23:12 +00:00
8c8dddc904
Simplification of the DROP TRIGGER logic using sqlite3NestedParse() instead
...
of hand-coded VDBE code. This is a manual cherry-pick of the key change from
check-in [c80bbf14b365d].
FossilOrigin-Name: 8021b4c8139ba56d6b1e2e26aeec4f9bf77f37c9
2015-12-09 16:26:38 +00:00
drh